@danielx/civet 0.5.91 → 0.5.93

package/dist/civet

@@ -265,7 +265,6 @@ cli = async function() {
   if (options.run) {
     options.js = true;
     options.inlineMap = true;
-    require("../register.js");
   }
   if (options.repl) {
     return repl(options);
@@ -353,6 +352,7 @@ cli = async function() {
         }
         results.push(process.exit(child.status));
       } else {
+        require("../register.js");
         try {
           module.filename = await fs.realpath(filename);
         } catch (error1) {

package/dist/esm.mjs

@@ -44,7 +44,7 @@ function ensureRegister () {
       let path = pathOrUrl
       // If it's a file URL, convert to local path
       // I could not find a way to handle non-URLs except to swallow an error
-      if (path.startsWith('file://')) {
+      if (path.startsWith('file:')) {
         try {
           path = fileURLToPath(path)
         } catch(e) {}
@@ -85,10 +85,11 @@ export async function load(url, context, next) {
       js: true,
     })
 
-    const transpiledPath = url + ".tsx"
+    // NOTE: Append .tsx to URL so ts-node treats as TypeScript
+    const transpiledUrl = url + ".tsx"
 
     // NOTE: Assuming ts-node hook follows load hook
-    const result = await next(transpiledPath, {
+    const result = await next(transpiledUrl, {
       // ts-node won't transpile unless this is module
       // can't use commonjs since we don't rewrite imports
       format: "module",
@@ -99,9 +100,13 @@ export async function load(url, context, next) {
     // NOTE: we must install our source map support after ts-node does to take priority
     ensureRegister()
 
+    // Remove .tsx extension for final URL
+    result.responseURL = (result.responseURL ?? transpiledUrl)
+    .replace(/.tsx$/, '')
+
     // parse source map from downstream (ts-node) result
     // compose with civet source map
-    result.source = SourceMap.remap(result.source, sourceMap, url, "")
+    result.source = SourceMap.remap(result.source, sourceMap, url, result.responseURL)
     // NOTE: This path needs to match what ts-node uses so we can override the source map
     outputCache.set(normalizeSlashes(path), result.source)