@nasti-toolchain/nasti 1.6.1 → 1.6.3

package/dist/cli.js

@@ -443,6 +443,19 @@ var init_module_graph = __esm({
         }
         mods.add(mod);
       }
+      /**
+       * Reindex a module under a plugin-provided canonical id (e.g. a `\0virtual:foo`
+       * id returned from `resolveId`). Plugins look up their own virtual modules via
+       * `getModuleById(RESOLVED_ID)` to invalidate them on watcher events; without
+       * this remap they'd never find the node because `ensureEntryFromUrl` keys by
+       * the public URL only.
+       */
+      setModuleId(mod, id) {
+        if (mod.id === id) return;
+        this.idToModuleMap.delete(mod.id);
+        mod.id = id;
+        this.idToModuleMap.set(id, mod);
+      }
       /** 更新模块依赖关系 */
       updateModuleImports(mod, importedIds) {
         for (const imported of mod.importedModules) {
@@ -739,7 +752,7 @@ __export(middleware_exports, {
 import path4 from "path";
 import fs4 from "fs";
 import { createRequire } from "module";
-import { fileURLToPath } from "url";
+import { fileURLToPath, pathToFileURL as pathToFileURL2 } from "url";
 function getReactRefreshRuntimeEsm() {
   if (__refreshRuntimeCache) return __refreshRuntimeCache;
   let cjsPath;
@@ -894,6 +907,16 @@ async function transformRequest(url, ctx) {
   if (cleanReqUrl === "/@react-refresh") {
     return { code: getReactRefreshRuntimeEsm() };
   }
+  if (cleanReqUrl.startsWith("/@modules/")) {
+    const spec = cleanReqUrl.slice("/@modules/".length);
+    const virtual = await loadVirtualModule(spec, ctx);
+    if (virtual) {
+      const mod2 = await moduleGraph.ensureEntryFromUrl(url);
+      moduleGraph.setModuleId(mod2, virtual.id);
+      mod2.transformResult = virtual.result;
+      return virtual.result;
+    }
+  }
   const filePath = resolveUrlToFile(url, config.root);
   if (!filePath || !fs4.existsSync(filePath)) return null;
   const mod = await moduleGraph.ensureEntryFromUrl(url);
@@ -940,6 +963,28 @@ async function transformRequest(url, ctx) {
   mod.transformResult = transformResult;
   return transformResult;
 }
+async function loadVirtualModule(spec, ctx) {
+  const { config, pluginContainer } = ctx;
+  const resolved = await pluginContainer.resolveId(spec);
+  if (resolved == null) return null;
+  const resolvedId = typeof resolved === "string" ? resolved : resolved.id;
+  const looksVirtual = resolvedId.startsWith("\0") || !fs4.existsSync(resolvedId);
+  if (!looksVirtual) return null;
+  const loadResult = await pluginContainer.load(resolvedId);
+  if (loadResult == null) return null;
+  let code = typeof loadResult === "string" ? loadResult : loadResult.code;
+  const transformed = await pluginContainer.transform(code, resolvedId);
+  if (transformed != null) {
+    code = typeof transformed === "string" ? transformed : transformed.code;
+  }
+  code = replaceEnvInCode(code, ctx.envDefine ?? buildEnvDefine(
+    loadEnv(config.mode, config.root, config.envPrefix),
+    config.mode
+  ));
+  const anchor = path4.join(config.root, "__nasti_virtual__.ts");
+  code = rewriteImports(code, config, anchor);
+  return { id: resolvedId, result: { code } };
+}
 async function bundlePackageAsEsm(entryFile) {
   if (!esmBundleCache.has(entryFile)) {
     esmBundleCache.set(entryFile, doBundlePackage(entryFile));
@@ -947,6 +992,8 @@ async function bundlePackageAsEsm(entryFile) {
   return esmBundleCache.get(entryFile);
 }
 async function doBundlePackage(entryFile) {
+  const shim = await tryGenerateSubpathShim(entryFile);
+  if (shim != null) return shim;
   const { rolldown: rolldown4 } = await import("rolldown");
   const bundle = await rolldown4({
     input: entryFile,
@@ -976,6 +1023,103 @@ async function doBundlePackage(entryFile) {
   }
   return code;
 }
+async function tryGenerateSubpathShim(entryFile) {
+  const NM = `${path4.sep}node_modules${path4.sep}`;
+  if (!entryFile.includes(NM)) return null;
+  let pkgDir = null;
+  let pkgName = null;
+  let dir = path4.dirname(entryFile);
+  while (true) {
+    const pkgJsonPath = path4.join(dir, "package.json");
+    if (fs4.existsSync(pkgJsonPath)) {
+      try {
+        const pkg = JSON.parse(fs4.readFileSync(pkgJsonPath, "utf-8"));
+        if (typeof pkg?.name === "string" && pkg.name) {
+          pkgDir = dir;
+          pkgName = pkg.name;
+          break;
+        }
+      } catch {
+      }
+    }
+    const parent = path4.dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+    if (!dir.includes(NM)) return null;
+  }
+  if (!pkgDir || !pkgName) return null;
+  const entryExt = path4.extname(entryFile);
+  const mainEntry = pickMainEntryByExtension(pkgDir, entryExt);
+  if (!mainEntry) return null;
+  if (path4.resolve(mainEntry) === path4.resolve(entryFile)) return null;
+  let mainNs;
+  let subNs;
+  try {
+    mainNs = await import(pathToFileURL2(mainEntry).href);
+    subNs = await import(pathToFileURL2(entryFile).href);
+  } catch {
+    return null;
+  }
+  if (!mainNs || typeof mainNs !== "object") return null;
+  if (!subNs || typeof subNs !== "object") return null;
+  const subKeys = Object.keys(subNs).filter(
+    (k) => k !== "__esModule" && k !== "default" && VALID_IDENT.test(k)
+  );
+  if (subKeys.length === 0) return null;
+  for (const k of subKeys) {
+    if (!(k in mainNs)) return null;
+    if (mainNs[k] !== subNs[k]) return null;
+  }
+  if ("default" in subNs) {
+    if (!("default" in mainNs)) return null;
+    if (mainNs["default"] !== subNs["default"]) return null;
+  }
+  const lines = [
+    `// Nasti subpath shim \u2192 ${pkgName} (avoid duplicate bundling)`,
+    `import * as __pkg from "/@modules/${pkgName}";`
+  ];
+  for (const k of subKeys) {
+    lines.push(`export const ${k} = __pkg[${JSON.stringify(k)}];`);
+  }
+  if ("default" in subNs) {
+    lines.push(`export default ("default" in __pkg ? __pkg["default"] : __pkg);`);
+  }
+  return lines.join("\n") + "\n";
+}
+function pickMainEntryByExtension(pkgDir, preferredExt) {
+  const pkgJsonPath = path4.join(pkgDir, "package.json");
+  let pkg;
+  try {
+    pkg = JSON.parse(fs4.readFileSync(pkgJsonPath, "utf-8"));
+  } catch {
+    return null;
+  }
+  const candidates = [];
+  const collectFromExportObject = (obj) => {
+    if (!obj || typeof obj !== "object") return;
+    for (const cond of ["import", "module", "default", "require", "node"]) {
+      const v = obj[cond];
+      if (typeof v === "string") candidates.push(v);
+      else if (v && typeof v === "object") collectFromExportObject(v);
+    }
+  };
+  const dot = pkg?.exports?.["."];
+  if (typeof dot === "string") candidates.push(dot);
+  else if (dot && typeof dot === "object") collectFromExportObject(dot);
+  if (typeof pkg.module === "string") candidates.push(pkg.module);
+  if (typeof pkg.main === "string") candidates.push(pkg.main);
+  for (const cand of candidates) {
+    if (path4.extname(cand) === preferredExt) {
+      const full = path4.resolve(pkgDir, cand);
+      if (fs4.existsSync(full)) return full;
+    }
+  }
+  for (const cand of candidates) {
+    const full = path4.resolve(pkgDir, cand);
+    if (fs4.existsSync(full)) return full;
+  }
+  return null;
+}
 function rewriteExternalRequires(code) {
   const pkgs = /* @__PURE__ */ new Set();
   const re = /__require\(["']([^"']+)["']\)/g;
@@ -1691,7 +1835,7 @@ async function createServer(inlineConfig = {}) {
           const localUrl = `http://localhost:${actualPort}`;
           const networkUrl = host === "0.0.0.0" ? `http://${getNetworkAddress()}:${actualPort}` : null;
           console.log();
-          console.log(pc.cyan("  nasti dev server") + pc.dim(` v${"1.6.1"}`));
+          console.log(pc.cyan("  nasti dev server") + pc.dim(` v${"1.6.3"}`));
           console.log();
           console.log(`  ${pc.green(">")} Local:   ${pc.cyan(localUrl)}`);
           if (networkUrl) {
@@ -1814,7 +1958,7 @@ import pc2 from "picocolors";
 async function build(inlineConfig = {}) {
   const config = await resolveConfig(inlineConfig, "build");
   const startTime = performance.now();
-  console.log(pc2.cyan("\n\u{1F528} nasti build") + pc2.dim(` v${"1.6.1"}`));
+  console.log(pc2.cyan("\n\u{1F528} nasti build") + pc2.dim(` v${"1.6.3"}`));
   console.log(pc2.dim(`  root: ${config.root}`));
   console.log(pc2.dim(`  mode: ${config.mode}`));
   const outDir = path10.resolve(config.root, config.build.outDir);
@@ -1880,7 +2024,11 @@ async function build(inlineConfig = {}) {
         load: p.load,
         transform: p.transform,
         buildStart: p.buildStart,
-        buildEnd: p.buildEnd
+        buildEnd: p.buildEnd,
+        // Forward `closeBundle` to Rolldown — it invokes the hook during
+        // `bundle.close()` below. This is the hook Vite plugins (e.g. PWA
+        // manifest/SW writers) rely on for final-stage artifact emission.
+        closeBundle: p.closeBundle
       }))
     ],
     ...config.build.rolldownOptions
@@ -1974,7 +2122,7 @@ async function buildElectron(inlineConfig = {}) {
   const config = await resolveConfig({ ...inlineConfig, target: "electron" }, "build");
   const startTime = performance.now();
   assertElectronVersion(config);
-  console.log(pc3.cyan("\n\u26A1 nasti build (electron)") + pc3.dim(` v${"1.6.1"}`));
+  console.log(pc3.cyan("\n\u26A1 nasti build (electron)") + pc3.dim(` v${"1.6.3"}`));
   console.log(pc3.dim(`  root: ${config.root}`));
   console.log(pc3.dim(`  mode: ${config.mode}`));
   console.log(pc3.dim(`  target: electron (\u2265 ${config.electron.minVersion})`));
@@ -2128,7 +2276,7 @@ async function startElectronDev(inlineConfig = {}) {
   const { noSpawn, ...rest } = inlineConfig;
   const config = await resolveConfig({ ...rest, target: "electron" }, "serve");
   warnElectronVersion(config);
-  console.log(pc4.cyan("\n\u26A1 nasti electron dev") + pc4.dim(` v${"1.6.1"}`));
+  console.log(pc4.cyan("\n\u26A1 nasti electron dev") + pc4.dim(` v${"1.6.3"}`));
   const { createServer: createServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
   const server = await createServer2({ ...rest, target: "electron" });
   await server.listen();
@@ -2455,6 +2603,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.6.1");
+cli.version("1.6.3");
 cli.parse();
 //# sourceMappingURL=cli.js.map