@danielx/civet 0.5.92 → 0.5.93

package/dist/browser.js

@@ -475,6 +475,8 @@ var Civet = (() => {
         };
       }
       function processUnaryExpression(pre, exp, post) {
+        if (!(pre.length || post))
+          return exp;
         if (post?.token === "?") {
           post = {
             $loc: post.$loc,
@@ -524,22 +526,10 @@ var Civet = (() => {
             };
           }
         }
-        if (exp.children) {
-          const children = [...pre, ...exp.children];
-          if (post)
-            children.push(post);
-          return Object.assign({}, exp, { children });
-        } else if (Array.isArray(exp)) {
-          const children = [...pre, ...exp];
-          if (post)
-            children.push(post);
-          return { children };
-        } else {
-          const children = [...pre, exp];
-          if (post)
-            children.push(post);
-          return { children };
-        }
+        return {
+          type: "UnaryExpression",
+          children: [...pre, exp, post]
+        };
       }
       module.exports = {
         blockWithPrefix,
@@ -3119,9 +3109,9 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var FatArrow$0 = $TS($S(__, $EXPECT($L8, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
+      var FatArrow$0 = $TS($S($E(_), $EXPECT($L8, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
         var ws = $1;
-        if (!ws.length)
+        if (!ws)
           return " =>";
         return $0;
       });
@@ -4132,11 +4122,8 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var LeftHandSideExpression$0 = $TS($S($Q($S(New, $N($C($EXPECT($L5, fail, 'LeftHandSideExpression "."'), $EXPECT($L10, fail, 'LeftHandSideExpression ":"'))), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
-        if ($1.length)
-          return $0;
-        return $2;
-      });
+      var LeftHandSideExpression$0 = $S($P($S(New, $N($C($EXPECT($L5, fail, 'LeftHandSideExpression "."'), $EXPECT($L10, fail, 'LeftHandSideExpression ":"'))), __)), CallExpression, $E(TypeArguments));
+      var LeftHandSideExpression$1 = CallExpression;
       function LeftHandSideExpression(state) {
         let eventData;
         if (state.events) {
@@ -4148,12 +4135,12 @@ ${input.slice(result.pos)}
           }
         }
         if (state.tokenize) {
-          const result = $TOKEN("LeftHandSideExpression", state, LeftHandSideExpression$0(state));
+          const result = $TOKEN("LeftHandSideExpression", state, LeftHandSideExpression$0(state) || LeftHandSideExpression$1(state));
           if (state.events)
             state.events.exit?.("LeftHandSideExpression", state, result, eventData);
           return result;
         } else {
-          const result = LeftHandSideExpression$0(state);
+          const result = LeftHandSideExpression$0(state) || LeftHandSideExpression$1(state);
           if (state.events)
             state.events.exit?.("LeftHandSideExpression", state, result, eventData);
           return result;
@@ -4722,10 +4709,13 @@ ${input.slice(result.pos)}
         }
       }
       var Parameters$0 = NonEmptyParameters;
-      var Parameters$1 = $TV($EXPECT($L0, fail, 'Parameters ""'), function($skip, $loc, $0, $1) {
+      var Parameters$1 = $TS($S($E(TypeParameters), Loc), function($skip, $loc, $0, $1, $2) {
+        var tp = $1;
+        var p = $2;
         return {
           type: "Parameters",
-          children: [{ $loc, token: "()" }],
+          children: [tp, { $loc: p.$loc, token: "()" }],
+          tp,
           names: [],
           implicit: true
         };
@@ -4771,9 +4761,8 @@ ${input.slice(result.pos)}
           }
           let blockPrefix;
           if (after.length) {
-            const spliceRef = module.getRef("splice");
             blockPrefix = {
-              children: ["[", insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
+              children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
               names: after.flatMap((p) => p.names)
             };
           }
@@ -6157,7 +6146,7 @@ ${input.slice(result.pos)}
           async,
           generator,
           block: null,
-          children: !parameters.implicit ? $0 : [async, func, generator, wid, parameters, w, suffix]
+          children: !parameters.implicit ? [async, func, generator, wid, w, parameters, suffix] : [async, func, generator, wid, parameters, w, suffix]
         };
       });
       function FunctionSignature(state) {
@@ -6470,7 +6459,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $Q(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         var async = $1;
         var parameters = $2;
         var suffix = $3;
@@ -8542,7 +8531,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var MethodModifier$0 = $TS($S(GetOrSet, $E(_)), function($skip, $loc, $0, $1, $2) {
+      var MethodModifier$0 = $TS($S(GetOrSet, $E(_), $Y(ClassElementName)), function($skip, $loc, $0, $1, $2, $3) {
         var kind = $1;
         return {
           type: "MethodModifier",
@@ -17400,7 +17389,8 @@ ${input.slice(result.pos)}
       var JSXAttributeValue$1 = JSXElement;
       var JSXAttributeValue$2 = JSXFragment;
       var JSXAttributeValue$3 = $TS($S(InsertInlineOpenBrace, InlineJSXAttributeValue, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
-        if ($2.children?.length === 1 && $2.children[0].type === "StringLiteral") {
+        var value = $2;
+        if (value.type === "StringLiteral") {
           return $skip;
         }
         return $0;
@@ -19783,7 +19773,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeParameters$0 = $TS($S(__, $EXPECT($L132, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L31, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var TypeParameters$0 = $TS($S($E(_), $EXPECT($L132, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L31, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var parameters = $3;
         return {
           type: "TypeParameters",
@@ -21934,10 +21924,9 @@ ${input.slice(result.pos)}
               names.push(...rest.names);
             }
             if (after.length) {
-              const spliceRef = module.getRef("splice");
               blockPrefix = {
                 type: "PostRestBindingElements",
-                children: ["[", insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
+                children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
                 names: after.flatMap((p) => p.names)
               };
             }
@@ -22298,16 +22287,6 @@ ${input.slice(result.pos)}
               exp.children.push(...post);
           });
         }
-        function checkSpliceRef(statements) {
-          const spliceRef = module.getRef("splice");
-          if (gatherRecursiveAll(statements, (n) => n === spliceRef).length) {
-            const typeSuffix = {
-              ts: true,
-              children: [": <T>(this: T[], start: number, deleteCount?: number) => T[]"]
-            };
-            module.prelude.push(["", ["const ", spliceRef, typeSuffix, " = [].splice", module.asAny, "\n"]]);
-          }
-        }
         module.attachPostfixStatementAsExpression = function(exp, post) {
           let clause;
           switch (post[1].type) {
@@ -22795,7 +22774,6 @@ ${input.slice(result.pos)}
           processTryExpressions(statements);
           hoistRefDecs(statements);
           gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
-          checkSpliceRef(statements);
           statements.unshift(...module.prelude);
           if (module.config.autoLet) {
             createLetDecs(statements, []);
@@ -23606,17 +23584,17 @@ ${input.slice(result.pos)}
   smRegexp = /\n\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,([+a-zA-Z0-9\/]*=?=?)$/;
   SourceMap.remap = function(codeWithSourceMap, upstreamMap, sourcePath, targetPath) {
     var codeWithoutSourceMap, composedLines, newSourceMap, parsed, remappedCodeWithSourceMap, remappedSourceMapJSON, sourceMapText;
-    sourceMapText = codeWithSourceMap.match(smRegexp);
+    sourceMapText = null;
+    codeWithoutSourceMap = codeWithSourceMap.replace(smRegexp, (match, sm) => {
+      sourceMapText = sm;
+      return "";
+    });
     if (sourceMapText) {
-      parsed = SourceMap.parseWithLines(sourceMapText[1]);
-    } else {
-      console.warn("No source map found in code");
-      return codeWithSourceMap;
+      parsed = SourceMap.parseWithLines(sourceMapText);
+      composedLines = SourceMap.composeLines(upstreamMap.data.lines, parsed.lines);
+      upstreamMap.data.lines = composedLines;
     }
-    composedLines = SourceMap.composeLines(upstreamMap.data.lines, parsed.lines);
-    upstreamMap.data.lines = composedLines;
     remappedSourceMapJSON = upstreamMap.json(sourcePath, targetPath);
-    codeWithoutSourceMap = codeWithSourceMap.replace(smRegexp, "");
     newSourceMap = `${"sourceMapping"}URL=data:application/json;charset=utf-8;base64,${base64Encode(JSON.stringify(remappedSourceMapJSON))}`;
     remappedCodeWithSourceMap = `${codeWithoutSourceMap}
 //# ${newSourceMap}`;
@@ -23786,15 +23764,14 @@ ${input.slice(result.pos)}
   // source/main.coffee
   "civet coffeeCompat";
   var SourceMap2;
-  var base64Encode2;
   var makeCache;
   var parse;
   var uncacheable;
   ({ parse } = import_parser.default);
-  ({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
+  ({ SourceMap: SourceMap2 } = util_exports);
   uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
   var compile = function(src, options) {
-    var ast, code, events, filename, ref, result, sm, srcMapJSON;
+    var ast, code, events, filename, ref, result, sm;
     if (!options) {
       options = {};
     } else {
@@ -23816,10 +23793,7 @@ ${input.slice(result.pos)}
       options.updateSourceMap = sm.updateSourceMap;
       code = generate_default(ast, options);
       if (options.inlineMap) {
-        srcMapJSON = sm.json(filename, "");
-        return `${code}
-${"//#"} sourceMappingURL=data:application/json;base64,${base64Encode2(JSON.stringify(srcMapJSON))}
-`;
+        return SourceMap2.remap(code, sm, filename, filename + ".tsx");
       } else {
         return {
           code,

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)
 

package/dist/main.js

@@ -474,6 +474,8 @@ var require_lib = __commonJS({
       };
     }
     function processUnaryExpression(pre, exp, post) {
+      if (!(pre.length || post))
+        return exp;
       if (post?.token === "?") {
         post = {
           $loc: post.$loc,
@@ -523,22 +525,10 @@ var require_lib = __commonJS({
           };
         }
       }
-      if (exp.children) {
-        const children = [...pre, ...exp.children];
-        if (post)
-          children.push(post);
-        return Object.assign({}, exp, { children });
-      } else if (Array.isArray(exp)) {
-        const children = [...pre, ...exp];
-        if (post)
-          children.push(post);
-        return { children };
-      } else {
-        const children = [...pre, exp];
-        if (post)
-          children.push(post);
-        return { children };
-      }
+      return {
+        type: "UnaryExpression",
+        children: [...pre, exp, post]
+      };
     }
     module2.exports = {
       blockWithPrefix,
@@ -3118,9 +3108,9 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FatArrow$0 = $TS($S(__, $EXPECT($L8, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
+    var FatArrow$0 = $TS($S($E(_), $EXPECT($L8, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
-      if (!ws.length)
+      if (!ws)
         return " =>";
       return $0;
     });
@@ -4131,11 +4121,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LeftHandSideExpression$0 = $TS($S($Q($S(New, $N($C($EXPECT($L5, fail, 'LeftHandSideExpression "."'), $EXPECT($L10, fail, 'LeftHandSideExpression ":"'))), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
-      if ($1.length)
-        return $0;
-      return $2;
-    });
+    var LeftHandSideExpression$0 = $S($P($S(New, $N($C($EXPECT($L5, fail, 'LeftHandSideExpression "."'), $EXPECT($L10, fail, 'LeftHandSideExpression ":"'))), __)), CallExpression, $E(TypeArguments));
+    var LeftHandSideExpression$1 = CallExpression;
     function LeftHandSideExpression(state) {
       let eventData;
       if (state.events) {
@@ -4147,12 +4134,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("LeftHandSideExpression", state, LeftHandSideExpression$0(state));
+        const result = $TOKEN("LeftHandSideExpression", state, LeftHandSideExpression$0(state) || LeftHandSideExpression$1(state));
         if (state.events)
           state.events.exit?.("LeftHandSideExpression", state, result, eventData);
         return result;
       } else {
-        const result = LeftHandSideExpression$0(state);
+        const result = LeftHandSideExpression$0(state) || LeftHandSideExpression$1(state);
         if (state.events)
           state.events.exit?.("LeftHandSideExpression", state, result, eventData);
         return result;
@@ -4721,10 +4708,13 @@ ${input.slice(result.pos)}
       }
     }
     var Parameters$0 = NonEmptyParameters;
-    var Parameters$1 = $TV($EXPECT($L0, fail, 'Parameters ""'), function($skip, $loc, $0, $1) {
+    var Parameters$1 = $TS($S($E(TypeParameters), Loc), function($skip, $loc, $0, $1, $2) {
+      var tp = $1;
+      var p = $2;
       return {
         type: "Parameters",
-        children: [{ $loc, token: "()" }],
+        children: [tp, { $loc: p.$loc, token: "()" }],
+        tp,
         names: [],
         implicit: true
       };
@@ -4770,9 +4760,8 @@ ${input.slice(result.pos)}
         }
         let blockPrefix;
         if (after.length) {
-          const spliceRef = module2.getRef("splice");
           blockPrefix = {
-            children: ["[", insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
+            children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
             names: after.flatMap((p) => p.names)
           };
         }
@@ -6156,7 +6145,7 @@ ${input.slice(result.pos)}
         async,
         generator,
         block: null,
-        children: !parameters.implicit ? $0 : [async, func, generator, wid, parameters, w, suffix]
+        children: !parameters.implicit ? [async, func, generator, wid, w, parameters, suffix] : [async, func, generator, wid, parameters, w, suffix]
       };
     });
     function FunctionSignature(state) {
@@ -6469,7 +6458,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $Q(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var async = $1;
       var parameters = $2;
       var suffix = $3;
@@ -8541,7 +8530,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var MethodModifier$0 = $TS($S(GetOrSet, $E(_)), function($skip, $loc, $0, $1, $2) {
+    var MethodModifier$0 = $TS($S(GetOrSet, $E(_), $Y(ClassElementName)), function($skip, $loc, $0, $1, $2, $3) {
       var kind = $1;
       return {
         type: "MethodModifier",
@@ -17399,7 +17388,8 @@ ${input.slice(result.pos)}
     var JSXAttributeValue$1 = JSXElement;
     var JSXAttributeValue$2 = JSXFragment;
     var JSXAttributeValue$3 = $TS($S(InsertInlineOpenBrace, InlineJSXAttributeValue, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
-      if ($2.children?.length === 1 && $2.children[0].type === "StringLiteral") {
+      var value = $2;
+      if (value.type === "StringLiteral") {
         return $skip;
       }
       return $0;
@@ -19782,7 +19772,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameters$0 = $TS($S(__, $EXPECT($L132, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L31, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var TypeParameters$0 = $TS($S($E(_), $EXPECT($L132, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L31, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var parameters = $3;
       return {
         type: "TypeParameters",
@@ -21933,10 +21923,9 @@ ${input.slice(result.pos)}
             names.push(...rest.names);
           }
           if (after.length) {
-            const spliceRef = module2.getRef("splice");
             blockPrefix = {
               type: "PostRestBindingElements",
-              children: ["[", insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
+              children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
               names: after.flatMap((p) => p.names)
             };
           }
@@ -22297,16 +22286,6 @@ ${input.slice(result.pos)}
             exp.children.push(...post);
         });
       }
-      function checkSpliceRef(statements) {
-        const spliceRef = module2.getRef("splice");
-        if (gatherRecursiveAll(statements, (n) => n === spliceRef).length) {
-          const typeSuffix = {
-            ts: true,
-            children: [": <T>(this: T[], start: number, deleteCount?: number) => T[]"]
-          };
-          module2.prelude.push(["", ["const ", spliceRef, typeSuffix, " = [].splice", module2.asAny, "\n"]]);
-        }
-      }
       module2.attachPostfixStatementAsExpression = function(exp, post) {
         let clause;
         switch (post[1].type) {
@@ -22794,7 +22773,6 @@ ${input.slice(result.pos)}
         processTryExpressions(statements);
         hoistRefDecs(statements);
         gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
-        checkSpliceRef(statements);
         statements.unshift(...module2.prelude);
         if (module2.config.autoLet) {
           createLetDecs(statements, []);
@@ -23606,17 +23584,17 @@ SourceMap.parseWithLines = function(base64encodedJSONstr) {
 smRegexp = /\n\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,([+a-zA-Z0-9\/]*=?=?)$/;
 SourceMap.remap = function(codeWithSourceMap, upstreamMap, sourcePath, targetPath) {
   var codeWithoutSourceMap, composedLines, newSourceMap, parsed, remappedCodeWithSourceMap, remappedSourceMapJSON, sourceMapText;
-  sourceMapText = codeWithSourceMap.match(smRegexp);
+  sourceMapText = null;
+  codeWithoutSourceMap = codeWithSourceMap.replace(smRegexp, (match, sm) => {
+    sourceMapText = sm;
+    return "";
+  });
   if (sourceMapText) {
-    parsed = SourceMap.parseWithLines(sourceMapText[1]);
-  } else {
-    console.warn("No source map found in code");
-    return codeWithSourceMap;
+    parsed = SourceMap.parseWithLines(sourceMapText);
+    composedLines = SourceMap.composeLines(upstreamMap.data.lines, parsed.lines);
+    upstreamMap.data.lines = composedLines;
   }
-  composedLines = SourceMap.composeLines(upstreamMap.data.lines, parsed.lines);
-  upstreamMap.data.lines = composedLines;
   remappedSourceMapJSON = upstreamMap.json(sourcePath, targetPath);
-  codeWithoutSourceMap = codeWithSourceMap.replace(smRegexp, "");
   newSourceMap = `${"sourceMapping"}URL=data:application/json;charset=utf-8;base64,${base64Encode(JSON.stringify(remappedSourceMapJSON))}`;
   remappedCodeWithSourceMap = `${codeWithoutSourceMap}
 //# ${newSourceMap}`;
@@ -23786,15 +23764,14 @@ remapPosition = function(position, sourcemapLines) {
 // source/main.coffee
 "civet coffeeCompat";
 var SourceMap2;
-var base64Encode2;
 var makeCache;
 var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
-({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
+({ SourceMap: SourceMap2 } = util_exports);
 uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
 var compile = function(src, options) {
-  var ast, code, events, filename, ref, result, sm, srcMapJSON;
+  var ast, code, events, filename, ref, result, sm;
   if (!options) {
     options = {};
   } else {
@@ -23816,10 +23793,7 @@ var compile = function(src, options) {
     options.updateSourceMap = sm.updateSourceMap;
     code = generate_default(ast, options);
     if (options.inlineMap) {
-      srcMapJSON = sm.json(filename, "");
-      return `${code}
-${"//#"} sourceMappingURL=data:application/json;base64,${base64Encode2(JSON.stringify(srcMapJSON))}
-`;
+      return SourceMap2.remap(code, sm, filename, filename + ".tsx");
     } else {
       return {
         code,

package/dist/main.mjs

@@ -472,6 +472,8 @@ var require_lib = __commonJS({
       };
     }
     function processUnaryExpression(pre, exp, post) {
+      if (!(pre.length || post))
+        return exp;
       if (post?.token === "?") {
         post = {
           $loc: post.$loc,
@@ -521,22 +523,10 @@ var require_lib = __commonJS({
           };
         }
       }
-      if (exp.children) {
-        const children = [...pre, ...exp.children];
-        if (post)
-          children.push(post);
-        return Object.assign({}, exp, { children });
-      } else if (Array.isArray(exp)) {
-        const children = [...pre, ...exp];
-        if (post)
-          children.push(post);
-        return { children };
-      } else {
-        const children = [...pre, exp];
-        if (post)
-          children.push(post);
-        return { children };
-      }
+      return {
+        type: "UnaryExpression",
+        children: [...pre, exp, post]
+      };
     }
     module.exports = {
       blockWithPrefix,
@@ -3116,9 +3106,9 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var FatArrow$0 = $TS($S(__, $EXPECT($L8, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
+    var FatArrow$0 = $TS($S($E(_), $EXPECT($L8, fail, 'FatArrow "=>"')), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
-      if (!ws.length)
+      if (!ws)
         return " =>";
       return $0;
     });
@@ -4129,11 +4119,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LeftHandSideExpression$0 = $TS($S($Q($S(New, $N($C($EXPECT($L5, fail, 'LeftHandSideExpression "."'), $EXPECT($L10, fail, 'LeftHandSideExpression ":"'))), __)), CallExpression), function($skip, $loc, $0, $1, $2) {
-      if ($1.length)
-        return $0;
-      return $2;
-    });
+    var LeftHandSideExpression$0 = $S($P($S(New, $N($C($EXPECT($L5, fail, 'LeftHandSideExpression "."'), $EXPECT($L10, fail, 'LeftHandSideExpression ":"'))), __)), CallExpression, $E(TypeArguments));
+    var LeftHandSideExpression$1 = CallExpression;
     function LeftHandSideExpression(state) {
       let eventData;
       if (state.events) {
@@ -4145,12 +4132,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("LeftHandSideExpression", state, LeftHandSideExpression$0(state));
+        const result = $TOKEN("LeftHandSideExpression", state, LeftHandSideExpression$0(state) || LeftHandSideExpression$1(state));
         if (state.events)
           state.events.exit?.("LeftHandSideExpression", state, result, eventData);
         return result;
       } else {
-        const result = LeftHandSideExpression$0(state);
+        const result = LeftHandSideExpression$0(state) || LeftHandSideExpression$1(state);
         if (state.events)
           state.events.exit?.("LeftHandSideExpression", state, result, eventData);
         return result;
@@ -4719,10 +4706,13 @@ ${input.slice(result.pos)}
       }
     }
     var Parameters$0 = NonEmptyParameters;
-    var Parameters$1 = $TV($EXPECT($L0, fail, 'Parameters ""'), function($skip, $loc, $0, $1) {
+    var Parameters$1 = $TS($S($E(TypeParameters), Loc), function($skip, $loc, $0, $1, $2) {
+      var tp = $1;
+      var p = $2;
       return {
         type: "Parameters",
-        children: [{ $loc, token: "()" }],
+        children: [tp, { $loc: p.$loc, token: "()" }],
+        tp,
         names: [],
         implicit: true
       };
@@ -4768,9 +4758,8 @@ ${input.slice(result.pos)}
         }
         let blockPrefix;
         if (after.length) {
-          const spliceRef = module.getRef("splice");
           blockPrefix = {
-            children: ["[", insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
+            children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
             names: after.flatMap((p) => p.names)
           };
         }
@@ -6154,7 +6143,7 @@ ${input.slice(result.pos)}
         async,
         generator,
         block: null,
-        children: !parameters.implicit ? $0 : [async, func, generator, wid, parameters, w, suffix]
+        children: !parameters.implicit ? [async, func, generator, wid, w, parameters, suffix] : [async, func, generator, wid, parameters, w, suffix]
       };
     });
     function FunctionSignature(state) {
@@ -6467,7 +6456,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $Q(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var ThinArrowFunction$0 = $TS($S($E($S(Async, _)), Parameters, $E(ReturnTypeSuffix), $E(_), Arrow, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var async = $1;
       var parameters = $2;
       var suffix = $3;
@@ -8539,7 +8528,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var MethodModifier$0 = $TS($S(GetOrSet, $E(_)), function($skip, $loc, $0, $1, $2) {
+    var MethodModifier$0 = $TS($S(GetOrSet, $E(_), $Y(ClassElementName)), function($skip, $loc, $0, $1, $2, $3) {
       var kind = $1;
       return {
         type: "MethodModifier",
@@ -17397,7 +17386,8 @@ ${input.slice(result.pos)}
     var JSXAttributeValue$1 = JSXElement;
     var JSXAttributeValue$2 = JSXFragment;
     var JSXAttributeValue$3 = $TS($S(InsertInlineOpenBrace, InlineJSXAttributeValue, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
-      if ($2.children?.length === 1 && $2.children[0].type === "StringLiteral") {
+      var value = $2;
+      if (value.type === "StringLiteral") {
         return $skip;
       }
       return $0;
@@ -19780,7 +19770,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameters$0 = $TS($S(__, $EXPECT($L132, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L31, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var TypeParameters$0 = $TS($S($E(_), $EXPECT($L132, fail, 'TypeParameters "<"'), $P(TypeParameter), __, $EXPECT($L31, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var parameters = $3;
       return {
         type: "TypeParameters",
@@ -21931,10 +21921,9 @@ ${input.slice(result.pos)}
             names.push(...rest.names);
           }
           if (after.length) {
-            const spliceRef = module.getRef("splice");
             blockPrefix = {
               type: "PostRestBindingElements",
-              children: ["[", insertTrimmingSpace(after, ""), "] = ", spliceRef, ".call(", restIdentifier, ", -", after.length.toString(), ")"],
+              children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", after.length.toString(), ")"],
               names: after.flatMap((p) => p.names)
             };
           }
@@ -22295,16 +22284,6 @@ ${input.slice(result.pos)}
             exp.children.push(...post);
         });
       }
-      function checkSpliceRef(statements) {
-        const spliceRef = module.getRef("splice");
-        if (gatherRecursiveAll(statements, (n) => n === spliceRef).length) {
-          const typeSuffix = {
-            ts: true,
-            children: [": <T>(this: T[], start: number, deleteCount?: number) => T[]"]
-          };
-          module.prelude.push(["", ["const ", spliceRef, typeSuffix, " = [].splice", module.asAny, "\n"]]);
-        }
-      }
       module.attachPostfixStatementAsExpression = function(exp, post) {
         let clause;
         switch (post[1].type) {
@@ -22792,7 +22771,6 @@ ${input.slice(result.pos)}
         processTryExpressions(statements);
         hoistRefDecs(statements);
         gatherRecursiveAll(statements, (n) => n.type === "IterationExpression").forEach((e) => expressionizeIteration(e));
-        checkSpliceRef(statements);
         statements.unshift(...module.prelude);
         if (module.config.autoLet) {
           createLetDecs(statements, []);
@@ -23594,17 +23572,17 @@ SourceMap.parseWithLines = function(base64encodedJSONstr) {
 smRegexp = /\n\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,([+a-zA-Z0-9\/]*=?=?)$/;
 SourceMap.remap = function(codeWithSourceMap, upstreamMap, sourcePath, targetPath) {
   var codeWithoutSourceMap, composedLines, newSourceMap, parsed, remappedCodeWithSourceMap, remappedSourceMapJSON, sourceMapText;
-  sourceMapText = codeWithSourceMap.match(smRegexp);
+  sourceMapText = null;
+  codeWithoutSourceMap = codeWithSourceMap.replace(smRegexp, (match, sm) => {
+    sourceMapText = sm;
+    return "";
+  });
   if (sourceMapText) {
-    parsed = SourceMap.parseWithLines(sourceMapText[1]);
-  } else {
-    console.warn("No source map found in code");
-    return codeWithSourceMap;
+    parsed = SourceMap.parseWithLines(sourceMapText);
+    composedLines = SourceMap.composeLines(upstreamMap.data.lines, parsed.lines);
+    upstreamMap.data.lines = composedLines;
   }
-  composedLines = SourceMap.composeLines(upstreamMap.data.lines, parsed.lines);
-  upstreamMap.data.lines = composedLines;
   remappedSourceMapJSON = upstreamMap.json(sourcePath, targetPath);
-  codeWithoutSourceMap = codeWithSourceMap.replace(smRegexp, "");
   newSourceMap = `${"sourceMapping"}URL=data:application/json;charset=utf-8;base64,${base64Encode(JSON.stringify(remappedSourceMapJSON))}`;
   remappedCodeWithSourceMap = `${codeWithoutSourceMap}
 //# ${newSourceMap}`;
@@ -23774,15 +23752,14 @@ remapPosition = function(position, sourcemapLines) {
 // source/main.coffee
 "civet coffeeCompat";
 var SourceMap2;
-var base64Encode2;
 var makeCache;
 var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
-({ SourceMap: SourceMap2, base64Encode: base64Encode2 } = util_exports);
+({ SourceMap: SourceMap2 } = util_exports);
 uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
 var compile = function(src, options) {
-  var ast, code, events, filename, ref, result, sm, srcMapJSON;
+  var ast, code, events, filename, ref, result, sm;
   if (!options) {
     options = {};
   } else {
@@ -23804,10 +23781,7 @@ var compile = function(src, options) {
     options.updateSourceMap = sm.updateSourceMap;
     code = generate_default(ast, options);
     if (options.inlineMap) {
-      srcMapJSON = sm.json(filename, "");
-      return `${code}
-${"//#"} sourceMappingURL=data:application/json;base64,${base64Encode2(JSON.stringify(srcMapJSON))}
-`;
+      return SourceMap2.remap(code, sm, filename, filename + ".tsx");
     } else {
       return {
         code,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.5.92",
+  "version": "0.5.93",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -37,6 +37,9 @@
   },
   "author": "Daniel X. Moore",
   "license": "MIT",
+  "dependencies": {
+    "@cspotcode/source-map-support": "^0.8.1"
+  },
   "devDependencies": {
     "@danielx/hera": "^0.8.0",
     "@types/assert": "^1.5.6",

package/register.js

@@ -22,4 +22,13 @@ if (require.extensions) {
     module._compile(js, filename);
     return;
   };
+
+  try {
+    require('@cspotcode/source-map-support').install({
+      environment: 'node',
+      hookRequire: true  // support inline source maps
+    })
+  } catch (e) {
+    // ignore missing dependency
+  }
 }