Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import $ from '@js/core/renderer';
import devices from '@ts/core/devices';
import domAdapter from '@ts/core/dom_adapter';
import { extend } from '@ts/core/utils/m_extend';
import resizeCallbacks from '@ts/core/utils/m_resize_callbacks';
import { getWidth, setWidth } from '@ts/core/utils/m_size';
import { styleProp } from '@ts/core/utils/m_style';
import supportUtils from '@ts/core/utils/m_support';
import { getWindow } from '@ts/core/utils/m_window';
import resizeCallbacks from '@ts/core/utils/resize_callbacks';
import { styleProp } from '@ts/core/utils/style';
import eventsEngine from '@ts/events/core/events_engine';
import type { ScrollEvent } from '@ts/events/gesture/emitter.gesture.scroll';

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/core/events_strategy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { each } from '@js/core/utils/iterator';
import { isFunction, isPlainObject } from '@js/core/utils/type';
import { Callbacks } from '@ts/core/utils/m_callbacks';
import { Callbacks } from '@ts/core/utils/callbacks';

export type EventHandler = Function;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import coreLocalization from '@ts/core/localization/core';
import { defaultMessages } from '@ts/core/localization/default_messages';
import { injector as dependencyInjector } from '@ts/core/utils/dependency_injector';
import { humanize } from '@ts/core/utils/inflector';
import { extend } from '@ts/core/utils/m_extend';
import { humanize } from '@ts/core/utils/m_inflector';
import { format as stringFormat } from '@ts/core/utils/m_string';
import { format as stringFormat } from '@ts/core/utils/string';

export type MessageFormatter = (...values: unknown[]) => string;
export type MessageDictionary = Record<string, Record<string, string>>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Callbacks from '@js/core/utils/callbacks';
import { each } from '@js/core/utils/iterator';

import type { CallbackInterface } from './utils/m_callbacks';
import type { CallbackInterface } from './utils/callbacks';

type MemorizedHandler = Parameters<CallbackInterface['add']>[0];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from '@jest/globals';
import $ from '@js/core/renderer';
import { equals } from '@ts/core/utils/m_comparator';
import { equals } from '@ts/core/utils/comparator';

describe('Comparator utils', () => {
describe('equals', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {
beforeEach, describe, expect, it, jest,
} from '@jest/globals';
import errorFactory from '@ts/core/utils/error';
import consoleUtils from '@ts/core/utils/m_console';
import errorFactory from '@ts/core/utils/m_error';

jest.mock('@ts/core/utils/m_console', () => {
const logger = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { isTablePart, parseHTML } from '@ts/core/utils/m_html_parser';
import { isTablePart, parseHTML } from '@ts/core/utils/html_parser';

const tableParts: [string, string][] = [
['tr', '<tr><td>1</td></tr>'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
attachInstanceToElement,
getInstanceByElement,
name as getComponentName,
} from '@ts/core/utils/m_public_component';
} from '@ts/core/utils/public_component';

const ANONYMOUS_NAME = /^dxPrivateComponent(\d+)$/;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it } from '@jest/globals';
import { SelectionFilterCreator } from '@ts/core/utils/m_selection_filter';
import { SelectionFilterCreator } from '@ts/core/utils/selection_filter';

const createFilter = (
keys: unknown[],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
afterEach, beforeEach, describe, expect, it, jest,
} from '@jest/globals';
import type { dxElementWrapper } from '@js/core/renderer';
import { computeStyleSheetsHash, getShadowElementsFromPoint } from '@ts/core/utils/m_shadow_dom';
import { computeStyleSheetsHash, getShadowElementsFromPoint } from '@ts/core/utils/shadow_dom';

const createSheet = (rules: string[] | 'cross-origin'): CSSStyleSheet => ({
get cssRules() {
Expand Down Expand Up @@ -269,12 +269,12 @@ describe('Shadow DOM utils', () => {

const createRoot = (sheets: CSSStyleSheet[]): FakeRoot => ({ host: {}, styleSheets: sheets });

type ShadowDomModule = typeof import('@ts/core/utils/m_shadow_dom');
type ShadowDomModule = typeof import('@ts/core/utils/shadow_dom');

const load = (): ShadowDomModule => {
jest.resetModules();

return jest.requireActual<ShadowDomModule>('@ts/core/utils/m_shadow_dom');
return jest.requireActual<ShadowDomModule>('@ts/core/utils/shadow_dom');
};

const getTexts = (sheet: FakeStyleSheet): string[] => (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
afterEach, describe, expect, it,
} from '@jest/globals';
import { sessionStorage } from '@ts/core/utils/m_storage';
import { sessionStorage } from '@ts/core/utils/storage';

describe('Storage utils', () => {
describe('sessionStorage', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import {
setHeight,
setStyle,
setWidth,
} from '@ts/core/utils/m_style';
} from '@ts/core/utils/style';

type StyleModule = typeof import('@ts/core/utils/m_style');
type StyleModule = typeof import('@ts/core/utils/style');

const createRealElement = document.createElement.bind(document) as (tagName: string) => HTMLElement;

Expand All @@ -23,7 +23,7 @@ const loadStyleModule = (supportedProps: Record<string, string>): StyleModule =>
)) as typeof document.createElement,
);

return jest.requireActual<StyleModule>('@ts/core/utils/m_style');
return jest.requireActual<StyleModule>('@ts/core/utils/style');
};

describe('Style utils', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
afterEach, describe, expect, it, jest,
} from '@jest/globals';
import $ from '@js/core/renderer';
import { getSvgElement, getSvgMarkup, HIDDEN_FOR_EXPORT } from '@ts/core/utils/m_svg';
import { getSvgElement, getSvgMarkup, HIDDEN_FOR_EXPORT } from '@ts/core/utils/svg';

const SVG_NS = 'http://www.w3.org/2000/svg';
const XLINK_NS = 'http://www.w3.org/1999/xlink';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import domAdapter from '@js/core/dom_adapter';
import { Callbacks } from '@ts/core/utils/m_callbacks';
import { Callbacks } from '@ts/core/utils/callbacks';
import windowUtils from '@ts/core/utils/m_window';

interface Size {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import domAdapter from '@js/core/dom_adapter';
import { callOnce } from '@ts/core/utils/call_once';

import type { CallbackInterface } from './m_callbacks';
import type { CallbackInterface } from './callbacks';
// eslint-disable-next-line import/no-named-as-default
import Callbacks from './m_callbacks';
import readyCallbacks from './m_ready_callbacks';
import Callbacks from './callbacks';
import windowModule from './m_window';
import readyCallbacks from './ready_callbacks';

interface Size {
width: number;
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/core/widget/widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import type {
PointerInteractionEvent,
} from '@js/events';
import type { WidgetOptions } from '@js/ui/widget/ui.widget';
import { focusable as focusableSelector } from '@ts/core/utils/m_selectors';
import { focusable as focusableSelector } from '@ts/core/utils/selectors';
import type { DOMComponentProperties } from '@ts/core/widget/dom_component';
import DOMComponent from '@ts/core/widget/dom_component';
import type { OptionChanged } from '@ts/core/widget/types';
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/data/errors.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import coreErrors from '@js/core/errors';
import errorUtils from '@js/core/utils/error';
import { isObject } from '@js/core/utils/type';
import type { DxError } from '@ts/core/utils/m_error';
import type { DxError } from '@ts/core/utils/error';

export const errors = errorUtils(coreErrors.ERROR_MESSAGES, {

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/draggable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import type { Properties } from '@js/ui/draggable';
import { domAdapter } from '@ts/core/dom_adapter';
import { splitPair } from '@ts/core/utils/m_common';
import { fromPromise } from '@ts/core/utils/m_deferred';
import type { Quad } from '@ts/core/utils/m_string';
import type { Quad } from '@ts/core/utils/string';
import type { DefaultActionArgs } from '@ts/core/widget/component';
import DOMComponent from '@ts/core/widget/dom_component';
import type { OptionChanged } from '@ts/core/widget/types';
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/events/core/emitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import $ from '@js/core/renderer';
import Callbacks from '@js/core/utils/callbacks';
import { extend } from '@js/core/utils/extend';
import type { DxEvent, PointerInteractionEvent } from '@js/events';
import type { CallbackInterface } from '@ts/core/utils/m_callbacks';
import type { CallbackInterface } from '@ts/core/utils/callbacks';

export interface EmitterEventPointer {
pageX: number;
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/events/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import eventsEngine from '@js/common/core/events/core/events_engine';
import $ from '@js/core/renderer';
import { extend } from '@js/core/utils/extend';
import { each } from '@js/core/utils/iterator';
import { focused } from '@ts/core/utils/m_selectors';
import { focused } from '@ts/core/utils/selectors';

import mappedAddNamespace from './add_namespace';
/* eslint-disable spellcheck/spell-checker */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
isDefined, isFunction, isPromise, isRenderer,
} from '@js/core/utils/type';
import { getWindow } from '@js/core/utils/window';
import svgUtils from '@ts/core/utils/m_svg';
import svgUtils from '@ts/core/utils/svg';

const window = getWindow();

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/exporter/svg_creator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { Deferred, when } from '@js/core/utils/deferred';
import { each } from '@js/core/utils/iterator';
import { isFunction } from '@js/core/utils/type';
import { getWindow } from '@js/core/utils/window';
import svgUtils from '@ts/core/utils/m_svg';
import svgUtils from '@ts/core/utils/svg';

const window = getWindow();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
} from '@jest/globals';
import type { Properties as DataGridProperties } from '@js/ui/data_grid';
import errors from '@js/ui/widget/ui.errors';
import { variableWrapper } from '@ts/core/utils/m_variable_wrapper';
import { variableWrapper } from '@ts/core/utils/variable_wrapper';
import type { Column } from '@ts/grids/grid_core/columns_controller/types';
import type { RawItemData } from '@ts/grids/grid_core/data_source_adapter/types';
import type { InternalGrid } from '@ts/grids/grid_core/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import config from '@js/core/config';
import type { Properties as DataGridProperties } from '@js/ui/data_grid';
import errors from '@js/ui/widget/ui.errors';
import { AIIntegration } from '@ts/core/ai_integration/core/ai_integration';
import { variableWrapper } from '@ts/core/utils/m_variable_wrapper';
import { variableWrapper } from '@ts/core/utils/variable_wrapper';
import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller';
import {
columnOptionCore,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Store from '@js/data/abstract_store';
import type { Grouping, GroupPanel } from '@js/ui/data_grid';
import filterUtils from '@js/ui/shared/filtering';
import errors from '@js/ui/widget/ui.errors';
import inflector from '@ts/core/utils/m_inflector';
import inflector from '@ts/core/utils/inflector';
import type { SortingInfo } from '@ts/data/utils';
import type {
BandColumnsCache,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { DxError } from '@ts/core/utils/m_error';
import type { DxError } from '@ts/core/utils/error';

export interface ExternalError {
message?: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { isObject } from '@js/core/utils/type';
import type { DxError } from '@ts/core/utils/m_error';
import type { DxError } from '@ts/core/utils/error';

import type { GridError } from './types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { DeferredObj } from '@js/core/utils/deferred';
import { Deferred, when } from '@js/core/utils/deferred';
import { isDefined } from '@js/core/utils/type';
import CheckBox from '@js/ui/check_box';
import inflector from '@ts/core/utils/m_inflector';
import inflector from '@ts/core/utils/inflector';
import {
getCaptionByOperation, getCurrentLookupValueText, getCurrentValueText,
getCustomOperation, getField, getGroupValue, isCondition, isGroup,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
import { isDeferred, isDefined, isEmptyObject } from '@js/core/utils/type';
import * as accessibility from '@js/ui/shared/accessibility';
import { isElementInDom } from '@ts/core/utils/m_dom';
import { focused } from '@ts/core/utils/m_selectors';
import { focused } from '@ts/core/utils/selectors';
import type { KeyboardKeyDownEvent } from '@ts/events/core/keyboard_processor';
import type { AdaptiveColumnsController } from '@ts/grids/grid_core/adaptivity/m_adaptivity';
import { CLASSES as COLUMNS_CONTROLLER_CLASSES } from '@ts/grids/grid_core/columns_controller/const';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { current, isFluent } from '@js/ui/themes';
import ValidationEngine from '@js/ui/validation_engine';
import Validator from '@js/ui/validator';
import errors from '@js/ui/widget/ui.errors';
import { focused } from '@ts/core/utils/m_selectors';
import { focused } from '@ts/core/utils/selectors';
import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/columns_controller';
import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory';
import type { ErrorHandlingViewController } from '@ts/grids/grid_core/error_handling/error_handling_view_controller';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
isString,
} from '@js/core/utils/type';
import Store from '@js/data/abstract_store';
import inflector from '@ts/core/utils/inflector';
import commonUtils from '@ts/core/utils/m_common';
import inflector from '@ts/core/utils/m_inflector';

import { LocalStore } from '../local_store/m_local_store';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/integration/jquery.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable import/first */
import errors from '@ts/core/utils/m_error';
import errors from '@ts/core/utils/error';
import { compare as compareVersions } from '@ts/core/utils/version';
// eslint-disable-next-line import/no-extraneous-dependencies
import jQuery from 'jquery';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import readyCallbacks from '@ts/core/utils/m_ready_callbacks';
import readyCallbacks from '@ts/core/utils/ready_callbacks';
import { themeReadyCallback } from '@ts/ui/m_themes_callback';
// eslint-disable-next-line import/no-extraneous-dependencies
import jQuery from 'jquery';
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/integration/knockout.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable import/first */
import errors from '@ts/core/utils/m_error';
import errors from '@ts/core/utils/error';
import { compare as compareVersion } from '@ts/core/utils/version';
// eslint-disable-next-line import/no-extraneous-dependencies
import ko from 'knockout';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import {
} from '@ts/core/component_registrator_callbacks';
import config from '@ts/core/config';
import { ComponentWrapper } from '@ts/core/r1/component_wrapper';
import Callbacks from '@ts/core/utils/callbacks';
import type { Lock } from '@ts/core/utils/locker';
import { Locker } from '@ts/core/utils/locker';
import Callbacks from '@ts/core/utils/m_callbacks';
import { isPlainObject } from '@ts/core/utils/m_type';
import Draggable from '@ts/draggable';
import Editor from '@ts/ui/editor/editor';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getImageContainer } from '@ts/core/utils/m_icon';
import { getImageContainer } from '@ts/core/utils/icon';
// eslint-disable-next-line import/no-extraneous-dependencies
import ko from 'knockout';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { variableWrapper } from '@ts/core/utils/m_variable_wrapper';
import { variableWrapper } from '@ts/core/utils/variable_wrapper';
// eslint-disable-next-line import/no-extraneous-dependencies
import ko from 'knockout';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { isDefined } from '@js/core/utils/type';
import type { Properties as DateBoxProperties } from '@js/ui/date_box';
import type { SimpleItem } from '@js/ui/form';

import { getImageContainer } from '../../core/utils/m_icon';
import { getImageContainer } from '../../core/utils/icon';
import { getRecurrenceString, parseRecurrenceRule } from '../recurrence/base';
import { daysFromByDayRule } from '../recurrence/days_from_by_day_rule';
import type { Rule } from '../recurrence/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { isFunction, isObject } from '@js/core/utils/type';
import messageLocalization from '@js/localization/message';
import type { DateNavigatorTextInfo, Properties } from '@js/ui/scheduler';
import type { BaseFormat } from '@ts/core/localization/date';
import { camelize } from '@ts/core/utils/m_inflector';
import { camelize } from '@ts/core/utils/inflector';
import type { IntervalOptions, Step } from '@ts/scheduler/header/types';
import type { NormalizedView, RawViewType, ViewType } from '@ts/scheduler/utils/options/types';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/scheduler/scheduler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import type {
import errors from '@js/ui/widget/ui.errors';
import type { Options } from '@ts/core/options/index';
import { dateUtilsTs } from '@ts/core/utils/date';
import { tabbable } from '@ts/core/utils/m_selectors';
import { tabbable } from '@ts/core/utils/selectors';
import type { OptionChanged } from '@ts/core/widget/types';
import { focus } from '@ts/events/short';
import type Scrollable from '@ts/ui/scroll_view/scrollable';
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/sortable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from '@js/core/utils/size';
import { getWindow } from '@js/core/utils/window';
import fx from '@ts/common/core/animation/fx';
import type { Quad } from '@ts/core/utils/m_string';
import type { Quad } from '@ts/core/utils/string';
import type { OptionChanged } from '@ts/core/widget/types';
import Draggable from '@ts/draggable';
import type { EngineEvent } from '@ts/events/core/events_engine';
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/js/__internal/ui/button/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type { EffectReturn } from '@ts/core/r1/utils/effect_return';
import { getTemplate } from '@ts/core/r1/utils/index';
import { Widget } from '@ts/core/r1/widget';
import { combineClasses } from '@ts/core/utils/combine_classes';
import { getImageAriaLabel } from '@ts/core/utils/m_icon';
import { getImageAriaLabel } from '@ts/core/utils/icon';
import { createRef as infernoCreateRef } from 'inferno';

import { Icon } from './icon';
Expand Down
Loading
Loading