WIP-2. Fix devextreme bundling for strict ESM import rules

apps/demos/Demos/Charts/MultipleAxes/Vue/App.vue

@@ -70,7 +70,7 @@ function customizeTooltip(pointInfo: DxChartTypes.PointInfo) {
   const items = pointInfo.valueText?.split('\n');
   const color = pointInfo.point?.getColor();
 
-  items?.forEach((item, index) => {
+  items?.forEach((item: string, index: number) => {
     if (item.indexOf(pointInfo.seriesName) === 0) {
       const element = document.createElement('span');
 

apps/demos/Demos/Diagram/ItemSelection/Vue/App.vue

@@ -46,7 +46,7 @@ const textExpression = 'Full_Name';
 function onContentReady(e: DxDiagramTypes.ContentReadyEvent) {
   const diagram = e.component;
   // preselect some shape
-  const items = diagram.getItems().filter(({ itemType, dataItem }) => itemType === 'shape' && (dataItem[textExpression] === 'Greta Sims'));
+  const items = diagram.getItems().filter(({ itemType, dataItem }: DxDiagramTypes.Item) => itemType === 'shape' && (dataItem[textExpression] === 'Greta Sims'));
   if (items.length > 0) {
     diagram.setSelectedItems(items);
     diagram.scrollToItem(items[0]);
@@ -56,7 +56,7 @@ function onContentReady(e: DxDiagramTypes.ContentReadyEvent) {
 function onSelectionChanged({ items }: DxDiagramTypes.SelectionChangedEvent) {
   selectedItemNames.value = 'Nobody has been selected';
   const filteredItems = items
-    .filter((item) => item.itemType === 'shape')
+    .filter((item: DxDiagramTypes.Item) => item.itemType === 'shape')
     .map(({ text }: Record<string, any>) => text);
   if (filteredItems.length > 0) {
     selectedItemNames.value = filteredItems.join(', ');

apps/demos/Demos/TreeView/DragAndDropHierarchicalDataStructure/Vue/App.vue

@@ -167,7 +167,7 @@ function moveNode(
 ) {
   const fromNodeContainingArray = getNodeContainingArray(fromNode, fromItems);
   const fromIndex = fromNodeContainingArray
-    ?.findIndex((item) => item.id === fromNode.itemData?.id) || -1;
+    ?.findIndex((item: DriveItem) => item.id === fromNode.itemData?.id) || -1;
 
   if (fromIndex !== -1 && fromNodeContainingArray) {
     fromNodeContainingArray.splice(fromIndex, 1);
@@ -179,7 +179,7 @@ function moveNode(
     const toNodeContainingArray = getNodeContainingArray(toNode, toItems);
     const toIndex = toNode === null
       ? toNodeContainingArray?.length || 0
-      : toNodeContainingArray?.findIndex((item) => item.id === toNode.itemData?.id) || 0;
+      : toNodeContainingArray?.findIndex((item: DriveItem) => item.id === toNode.itemData?.id) || 0;
     toNodeContainingArray?.splice(toIndex, 0, fromNode.itemData);
   }
 }

apps/demos/Demos/TreeView/DragAndDropPlainDataStructure/Vue/App.vue

@@ -184,7 +184,7 @@ function moveChildren(node: Node, fromDataSource: DriveItem[], toDataSource: any
     return;
   }
 
-  node.children?.forEach((child) => {
+  node.children?.forEach((child: Node) => {
     if (child.itemData?.isDirectory) {
       moveChildren(child, fromDataSource, toDataSource);
     }

apps/demos/package.json

@@ -152,7 +152,7 @@
         "testcafe": "3.7.2",
         "testcafe-reporter-spec-time": "4.0.0",
         "ts-node": "10.9.2",
-        "vue-tsc": "^3.0.6"
+        "vue-tsc": "3.0.6"
     },
     "scripts": {
         "test": "jest --coverage --runInBand",

packages/devextreme/build/gulp/babel-plugin-add-import-extensions.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const TS_OUTPUT_BASE_DIR = 'artifacts/dist_ts';
+
+module.exports = function addImportExtensions() {
+    return {
+        name: 'add-import-extensions',
+        visitor: {
+            'ImportDeclaration|ExportNamedDeclaration|ExportAllDeclaration'(astPath) {
+                const source = astPath.node.source;
+
+                if (!source) return;
+
+                const value = source.value;
+
+                if (!value || (!value.startsWith('./') && !value.startsWith('../'))) {
+                    return;
+                }
+
+                if (value.match(/\.(js|mjs|json|css)$/)) {
+                    return;
+                }
+
+                if (value.endsWith('/')) {
+                    source.value = value + 'index.js';
+                    return;
+                }
+
+                const currentFile = astPath.hub?.file?.opts?.filename;
+                const distPathRegExp = new RegExp(TS_OUTPUT_BASE_DIR)
+
+                if (currentFile) {
+                    const currentDir = path.dirname(currentFile);
+                    const resolvedPath = path.resolve(currentDir, value).replace(distPathRegExp,'js');
+
+                    if (fs.existsSync(resolvedPath)) {
+                        const stat = fs.statSync(resolvedPath);
+
+                        if (stat.isDirectory()) {
+                            const indexPath = path.join(resolvedPath, 'index.js');
+
+                            if (fs.existsSync(indexPath)) {
+                                source.value = value + '/index.js';
+                                return;
+                            }
+                        }
+                    }
+
+                    let jsFilePath = resolvedPath + '.js';
+
+                    if ( fs.existsSync(jsFilePath)
+                        || fs.existsSync(jsFilePath = resolvedPath + '.ts')
+                    ) {
+                        const stat = fs.statSync(jsFilePath);
+
+                        if (stat.isFile()) {
+                            source.value = value + '.js';
+                            return;
+                        }
+                    }
+                }
+
+                source.value = value + '.js';
+            }
+        }
+    };
+};
+

packages/devextreme/build/gulp/fix-imports-path.js

@@ -0,0 +1,81 @@
+// fix-imports.js
+const fs = require('fs');
+const path = require('path');
+
+const ROOT_DIR = process.argv[2]; // Папка передаётся первым аргументом
+
+if (!ROOT_DIR) {
+    console.error('Использование: node fix-imports.js <path-to-folder>');
+    process.exit(1);
+}
+
+function walkDir(dir, callback) {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+        const fullPath = path.join(dir, entry.name);
+        if (entry.isDirectory()) {
+            walkDir(fullPath, callback);
+        } else if (entry.isFile() && fullPath.endsWith('.js')) {
+            callback(fullPath);
+        }
+    }
+}
+
+function resolveImport(fileDir, importSpecifier) {
+    const basePath = path.resolve(fileDir, importSpecifier);
+
+    const candidates = [
+        basePath + '.js',
+        path.join(basePath, 'index.js'),
+    ];
+
+    for (const full of candidates) {
+        if (fs.existsSync(full) && fs.statSync(full).isFile()) {
+            let rel = path.relative(fileDir, full).replace(/\\/g, '/');
+            if (!rel.startsWith('.')) {
+                rel = './' + rel;
+            }
+            return rel;
+        }
+    }
+    return null;
+}
+
+function processFile(filePath) {
+    const original = fs.readFileSync(filePath, 'utf8');
+    let content = original;
+    const fileDir = path.dirname(filePath);
+
+    const importExportRegex =
+        /(?:import|export)\s+(?:[^'"]*?\s+from\s+)?(['"])(\.{1,2}\/[^'"]*)\1/g;
+
+    const requireRegex =
+        /require\(\s*(['"])(\.{1,2}\/[^'"]*)\1\s*\)/g;
+
+    function replaceCallback(_, quote, spec) {
+        // Если уже есть .js или .mjs — не трогаем
+        if (spec.endsWith('.js') || spec.endsWith('.mjs')) {
+            return _;
+        }
+
+        const resolved = resolveImport(fileDir, spec);
+        if (!resolved) return _;
+
+        return _.replace(spec, resolved);
+    }
+
+    content = content.replace(importExportRegex, replaceCallback);
+    content = content.replace(requireRegex, replaceCallback);
+
+    if (content !== original) {
+        fs.writeFileSync(filePath, content, 'utf8');
+        console.log('Updated:', filePath);
+    }
+}
+
+;
+
+module.exports = {
+    addExtensionToImportsPath: function (dir) {
+        walkDir(path.resolve(dir), processFile)
+    },
+};

packages/devextreme/build/gulp/modules_metadata.json

@@ -661,7 +661,8 @@
     "name": "ui/widget/template",
     "exports": {
       "Template": { "path": "ui.template", "exportAs": "type" }
-    }
+    },
+    "types": "./ui/widget/template.d.ts"
   },
   {
     "name": "utils",
@@ -694,6 +695,11 @@
       "default": { "path": "viz.dxCircularGauge", "isWidget": true }
     }
   },
+  {
+    "name": "viz/common",
+    "exports": {},
+    "types": "./viz/common.d.ts"
+  },
   {
     "name": "viz/export",
     "exports": {

packages/devextreme/build/gulp/npm.js

@@ -11,13 +11,16 @@ const replace = require('gulp-replace');
 const lazyPipe = require('lazypipe');
 const gulpFilter = require('gulp-filter');
 const gulpRename = require('gulp-rename');
+const MODULES = require('./modules_metadata.json');
 
 const compressionPipes = require('./compression-pipes.js');
 const ctx = require('./context.js');
 const env = require('./env-variables.js');
 const dataUri = require('./gulp-data-uri').gulpPipe;
 const headerPipes = require('./header-pipes.js');
 const { packageDir, packageDistDir, isEsmPackage, stringSrc, devextremeDistDir } = require('./utils');
+const path = require('path');
+const fs = require('fs');
 
 const resultPath = ctx.RESULT_NPM_PATH;
 
@@ -150,6 +153,59 @@ const sources = (src, dist, distGlob) => (() => merge(
 const packagePath = `${resultPath}/${packageDir}`;
 const distPath = `${resultPath}/${packageDistDir}`;
 
+function collectExports(baseDir) {
+    const exportsMap = {};
+
+    function getPath(p) {
+        return path.posix.join(p.replace(/\\/g, '/'))
+            .replace(/^.+\/esm\//, './esm/')
+            .replace(/^.+\/cjs\//, './cjs/')
+    }
+
+    function walk(currentDir, relativePath = '.') {
+        const packageJsonPath = path.join(currentDir, 'package.json');
+
+        if (fs.existsSync(packageJsonPath) && !/(cjs|esm)$/.test(currentDir)) {
+            try {
+                const pkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+                const exportEntry = {};
+
+                if (pkg.module) {
+                    exportEntry.import = getPath(pkg.module);
+                }
+                if (pkg.main) {
+                    exportEntry.require = getPath(pkg.main);
+                }
+                if (pkg.typings || pkg.types) {
+                    const typesFile = pkg.typings || pkg.types;
+                    exportEntry.types = path.join(currentDir, typesFile)
+                        .replace(/\\/g, '/')
+                        .replace(/^.*\/devextreme\//, './');
+                }
+
+                if (Object.keys(exportEntry).length > 0) {
+                    const exportKey = relativePath === '.' ? '.' : `./${relativePath.replace(/\\/g, '/')}`;
+                    exportsMap[exportKey] = exportEntry;
+                }
+            } catch (err) {
+                console.warn(`Failed to read package.json in ${packageJsonPath}:`, err.message);
+            }
+        }
+
+        // проход по вложенным папкам
+        const entries = fs.readdirSync(currentDir, { withFileTypes: true });
+
+        for (const entry of entries) {
+            if (entry.isDirectory()) {
+                walk(path.join(currentDir, entry.name), path.join(relativePath, entry.name));
+            }
+        }
+    }
+
+    walk(baseDir);
+    return exportsMap;
+}
+
 gulp.task('npm-sources', gulp.series(
     'ts-sources',
     () => gulp
@@ -164,6 +220,33 @@ gulp.task('npm-dist', () => gulp
     .pipe(gulp.dest(distPath))
 );
 
+gulp.task('add-exports-to-package-json', () => gulp
+    .src(`${packagePath}/package.json`)
+    .pipe(
+        through.obj((file, enc, callback) => {
+            const pkg = JSON.parse(file.contents.toString(enc));
+
+/*            pkg.exports = {
+                "./dist/!*":"./dist/!*",
+                ...collectExports(path.resolve(packagePath))
+            };
+
+            MODULES.forEach((item) => {
+                const exportPath = './' + item.name;
+                if(item.types && !pkg.exports[exportPath]?.types) {
+                    pkg.exports[exportPath] = pkg.exports[exportPath] || {};
+                    pkg.exports[exportPath].types = item.types;
+                }
+            })*/
+
+            file.contents = Buffer.from(JSON.stringify(pkg, null, 2));
+
+            callback(null, file);
+        })
+    )
+    .pipe(gulp.dest(packagePath))
+);
+
 const scssDir = `${packagePath}/scss`;
 
 gulp.task('npm-sass', gulp.series(
@@ -183,4 +266,5 @@ gulp.task('npm-sass', gulp.series(
     )
 ));
 
-gulp.task('npm', gulp.series('npm-sources', 'npm-dist', 'ts-check-public-modules', 'npm-sass'));
+gulp.task('npm', gulp.series('npm-sources', 'npm-dist', 'ts-check-public-modules', 'npm-sass', 'add-exports-to-package-json'));
+

packages/devextreme/build/gulp/side-effects-finder.js

@@ -46,7 +46,7 @@ class SideEffectFinder {
             .forEach((str) => {
                 let importPath = str.match(relativePathRegExp)[0].replace(/(^['"]|['"]$)/g, '');
 
-                importPath = path.join(path.dirname(modulePath), importPath) + '.js';
+                importPath = path.join(path.dirname(modulePath), importPath);
 
                 if(!fs.existsSync(importPath)) {
                     importPath = importPath.replace(/\.js$/, '/index.js');

packages/devextreme/build/gulp/transpile-config.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const addImportExtensions = require('./babel-plugin-add-import-extensions');
+
 const common = {
     plugins: [
         ['babel-plugin-inferno', { 'imports': true }],
@@ -33,11 +35,12 @@ module.exports = {
     esm: Object.assign({}, common, {
         // eslint-disable-next-line spellcheck/spell-checker
         presets: [['@babel/preset-env', { targets, modules: false }]],
-        plugins: common.plugins.concat(
-            [['@babel/plugin-transform-runtime', {
+        plugins: common.plugins.concat([
+            addImportExtensions,
+            ['@babel/plugin-transform-runtime', {
                 useESModules: true,
                 version: '7.5.0' // https://github.com/babel/babel/issues/10261#issuecomment-514687857
-            }]]
-        )
+            }]
+        ])
     })
 };