Core(utils): version and browser - remove m prefix and improve typing

packages/devextreme/js/__internal/core/utils/browser.ts

@@ -0,0 +1,57 @@
+import { extend } from '@js/core/utils/extend';
+import { getNavigator } from '@js/core/utils/window';
+
+export type BrowserName = 'webkit' | 'chrome' | 'mozilla' | 'safari' | 'unknown';
+
+export type BrowserInfo = Partial<Record<BrowserName, boolean>> & {
+  version?: string;
+};
+
+export type Browser = BrowserInfo & {
+  _fromUA: (userAgent: string) => BrowserInfo;
+};
+
+const navigator = getNavigator();
+
+const webkitRegExp = /(webkit)[ /]([\w.]+)/;
+const mozillaRegExp = /(mozilla)(?:.*? rv:([\w.]+))/;
+
+const browserFromUA = (userAgent: string): BrowserInfo => {
+  const ua = userAgent.toLowerCase();
+
+  const result: BrowserInfo = {};
+  const matches = webkitRegExp.exec(ua)
+    ?? (!ua.includes('compatible') ? mozillaRegExp.exec(ua) : null)
+    ?? [];
+  let browserName = matches[1] as BrowserName | undefined;
+  let browserVersion = matches[2] as string | undefined;
+
+  if (browserName === 'webkit') {
+    result.webkit = true;
+
+    if (ua.includes('chrome') || ua.includes('crios')) {
+      browserName = 'chrome';
+      browserVersion = /(?:chrome|crios)\/(\d+\.\d+)/.exec(ua)?.[1];
+    } else if (ua.includes('fxios')) {
+      browserName = 'mozilla';
+      browserVersion = /fxios\/(\d+\.\d+)/.exec(ua)?.[1];
+    } else if (ua.includes('safari') && /version|phantomjs/.test(ua)) {
+      browserName = 'safari';
+      browserVersion = /(?:version|phantomjs)\/([0-9.]+)/.exec(ua)?.[1];
+    } else {
+      browserName = 'unknown';
+      browserVersion = /applewebkit\/([0-9.]+)/.exec(ua)?.[1];
+    }
+  }
+
+  if (browserName) {
+    result[browserName] = true;
+    result.version = browserVersion;
+  }
+
+  return result;
+};
+
+const browser: Browser = extend({ _fromUA: browserFromUA }, browserFromUA(navigator.userAgent));
+
+export { browser };

packages/devextreme/js/__internal/core/utils/version.ts

@@ -0,0 +1,36 @@
+export type Version = string | number | (string | number)[];
+
+function toParts(value: Version): number[] {
+  if (typeof value === 'number') {
+    return [value];
+  }
+
+  const parts = typeof value === 'string' ? value.split('.') : value;
+
+  return parts.map((part) => parseInt(String(part || 0), 10));
+}
+
+export function compare(x: Version, y: Version, maxLevel?: number): number {
+  const xParts = toParts(x);
+  const yParts = toParts(y);
+
+  let length = Math.max(xParts.length, yParts.length);
+
+  if (maxLevel !== undefined && isFinite(maxLevel)) {
+    length = Math.min(length, maxLevel);
+  }
+
+  for (let i = 0; i < length; i += 1) {
+    const xItem = xParts[i] ?? 0;
+    const yItem = yParts[i] ?? 0;
+
+    if (xItem < yItem) {
+      return -1;
+    }
+    if (xItem > yItem) {
+      return 1;
+    }
+  }
+
+  return 0;
+}

packages/devextreme/js/__internal/core/widget/widget.ts

@@ -151,7 +151,7 @@ class Widget<
           const device = devices.real();
           const { platform } = device;
           const { version } = device;
-          return platform === 'ios' && compareVersions(version, '13.3') <= 0;
+          return platform === 'ios' && compareVersions(version ?? [], '13.3') <= 0;
         },
         options: {
           useResizeObserver: false,

packages/devextreme/js/__internal/integration/jquery.ts

@@ -1,6 +1,6 @@
 /* eslint-disable import/first */
 import errors from '@ts/core/utils/m_error';
-import { compare as compareVersions } from '@ts/core/utils/m_version';
+import { compare as compareVersions } from '@ts/core/utils/version';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import jQuery from 'jquery';
 

packages/devextreme/js/__internal/integration/jquery/deferred.ts

@@ -1,6 +1,6 @@
 import type { DeferredObj } from '@js/core/utils/deferred';
 import { setStrategy } from '@ts/core/utils/m_deferred';
-import { compare as compareVersion } from '@ts/core/utils/m_version';
+import { compare as compareVersion } from '@ts/core/utils/version';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import jQuery from 'jquery';
 

packages/devextreme/js/__internal/integration/jquery/hooks.ts

@@ -1,6 +1,6 @@
 import { each } from '@ts/core/utils/m_iterator';
 import { isNumeric } from '@ts/core/utils/m_type';
-import { compare as compareVersion } from '@ts/core/utils/m_version';
+import { compare as compareVersion } from '@ts/core/utils/version';
 import registerEvent from '@ts/events/core/event_registrator';
 import hookTouchProps from '@ts/events/core/hook_touch_props';
 import { setEventFixMethod } from '@ts/events/utils/index';

packages/devextreme/js/__internal/integration/knockout.ts

@@ -1,6 +1,6 @@
 /* eslint-disable import/first */
 import errors from '@ts/core/utils/m_error';
-import { compare as compareVersion } from '@ts/core/utils/m_version';
+import { compare as compareVersion } from '@ts/core/utils/version';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import ko from 'knockout';
 

packages/devextreme/js/__internal/integration/knockout/clean_node.ts

@@ -1,5 +1,5 @@
 import { afterCleanData, cleanData, strategyChanging } from '@ts/core/element_data';
-import { compare as compareVersion } from '@ts/core/utils/m_version';
+import { compare as compareVersion } from '@ts/core/utils/version';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import ko from 'knockout';
 

packages/devextreme/js/__internal/integration/knockout/clean_node_old.ts

@@ -1,6 +1,6 @@
 /* eslint-disable func-names */
 import { strategyChanging } from '@ts/core/element_data';
-import { compare as compareVersion } from '@ts/core/utils/m_version';
+import { compare as compareVersion } from '@ts/core/utils/version';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import ko from 'knockout';
 

packages/devextreme/js/core/utils/browser.js

@@ -1,3 +1,3 @@
 // deprecated
-import { browser } from '../../__internal/core/utils/m_browser';
+import { browser } from '../../__internal/core/utils/browser';
 export default browser;

packages/devextreme/js/core/utils/version.js

@@ -1,2 +1,2 @@
 // deprecated
-export { compare } from '../../__internal/core/utils/m_version';
+export { compare } from '../../__internal/core/utils/version';