@nasti-toolchain/nasti 1.6.0 → 1.6.2

package/dist/cli.js

@@ -739,7 +739,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;
@@ -935,7 +935,7 @@ async function transformRequest(url, ctx) {
     config.mode
   );
   code = replaceEnvInCode(code, envDefine);
-  code = rewriteImports(code, config);
+  code = rewriteImports(code, config, filePath);
   const transformResult = { code };
   mod.transformResult = transformResult;
   return transformResult;
@@ -947,6 +947,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 +978,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;
@@ -1017,26 +1116,73 @@ async function injectCjsNamedExports(code, entryFile) {
     return code;
   }
 }
-function rewriteImports(code, _config) {
-  return code.replace(
-    /\bfrom\s+(['"])([^'"./][^'"]*)\1/g,
-    (match, quote, specifier) => {
-      return `from ${quote}/@modules/${specifier}${quote}`;
+function rewriteImports(code, config, filePath) {
+  const root = config.root;
+  const fileDir = path4.dirname(filePath);
+  const aliasEntries = Object.entries(config.resolve.alias).sort(
+    ([a], [b]) => b.length - a.length
+  );
+  const toRootUrl = (abs) => "/" + path4.relative(root, abs).replace(/\\/g, "/");
+  const transformSpec = (spec) => {
+    const suffixMatch = spec.match(/[?#].*$/);
+    const suffix = suffixMatch ? suffixMatch[0] : "";
+    const baseSpec = suffix ? spec.slice(0, -suffix.length) : spec;
+    for (const [key, value] of aliasEntries) {
+      if (baseSpec === key || baseSpec.startsWith(key + "/")) {
+        const aliasBase = resolveAliasTarget(value, root);
+        const sub = baseSpec.slice(key.length).replace(/^\//, "");
+        const target = sub ? path4.join(aliasBase, sub) : aliasBase;
+        const resolved = tryResolveDiskPath(target);
+        return resolved && isUnderRoot(resolved, root) ? toRootUrl(resolved) + suffix : spec;
+      }
     }
-  ).replace(
-    // 处理纯副作用导入: import 'bare-specifier'
-    /\bimport\s+(['"])([^'"./][^'"]*)\1/g,
-    (match, quote, specifier) => {
-      return `import ${quote}/@modules/${specifier}${quote}`;
+    if (baseSpec.startsWith("./") || baseSpec.startsWith("../")) {
+      const target = path4.resolve(fileDir, baseSpec);
+      const resolved = tryResolveDiskPath(target);
+      return resolved && isUnderRoot(resolved, root) ? toRootUrl(resolved) + suffix : spec;
     }
-  ).replace(
-    // 处理动态导入: import('bare-specifier')
-    /\bimport\s*\(\s*(['"])([^'"./][^'"]*)\1\s*\)/g,
-    (match, quote, specifier) => {
-      return `import(${quote}/@modules/${specifier}${quote})`;
+    if (baseSpec.startsWith("/") && !baseSpec.startsWith("/@")) {
+      const target = path4.join(root, baseSpec.replace(/^\//, ""));
+      const resolved = tryResolveDiskPath(target);
+      return resolved && isUnderRoot(resolved, root) ? toRootUrl(resolved) + suffix : spec;
     }
+    if (baseSpec.startsWith("/")) return spec;
+    return `/@modules/${spec}`;
+  };
+  return code.replace(
+    /\bfrom\s+(['"])([^'"]+)\1/g,
+    (_m, q, s) => `from ${q}${transformSpec(s)}${q}`
+  ).replace(
+    /\bimport\s+(['"])([^'"]+)\1/g,
+    (_m, q, s) => `import ${q}${transformSpec(s)}${q}`
+  ).replace(
+    /\bimport\s*\(\s*(['"])([^'"]+)\1\s*\)/g,
+    (_m, q, s) => `import(${q}${transformSpec(s)}${q})`
   );
 }
+function resolveAliasTarget(value, root) {
+  if (path4.isAbsolute(value) && fs4.existsSync(value)) return value;
+  if (value.startsWith("/")) return path4.join(root, value.slice(1));
+  return path4.resolve(root, value);
+}
+function tryResolveDiskPath(target) {
+  if (fs4.existsSync(target) && fs4.statSync(target).isFile()) return target;
+  for (const ext of RESOLVE_EXTENSIONS) {
+    const withExt = target + ext;
+    if (fs4.existsSync(withExt) && fs4.statSync(withExt).isFile()) return withExt;
+  }
+  if (fs4.existsSync(target) && fs4.statSync(target).isDirectory()) {
+    for (const ext of RESOLVE_EXTENSIONS) {
+      const idx = path4.join(target, "index" + ext);
+      if (fs4.existsSync(idx) && fs4.statSync(idx).isFile()) return idx;
+    }
+  }
+  return null;
+}
+function isUnderRoot(abs, root) {
+  const rel = path4.relative(root, abs);
+  return !!rel && !rel.startsWith("..") && !path4.isAbsolute(rel);
+}
 function resolveNodeModule(root, moduleName) {
   let pkgName;
   let subpath;
@@ -1644,7 +1790,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.0"}`));
+          console.log(pc.cyan("  nasti dev server") + pc.dim(` v${"1.6.2"}`));
           console.log();
           console.log(`  ${pc.green(">")} Local:   ${pc.cyan(localUrl)}`);
           if (networkUrl) {
@@ -1767,7 +1913,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.0"}`));
+  console.log(pc2.cyan("\n\u{1F528} nasti build") + pc2.dim(` v${"1.6.2"}`));
   console.log(pc2.dim(`  root: ${config.root}`));
   console.log(pc2.dim(`  mode: ${config.mode}`));
   const outDir = path10.resolve(config.root, config.build.outDir);
@@ -1927,7 +2073,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.0"}`));
+  console.log(pc3.cyan("\n\u26A1 nasti build (electron)") + pc3.dim(` v${"1.6.2"}`));
   console.log(pc3.dim(`  root: ${config.root}`));
   console.log(pc3.dim(`  mode: ${config.mode}`));
   console.log(pc3.dim(`  target: electron (\u2265 ${config.electron.minVersion})`));
@@ -2081,7 +2227,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.0"}`));
+  console.log(pc4.cyan("\n\u26A1 nasti electron dev") + pc4.dim(` v${"1.6.2"}`));
   const { createServer: createServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
   const server = await createServer2({ ...rest, target: "electron" });
   await server.listen();
@@ -2408,6 +2554,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.6.0");
+cli.version("1.6.2");
 cli.parse();
 //# sourceMappingURL=cli.js.map