@nasti-toolchain/nasti 1.6.0 → 1.6.1

package/dist/cli.js

@@ -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;
@@ -1017,26 +1017,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 +1691,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.1"}`));
           console.log();
           console.log(`  ${pc.green(">")} Local:   ${pc.cyan(localUrl)}`);
           if (networkUrl) {
@@ -1767,7 +1814,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.1"}`));
   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 +1974,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.1"}`));
   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 +2128,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.1"}`));
   const { createServer: createServer2 } = await Promise.resolve().then(() => (init_server(), server_exports));
   const server = await createServer2({ ...rest, target: "electron" });
   await server.listen();
@@ -2408,6 +2455,6 @@ cli.command("preview [root]", "Preview production build").option("--port <port>"
   }
 });
 cli.help();
-cli.version("1.6.0");
+cli.version("1.6.1");
 cli.parse();
 //# sourceMappingURL=cli.js.map