@nasti-toolchain/nasti 2.0.0 → 2.0.2

package/dist/cli.cjs

@@ -1342,6 +1342,28 @@ async function transformRequest(url, ctx) {
   if (cleanReqUrl === "/@react-refresh") {
     return { code: getReactRefreshRuntimeEsm() };
   }
+  if (cleanReqUrl.startsWith("/@modules/") && url.includes("?")) {
+    const idParam = new URLSearchParams(url.slice(url.indexOf("?") + 1)).get("id");
+    let realId = null;
+    let realIdValid = false;
+    try {
+      if (idParam) {
+        realId = import_node_fs4.default.realpathSync(idParam);
+        realIdValid = import_node_fs4.default.statSync(realId).isFile() && (realId.includes(`${import_node_path4.default.sep}node_modules${import_node_path4.default.sep}`) || isUnderRoot(realId, config.root));
+      }
+    } catch {
+      realId = null;
+      realIdValid = false;
+    }
+    if (realId && realIdValid) {
+      const mod2 = await moduleGraph.ensureEntryFromUrl(url);
+      moduleGraph.registerModule(mod2, realId);
+      const code2 = await bundlePackageAsEsm(realId, config.root);
+      const transformResult2 = { code: code2 };
+      mod2.transformResult = transformResult2;
+      return transformResult2;
+    }
+  }
   if (cleanReqUrl.startsWith("/@modules/")) {
     const spec = cleanReqUrl.slice("/@modules/".length);
     const virtual = await loadVirtualModule(spec, ctx);
@@ -1379,7 +1401,7 @@ async function transformRequest(url, ctx) {
   const mod = await moduleGraph.ensureEntryFromUrl(url);
   moduleGraph.registerModule(mod, filePath);
   if (cleanReqUrl.startsWith("/@modules/")) {
-    const code2 = await bundlePackageAsEsm(filePath);
+    const code2 = await bundlePackageAsEsm(filePath, config.root);
     const transformResult2 = { code: code2 };
     mod.transformResult = transformResult2;
     return transformResult2;
@@ -1442,14 +1464,14 @@ async function loadVirtualModule(spec, ctx) {
   code = rewriteImports(code, config, anchor);
   return { id: resolvedId, result: { code } };
 }
-async function bundlePackageAsEsm(entryFile) {
+async function bundlePackageAsEsm(entryFile, root) {
   if (!esmBundleCache.has(entryFile)) {
-    esmBundleCache.set(entryFile, doBundlePackage(entryFile));
+    esmBundleCache.set(entryFile, doBundlePackage(entryFile, root));
   }
   return esmBundleCache.get(entryFile);
 }
-async function doBundlePackage(entryFile) {
-  const shim = await tryGenerateSubpathShim(entryFile);
+async function doBundlePackage(entryFile, root) {
+  const shim = await tryGenerateSubpathShim(entryFile, root);
   if (shim != null) return shim;
   const { rolldown: rolldown4 } = await import("rolldown");
   const bundle2 = await rolldown4({
@@ -1464,23 +1486,24 @@ async function doBundlePackage(entryFile) {
   await bundle2.close();
   let code = result.output[0].code;
   code = code.replace(/process\.env\.NODE_ENV/g, '"development"');
+  const externalBaseDir = import_node_path4.default.dirname(entryFile);
   code = code.replace(
     /^(import\b[^;'"]*?\bfrom\s+)(['"])([^'"./][^'"]*)(\2)/gm,
-    (_, prefix, q, spec) => `${prefix}${q}/@modules/${spec}${q}`
+    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir, root)}${q}`
   ).replace(
     /^(export\b[^;'"]*?\bfrom\s+)(['"])([^'"./][^'"]*)(\2)/gm,
-    (_, prefix, q, spec) => `${prefix}${q}/@modules/${spec}${q}`
+    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir, root)}${q}`
   ).replace(
     /^(import\s+)(['"])([^'"./][^'"]*)(\2)/gm,
-    (_, prefix, q, spec) => `${prefix}${q}/@modules/${spec}${q}`
+    (_, prefix, q, spec) => `${prefix}${q}${externalSpecToModuleUrl(spec, externalBaseDir, root)}${q}`
   );
-  code = rewriteExternalRequires(code);
+  code = rewriteExternalRequires(code, externalBaseDir, root);
   if (code.includes("__commonJSMin")) {
     code = await injectCjsNamedExports(code, entryFile);
   }
   return code;
 }
-async function tryGenerateSubpathShim(entryFile) {
+async function tryGenerateSubpathShim(entryFile, root) {
   const NM = `${import_node_path4.default.sep}node_modules${import_node_path4.default.sep}`;
   if (!entryFile.includes(NM)) return null;
   let pkgDir = null;
@@ -1531,9 +1554,11 @@ async function tryGenerateSubpathShim(entryFile) {
     if (!("default" in mainNs)) return null;
     if (mainNs["default"] !== subNs["default"]) return null;
   }
+  const rootMain = resolveNodeModule(root, pkgName);
+  const mainEntryUrl = rootMain && rootMain.startsWith(pkgDir + import_node_path4.default.sep) ? `/@modules/${pkgName}` : `/@modules/${pkgName}?id=${encodeURIComponent(mainEntry)}`;
   const lines = [
     `// Nasti subpath shim \u2192 ${pkgName} (avoid duplicate bundling)`,
-    `import * as __pkg from "/@modules/${pkgName}";`
+    `import * as __pkg from "${mainEntryUrl}";`
   ];
   for (const k of subKeys) {
     lines.push(`export const ${k} = __pkg[${JSON.stringify(k)}];`);
@@ -1577,7 +1602,7 @@ function pickMainEntryByExtension(pkgDir, preferredExt) {
   }
   return null;
 }
-function rewriteExternalRequires(code) {
+function rewriteExternalRequires(code, baseDir, root) {
   const pkgs = /* @__PURE__ */ new Set();
   const re = /__require\(["']([^"']+)["']\)/g;
   let m;
@@ -1589,7 +1614,7 @@ function rewriteExternalRequires(code) {
   const imports = [];
   for (const pkg of pkgs) {
     const safe = pkg.replace(/[^a-zA-Z0-9_$]/g, "_");
-    imports.push(`import * as __ns_${safe} from "/@modules/${pkg}";`);
+    imports.push(`import * as __ns_${safe} from "${externalSpecToModuleUrl(pkg, baseDir, root)}";`);
     imports.push(`var __req_${safe} = "default" in __ns_${safe} ? __ns_${safe}["default"] : __ns_${safe};`);
     result = result.replaceAll(`__require("${pkg}")`, `__req_${safe}`);
     result = result.replaceAll(`__require('${pkg}')`, `__req_${safe}`);
@@ -1686,7 +1711,23 @@ function isUnderRoot(abs, root) {
   const rel = import_node_path4.default.relative(root, abs);
   return !!rel && !rel.startsWith("..") && !import_node_path4.default.isAbsolute(rel);
 }
-function resolveNodeModule(root, moduleName) {
+function externalSpecToModuleUrl(spec, baseDir, root) {
+  const resolved = resolveNodeModule(baseDir, spec);
+  if (!resolved) return `/@modules/${spec}`;
+  const rootResolved = resolveNodeModule(root, spec);
+  if (rootResolved && rootResolved === resolved) return `/@modules/${spec}`;
+  return `/@modules/${spec}?id=${encodeURIComponent(resolved)}`;
+}
+function resolveNodeModule(baseDir, moduleName) {
+  const resolved = resolveNodeModuleEntry(baseDir, moduleName);
+  if (!resolved) return null;
+  try {
+    return import_node_fs4.default.realpathSync(resolved);
+  } catch {
+    return resolved;
+  }
+}
+function resolveNodeModuleEntry(root, moduleName) {
   let pkgName;
   let subpath;
   if (moduleName.startsWith("@")) {
@@ -1756,7 +1797,12 @@ function resolvePackageExports(exports2, key, pkgDir) {
     return key === "." ? import_node_path4.default.join(pkgDir, exports2) : null;
   }
   const entry = exports2[key];
-  if (entry === void 0) return null;
+  if (entry === void 0) {
+    if (key === "." && typeof exports2 === "object" && !Object.keys(exports2).some((k) => k.startsWith("."))) {
+      return resolveExportValue(exports2, pkgDir);
+    }
+    return null;
+  }
   return resolveExportValue(entry, pkgDir);
 }
 function resolveExportValue(value, pkgDir) {
@@ -3990,7 +4036,7 @@ async function build(inlineConfig = {}) {
   const startTime = performance.now();
   logger.info(
     import_picocolors6.default.cyan(`
-nasti v${"2.0.0"} `) + import_picocolors6.default.green(`building for ${config.mode}...`)
+nasti v${"2.0.2"} `) + import_picocolors6.default.green(`building for ${config.mode}...`)
   );
   debug5?.(`root: ${config.root}`);
   const buildableNames = Object.keys(config.environments).filter(
@@ -4709,7 +4755,7 @@ async function createServer(inlineConfig = {}) {
           const readyIn = Math.ceil(performance.now() - startTime);
           logger.info(
             `
-  ${import_picocolors8.default.cyan(import_picocolors8.default.bold("NASTI"))} ${import_picocolors8.default.cyan(`v${"2.0.0"}`)}  ${import_picocolors8.default.dim("ready in")} ${import_picocolors8.default.bold(readyIn)} ${import_picocolors8.default.dim("ms")}
+  ${import_picocolors8.default.cyan(import_picocolors8.default.bold("NASTI"))} ${import_picocolors8.default.cyan(`v${"2.0.2"}`)}  ${import_picocolors8.default.dim("ready in")} ${import_picocolors8.default.bold(readyIn)} ${import_picocolors8.default.dim("ms")}
 `
           );
           printServerUrls(
@@ -4843,7 +4889,7 @@ async function buildElectron(inlineConfig = {}) {
   const config = await resolveConfig({ ...inlineConfig, target: "electron" }, "build");
   const startTime = performance.now();
   assertElectronVersion(config);
-  console.log(import_picocolors9.default.cyan("\n\u26A1 nasti build (electron)") + import_picocolors9.default.dim(` v${"2.0.0"}`));
+  console.log(import_picocolors9.default.cyan("\n\u26A1 nasti build (electron)") + import_picocolors9.default.dim(` v${"2.0.2"}`));
   console.log(import_picocolors9.default.dim(`  root: ${config.root}`));
   console.log(import_picocolors9.default.dim(`  mode: ${config.mode}`));
   console.log(import_picocolors9.default.dim(`  target: electron (\u2265 ${config.electron.minVersion})`));
@@ -4999,7 +5045,7 @@ async function startElectronDev(inlineConfig = {}) {
   const { noSpawn, ...rest } = inlineConfig;
   const config = await resolveConfig({ ...rest, target: "electron" }, "serve");
   warnElectronVersion(config);
-  console.log(import_picocolors10.default.cyan("\n\u26A1 nasti electron dev") + import_picocolors10.default.dim(` v${"2.0.0"}`));
+  console.log(import_picocolors10.default.cyan("\n\u26A1 nasti electron dev") + import_picocolors10.default.dim(` v${"2.0.2"}`));
   const { createServer: createServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
   const server = await createServer2({ ...rest, target: "electron" });
   await server.listen();
@@ -5352,7 +5398,7 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
     const host = options.host === true ? "0.0.0.0" : options.host ?? "localhost";
     http2.createServer(app).listen(port, host, () => {
       logger.info(`
-  ${import_picocolors11.default.cyan(import_picocolors11.default.bold("NASTI"))} ${import_picocolors11.default.cyan(`v${"2.0.0"}`)}  ${import_picocolors11.default.dim("preview")}
+  ${import_picocolors11.default.cyan(import_picocolors11.default.bold("NASTI"))} ${import_picocolors11.default.cyan(`v${"2.0.2"}`)}  ${import_picocolors11.default.dim("preview")}
 `);
       printServerUrls2(
         {
@@ -5369,6 +5415,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("2.0.0");
+cli.version("2.0.2");
 cli.parse();
 //# sourceMappingURL=cli.cjs.map