@nasti-toolchain/nasti 1.5.2 → 1.6.1

package/dist/cli.cjs

@@ -954,7 +954,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;
@@ -1036,26 +1036,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 = import_node_path4.default.dirname(filePath);
+  const aliasEntries = Object.entries(config.resolve.alias).sort(
+    ([a], [b]) => b.length - a.length
+  );
+  const toRootUrl = (abs) => "/" + import_node_path4.default.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 ? import_node_path4.default.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 = import_node_path4.default.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 = import_node_path4.default.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 (import_node_path4.default.isAbsolute(value) && import_node_fs4.default.existsSync(value)) return value;
+  if (value.startsWith("/")) return import_node_path4.default.join(root, value.slice(1));
+  return import_node_path4.default.resolve(root, value);
+}
+function tryResolveDiskPath(target) {
+  if (import_node_fs4.default.existsSync(target) && import_node_fs4.default.statSync(target).isFile()) return target;
+  for (const ext of RESOLVE_EXTENSIONS) {
+    const withExt = target + ext;
+    if (import_node_fs4.default.existsSync(withExt) && import_node_fs4.default.statSync(withExt).isFile()) return withExt;
+  }
+  if (import_node_fs4.default.existsSync(target) && import_node_fs4.default.statSync(target).isDirectory()) {
+    for (const ext of RESOLVE_EXTENSIONS) {
+      const idx = import_node_path4.default.join(target, "index" + ext);
+      if (import_node_fs4.default.existsSync(idx) && import_node_fs4.default.statSync(idx).isFile()) return idx;
+    }
+  }
+  return null;
+}
+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) {
   let pkgName;
   let subpath;
@@ -1624,12 +1671,19 @@ async function createServer(inlineConfig = {}) {
   app.use((0, import_sirv.default)(config.root, { dev: true, etag: true }));
   const httpServer = import_node_http.default.createServer(app);
   const ws = createWebSocketServer(httpServer);
+  const ignoredSegments = /* @__PURE__ */ new Set(["node_modules", ".git", ".nasti"]);
+  const outDirAbs = import_node_path9.default.resolve(config.root, config.build.outDir);
   const watcher = (0, import_chokidar.watch)(config.root, {
-    ignored: [
-      "**/node_modules/**",
-      "**/.git/**",
-      `**/${config.build.outDir}/**`
-    ],
+    ignored: (filePath) => {
+      if (filePath === config.root) return false;
+      if (filePath === outDirAbs || filePath.startsWith(outDirAbs + import_node_path9.default.sep)) return true;
+      const rel = import_node_path9.default.relative(config.root, filePath);
+      if (!rel || rel.startsWith("..") || import_node_path9.default.isAbsolute(rel)) return false;
+      for (const seg of rel.split(import_node_path9.default.sep)) {
+        if (ignoredSegments.has(seg)) return true;
+      }
+      return false;
+    },
     ignoreInitial: true
   });
   let server;
@@ -1657,7 +1711,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(import_picocolors.default.cyan("  nasti dev server") + import_picocolors.default.dim(` v${"1.5.2"}`));
+          console.log(import_picocolors.default.cyan("  nasti dev server") + import_picocolors.default.dim(` v${"1.6.1"}`));
           console.log();
           console.log(`  ${import_picocolors.default.green(">")} Local:   ${import_picocolors.default.cyan(localUrl)}`);
           if (networkUrl) {
@@ -1784,7 +1838,7 @@ __export(build_exports, {
 async function build(inlineConfig = {}) {
   const config = await resolveConfig(inlineConfig, "build");
   const startTime = performance.now();
-  console.log(import_picocolors2.default.cyan("\n\u{1F528} nasti build") + import_picocolors2.default.dim(` v${"1.5.2"}`));
+  console.log(import_picocolors2.default.cyan("\n\u{1F528} nasti build") + import_picocolors2.default.dim(` v${"1.6.1"}`));
   console.log(import_picocolors2.default.dim(`  root: ${config.root}`));
   console.log(import_picocolors2.default.dim(`  mode: ${config.mode}`));
   const outDir = import_node_path10.default.resolve(config.root, config.build.outDir);
@@ -1945,7 +1999,7 @@ async function buildElectron(inlineConfig = {}) {
   const config = await resolveConfig({ ...inlineConfig, target: "electron" }, "build");
   const startTime = performance.now();
   assertElectronVersion(config);
-  console.log(import_picocolors3.default.cyan("\n\u26A1 nasti build (electron)") + import_picocolors3.default.dim(` v${"1.5.2"}`));
+  console.log(import_picocolors3.default.cyan("\n\u26A1 nasti build (electron)") + import_picocolors3.default.dim(` v${"1.6.1"}`));
   console.log(import_picocolors3.default.dim(`  root: ${config.root}`));
   console.log(import_picocolors3.default.dim(`  mode: ${config.mode}`));
   console.log(import_picocolors3.default.dim(`  target: electron (\u2265 ${config.electron.minVersion})`));
@@ -2036,7 +2090,7 @@ async function bundleNode(config, entry, opts) {
     format: opts.format === "cjs" ? "cjs" : "esm",
     sourcemap: !!config.build.sourcemap,
     minify: !!config.build.minify,
-    inlineDynamicImports: true
+    codeSplitting: false
   });
   await bundle.close();
   console.log(import_picocolors3.default.dim(`  \u2713 ${opts.label} \u2192 ${import_node_path11.default.relative(config.root, opts.outFile)}`));
@@ -2097,7 +2151,7 @@ async function startElectronDev(inlineConfig = {}) {
   const { noSpawn, ...rest } = inlineConfig;
   const config = await resolveConfig({ ...rest, target: "electron" }, "serve");
   warnElectronVersion(config);
-  console.log(import_picocolors4.default.cyan("\n\u26A1 nasti electron dev") + import_picocolors4.default.dim(` v${"1.5.2"}`));
+  console.log(import_picocolors4.default.cyan("\n\u26A1 nasti electron dev") + import_picocolors4.default.dim(` v${"1.6.1"}`));
   const { createServer: createServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
   const server = await createServer2({ ...rest, target: "electron" });
   await server.listen();
@@ -2240,7 +2294,9 @@ async function compileNode(config, entry, opts) {
     format: opts.format === "cjs" ? "cjs" : "esm",
     sourcemap: false,
     minify: false,
-    inlineDynamicImports: true
+    // rolldown 已弃用 inlineDynamicImports，改用 codeSplitting:false 表达
+    // 同样语义（单 chunk、内联 dynamic import）
+    codeSplitting: false
   });
   await bundle.close();
 }
@@ -2430,6 +2486,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.5.2");
+cli.version("1.6.1");
 cli.parse();
 //# sourceMappingURL=cli.cjs.map