@hirarijs/loader-ts 1.0.13 → 1.0.15

package/dist/index.cjs

@@ -213426,8 +213426,30 @@ function createTsResolveForConfig(tsconfigPath, debug = false) {
   };
   const resolver = (specifier, importer) => {
     const result = import_typescript.default.resolveModuleName(specifier, importer, options, host);
-    const resolved = result.resolvedModule?.resolvedFileName;
-    if (resolved && !resolved.endsWith(".d.ts")) {
+    let resolved = result.resolvedModule?.resolvedFileName;
+    if (resolved && resolved.endsWith(".d.ts")) {
+      const candidates = [
+        resolved.replace(/\.d\.ts$/, ".ts"),
+        resolved.replace(/\.d\.ts$/, ".tsx"),
+        resolved.replace(/\.d\.ts$/, ".js"),
+        resolved.replace(/\.d\.ts$/, ".mjs"),
+        resolved.replace(/\.d\.ts$/, ".cts"),
+        resolved.replace(/\.d\.ts$/, ".cjs")
+      ];
+      if (resolved.includes(`${import_path.default.sep}dist${import_path.default.sep}`)) {
+        const srcBase = resolved.replace(`${import_path.default.sep}dist${import_path.default.sep}`, `${import_path.default.sep}src${import_path.default.sep}`);
+        candidates.unshift(
+          srcBase.replace(/\.d\.ts$/, ".ts"),
+          srcBase.replace(/\.d\.ts$/, ".tsx"),
+          srcBase.replace(/\.d\.ts$/, ".js"),
+          srcBase.replace(/\.d\.ts$/, ".mjs"),
+          srcBase.replace(/\.d\.ts$/, ".cts"),
+          srcBase.replace(/\.d\.ts$/, ".cjs")
+        );
+      }
+      resolved = candidates.find((f) => import_typescript.default.sys.fileExists(f)) || resolved;
+    }
+    if (resolved) {
       if (debug) {
         console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
       }
@@ -213466,6 +213488,11 @@ function rewriteImports(code, filename, resolve, debug = false) {
 }
 var extensions = [".ts", ".mts", ".cts", ".js", ".mjs", ".cjs"];
 function runTransform(code, filename, ctx) {
+  const opts = ctx.loaderConfig.pluginOptions?.["@hirarijs/loader-ts"] || {};
+  const ignoreNm = opts.ignoreNodeModules !== false && opts.allowNodeModules !== true;
+  if (ignoreNm && filename.includes("node_modules")) {
+    return { code, continue: true };
+  }
   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) {
@@ -213489,7 +213516,7 @@ function runTransform(code, filename, ctx) {
     code: result.code,
     map: result.map,
     format: ctx.format,
-    continue: ctx.loaderConfig.pluginOptions?.["@hirarijs/loader-ts"]?.continue === true
+    continue: opts.continue === true
   };
 }
 var plugin = {

package/dist/index.js

@@ -213423,8 +213423,30 @@ function createTsResolveForConfig(tsconfigPath, debug = false) {
   };
   const resolver = (specifier, importer) => {
     const result = import_typescript.default.resolveModuleName(specifier, importer, options, host);
-    const resolved = result.resolvedModule?.resolvedFileName;
-    if (resolved && !resolved.endsWith(".d.ts")) {
+    let resolved = result.resolvedModule?.resolvedFileName;
+    if (resolved && resolved.endsWith(".d.ts")) {
+      const candidates = [
+        resolved.replace(/\.d\.ts$/, ".ts"),
+        resolved.replace(/\.d\.ts$/, ".tsx"),
+        resolved.replace(/\.d\.ts$/, ".js"),
+        resolved.replace(/\.d\.ts$/, ".mjs"),
+        resolved.replace(/\.d\.ts$/, ".cts"),
+        resolved.replace(/\.d\.ts$/, ".cjs")
+      ];
+      if (resolved.includes(`${path.sep}dist${path.sep}`)) {
+        const srcBase = resolved.replace(`${path.sep}dist${path.sep}`, `${path.sep}src${path.sep}`);
+        candidates.unshift(
+          srcBase.replace(/\.d\.ts$/, ".ts"),
+          srcBase.replace(/\.d\.ts$/, ".tsx"),
+          srcBase.replace(/\.d\.ts$/, ".js"),
+          srcBase.replace(/\.d\.ts$/, ".mjs"),
+          srcBase.replace(/\.d\.ts$/, ".cts"),
+          srcBase.replace(/\.d\.ts$/, ".cjs")
+        );
+      }
+      resolved = candidates.find((f) => import_typescript.default.sys.fileExists(f)) || resolved;
+    }
+    if (resolved) {
       if (debug) {
         console.log(`[loader-ts] resolved ${specifier} -> ${resolved}`);
       }
@@ -213463,6 +213485,11 @@ function rewriteImports(code, filename, resolve, debug = false) {
 }
 var extensions = [".ts", ".mts", ".cts", ".js", ".mjs", ".cjs"];
 function runTransform(code, filename, ctx) {
+  const opts = ctx.loaderConfig.pluginOptions?.["@hirarijs/loader-ts"] || {};
+  const ignoreNm = opts.ignoreNodeModules !== false && opts.allowNodeModules !== true;
+  if (ignoreNm && filename.includes("node_modules")) {
+    return { code, continue: true };
+  }
   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) {
@@ -213486,7 +213513,7 @@ function runTransform(code, filename, ctx) {
     code: result.code,
     map: result.map,
     format: ctx.format,
-    continue: ctx.loaderConfig.pluginOptions?.["@hirarijs/loader-ts"]?.continue === true
+    continue: opts.continue === true
   };
 }
 var plugin = {

package/package.json

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