@esmx/core 3.0.0-rc.59 → 3.0.0-rc.60

package/dist/pack-config.d.ts

@@ -24,8 +24,8 @@ import type { Esmx } from './core';
  *     exports: [
  *       'root:src/components/button.vue',
  *       'root:src/utils/format.ts',
- *       'npm:vue',
- *       'npm:vue-router'
+ *       'pkg:vue',
+ *       'pkg:vue-router'
  *     ]
  *   },
  *   // 打包配置

package/dist/utils/import-map.d.ts

@@ -1,4 +1,4 @@
-import type { ImportMap } from '@esmx/import';
+import type { ImportMap, ScopesMap, SpecifierMap } from '@esmx/import';
 export interface ImportMapManifest {
     name: string;
     imports: Record<string, string>;
@@ -6,11 +6,15 @@ export interface ImportMapManifest {
         name: string;
         file: string;
         identifier: string;
-        rewrite: boolean;
+        pkg: boolean;
     }>;
+    scopes: Record<string, Record<string, string>>;
 }
-export declare function getImportMap({ manifests, getFile, getScope }: {
+export interface GetImportMapOptions {
     manifests: readonly ImportMapManifest[];
-    getScope: (name: string) => string;
+    getScope: (name: string, scope: string) => string;
     getFile: (name: string, file: string) => string;
-}): ImportMap;
+}
+export declare function buildImportsMap(manifests: readonly ImportMapManifest[], getFile: (name: string, file: string) => string): SpecifierMap;
+export declare function buildScopesMap(imports: SpecifierMap, manifests: readonly ImportMapManifest[], getScope: (name: string, scope: string) => string): ScopesMap;
+export declare function getImportMap({ manifests, getFile, getScope }: GetImportMapOptions): ImportMap;

package/dist/utils/import-map.mjs

@@ -1,35 +1,48 @@
 import { pathWithoutIndex } from "./path-without-index.mjs";
-export function getImportMap({
-  manifests,
-  getFile,
-  getScope
-}) {
+export function buildImportsMap(manifests, getFile) {
   const imports = {};
-  const scopes = {};
-  Object.values(manifests).forEach((manifest) => {
-    const scopeImports = {};
-    Object.entries(manifest.exports).forEach(([key, exportItem]) => {
-      if (typeof exportItem === "string") {
-        throw new Error(
-          `Detected incompatible legacy manifest format in ${manifest.name}. Please upgrade your ESMX dependencies first, then rebuild and redeploy your service.`
-        );
-      }
+  manifests.forEach((manifest) => {
+    Object.entries(manifest.exports).forEach(([, exportItem]) => {
       const file = getFile(manifest.name, exportItem.file);
       imports[exportItem.identifier] = file;
-      if (!exportItem.rewrite) {
-        scopeImports[exportItem.name] = file;
-      }
     });
-    if (Object.keys(scopeImports).length || Object.keys(imports).length) {
-      scopes[getScope(manifest.name)] = scopeImports;
-    }
   });
-  pathWithoutIndex(imports);
-  Object.values(manifests).forEach((manifest) => {
+  manifests.forEach((manifest) => {
     Object.entries(manifest.imports).forEach(([name, identifier]) => {
-      scopes[getScope(manifest.name)][name] = imports[identifier] ?? identifier;
+      const fullName = `${manifest.name}/${name}`;
+      imports[fullName] = imports[identifier] ?? identifier;
+    });
+  });
+  pathWithoutIndex(imports);
+  return imports;
+}
+export function buildScopesMap(imports, manifests, getScope) {
+  const scopes = {};
+  manifests.forEach((manifest) => {
+    if (!manifest.scopes) {
+      return;
+    }
+    Object.entries(manifest.scopes).forEach(([scopeName, specifierMap]) => {
+      const scopedImports = {};
+      Object.entries(specifierMap).forEach(
+        ([specifierName, identifier]) => {
+          scopedImports[specifierName] = imports[identifier] ?? identifier;
+        }
+      );
+      const scopePath = imports[`${manifest.name}/${scopeName}`] ?? `/${scopeName}`;
+      const scopeKey = getScope(manifest.name, scopePath);
+      scopes[scopeKey] = scopedImports;
     });
   });
+  return scopes;
+}
+export function getImportMap({
+  manifests,
+  getFile,
+  getScope
+}) {
+  const imports = buildImportsMap(manifests, getFile);
+  const scopes = buildScopesMap(imports, manifests, getScope);
   return {
     imports,
     scopes