DataHelper: move to TS

DevExpress · Jan 21, 2025 · 88d815e · 88d815e
1 parent 7aba822
commit 88d815e
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/...vextreme/js/__internal/data_controller.ts → ...l/data/data_controller/data_controller.ts b/...vextreme/js/__internal/data_controller.ts → ...l/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/.../devextreme/js/common/data/data_helper.js → ...treme/js/__internal/data/m_data_helper.ts b/.../devextreme/js/common/data/data_helper.js → ...treme/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,