@hirarijs/loader-ts 1.0.18 → 1.0.20

package/dist/index.cjs

@@ -213378,6 +213378,7 @@ module.exports = __toCommonJS(index_exports);
 var import_esbuild = require("esbuild");
 var import_loader = require("@hirarijs/loader");
 var import_path = __toESM(require("path"), 1);
+var import_url = require("url");
 var import_typescript = __toESM(require_typescript(), 1);
 var resolverCache = /* @__PURE__ */ new Map();
 var nearestConfigCache = /* @__PURE__ */ new Map();
@@ -213430,6 +213431,9 @@ function createTsResolveForConfig(tsconfigPath, debug = false) {
   const resolver = (specifier, importer) => {
     const result = import_typescript.default.resolveModuleName(specifier, importer, options, host);
     let resolved = result.resolvedModule?.resolvedFileName;
+    if (result.resolvedModule?.isExternalLibraryImport || !result.resolvedModule) {
+      return null;
+    }
     if (resolved && resolved.endsWith(".d.ts")) {
       const candidates = [
         resolved.replace(/\.d\.ts$/, ".ts"),
@@ -213472,6 +213476,11 @@ function createTsResolve(importer, debug = false) {
   if (!tsconfigPath) return null;
   return createTsResolveForConfig(tsconfigPath, debug);
 }
+function hasTsconfigFor(importer) {
+  const root = findRootTsconfig();
+  if (root) return true;
+  return Boolean(findNearestTsconfig(import_path.default.dirname(importer)));
+}
 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) => {
@@ -213533,7 +213542,17 @@ var plugin = {
   extensions,
   match: (filename) => {
     const ext = import_path.default.extname(filename);
-    return extensions.includes(ext);
+    return extensions.includes(ext) && hasTsconfigFor(filename);
+  },
+  resolve: (specifier, importer, ctx) => {
+    if (!importer) return null;
+    if (specifier.startsWith("node:")) return null;
+    const resolver = createTsResolve(importer, ctx.loaderConfig.debug);
+    if (!resolver) return null;
+    const resolved = resolver(specifier, importer);
+    if (!resolved) return null;
+    if (resolved.includes("node_modules")) return null;
+    return { url: (0, import_url.pathToFileURL)(resolved).href, shortCircuit: true };
   },
   transform: runTransform
 };

package/dist/index.js

@@ -213376,6 +213376,7 @@ import {
   IMPORT_META_URL_VARIABLE
 } from "@hirarijs/loader";
 import path from "path";
+import { pathToFileURL } from "url";
 var resolverCache = /* @__PURE__ */ new Map();
 var nearestConfigCache = /* @__PURE__ */ new Map();
 var rootConfigPath = null;
@@ -213427,6 +213428,9 @@ function createTsResolveForConfig(tsconfigPath, debug = false) {
   const resolver = (specifier, importer) => {
     const result = import_typescript.default.resolveModuleName(specifier, importer, options, host);
     let resolved = result.resolvedModule?.resolvedFileName;
+    if (result.resolvedModule?.isExternalLibraryImport || !result.resolvedModule) {
+      return null;
+    }
     if (resolved && resolved.endsWith(".d.ts")) {
       const candidates = [
         resolved.replace(/\.d\.ts$/, ".ts"),
@@ -213469,6 +213473,11 @@ function createTsResolve(importer, debug = false) {
   if (!tsconfigPath) return null;
   return createTsResolveForConfig(tsconfigPath, debug);
 }
+function hasTsconfigFor(importer) {
+  const root = findRootTsconfig();
+  if (root) return true;
+  return Boolean(findNearestTsconfig(path.dirname(importer)));
+}
 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) => {
@@ -213530,7 +213539,17 @@ var plugin = {
   extensions,
   match: (filename) => {
     const ext = path.extname(filename);
-    return extensions.includes(ext);
+    return extensions.includes(ext) && hasTsconfigFor(filename);
+  },
+  resolve: (specifier, importer, ctx) => {
+    if (!importer) return null;
+    if (specifier.startsWith("node:")) return null;
+    const resolver = createTsResolve(importer, ctx.loaderConfig.debug);
+    if (!resolver) return null;
+    const resolved = resolver(specifier, importer);
+    if (!resolved) return null;
+    if (resolved.includes("node_modules")) return null;
+    return { url: pathToFileURL(resolved).href, shortCircuit: true };
   },
   transform: runTransform
 };

package/package.json

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