@danielx/civet 0.10.4 → 0.10.6

package/dist/main.js

@@ -515,6 +515,8 @@ __export(lib_civet_exports, {
   blockWithPrefix: () => blockWithPrefix,
   braceBlock: () => braceBlock,
   bracedBlock: () => bracedBlock,
+  convertArrowFunctionToMethod: () => convertArrowFunctionToMethod,
+  convertFunctionToMethod: () => convertFunctionToMethod,
   convertNamedImportsToObject: () => convertNamedImportsToObject,
   convertObjectToJSXAttributes: () => convertObjectToJSXAttributes,
   convertWithClause: () => convertWithClause,
@@ -6799,7 +6801,7 @@ function createVarDecs(block, scopes, pushVar) {
         findAssignments(assignmentStatements2.map((s) => s.children), decs2)
       );
     }
-    return assignmentStatements2;
+    return assignmentStatements2.filter(($4) => !($4.parent?.type === "CoffeeClassPublic"));
   }
   pushVar ??= (name) => {
     varIds.push(name);
@@ -6810,7 +6812,7 @@ function createVarDecs(block, scopes, pushVar) {
   scopes.push(decs);
   const varIds = [];
   const assignmentStatements = findAssignments(statements, scopes);
-  const undeclaredIdentifiers = assignmentStatements.flatMap(($4) => $4?.names || []);
+  const undeclaredIdentifiers = assignmentStatements.flatMap(($5) => $5?.names || []);
   undeclaredIdentifiers.filter((x, i, a) => {
     if (!hasDec(x)) return a.indexOf(x) === i;
     return;
@@ -7688,6 +7690,45 @@ function convertMethodToFunction(method) {
     block
   };
 }
+function convertFunctionToMethod(id, exp) {
+  const fnTokenIndex = exp.children.findIndex(function(c) {
+    return c?.token?.startsWith("function");
+  });
+  const children = exp.children.slice();
+  if (exp.generator) {
+    children.splice(fnTokenIndex, 2, children[fnTokenIndex + 1], id);
+  } else {
+    children.splice(fnTokenIndex, 1, id);
+  }
+  return {
+    ...exp,
+    type: "MethodDefinition",
+    name: id.name,
+    signature: { ...exp.signature, id, name: id.name },
+    children
+  };
+}
+function convertArrowFunctionToMethod(id, exp) {
+  const block = { ...exp.block };
+  const children = exp.children.filter(function(c) {
+    return !(Array.isArray(c) && c[c.length - 1]?.token?.includes("=>"));
+  }).map(function(c) {
+    return c === exp.block ? block : c;
+  });
+  children.unshift(id);
+  exp = {
+    ...exp,
+    type: "MethodDefinition",
+    name: id.name,
+    signature: { ...exp.signature, id, name: id.name },
+    block,
+    children,
+    autoBind: true
+  };
+  block.parent = exp;
+  braceBlock(block);
+  return exp;
+}
 function convertNamedImportsToObject(node, pattern) {
   const properties = node.specifiers.map((specifier) => {
     if (specifier.ts) {
@@ -8472,7 +8513,17 @@ function processCoffeeClasses(statements) {
         })()
       );
     }
-    const privates = expressions.filter(($15) => $15[1]?.type === "CoffeeClassPrivate");
+    const public_static_function_assignments = expressions.filter(($15) => $15[1]?.type === "CoffeeClassPublic" && $15[1].assignment?.expression?.type === "FunctionExpression").map(($16) => $16[1].assignment);
+    for (const public_static_function_assignment of public_static_function_assignments) {
+      const id = public_static_function_assignment.lhs[0][1];
+      replaceNode(public_static_function_assignment, convertFunctionToMethod(id, public_static_function_assignment.expression));
+    }
+    const public_static_arrow_function_assignments = expressions.filter(($17) => $17[1]?.type === "CoffeeClassPublic" && $17[1].assignment?.expression?.type === "ArrowFunction").map(($18) => $18[1].assignment);
+    for (const public_static_arrow_function_assignment of public_static_arrow_function_assignments) {
+      const id = public_static_arrow_function_assignment.lhs[0][1];
+      replaceNode(public_static_arrow_function_assignment, convertArrowFunctionToMethod(id, public_static_arrow_function_assignment.expression));
+    }
+    const privates = expressions.filter(($19) => $19[1]?.type === "CoffeeClassPrivate");
     if (!privates.length) {
       continue;
     }
@@ -8537,7 +8588,7 @@ function processProgram(root) {
       root.topLevelYield ? "*" : void 0
     );
     statements = [["", rootIIFE]];
-    root.children = root.children.map(($16) => $16 === root.expressions ? statements : $16);
+    root.children = root.children.map(($20) => $20 === root.expressions ? statements : $20);
     root.expressions = statements;
   }
   hoistRefDecs(statements);
@@ -8568,9 +8619,9 @@ async function processProgramAsync(root) {
   await processComptime(statements);
 }
 function processRepl(root, rootIIFE) {
-  const topBlock = gatherRecursive(rootIIFE, ($17) => $17.type === "BlockStatement")[0];
+  const topBlock = gatherRecursive(rootIIFE, ($21) => $21.type === "BlockStatement")[0];
   let i = 0;
-  for (let ref23 = gatherRecursiveWithinFunction(topBlock, ($18) => $18.type === "Declaration"), i14 = 0, len11 = ref23.length; i14 < len11; i14++) {
+  for (let ref23 = gatherRecursiveWithinFunction(topBlock, ($22) => $22.type === "Declaration"), i14 = 0, len11 = ref23.length; i14 < len11; i14++) {
     const decl = ref23[i14];
     if (!decl.names?.length) {
       continue;
@@ -8584,7 +8635,7 @@ function processRepl(root, rootIIFE) {
       root.expressions.splice(i++, 0, ["", `var ${decl.names.join(",")}`, ";"]);
     }
   }
-  for (let ref24 = gatherRecursive(topBlock, ($19) => $19.type === "FunctionExpression"), i15 = 0, len12 = ref24.length; i15 < len12; i15++) {
+  for (let ref24 = gatherRecursive(topBlock, ($23) => $23.type === "FunctionExpression"), i15 = 0, len12 = ref24.length; i15 < len12; i15++) {
     const func = ref24[i15];
     if (func.name && func.parent?.type === "BlockStatement") {
       if (func.parent === topBlock) {
@@ -8597,7 +8648,7 @@ function processRepl(root, rootIIFE) {
       }
     }
   }
-  for (let ref25 = gatherRecursiveWithinFunction(topBlock, ($20) => $20.type === "ClassExpression"), i16 = 0, len13 = ref25.length; i16 < len13; i16++) {
+  for (let ref25 = gatherRecursiveWithinFunction(topBlock, ($24) => $24.type === "ClassExpression"), i16 = 0, len13 = ref25.length; i16 < len13; i16++) {
     const classExp = ref25[i16];
     let m8;
     if (classExp.name && classExp.parent === topBlock || (m8 = classExp.parent, typeof m8 === "object" && m8 != null && "type" in m8 && m8.type === "ReturnStatement" && "parent" in m8 && m8.parent === topBlock)) {
@@ -8609,7 +8660,7 @@ function processRepl(root, rootIIFE) {
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const liftedIfs = /* @__PURE__ */ new Set();
-  for (let ref26 = gatherRecursiveAll(statements, ($21) => $21.type === "Placeholder"), i17 = 0, len14 = ref26.length; i17 < len14; i17++) {
+  for (let ref26 = gatherRecursiveAll(statements, ($25) => $25.type === "Placeholder"), i17 = 0, len14 = ref26.length; i17 < len14; i17++) {
     const exp = ref26[i17];
     let ancestor;
     if (exp.subtype === ".") {
@@ -9011,6 +9062,7 @@ var grammar = {
   AccessModifier,
   FieldDefinition,
   ThisLiteral,
+  BasicThisLiteral,
   HashThis,
   LengthShorthand,
   AtThis,
@@ -9996,7 +10048,7 @@ var $R9 = (0, import_lib2.$R)(new RegExp("(?=[\\/?])", "suy"));
 var $R10 = (0, import_lib2.$R)(new RegExp("(?=[\\/\\[{?.!@#'\u2019:])", "suy"));
 var $R11 = (0, import_lib2.$R)(new RegExp("%%?", "suy"));
 var $R12 = (0, import_lib2.$R)(new RegExp("[.\\s]", "suy"));
-var $R13 = (0, import_lib2.$R)(new RegExp("[)}]", "suy"));
+var $R13 = (0, import_lib2.$R)(new RegExp("[)\\]}]", "suy"));
 var $R14 = (0, import_lib2.$R)(new RegExp("[+-]", "suy"));
 var $R15 = (0, import_lib2.$R)(new RegExp("\\+\\+|--|\u29FA|\u2014|[\\+\\-&]\\S", "suy"));
 var $R16 = (0, import_lib2.$R)(new RegExp(`(?=[0-9.'"tfyno])`, "suy"));
@@ -11376,7 +11428,20 @@ var NestedClassElement$0 = (0, import_lib2.$S)(Nested, ClassElement, StatementDe
 function NestedClassElement(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NestedClassElement", NestedClassElement$0);
 }
-var ClassElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(Decorators), (0, import_lib2.$E)((0, import_lib2.$S)(Declare, (0, import_lib2.$E)(_))), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)((0, import_lib2.$S)(Static, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Override, (0, import_lib2.$E)(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+var ClassElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeClassesEnabled, (0, import_lib2.$E)(Decorators), (0, import_lib2.$E)((0, import_lib2.$S)(Declare, (0, import_lib2.$E)(_))), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)((0, import_lib2.$S)(Static, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Override, (0, import_lib2.$E)(_))), ActualAssignment), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var decorators = $2;
+  var declare = $3;
+  var access = $4;
+  var static_ = $5;
+  var override = $6;
+  var assignment = $7;
+  return {
+    type: static_ ? "CoffeeClassPublic" : "CoffeeClassPrivate",
+    children: [decorators, declare, access, static_, override, assignment],
+    assignment
+  };
+});
+var ClassElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(Decorators), (0, import_lib2.$E)((0, import_lib2.$S)(Declare, (0, import_lib2.$E)(_))), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)((0, import_lib2.$S)(Static, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Override, (0, import_lib2.$E)(_))), ClassElementDefinition), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
   var decorators = $1;
   var declare = $2;
   var access = $3;
@@ -11402,14 +11467,14 @@ var ClassElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E
     children: [decorators, declare, access, static_, override, ...definition.children]
   };
 });
-var ClassElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
+var ClassElement$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(Static, BracedBlock), function($skip, $loc, $0, $1, $2) {
   return {
     type: "ClassStaticBlock",
     children: $0
   };
 });
-var ClassElement$2 = EmptyStatement;
-var ClassElement$$ = [ClassElement$0, ClassElement$1, ClassElement$2];
+var ClassElement$3 = EmptyStatement;
+var ClassElement$$ = [ClassElement$0, ClassElement$1, ClassElement$2, ClassElement$3];
 function ClassElement(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ClassElement", ClassElement$$);
 }
@@ -11462,37 +11527,10 @@ var FieldDefinition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeClassesEn
   var exp = $6;
   switch (exp.type) {
     case "FunctionExpression": {
-      const fnTokenIndex = exp.children.findIndex((c) => c?.token?.startsWith("function"));
-      const children = exp.children.slice();
-      if (exp.generator) {
-        children.splice(fnTokenIndex, 2, children[fnTokenIndex + 1], id);
-      } else {
-        children.splice(fnTokenIndex, 1, id);
-      }
-      return {
-        ...exp,
-        type: "MethodDefinition",
-        name: id.name,
-        signature: { ...exp.signature, id, name: id.name },
-        children
-      };
+      return convertFunctionToMethod(id, exp);
     }
     case "ArrowFunction": {
-      const block = { ...exp.block };
-      const children = exp.children.filter((c) => !(Array.isArray(c) && c[c.length - 1]?.token?.includes("=>"))).map((c) => c === exp.block ? block : c);
-      children.unshift(id);
-      exp = {
-        ...exp,
-        type: "MethodDefinition",
-        name: id.name,
-        signature: { ...exp.signature, id, name: id.name },
-        block,
-        children,
-        autoBind: true
-      };
-      block.parent = exp;
-      braceBlock(block);
-      return exp;
+      return convertArrowFunctionToMethod(id, exp);
     }
     default:
       return {
@@ -11519,15 +11557,7 @@ var FieldDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(InsertReadonly,
     readonly
   };
 });
-var FieldDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(CoffeeClassesEnabled, ActualAssignment), function($skip, $loc, $0, $1, $2) {
-  var assignment = $2;
-  return {
-    type: "CoffeeClassPrivate",
-    children: [assignment],
-    assignment
-  };
-});
-var FieldDefinition$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(Abstract, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Readonly, (0, import_lib2.$E)(_))), ClassElementName, (0, import_lib2.$E)(TypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var FieldDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(Abstract, (0, import_lib2.$E)(_))), (0, import_lib2.$E)((0, import_lib2.$S)(Readonly, (0, import_lib2.$E)(_))), ClassElementName, (0, import_lib2.$E)(TypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var abstract = $1;
   var readonly = $2;
   var id = $3;
@@ -11544,15 +11574,12 @@ var FieldDefinition$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
     initializer
   };
 });
-var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2, FieldDefinition$3];
+var FieldDefinition$$ = [FieldDefinition$0, FieldDefinition$1, FieldDefinition$2];
 function FieldDefinition(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "FieldDefinition", FieldDefinition$$);
 }
-var ThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
-  return { "type": "Identifier", "name": "this", "children": [value[0]] };
-});
-var ThisLiteral$1 = HashThis;
-var ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
+var ThisLiteral$0 = HashThis;
+var ThisLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$E)(Hash), IdentifierName))), function($skip, $loc, $0, $1, $2) {
   var at = $1;
   var id = $2;
   return {
@@ -11571,11 +11598,19 @@ var ThisLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(AtThis, (0, import_
     thisShorthand: true
   };
 });
-var ThisLiteral$3 = AtThis;
-var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2, ThisLiteral$3];
+var ThisLiteral$2 = BasicThisLiteral;
+var ThisLiteral$$ = [ThisLiteral$0, ThisLiteral$1, ThisLiteral$2];
 function ThisLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ThisLiteral", ThisLiteral$$);
 }
+var BasicThisLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(This), function(value) {
+  return { "type": "Identifier", "name": "this", "children": [value[0]] };
+});
+var BasicThisLiteral$1 = AtThis;
+var BasicThisLiteral$$ = [BasicThisLiteral$0, BasicThisLiteral$1];
+function BasicThisLiteral(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "BasicThisLiteral", BasicThisLiteral$$);
+}
 var HashThis$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(AtThis), LengthShorthand, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$Y)((0, import_lib2.$S)(_, (0, import_lib2.$E)((0, import_lib2.$S)(Not, __)), ActualIn)), (0, import_lib2.$EXPECT)($L0, 'HashThis ""')))), function($skip, $loc, $0, $1, $2, $3) {
   var at = $1;
   var id = $2;
@@ -11612,7 +11647,7 @@ var HashThis$$ = [HashThis$0, HashThis$1, HashThis$2];
 function HashThis(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "HashThis", HashThis$$);
 }
-var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Hash, NonIdContinue), function($skip, $loc, $0, $1, $2) {
+var LengthShorthand$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(CoffeeCommentEnabled), Hash, NonIdContinue), function($skip, $loc, $0, $1, $2, $3) {
   const id = "length";
   return {
     type: "Identifier",
@@ -12310,7 +12345,7 @@ function ParameterElement(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ParameterElement", ParameterElement$0);
 }
 var ParameterElementDelimiter$0 = (0, import_lib2.$S)((0, import_lib2.$E)(_), Comma);
-var ParameterElementDelimiter$1 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R13, "ParameterElementDelimiter /[)}]/"))));
+var ParameterElementDelimiter$1 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R13, "ParameterElementDelimiter /[)\\]}]/"))));
 var ParameterElementDelimiter$2 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertComma), function(value) {
   return value[1];
 });
@@ -14246,7 +14281,7 @@ function InlineObjectPropertyDelimiter(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "InlineObjectPropertyDelimiter", InlineObjectPropertyDelimiter$0);
 }
 var ObjectPropertyDelimiter$0 = (0, import_lib2.$S)((0, import_lib2.$E)(_), Comma);
-var ObjectPropertyDelimiter$1 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L37, 'ObjectPropertyDelimiter "}"')));
+var ObjectPropertyDelimiter$1 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)($R13, "ObjectPropertyDelimiter /[)\\]}]/"))));
 var ObjectPropertyDelimiter$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertComma), function($skip, $loc, $0, $1, $2) {
   return { ...$2, implicit: true };
 });
@@ -19904,7 +19939,14 @@ var TypeIdentifier$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.
     args
   };
 });
-var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1];
+var TypeIdentifier$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), BasicThisLiteral), function($skip, $loc, $0, $1, $2) {
+  return {
+    type: "TypeIdentifier",
+    children: $0,
+    raw: $2.name
+  };
+});
+var TypeIdentifier$$ = [TypeIdentifier$0, TypeIdentifier$1, TypeIdentifier$2];
 function TypeIdentifier(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "TypeIdentifier", TypeIdentifier$$);
 }
@@ -21190,6 +21232,7 @@ var sourcemap_civet_exports = {};
 __export(sourcemap_civet_exports, {
   SourceMap: () => SourceMap,
   base64Encode: () => base64Encode,
+  decodeVLQ: () => decodeVLQ,
   locationTable: () => locationTable,
   lookupLineColumn: () => lookupLineColumn
 });
@@ -21225,7 +21268,6 @@ var SourceMap = class {
   // relative to previous entry
   srcLine;
   srcColumn;
-  srcOffset;
   srcTable;
   source;
   constructor(source1) {
@@ -21235,7 +21277,6 @@ var SourceMap = class {
     this.colOffset = 0;
     this.srcLine = 0;
     this.srcColumn = 0;
-    this.srcOffset = 0;
     this.srcTable = locationTable(this.source);
   }
   renderMappings() {
@@ -21279,6 +21320,10 @@ var SourceMap = class {
       }
     };
   }
+  /** Generate a comment with the source mapping URL. */
+  comment(srcFileName, outFileName) {
+    return `//${"#"} sourceMappingURL=data:application/json;base64,${base64Encode(JSON.stringify(this.json(srcFileName, outFileName)))}`;
+  }
   updateSourceMap(outputStr, inputPos, colOffset = 0) {
     const outLines = outputStr.split(EOL2);
     let srcLine, srcCol;
@@ -21287,7 +21332,6 @@ var SourceMap = class {
       srcCol += colOffset;
       this.srcLine = srcLine;
       this.srcColumn = srcCol;
-      this.srcOffset = inputPos + outputStr.length;
     }
     for (let i3 = 0, len22 = outLines.length; i3 < len22; i3++) {
       const i = i3;
@@ -21310,74 +21354,85 @@ var SourceMap = class {
     }
     return;
   }
-};
-var smRegexp = /\n\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,([+a-zA-Z0-9\/]*=?=?)$/;
-var remap = function(codeWithSourceMap, upstreamMap, sourcePath, targetPath) {
-  let sourceMapText;
-  const codeWithoutSourceMap = codeWithSourceMap.replace(smRegexp, (match, sm) => {
-    sourceMapText = sm;
-    return "";
-  });
-  if (sourceMapText) {
-    const parsed = parseWithLines(sourceMapText);
-    const composedLines = composeLines(upstreamMap.lines, parsed.lines);
-    upstreamMap.lines = composedLines;
-  }
-  const remappedSourceMapJSON = upstreamMap.json(sourcePath, targetPath);
-  const newSourceMap = `${"sourceMapping"}URL=data:application/json;charset=utf-8;base64,${base64Encode(JSON.stringify(remappedSourceMapJSON))}`;
-  const remappedCodeWithSourceMap = `${codeWithoutSourceMap}
-//# ${newSourceMap}`;
-  return remappedCodeWithSourceMap;
-};
-var composeLines = function(upstreamMapping, lines) {
-  return lines.map((line) => {
-    return line.map((entry) => {
-      if (entry.length === 1) {
-        return entry;
-      }
-      const [colDelta, sourceFileIndex, srcLine, srcCol] = entry;
-      const srcPos = remapPosition([srcLine, srcCol], upstreamMapping);
-      if (!srcPos) {
-        return [entry[0]];
-      }
-      const [upstreamLine, upstreamCol] = srcPos;
-      if (entry.length === 4) {
-        return [colDelta, sourceFileIndex, upstreamLine, upstreamCol];
-      }
-      return [colDelta, sourceFileIndex, upstreamLine, upstreamCol, entry[4]];
+  /**
+  Remap a string with compiled code and a source map to use a new source map
+  referencing upstream source files.
+  This modifies the upstream map in place.
+  */
+  static remap = (codeWithSourceMap, upstreamMap, sourcePath, targetPath) => {
+    let sourceMapText;
+    const codeWithoutSourceMap = codeWithSourceMap.replace(smRegexp, (_match, sm) => {
+      sourceMapText = sm;
+      return "";
     });
-  });
-};
-var parseWithLines = function(base64encodedJSONstr) {
-  const json = JSON.parse(Buffer.from(base64encodedJSONstr, "base64").toString("utf8"));
-  let sourceLine = 0;
-  let sourceColumn = 0;
-  const lines = json.mappings.split(";").map((line) => {
-    if (line.length === 0) {
-      return [];
+    if (sourceMapText) {
+      const parsed = this.parseWithLines(sourceMapText);
+      const composedLines = this.composeLines(upstreamMap.lines, parsed.lines);
+      upstreamMap.lines = composedLines;
     }
-    return line.split(",").map((entry) => {
-      const result = decodeVLQ(entry);
-      switch (result.length) {
-        case 1: {
-          return [result[0]];
-        }
-        case 4: {
-          return [result[0], result[1], sourceLine += result[2], sourceColumn += result[3]];
+    const remappedCodeWithSourceMap = `${codeWithoutSourceMap}
+${upstreamMap.comment(sourcePath, targetPath)}`;
+    return remappedCodeWithSourceMap;
+  };
+  /**
+  Compose lines from an upstream source map with lines from a downstream source map.
+  */
+  static composeLines = (upstreamMapping, lines) => {
+    return lines.map((line) => {
+      return line.map((entry) => {
+        if (entry.length === 1) {
+          return entry;
         }
-        case 5: {
-          return [result[0], result[1], sourceLine += result[2], sourceColumn += result[3], result[4]];
+        const [colDelta, sourceFileIndex, srcLine, srcCol] = entry;
+        const srcPos = remapPosition([srcLine, srcCol], upstreamMapping);
+        if (!srcPos) {
+          return [entry[0]];
         }
-        default: {
-          throw new Error("Unknown source map entry", result);
+        const [upstreamLine, upstreamCol] = srcPos;
+        if (entry.length === 4) {
+          return [colDelta, sourceFileIndex, upstreamLine, upstreamCol];
         }
+        return [colDelta, sourceFileIndex, upstreamLine, upstreamCol, entry[4]];
+      });
+    });
+  };
+  /**
+  Parse a base64 encoded source map string into a SourceMapJSON object with lines.
+  */
+  static parseWithLines = (base64encodedJSONstr) => {
+    const json = JSON.parse(Buffer.from(base64encodedJSONstr, "base64").toString("utf8"));
+    let sourceLine = 0;
+    let sourceColumn = 0;
+    const lines = json.mappings.split(";").map((line) => {
+      if (line.length === 0) {
+        return [];
       }
+      return line.split(",").map((entry) => {
+        const result = decodeVLQ(entry);
+        switch (result.length) {
+          case 1: {
+            ;
+            break;
+          }
+          case 4:
+          case 5: {
+            sourceLine += result[2];
+            result[2] = sourceLine;
+            sourceColumn += result[3];
+            result[3] = sourceColumn;
+            break;
+          }
+          default: {
+            throw new Error(`Unknown source map entry ${JSON.stringify(result)}`);
+          }
+        }
+        return result;
+      });
     });
-  });
-  json.lines = lines;
-  return json;
+    return { ...json, lines };
+  };
 };
-Object.assign(SourceMap, { remap, parseWithLines, composeLines });
+var smRegexp = /(?:\r?\n|\r)\/\/# sourceMappingURL=data:application\/json;(?:charset=[^;]*;)?base64,([+a-zA-Z0-9\/]*=?=?)(?:\s*)$/;
 var VLQ_SHIFT = 5;
 var VLQ_CONTINUATION_BIT = 1 << VLQ_SHIFT;
 var VLQ_VALUE_MASK = VLQ_CONTINUATION_BIT - 1;
@@ -21394,21 +21449,18 @@ var encodeVlq = function(value) {
     if (valueToEncode) {
       nextChunk |= VLQ_CONTINUATION_BIT;
     }
-    answer += encodeBase64(nextChunk);
+    answer += BASE64_CHARS[nextChunk];
   }
   return answer;
 };
 var BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-var encodeBase64 = function(value) {
-  return BASE64_CHARS[value] || (() => {
-    throw new Error("Cannot Base64 encode value: ${value}");
-  })();
-};
 var base64Encode = function(src) {
   if (typeof Buffer !== "undefined") {
     return Buffer.from(src).toString("base64");
   } else {
-    return btoa(src);
+    const bytes = new TextEncoder().encode(src);
+    const binaryString = String.fromCodePoint(...bytes);
+    return btoa(binaryString);
   }
 };
 var vlqTable = new Uint8Array(128);
@@ -21430,7 +21482,7 @@ var vlqChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/
 var decodeError = function(message) {
   throw new Error(message);
 };
-var decodeVLQ = function(mapping) {
+var decodeVLQ = (mapping) => {
   let i = 0;
   let l = mapping.length;
   let result = [];
@@ -21444,11 +21496,11 @@ var decodeVLQ = function(mapping) {
       }
       const c = mapping.charCodeAt(i);
       if ((c & 127) != c) {
-        decodeError("Invalid mapping character: ${JSON.stringify(String.fromCharCode(c))}");
+        decodeError(`Invalid mapping character: ${JSON.stringify(String.fromCharCode(c))}`);
       }
       const index = vlqTable[c & 127];
       if (index === 255) {
-        decodeError("Invalid mapping character: ${JSON.stringify(String.fromCharCode(c))}");
+        decodeError(`Invalid mapping character: ${JSON.stringify(String.fromCharCode(c))}`);
       }
       i++;
       vlq |= (index & 31) << shift;
@@ -21466,7 +21518,7 @@ var decodeVLQ = function(mapping) {
   }
   return result;
 };
-var remapPosition = function(position, sourcemapLines) {
+var remapPosition = (position, sourcemapLines) => {
   const [line, character] = position;
   const textLine = sourcemapLines[line];
   if (!textLine?.length) {
@@ -21793,7 +21845,8 @@ ${counts}`;
       const code = generate_civet_default(ast2, options);
       checkErrors();
       if (options.inlineMap) {
-        return SourceMap2.remap(code, options.sourceMap, filename2, filename2 + ".tsx");
+        return `${code}
+${options.sourceMap.comment(filename2, filename2 + ".tsx")}`;
       } else {
         return {
           code,