@danielx/civet 0.8.12 → 0.8.14

package/dist/main.mjs

@@ -28,9 +28,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// node_modules/@danielx/hera/dist/machine.js
+// node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js
 var require_machine = __commonJS({
-  "node_modules/@danielx/hera/dist/machine.js"(exports, module) {
+  "node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js"(exports, module) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -1829,8 +1829,8 @@ var declareHelper = {
       ts(": <T>(object: T, prop: PropertyKey) => boolean"),
       " = ({}.constructor",
       asAny,
-      ").hasOwn;\n"
-    ]]);
+      ").hasOwn"
+    ], ";\n"]);
   },
   is(isRef) {
     state.prelude.push(["", [
@@ -1839,9 +1839,8 @@ var declareHelper = {
       isRef,
       ts(": { <B, A extends B> (a: A, b: B): b is A, <A, B> (a: A, b: B): a is A & B }"),
       " = Object.is",
-      asAny,
-      ";\n"
-    ]]);
+      asAny
+    ], ";\n"]);
   },
   /**
    * Array length check with type guard.
@@ -1859,8 +1858,11 @@ var declareHelper = {
   },
   rslice(rsliceRef) {
     const RSliceable = makeRef("RSliceable");
+    state.prelude.push([
+      "",
+      ts(["type ", RSliceable, "<R> = string | {length: number; slice(start: number, end: number): {reverse(): R}}\n"])
+    ]);
     state.prelude.push(["", [
-      ts(["type ", RSliceable, "<R> = string | {length: number; slice(start: number, end: number): {reverse(): R}}\n"]),
       preludeVar,
       rsliceRef,
       ts([": <R, T extends string | ", RSliceable, "<R>>(a: T, start?: number, end?: number) => T extends string ? string : T extends ", RSliceable, "<infer R> ? R : never"]),
@@ -1879,8 +1881,8 @@ var declareHelper = {
       "  } else {\n",
       "    return a.slice(end, start + 1).reverse()\n",
       "  }\n",
-      "});\n"
-    ]]);
+      "})"
+    ], ";\n"]);
   },
   div(divRef) {
     state.prelude.push(["", [
@@ -1888,8 +1890,8 @@ var declareHelper = {
       preludeVar,
       divRef,
       ts(": (a: number, b: number) => number"),
-      " = (a, b) => Math.floor(a / b);\n"
-    ]]);
+      " = (a, b) => Math.floor(a / b)"
+    ], ";\n"]);
   },
   modulo(moduloRef) {
     state.prelude.push(["", [
@@ -1897,14 +1899,15 @@ var declareHelper = {
       preludeVar,
       moduloRef,
       ts(": (a: number, b: number) => number"),
-      " = (a, b) => (a % b + b) % b;\n"
-    ]]);
+      " = (a, b) => (a % b + b) % b"
+    ], ";\n"]);
   },
   Falsy(FalsyRef) {
     state.prelude.push([
       "",
       // [indent, statement]
-      ts(["type ", FalsyRef, " = false | 0 | '' | 0n | null | undefined;\n"])
+      ts(["type ", FalsyRef, " = false | 0 | '' | 0n | null | undefined"]),
+      ";\n"
     ]);
   },
   xor(xorRef) {
@@ -1925,9 +1928,8 @@ var declareHelper = {
         " extends never ? never : A))"
       ]),
       " = (a, b) => (a ? !b && a : b)",
-      asAny,
-      ";\n"
-    ]]);
+      asAny
+    ], ";\n"]);
   },
   xnor(xnorRef) {
     const Falsy = getHelperRef("Falsy");
@@ -1945,9 +1947,8 @@ var declareHelper = {
         " ? never : B))"
       ]),
       " = (a, b) => (a ? b : !b || a)",
-      asAny,
-      ";\n"
-    ]]);
+      asAny
+    ], ";\n"]);
   },
   concatAssign(ref) {
     state.prelude.push(["", [
@@ -1965,8 +1966,8 @@ var declareHelper = {
       asAny,
       ") : (lhs",
       asAny,
-      ").push(rhs), lhs);\n"
-    ]]);
+      ").push(rhs), lhs)"
+    ], ";\n"]);
   },
   AutoPromise(ref) {
     state.prelude.push([
@@ -3101,6 +3102,8 @@ function iterationDeclaration(statement) {
         }
       }
     })());
+  } else if (statement.object) {
+    declaration.children.push("={}");
   } else {
     if (decl === "const") {
       declaration.children.push("=[]");
@@ -3116,6 +3119,9 @@ function iterationDeclaration(statement) {
     }
     if (!block.empty) {
       assignResults(block, (node) => {
+        if (statement.object) {
+          return ["Object.assign(", resultsRef, ",", node, ")"];
+        }
         if (!reduction) {
           return [resultsRef, ".push(", node, ")"];
         }
@@ -4674,7 +4680,7 @@ function processDeclarationCondition(condition, rootCondition, parent) {
     const simple = ref === expression;
     let children;
     if (simple) {
-      ref = insertTrimmingSpace(ref, "");
+      ref = trimFirstSpace(ref);
       children = [ref];
     } else {
       children = [ref, initializer];
@@ -4720,8 +4726,8 @@ function processDeclarationConditionStatement(s) {
     return;
   }
   let { expression } = condition;
-  if (expression && typeof expression === "object" && "type" in expression && expression.type === "UnaryExpression" && "children" in expression && Array.isArray(expression.children) && len2(expression.children, 2) && expression.children[0] === "!" && typeof expression.children[1] === "object" && expression.children[1] != null && "type" in expression.children[1] && expression.children[1].type === "ParenthesizedExpression" && "expression" in expression.children[1]) {
-    const { type: type1, children: [, { type: type2, expression: expression2 }] } = expression;
+  if (expression && typeof expression === "object" && "type" in expression && expression.type === "UnaryExpression" && "children" in expression && Array.isArray(expression.children) && len2(expression.children, 2) && Array.isArray(expression.children[0]) && len2(expression.children[0], 1) && expression.children[0][0] === "!" && typeof expression.children[1] === "object" && expression.children[1] != null && "type" in expression.children[1] && expression.children[1].type === "ParenthesizedExpression" && "expression" in expression.children[1]) {
+    const { type: type1, children: [[], { type: type2, expression: expression2 }] } = expression;
     const type = [type1, type2];
     expression = expression2;
   }
@@ -4740,7 +4746,7 @@ function processDeclarationConditionStatement(s) {
       let children = condition.children;
       if (s.negated) {
         let m;
-        if (!(m = condition.expression, typeof m === "object" && m != null && "type" in m && m.type === "UnaryExpression" && "children" in m && Array.isArray(m.children) && len2(m.children, 2) && m.children[0] === "!" && typeof m.children[1] === "object" && m.children[1] != null && "type" in m.children[1] && m.children[1].type === "ParenthesizedExpression")) {
+        if (!(m = condition.expression, typeof m === "object" && m != null && "type" in m && m.type === "UnaryExpression" && "children" in m && Array.isArray(m.children) && len2(m.children, 2) && Array.isArray(m.children[0]) && len2(m.children[0], 1) && m.children[0][0] === "!" && typeof m.children[1] === "object" && m.children[1] != null && "type" in m.children[1] && m.children[1].type === "ParenthesizedExpression")) {
           throw new Error("Unsupported negated condition");
         }
         ;
@@ -4864,9 +4870,12 @@ function processDeclarationConditionStatement(s) {
 }
 function dynamizeFromClause(from) {
   from = from.slice(1);
-  from = insertTrimmingSpace(from, "");
-  if (from[from.length - 1]?.type === "ImportAssertion") {
-    const assert2 = from.pop();
+  from = trimFirstSpace(from);
+  let ref2;
+  if (ref2 = from[from.length - 1]?.assertion) {
+    const assert2 = ref2;
+    let ref3;
+    ref3 = from[from.length - 1], ref3.children = ref3.children.filter((a2) => a2 !== assert2);
     from.push(", {", assert2.keyword, ":", assert2.object, "}");
   }
   return ["(", ...from, ")"];
@@ -4875,20 +4884,20 @@ function dynamizeImportDeclaration(decl) {
   const { imports } = decl;
   let { star, binding, specifiers } = imports;
   const justDefault = binding && !specifiers && !star;
-  let ref2;
+  let ref4;
   {
     if (binding) {
       if (specifiers) {
-        ref2 = makeRef();
+        ref4 = makeRef();
       } else {
-        ref2 = binding;
+        ref4 = binding;
       }
     } else {
-      ref2 = convertNamedImportsToObject(imports, true);
+      ref4 = convertNamedImportsToObject(imports, true);
     }
   }
   ;
-  const pattern = ref2;
+  const pattern = ref4;
   const c = "const";
   const expression = [
     justDefault ? "(" : void 0,
@@ -4965,7 +4974,7 @@ function dynamizeImportDeclarationExpression($0) {
       { type: "Await", children: "await" },
       " ",
       imp,
-      insertTrimmingSpace(ws2, ""),
+      trimFirstSpace(ws2),
       dynamizeFromClause(from),
       {
         type: "PropertyGlob",
@@ -5041,7 +5050,9 @@ function processUnaryExpression(pre, exp, post) {
     if (pre.length) {
       return {
         type: "UnaryExpression",
-        children: [...pre, exp]
+        children: [pre, exp],
+        pre,
+        expression: exp
       };
     }
     return exp;
@@ -5093,7 +5104,10 @@ function processUnaryExpression(pre, exp, post) {
   }
   return {
     type: "UnaryExpression",
-    children: [...pre, exp, post]
+    children: [pre, exp, post],
+    pre,
+    expression: exp,
+    post
   };
 }
 function processUnaryNestedExpression(pre, args, post) {
@@ -6133,12 +6147,16 @@ function negateCondition(condition) {
   if (i < 0) {
     throw new Error(`Could not find expression in condition`);
   }
+  const pre = ["!"];
+  expression = makeLeftHandSideExpression(expression);
   children[i] = expression = {
     type: "UnaryExpression",
     children: [
-      "!",
-      makeLeftHandSideExpression(expression)
-    ]
+      pre,
+      expression
+    ],
+    pre,
+    expression
   };
   return { ...condition, expression, children };
 }
@@ -6616,19 +6634,23 @@ function processCallMemberExpression(node) {
       assert.notEqual(i, 0, "Index access must be preceded by an expression");
       const prefix = i === 1 ? children[0] : children.slice(0, i);
       const { ref, refAssignment } = maybeRefAssignment(prefix);
+      const args = [
+        glob.children.slice(0 + 1, -1),
+        // between "[" and "]" tokens
+        ",",
+        [" ", ref, ".length"]
+      ];
       const call = makeNode({
         type: "CallExpression",
+        implicit: true,
         children: [
           getHelperRef("modulo"),
           makeNode({
             type: "Call",
+            args,
             children: [
               "(",
-              ...glob.children.slice(0 + 1, -1),
-              // between "[" and "]" tokens
-              ", ",
-              ref,
-              ".length",
+              args,
               ")"
             ]
           })
@@ -6640,7 +6662,7 @@ function processCallMemberExpression(node) {
         ...node,
         children: [
           makeLeftHandSideExpression(refAssignment ?? prefix),
-          {
+          makeNode({
             ...glob,
             mod: false,
             expression: call,
@@ -6651,7 +6673,7 @@ function processCallMemberExpression(node) {
               (ref3 = glob.children)[ref3.length - 1]
               // "]" token
             ]
-          },
+          }),
           ...children.slice(i + 1)
         ]
       });
@@ -6701,7 +6723,7 @@ function makeExpressionStatement(expression) {
         return [comma, makeExpressionStatement(exp)];
       })
     ];
-  } else if (expression?.type === "ObjectExpression" || expression?.type === "FunctionExpression" && !expression.id) {
+  } else if (expression?.type === "ObjectExpression" || expression?.type === "FunctionExpression" && !expression.id || expression?.type === "UnaryExpression" && !expression.pre?.length && expression.expression !== makeExpressionStatement(expression.expression)) {
     return makeLeftHandSideExpression(expression);
   } else {
     return expression;
@@ -7414,12 +7436,12 @@ function processProgram(root) {
   } else if (config2.autoVar) {
     createVarDecs(root, []);
   }
-  processBlocks(statements);
-  populateRefs(statements);
-  adjustAtBindings(statements);
   if (config2.repl) {
     processRepl(root, rootIIFE);
   }
+  processBlocks(statements);
+  populateRefs(statements);
+  adjustAtBindings(statements);
   if (getSync()) {
     processComptime(statements);
   }
@@ -7438,7 +7460,11 @@ function processRepl(root, rootIIFE) {
     }
     if (decl.parent === topBlock || decl.decl === "var") {
       decl.children.shift();
-      root.expressions.splice(i++, 0, ["", `var ${decl.names.join(",")};`]);
+      if (decl.bindings[0]?.pattern?.type === "ObjectBindingPattern") {
+        decl.children.unshift("(");
+        decl.children.push(")");
+      }
+      root.expressions.splice(i++, 0, ["", `var ${decl.names.join(",")}`, ";"]);
     }
   }
   for (let ref27 = gatherRecursive(topBlock, ($15) => $15.type === "FunctionExpression"), i10 = 0, len9 = ref27.length; i10 < len9; i10++) {
@@ -7450,7 +7476,7 @@ function processRepl(root, rootIIFE) {
         func.parent = root;
       } else {
         func.children.unshift(func.name, "=");
-        root.expressions.splice(i++, 0, ["", `var ${func.name};`]);
+        root.expressions.splice(i++, 0, ["", `var ${func.name}`, ";"]);
       }
     }
   }
@@ -7459,7 +7485,7 @@ function processRepl(root, rootIIFE) {
     let m5;
     if (classExp.name && classExp.parent === topBlock || (m5 = classExp.parent, typeof m5 === "object" && m5 != null && "type" in m5 && m5.type === "ReturnStatement" && "parent" in m5 && m5.parent === topBlock)) {
       classExp.children.unshift(classExp.name, "=");
-      root.expressions.splice(i++, 0, ["", `var ${classExp.name};`]);
+      root.expressions.splice(i++, 0, ["", `var ${classExp.name}`, ";"]);
     }
   }
 }
@@ -8001,6 +8027,7 @@ var grammar = {
   ArrayElementDelimiter,
   ElementListWithIndentedApplicationForbidden,
   ElementList,
+  SingleLineElementList,
   ElementListRest,
   ArrayElementExpression,
   NestedBulletedArray,
@@ -8013,6 +8040,7 @@ var grammar = {
   BulletedArrayWithTrailing,
   ObjectLiteral,
   BracedObjectLiteral,
+  SingleLineObjectProperties,
   BracedObjectLiteralContent,
   NestedImplicitObjectLiteral,
   NestedImplicitPropertyDefinitions,
@@ -8293,6 +8321,7 @@ var grammar = {
   Dot,
   DotDot,
   DotDotDot,
+  InsertDotDotDot,
   DoubleColon,
   DoubleColonAsColon,
   DoubleQuote,
@@ -8853,7 +8882,7 @@ 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 $R14 = (0, import_lib2.$R)(new RegExp("[+-]", "suy"));
-var $R15 = (0, import_lib2.$R)(new RegExp("\\+\\+|--|[\\+\\-&]\\S", "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"));
 var $R17 = (0, import_lib2.$R)(new RegExp("(?=true|false|yes|no|on|off)", "suy"));
 var $R18 = (0, import_lib2.$R)(new RegExp("(?=\\p{ID_Start}|[_$])", "suy"));
@@ -9715,9 +9744,7 @@ function TrailingPostfix(ctx, state2) {
 }
 var FatArrowBody$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(EOS), (0, import_lib2.$N)((0, import_lib2.$S)((0, import_lib2.$E)(_), ExpressionizedStatement)), NonPipelineExpression, (0, import_lib2.$N)(TrailingDeclaration), (0, import_lib2.$N)(TrailingPipe), (0, import_lib2.$N)(TrailingPostfix), (0, import_lib2.$N)(SemicolonDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
   var exp = $3;
-  if (exp.type === "ObjectExpression") {
-    exp = makeLeftHandSideExpression(exp);
-  }
+  exp = makeExpressionStatement(exp);
   const expressions = [["", exp]];
   return {
     type: "BlockStatement",
@@ -11651,13 +11678,13 @@ var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, _
     expression: fn
   };
 });
-var FunctionExpression$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R15, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+var FunctionExpression$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R15, "FunctionExpression /\\+\\+|--|\u29FA|\u2014|[\\+\\-&]\\S/")), (0, import_lib2.$N)((0, import_lib2.$S)(Placeholder, (0, import_lib2.$C)(TypePostfix, BinaryOpRHS))), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
   var open = $1;
   var ws1 = $2;
-  var op = $4;
-  var ws2 = $5;
-  var rhs = $6;
-  var close = $7;
+  var op = $5;
+  var ws2 = $6;
+  var rhs = $7;
+  var close = $8;
   const refA = makeRef("a");
   const fn = makeAmpersandFunction({
     ref: refA,
@@ -12359,7 +12386,30 @@ function ArrayLiteral(ctx, state2) {
 var _ArrayLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(ArrayBindingPattern, UpcomingAssignment), function(value) {
   return value[0];
 });
-var _ArrayLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBracket, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(ArrayLiteralContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+var _ArrayLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBracket, CloseBracket, ApplicationStart, AllowAll, (0, import_lib2.$E)((0, import_lib2.$C)(NestedElementList, SingleLineElementList)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var open = $1;
+  var close = $2;
+  var content = $5;
+  if (!content)
+    return $skip;
+  let last = content[content.length - 1];
+  let lastArray = Array.isArray(last) ? last : last.children;
+  if (isComma(lastArray[lastArray.length - 1])) {
+    lastArray = lastArray.slice(0, -1);
+    if (Array.isArray(last)) {
+      last = lastArray;
+    } else {
+      last = { ...last, children: lastArray };
+    }
+    content = [...content.slice(0, -1), last];
+  }
+  return {
+    type: "ArrayExpression",
+    children: [open, ...content, close],
+    names: content.flatMap((c) => c?.names || [])
+  };
+});
+var _ArrayLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBracket, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(ArrayLiteralContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
   var open = $1;
   if (!$3)
     return $skip;
@@ -12380,8 +12430,8 @@ var _ArrayLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBracket, Allo
     names
   };
 });
-var _ArrayLiteral$2 = NestedBulletedArray;
-var _ArrayLiteral$$ = [_ArrayLiteral$0, _ArrayLiteral$1, _ArrayLiteral$2];
+var _ArrayLiteral$3 = NestedBulletedArray;
+var _ArrayLiteral$$ = [_ArrayLiteral$0, _ArrayLiteral$1, _ArrayLiteral$2, _ArrayLiteral$3];
 function _ArrayLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "_ArrayLiteral", _ArrayLiteral$$);
 }
@@ -12554,7 +12604,12 @@ function ElementListWithIndentedApplicationForbidden(ctx, state2) {
 var ElementList$0 = (0, import_lib2.$T)((0, import_lib2.$S)(BulletedArray), function(value) {
   return [value[0]];
 });
-var ElementList$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(EOS), ArrayElementExpression, (0, import_lib2.$Q)(ElementListRest)), function($skip, $loc, $0, $1, $2, $3) {
+var ElementList$1 = SingleLineElementList;
+var ElementList$$ = [ElementList$0, ElementList$1];
+function ElementList(ctx, state2) {
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "ElementList", ElementList$$);
+}
+var SingleLineElementList$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(EOS), ArrayElementExpression, (0, import_lib2.$Q)(ElementListRest)), function($skip, $loc, $0, $1, $2, $3) {
   var first = $2;
   var rest = $3;
   if (!rest.length)
@@ -12565,9 +12620,8 @@ var ElementList$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)
     rest.map(([_2, e], i) => append(e, rest[i + 1]?.[0]))
   );
 });
-var ElementList$$ = [ElementList$0, ElementList$1];
-function ElementList(ctx, state2) {
-  return (0, import_lib2.$EVENT_C)(ctx, state2, "ElementList", ElementList$$);
+function SingleLineElementList(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "SingleLineElementList", SingleLineElementList$0);
 }
 var ElementListRest$0 = (0, import_lib2.$S)((0, import_lib2.$S)((0, import_lib2.$E)(_), Comma, (0, import_lib2.$N)(EOS)), ArrayElementExpression);
 function ElementListRest(ctx, state2) {
@@ -12746,7 +12800,29 @@ var ObjectLiteral$$ = [ObjectLiteral$0, ObjectLiteral$1, ObjectLiteral$2, Object
 function ObjectLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ObjectLiteral", ObjectLiteral$$);
 }
-var BracedObjectLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBrace, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(BracedObjectLiteralContent, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+var BracedObjectLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBrace, CloseBrace, ApplicationStart, AllowAll, (0, import_lib2.$E)((0, import_lib2.$C)(NestedPropertyDefinitions, SingleLineObjectProperties)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+  var open = $1;
+  var close = $2;
+  var properties = $5;
+  if (!properties?.length)
+    return $skip;
+  let last = properties[properties.length - 1];
+  if (last.delim?.implicit) {
+    last = {
+      ...last,
+      delim: void 0,
+      children: last.children.filter((c) => c !== last.delim)
+    };
+    properties = [...properties.slice(0, properties.length - 1), last];
+  }
+  return {
+    type: "ObjectExpression",
+    children: [open, properties, close],
+    names: properties.flatMap((c) => c.names || []),
+    properties
+  };
+});
+var BracedObjectLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBrace, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(BracedObjectLiteralContent, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
   var open = $1;
   if (!$3)
     return $skip;
@@ -12758,13 +12834,13 @@ var BracedObjectLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBrace,
     properties
   };
 });
+var BracedObjectLiteral$$ = [BracedObjectLiteral$0, BracedObjectLiteral$1];
 function BracedObjectLiteral(ctx, state2) {
-  return (0, import_lib2.$EVENT)(ctx, state2, "BracedObjectLiteral", BracedObjectLiteral$0);
+  return (0, import_lib2.$EVENT_C)(ctx, state2, "BracedObjectLiteral", BracedObjectLiteral$$);
 }
-var BracedObjectLiteralContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)((0, import_lib2.$S)(PropertyDefinition, ObjectPropertyDelimiter)), (0, import_lib2.$E)(NestedPropertyDefinitions)), function($skip, $loc, $0, $1, $2) {
-  var line = $1;
-  var nested = $2;
-  line = line.flatMap(([prop, delim]) => {
+var SingleLineObjectProperties$0 = (0, import_lib2.$TV)((0, import_lib2.$Q)((0, import_lib2.$S)(PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
+  var line = $0;
+  return line.flatMap(([prop, delim]) => {
     prop = Array.isArray(prop) ? prop : [prop];
     let last = prop[prop.length - 1];
     if (!last)
@@ -12776,6 +12852,13 @@ var BracedObjectLiteralContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0,
     };
     return [...prop.slice(0, prop.length - 1), last];
   });
+});
+function SingleLineObjectProperties(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "SingleLineObjectProperties", SingleLineObjectProperties$0);
+}
+var BracedObjectLiteralContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(SingleLineObjectProperties, (0, import_lib2.$E)(NestedPropertyDefinitions)), function($skip, $loc, $0, $1, $2) {
+  var line = $1;
+  var nested = $2;
   return line.concat(nested || []);
 });
 var BracedObjectLiteralContent$1 = (0, import_lib2.$TV)((0, import_lib2.$P)((0, import_lib2.$S)(__, PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
@@ -12907,19 +12990,48 @@ function InlineObjectPropertyDelimiter(ctx, state2) {
 }
 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$2 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertComma), function(value) {
-  return value[1];
+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 };
 });
 var ObjectPropertyDelimiter$$ = [ObjectPropertyDelimiter$0, ObjectPropertyDelimiter$1, ObjectPropertyDelimiter$2];
 function ObjectPropertyDelimiter(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ObjectPropertyDelimiter", ObjectPropertyDelimiter$$);
 }
-var PropertyDefinition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
+var PropertyDefinition$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), InsertDotDotDot, IterationExpression), function($skip, $loc, $0, $1, $2, $3) {
+  var ws = $1;
+  var dots = $2;
+  var exp = $3;
+  let { statement } = exp;
+  if (exp.block.implicit && (statement.type === "DoStatement" || statement.subtype === "loop")) {
+    return $skip;
+  }
+  statement = { ...statement, object: true };
+  exp = {
+    ...exp,
+    statement,
+    children: exp.children.map(($) => $ === exp.statement ? statement : $)
+  };
+  const children = [ws, dots, exp];
+  if (statement.reduction) {
+    children.unshift({
+      type: "Error",
+      message: "Reduction loops are forbidden in object literals"
+    });
+  }
+  return {
+    type: "SpreadProperty",
+    children,
+    names: exp.names,
+    dots,
+    value: exp
+  };
+});
+var PropertyDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), NamedProperty), function($skip, $loc, $0, $1, $2) {
   var ws = $1;
   var prop = $2;
   return prepend(ws, prop);
 });
-var PropertyDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R24, "PropertyDefinition /[!+-]?/")), PropertyName, (0, import_lib2.$Y)(ObjectPropertyDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
+var PropertyDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R24, "PropertyDefinition /[!+-]?/")), PropertyName, (0, import_lib2.$Y)(ObjectPropertyDelimiter)), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws = $1;
   var toggle = $2;
   var id = $3;
@@ -12941,7 +13053,7 @@ var PropertyDefinition$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_l
     value: id
   };
 });
-var PropertyDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
+var PropertyDefinition$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), MethodDefinition), function($skip, $loc, $0, $1, $2) {
   var ws = $1;
   var def = $2;
   if (def.type === "MultiMethodDefinition") {
@@ -12953,7 +13065,7 @@ var PropertyDefinition$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_l
     return $skip;
   return prepend(ws, def);
 });
-var PropertyDefinition$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, Expression), function($skip, $loc, $0, $1, $2, $3) {
+var PropertyDefinition$4 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, Expression), function($skip, $loc, $0, $1, $2, $3) {
   var ws = $1;
   var dots = $2;
   var exp = $3;
@@ -12965,7 +13077,7 @@ var PropertyDefinition$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_l
     value: exp
   };
 });
-var PropertyDefinition$4 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$N)((0, import_lib2.$C)(EOS, (0, import_lib2.$EXPECT)($L7, 'PropertyDefinition "."'))), (0, import_lib2.$Q)(UnaryOp), CallExpression, (0, import_lib2.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+var PropertyDefinition$5 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$N)((0, import_lib2.$C)(EOS, (0, import_lib2.$EXPECT)($L7, 'PropertyDefinition "."'))), (0, import_lib2.$Q)(UnaryOp), CallExpression, (0, import_lib2.$E)(UnaryPostfix)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var ws = $1;
   var pre = $3;
   var value = $4;
@@ -13030,7 +13142,7 @@ var PropertyDefinition$4 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_l
     value
   };
 });
-var PropertyDefinition$$ = [PropertyDefinition$0, PropertyDefinition$1, PropertyDefinition$2, PropertyDefinition$3, PropertyDefinition$4];
+var PropertyDefinition$$ = [PropertyDefinition$0, PropertyDefinition$1, PropertyDefinition$2, PropertyDefinition$3, PropertyDefinition$4, PropertyDefinition$5];
 function PropertyDefinition(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "PropertyDefinition", PropertyDefinition$$);
 }
@@ -15687,8 +15799,9 @@ function ModuleExportName(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "ModuleExportName", ModuleExportName$$);
 }
 var ModuleSpecifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UnprocessedModuleSpecifier, (0, import_lib2.$E)(ImportAssertion)), function($skip, $loc, $0, $1, $2) {
-  var a = $2;
-  let { token } = $1;
+  var module = $1;
+  var assertion = $2;
+  let { token } = module;
   if (config.rewriteTsImports) {
     token = token.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
   }
@@ -15698,9 +15811,15 @@ var ModuleSpecifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UnprocessedModu
       `${config.rewriteCivetImports.replace(/\$/g, "$$")}$1`
     );
   }
-  if (a)
-    return [{ ...$1, token }, a];
-  return { ...$1, token };
+  if (token !== module.token) {
+    module = { ...module, token, input: module.token };
+  }
+  return {
+    type: "ModuleSpecifier",
+    module,
+    assertion,
+    children: [module, assertion]
+  };
 });
 function ModuleSpecifier(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "ModuleSpecifier", ModuleSpecifier$0);
@@ -16004,7 +16123,7 @@ var DecimalBigIntegerLiteral$0 = (0, import_lib2.$R$0)((0, import_lib2.$EXPECT)(
 function DecimalBigIntegerLiteral(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "DecimalBigIntegerLiteral", DecimalBigIntegerLiteral$0);
 }
-var DecimalLiteral$0 = (0, import_lib2.$TV)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R36, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))/")), function($skip, $loc, $0, $1) {
+var DecimalLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$TEXT)((0, import_lib2.$EXPECT)($R36, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?=\\.(?:\\p{ID_Start}|[_$]))/")), (0, import_lib2.$N)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L7, 'DecimalLiteral "."'), ExponentPart))), function($skip, $loc, $0, $1, $2) {
   return $1 + ".";
 });
 var DecimalLiteral$1 = (0, import_lib2.$TEXT)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($R37, "DecimalLiteral /(?:0|[1-9](?:_[0-9]|[0-9])*)(?:\\.(?:[0-9](?:_[0-9]|[0-9])*))?/"), (0, import_lib2.$E)(ExponentPart)));
@@ -16643,6 +16762,12 @@ var DotDotDot$$ = [DotDotDot$0, DotDotDot$1];
 function DotDotDot(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "DotDotDot", DotDotDot$$);
 }
+var InsertDotDotDot$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L0, 'InsertDotDotDot ""'), function($skip, $loc, $0, $1) {
+  return { $loc, token: "..." };
+});
+function InsertDotDotDot(ctx, state2) {
+  return (0, import_lib2.$EVENT)(ctx, state2, "InsertDotDotDot", InsertDotDotDot$0);
+}
 var DoubleColon$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L162, 'DoubleColon "::"'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });