@hirarijs/loader-ts 1.0.3 → 1.0.5

package/dist/index.cjs

@@ -213379,18 +213379,36 @@ var import_esbuild = require("esbuild");
 var import_loader = require("@hirarijs/loader");
 var import_path = __toESM(require("path"), 1);
 var import_typescript = __toESM(require_typescript(), 1);
-var cachedResolve = null;
-function createTsResolve(debug = false) {
-  if (cachedResolve) return cachedResolve;
-  const configPath = import_typescript.default.findConfigFile(process.cwd(), import_typescript.default.sys.fileExists, "tsconfig.json");
-  if (!configPath) return null;
-  const configFile = import_typescript.default.readConfigFile(configPath, import_typescript.default.sys.readFile);
-  const config = import_typescript.default.parseJsonConfigFileContent(
+var resolverCache = /* @__PURE__ */ new Map();
+var nearestConfigCache = /* @__PURE__ */ new Map();
+function findNearestTsconfig(start) {
+  if (nearestConfigCache.has(start)) return nearestConfigCache.get(start);
+  let dir = start;
+  while (true) {
+    const candidate = import_path.default.join(dir, "tsconfig.json");
+    if (import_typescript.default.sys.fileExists(candidate)) {
+      nearestConfigCache.set(start, candidate);
+      return candidate;
+    }
+    const parent = import_path.default.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  nearestConfigCache.set(start, null);
+  return null;
+}
+function createTsResolveForConfig(tsconfigPath, debug = false) {
+  if (resolverCache.has(tsconfigPath)) return resolverCache.get(tsconfigPath);
+  const configFile = import_typescript.default.readConfigFile(tsconfigPath, import_typescript.default.sys.readFile);
+  if (configFile.error) {
+    return null;
+  }
+  const parsed = import_typescript.default.parseJsonConfigFileContent(
     configFile.config,
     import_typescript.default.sys,
-    import_path.default.dirname(configPath)
+    import_path.default.dirname(tsconfigPath)
   );
-  const options = config.options;
+  const options = parsed.options;
   const host = {
     fileExists: import_typescript.default.sys.fileExists,
     readFile: import_typescript.default.sys.readFile,
@@ -213399,18 +213417,27 @@ function createTsResolve(debug = false) {
     getCurrentDirectory: import_typescript.default.sys.getCurrentDirectory,
     getDirectories: import_typescript.default.sys.getDirectories
   };
-  cachedResolve = (specifier, importer) => {
+  const resolver = (specifier, importer) => {
     const result = import_typescript.default.resolveModuleName(specifier, importer, options, host);
     const resolved = result.resolvedModule?.resolvedFileName;
-    if (resolved && debug) {
-      console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
+    if (resolved && !resolved.endsWith(".d.ts")) {
+      if (debug) {
+        console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
+      }
+      return resolved;
     }
-    return resolved || null;
+    return null;
   };
   if (debug) {
-    console.log("[loader-ts] tsconfig:", configPath);
+    console.log("[loader-ts] tsconfig:", tsconfigPath);
   }
-  return cachedResolve;
+  resolverCache.set(tsconfigPath, resolver);
+  return resolver;
+}
+function createTsResolve(importer, debug = false) {
+  const tsconfigPath = findNearestTsconfig(import_path.default.dirname(importer));
+  if (!tsconfigPath) return null;
+  return createTsResolveForConfig(tsconfigPath, debug);
 }
 function rewriteImports(code, filename, resolve, debug = false) {
   const importLike = /(import\s+[^'";]+?from\s+['"]([^'"]+)['"])|(import\s+['"]([^'"]+)['"])|(export\s+[^'";]+?from\s+['"]([^'"]+)['"])/g;
@@ -213431,8 +213458,14 @@ function rewriteImports(code, filename, resolve, debug = false) {
 }
 var extensions = [".ts", ".mts", ".cts"];
 function runTransform(code, filename, ctx) {
-  const pathResolver = createTsResolve(ctx.loaderConfig.debug);
-  const rewrittenCode = pathResolver && !pathResolver(filename, filename) ? code : pathResolver ? rewriteImports(code, filename, pathResolver, ctx.loaderConfig.debug) : code;
+  const pathResolver = createTsResolve(filename, ctx.loaderConfig.debug);
+  const rewrittenCode = pathResolver && !filename.includes("node_modules") ? rewriteImports(code, filename, pathResolver, ctx.loaderConfig.debug) : code;
+  if (ctx.loaderConfig.debug) {
+    console.log(`[loader-ts] transforming ${filename}`);
+    if (!pathResolver) {
+      console.log("[loader-ts] no tsconfig resolver created for", filename);
+    }
+  }
   const banner = ctx.format === "cjs" ? `const ${import_loader.IMPORT_META_URL_VARIABLE} = require('url').pathToFileURL(__filename).href;` : void 0;
   const result = (0, import_esbuild.transformSync)(rewrittenCode, {
     loader: "ts",

package/dist/index.js

@@ -213376,18 +213376,36 @@ import {
   IMPORT_META_URL_VARIABLE
 } from "@hirarijs/loader";
 import path from "path";
-var cachedResolve = null;
-function createTsResolve(debug = false) {
-  if (cachedResolve) return cachedResolve;
-  const configPath = import_typescript.default.findConfigFile(process.cwd(), import_typescript.default.sys.fileExists, "tsconfig.json");
-  if (!configPath) return null;
-  const configFile = import_typescript.default.readConfigFile(configPath, import_typescript.default.sys.readFile);
-  const config = import_typescript.default.parseJsonConfigFileContent(
+var resolverCache = /* @__PURE__ */ new Map();
+var nearestConfigCache = /* @__PURE__ */ new Map();
+function findNearestTsconfig(start) {
+  if (nearestConfigCache.has(start)) return nearestConfigCache.get(start);
+  let dir = start;
+  while (true) {
+    const candidate = path.join(dir, "tsconfig.json");
+    if (import_typescript.default.sys.fileExists(candidate)) {
+      nearestConfigCache.set(start, candidate);
+      return candidate;
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  nearestConfigCache.set(start, null);
+  return null;
+}
+function createTsResolveForConfig(tsconfigPath, debug = false) {
+  if (resolverCache.has(tsconfigPath)) return resolverCache.get(tsconfigPath);
+  const configFile = import_typescript.default.readConfigFile(tsconfigPath, import_typescript.default.sys.readFile);
+  if (configFile.error) {
+    return null;
+  }
+  const parsed = import_typescript.default.parseJsonConfigFileContent(
     configFile.config,
     import_typescript.default.sys,
-    path.dirname(configPath)
+    path.dirname(tsconfigPath)
   );
-  const options = config.options;
+  const options = parsed.options;
   const host = {
     fileExists: import_typescript.default.sys.fileExists,
     readFile: import_typescript.default.sys.readFile,
@@ -213396,18 +213414,27 @@ function createTsResolve(debug = false) {
     getCurrentDirectory: import_typescript.default.sys.getCurrentDirectory,
     getDirectories: import_typescript.default.sys.getDirectories
   };
-  cachedResolve = (specifier, importer) => {
+  const resolver = (specifier, importer) => {
     const result = import_typescript.default.resolveModuleName(specifier, importer, options, host);
     const resolved = result.resolvedModule?.resolvedFileName;
-    if (resolved && debug) {
-      console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
+    if (resolved && !resolved.endsWith(".d.ts")) {
+      if (debug) {
+        console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
+      }
+      return resolved;
     }
-    return resolved || null;
+    return null;
   };
   if (debug) {
-    console.log("[loader-ts] tsconfig:", configPath);
+    console.log("[loader-ts] tsconfig:", tsconfigPath);
   }
-  return cachedResolve;
+  resolverCache.set(tsconfigPath, resolver);
+  return resolver;
+}
+function createTsResolve(importer, debug = false) {
+  const tsconfigPath = findNearestTsconfig(path.dirname(importer));
+  if (!tsconfigPath) return null;
+  return createTsResolveForConfig(tsconfigPath, debug);
 }
 function rewriteImports(code, filename, resolve, debug = false) {
   const importLike = /(import\s+[^'";]+?from\s+['"]([^'"]+)['"])|(import\s+['"]([^'"]+)['"])|(export\s+[^'";]+?from\s+['"]([^'"]+)['"])/g;
@@ -213428,8 +213455,14 @@ function rewriteImports(code, filename, resolve, debug = false) {
 }
 var extensions = [".ts", ".mts", ".cts"];
 function runTransform(code, filename, ctx) {
-  const pathResolver = createTsResolve(ctx.loaderConfig.debug);
-  const rewrittenCode = pathResolver && !pathResolver(filename, filename) ? code : pathResolver ? rewriteImports(code, filename, pathResolver, ctx.loaderConfig.debug) : code;
+  const pathResolver = createTsResolve(filename, ctx.loaderConfig.debug);
+  const rewrittenCode = pathResolver && !filename.includes("node_modules") ? rewriteImports(code, filename, pathResolver, ctx.loaderConfig.debug) : code;
+  if (ctx.loaderConfig.debug) {
+    console.log(`[loader-ts] transforming ${filename}`);
+    if (!pathResolver) {
+      console.log("[loader-ts] no tsconfig resolver created for", filename);
+    }
+  }
   const banner = ctx.format === "cjs" ? `const ${IMPORT_META_URL_VARIABLE} = require('url').pathToFileURL(__filename).href;` : void 0;
   const result = transformSync(rewrittenCode, {
     loader: "ts",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirarijs/loader-ts",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "TypeScript loader plugin for HirariJS loader",
   "type": "module",
   "main": "./dist/index.cjs",