diff --git a/packages/devextreme/js/__internal/core/component_registrator.ts b/packages/devextreme/js/__internal/core/component_registrator.ts index 36357d88e7c8..13bbb999a50d 100644 --- a/packages/devextreme/js/__internal/core/component_registrator.ts +++ b/packages/devextreme/js/__internal/core/component_registrator.ts @@ -11,28 +11,28 @@ interface ComponentInstance { type ComponentMember = (...args: unknown[]) => unknown; -interface ComponentClass { - getInstance: (element: Element) => ComponentInstance | undefined; - new (element: Element, options?: unknown): ComponentInstance; +interface ComponentClass { + getInstance: (element: Element) => TInstance | undefined; + new (element: Element, options?: unknown): TInstance; } -type ComponentNamespace = Record; +type ComponentNamespace = Record>; -function registerComponent(name: string, componentClass: ComponentClass): void; +function registerComponent(name: string, componentClass: ComponentClass): void; function registerComponent( name: string, namespace: ComponentNamespace, - componentClass: ComponentClass, + componentClass: ComponentClass, ): void; function registerComponent( name: string, - namespace: ComponentNamespace | ComponentClass, - componentClass?: ComponentClass, + namespace: ComponentNamespace | ComponentClass, + componentClass?: ComponentClass, ): void { let registeredClass = componentClass; if (!registeredClass) { - registeredClass = namespace as ComponentClass; + registeredClass = namespace as ComponentClass; } else { (namespace as ComponentNamespace)[name] = registeredClass; } diff --git a/packages/devextreme/js/__internal/core/format_helper.ts b/packages/devextreme/js/__internal/core/format_helper.ts index a9a3dd4fc509..51c6e611db40 100644 --- a/packages/devextreme/js/__internal/core/format_helper.ts +++ b/packages/devextreme/js/__internal/core/format_helper.ts @@ -17,7 +17,7 @@ import { injector as dependencyInjector } from '@ts/core/utils/dependency_inject import { getGlobalFormatByDataType } from './global_format_config'; export default dependencyInjector({ - format(value, format) { + format(value, format?) { const formatIsValid = (isString(format) && format !== '') || isPlainObject(format) || isFunction(format); const valueIsValid = isNumeric(value) || (isDate(value) && !isNaN(value.getTime())); @@ -30,7 +30,6 @@ export default dependencyInjector({ if (!formatIsValid && isNumeric(value)) { const globalNumberFormat = getGlobalFormatByDataType('number'); if (globalNumberFormat) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return return numberLocalization.format(value, globalNumberFormat); } } @@ -47,7 +46,6 @@ export default dependencyInjector({ const resolvedFormat = isString(format) ? { type: format } : format; if (isNumeric(value)) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return return numberLocalization.format(value, resolvedFormat); } @@ -77,7 +75,7 @@ export default dependencyInjector({ }; }, - getDateFormatByDifferences(dateDifferences, intervalFormat) { + getDateFormatByDifferences(dateDifferences, intervalFormat?) { const resultFormat: Format[] = []; const needSpecialSecondFormatter = intervalFormat && dateDifferences.millisecond && !(dateDifferences.year || dateDifferences.month || dateDifferences.day); diff --git a/packages/devextreme/js/__internal/core/localization/message.ts b/packages/devextreme/js/__internal/core/localization/message.ts index 81ec9aecf53d..bd0cc961685e 100644 --- a/packages/devextreme/js/__internal/core/localization/message.ts +++ b/packages/devextreme/js/__internal/core/localization/message.ts @@ -5,7 +5,7 @@ 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'; -export type MessageFormatter = () => string; +export type MessageFormatter = (...values: unknown[]) => string; export type MessageDictionary = Record>; const baseDictionary: MessageDictionary = extend(true, {}, defaultMessages); @@ -109,7 +109,6 @@ const messageLocalization = dependencyInjector({ // eslint-disable-next-line prefer-rest-params const values = Array.prototype.slice.call(arguments, 1); - // @ts-expect-error return formatter?.apply(this, values) || ''; }, }); diff --git a/packages/devextreme/js/__internal/core/utils/m_common.ts b/packages/devextreme/js/__internal/core/utils/m_common.ts index 9c8ef1d5485f..b2b248cf367f 100644 --- a/packages/devextreme/js/__internal/core/utils/m_common.ts +++ b/packages/devextreme/js/__internal/core/utils/m_common.ts @@ -258,7 +258,7 @@ export const noop = function () {}; // @ts-expect-error only void function can be called with new export const asyncNoop = function () { return new Deferred().resolve().promise(); }; -export const grep = function (elements, checkFunction, invert) { +export const grep = function (elements, checkFunction, invert?) { const result: any[] = []; let check; const expectedCheck = !invert; diff --git a/packages/devextreme/js/__internal/core/utils/m_deferred.ts b/packages/devextreme/js/__internal/core/utils/m_deferred.ts index ca4bcb249a84..947c05798e9c 100644 --- a/packages/devextreme/js/__internal/core/utils/m_deferred.ts +++ b/packages/devextreme/js/__internal/core/utils/m_deferred.ts @@ -1,4 +1,5 @@ import Callbacks from '@js/core/utils/callbacks'; +import type { DeferredObj as DeferredInstance } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDeferred, isDefined, isPromise } from '@js/core/utils/type'; @@ -169,10 +170,12 @@ export function setStrategy(value) { whenFunc = value.when; } +export function Deferred(): DeferredInstance; export function Deferred() { return new DeferredObj(); } +export function when(...values: (DeferredInstance | T)[]): DeferredInstance; export function when() { // @ts-expect-error return whenFunc.apply(this, arguments); diff --git a/packages/devextreme/js/__internal/ui/themes.ts b/packages/devextreme/js/__internal/ui/themes.ts index 537b6e7f29a9..675f5a025202 100644 --- a/packages/devextreme/js/__internal/ui/themes.ts +++ b/packages/devextreme/js/__internal/ui/themes.ts @@ -222,7 +222,6 @@ function initContext(newContext): void { } function getCssClasses(themeName?: string): string[] { - // @ts-expect-error ts-error // eslint-disable-next-line @stylistic/max-len // eslint-disable-next-line no-param-reassign,@typescript-eslint/no-use-before-define, @typescript-eslint/prefer-nullish-coalescing themeName = themeName || current(); @@ -287,7 +286,7 @@ export function detachCssClasses(element: dxElementWrapper): void { // eslint-disable-next-line @stylistic/max-len // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types,@typescript-eslint/explicit-function-return-type,consistent-return -export function current(options) { +export function current(options?) { if (!arguments.length) { currentThemeName = currentThemeName || readThemeMarker(); // eslint-disable-next-line @typescript-eslint/no-unsafe-return diff --git a/packages/devextreme/js/__internal/viz/axes/base_axis.ts b/packages/devextreme/js/__internal/viz/axes/base_axis.ts index da9790ef54e5..a271e4abe74b 100644 --- a/packages/devextreme/js/__internal/viz/axes/base_axis.ts +++ b/packages/devextreme/js/__internal/viz/axes/base_axis.ts @@ -23,16 +23,15 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; -import dateUtils from '@js/core/utils/date'; -import { Deferred, when } from '@js/core/utils/deferred'; -import { extend } from '@js/core/utils/extend'; -import { adjust } from '@js/core/utils/math'; +import formatHelper from '@ts/core/format_helper'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { Deferred, when } from '@ts/core/utils/m_deferred'; +import { extend } from '@ts/core/utils/m_extend'; +import { adjust, multiplyInExponentialForm } from '@ts/core/utils/m_math'; import { isDate, isDefined, isFunction, isPlainObject, type, -} from '@js/core/utils/type'; -import formatHelper from '@js/format_helper'; -import { multiplyInExponentialForm } from '@ts/core/utils/m_math'; +} from '@ts/core/utils/m_type'; import constants from '@ts/viz/axes/axes_constants'; import { calculateCanvasMargins, measureLabels } from '@ts/viz/axes/axes_utils'; import createConstantLine from '@ts/viz/axes/constant_line'; @@ -1965,7 +1964,6 @@ export let Axis = class Axis { const ticks = this._getTicks(range, incidentOccurred, false); if (!range.isEmpty() && options.type === constants.discrete && options.dataType === 'datetime' && !this._hasLabelFormat && ticks.ticks.length) { - // @ts-expect-error getDateFormatByTicks is not in the FormatHelper typings options.label.format = formatHelper.getDateFormatByTicks(ticks.ticks); } diff --git a/packages/devextreme/js/__internal/viz/axes/constant_line.ts b/packages/devextreme/js/__internal/viz/axes/constant_line.ts index fa4c9b89d2f9..1144ff507d77 100644 --- a/packages/devextreme/js/__internal/viz/axes/constant_line.ts +++ b/packages/devextreme/js/__internal/viz/axes/constant_line.ts @@ -7,7 +7,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { isDefined } from '@js/core/utils/type'; +import { isDefined } from '@ts/core/utils/m_type'; export default function createConstantLine(axis, options) { const labelOptions = options.label || {}; diff --git a/packages/devextreme/js/__internal/viz/axes/datetime_breaks.ts b/packages/devextreme/js/__internal/viz/axes/datetime_breaks.ts index e8a7f7863a49..39fd7e744f4c 100644 --- a/packages/devextreme/js/__internal/viz/axes/datetime_breaks.ts +++ b/packages/devextreme/js/__internal/viz/axes/datetime_breaks.ts @@ -8,7 +8,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import dateUtils from '@js/core/utils/date'; +import { dateUtils } from '@ts/core/utils/m_date'; const days = [0, 1, 2, 3, 4, 5, 6]; diff --git a/packages/devextreme/js/__internal/viz/axes/polar_axes.ts b/packages/devextreme/js/__internal/viz/axes/polar_axes.ts index e5f172f6fcb4..4e7fadd8002c 100644 --- a/packages/devextreme/js/__internal/viz/axes/polar_axes.ts +++ b/packages/devextreme/js/__internal/viz/axes/polar_axes.ts @@ -18,9 +18,9 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; import constants from '@ts/viz/axes/axes_constants'; import { calculateCanvasMargins, measureLabels } from '@ts/viz/axes/axes_utils'; import { tick } from '@ts/viz/axes/tick'; diff --git a/packages/devextreme/js/__internal/viz/axes/smart_formatter.ts b/packages/devextreme/js/__internal/viz/axes/smart_formatter.ts index 48cc3c588ea5..7a3e72e62800 100644 --- a/packages/devextreme/js/__internal/viz/axes/smart_formatter.ts +++ b/packages/devextreme/js/__internal/viz/axes/smart_formatter.ts @@ -15,13 +15,13 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import dateUtils from '@js/core/utils/date'; -import { adjust, getExponent, getPrecision } from '@js/core/utils/math'; +import formatHelper from '@ts/core/format_helper'; +import { getGlobalFormatByDataType } from '@ts/core/global_format_config'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { adjust, getExponent, getPrecision } from '@ts/core/utils/m_math'; import { isDefined, isExponential, isFunction, isObject, -} from '@js/core/utils/type'; -import formatHelper from '@js/format_helper'; -import { getGlobalFormatByDataType } from '@ts/core/global_format_config'; +} from '@ts/core/utils/m_type'; import { getAdjustedLog10 as log10 } from '@ts/viz/core/utils'; const _format = formatHelper.format; @@ -165,7 +165,6 @@ function getDateTimeFormat(tick, { showTransition, ticks, tickInterval }) { if (showTransition && ticks.length) { const indexOfTick = ticks.map(Number).indexOf(+tick); if (ticks.length === 1 && indexOfTick === 0) { - // @ts-expect-error typeFormat = formatHelper.getDateFormatByTicks(ticks); } else { if (indexOfTick === -1) { @@ -175,7 +174,6 @@ function getDateTimeFormat(tick, { showTransition, ticks, tickInterval }) { nextDateIndex = indexOfTick === 0 ? 1 : -1; } const datesDifferences = getDatesDifferences(ticks[prevDateIndex], tick, ticks[nextDateIndex], typeFormat); - // @ts-expect-error typeFormat = formatHelper.getDateFormatByDifferences(datesDifferences, typeFormat); } } @@ -227,7 +225,6 @@ function getHighDiffFormat(diff) { diff[i] = true; } } - // @ts-expect-error return createFormat(formatHelper.getDateFormatByDifferences(diff)); } @@ -242,14 +239,12 @@ function getHighAndSelfDiffFormat(diff, interval) { diff[i] = true; } } - // @ts-expect-error return createFormat(formatHelper.getDateFormatByDifferences(diff)); } function formatDateRange(startValue, endValue, tickInterval) { const diff = getDatesDifferences(startValue, endValue); const typeFormat = dateUtils.getDateFormatByTickInterval(tickInterval); - // @ts-expect-error const diffFormatType = formatHelper.getDateFormatByDifferences(diff, typeFormat); const diffFormat = createFormat(diffFormatType); const values = []; diff --git a/packages/devextreme/js/__internal/viz/axes/strip.ts b/packages/devextreme/js/__internal/viz/axes/strip.ts index 8091fbde5099..4933295a663b 100644 --- a/packages/devextreme/js/__internal/viz/axes/strip.ts +++ b/packages/devextreme/js/__internal/viz/axes/strip.ts @@ -6,8 +6,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; import { patchFontOptions } from '@ts/viz/core/utils'; export default function createStrip(axis, options) { diff --git a/packages/devextreme/js/__internal/viz/axes/tick.ts b/packages/devextreme/js/__internal/viz/axes/tick.ts index 3be185b5d044..b3a31bd01076 100644 --- a/packages/devextreme/js/__internal/viz/axes/tick.ts +++ b/packages/devextreme/js/__internal/viz/axes/tick.ts @@ -9,9 +9,9 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { Deferred, when } from '@js/core/utils/deferred'; -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; +import { Deferred, when } from '@ts/core/utils/m_deferred'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; function getPathStyle(options) { return { diff --git a/packages/devextreme/js/__internal/viz/axes/tick_generator.ts b/packages/devextreme/js/__internal/viz/axes/tick_generator.ts index 7cba1e2fee6f..023ee58d85da 100644 --- a/packages/devextreme/js/__internal/viz/axes/tick_generator.ts +++ b/packages/devextreme/js/__internal/viz/axes/tick_generator.ts @@ -16,10 +16,10 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import dateUtils from '@js/core/utils/date'; -import { extend } from '@js/core/utils/extend'; -import { adjust, sign } from '@js/core/utils/math'; -import { isDefined, isString } from '@js/core/utils/type'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { extend } from '@ts/core/utils/m_extend'; +import { adjust, sign } from '@ts/core/utils/m_math'; +import { isDefined, isString } from '@ts/core/utils/m_type'; import { getCategoriesInfo, getLog as mathLog, diff --git a/packages/devextreme/js/__internal/viz/axes/xy_axes.ts b/packages/devextreme/js/__internal/viz/axes/xy_axes.ts index 1f812148dffc..a40e9ed86b9f 100644 --- a/packages/devextreme/js/__internal/viz/axes/xy_axes.ts +++ b/packages/devextreme/js/__internal/viz/axes/xy_axes.ts @@ -24,11 +24,11 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop } from '@js/core/utils/common'; -import dateUtils from '@js/core/utils/date'; -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; -import formatHelper from '@js/format_helper'; +import formatHelper from '@ts/core/format_helper'; +import { noop } from '@ts/core/utils/m_common'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; import constants from '@ts/viz/axes/axes_constants'; import { generateDateBreaks } from '@ts/viz/axes/datetime_breaks'; import { getCosAndSin, getLog, patchFontOptions } from '@ts/viz/core/utils'; @@ -137,7 +137,6 @@ function getMarkerFormat(curDate, prevDate, tickInterval, markerInterval) { const datesDifferences = prevDate && dateUtils.getDatesDifferences(prevDate, curDate); if (prevDate && tickInterval !== 'year') { prepareDatesDifferences(datesDifferences, tickInterval); - // @ts-expect-error format = formatHelper.getDateFormatByDifferences(datesDifferences); } return format; diff --git a/packages/devextreme/js/__internal/viz/chart.ts b/packages/devextreme/js/__internal/viz/chart.ts index 8a59839b2ed9..e6a6a9b9cf82 100644 --- a/packages/devextreme/js/__internal/viz/chart.ts +++ b/packages/devextreme/js/__internal/viz/chart.ts @@ -8,7 +8,6 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/prefer-for-of */ -/* eslint-disable @typescript-eslint/prefer-for-of */ /* eslint-disable consistent-return */ /* eslint-disable max-depth */ /* eslint-disable no-bitwise */ @@ -17,14 +16,14 @@ /* eslint-disable no-param-reassign */ /* eslint-disable no-plusplus */ -import registerComponent from '@js/core/component_registrator'; -import { noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; -import { each as _each } from '@js/core/utils/iterator'; -import { getPrecision } from '@js/core/utils/math'; -import { getHeight } from '@js/core/utils/size'; -import { isDefined as _isDefined, type } from '@js/core/utils/type'; -import { hasWindow } from '@js/core/utils/window'; +import { registerComponent } from '@ts/core/component_registrator'; +import { noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { each as _each } from '@ts/core/utils/m_iterator'; +import { getPrecision } from '@ts/core/utils/m_math'; +import { getHeight } from '@ts/core/utils/m_size'; +import { isDefined as _isDefined, type } from '@ts/core/utils/m_type'; +import { hasWindow } from '@ts/core/utils/m_window'; import { Crosshair, getMargins } from '@ts/viz/chart_components/crosshair'; import { LayoutManager } from '@ts/viz/chart_components/layout_manager'; import multiAxesSynchronizer from '@ts/viz/chart_components/multi_axes_synchronizer'; diff --git a/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts index b4d8eff47099..b785b8e95b8c 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/advanced_chart.ts @@ -11,15 +11,11 @@ /* eslint-disable no-multi-assign */ /* eslint-disable no-nested-ternary */ /* eslint-disable no-param-reassign */ -/* eslint-disable prefer-rest-params */ -/* eslint-disable prefer-spread */ - -import { noop as _noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; -import { reverseEach as _reverseEach } from '@js/core/utils/iterator'; -import { isDefined as _isDefined, type } from '@js/core/utils/type'; -// @ts-expect-error -import { areCanvasesDifferent, floorCanvasDimensions } from '@js/viz/utils'; + +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { reverseEach as _reverseEach } from '@ts/core/utils/m_iterator'; +import { isDefined as _isDefined, type } from '@ts/core/utils/m_type'; import { Axis } from '@ts/viz/axes/base_axis'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; @@ -30,6 +26,7 @@ import { } from '@ts/viz/core/utils'; import rangeDataCalculator from '@ts/viz/series/helpers/range_data_calculator'; import { Range } from '@ts/viz/translators/range'; +import { areCanvasesDifferent, floorCanvasDimensions } from '@ts/viz/utils'; import { BaseChart } from './base_chart'; diff --git a/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts index 1ba9d316429e..3eaa1d12baaf 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/base_chart.ts @@ -17,17 +17,15 @@ /* eslint-disable no-nested-ternary */ /* eslint-disable no-param-reassign */ /* eslint-disable no-plusplus */ -/* eslint-disable prefer-rest-params */ /* eslint-disable prefer-spread */ -import eventsEngine from '@js/common/core/events/core/events_engine'; -import { isPointerEvent, isTouchEvent } from '@js/common/core/events/utils/index'; -// @ts-expect-error -import { grep, noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { reverseEach as _reverseEach } from '@js/core/utils/iterator'; -import { isDefined as _isDefined, isFunction } from '@js/core/utils/type'; import trackerModule from '@js/viz/chart_components/tracker'; +import { grep, noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { reverseEach as _reverseEach } from '@ts/core/utils/m_iterator'; +import { isDefined as _isDefined, isFunction } from '@ts/core/utils/m_type'; +import eventsEngine from '@ts/events/core/events_engine'; +import { isPointerEvent, isTouchEvent } from '@ts/events/utils/index'; import { LayoutManager } from '@ts/viz/chart_components/layout_manager'; import { ThemeManager } from '@ts/viz/components/chart_theme_manager'; import { validateData } from '@ts/viz/components/data_validator'; diff --git a/packages/devextreme/js/__internal/viz/chart_components/crosshair.ts b/packages/devextreme/js/__internal/viz/chart_components/crosshair.ts index 4a81f091c649..cd302d142261 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/crosshair.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/crosshair.ts @@ -6,7 +6,7 @@ /* eslint-disable @stylistic/max-len */ /* eslint-disable prefer-destructuring */ -import { extend } from '@js/core/utils/extend'; +import { extend } from '@ts/core/utils/m_extend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { BBox, Bounds, Canvas, Coords, diff --git a/packages/devextreme/js/__internal/viz/chart_components/layout_manager.ts b/packages/devextreme/js/__internal/viz/chart_components/layout_manager.ts index c9490eb48433..7b3412c9b8e7 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/layout_manager.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/layout_manager.ts @@ -12,7 +12,7 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { isNumeric as _isNumber } from '@js/core/utils/type'; +import { isNumeric as _isNumber } from '@ts/core/utils/m_type'; import consts from '@ts/viz/components/consts'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { WrapperLayoutElement } from '@ts/viz/core/layout_element'; diff --git a/packages/devextreme/js/__internal/viz/chart_components/multi_axes_synchronizer.ts b/packages/devextreme/js/__internal/viz/chart_components/multi_axes_synchronizer.ts index d76b76f74de4..74c4276b3bf1 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/multi_axes_synchronizer.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/multi_axes_synchronizer.ts @@ -12,10 +12,10 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { debug } from '@js/core/utils/console'; -import { each } from '@js/core/utils/iterator'; -import { adjust } from '@js/core/utils/math'; -import { isDefined, isNumeric } from '@js/core/utils/type'; +import { debug } from '@ts/core/utils/m_console'; +import { each } from '@ts/core/utils/m_iterator'; +import { adjust } from '@ts/core/utils/m_math'; +import { isDefined, isNumeric } from '@ts/core/utils/m_type'; import { getLogExt, raiseToExt } from '@ts/viz/core/utils'; const _math = Math; diff --git a/packages/devextreme/js/__internal/viz/chart_components/scroll_bar.ts b/packages/devextreme/js/__internal/viz/chart_components/scroll_bar.ts index 8f1be41452ff..95c1fc2aeeb9 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/scroll_bar.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/scroll_bar.ts @@ -5,12 +5,13 @@ /* eslint-disable no-multi-assign */ /* eslint-disable prefer-destructuring */ -import eventsEngine from '@js/common/core/events/core/events_engine'; -import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/common/core/events/drag'; -import { fireEvent } from '@js/common/core/events/utils/index'; -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; +import type { EngineEvent } from '@ts/events/core/events_engine'; +import eventsEngine from '@ts/events/core/events_engine'; +import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@ts/events/drag'; +import { fireEvent } from '@ts/events/utils/index'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { Bounds, Canvas } from '@ts/viz/core/types'; @@ -29,7 +30,7 @@ interface ScrollBarLayoutOptions { position: ScrollBarPosition; } -interface ScrollBarPointerEvent { +interface ScrollBarPointerEvent extends EngineEvent { offset: { x: number; y: number }; } @@ -127,14 +128,14 @@ export let ScrollBar = class ScrollBar { }); }); - eventsEngine.on(scrollElement, dragEventMove, (e) => { + eventsEngine.on(scrollElement, dragEventMove, (e: ScrollBarPointerEvent) => { const position = this._getDragPosition(e); this._applyPosition(position, position + this._thumbLength); fireEvent(this._getDragEvent('dxc-scroll-move', e, scrollElement, position)); }); - eventsEngine.on(scrollElement, dragEventEnd, (e) => { + eventsEngine.on(scrollElement, dragEventEnd, (e: ScrollBarPointerEvent) => { fireEvent(this._getDragEvent('dxc-scroll-end', e, scrollElement, this._getDragPosition(e))); }); } diff --git a/packages/devextreme/js/__internal/viz/chart_components/shutter_zoom.ts b/packages/devextreme/js/__internal/viz/chart_components/shutter_zoom.ts index e6498119fc6e..db760b4129ab 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/shutter_zoom.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/shutter_zoom.ts @@ -10,7 +10,7 @@ import { end as dragEventEnd, move as dragEventMove, start as dragEventStart, -} from '@js/common/core/events/drag'; +} from '@ts/events/drag'; const SHUTTER_EVENTS_NS = '.shutter-zoom'; const DRAG_START_EVENT_NAME = dragEventStart + SHUTTER_EVENTS_NS; diff --git a/packages/devextreme/js/__internal/viz/chart_components/tracker.ts b/packages/devextreme/js/__internal/viz/chart_components/tracker.ts index ec22dd513309..5373b262eac0 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/tracker.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/tracker.ts @@ -1,5 +1,4 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -/* eslint-disable prefer-rest-params */ /* eslint-disable no-return-assign */ /* eslint-disable @stylistic/no-mixed-operators */ /* eslint-disable @typescript-eslint/prefer-for-of */ @@ -23,15 +22,15 @@ /* eslint-disable @typescript-eslint/prefer-optional-chain */ /* eslint-disable max-classes-per-file */ -import { name as clickEventName } from '@js/common/core/events/click'; -import eventsEngine from '@js/common/core/events/core/events_engine'; -import pointerEvents from '@js/common/core/events/pointer'; -import { addNamespace } from '@js/common/core/events/utils/index'; -import domAdapter from '@js/core/dom_adapter'; -import { noop as _noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { each as _each } from '@js/core/utils/iterator'; -import { isDefined } from '@js/core/utils/type'; +import { domAdapter } from '@ts/core/dom_adapter'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { each as _each } from '@ts/core/utils/m_iterator'; +import { isDefined } from '@ts/core/utils/m_type'; +import { name as clickEventName } from '@ts/events/click'; +import eventsEngine from '@ts/events/core/events_engine'; +import pointerEvents from '@ts/events/pointer'; +import { addNamespace } from '@ts/events/utils/index'; import consts from '@ts/viz/components/consts'; import { getDistance, normalizeEnum as _normalizeEnum, pointInCanvas as inCanvas } from '../core/utils'; diff --git a/packages/devextreme/js/__internal/viz/chart_components/zoom_and_pan.ts b/packages/devextreme/js/__internal/viz/chart_components/zoom_and_pan.ts index 95e0b7dd615d..1643cbba5ed0 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/zoom_and_pan.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/zoom_and_pan.ts @@ -12,15 +12,15 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { name as wheelEvent } from '@js/common/core/events/core/wheel'; +import * as transformEvents from '@js/common/core/events/transform'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; +import { name as wheelEvent } from '@ts/events/core/wheel'; import { end as dragEventEnd, move as dragEventMove, start as dragEventStart, -} from '@js/common/core/events/drag'; -import * as transformEvents from '@js/common/core/events/transform'; -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; +} from '@ts/events/drag'; import { getVizRangeObject, normalizeEnum } from '@ts/viz/core/utils'; const EVENTS_NS = '.zoomAndPanNS'; diff --git a/packages/devextreme/js/__internal/viz/components/chart_theme_manager.ts b/packages/devextreme/js/__internal/viz/components/chart_theme_manager.ts index 0fca7c1c23c2..7562d1f39e1e 100644 --- a/packages/devextreme/js/__internal/viz/components/chart_theme_manager.ts +++ b/packages/devextreme/js/__internal/viz/components/chart_theme_manager.ts @@ -1,11 +1,11 @@ -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; import { isDefined, isNumeric, isPlainObject, isString, -} from '@js/core/utils/type'; +} from '@ts/core/utils/m_type'; import type { BaseThemeManagerOptions, Palette, ThemeValue } from '@ts/viz/core/base_theme_manager'; import { BaseThemeManager } from '@ts/viz/core/base_theme_manager'; import { extractColor, normalizeEnum } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/components/data_validator.ts b/packages/devextreme/js/__internal/viz/components/data_validator.ts index df90aae1b489..2546ca21c1bf 100644 --- a/packages/devextreme/js/__internal/viz/components/data_validator.ts +++ b/packages/devextreme/js/__internal/viz/components/data_validator.ts @@ -19,7 +19,7 @@ /* eslint-disable no-restricted-syntax */ /* eslint-disable prefer-destructuring */ -import { extend } from '@js/core/utils/extend'; +import { extend } from '@ts/core/utils/m_extend'; import { isDate as _isDate, isDefined as _isDefined, @@ -27,7 +27,7 @@ import { isNumeric as _isNumber, isObject as _isObject, isString as _isString, -} from '@js/core/utils/type'; +} from '@ts/core/utils/m_type'; import { getParser as _getParser } from '@ts/viz/components/parse_utils'; import { enumParser } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/components/legend.ts b/packages/devextreme/js/__internal/viz/components/legend.ts index 283dcfcf356f..f83b5c10ce84 100644 --- a/packages/devextreme/js/__internal/viz/components/legend.ts +++ b/packages/devextreme/js/__internal/viz/components/legend.ts @@ -22,13 +22,14 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop } from '@js/core/utils/common'; +import type { DeferredObj } from '@js/core/utils/deferred'; +import { noop } from '@ts/core/utils/m_common'; /// #DEBUG -import { debug } from '@js/core/utils/console'; +import { debug } from '@ts/core/utils/m_console'; /// #ENDDEBUG -import { Deferred, type DeferredObj } from '@js/core/utils/deferred'; -import { extend } from '@js/core/utils/extend'; -import { isDefined, isFunction } from '@js/core/utils/type'; +import { Deferred } from '@ts/core/utils/m_deferred'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined, isFunction } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { LayoutTargetOptions } from '@ts/viz/core/layout'; import type { AlignedLayoutRect, LayoutAlignment } from '@ts/viz/core/layout_element'; diff --git a/packages/devextreme/js/__internal/viz/components/parse_utils.ts b/packages/devextreme/js/__internal/viz/components/parse_utils.ts index f0e4407ae45e..445a87e6c635 100644 --- a/packages/devextreme/js/__internal/viz/components/parse_utils.ts +++ b/packages/devextreme/js/__internal/viz/components/parse_utils.ts @@ -4,9 +4,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { noop } from '@js/core/utils/common'; -import dateSerialization from '@js/core/utils/date_serialization'; -import { isDefined } from '@js/core/utils/type'; +import { noop } from '@ts/core/utils/m_common'; +import { dateSerialization } from '@ts/core/utils/m_date_serialization'; +import { isDefined } from '@ts/core/utils/m_type'; const parsers = { string(val) { diff --git a/packages/devextreme/js/__internal/viz/components/tracker.ts b/packages/devextreme/js/__internal/viz/components/tracker.ts index fb5eab412b54..2e44786f0adc 100644 --- a/packages/devextreme/js/__internal/viz/components/tracker.ts +++ b/packages/devextreme/js/__internal/viz/components/tracker.ts @@ -4,11 +4,11 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { name as clickEventName } from '@js/common/core/events/click'; -import eventsEngine from '@js/common/core/events/core/events_engine'; -import pointer from '@js/common/core/events/pointer'; -import { eventData as _eventData } from '@js/common/core/events/utils/index'; -import domAdapter from '@js/core/dom_adapter'; +import { domAdapter } from '@ts/core/dom_adapter'; +import { name as clickEventName } from '@ts/events/click'; +import eventsEngine from '@ts/events/core/events_engine'; +import pointer from '@ts/events/pointer'; +import { eventData as _eventData } from '@ts/events/utils/index'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; const downPointerEventName = pointer.down; diff --git a/packages/devextreme/js/__internal/viz/core/annotations.ts b/packages/devextreme/js/__internal/viz/core/annotations.ts index e873b0513f6c..7f524c824115 100644 --- a/packages/devextreme/js/__internal/viz/core/annotations.ts +++ b/packages/devextreme/js/__internal/viz/core/annotations.ts @@ -14,13 +14,14 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import eventsEngine from '@js/common/core/events/core/events_engine'; -import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/common/core/events/drag'; -import pointerEvents from '@js/common/core/events/pointer'; -import { addNamespace } from '@js/common/core/events/utils/index'; -import domAdapter from '@js/core/dom_adapter'; -import { extend } from '@js/core/utils/extend'; -import { isDefined, isFunction } from '@js/core/utils/type'; +import { domAdapter } from '@ts/core/dom_adapter'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined, isFunction } from '@ts/core/utils/m_type'; +import type { EngineEvent } from '@ts/events/core/events_engine'; +import eventsEngine from '@ts/events/core/events_engine'; +import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@ts/events/drag'; +import pointerEvents from '@ts/events/pointer'; +import { addNamespace } from '@ts/events/utils/index'; import { Plaque } from './plaque'; import { Tooltip } from './tooltip'; @@ -37,6 +38,11 @@ const DRAG_START_EVENT_NAME = dragEventStart + DOT_EVENT_NS; const DRAG_EVENT_NAME = dragEventMove + DOT_EVENT_NS; const DRAG_END_EVENT_NAME = dragEventEnd + DOT_EVENT_NS; +interface PointerEventData extends EngineEvent { + pageX: number; + pageY: number; +} + function coreAnnotation(options, contentTemplate) { return { draw(widget, group) { @@ -500,7 +506,7 @@ const corePlugin = { .css(this._getAnnotationStyles()) .linkOn(this._renderer.root, 'annotations') .linkAppend(); - eventsEngine.on(getDocument(), POINTER_ACTION, (e) => { + eventsEngine.on(getDocument(), POINTER_ACTION, (e: PointerEventData) => { if (this._disposed) { return; } diff --git a/packages/devextreme/js/__internal/viz/core/base_theme_manager.ts b/packages/devextreme/js/__internal/viz/core/base_theme_manager.ts index 3f4bb6d4a614..bf4b65c78bbf 100644 --- a/packages/devextreme/js/__internal/viz/core/base_theme_manager.ts +++ b/packages/devextreme/js/__internal/viz/core/base_theme_manager.ts @@ -1,7 +1,7 @@ import type { Font } from '@js/common/charts'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { isString } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { isString } from '@ts/core/utils/m_type'; import { parseScalar } from '@ts/viz/core/utils'; import { createPalette as getPalette, diff --git a/packages/devextreme/js/__internal/viz/core/base_widget.ts b/packages/devextreme/js/__internal/viz/core/base_widget.ts index 44b52fc005f5..3e6230d3a1c1 100644 --- a/packages/devextreme/js/__internal/viz/core/base_widget.ts +++ b/packages/devextreme/js/__internal/viz/core/base_widget.ts @@ -12,23 +12,21 @@ /* eslint-disable no-plusplus */ /* eslint-disable prefer-spread */ -import eventsEngine from '@js/common/core/events/core/events_engine'; -import devices from '@js/core/devices'; -import $ from '@js/core/renderer'; -import { noop } from '@js/core/utils/common'; -import { when } from '@js/core/utils/deferred'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { getHeight, getWidth } from '@js/core/utils/size'; -import { - isDefined, isNumeric, isObject as _isObject, type, -} from '@js/core/utils/type'; -import { getWindow, hasWindow } from '@js/core/utils/window'; -// @ts-expect-error -import { areCanvasesDifferent, floorCanvasDimensions } from '@js/viz/utils'; import graphicObject from '@ts/common/charts'; +import devices from '@ts/core/devices'; import { domAdapter } from '@ts/core/dom_adapter'; +import { renderer as $ } from '@ts/core/renderer'; +import { noop } from '@ts/core/utils/m_common'; +import { when } from '@ts/core/utils/m_deferred'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { getHeight, getWidth } from '@ts/core/utils/m_size'; +import { + isDefined, isNumeric, isObject as _isObject, type, +} from '@ts/core/utils/m_type'; +import { getWindow, hasWindow } from '@ts/core/utils/m_window'; import DOMComponent from '@ts/core/widget/dom_component'; +import eventsEngine from '@ts/events/core/events_engine'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { BaseThemeManager } from '@ts/viz/core/base_theme_manager'; import { @@ -41,6 +39,7 @@ import _Layout from '@ts/viz/core/layout'; import { Renderer } from '@ts/viz/core/renderers/renderer'; import type { Canvas } from '@ts/viz/core/types'; import { parseScalar as _parseScalar } from '@ts/viz/core/utils'; +import { areCanvasesDifferent, floorCanvasDimensions } from '@ts/viz/utils'; const { log } = warnings; @@ -507,7 +506,7 @@ class BaseWidget extends DOMComponent { const scrollEvents = 'scroll.viz_widgets'; if (devices.real().platform === 'generic') { - $parents = $parents.add(getWindow() as any); + $parents = $parents.add(getWindow()); } this._proxiedTargetParentsScrollHandler = this._proxiedTargetParentsScrollHandler diff --git a/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts b/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts index 7bb254437e5e..8bcfbb4c8168 100644 --- a/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts +++ b/packages/devextreme/js/__internal/viz/core/base_widget.utils.ts @@ -13,11 +13,11 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import resizeObserverSingleton from '@js/core/resize_observer'; -import { each } from '@js/core/utils/iterator'; -import _windowResizeCallbacks from '@js/core/utils/resize_callbacks'; -import { format as _stringFormat } from '@js/core/utils/string'; import { version } from '@js/core/version'; +import { resizeObserverSingleton } from '@ts/core/resize_observer'; +import { each } from '@ts/core/utils/m_iterator'; +import { resizeCallbacks as _windowResizeCallbacks } from '@ts/core/utils/m_resize_callbacks'; +import { format as _stringFormat } from '@ts/core/utils/m_string'; import warnings from '@ts/viz/core/errors_warnings'; import { normalizeEnum } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/core/center_template.ts b/packages/devextreme/js/__internal/viz/core/center_template.ts index fbd0ad89dfcc..474c7ac245e8 100644 --- a/packages/devextreme/js/__internal/viz/core/center_template.ts +++ b/packages/devextreme/js/__internal/viz/core/center_template.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { noop } from '@js/core/utils/common'; +import { noop } from '@ts/core/utils/m_common'; import { patchFontOptions } from '@ts/viz/core/utils'; const pieChartPlugin = { diff --git a/packages/devextreme/js/__internal/viz/core/data_source.ts b/packages/devextreme/js/__internal/viz/core/data_source.ts index 8b6f0f3ddffe..a55095d68fe2 100644 --- a/packages/devextreme/js/__internal/viz/core/data_source.ts +++ b/packages/devextreme/js/__internal/viz/core/data_source.ts @@ -5,8 +5,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { noop } from '@js/core/utils/common'; -import DataHelperMixin from '@js/data_helper'; +import { noop } from '@ts/core/utils/m_common'; +import { DataHelperMixin } from '@ts/data/m_data_helper'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; export interface DataSourcePluginMembers { @@ -14,7 +14,6 @@ export interface DataSourcePluginMembers { _dataSourceItems: () => ThemeValue; _updateDataSource: () => void; } -// @ts-expect-error const { postCtor } = DataHelperMixin; let name; const members = { diff --git a/packages/devextreme/js/__internal/viz/core/errors_warnings.ts b/packages/devextreme/js/__internal/viz/core/errors_warnings.ts index 850cd90a56ef..04b5c64d923a 100644 --- a/packages/devextreme/js/__internal/viz/core/errors_warnings.ts +++ b/packages/devextreme/js/__internal/viz/core/errors_warnings.ts @@ -1,5 +1,5 @@ -import errors from '@js/core/errors'; -import errorUtils from '@js/core/utils/error'; +import errors from '@ts/core/errors'; +import { error as errorUtils } from '@ts/core/utils/m_error'; export default errorUtils(errors.ERROR_MESSAGES, { E2001: 'Invalid data source', diff --git a/packages/devextreme/js/__internal/viz/core/export.ts b/packages/devextreme/js/__internal/viz/core/export.ts index 0b04e84c10c5..3d7b53464d69 100644 --- a/packages/devextreme/js/__internal/viz/core/export.ts +++ b/packages/devextreme/js/__internal/viz/core/export.ts @@ -15,23 +15,23 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { end as hoverEventEnd, start as hoverEventStart } from '@js/common/core/events/hover'; -import pointerEvents from '@js/common/core/events/pointer'; -import messageLocalization from '@js/common/core/localization/message'; -import $ from '@js/core/renderer'; -import { logger } from '@js/core/utils/console'; -import { extend } from '@js/core/utils/extend'; -import { getWidth } from '@js/core/utils/size'; -import { HIDDEN_FOR_EXPORT } from '@js/core/utils/svg'; -import { isDefined } from '@js/core/utils/type'; -import { getWindow } from '@js/core/utils/window'; import { export as _export, image as imageExporter, pdf as pdfExporter, svg as svgExporter, } from '@js/exporter'; -import { getTheme } from '@js/viz/themes'; +import messageLocalization from '@ts/core/localization/message'; +import { renderer as $ } from '@ts/core/renderer'; +import { logger } from '@ts/core/utils/m_console'; +import { extend } from '@ts/core/utils/m_extend'; +import { getWidth } from '@ts/core/utils/m_size'; +import { HIDDEN_FOR_EXPORT } from '@ts/core/utils/m_svg'; +import { isDefined } from '@ts/core/utils/m_type'; +import { getWindow } from '@ts/core/utils/m_window'; +import { end as hoverEventEnd, start as hoverEventStart } from '@ts/events/hover'; +import pointerEvents from '@ts/events/pointer'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { Renderer } from '@ts/viz/core/renderers/renderer'; import { patchFontOptions } from '@ts/viz/core/utils'; +import { getTheme } from '@ts/viz/themes'; const pointerActions = [pointerEvents.down, pointerEvents.move].join(' '); @@ -340,7 +340,6 @@ function createMenuItems(renderer: ThemeValue, options: ThemeValue): MenuItem[] items = options.formats.reduce((r, format) => { r.push(createMenuItem(renderer, options, { type: 'exporting', - // @ts-expect-error message.d.ts types the formatter returned by getFormatter() without parameters text: messageLocalization.getFormatter('vizExport-exportButtonText')(format), format, itemIndex: r.length, @@ -365,7 +364,6 @@ export const exportFromMarkup = function (markup, options) { options.exportedAction = options.onExported; options.fileSavingAction = options.onFileSaving; options.margin = isDefined(options.margin) ? options.margin : MARGIN; - // @ts-expect-error themes.d.ts requires the theme name; getTheme() without it returns the current theme options.backgroundColor = isDefined(options.backgroundColor) ? options.backgroundColor : getBackgroundColorFromMarkup(markup) || getTheme().backgroundColor; _export(markup, options, getCreatorFunc(options.format)); }; diff --git a/packages/devextreme/js/__internal/viz/core/helpers.ts b/packages/devextreme/js/__internal/viz/core/helpers.ts index 955498d86e2a..c419cb54c374 100644 --- a/packages/devextreme/js/__internal/viz/core/helpers.ts +++ b/packages/devextreme/js/__internal/viz/core/helpers.ts @@ -10,10 +10,10 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable no-plusplus */ -import { noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; -import { isFunction } from '@js/core/utils/type'; -import { hasWindow } from '@js/core/utils/window'; +import { noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { isFunction } from '@ts/core/utils/m_type'; +import { hasWindow } from '@ts/core/utils/m_window'; const isServerSide = !hasWindow(); diff --git a/packages/devextreme/js/__internal/viz/core/layout_element.ts b/packages/devextreme/js/__internal/viz/core/layout_element.ts index 32492947c7ac..f8e682c7e6e7 100644 --- a/packages/devextreme/js/__internal/viz/core/layout_element.ts +++ b/packages/devextreme/js/__internal/viz/core/layout_element.ts @@ -3,7 +3,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ /* eslint-disable @stylistic/max-len */ -import { noop } from '@js/core/utils/common'; +import { noop } from '@ts/core/utils/m_common'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { BBox } from '@ts/viz/core/types'; diff --git a/packages/devextreme/js/__internal/viz/core/plaque.ts b/packages/devextreme/js/__internal/viz/core/plaque.ts index bb4c67808f04..2c0ba474f7bc 100644 --- a/packages/devextreme/js/__internal/viz/core/plaque.ts +++ b/packages/devextreme/js/__internal/viz/core/plaque.ts @@ -11,8 +11,8 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable no-else-return */ -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; const math = Math; const round = math.round; diff --git a/packages/devextreme/js/__internal/viz/core/renderers/animation.ts b/packages/devextreme/js/__internal/viz/core/renderers/animation.ts index dff1659cbf7f..0c8ff7a874a5 100644 --- a/packages/devextreme/js/__internal/viz/core/renderers/animation.ts +++ b/packages/devextreme/js/__internal/viz/core/renderers/animation.ts @@ -14,7 +14,7 @@ /* eslint-disable guard-for-in */ /* eslint-disable no-plusplus */ -import { cancelAnimationFrame, requestAnimationFrame } from '@js/common/core/animation/frame'; +import { cancelAnimationFrame, requestAnimationFrame } from '@ts/common/core/animation/frame'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; type EasingFunction = (pos: number, start: number, end: number) => number; diff --git a/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts b/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts index f048d92eb39f..7d27303f9807 100644 --- a/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts +++ b/packages/devextreme/js/__internal/viz/core/renderers/renderer.ts @@ -34,14 +34,15 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable no-plusplus */ -import eventsEngine from '@js/common/core/events/core/events_engine'; -import domAdapter from '@js/core/dom_adapter'; -import type { Coordinates, dxElementWrapper } from '@js/core/renderer'; -import $ from '@js/core/renderer'; -import { getSvgMarkup } from '@js/core/utils/svg'; -import { isDefined } from '@js/core/utils/type'; -import { getWindow } from '@js/core/utils/window'; +import type { Coordinates } from '@js/core/renderer'; +import { domAdapter } from '@ts/core/dom_adapter'; +import { renderer as $ } from '@ts/core/renderer'; +import type { Renderer as CoreRenderer } from '@ts/core/renderer_base'; import { callOnce } from '@ts/core/utils/call_once'; +import { getSvgMarkup } from '@ts/core/utils/m_svg'; +import { isDefined } from '@ts/core/utils/m_type'; +import { getWindow } from '@ts/core/utils/m_window'; +import eventsEngine from '@ts/events/core/events_engine'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { Animation, AnimationOptions } from '@ts/viz/core/renderers/animation'; import { AnimationController } from '@ts/viz/core/renderers/animation'; @@ -282,8 +283,7 @@ function isObjectArgument(value: ThemeValue): value is SvgAttributes { } function createElement(tagName: string): SvgDomElement { - // @ts-expect-error the public DomAdapter typings lack createElementNS (the internal adapter has it) - return domAdapter.createElementNS('http://www.w3.org/2000/svg', tagName); + return domAdapter.createElementNS('http://www.w3.org/2000/svg', tagName) as SvgDomElement; } export function getFuncIri(id: string, pathModified?: boolean): string; @@ -1247,7 +1247,7 @@ export let SvgElement = class SvgElement { declare type?: string; - declare _$element?: dxElementWrapper; + declare _$element?: CoreRenderer; declare _links: LinkedItem[]; @@ -1292,7 +1292,7 @@ export let SvgElement = class SvgElement { } } - _getJQElement(): dxElementWrapper { + _getJQElement(): CoreRenderer { return (this._$element || (this._$element = $(this.element))); } @@ -1610,7 +1610,7 @@ export let SvgElement = class SvgElement { const args = [this._getJQElement()]; // @ts-expect-error push.apply forwards `arguments`, which the typings do not accept as an argument array args.push.apply(args, arguments); - // @ts-expect-error events_engine.d.ts does not declare trigger + // @ts-expect-error apply() passes the collected array, the typings expect the (element, event, extraParameters?) tuple eventsEngine.trigger.apply(eventsEngine, args); return this; } @@ -2016,7 +2016,7 @@ export let Renderer = class Renderer { declare pathModified: boolean; - declare _$container: dxElementWrapper; + declare _$container: CoreRenderer; declare _locker: number; diff --git a/packages/devextreme/js/__internal/viz/core/series_family.ts b/packages/devextreme/js/__internal/viz/core/series_family.ts index e7bc92ad50f9..059eead60558 100644 --- a/packages/devextreme/js/__internal/viz/core/series_family.ts +++ b/packages/devextreme/js/__internal/viz/core/series_family.ts @@ -18,15 +18,15 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; +import { noop as _noop } from '@ts/core/utils/m_common'; /// #DEBUG -import { debug } from '@js/core/utils/console'; +import { debug } from '@ts/core/utils/m_console'; /// #ENDDEBUG -import dateUtils from '@js/core/utils/date'; -import { extend } from '@js/core/utils/extend'; -import { each as _each } from '@js/core/utils/iterator'; -import { sign } from '@js/core/utils/math'; -import { isDefined, isNumeric } from '@js/core/utils/type'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { extend } from '@ts/core/utils/m_extend'; +import { each as _each } from '@ts/core/utils/m_iterator'; +import { sign } from '@ts/core/utils/m_math'; +import { isDefined, isNumeric } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { map as _map, normalizeEnum as _normalizeEnum } from './utils'; diff --git a/packages/devextreme/js/__internal/viz/core/title.ts b/packages/devextreme/js/__internal/viz/core/title.ts index a3f1cc7d916f..a183c8549e14 100644 --- a/packages/devextreme/js/__internal/viz/core/title.ts +++ b/packages/devextreme/js/__internal/viz/core/title.ts @@ -12,8 +12,8 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { extend } from '@js/core/utils/extend'; -import { isString as _isString } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { isString as _isString } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { LayoutTargetOptions } from '@ts/viz/core/layout'; import type { AlignedLayoutRect } from '@ts/viz/core/layout_element'; diff --git a/packages/devextreme/js/__internal/viz/core/tooltip.ts b/packages/devextreme/js/__internal/viz/core/tooltip.ts index 693ca7e762c6..cb8a468e88cb 100644 --- a/packages/devextreme/js/__internal/viz/core/tooltip.ts +++ b/packages/devextreme/js/__internal/viz/core/tooltip.ts @@ -16,17 +16,17 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import domAdapter from '@js/core/dom_adapter'; -import type { dxElementWrapper } from '@js/core/renderer'; -import $ from '@js/core/renderer'; -import { replaceWith } from '@js/core/utils/dom'; -import { extend } from '@js/core/utils/extend'; -import { camelize } from '@js/core/utils/inflector'; -import { getHeight, getWidth } from '@js/core/utils/size'; -import { normalizeStyleProp } from '@js/core/utils/style'; -import { isDefined, isFunction, isPlainObject } from '@js/core/utils/type'; -import { getWindow } from '@js/core/utils/window'; -import formatHelper from '@js/format_helper'; +import { domAdapter } from '@ts/core/dom_adapter'; +import formatHelper from '@ts/core/format_helper'; +import { renderer as $ } from '@ts/core/renderer'; +import type { Renderer as CoreRenderer } from '@ts/core/renderer_base'; +import { replaceWith } from '@ts/core/utils/m_dom'; +import { extend } from '@ts/core/utils/m_extend'; +import { camelize } from '@ts/core/utils/m_inflector'; +import { getHeight, getWidth } from '@ts/core/utils/m_size'; +import { normalizeStyleProp } from '@ts/core/utils/m_style'; +import { isDefined, isFunction, isPlainObject } from '@ts/core/utils/m_type'; +import { getWindow } from '@ts/core/utils/m_window'; import type { ThemeValue } from './base_theme_manager'; import { Plaque } from './plaque'; @@ -39,7 +39,7 @@ const format = formatHelper.format; const mathCeil = Math.ceil; const mathMax = Math.max; const mathMin = Math.min; -const window = getWindow(); +const window: Window = getWindow(); const DEFAULT_HTML_GROUP_WIDTH = 3000; type TooltipEventTrigger = (name: string, data?: ThemeValue) => void; @@ -100,7 +100,7 @@ function getSpecialFormatOptions(options: ThemeValue, specialFormat: string): Th return result; } -function createTextHtml(): dxElementWrapper { +function createTextHtml(): CoreRenderer { return $('
').css({ position: 'relative', display: 'inline-block', padding: 0, margin: 0, border: '0px solid transparent', }); diff --git a/packages/devextreme/js/__internal/viz/core/utils.ts b/packages/devextreme/js/__internal/viz/core/utils.ts index 4c65756fbeb6..8fc9ae871e0b 100644 --- a/packages/devextreme/js/__internal/viz/core/utils.ts +++ b/packages/devextreme/js/__internal/viz/core/utils.ts @@ -18,15 +18,15 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable no-plusplus */ -import Color from '@js/color'; -import { noop } from '@js/core/utils/common'; -import dateUtils from '@js/core/utils/date'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { adjust, sign } from '@js/core/utils/math'; +import Color from '@ts/color'; +import { noop } from '@ts/core/utils/m_common'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { adjust, sign } from '@ts/core/utils/m_math'; import { isDefined, isExponential, isFunction, isNumeric, isString, -} from '@js/core/utils/type'; +} from '@ts/core/utils/m_type'; const { PI, @@ -151,7 +151,6 @@ export const roundValue = function (value, precision) { if (isExponential(value)) { return _Number(value.toExponential(precision)); } - // @ts-expect-error return _Number(value.toFixed(precision)); } }; diff --git a/packages/devextreme/js/__internal/viz/funnel/funnel.ts b/packages/devextreme/js/__internal/viz/funnel/funnel.ts index f9014cfe0238..748fe072bfc4 100644 --- a/packages/devextreme/js/__internal/viz/funnel/funnel.ts +++ b/packages/devextreme/js/__internal/viz/funnel/funnel.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ // PLUGINS_SECTION -import componentRegistrator from '@js/core/component_registrator'; -import { noop } from '@js/core/utils/common'; +import { registerComponent as componentRegistrator } from '@ts/core/component_registrator'; +import { noop } from '@ts/core/utils/m_common'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import BaseWidget from '@ts/viz/core/base_widget'; import type { DataSourcePluginMembers } from '@ts/viz/core/data_source'; diff --git a/packages/devextreme/js/__internal/viz/funnel/item.ts b/packages/devextreme/js/__internal/viz/funnel/item.ts index ea00e5e392d2..74b380f2d33a 100644 --- a/packages/devextreme/js/__internal/viz/funnel/item.ts +++ b/packages/devextreme/js/__internal/viz/funnel/item.ts @@ -2,7 +2,7 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { isDefined } from '@js/core/utils/type'; +import { isDefined } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; const states = ['normal', 'hover', 'selection', 'selection']; diff --git a/packages/devextreme/js/__internal/viz/funnel/label.ts b/packages/devextreme/js/__internal/viz/funnel/label.ts index 6da7be60c481..298a3e467534 100644 --- a/packages/devextreme/js/__internal/viz/funnel/label.ts +++ b/packages/devextreme/js/__internal/viz/funnel/label.ts @@ -11,8 +11,8 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable no-else-return */ -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; import { normalizeEnum } from '@ts/viz/core/utils'; import { Label } from '@ts/viz/series/points/label'; diff --git a/packages/devextreme/js/__internal/viz/funnel/tooltip.ts b/packages/devextreme/js/__internal/viz/funnel/tooltip.ts index a9ea0a71c9d9..f867981291ab 100644 --- a/packages/devextreme/js/__internal/viz/funnel/tooltip.ts +++ b/packages/devextreme/js/__internal/viz/funnel/tooltip.ts @@ -4,7 +4,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { noop } from '@js/core/utils/common'; +import { noop } from '@ts/core/utils/m_common'; import { plugin as pluginTooltip } from '@ts/viz/core/tooltip'; function getCoords(coords, figureCoords, renderer) { diff --git a/packages/devextreme/js/__internal/viz/funnel/tracker.ts b/packages/devextreme/js/__internal/viz/funnel/tracker.ts index 7755049236a8..8b7063798f5f 100644 --- a/packages/devextreme/js/__internal/viz/funnel/tracker.ts +++ b/packages/devextreme/js/__internal/viz/funnel/tracker.ts @@ -11,7 +11,7 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { isDefined } from '@js/core/utils/type'; +import { isDefined } from '@ts/core/utils/m_type'; import { Tracker } from '@ts/viz/components/tracker'; import Funnel from '@ts/viz/funnel/funnel'; diff --git a/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts index e82535c28488..123eff173610 100644 --- a/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/bar_gauge.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ -import registerComponent from '@js/core/component_registrator'; -import { extend } from '@js/core/utils/extend'; -import { roundFloatPart } from '@js/core/utils/math'; -import { clone } from '@js/core/utils/object'; +import { registerComponent } from '@ts/core/component_registrator'; +import { extend } from '@ts/core/utils/m_extend'; +import { roundFloatPart } from '@ts/core/utils/m_math'; +import { clone } from '@ts/core/utils/m_object'; import { overlapping } from '@ts/viz/chart_components/base_chart'; import { plugin as pluginLegend } from '@ts/viz/components/legend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; diff --git a/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts index 54142917d186..c091153adad4 100644 --- a/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/base_gauge.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import formatHelper from '@js/format_helper'; +import formatHelper from '@ts/core/format_helper'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import BaseWidget from '@ts/viz/core/base_widget'; import { plugin as exportPlugin } from '@ts/viz/core/export'; @@ -322,7 +322,7 @@ export function formatValue( ): string { const normalizedValue = Object.is(value, -0) ? 0 : value; const formatOptions: GaugeFormatOptions = options ?? {}; - const text = format(normalizedValue, formatOptions.format); + const text: string = format(normalizedValue, formatOptions.format); if (typeof formatOptions.customizeText === 'function') { const formatObject = extend({ value: normalizedValue, valueText: text }, extra); return String(formatOptions.customizeText.call(formatObject, formatObject)); diff --git a/packages/devextreme/js/__internal/viz/gauges/base_indicators.ts b/packages/devextreme/js/__internal/viz/gauges/base_indicators.ts index 065c989d4e4f..b35ace120c49 100644 --- a/packages/devextreme/js/__internal/viz/gauges/base_indicators.ts +++ b/packages/devextreme/js/__internal/viz/gauges/base_indicators.ts @@ -1,8 +1,8 @@ /* eslint-disable max-classes-per-file */ import type { Font } from '@js/common/charts'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { Coords, Size } from '@ts/viz/core/types'; import { extractColor, patchFontOptions } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/gauges/base_range_container.ts b/packages/devextreme/js/__internal/viz/gauges/base_range_container.ts index 6102f7375cc2..5dc47eed029b 100644 --- a/packages/devextreme/js/__internal/viz/gauges/base_range_container.ts +++ b/packages/devextreme/js/__internal/viz/gauges/base_range_container.ts @@ -1,5 +1,5 @@ -import { each } from '@js/core/utils/iterator'; -import { isString } from '@js/core/utils/type'; +import { each } from '@ts/core/utils/m_iterator'; +import { isString } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { extractColor } from '@ts/viz/core/utils'; import { BaseElement } from '@ts/viz/gauges/base_indicators'; diff --git a/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts index c1ab80b9234d..b0ce9705c7c9 100644 --- a/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/circular_gauge.ts @@ -1,7 +1,7 @@ -import registerComponent from '@js/core/component_registrator'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { clone } from '@js/core/utils/object'; +import { registerComponent } from '@ts/core/component_registrator'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { clone } from '@ts/core/utils/m_object'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { plugins as centerTemplatePlugins } from '@ts/viz/core/center_template'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; diff --git a/packages/devextreme/js/__internal/viz/gauges/common.ts b/packages/devextreme/js/__internal/viz/gauges/common.ts index 684e815ff249..df1eaba9a7a1 100644 --- a/packages/devextreme/js/__internal/viz/gauges/common.ts +++ b/packages/devextreme/js/__internal/viz/gauges/common.ts @@ -2,9 +2,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-use-before-define */ -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { isDefined, isNumeric } from '@js/core/utils/type'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined, isNumeric } from '@ts/core/utils/m_type'; import { Axis } from '@ts/viz/axes/base_axis'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; diff --git a/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts b/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts index 3748acba4a6d..5ab22aaf6e0a 100644 --- a/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts +++ b/packages/devextreme/js/__internal/viz/gauges/linear_gauge.ts @@ -1,7 +1,7 @@ -import registerComponent from '@js/core/component_registrator'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { clone } from '@js/core/utils/object'; +import { registerComponent } from '@ts/core/component_registrator'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { clone } from '@ts/core/utils/m_object'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; import type { Bounds } from '@ts/viz/core/types'; diff --git a/packages/devextreme/js/__internal/viz/gauges/theme_manager.ts b/packages/devextreme/js/__internal/viz/gauges/theme_manager.ts index addc5d6fa41f..5ed2d1e1b550 100644 --- a/packages/devextreme/js/__internal/viz/gauges/theme_manager.ts +++ b/packages/devextreme/js/__internal/viz/gauges/theme_manager.ts @@ -1,4 +1,4 @@ -import { extend } from '@js/core/utils/extend'; +import { extend } from '@ts/core/utils/m_extend'; import type { BaseThemeManagerOptions } from '@ts/viz/core/base_theme_manager'; import { BaseThemeManager } from '@ts/viz/core/base_theme_manager'; diff --git a/packages/devextreme/js/__internal/viz/gauges/tracker.ts b/packages/devextreme/js/__internal/viz/gauges/tracker.ts index 1a223ef2c75d..3f9d5765ee9e 100644 --- a/packages/devextreme/js/__internal/viz/gauges/tracker.ts +++ b/packages/devextreme/js/__internal/viz/gauges/tracker.ts @@ -1,12 +1,12 @@ -import { name as wheelEventName } from '@js/common/core/events/core/wheel'; -import pointerEvents from '@js/common/core/events/pointer'; -import { addNamespace } from '@js/common/core/events/utils/index'; -import domAdapter from '@js/core/dom_adapter'; +import { domAdapter } from '@ts/core/dom_adapter'; /// #DEBUG -import { debug } from '@js/core/utils/console'; +import { debug } from '@ts/core/utils/m_console'; /// #ENDDEBUG -import ReadyCallbacks from '@js/core/utils/ready_callbacks'; +import { readyCallbacksModule as ReadyCallbacks } from '@ts/core/utils/m_ready_callbacks'; import eventsEngine from '@ts/events/core/events_engine'; +import { name as wheelEventName } from '@ts/events/core/wheel'; +import pointerEvents from '@ts/events/pointer'; +import { addNamespace } from '@ts/events/utils/index'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; const EVENT_NS = 'gauge-tooltip'; diff --git a/packages/devextreme/js/__internal/viz/palette.ts b/packages/devextreme/js/__internal/viz/palette.ts index 8d00c26d2486..5f884b62f12b 100644 --- a/packages/devextreme/js/__internal/viz/palette.ts +++ b/packages/devextreme/js/__internal/viz/palette.ts @@ -17,9 +17,9 @@ /* eslint-disable no-else-return */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend } from '@js/core/utils/extend'; -import { isString } from '@js/core/utils/type'; import { Color } from '@ts/color'; +import { extend } from '@ts/core/utils/m_extend'; +import { isString } from '@ts/core/utils/m_type'; import { normalizeEnum } from '@ts/viz/core/utils'; const HIGHLIGHTING_STEP = 50; diff --git a/packages/devextreme/js/__internal/viz/pie_chart.ts b/packages/devextreme/js/__internal/viz/pie_chart.ts index 3d636ad3465a..c9379faa740c 100644 --- a/packages/devextreme/js/__internal/viz/pie_chart.ts +++ b/packages/devextreme/js/__internal/viz/pie_chart.ts @@ -1,21 +1,10 @@ -/* eslint-disable @stylistic/max-len */ -/* eslint-disable @typescript-eslint/explicit-function-return-type */ -/* eslint-disable @typescript-eslint/init-declarations */ -/* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable @typescript-eslint/no-shadow */ -/* eslint-disable @typescript-eslint/no-unsafe-return */ -/* eslint-disable no-bitwise */ -/* eslint-disable no-param-reassign */ -/* eslint-disable no-plusplus */ -/* eslint-disable prefer-rest-params */ -/* eslint-disable prefer-spread */ /* eslint-disable */ -import registerComponent from '@js/core/component_registrator'; -import { noop as _noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; -import { each as _each } from '@js/core/utils/iterator'; -import { isNumeric } from '@js/core/utils/type'; +import { registerComponent } from '@ts/core/component_registrator'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { each as _each } from '@ts/core/utils/m_iterator'; +import { isNumeric } from '@ts/core/utils/m_type'; import consts from '@ts/viz/components/consts'; import { plugins as annotationsPlugins } from '@ts/viz/core/annotations'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; diff --git a/packages/devextreme/js/__internal/viz/polar_chart.ts b/packages/devextreme/js/__internal/viz/polar_chart.ts index 2ddd501f9aef..f638b4666aef 100644 --- a/packages/devextreme/js/__internal/viz/polar_chart.ts +++ b/packages/devextreme/js/__internal/viz/polar_chart.ts @@ -1,11 +1,10 @@ /* eslint-disable @stylistic/max-len */ /* eslint-disable @typescript-eslint/init-declarations */ -/* eslint-disable @typescript-eslint/no-unsafe-return */ -import registerComponent from '@js/core/component_registrator'; -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; +import { registerComponent } from '@ts/core/component_registrator'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; import { plugins } from '@ts/viz/core/annotations'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; diff --git a/packages/devextreme/js/__internal/viz/range_selector/common.ts b/packages/devextreme/js/__internal/viz/range_selector/common.ts index f8311c48d859..5ab7486e338c 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/common.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/common.ts @@ -3,9 +3,9 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import devices from '@js/core/devices'; -import browser from '@js/core/utils/browser'; -import { isFunction } from '@js/core/utils/type'; +import devices from '@ts/core/devices'; +import { browser } from '@ts/core/utils/browser'; +import { isFunction } from '@ts/core/utils/m_type'; import { smartFormatter as _format } from '@ts/viz/axes/smart_formatter'; export const HEIGHT_COMPACT_MODE = 24; diff --git a/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts b/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts index fb57c502245f..5d1d834376d5 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/range_selector.ts @@ -2,15 +2,15 @@ /* eslint-disable max-classes-per-file */ import type { VisualRange } from '@js/common/charts'; -import registerComponent from '@js/core/component_registrator'; -import dateUtils from '@js/core/utils/date'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { adjust } from '@js/core/utils/math'; +import { registerComponent } from '@ts/core/component_registrator'; +import formatHelper from '@ts/core/format_helper'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { adjust } from '@ts/core/utils/m_math'; import { isDate, isDefined, isFunction, isNumeric, isPlainObject, type as getType, -} from '@js/core/utils/type'; -import formatHelper from '@ts/core/format_helper'; +} from '@ts/core/utils/m_type'; import constants from '@ts/viz/axes/axes_constants'; import { Axis } from '@ts/viz/axes/base_axis'; import { tickGenerator } from '@ts/viz/axes/tick_generator'; diff --git a/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts b/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts index 69a21050d5d8..fbde40139fe3 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/series_data_source.ts @@ -5,9 +5,9 @@ /* eslint-disable no-multi-assign */ /* eslint-disable @stylistic/max-len */ -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { isDate, isDefined, isNumeric } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { isDate, isDefined, isNumeric } from '@ts/core/utils/m_type'; import { ThemeManager as ChartThemeManager } from '@ts/viz/components/chart_theme_manager'; import { validateData } from '@ts/viz/components/data_validator'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; diff --git a/packages/devextreme/js/__internal/viz/range_selector/sliders_controller.ts b/packages/devextreme/js/__internal/viz/range_selector/sliders_controller.ts index baac87bb8d55..c47ee13c68f3 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/sliders_controller.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/sliders_controller.ts @@ -11,9 +11,9 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable no-else-return */ -import { noop } from '@js/core/utils/common'; -import { adjust } from '@js/core/utils/math'; -import { isDefined, isNumeric } from '@js/core/utils/type'; +import { noop } from '@ts/core/utils/m_common'; +import { adjust } from '@ts/core/utils/m_math'; +import { isDefined, isNumeric } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { adjustVisualRange, normalizeEnum as _normalizeEnum, rangesAreEqual } from '@ts/viz/core/utils'; import { consts, isFirefoxOnAndroid, utils } from '@ts/viz/range_selector/common'; diff --git a/packages/devextreme/js/__internal/viz/range_selector/tracker.ts b/packages/devextreme/js/__internal/viz/range_selector/tracker.ts index d78a243c4708..caf647490a50 100644 --- a/packages/devextreme/js/__internal/viz/range_selector/tracker.ts +++ b/packages/devextreme/js/__internal/viz/range_selector/tracker.ts @@ -6,12 +6,12 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import eventsEngine from '@js/common/core/events/core/events_engine'; -import pointerEvents from '@js/common/core/events/pointer'; -import domAdapter from '@js/core/dom_adapter'; -import { each } from '@js/core/utils/iterator'; -import { pointerEvents as msPointerEnabled } from '@js/core/utils/support'; -import { getWindow } from '@js/core/utils/window'; +import { domAdapter } from '@ts/core/dom_adapter'; +import { each } from '@ts/core/utils/m_iterator'; +import { pointerEvents as msPointerEnabled } from '@ts/core/utils/m_support'; +import { getWindow } from '@ts/core/utils/m_window'; +import eventsEngine from '@ts/events/core/events_engine'; +import pointerEvents from '@ts/events/pointer'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { MovingHandler } from '@ts/viz/range_selector/sliders_controller'; @@ -270,7 +270,6 @@ export let Tracker = class Tracker { ]; // TODO: 3 "move" and 3 "end" events - do we really need that much? each(this._docEvents, (_, events) => { - // @ts-expect-error events_engine.d.ts declares no (element, events map) overload of on() eventsEngine.on(domAdapter.getDocument(), events); }); diff --git a/packages/devextreme/js/__internal/viz/sankey/link_item.ts b/packages/devextreme/js/__internal/viz/sankey/link_item.ts index c4554ba41405..ef7528d55e20 100644 --- a/packages/devextreme/js/__internal/viz/sankey/link_item.ts +++ b/packages/devextreme/js/__internal/viz/sankey/link_item.ts @@ -4,7 +4,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { isDefined } from '@js/core/utils/type'; +import { isDefined } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { BBox } from '@ts/viz/core/types'; import { COLOR_MODE_GRADIENT, COLOR_MODE_SOURCE, COLOR_MODE_TARGET } from '@ts/viz/sankey/constants'; diff --git a/packages/devextreme/js/__internal/viz/sankey/node_item.ts b/packages/devextreme/js/__internal/viz/sankey/node_item.ts index d26f86587410..cded17339a25 100644 --- a/packages/devextreme/js/__internal/viz/sankey/node_item.ts +++ b/packages/devextreme/js/__internal/viz/sankey/node_item.ts @@ -6,7 +6,7 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { isDefined } from '@js/core/utils/type'; +import { isDefined } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { patchFontOptions } from '@ts/viz/core/utils'; import type Link from '@ts/viz/sankey/link_item'; diff --git a/packages/devextreme/js/__internal/viz/sankey/sankey.ts b/packages/devextreme/js/__internal/viz/sankey/sankey.ts index e99be43d037f..cdf70055c06f 100644 --- a/packages/devextreme/js/__internal/viz/sankey/sankey.ts +++ b/packages/devextreme/js/__internal/viz/sankey/sankey.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ // PLUGINS_SECTION -import componentRegistrator from '@js/core/component_registrator'; -import { noop } from '@js/core/utils/common'; -import { isNumeric, isString } from '@js/core/utils/type'; +import { registerComponent as componentRegistrator } from '@ts/core/component_registrator'; +import { noop } from '@ts/core/utils/m_common'; +import { isNumeric, isString } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import BaseWidget from '@ts/viz/core/base_widget'; import type { DataSourcePluginMembers } from '@ts/viz/core/data_source'; diff --git a/packages/devextreme/js/__internal/viz/sankey/tooltip.ts b/packages/devextreme/js/__internal/viz/sankey/tooltip.ts index f38a72e72ad7..071653096e4a 100644 --- a/packages/devextreme/js/__internal/viz/sankey/tooltip.ts +++ b/packages/devextreme/js/__internal/viz/sankey/tooltip.ts @@ -10,8 +10,8 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend as _extend } from '@js/core/utils/extend'; -import { isFunction } from '@js/core/utils/type'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { isFunction } from '@ts/core/utils/m_type'; const defaultCustomizeLinkTooltip = (formatter) => function (info) { return { html: `${info.source} > ${info.target}
Weight: ${formatter(info.weight)}` }; diff --git a/packages/devextreme/js/__internal/viz/series/area_series.ts b/packages/devextreme/js/__internal/viz/series/area_series.ts index 2139bcbd762a..a008ee3aaf29 100644 --- a/packages/devextreme/js/__internal/viz/series/area_series.ts +++ b/packages/devextreme/js/__internal/viz/series/area_series.ts @@ -10,8 +10,8 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend } from '@js/core/utils/extend'; -import { clone } from '@js/core/utils/object'; +import { extend } from '@ts/core/utils/m_extend'; +import { clone } from '@ts/core/utils/m_object'; import { extractColor, map as _map } from '@ts/viz/core/utils'; import { chart as lineSeriesChart, polar as lineSeriesPolar } from './line_series'; diff --git a/packages/devextreme/js/__internal/viz/series/bar_series.ts b/packages/devextreme/js/__internal/viz/series/bar_series.ts index 36e0eb387d48..0b24c8be78d2 100644 --- a/packages/devextreme/js/__internal/viz/series/bar_series.ts +++ b/packages/devextreme/js/__internal/viz/series/bar_series.ts @@ -13,9 +13,9 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { isDefined as _isDefined } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { isDefined as _isDefined } from '@ts/core/utils/m_type'; import { convertPolarToXY, extractColor } from '@ts/viz/core/utils'; import { chart as areaChart } from './area_series'; diff --git a/packages/devextreme/js/__internal/viz/series/base_series.ts b/packages/devextreme/js/__internal/viz/series/base_series.ts index 23f0bcba7bb2..74f21dafa5b0 100644 --- a/packages/devextreme/js/__internal/viz/series/base_series.ts +++ b/packages/devextreme/js/__internal/viz/series/base_series.ts @@ -17,10 +17,10 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; -import { each as _each } from '@js/core/utils/iterator'; -import { isDefined as _isDefined, isEmptyObject as _isEmptyObject, isFunction } from '@js/core/utils/type'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { each as _each } from '@ts/core/utils/m_iterator'; +import { isDefined as _isDefined, isEmptyObject as _isEmptyObject, isFunction } from '@ts/core/utils/m_type'; import consts from '@ts/viz/components/consts'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { normalizeEnum as _normalizeEnum } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/series/bubble_series.ts b/packages/devextreme/js/__internal/viz/series/bubble_series.ts index 9a675df172fa..281612776763 100644 --- a/packages/devextreme/js/__internal/viz/series/bubble_series.ts +++ b/packages/devextreme/js/__internal/viz/series/bubble_series.ts @@ -11,9 +11,9 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; import { chart as areaChart } from './area_series'; import { chart as barChart, polar as barPolar } from './bar_series'; diff --git a/packages/devextreme/js/__internal/viz/series/financial_series.ts b/packages/devextreme/js/__internal/viz/series/financial_series.ts index 1573dd7b5cd2..501a7d63febe 100644 --- a/packages/devextreme/js/__internal/viz/series/financial_series.ts +++ b/packages/devextreme/js/__internal/viz/series/financial_series.ts @@ -14,9 +14,9 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; -import { isDefined as _isDefined } from '@js/core/utils/type'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { isDefined as _isDefined } from '@ts/core/utils/m_type'; import { extractColor, normalizeEnum as _normalizeEnum } from '@ts/viz/core/utils'; import { chart as barChart } from './bar_series'; diff --git a/packages/devextreme/js/__internal/viz/series/helpers/display_format_parser.ts b/packages/devextreme/js/__internal/viz/series/helpers/display_format_parser.ts index 1b3154a4b9d0..a4d6a5a95a7a 100644 --- a/packages/devextreme/js/__internal/viz/series/helpers/display_format_parser.ts +++ b/packages/devextreme/js/__internal/viz/series/helpers/display_format_parser.ts @@ -4,7 +4,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { formatDate, formatNumber } from '@js/localization'; +import { formatDate, formatNumber } from '@ts/core/localization'; const startPlaceHolderChar = '{'; const endPlaceHolderChar = '}'; diff --git a/packages/devextreme/js/__internal/viz/series/helpers/range_data_calculator.ts b/packages/devextreme/js/__internal/viz/series/helpers/range_data_calculator.ts index 972d3952ea43..b48abd2b09bd 100644 --- a/packages/devextreme/js/__internal/viz/series/helpers/range_data_calculator.ts +++ b/packages/devextreme/js/__internal/viz/series/helpers/range_data_calculator.ts @@ -13,8 +13,8 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop } from '@js/core/utils/common'; -import { isDefined, isObject } from '@js/core/utils/type'; +import { noop } from '@ts/core/utils/m_common'; +import { isDefined, isObject } from '@ts/core/utils/m_type'; import { getAddFunction, getLog, unique } from '@ts/viz/core/utils'; const DISCRETE = 'discrete'; diff --git a/packages/devextreme/js/__internal/viz/series/line_series.ts b/packages/devextreme/js/__internal/viz/series/line_series.ts index 941e7c8dd861..960e1b642ce9 100644 --- a/packages/devextreme/js/__internal/viz/series/line_series.ts +++ b/packages/devextreme/js/__internal/viz/series/line_series.ts @@ -17,10 +17,10 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { solveCubicEquation, trunc } from '@js/core/utils/math'; -import { clone } from '@js/core/utils/object'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { solveCubicEquation, trunc } from '@ts/core/utils/m_math'; +import { clone } from '@ts/core/utils/m_object'; import { extractColor, getCosAndSin, diff --git a/packages/devextreme/js/__internal/viz/series/pie_series.ts b/packages/devextreme/js/__internal/viz/series/pie_series.ts index 6fc40f41e2f1..2600f6fc9f1e 100644 --- a/packages/devextreme/js/__internal/viz/series/pie_series.ts +++ b/packages/devextreme/js/__internal/viz/series/pie_series.ts @@ -18,12 +18,12 @@ /* eslint-disable @typescript-eslint/prefer-optional-chain */ /* eslint-disable array-callback-return */ -import { noop } from '@js/core/utils/common'; +import { noop } from '@ts/core/utils/m_common'; /// #DEBUG -import { debug } from '@js/core/utils/console'; +import { debug } from '@ts/core/utils/m_console'; /// #ENDDEBUG -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; import { extractColor, map, normalizeAngle } from '@ts/viz/core/utils'; import { chart as barChart } from './bar_series'; diff --git a/packages/devextreme/js/__internal/viz/series/points/bar_point.ts b/packages/devextreme/js/__internal/viz/series/points/bar_point.ts index 25ab74e88513..46ae4b077eca 100644 --- a/packages/devextreme/js/__internal/viz/series/points/bar_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/bar_point.ts @@ -10,7 +10,7 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { extend } from '@js/core/utils/extend'; +import { extend } from '@ts/core/utils/m_extend'; import symbolPoint from '@ts/viz/series/points/symbol_point'; const _extend = extend; diff --git a/packages/devextreme/js/__internal/viz/series/points/base_point.ts b/packages/devextreme/js/__internal/viz/series/points/base_point.ts index e5f06fc031ee..23ee84012ae9 100644 --- a/packages/devextreme/js/__internal/viz/series/points/base_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/base_point.ts @@ -11,9 +11,9 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { isDefined as _isDefined } from '@js/core/utils/type'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined as _isDefined } from '@ts/core/utils/m_type'; import consts from '@ts/viz/components/consts'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { Coords } from '@ts/viz/core/types'; diff --git a/packages/devextreme/js/__internal/viz/series/points/bubble_point.ts b/packages/devextreme/js/__internal/viz/series/points/bubble_point.ts index 53d9525e4dc5..b43ba31edafc 100644 --- a/packages/devextreme/js/__internal/viz/series/points/bubble_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/bubble_point.ts @@ -7,7 +7,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable prefer-destructuring */ -import { extend } from '@js/core/utils/extend'; +import { extend } from '@ts/core/utils/m_extend'; import symbolPoint from '@ts/viz/series/points/symbol_point'; const _extend = extend; diff --git a/packages/devextreme/js/__internal/viz/series/points/candlestick_point.ts b/packages/devextreme/js/__internal/viz/series/points/candlestick_point.ts index 0f8517b1adb9..7695d56d197e 100644 --- a/packages/devextreme/js/__internal/viz/series/points/candlestick_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/candlestick_point.ts @@ -13,7 +13,7 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { extend as _extend } from '@js/core/utils/extend'; +import { extend as _extend } from '@ts/core/utils/m_extend'; import barPoint from '@ts/viz/series/points/bar_point'; import symbolPoint from '@ts/viz/series/points/symbol_point'; diff --git a/packages/devextreme/js/__internal/viz/series/points/label.ts b/packages/devextreme/js/__internal/viz/series/points/label.ts index eb881d012b0e..bf216df1c4d2 100644 --- a/packages/devextreme/js/__internal/viz/series/points/label.ts +++ b/packages/devextreme/js/__internal/viz/series/points/label.ts @@ -10,9 +10,9 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import formatHelper from '@js/format_helper'; +import formatHelper from '@ts/core/format_helper'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { BBox, Coords } from '@ts/viz/core/types'; import { diff --git a/packages/devextreme/js/__internal/viz/series/points/pie_point.ts b/packages/devextreme/js/__internal/viz/series/points/pie_point.ts index 26be6c9736d2..30e221831624 100644 --- a/packages/devextreme/js/__internal/viz/series/points/pie_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/pie_point.ts @@ -11,8 +11,8 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend } from '@js/core/utils/extend'; -import { isDefined as _isDefined } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined as _isDefined } from '@ts/core/utils/m_type'; import consts from '@ts/viz/components/consts'; import { getCosAndSin as _getCosAndSin, getVerticallyShiftedAngularCoords, normalizeAngle as _normalizeAngle } from '@ts/viz/core/utils'; import symbolPoint from '@ts/viz/series/points/symbol_point'; diff --git a/packages/devextreme/js/__internal/viz/series/points/polar_point.ts b/packages/devextreme/js/__internal/viz/series/points/polar_point.ts index bfbc760db1ff..969182275520 100644 --- a/packages/devextreme/js/__internal/viz/series/points/polar_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/polar_point.ts @@ -8,8 +8,8 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { extend } from '@js/core/utils/extend'; -import { isDefined } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined } from '@ts/core/utils/m_type'; import consts from '@ts/viz/components/consts'; import { convertPolarToXY, diff --git a/packages/devextreme/js/__internal/viz/series/points/range_bar_point.ts b/packages/devextreme/js/__internal/viz/series/points/range_bar_point.ts index 43ae41fd370b..a4108b4d3fb7 100644 --- a/packages/devextreme/js/__internal/viz/series/points/range_bar_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/range_bar_point.ts @@ -4,8 +4,8 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; import barPoint from '@ts/viz/series/points/bar_point'; import rangeSymbolPointMethods from '@ts/viz/series/points/range_symbol_point'; diff --git a/packages/devextreme/js/__internal/viz/series/points/range_symbol_point.ts b/packages/devextreme/js/__internal/viz/series/points/range_symbol_point.ts index d36d384054b7..74616916b611 100644 --- a/packages/devextreme/js/__internal/viz/series/points/range_symbol_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/range_symbol_point.ts @@ -11,10 +11,10 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { isDefined as _isDefined } from '@js/core/utils/type'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { isDefined as _isDefined } from '@ts/core/utils/m_type'; import { Label } from '@ts/viz/series/points/label'; import symbolPoint from '@ts/viz/series/points/symbol_point'; diff --git a/packages/devextreme/js/__internal/viz/series/points/stock_point.ts b/packages/devextreme/js/__internal/viz/series/points/stock_point.ts index 00dd71ed7728..91e263fc02b9 100644 --- a/packages/devextreme/js/__internal/viz/series/points/stock_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/stock_point.ts @@ -8,8 +8,8 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { extend } from '@js/core/utils/extend'; -import { isNumeric } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { isNumeric } from '@ts/core/utils/m_type'; import candlestickPoint from '@ts/viz/series/points/candlestick_point'; const _extend = extend; diff --git a/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts b/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts index b4283e99e1de..f1aaaa4259ce 100644 --- a/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts +++ b/packages/devextreme/js/__internal/viz/series/points/symbol_point.ts @@ -16,11 +16,11 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { isDefined as _isDefined } from '@js/core/utils/type'; -import { getWindow, hasProperty } from '@js/core/utils/window'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { isDefined as _isDefined } from '@ts/core/utils/m_type'; +import { getWindow, hasProperty } from '@ts/core/utils/m_window'; import { normalizeEnum as _normalizeEnum } from '@ts/viz/core/utils'; import { Label } from '@ts/viz/series/points/label'; @@ -571,7 +571,6 @@ export default { navigator = that.__debug_navigator || navigator; that.__debug_browserNavigator = navigator; /// #ENDDEBUG - // @ts-expect-error const minTrackerSize = hasProperty('ontouchstart') || (navigator.msPointerEnabled && navigator.msMaxTouchPoints || navigator.pointerEnabled && navigator.maxTouchPoints) ? 20 : 6; that._options.trackerR = r < minTrackerSize ? minTrackerSize : r; return that._options.trackerR; diff --git a/packages/devextreme/js/__internal/viz/series/range_series.ts b/packages/devextreme/js/__internal/viz/series/range_series.ts index a140a6a5b0f2..99ade797cafd 100644 --- a/packages/devextreme/js/__internal/viz/series/range_series.ts +++ b/packages/devextreme/js/__internal/viz/series/range_series.ts @@ -17,9 +17,9 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { isDefined as _isDefined } from '@js/core/utils/type'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDefined as _isDefined } from '@ts/core/utils/m_type'; import { map as _map } from '@ts/viz/core/utils'; import { chart as areaChart } from './area_series'; diff --git a/packages/devextreme/js/__internal/viz/series/scatter_series.ts b/packages/devextreme/js/__internal/viz/series/scatter_series.ts index fec274565d22..1e525c2d2890 100644 --- a/packages/devextreme/js/__internal/viz/series/scatter_series.ts +++ b/packages/devextreme/js/__internal/viz/series/scatter_series.ts @@ -25,10 +25,10 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; -import { each as _each } from '@js/core/utils/iterator'; -import { isDefined as _isDefined, isString as _isString } from '@js/core/utils/type'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { each as _each } from '@ts/core/utils/m_iterator'; +import { isDefined as _isDefined, isString as _isString } from '@ts/core/utils/m_type'; import { convertXYToPolar, extractColor, map as _map, normalizeEnum as _normalizeEnum, } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/series/stacked_series.ts b/packages/devextreme/js/__internal/viz/series/stacked_series.ts index 6d3639ac9fb4..0304444f7548 100644 --- a/packages/devextreme/js/__internal/viz/series/stacked_series.ts +++ b/packages/devextreme/js/__internal/viz/series/stacked_series.ts @@ -12,10 +12,10 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { noop as _noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { clone } from '@js/core/utils/object'; +import { noop as _noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { clone } from '@ts/core/utils/m_object'; import { map } from '@ts/viz/core/utils'; import { chart as areaSeries } from './area_series'; diff --git a/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts b/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts index 15a642a768a4..23dc84980953 100644 --- a/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts +++ b/packages/devextreme/js/__internal/viz/sparklines/base_sparkline.ts @@ -1,12 +1,13 @@ /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ -import eventsEngine from '@js/common/core/events/core/events_engine'; -import pointerEvents from '@js/common/core/events/pointer'; -import { addNamespace } from '@js/common/core/events/utils/index'; -import domAdapter from '@js/core/dom_adapter'; -import $ from '@js/core/renderer'; -import { noop } from '@js/core/utils/common'; -import { extend } from '@js/core/utils/extend'; -import { isFunction } from '@js/core/utils/type'; +import { domAdapter } from '@ts/core/dom_adapter'; +import { renderer as $ } from '@ts/core/renderer'; +import { noop } from '@ts/core/utils/m_common'; +import { extend } from '@ts/core/utils/m_extend'; +import { isFunction } from '@ts/core/utils/m_type'; +import type { EngineEvent } from '@ts/events/core/events_engine'; +import eventsEngine from '@ts/events/core/events_engine'; +import pointerEvents from '@ts/events/pointer'; +import { addNamespace } from '@ts/events/utils/index'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; // PLUGINS_SECTION // T422022 @@ -47,7 +48,7 @@ export interface SparklineAxis { aggregatedPointBetweenTicks: () => boolean; } -interface PointerEventData { +interface PointerEventData extends EngineEvent { pageX: number; pageY: number; } diff --git a/packages/devextreme/js/__internal/viz/sparklines/bullet.ts b/packages/devextreme/js/__internal/viz/sparklines/bullet.ts index 02f1e7da704f..89b0d4f068ed 100644 --- a/packages/devextreme/js/__internal/viz/sparklines/bullet.ts +++ b/packages/devextreme/js/__internal/viz/sparklines/bullet.ts @@ -1,4 +1,4 @@ -import componentRegistrator from '@js/core/component_registrator'; +import { registerComponent as componentRegistrator } from '@ts/core/component_registrator'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { setupWidgetPrototype } from '@ts/viz/core/helpers'; import BaseSparkline from '@ts/viz/sparklines/base_sparkline'; diff --git a/packages/devextreme/js/__internal/viz/sparklines/sparkline.ts b/packages/devextreme/js/__internal/viz/sparklines/sparkline.ts index b451d1de7f39..db61ca5c30d6 100644 --- a/packages/devextreme/js/__internal/viz/sparklines/sparkline.ts +++ b/packages/devextreme/js/__internal/viz/sparklines/sparkline.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ // PLUGINS_SECTION -import componentRegistrator from '@js/core/component_registrator'; -import { isDefined } from '@js/core/utils/type'; +import { registerComponent as componentRegistrator } from '@ts/core/component_registrator'; +import { isDefined } from '@ts/core/utils/m_type'; import { validateData } from '@ts/viz/components/data_validator'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { DataSourcePluginMembers } from '@ts/viz/core/data_source'; diff --git a/packages/devextreme/js/__internal/viz/themes.ts b/packages/devextreme/js/__internal/viz/themes.ts index b931a9744ab1..b80890ae435c 100644 --- a/packages/devextreme/js/__internal/viz/themes.ts +++ b/packages/devextreme/js/__internal/viz/themes.ts @@ -15,9 +15,9 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend } from '@js/core/utils/extend'; -import { isEmptyObject } from '@js/core/utils/type'; -import { current as getCurrentTheme } from '@js/ui/themes'; +import { extend } from '@ts/core/utils/m_extend'; +import { isEmptyObject } from '@ts/core/utils/m_type'; +import { current as getCurrentTheme } from '@ts/ui/themes'; import fluentThemes from '@ts/viz/core/themes/fluent/index'; import carmineThemes from '@ts/viz/core/themes/generic/carmine'; import contrastThemes from '@ts/viz/core/themes/generic/contrast'; @@ -39,7 +39,7 @@ let defaultTheme; let nextCacheUid = 0; const widgetsCache = {}; -export function getTheme(themeName) { +export function getTheme(themeName?) { const name = normalizeEnum(themeName); // @ts-expect-error return themes[name] || themes[themesMapping[name] || currentTheme()]; diff --git a/packages/devextreme/js/__internal/viz/translators/category_translator.ts b/packages/devextreme/js/__internal/viz/translators/category_translator.ts index da187f112bcf..3b191176ed56 100644 --- a/packages/devextreme/js/__internal/viz/translators/category_translator.ts +++ b/packages/devextreme/js/__internal/viz/translators/category_translator.ts @@ -7,8 +7,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { adjust } from '@js/core/utils/math'; -import { isDefined } from '@js/core/utils/type'; +import { adjust } from '@ts/core/utils/m_math'; +import { isDefined } from '@ts/core/utils/m_type'; const { round } = Math; diff --git a/packages/devextreme/js/__internal/viz/translators/datetime_translator.ts b/packages/devextreme/js/__internal/viz/translators/datetime_translator.ts index 65a6993d6fe2..cf77fde703e9 100644 --- a/packages/devextreme/js/__internal/viz/translators/datetime_translator.ts +++ b/packages/devextreme/js/__internal/viz/translators/datetime_translator.ts @@ -2,7 +2,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import dateUtils from '@js/core/utils/date'; +import { dateUtils } from '@ts/core/utils/m_date'; function parse(value) { return value !== null ? new Date(value) : value; diff --git a/packages/devextreme/js/__internal/viz/translators/interval_translator.ts b/packages/devextreme/js/__internal/viz/translators/interval_translator.ts index 49c47f5bf383..331405e55298 100644 --- a/packages/devextreme/js/__internal/viz/translators/interval_translator.ts +++ b/packages/devextreme/js/__internal/viz/translators/interval_translator.ts @@ -6,9 +6,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import dateUtils from '@js/core/utils/date'; -import { adjust } from '@js/core/utils/math'; -import { isDefined, isNumeric as isNumber } from '@js/core/utils/type'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { adjust } from '@ts/core/utils/m_math'; +import { isDefined, isNumeric as isNumber } from '@ts/core/utils/m_type'; const { floor } = Math; diff --git a/packages/devextreme/js/__internal/viz/translators/logarithmic_translator.ts b/packages/devextreme/js/__internal/viz/translators/logarithmic_translator.ts index 898f0fdffa2a..0ec91b1c7b13 100644 --- a/packages/devextreme/js/__internal/viz/translators/logarithmic_translator.ts +++ b/packages/devextreme/js/__internal/viz/translators/logarithmic_translator.ts @@ -4,7 +4,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { isDefined } from '@js/core/utils/type'; +import { isDefined } from '@ts/core/utils/m_type'; import { getLogExt as getLog, raiseToExt as raiseTo, diff --git a/packages/devextreme/js/__internal/viz/translators/range.ts b/packages/devextreme/js/__internal/viz/translators/range.ts index e732e45cef51..4e2c7d4608e8 100644 --- a/packages/devextreme/js/__internal/viz/translators/range.ts +++ b/packages/devextreme/js/__internal/viz/translators/range.ts @@ -5,8 +5,8 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @stylistic/max-len */ -import { extend } from '@js/core/utils/extend'; -import { isDate, isDefined, isFunction } from '@js/core/utils/type'; +import { extend } from '@ts/core/utils/m_extend'; +import { isDate, isDefined, isFunction } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { unique } from '@ts/viz/core/utils'; diff --git a/packages/devextreme/js/__internal/viz/translators/translator2d.ts b/packages/devextreme/js/__internal/viz/translators/translator2d.ts index 01ff8b0f5a0d..991e21bf2b9c 100644 --- a/packages/devextreme/js/__internal/viz/translators/translator2d.ts +++ b/packages/devextreme/js/__internal/viz/translators/translator2d.ts @@ -14,11 +14,11 @@ /* eslint-disable @typescript-eslint/no-unused-expressions */ /* eslint-disable @stylistic/max-len */ -import dateUtils from '@js/core/utils/date'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { adjust } from '@js/core/utils/math'; -import { isDate, isDefined } from '@js/core/utils/type'; +import { dateUtils } from '@ts/core/utils/m_date'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { adjust } from '@ts/core/utils/m_math'; +import { isDate, isDefined } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { getCategoriesInfo, diff --git a/packages/devextreme/js/__internal/viz/tree_map/api.ts b/packages/devextreme/js/__internal/viz/tree_map/api.ts index d94cbf49d5b5..39b9aabebd06 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/api.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/api.ts @@ -11,8 +11,8 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; +import { noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import Node from '@ts/viz/tree_map/node'; import TreeMapBase from '@ts/viz/tree_map/tree_map.base'; diff --git a/packages/devextreme/js/__internal/viz/tree_map/colorizing.ts b/packages/devextreme/js/__internal/viz/tree_map/colorizing.ts index 6980f6b1f21b..68b3ad82f2a1 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/colorizing.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/colorizing.ts @@ -6,7 +6,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { noop as _noop } from '@js/core/utils/common'; +import { noop as _noop } from '@ts/core/utils/m_common'; import { normalizeEnum as _normalizeEnum } from '@ts/viz/core/utils'; const colorizers = {}; diff --git a/packages/devextreme/js/__internal/viz/tree_map/node.ts b/packages/devextreme/js/__internal/viz/tree_map/node.ts index 43e8a8233c47..a54ebbbd85a1 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/node.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/node.ts @@ -1,7 +1,7 @@ /* eslint-disable @stylistic/max-len */ /* eslint-disable @typescript-eslint/no-use-before-define */ -import { extend as _extend } from '@js/core/utils/extend'; +import { extend as _extend } from '@ts/core/utils/m_extend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; const updateTile = [updateLeaf, updateGroup]; diff --git a/packages/devextreme/js/__internal/viz/tree_map/states.ts b/packages/devextreme/js/__internal/viz/tree_map/states.ts index ce4ef0315d76..dde0af6be766 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/states.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/states.ts @@ -7,8 +7,8 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import { noop } from '@js/core/utils/common'; -import { extend as _extend } from '@js/core/utils/extend'; +import { noop } from '@ts/core/utils/m_common'; +import { extend as _extend } from '@ts/core/utils/m_extend'; import Node from '@ts/viz/tree_map/node'; import TreeMapBase from '@ts/viz/tree_map/tree_map.base'; diff --git a/packages/devextreme/js/__internal/viz/tree_map/tiling.ts b/packages/devextreme/js/__internal/viz/tree_map/tiling.ts index 3b49fa6bea92..c2ad818bc4a6 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tiling.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tiling.ts @@ -9,7 +9,7 @@ /* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable prefer-destructuring */ -import { isFunction as _isFunction } from '@js/core/utils/type'; +import { isFunction as _isFunction } from '@ts/core/utils/m_type'; import { normalizeEnum as _normalizeEnum } from '@ts/viz/core/utils'; const _round = Math.round; diff --git a/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts b/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts index 51e5f7290165..04ae595da27f 100644 --- a/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts +++ b/packages/devextreme/js/__internal/viz/tree_map/tree_map.base.ts @@ -3,8 +3,8 @@ import '@ts/viz/tree_map/tiling.squarified'; // By design discrete colorizing is used by default. import '@ts/viz/tree_map/colorizing.discrete'; -import componentRegistrator from '@js/core/component_registrator'; -import { noop } from '@js/core/utils/common'; +import { registerComponent as componentRegistrator } from '@ts/core/component_registrator'; +import { noop } from '@ts/core/utils/m_common'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; // PLUGINS_SECTION import BaseWidget from '@ts/viz/core/base_widget'; diff --git a/packages/devextreme/js/__internal/viz/utils.ts b/packages/devextreme/js/__internal/viz/utils.ts index 229b4cee08c0..337c2b6655d2 100644 --- a/packages/devextreme/js/__internal/viz/utils.ts +++ b/packages/devextreme/js/__internal/viz/utils.ts @@ -12,7 +12,7 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import { each as _each } from '@js/core/utils/iterator'; +import { each as _each } from '@ts/core/utils/m_iterator'; import { refreshPaths } from '@ts/viz/core/renderers/renderer'; const { floor } = Math; diff --git a/packages/devextreme/js/__internal/viz/vector_map/data_exchanger.ts b/packages/devextreme/js/__internal/viz/vector_map/data_exchanger.ts index a0c2a6eecc77..936f237ef932 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/data_exchanger.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/data_exchanger.ts @@ -1,7 +1,7 @@ /* eslint-disable no-return-assign */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -import Callbacks from '@js/core/utils/callbacks'; +import { Callbacks } from '@ts/core/utils/m_callbacks'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; type DataCallback = (data: ThemeValue) => void; diff --git a/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts b/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts index 9766e74b5ba2..1a5c96646ef8 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/event_emitter.ts @@ -7,7 +7,7 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable @typescript-eslint/explicit-function-return-type */ -import Callbacks from '@js/core/utils/callbacks'; +import { Callbacks } from '@ts/core/utils/m_callbacks'; const eventEmitterMethods = { _initEvents() { diff --git a/packages/devextreme/js/__internal/viz/vector_map/layout.ts b/packages/devextreme/js/__internal/viz/vector_map/layout.ts index f10e8eacacb6..24c7093c1a1c 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/layout.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/layout.ts @@ -9,7 +9,7 @@ /* eslint-disable @stylistic/max-len */ /* eslint-disable @typescript-eslint/no-use-before-define */ -import { each } from '@js/core/utils/iterator'; +import { each } from '@ts/core/utils/m_iterator'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { Bounds } from '@ts/viz/core/types'; diff --git a/packages/devextreme/js/__internal/viz/vector_map/legend.ts b/packages/devextreme/js/__internal/viz/vector_map/legend.ts index d9cfd6a5edfc..f061a21e43eb 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/legend.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/legend.ts @@ -11,8 +11,8 @@ /* eslint-disable prefer-destructuring */ /* eslint-disable @typescript-eslint/prefer-optional-chain */ -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; import type { LegendDataItem } from '@ts/viz/components/legend'; import { Legend as _BaseLegend } from '@ts/viz/components/legend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; diff --git a/packages/devextreme/js/__internal/viz/vector_map/map_layer.ts b/packages/devextreme/js/__internal/viz/vector_map/map_layer.ts index e4069ad0fec6..120e9418544f 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/map_layer.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/map_layer.ts @@ -26,11 +26,11 @@ /* eslint-disable max-classes-per-file */ // @ts-expect-error DataHelperMixin is absent from the common/data d.ts import { DataHelperMixin } from '@js/common/data'; -import { noop } from '@js/core/utils/common'; -import { Deferred, when } from '@js/core/utils/deferred'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { isDefined as _isDefined, isFunction as _isFunction } from '@js/core/utils/type'; +import { noop } from '@ts/core/utils/m_common'; +import { Deferred, when } from '@ts/core/utils/m_deferred'; +import { extend } from '@ts/core/utils/m_extend'; +import { each } from '@ts/core/utils/m_iterator'; +import { isDefined as _isDefined, isFunction as _isFunction } from '@ts/core/utils/m_type'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { normalizeEnum as _normalizeEnum, diff --git a/packages/devextreme/js/__internal/viz/vector_map/projection.main.ts b/packages/devextreme/js/__internal/viz/vector_map/projection.main.ts index 362fba351c5c..a46187899c75 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/projection.main.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/projection.main.ts @@ -17,7 +17,7 @@ /* eslint-disable @typescript-eslint/prefer-optional-chain */ /* eslint-disable max-classes-per-file */ -import { extend } from '@js/core/utils/extend'; +import { extend } from '@ts/core/utils/m_extend'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import { makeEventEmitter } from '@ts/viz/vector_map/event_emitter'; diff --git a/packages/devextreme/js/__internal/viz/vector_map/tracker.ts b/packages/devextreme/js/__internal/viz/vector_map/tracker.ts index 13a7fc7bfbe6..44d82fbee2f4 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/tracker.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/tracker.ts @@ -15,11 +15,11 @@ /* eslint-disable @typescript-eslint/prefer-optional-chain */ /* eslint-disable max-classes-per-file */ -import eventsEngine from '@js/common/core/events/core/events_engine'; -import { name as wheelEventName } from '@js/common/core/events/core/wheel'; -import { addNamespace } from '@js/common/core/events/utils/index'; -import domAdapter from '@js/core/dom_adapter'; -import { getNavigator, hasProperty } from '@js/core/utils/window'; +import { domAdapter } from '@ts/core/dom_adapter'; +import { getNavigator, hasProperty } from '@ts/core/utils/m_window'; +import eventsEngine from '@ts/events/core/events_engine'; +import { name as wheelEventName } from '@ts/events/core/wheel'; +import { addNamespace } from '@ts/events/utils/index'; import type { ThemeValue } from '@ts/viz/core/base_theme_manager'; import type { Coords } from '@ts/viz/core/types'; import { parseScalar } from '@ts/viz/core/utils'; @@ -468,7 +468,6 @@ export let Tracker = class Tracker { isTouchEvent(event) && event.preventDefault(); }); } - // @ts-expect-error eventsEngine.on also accepts an (event name -> handler) map, its d.ts lacks that overload eventsEngine.on(domAdapter.getDocument(), this._docHandlers); this._root.on(this._rootHandlers); } diff --git a/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts b/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts index d06fd7e0d000..816ce4680c38 100644 --- a/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts +++ b/packages/devextreme/js/__internal/viz/vector_map/vector_map.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */ import '@ts/viz/vector_map/projection'; -import componentRegistrator from '@js/core/component_registrator'; +import { registerComponent as componentRegistrator } from '@ts/core/component_registrator'; // PLUGINS_SECTION import type { AnnotationsPluginMembers } from '@ts/viz/core/annotations'; import { plugins as annotationsPlugins } from '@ts/viz/core/annotations';