core: adjust client import-map order; use Object.hasOwn in compressImportMap

Author: lzxb

packages/core/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 { createImportMap } 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 = createImportMap({
+                    json = createClientImportMap({
                         manifests,
                         getScope(name, scope) {
                             return `/${name}${scope}`;

packages/core/src/utils/import-map.test.ts

@@ -462,20 +462,17 @@ describe('fixImportMapNestedScopes', () => {
         };
 
         const result = fixImportMapNestedScopes(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 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', () => {
@@ -748,8 +745,11 @@ describe('fixImportMapNestedScopes', () => {
         };
 
         const result = fixImportMapNestedScopes(importMap);
-        assert.deepEqual(result.imports, importMap.imports);
-        assert.isUndefined(result.scopes['/shared/modules/vue2/']);
+        const expected = {
+            imports: importMap.imports,
+            scopes: {}
+        };
+        assert.deepEqual(result, expected);
         assert.doesNotThrow(() => {
             fixImportMapNestedScopes(importMap);
         });
@@ -1668,10 +1668,14 @@ describe('compressImportMap', () => {
         };
 
         const result = compressImportMap(importMap);
-        assert.deepEqual(result.imports, importMap.imports);
-        assert.deepEqual(result.scopes, {
-            '/a/': { lodash: '/a/lodash.final.mjs' }
-        });
+        const expected = {
+            imports: {
+                vue: '/shared/vue.final.mjs',
+                lodash: '/a/lodash.final.mjs'
+            },
+            scopes: {}
+        };
+        assert.deepEqual(result, expected);
     });
 
     test('promotes to global when global matches single unique target across scopes', () => {

packages/core/src/utils/import-map.ts

@@ -129,8 +129,6 @@ export function fixImportMapNestedScopes(
 export function compressImportMap(
     importMap: Required<ImportMap>
 ): Required<ImportMap> {
-    const minOccurrences = 2;
-
     const compressed: Required<ImportMap> = {
         imports: { ...importMap.imports },
         scopes: {}
@@ -160,7 +158,7 @@ export function compressImportMap(
                 secondBestCount = Math.max(secondBestCount, c);
             }
         }
-        if (best && best[1] >= minOccurrences && best[1] > secondBestCount) {
+        if (best && best[1] > secondBestCount) {
             compressed.imports[specifier] = best[0];
         }
     });
@@ -197,3 +195,11 @@ export function createImportMap({
         scopes
     };
 }
+
+export function createClientImportMap(
+    options: GetImportMapOptions
+): Required<ImportMap> {
+    const base = createImportMap(options);
+    const fixed = fixImportMapNestedScopes(base);
+    return compressImportMap(fixed);
+}

packages/router-vue/src/plugin.test.ts

@@ -45,7 +45,7 @@ describe('plugin.ts - RouterPlugin', () => {
         router = new Router({
             mode: RouterMode.memory,
             routes,
-            base: new URL('http://localhost:3000/')
+            base: new URL('http://localhost:8000/')
         });
 
         await router.replace('/');

packages/router-vue/src/router-link.test.ts

@@ -52,7 +52,7 @@ describe('router-link.ts - RouterLink Component', () => {
             root: '#test-app',
             routes,
             mode: RouterMode.memory,
-            base: new URL('http://localhost:3000/')
+            base: new URL('http://localhost:8000/')
         });
 
         // Initialize router and wait for it to be ready

packages/router-vue/src/router-view.test.ts

@@ -80,7 +80,7 @@ describe('router-view.ts - RouterView Component', () => {
             root: '#test-app',
             routes,
             mode: RouterMode.memory,
-            base: new URL('http://localhost:3000/')
+            base: new URL('http://localhost:8000/')
         });
 
         // Initialize router to root path and wait for it to be ready
@@ -201,7 +201,7 @@ describe('router-view.ts - RouterView Component', () => {
                 root: '#test-app',
                 routes,
                 mode: RouterMode.memory,
-                base: new URL('http://localhost:3000/')
+                base: new URL('http://localhost:8000/')
             });
 
             // Initialize the router and wait for it to be ready
@@ -334,7 +334,7 @@ describe('router-view.ts - RouterView Component', () => {
                 root: '#test-app',
                 routes: nestedRoutes,
                 mode: RouterMode.memory,
-                base: new URL('http://localhost:3000/')
+                base: new URL('http://localhost:8000/')
             });
 
             // Initialize the router and wait for it to be ready
@@ -411,7 +411,7 @@ describe('router-view.ts - RouterView Component', () => {
                 root: '#test-app',
                 routes: routesWithNull,
                 mode: RouterMode.memory,
-                base: new URL('http://localhost:3000/')
+                base: new URL('http://localhost:8000/')
             });
 
             // Initialize the router and wait for it to be ready
@@ -451,7 +451,7 @@ describe('router-view.ts - RouterView Component', () => {
                     }
                 ],
                 mode: RouterMode.memory,
-                base: new URL('http://localhost:3000/')
+                base: new URL('http://localhost:8000/')
             });
 
             // Initialize router with root path
@@ -504,7 +504,7 @@ describe('router-view.ts - RouterView Component', () => {
                 root: '#test-app',
                 routes: malformedRoutes,
                 mode: RouterMode.memory,
-                base: new URL('http://localhost:3000/')
+                base: new URL('http://localhost:8000/')
             });
 
             // Initialize the router and wait for it to be ready

packages/router-vue/src/use.test.ts

@@ -22,7 +22,7 @@ describe('Router Vue Integration', () => {
                 { path: '/user/:id', component: {} },
                 { path: '/new-path', component: {} }
             ],
-            base: new URL('http://localhost:3000/')
+            base: new URL('http://localhost:8000/')
         });
 
         // Ensure navigation to initial route is complete