ts-arc 1.1.17 → 1.1.19

package/dist/bin.js

@@ -34,7 +34,7 @@ function stripJsonComments(input) {
     }
     if (char === "/" && input[i + 1] === "*") {
       i += 2;
-      while (i < input.length && !(input[i - 1] === "*" && input[i] === "/")) i++;
+      while (!(input[i - 1] === "*" && input[i])) i++;
       if (i < input.length) i++;
       continue;
     }
@@ -47,17 +47,13 @@ function loadConfig(filePath) {
   const content = fs.readFileSync(filePath, "utf8");
   const stripped = stripJsonComments(content);
   const config = JSON.parse(stripped);
-  if (!config.extends) {
-    return config;
-  }
+  if (!config.extends) return config;
   const extendsVal = config.extends;
   const tsconfigDir = path.dirname(filePath);
   let extendsPath;
   if (extendsVal.startsWith("./") || extendsVal.startsWith("../")) {
     extendsPath = path.resolve(tsconfigDir, extendsVal);
-    if (!extendsPath.endsWith(".json")) {
-      extendsPath += ".json";
-    }
+    if (!extendsPath.endsWith(".json")) extendsPath += ".json";
   } else {
     try {
       extendsPath = require2.resolve(extendsVal);
@@ -73,24 +69,36 @@ function loadConfig(filePath) {
 function findTsConfig(dir) {
   let current = dir;
   while (current !== path.parse(current).root) {
-    const tsconfigPath = path.join(current, "tsconfig.json");
-    if (fs.existsSync(tsconfigPath)) {
-      return tsconfigPath;
-    }
+    const tsconfigPath2 = path.join(current, "tsconfig.json");
+    if (fs.existsSync(tsconfigPath2)) return tsconfigPath2;
     current = path.dirname(current);
   }
   return null;
 }
-var tsArcConfig = { baseUrl: null, paths: {}, tsconfigDir: null };
-async function registerLoader() {
-  register("./loader.js", import.meta.url, { data: tsArcConfig });
+var tsArcConfig = {
+  baseUrl: null,
+  paths: {},
+  tsconfigDir: null
+};
+var tsconfigPath = findTsConfig(process.cwd());
+if (tsconfigPath) {
+  const mergedConfig = loadConfig(tsconfigPath);
+  const compilerOptions = mergedConfig.compilerOptions || {};
+  const tsconfigDir = path.dirname(tsconfigPath);
+  const baseUrlStr = compilerOptions.baseUrl;
+  tsArcConfig.baseUrl = baseUrlStr ? path.resolve(tsconfigDir, baseUrlStr) : null;
+  tsArcConfig.paths = compilerOptions.paths || {};
+  tsArcConfig.tsconfigDir = tsconfigDir;
+}
+function registerLoader() {
+  register(loaderPath, import.meta.url, { data: tsArcConfig });
 }
 async function setArcTsConfig(directory) {
-  const tsconfigPath = findTsConfig(directory);
-  if (tsconfigPath) {
-    const mergedConfig = loadConfig(tsconfigPath);
+  const tsconfigPath2 = findTsConfig(directory);
+  if (tsconfigPath2) {
+    const mergedConfig = loadConfig(tsconfigPath2);
     const compilerOptions = mergedConfig.compilerOptions || {};
-    const tsconfigDir = path.dirname(tsconfigPath);
+    const tsconfigDir = path.dirname(tsconfigPath2);
     const baseUrlStr = compilerOptions.baseUrl;
     tsArcConfig.baseUrl = baseUrlStr ? path.resolve(tsconfigDir, baseUrlStr) : null;
     tsArcConfig.paths = compilerOptions.paths || {};
@@ -100,7 +108,7 @@ async function setArcTsConfig(directory) {
 async function loadModule(scriptUrl) {
   const scriptPath = url.fileURLToPath(scriptUrl);
   setArcTsConfig(path.dirname(scriptPath));
-  await registerLoader();
+  registerLoader();
   import(scriptUrl).catch((err) => {
     console.error(err);
     process.exit(1);

package/dist/cli.js

@@ -40,7 +40,7 @@ function stripJsonComments(input) {
     }
     if (char === "/" && input[i + 1] === "*") {
       i += 2;
-      while (i < input.length && !(input[i - 1] === "*" && input[i] === "/")) i++;
+      while (!(input[i - 1] === "*" && input[i])) i++;
       if (i < input.length) i++;
       continue;
     }
@@ -53,17 +53,13 @@ function loadConfig(filePath) {
   const content = fs.readFileSync(filePath, "utf8");
   const stripped = stripJsonComments(content);
   const config = JSON.parse(stripped);
-  if (!config.extends) {
-    return config;
-  }
+  if (!config.extends) return config;
   const extendsVal = config.extends;
   const tsconfigDir = path.dirname(filePath);
   let extendsPath;
   if (extendsVal.startsWith("./") || extendsVal.startsWith("../")) {
     extendsPath = path.resolve(tsconfigDir, extendsVal);
-    if (!extendsPath.endsWith(".json")) {
-      extendsPath += ".json";
-    }
+    if (!extendsPath.endsWith(".json")) extendsPath += ".json";
   } else {
     try {
       extendsPath = require2.resolve(extendsVal);
@@ -79,24 +75,36 @@ function loadConfig(filePath) {
 function findTsConfig(dir) {
   let current = dir;
   while (current !== path.parse(current).root) {
-    const tsconfigPath = path.join(current, "tsconfig.json");
-    if (fs.existsSync(tsconfigPath)) {
-      return tsconfigPath;
-    }
+    const tsconfigPath2 = path.join(current, "tsconfig.json");
+    if (fs.existsSync(tsconfigPath2)) return tsconfigPath2;
     current = path.dirname(current);
   }
   return null;
 }
-var tsArcConfig = { baseUrl: null, paths: {}, tsconfigDir: null };
-async function registerLoader() {
-  register("./loader.js", import.meta.url, { data: tsArcConfig });
+var tsArcConfig = {
+  baseUrl: null,
+  paths: {},
+  tsconfigDir: null
+};
+var tsconfigPath = findTsConfig(process.cwd());
+if (tsconfigPath) {
+  const mergedConfig = loadConfig(tsconfigPath);
+  const compilerOptions = mergedConfig.compilerOptions || {};
+  const tsconfigDir = path.dirname(tsconfigPath);
+  const baseUrlStr = compilerOptions.baseUrl;
+  tsArcConfig.baseUrl = baseUrlStr ? path.resolve(tsconfigDir, baseUrlStr) : null;
+  tsArcConfig.paths = compilerOptions.paths || {};
+  tsArcConfig.tsconfigDir = tsconfigDir;
+}
+function registerLoader() {
+  register(loaderPath, import.meta.url, { data: tsArcConfig });
 }
 async function setArcTsConfig(directory) {
-  const tsconfigPath = findTsConfig(directory);
-  if (tsconfigPath) {
-    const mergedConfig = loadConfig(tsconfigPath);
+  const tsconfigPath2 = findTsConfig(directory);
+  if (tsconfigPath2) {
+    const mergedConfig = loadConfig(tsconfigPath2);
     const compilerOptions = mergedConfig.compilerOptions || {};
-    const tsconfigDir = path.dirname(tsconfigPath);
+    const tsconfigDir = path.dirname(tsconfigPath2);
     const baseUrlStr = compilerOptions.baseUrl;
     tsArcConfig.baseUrl = baseUrlStr ? path.resolve(tsconfigDir, baseUrlStr) : null;
     tsArcConfig.paths = compilerOptions.paths || {};
@@ -106,7 +114,7 @@ async function setArcTsConfig(directory) {
 async function loadModule(scriptUrl2) {
   const scriptPath2 = url.fileURLToPath(scriptUrl2);
   setArcTsConfig(path.dirname(scriptPath2));
-  await registerLoader();
+  registerLoader();
   import(scriptUrl2).catch((err) => {
     console.error(err);
     process.exit(1);

package/dist/loader.js

@@ -123,12 +123,90 @@ const require = createRequire(import.meta.url);`
     shortCircuit: true
   };
 }
-function resolveSync(specifier, context, nextResolve) {
-  return nextResolve(specifier, context);
+function resolveLocalSync(baseDir, relativePath) {
+  const fullPath = path.resolve(baseDir, relativePath);
+  const candidates = [
+    fullPath,
+    fullPath + ".ts",
+    fullPath + ".tsx",
+    path.join(fullPath, "index.ts"),
+    path.join(fullPath, "index.tsx"),
+    path.join(fullPath, "page.ts"),
+    path.join(fullPath, "page.tsx")
+  ];
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate) && fs.statSync(candidate).isFile()) {
+      return { url: url.pathToFileURL(candidate).href };
+    }
+  }
+  throw Object.assign(
+    new Error(`Cannot find module '${relativePath}'`),
+    { code: "ERR_MODULE_NOT_FOUND" }
+  );
+}
+function resolveSync(specifier, context) {
+  let parentPath = process.cwd();
+  if (context.parentURL) {
+    parentPath = path.dirname(url.fileURLToPath(context.parentURL));
+  }
+  if (specifier.startsWith("file://")) {
+    const filePath = url.fileURLToPath(specifier);
+    const dir = path.dirname(filePath);
+    const baseName = path.basename(filePath);
+    const resolved = resolveLocalSync(dir, baseName);
+    return { ...resolved, shortCircuit: true };
+  }
+  const isPathLike = specifier.startsWith(".") || specifier.startsWith("/");
+  if (isPathLike) {
+    const resolved = resolveLocalSync(parentPath, specifier);
+    return { ...resolved, shortCircuit: true };
+  }
+  const { paths } = config;
+  const effectiveBase = getEffectiveBase();
+  for (const key of Object.keys(paths)) {
+    let capture = null;
+    const isWildcard = key.endsWith("/*");
+    const prefix = isWildcard ? key.slice(0, -2) : key;
+    if (isWildcard && specifier.startsWith(prefix + "/")) {
+      capture = specifier.slice(prefix.length + 1);
+    } else if (!isWildcard && specifier === key) {
+      capture = "";
+    }
+    if (capture !== null) {
+      for (const target of paths[key]) {
+        const mapped = isWildcard ? target.replace(/\*/g, capture) : target;
+        if (effectiveBase) {
+          try {
+            const resolved = resolveLocalSync(effectiveBase, mapped);
+            return { ...resolved, shortCircuit: true };
+          } catch (e) {
+            if (e.code !== "ERR_MODULE_NOT_FOUND") {
+              throw e;
+            }
+          }
+        }
+      }
+    }
+  }
+  if (effectiveBase) {
+    try {
+      const resolved = resolveLocalSync(effectiveBase, specifier);
+      return { ...resolved, shortCircuit: true };
+    } catch (e) {
+      if (e.code !== "ERR_MODULE_NOT_FOUND") {
+        throw e;
+      }
+    }
+  }
+  throw Object.assign(
+    new Error(`Cannot find module '${specifier}'`),
+    { code: "ERR_MODULE_NOT_FOUND" }
+  );
 }
 export {
   initialize,
   load,
   resolve2 as resolve,
+  resolveLocalSync,
   resolveSync
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-arc",
-    "version": "1.1.17",
+    "version": "1.1.19",
     "type": "module",
     "description": "A simple typescript runtime.",
     "main": "dist/bin.js",