Skip to content

Commit a9a5bd3

Browse files
DataHelper: move to TS
1 parent da2a4bd commit a9a5bd3

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

packages/devextreme/js/__internal/data_controller.ts renamed to packages/devextreme/js/__internal/data/data_controller/data_controller.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Deferred } from '@js/core/utils/deferred';
22

3-
import ArrayStore from '../common/data/array_store';
4-
import { DataSource } from '../common/data/data_source/data_source';
5-
import { normalizeDataSourceOptions } from '../common/data/data_source/utils';
6-
import { extend } from '../core/utils/extend';
7-
import { isDefined } from '../core/utils/type';
3+
import ArrayStore from '../../../common/data/array_store';
4+
import { DataSource } from '../../../common/data/data_source/data_source';
5+
import { normalizeDataSourceOptions } from '../../../common/data/data_source/utils';
6+
import { extend } from '../../../core/utils/extend';
7+
import { isDefined } from '../../../core/utils/type';
88

99
interface DataSourceType {
1010
_userData: unknown;

packages/devextreme/js/common/data/data_helper.js renamed to packages/devextreme/js/__internal/data/m_data_helper.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
import { DataSource } from './data_source/data_source';
2+
import { DataSource } from '../../common/data/data_source/data_source';
33
import { extend } from '../../core/utils/extend';
4-
import { normalizeDataSourceOptions } from './data_source/utils';
5-
import DataController from '../../__internal/ui/collection/m_data_controller';
4+
import { normalizeDataSourceOptions } from '../../common/data/data_source/utils';
5+
import DataController from '../ui/collection/m_data_controller';
66

77
const DATA_SOURCE_OPTIONS_METHOD = '_dataSourceOptions';
88
const DATA_SOURCE_CHANGED_METHOD = '_dataSourceChangedHandler';

packages/devextreme/js/__internal/scheduler/m_scheduler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { triggerResizeEvent } from '@js/common/core/events/visibility_change';
22
import dateLocalization from '@js/common/core/localization/date';
33
import messageLocalization from '@js/common/core/localization/message';
4-
import DataHelperMixin from '@js/common/data/data_helper';
4+
import DataHelperMixin from '@ts/data/m_data_helper';
55
import registerComponent from '@js/core/component_registrator';
66
import config from '@js/core/config';
77
import devices from '@js/core/devices';

packages/devextreme/js/__internal/ui/chat/chat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Guid } from '@js/common';
22
import messageLocalization from '@js/common/core/localization/message';
33
import type { DataSourceOptions } from '@js/common/data';
4-
import DataHelperMixin from '@js/common/data/data_helper';
4+
import DataHelperMixin from '@ts/data/m_data_helper';
55
import registerComponent from '@js/core/component_registrator';
66
import type { dxElementWrapper } from '@js/core/renderer';
77
import $ from '@js/core/renderer';

packages/devextreme/js/__internal/ui/collection/collection_widget.base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import holdEvent from '@js/common/core/events/hold';
66
import pointerEvents from '@js/common/core/events/pointer';
77
import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index';
88
import messageLocalization from '@js/common/core/localization/message';
9-
import DataHelperMixin from '@js/common/data/data_helper';
109
import Action from '@js/core/action';
1110
import domAdapter from '@js/core/dom_adapter';
1211
import Guid from '@js/core/guid';
@@ -35,6 +34,7 @@ import { focusable } from '@js/ui/widget/selectors';
3534
import { getPublicElement } from '@ts/core/m_element';
3635
import type { OptionChanged } from '@ts/core/widget/types';
3736
import Widget from '@ts/core/widget/widget';
37+
import DataHelperMixin from '@ts/data/m_data_helper';
3838
import CollectionWidgetItem from '@ts/ui/collection/m_item';
3939

4040
const COLLECTION_CLASS = 'dx-collection';

packages/devextreme/js/__internal/ui/editor/m_data_expression.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import ArrayStore from '@js/common/data/array_store';
2-
import DataHelperMixin from '@js/common/data/data_helper';
2+
import DataHelperMixin from '@ts/data/m_data_helper';
33
import DataSource from '@js/common/data/data_source';
44
import { ensureDefined, noop } from '@js/core/utils/common';
55
import {

packages/devextreme/js/common/data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { errorHandler, setErrorHandler } from './data/errors';
77
import LocalStore from './data/local_store';
88
import query from './data/query';
99
import { base64_encode, compileGetter, compileSetter } from './data/utils';
10-
import DataHelperMixin from './data/data_helper';
10+
import DataHelperMixin from '../__internal/data/m_data_helper';
1111
import ODataContext from './data/odata/context';
1212
import ODataStore from './data/odata/store';
1313
import { EdmLiteral, keyConverters } from './data/odata/utils';
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import DataController from './__internal/data_controller';
1+
import DataController from './__internal/data/data_controller/data_controller';
22
export default DataController;

packages/devextreme/js/ui/diagram/diagram.items_option.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { extend } from '../../core/utils/extend';
22
import { Component } from '../../core/component';
3-
import DataHelperMixin from '../../common/data/data_helper';
3+
import { DataHelperMixin } from '../../common/data';
44

55
const ItemsOptionBase = Component.inherit({}).include(DataHelperMixin);
66

packages/devextreme/js/ui/gantt/ui.gantt.data.option.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from '../../core/component';
2-
import DataHelperMixin from '../../common/data/data_helper';
2+
import { DataHelperMixin } from '../../common/data';
33

44
class DataOption extends Component {
55
constructor(optionName, getLoadPanel, dataSourceChangedCallback) {

packages/devextreme/js/viz/core/data_source.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { noop } from '../../core/utils/common';
2-
import DataHelperMixin from '../../common/data/data_helper';
2+
import DataHelperMixin from '../../__internal/data/m_data_helper';
33
const postCtor = DataHelperMixin.postCtor;
44
let name;
55
const members = {

packages/devextreme/js/viz/vector_map/map_layer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { noop } from '../../core/utils/common';
22
import { extend } from '../../core/utils/extend';
33
import { each } from '../../core/utils/iterator';
4-
import DataHelperMixin from '../../common/data/data_helper';
4+
import { DataHelperMixin } from '../../common/data';
55
import { isFunction as _isFunction, isDefined as _isDefined } from '../../core/utils/type';
66
import { Deferred, when } from '../../core/utils/deferred';
77
import { parseScalar as _parseScalar,

0 commit comments

Comments
 (0)