From 88d815e61b1996d42a0987c5dc5fe53d3a225ade Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Tue, 21 Jan 2025 14:57:33 +0400 Subject: [PATCH] DataHelper: move to TS --- .../{ => data/data_controller}/data_controller.ts | 10 +++++----- .../data/m_data_helper.ts} | 6 +++--- .../devextreme/js/__internal/scheduler/m_scheduler.ts | 2 +- packages/devextreme/js/__internal/ui/chat/chat.ts | 2 +- .../__internal/ui/collection/collection_widget.base.ts | 2 +- .../js/__internal/ui/editor/m_data_expression.ts | 2 +- packages/devextreme/js/common/data.js | 2 +- packages/devextreme/js/data_controller.js | 2 +- .../devextreme/js/ui/diagram/diagram.items_option.js | 2 +- .../devextreme/js/ui/gantt/ui.gantt.data.option.js | 2 +- packages/devextreme/js/viz/core/data_source.js | 2 +- packages/devextreme/js/viz/vector_map/map_layer.js | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) rename packages/devextreme/js/__internal/{ => data/data_controller}/data_controller.ts (95%) rename packages/devextreme/js/{common/data/data_helper.js => __internal/data/m_data_helper.ts} (96%) diff --git a/packages/devextreme/js/__internal/data_controller.ts b/packages/devextreme/js/__internal/data/data_controller/data_controller.ts similarity index 95% rename from packages/devextreme/js/__internal/data_controller.ts rename to packages/devextreme/js/__internal/data/data_controller/data_controller.ts index 941aa26d9b66..0730af1df864 100644 --- a/packages/devextreme/js/__internal/data_controller.ts +++ b/packages/devextreme/js/__internal/data/data_controller/data_controller.ts @@ -1,10 +1,10 @@ import { Deferred } from '@js/core/utils/deferred'; -import ArrayStore from '../common/data/array_store'; -import { DataSource } from '../common/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '../common/data/data_source/utils'; -import { extend } from '../core/utils/extend'; -import { isDefined } from '../core/utils/type'; +import ArrayStore from '../../../common/data/array_store'; +import { DataSource } from '../../../common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '../../../common/data/data_source/utils'; +import { extend } from '../../../core/utils/extend'; +import { isDefined } from '../../../core/utils/type'; interface DataSourceType { _userData: unknown; diff --git a/packages/devextreme/js/common/data/data_helper.js b/packages/devextreme/js/__internal/data/m_data_helper.ts similarity index 96% rename from packages/devextreme/js/common/data/data_helper.js rename to packages/devextreme/js/__internal/data/m_data_helper.ts index 998956583371..255fce448461 100644 --- a/packages/devextreme/js/common/data/data_helper.js +++ b/packages/devextreme/js/__internal/data/m_data_helper.ts @@ -1,8 +1,8 @@ -import { DataSource } from './data_source/data_source'; +import { DataSource } from '../../common/data/data_source/data_source'; import { extend } from '../../core/utils/extend'; -import { normalizeDataSourceOptions } from './data_source/utils'; -import DataController from '../../__internal/ui/collection/m_data_controller'; +import { normalizeDataSourceOptions } from '../../common/data/data_source/utils'; +import DataController from '../ui/collection/m_data_controller'; const DATA_SOURCE_OPTIONS_METHOD = '_dataSourceOptions'; const DATA_SOURCE_CHANGED_METHOD = '_dataSourceChangedHandler'; diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts index 7d425480f2eb..f4a4354f5e75 100644 --- a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts @@ -1,7 +1,7 @@ import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; import dateLocalization from '@js/common/core/localization/date'; import messageLocalization from '@js/common/core/localization/message'; -import DataHelperMixin from '@js/common/data/data_helper'; +import DataHelperMixin from '@ts/data/m_data_helper'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import devices from '@js/core/devices'; diff --git a/packages/devextreme/js/__internal/ui/chat/chat.ts b/packages/devextreme/js/__internal/ui/chat/chat.ts index d3c8aa0f114f..4308d9076283 100644 --- a/packages/devextreme/js/__internal/ui/chat/chat.ts +++ b/packages/devextreme/js/__internal/ui/chat/chat.ts @@ -1,7 +1,7 @@ import { Guid } from '@js/common'; import messageLocalization from '@js/common/core/localization/message'; import type { DataSourceOptions } from '@js/common/data'; -import DataHelperMixin from '@js/common/data/data_helper'; +import DataHelperMixin from '@ts/data/m_data_helper'; import registerComponent from '@js/core/component_registrator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; diff --git a/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts b/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts index 01c95f6a6c59..224a297208b3 100644 --- a/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts +++ b/packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts @@ -6,7 +6,6 @@ import holdEvent from '@js/common/core/events/hold'; import pointerEvents from '@js/common/core/events/pointer'; import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; import messageLocalization from '@js/common/core/localization/message'; -import DataHelperMixin from '@js/common/data/data_helper'; import Action from '@js/core/action'; import domAdapter from '@js/core/dom_adapter'; import Guid from '@js/core/guid'; @@ -35,6 +34,7 @@ import { focusable } from '@js/ui/widget/selectors'; import { getPublicElement } from '@ts/core/m_element'; import type { OptionChanged } from '@ts/core/widget/types'; import Widget from '@ts/core/widget/widget'; +import DataHelperMixin from '@ts/data/m_data_helper'; import CollectionWidgetItem from '@ts/ui/collection/m_item'; const COLLECTION_CLASS = 'dx-collection'; diff --git a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts index fae1c38874c6..8e84dc2aed56 100644 --- a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts +++ b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts @@ -1,5 +1,5 @@ import ArrayStore from '@js/common/data/array_store'; -import DataHelperMixin from '@js/common/data/data_helper'; +import DataHelperMixin from '@ts/data/m_data_helper'; import DataSource from '@js/common/data/data_source'; import { ensureDefined, noop } from '@js/core/utils/common'; import { diff --git a/packages/devextreme/js/common/data.js b/packages/devextreme/js/common/data.js index 8c5cd19312a2..c497b6c97a6d 100644 --- a/packages/devextreme/js/common/data.js +++ b/packages/devextreme/js/common/data.js @@ -7,7 +7,7 @@ import { errorHandler, setErrorHandler } from './data/errors'; import LocalStore from './data/local_store'; import query from './data/query'; import { base64_encode, compileGetter, compileSetter } from './data/utils'; -import DataHelperMixin from './data/data_helper'; +import DataHelperMixin from '../__internal/data/m_data_helper'; import ODataContext from './data/odata/context'; import ODataStore from './data/odata/store'; import { EdmLiteral, keyConverters } from './data/odata/utils'; diff --git a/packages/devextreme/js/data_controller.js b/packages/devextreme/js/data_controller.js index f34b3d1f919b..296bde98f930 100644 --- a/packages/devextreme/js/data_controller.js +++ b/packages/devextreme/js/data_controller.js @@ -1,2 +1,2 @@ -import DataController from './__internal/data_controller'; +import DataController from './__internal/data/data_controller/data_controller'; export default DataController; diff --git a/packages/devextreme/js/ui/diagram/diagram.items_option.js b/packages/devextreme/js/ui/diagram/diagram.items_option.js index 2ae6694bdbe3..d8d0b3096eaa 100644 --- a/packages/devextreme/js/ui/diagram/diagram.items_option.js +++ b/packages/devextreme/js/ui/diagram/diagram.items_option.js @@ -1,6 +1,6 @@ import { extend } from '../../core/utils/extend'; import { Component } from '../../core/component'; -import DataHelperMixin from '../../common/data/data_helper'; +import { DataHelperMixin } from '../../common/data'; const ItemsOptionBase = Component.inherit({}).include(DataHelperMixin); diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js b/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js index 8076b7d23e39..faa0774b1560 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js @@ -1,5 +1,5 @@ import { Component } from '../../core/component'; -import DataHelperMixin from '../../common/data/data_helper'; +import { DataHelperMixin } from '../../common/data'; class DataOption extends Component { constructor(optionName, getLoadPanel, dataSourceChangedCallback) { diff --git a/packages/devextreme/js/viz/core/data_source.js b/packages/devextreme/js/viz/core/data_source.js index 27518ef780e8..c7a4b6d2be40 100644 --- a/packages/devextreme/js/viz/core/data_source.js +++ b/packages/devextreme/js/viz/core/data_source.js @@ -1,5 +1,5 @@ import { noop } from '../../core/utils/common'; -import DataHelperMixin from '../../common/data/data_helper'; +import DataHelperMixin from '../../__internal/data/m_data_helper'; const postCtor = DataHelperMixin.postCtor; let name; const members = { diff --git a/packages/devextreme/js/viz/vector_map/map_layer.js b/packages/devextreme/js/viz/vector_map/map_layer.js index a6b60250c913..43d76126ea77 100644 --- a/packages/devextreme/js/viz/vector_map/map_layer.js +++ b/packages/devextreme/js/viz/vector_map/map_layer.js @@ -1,7 +1,7 @@ import { noop } from '../../core/utils/common'; import { extend } from '../../core/utils/extend'; import { each } from '../../core/utils/iterator'; -import DataHelperMixin from '../../common/data/data_helper'; +import { DataHelperMixin } from '../../common/data'; import { isFunction as _isFunction, isDefined as _isDefined } from '../../core/utils/type'; import { Deferred, when } from '../../core/utils/deferred'; import { parseScalar as _parseScalar,