@hirarijs/loader-ts 1.0.2 → 1.0.3

package/dist/index.cjs

@@ -213379,14 +213379,17 @@ 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);
-function createTsResolve(filename, debug = false) {
-  const configPath = import_typescript.default.findConfigFile(import_path.default.dirname(filename), import_typescript.default.sys.fileExists, "tsconfig.json");
+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(configFile.config, import_typescript.default.sys, import_path.default.dirname(configPath));
-  if (debug) {
-    console.log("[loader-ts] tsconfig:", configPath);
-  }
+  const config = import_typescript.default.parseJsonConfigFileContent(
+    configFile.config,
+    import_typescript.default.sys,
+    import_path.default.dirname(configPath)
+  );
   const options = config.options;
   const host = {
     fileExists: import_typescript.default.sys.fileExists,
@@ -213396,19 +213399,20 @@ function createTsResolve(filename, debug = false) {
     getCurrentDirectory: import_typescript.default.sys.getCurrentDirectory,
     getDirectories: import_typescript.default.sys.getDirectories
   };
-  return (specifier, importer) => {
+  cachedResolve = (specifier, importer) => {
     const result = import_typescript.default.resolveModuleName(specifier, importer, options, host);
     const resolved = result.resolvedModule?.resolvedFileName;
-    if (resolved) {
-      if (debug) {
-        console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
-      }
-      return resolved;
+    if (resolved && debug) {
+      console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
     }
-    return null;
+    return resolved || null;
   };
+  if (debug) {
+    console.log("[loader-ts] tsconfig:", configPath);
+  }
+  return cachedResolve;
 }
-function rewriteImports(code, filename, resolve) {
+function rewriteImports(code, filename, resolve, debug = false) {
   const importLike = /(import\s+[^'";]+?from\s+['"]([^'"]+)['"])|(import\s+['"]([^'"]+)['"])|(export\s+[^'";]+?from\s+['"]([^'"]+)['"])/g;
   return code.replace(importLike, (full, _a, from1, _b, from2, _c, from3) => {
     const spec = from1 || from2 || from3;
@@ -213417,6 +213421,9 @@ function rewriteImports(code, filename, resolve) {
     }
     const resolved = resolve(spec, filename);
     if (!resolved) return full;
+    if (debug) {
+      console.log(`[loader-ts] rewrite ${spec} -> ${resolved}`);
+    }
     const relative = import_path.default.isAbsolute(resolved) ? import_path.default.relative(import_path.default.dirname(filename), resolved).replace(/\\/g, "/") : resolved;
     const normalized = relative.startsWith(".") ? relative : "./" + relative;
     return full.replace(spec, normalized);
@@ -213424,8 +213431,8 @@ function rewriteImports(code, filename, resolve) {
 }
 var extensions = [".ts", ".mts", ".cts"];
 function runTransform(code, filename, ctx) {
-  const pathResolver = createTsResolve(filename, ctx.loaderConfig.debug);
-  const rewrittenCode = pathResolver ? rewriteImports(code, filename, pathResolver) : code;
+  const pathResolver = createTsResolve(ctx.loaderConfig.debug);
+  const rewrittenCode = pathResolver && !pathResolver(filename, filename) ? code : pathResolver ? rewriteImports(code, filename, pathResolver, ctx.loaderConfig.debug) : code;
   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,14 +213376,17 @@ import {
   IMPORT_META_URL_VARIABLE
 } from "@hirarijs/loader";
 import path from "path";
-function createTsResolve(filename, debug = false) {
-  const configPath = import_typescript.default.findConfigFile(path.dirname(filename), import_typescript.default.sys.fileExists, "tsconfig.json");
+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(configFile.config, import_typescript.default.sys, path.dirname(configPath));
-  if (debug) {
-    console.log("[loader-ts] tsconfig:", configPath);
-  }
+  const config = import_typescript.default.parseJsonConfigFileContent(
+    configFile.config,
+    import_typescript.default.sys,
+    path.dirname(configPath)
+  );
   const options = config.options;
   const host = {
     fileExists: import_typescript.default.sys.fileExists,
@@ -213393,19 +213396,20 @@ function createTsResolve(filename, debug = false) {
     getCurrentDirectory: import_typescript.default.sys.getCurrentDirectory,
     getDirectories: import_typescript.default.sys.getDirectories
   };
-  return (specifier, importer) => {
+  cachedResolve = (specifier, importer) => {
     const result = import_typescript.default.resolveModuleName(specifier, importer, options, host);
     const resolved = result.resolvedModule?.resolvedFileName;
-    if (resolved) {
-      if (debug) {
-        console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
-      }
-      return resolved;
+    if (resolved && debug) {
+      console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
     }
-    return null;
+    return resolved || null;
   };
+  if (debug) {
+    console.log("[loader-ts] tsconfig:", configPath);
+  }
+  return cachedResolve;
 }
-function rewriteImports(code, filename, resolve) {
+function rewriteImports(code, filename, resolve, debug = false) {
   const importLike = /(import\s+[^'";]+?from\s+['"]([^'"]+)['"])|(import\s+['"]([^'"]+)['"])|(export\s+[^'";]+?from\s+['"]([^'"]+)['"])/g;
   return code.replace(importLike, (full, _a, from1, _b, from2, _c, from3) => {
     const spec = from1 || from2 || from3;
@@ -213414,6 +213418,9 @@ function rewriteImports(code, filename, resolve) {
     }
     const resolved = resolve(spec, filename);
     if (!resolved) return full;
+    if (debug) {
+      console.log(`[loader-ts] rewrite ${spec} -> ${resolved}`);
+    }
     const relative = path.isAbsolute(resolved) ? path.relative(path.dirname(filename), resolved).replace(/\\/g, "/") : resolved;
     const normalized = relative.startsWith(".") ? relative : "./" + relative;
     return full.replace(spec, normalized);
@@ -213421,8 +213428,8 @@ function rewriteImports(code, filename, resolve) {
 }
 var extensions = [".ts", ".mts", ".cts"];
 function runTransform(code, filename, ctx) {
-  const pathResolver = createTsResolve(filename, ctx.loaderConfig.debug);
-  const rewrittenCode = pathResolver ? rewriteImports(code, filename, pathResolver) : code;
+  const pathResolver = createTsResolve(ctx.loaderConfig.debug);
+  const rewrittenCode = pathResolver && !pathResolver(filename, filename) ? code : pathResolver ? rewriteImports(code, filename, pathResolver, ctx.loaderConfig.debug) : code;
   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.2",
+  "version": "1.0.3",
   "description": "TypeScript loader plugin for HirariJS loader",
   "type": "module",
   "main": "./dist/index.cjs",