@esmx/core 3.0.0-rc.11 → 3.0.0-rc.13

package/dist/cli/cli.mjs

@@ -1,7 +1,7 @@
 import module from "node:module";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { COMMAND, Esmx } from "../esmx";
+import { COMMAND, Esmx } from "../esmx.mjs";
 async function getSrcOptions() {
   return import(path.resolve(process.cwd(), "./src/entry.node.ts")).then(
     (m) => m.default

package/dist/{gez.mjs → esmx.mjs}

@@ -738,7 +738,7 @@ export class Esmx {
         if (this._importmapHash === null) {
           let wrote = false;
           const code = `(() => {
-const base = document.currentScript.getAttribute('data-base');
+const base = document.currentScript.getAttribute("data-base");
 const importmap = ${serialize(importmap, { isJSON: true })};
 if (importmap.imports && base) {
     const imports = importmap.imports;
@@ -746,10 +746,10 @@ if (importmap.imports && base) {
         imports[k] = base + v;
     });
 }
-document.head.appendChild(Object.assign(document.createElement('script'), {
-type: 'importmap',
-innerHTML: JSON.stringify(importmap)
-}));
+const script = document.createElement("script");
+script.type = "importmap";
+script.innerHTML = JSON.stringify(importmap);
+document.head.appendChild(script);
 })();`;
           const hash = contentHash(code);
           filepath = this.resolvePath(

package/dist/index.mjs

@@ -1,6 +1,6 @@
 export {
   Esmx
-} from "./esmx";
+} from "./esmx.mjs";
 export {
   PathType,
   parseModuleConfig

package/dist/utils/static-import-lexer.d.ts

@@ -23,4 +23,6 @@ export type ImportPreloadInfo = SpecifierMap;
  *   - `Promise<{ [specifier: string]: ImportPreloadPathString }>` 模块名和文件路径的映射对象
  *   - `null` specifier 不存在
  */
-export declare function getImportPreloadInfo(specifier: string, importMap: ImportMap, moduleConfig: ParsedModuleConfig): Promise<SpecifierMap | null>;
+export declare function getImportPreloadInfo(specifier: string, importMap: ImportMap, moduleConfig: ParsedModuleConfig): Promise<{
+    [k: string]: string;
+} | null>;

package/dist/utils/static-import-lexer.mjs

@@ -15,29 +15,28 @@ export async function getImportPreloadInfo(specifier, importMap, moduleConfig) {
   if (!importInfo || !(specifier in importInfo)) {
     return null;
   }
-  const ans = {};
-  const needHandles = [[specifier]];
+  const ans = {
+    // 入口文件也放入预加载列表
+    [specifier]: importInfo[specifier]
+  };
+  const needHandles = [specifier];
   while (needHandles.length) {
-    const needHandle = [];
-    for (const specifier2 of needHandles.shift()) {
-      let filepath = importInfo[specifier2];
-      const splitRes = filepath.split("/");
-      if (splitRes[0] === "") splitRes.shift();
-      const name = splitRes.shift() + "";
-      const link = moduleConfig.links.find((item) => item.name === name);
-      if (!link) {
-        continue;
-      }
-      filepath = path.join(link.root, "client", ...splitRes);
-      const imports = await getImportsFromJsFile(filepath);
-      imports.forEach((specifier3) => {
-        if (specifier3 in importInfo && !ans[specifier3]) {
-          ans[specifier3] = importInfo[specifier3];
-          needHandle.push(specifier3);
-        }
-      });
+    const specifier2 = needHandles.shift();
+    let filepath = importInfo[specifier2];
+    const splitRes = filepath.split("/");
+    if (splitRes[0] === "") splitRes.shift();
+    const name = splitRes.shift() + "";
+    const link = moduleConfig.links.find((item) => item.name === name);
+    if (!link) {
+      continue;
+    }
+    filepath = path.join(link.root, "client", ...splitRes);
+    const imports = await getImportsFromJsFile(filepath);
+    for (const specifier3 of imports) {
+      if (!(specifier3 in importInfo) || specifier3 in ans) continue;
+      ans[specifier3] = importInfo[specifier3];
+      needHandles.push(specifier3);
     }
-    needHandle.length && needHandles.push(needHandle);
   }
-  return ans;
+  return Object.fromEntries(Object.entries(ans).reverse());
 }

package/package.json

@@ -59,17 +59,18 @@
         "build": "unbuild"
     },
     "dependencies": {
-        "@esmx/import": "3.0.0-rc.11",
+        "@esmx/import": "3.0.0-rc.13",
         "@types/serialize-javascript": "^5.0.4",
         "es-module-lexer": "^1.6.0",
         "find": "^0.3.0",
-        "send": "^1.1.0",
+        "send": "^1.2.0",
         "serialize-javascript": "^6.0.2",
         "write": "^2.0.0"
     },
     "devDependencies": {
         "@biomejs/biome": "1.9.4",
-        "@esmx/lint": "3.0.0-rc.11",
+        "@esmx/lint": "3.0.0-rc.13",
+        "@gez/lint": "3.0.0-rc.9",
         "@types/find": "^0.2.4",
         "@types/node": "22.13.10",
         "@types/send": "^0.17.4",
@@ -80,7 +81,7 @@
         "unbuild": "2.0.0",
         "vitest": "3.0.8"
     },
-    "version": "3.0.0-rc.11",
+    "version": "3.0.0-rc.13",
     "type": "module",
     "private": false,
     "exports": {
@@ -103,5 +104,5 @@
         "template",
         "public"
     ],
-    "gitHead": "0920e0485284528eb642a7078f4cb48b013352a5"
+    "gitHead": "801082f89364db5e1137431e3cc1121f689fa7ca"
 }

package/src/{gez.ts → esmx.ts}

@@ -915,7 +915,7 @@ export class Esmx {
                 if (this._importmapHash === null) {
                     let wrote = false;
                     const code = `(() => {
-const base = document.currentScript.getAttribute('data-base');
+const base = document.currentScript.getAttribute("data-base");
 const importmap = ${serialize(importmap, { isJSON: true })};
 if (importmap.imports && base) {
     const imports = importmap.imports;
@@ -923,10 +923,10 @@ if (importmap.imports && base) {
         imports[k] = base + v;
     });
 }
-document.head.appendChild(Object.assign(document.createElement('script'), {
-type: 'importmap',
-innerHTML: JSON.stringify(importmap)
-}));
+const script = document.createElement("script");
+script.type = "importmap";
+script.innerHTML = JSON.stringify(importmap);
+document.head.appendChild(script);
 })();`;
                     const hash = contentHash(code);
                     filepath = this.resolvePath(

package/src/utils/static-import-lexer.ts

@@ -53,33 +53,34 @@ export async function getImportPreloadInfo(
         return null;
     }
 
-    const ans: ImportPreloadInfo = {};
+    const ans: ImportPreloadInfo = {
+        // 入口文件也放入预加载列表
+        [specifier]: importInfo[specifier]
+    };
 
-    const needHandles: string[][] = [[specifier]];
     // 词法分析是耗时操作，因此处理的文件越少越快，换句话说就是深度越浅越快，因此这里使用广度优先搜索
+    const needHandles: string[] = [specifier];
     while (needHandles.length) {
-        const needHandle: string[] = [];
-        for (const specifier of needHandles.shift()!) {
-            let filepath = importInfo[specifier];
-            const splitRes = filepath.split('/');
-            if (splitRes[0] === '') splitRes.shift();
-            const name = splitRes.shift() + '';
-            const link = moduleConfig.links.find((item) => item.name === name);
-            if (!link) {
-                continue;
-            }
-            filepath = path.join(link.root, 'client', ...splitRes);
-            const imports = await getImportsFromJsFile(filepath);
-            imports.forEach((specifier) => {
-                // 如果模块名在 importMap 中存在，且没处理过
-                if (specifier in importInfo && !ans[specifier]) {
-                    ans[specifier] = importInfo[specifier];
-                    needHandle.push(specifier);
-                }
-            });
+        const specifier = needHandles.shift()!;
+        let filepath = importInfo[specifier];
+        const splitRes = filepath.split('/');
+        if (splitRes[0] === '') splitRes.shift();
+        // 这里默认路径的第一个目录是软包名称
+        const name = splitRes.shift() + '';
+        const link = moduleConfig.links.find((item) => item.name === name);
+        if (!link) {
+            continue;
+        }
+        filepath = path.join(link.root, 'client', ...splitRes);
+        const imports = await getImportsFromJsFile(filepath);
+        for (const specifier of imports) {
+            // 如果模块名在 importMap 中不存在，或已经处理过
+            if (!(specifier in importInfo) || specifier in ans) continue;
+            ans[specifier] = importInfo[specifier];
+            needHandles.push(specifier);
         }
-        needHandle.length && needHandles.push(needHandle);
     }
 
-    return ans;
+    // 倒序，理论上倒序后浏览器解析可能会更快
+    return Object.fromEntries(Object.entries(ans).reverse());
 }