@poppinss/ts-exec 1.3.0 → 1.4.0

package/build/src/loader.js

@@ -35,10 +35,10 @@ var DEFAULT_CONFIG = {
     keepClassNames: true
   }
 };
-function tsConfigToSwcConfig(tsConfig) {
-  const tsTarget = tsConfig.compilerOptions?.target?.toLowerCase();
+function tsConfigToSwcConfig(tsConfig2) {
+  const tsTarget = tsConfig2.compilerOptions?.target?.toLowerCase();
   return {
-    sourceMaps: tsConfig.compilerOptions?.sourceMap ?? true,
+    sourceMaps: tsConfig2.compilerOptions?.sourceMap ?? true,
     module: {
       /**
        * Since, we will run the SWC transformer via Nodejs loader hooks, the
@@ -48,31 +48,31 @@ function tsConfigToSwcConfig(tsConfig) {
     },
     jsc: {
       target: tsTarget ? tsTarget === "es6" ? "esnext" : tsTarget : "esnext",
-      baseUrl: tsConfig.compilerOptions?.baseUrl,
+      baseUrl: tsConfig2.compilerOptions?.baseUrl,
       externalHelpers: false,
       parser: {
         syntax: "typescript",
-        tsx: !!tsConfig.compilerOptions?.jsx,
+        tsx: !!tsConfig2.compilerOptions?.jsx,
         decorators: true,
         dynamicImport: true
       },
       transform: {
-        ...tsConfig.compilerOptions?.emitDecoratorMetadata ? {
+        ...tsConfig2.compilerOptions?.emitDecoratorMetadata ? {
           decoratorMetadata: true
         } : {},
-        ...tsConfig.compilerOptions?.experimentalDecorators ? {
+        ...tsConfig2.compilerOptions?.experimentalDecorators ? {
           legacyDecorator: true
         } : {},
-        ...tsConfig.compilerOptions?.verbatimModuleSyntax ? {
+        ...tsConfig2.compilerOptions?.verbatimModuleSyntax ? {
           verbatimModuleSyntax: true
         } : {},
-        ...tsConfig.compilerOptions?.useDefineForClassFields ? {
+        ...tsConfig2.compilerOptions?.useDefineForClassFields ? {
           useDefineForClassFields: true
         } : {},
         react: {
           runtime: "automatic",
-          ...tsConfig.compilerOptions?.jsxImportSource ? {
-            importSource: tsConfig.compilerOptions?.jsxImportSource
+          ...tsConfig2.compilerOptions?.jsxImportSource ? {
+            importSource: tsConfig2.compilerOptions?.jsxImportSource
           } : {}
         }
       },
@@ -81,10 +81,10 @@ function tsConfigToSwcConfig(tsConfig) {
   };
 }
 function getConfig(searchPath) {
-  const tsConfig = getTsconfig(
+  const tsConfig2 = getTsconfig(
     typeof searchPath === "string" ? searchPath : fileURLToPath(searchPath)
   );
-  if (!tsConfig) {
+  if (!tsConfig2) {
     debug_default("Unable to locate tsconfig file");
     return {
       tsConfig: null,
@@ -94,10 +94,10 @@ function getConfig(searchPath) {
       }
     };
   }
-  debug_default("tsConfig %O", tsConfig.config);
-  const swcConfig2 = tsConfigToSwcConfig(tsConfig.config);
+  debug_default("tsConfig %O", tsConfig2.config);
+  const swcConfig2 = tsConfigToSwcConfig(tsConfig2.config);
   debug_default("swcConfig %O", swcConfig2);
-  return { tsConfig: tsConfig.config, tsConfigPath: tsConfig.path, swcConfig: swcConfig2 };
+  return { tsConfig: tsConfig2.config, tsConfigPath: tsConfig2.path, swcConfig: swcConfig2 };
 }
 
 // src/transform.ts
@@ -111,6 +111,10 @@ function transformSync(source, options) {
 
 // src/loader.ts
 var swcConfig;
+var tsConfig;
+function isTypeScriptFile(filePath) {
+  return !filePath.endsWith(".d.ts") && (filePath.endsWith(".ts") || filePath.endsWith(".tsx") || filePath.endsWith(".mts") || filePath.endsWith(".cts"));
+}
 function isLocalPath(specifier) {
   return specifier.startsWith("./") || specifier.startsWith("../") || specifier.startsWith("/") || specifier.startsWith("file:");
 }
@@ -138,24 +142,32 @@ async function initialize() {
   const searchPath = process.env.TS_EXEC_PWD ?? process.cwd();
   const config = getConfig(searchPath);
   swcConfig = config.swcConfig;
+  tsConfig = config.tsConfig;
 }
 var resolve = async (specifier, context, nextResolve) => {
   debug_default("resolving specifier %s", specifier);
+  const [pathname] = specifier.split("?");
+  if (!tsConfig?.compilerOptions?.rewriteRelativeImportExtensions && context.parentURL && isTypeScriptFile(pathname)) {
+    throw new Error(
+      `Cannot import "${specifier}" using "${extname(pathname)}" extension. Enable "compilerOptions.rewriteRelativeImportExtensions" to import TypeScript files`
+    );
+  }
   try {
     return await nextResolve(specifier, context);
   } catch (error) {
     if (error.code === "ERR_MODULE_NOT_FOUND" && error.url && isLocalPath(error.url)) {
-      let url = error.url;
-      const fileExtension = extname(url);
+      let [urlPathname, ...urlQs] = error.url.split("?");
+      const fileExtension = extname(urlPathname);
       if (fileExtension === ".js") {
-        url = url.replace(".js", ".ts");
+        urlPathname = urlPathname.replace(".js", ".ts");
       } else if (fileExtension === ".mjs") {
-        url = url.replace(".mjs", ".mts");
+        urlPathname = urlPathname.replace(".mjs", ".mts");
       } else if (fileExtension === ".cjs") {
-        url = url.replace(".cjs", ".cts");
+        urlPathname = urlPathname.replace(".cjs", ".cts");
       } else if (fileExtension === ".jsx") {
-        url = url.replace(".jsx", ".tsx");
+        urlPathname = urlPathname.replace(".jsx", ".tsx");
       }
+      const url = urlQs.length ? `${urlPathname}?${urlQs.join("?")}` : urlPathname;
       debug_default("retrying to resolve file with specifier %s", url);
       return nextResolve(url, context);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@poppinss/ts-exec",
   "description": "TypeScript JIT compiler built for correctness and supports legacy/experimental decorators",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "engines": {
     "node": ">=24.0.0"
   },