@esmx/core 3.0.0-rc.69 → 3.0.0-rc.71

package/src/core.ts

@@ -22,7 +22,7 @@ import {
 import type { ImportmapMode } from './render-context';
 import type { RenderContext, RenderContextOptions } from './render-context';
 import { type CacheHandle, createCache } from './utils/cache';
-import { getImportMap } from './utils/import-map';
+import { createClientImportMap, createImportMap } from './utils/import-map';
 import type { Middleware } from './utils/middleware';
 import { type ProjectPath, resolvePath } from './utils/resolve-path';
 import { getImportPreloadInfo as getStaticImportPaths } from './utils/static-import-lexer';
@@ -854,7 +854,7 @@ export class Esmx {
             let json: ImportMap = {};
             switch (env) {
                 case 'client': {
-                    json = getImportMap({
+                    json = createClientImportMap({
                         manifests,
                         getScope(name, scope) {
                             return `/${name}${scope}`;
@@ -866,7 +866,7 @@ export class Esmx {
                     break;
                 }
                 case 'server':
-                    json = getImportMap({
+                    json = createImportMap({
                         manifests,
                         getScope: (name: string, scope: string) => {
                             const linkPath = moduleConfig.links[name].server;

package/src/utils/import-map.test.ts

@@ -1,15 +1,16 @@
 import { assert, describe, test } from 'vitest';
 import {
-    buildImportsMap,
-    buildScopesMap,
-    fixNestedScopesResolution,
-    getImportMap
+    compressImportMap,
+    createImportMap,
+    createImportsMap,
+    createScopesMap,
+    fixImportMapNestedScopes
 } from './import-map';
 import type { GetImportMapOptions, ImportMapManifest } from './import-map';
 
-describe('buildImportsMap', () => {
+describe('createImportsMap', () => {
     test('should return empty object for empty manifests', () => {
-        const result = buildImportsMap([], (name, file) => `${name}/${file}`);
+        const result = createImportsMap([], (name, file) => `${name}/${file}`);
         assert.deepEqual(result, {});
     });
 
@@ -35,7 +36,7 @@ describe('buildImportsMap', () => {
             }
         ];
 
-        const result = buildImportsMap(
+        const result = createImportsMap(
             manifests,
             (name, file) => `${name}/${file}`
         );
@@ -62,7 +63,7 @@ describe('buildImportsMap', () => {
             }
         ];
 
-        const result = buildImportsMap(
+        const result = createImportsMap(
             manifests,
             (name, file) => `${name}/${file}`
         );
@@ -94,7 +95,7 @@ describe('buildImportsMap', () => {
             }
         ];
 
-        const result = buildImportsMap(
+        const result = createImportsMap(
             manifests,
             (name, file) => `${name}/${file}`
         );
@@ -113,7 +114,7 @@ describe('buildImportsMap', () => {
             }
         ];
 
-        const result = buildImportsMap(
+        const result = createImportsMap(
             manifests,
             (name, file) => `${name}/${file}`
         );
@@ -137,7 +138,7 @@ describe('buildImportsMap', () => {
             }
         ];
 
-        const result = buildImportsMap(
+        const result = createImportsMap(
             manifests,
             (name, file) => `${name}/${file}`
         );
@@ -177,7 +178,7 @@ describe('buildImportsMap', () => {
             }
         ];
 
-        const result = buildImportsMap(
+        const result = createImportsMap(
             manifests,
             (name, file) => `${name}/${file}`
         );
@@ -204,7 +205,7 @@ describe('buildImportsMap', () => {
             }
         ];
 
-        const result = buildImportsMap(
+        const result = createImportsMap(
             manifests,
             (name, file) => `${name}/${file}`
         );
@@ -218,7 +219,7 @@ describe('buildImportsMap', () => {
     });
 });
 
-describe('fixNestedScopesResolution', () => {
+describe('fixImportMapNestedScopes', () => {
     test('should return unchanged import map for empty scopes', () => {
         const importMap = {
             imports: {
@@ -227,7 +228,7 @@ describe('fixNestedScopesResolution', () => {
             scopes: {}
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, importMap);
     });
 
@@ -243,7 +244,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, importMap);
     });
 
@@ -294,7 +295,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
     });
 
@@ -355,7 +356,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
     });
 
@@ -391,7 +392,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
     });
 
@@ -420,7 +421,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
     });
 
@@ -439,7 +440,7 @@ describe('fixNestedScopesResolution', () => {
             scopes: {}
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
     });
 
@@ -460,21 +461,18 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
-
-        assert.deepEqual(result.imports, importMap.imports);
-        assert.deepEqual(
-            result.scopes['/shared-modules/vue2/'],
-            importMap.scopes['/shared-modules/vue2/']
-        );
-
-        assert.deepEqual(
-            result.scopes['/shared-modules/vue2/component.u5v4w3x2.final.mjs'],
-            {
-                vue: '/shared-modules/vue2.q9r8s7t6.final.mjs',
-                'vue-router': '/shared-modules/vue2/router.y1z0a9b8.final.mjs'
+        const result = fixImportMapNestedScopes(importMap);
+        const expected = {
+            imports: importMap.imports,
+            scopes: {
+                '/shared-modules/vue2/component.u5v4w3x2.final.mjs': {
+                    vue: '/shared-modules/vue2.q9r8s7t6.final.mjs',
+                    'vue-router':
+                        '/shared-modules/vue2/router.y1z0a9b8.final.mjs'
+                }
             }
-        );
+        };
+        assert.deepEqual(result, expected);
     });
 
     test('should handle complex priority scenarios with multiple nested levels', () => {
@@ -543,7 +541,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
     });
 
@@ -607,7 +605,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
     });
 
@@ -674,7 +672,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
     });
 
@@ -717,7 +715,7 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
+        const result = fixImportMapNestedScopes(importMap);
         assert.deepEqual(result, expected);
 
         assert.equal(
@@ -746,11 +744,14 @@ describe('fixNestedScopesResolution', () => {
             }
         };
 
-        const result = fixNestedScopesResolution(importMap);
-        assert.deepEqual(result.imports, importMap.imports);
-        assert.isUndefined(result.scopes['/shared/modules/vue2/']);
+        const result = fixImportMapNestedScopes(importMap);
+        const expected = {
+            imports: importMap.imports,
+            scopes: {}
+        };
+        assert.deepEqual(result, expected);
         assert.doesNotThrow(() => {
-            fixNestedScopesResolution(importMap);
+            fixImportMapNestedScopes(importMap);
         });
     });
 
@@ -794,7 +795,7 @@ describe('fixNestedScopesResolution', () => {
                 }
             };
 
-            const result = fixNestedScopesResolution(importMap);
+            const result = fixImportMapNestedScopes(importMap);
             assert.deepEqual(result, expected);
         });
 
@@ -817,7 +818,7 @@ describe('fixNestedScopesResolution', () => {
                 scopes: {}
             };
 
-            const result = fixNestedScopesResolution(importMap);
+            const result = fixImportMapNestedScopes(importMap);
             assert.deepEqual(result, expected);
         });
 
@@ -840,7 +841,7 @@ describe('fixNestedScopesResolution', () => {
                 scopes: {}
             };
 
-            const result = fixNestedScopesResolution(importMap);
+            const result = fixImportMapNestedScopes(importMap);
             assert.deepEqual(result, expected);
         });
 
@@ -875,7 +876,7 @@ describe('fixNestedScopesResolution', () => {
                 }
             };
 
-            const result = fixNestedScopesResolution(importMap);
+            const result = fixImportMapNestedScopes(importMap);
             assert.deepEqual(result, expected);
         });
 
@@ -919,17 +920,17 @@ describe('fixNestedScopesResolution', () => {
                 }
             };
 
-            const result = fixNestedScopesResolution(importMap);
+            const result = fixImportMapNestedScopes(importMap);
             assert.deepEqual(result, expected);
         });
     });
 });
 
-describe('buildScopesMap', () => {
+describe('createScopesMap', () => {
     test('should return empty object for empty manifests', () => {
         const imports = {};
         const manifests: ImportMapManifest[] = [];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -955,7 +956,7 @@ describe('buildScopesMap', () => {
                 scopes: {}
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -993,7 +994,7 @@ describe('buildScopesMap', () => {
                 }
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1029,7 +1030,7 @@ describe('buildScopesMap', () => {
                 }
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1065,7 +1066,7 @@ describe('buildScopesMap', () => {
                 }
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1107,7 +1108,7 @@ describe('buildScopesMap', () => {
                 }
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1141,7 +1142,7 @@ describe('buildScopesMap', () => {
                 }
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1185,7 +1186,7 @@ describe('buildScopesMap', () => {
                 }
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1239,7 +1240,7 @@ describe('buildScopesMap', () => {
                 }
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1274,7 +1275,7 @@ describe('buildScopesMap', () => {
                 }
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1302,7 +1303,7 @@ describe('buildScopesMap', () => {
                 scopes: undefined as any
             }
         ];
-        const result = buildScopesMap(
+        const result = createScopesMap(
             imports,
             manifests,
             (name, scope) => `${name}/${scope}`
@@ -1311,14 +1312,14 @@ describe('buildScopesMap', () => {
     });
 });
 
-describe('getImportMap', () => {
+describe('createImportMap', () => {
     test('should return empty import map for empty manifests', () => {
         const options: GetImportMapOptions = {
             manifests: [],
             getFile: (name, file) => `${name}/${file}`,
             getScope: (name, scope) => `${name}/${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {},
             scopes: {}
@@ -1355,7 +1356,7 @@ describe('getImportMap', () => {
             getFile: (name, file) => `${name}/${file}`,
             getScope: (name, scope) => `${name}/${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {
                 'test-module/component': 'test-module/component.js',
@@ -1409,7 +1410,7 @@ describe('getImportMap', () => {
             getFile: (name, file) => `${name}/${file}`,
             getScope: (name, scope) => `${name}/${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {
                 'module-a/utils': 'module-a/utils.js',
@@ -1445,7 +1446,7 @@ describe('getImportMap', () => {
             getFile: (name, file) => `${name}/${file}`,
             getScope: (name, scope) => `${name}/${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {
                 'test-module/component': 'test-module/component.js'
@@ -1470,7 +1471,7 @@ describe('getImportMap', () => {
             getFile: (name, file) => `${name}/${file}`,
             getScope: (name, scope) => `${name}/${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {},
             scopes: {
@@ -1504,7 +1505,7 @@ describe('getImportMap', () => {
             getFile: (name, file) => `/custom/path/${name}/${file}`,
             getScope: (name, scope) => `custom-scope-${name}-${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {
                 'test-module/component': '/custom/path/test-module/component.js'
@@ -1536,7 +1537,7 @@ describe('getImportMap', () => {
             getFile: (name, file) => `${name}/${file}`,
             getScope: (name, scope) => `${name}/${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {
                 'test-module/component': 'test-module/component.js'
@@ -1569,7 +1570,7 @@ describe('getImportMap', () => {
             getFile: (name, file) => `${name}/${file}`,
             getScope: (name, scope) => `${name}/${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {
                 'test-module/component': 'test-module/component.js'
@@ -1606,7 +1607,7 @@ describe('getImportMap', () => {
             getFile: (name, file) => `${name}/${file}`,
             getScope: (name, scope) => `${name}/${scope}`
         };
-        const result = getImportMap(options);
+        const result = createImportMap(options);
         assert.deepEqual(result, {
             imports: {
                 'test-module/src/index': 'test-module/src/index.js',
@@ -1620,3 +1621,160 @@ describe('getImportMap', () => {
         });
     });
 });
+
+describe('compressImportMap', () => {
+    test('does not promote when no global exists; keeps scopes intact', () => {
+        const importMap = {
+            imports: {},
+            scopes: {
+                '/a/': {
+                    vue: '/a/vue.final.mjs'
+                },
+                '/b/': {
+                    vue: '/a/vue.final.mjs'
+                }
+            }
+        };
+
+        const result = compressImportMap(importMap);
+        assert.deepEqual(result, {
+            imports: { vue: '/a/vue.final.mjs' }
+        });
+    });
+
+    test('does not promote when scoped mappings conflict across scopes', () => {
+        const importMap = {
+            imports: {},
+            scopes: {
+                '/a/': { vue: '/a/vue.final.mjs' },
+                '/b/': { vue: '/b/vue.final.mjs' }
+            }
+        };
+
+        const result = compressImportMap(importMap);
+        assert.deepEqual(result, importMap);
+    });
+
+    test('removes scoped entries that equal global mapping', () => {
+        const importMap = {
+            imports: { vue: '/shared/vue.final.mjs' },
+            scopes: {
+                '/a/': {
+                    vue: '/shared/vue.final.mjs',
+                    lodash: '/a/lodash.final.mjs'
+                }
+            }
+        };
+
+        const result = compressImportMap(importMap);
+        const expected = {
+            imports: {
+                vue: '/shared/vue.final.mjs',
+                lodash: '/a/lodash.final.mjs'
+            }
+        };
+        assert.deepEqual(result, expected);
+    });
+
+    test('promotes to global when global matches single unique target across scopes', () => {
+        const importMap = {
+            imports: { vue: '/shared/vue.final.mjs' },
+            scopes: {
+                '/a/': { vue: '/shared/vue.final.mjs' },
+                '/b/': { vue: '/shared/vue.final.mjs' }
+            }
+        };
+
+        const result = compressImportMap(importMap);
+        assert.deepEqual(result, {
+            imports: { vue: '/shared/vue.final.mjs' }
+        });
+    });
+
+    test('promotes to global when no global exists and targets are consistent across scopes (promote mode)', () => {
+        const importMap = {
+            imports: {},
+            scopes: {
+                '/a/': { vue: '/x/vue.final.mjs' },
+                '/b/': { vue: '/x/vue.final.mjs' }
+            }
+        };
+        const result = compressImportMap(importMap);
+        assert.deepEqual(result, {
+            imports: { vue: '/x/vue.final.mjs' }
+        });
+    });
+
+    test('promotes dominant target and keeps exceptions in scopes (promote mode)', () => {
+        const importMap = {
+            imports: {},
+            scopes: {
+                '/a/': { vue: '/x/vue.final.mjs' },
+                '/b/': { vue: '/x/vue.final.mjs' },
+                '/c/': { vue: '/y/vue2.final.mjs' }
+            }
+        };
+        const result = compressImportMap(importMap);
+        assert.deepEqual(result, {
+            imports: { vue: '/x/vue.final.mjs' },
+            scopes: {
+                '/c/': { vue: '/y/vue2.final.mjs' }
+            }
+        });
+    });
+
+    test('does not promote when no global exists; keeps scopes intact', () => {
+        const importMap = {
+            imports: {},
+            scopes: {
+                '/a/': { vue: '/shared/vue.final.mjs' },
+                '/b/': { vue: '/shared/vue.final.mjs' },
+                '/c/': { vue: '/c/vue2.final.mjs' }
+            }
+        };
+        const result = compressImportMap(importMap);
+        assert.deepEqual(result, {
+            imports: { vue: '/shared/vue.final.mjs' },
+            scopes: { '/c/': { vue: '/c/vue2.final.mjs' } }
+        });
+    });
+
+    test('aggressive default does not override different existing global', () => {
+        const importMap = {
+            imports: { vue: '/global/vue.final.mjs' },
+            scopes: {
+                '/a/': { vue: '/shared/vue.final.mjs' },
+                '/b/': { vue: '/shared/vue.final.mjs' }
+            }
+        };
+        const result = compressImportMap(importMap);
+        assert.deepEqual(result, {
+            imports: { vue: '/global/vue.final.mjs' },
+            scopes: {
+                '/a/': { vue: '/shared/vue.final.mjs' },
+                '/b/': { vue: '/shared/vue.final.mjs' }
+            }
+        });
+    });
+
+    test('returns new object and keeps input unchanged', () => {
+        const original = {
+            imports: {},
+            scopes: {
+                '/a/': { vue: '/x/vue.final.mjs' },
+                '/b/': { vue: '/x/vue.final.mjs' },
+                '/c/': { vue: '/y/vue2.final.mjs' }
+            }
+        };
+        const importMap = JSON.parse(JSON.stringify(original));
+        const result = compressImportMap(importMap);
+        assert.notStrictEqual(result, importMap);
+        assert.notStrictEqual(result.imports, importMap.imports);
+        assert.notStrictEqual(result.scopes, importMap.scopes);
+        assert.deepEqual(importMap, original);
+        assert.deepEqual(result, {
+            imports: { vue: '/x/vue.final.mjs' },
+            scopes: { '/c/': { vue: '/y/vue2.final.mjs' } }
+        });
+    });
+});