@danielx/civet 0.8.12 → 0.8.14

package/dist/browser.js

@@ -38,9 +38,9 @@ var Civet = (() => {
   ));
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), 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;
@@ -1873,8 +1873,8 @@ ${body}`;
         ts(": <T>(object: T, prop: PropertyKey) => boolean"),
         " = ({}.constructor",
         asAny,
-        ").hasOwn;\n"
-      ]]);
+        ").hasOwn"
+      ], ";\n"]);
     },
     is(isRef) {
       state.prelude.push(["", [
@@ -1883,9 +1883,8 @@ ${body}`;
         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.
@@ -1903,8 +1902,11 @@ ${body}`;
     },
     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"]),
@@ -1923,8 +1925,8 @@ ${body}`;
         "  } else {\n",
         "    return a.slice(end, start + 1).reverse()\n",
         "  }\n",
-        "});\n"
-      ]]);
+        "})"
+      ], ";\n"]);
     },
     div(divRef) {
       state.prelude.push(["", [
@@ -1932,8 +1934,8 @@ ${body}`;
         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(["", [
@@ -1941,14 +1943,15 @@ ${body}`;
         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) {
@@ -1969,9 +1972,8 @@ ${body}`;
           " extends never ? never : A))"
         ]),
         " = (a, b) => (a ? !b && a : b)",
-        asAny,
-        ";\n"
-      ]]);
+        asAny
+      ], ";\n"]);
     },
     xnor(xnorRef) {
       const Falsy = getHelperRef("Falsy");
@@ -1989,9 +1991,8 @@ ${body}`;
           " ? never : B))"
         ]),
         " = (a, b) => (a ? b : !b || a)",
-        asAny,
-        ";\n"
-      ]]);
+        asAny
+      ], ";\n"]);
     },
     concatAssign(ref) {
       state.prelude.push(["", [
@@ -2009,8 +2010,8 @@ ${body}`;
         asAny,
         ") : (lhs",
         asAny,
-        ").push(rhs), lhs);\n"
-      ]]);
+        ").push(rhs), lhs)"
+      ], ";\n"]);
     },
     AutoPromise(ref) {
       state.prelude.push([
@@ -3145,6 +3146,8 @@ ${js}`
           }
         }
       })());
+    } else if (statement.object) {
+      declaration.children.push("={}");
     } else {
       if (decl === "const") {
         declaration.children.push("=[]");
@@ -3160,6 +3163,9 @@ ${js}`
       }
       if (!block.empty) {
         assignResults(block, (node) => {
+          if (statement.object) {
+            return ["Object.assign(", resultsRef, ",", node, ")"];
+          }
           if (!reduction) {
             return [resultsRef, ".push(", node, ")"];
           }
@@ -4718,7 +4724,7 @@ ${js}`
       const simple = ref === expression;
       let children;
       if (simple) {
-        ref = insertTrimmingSpace(ref, "");
+        ref = trimFirstSpace(ref);
         children = [ref];
       } else {
         children = [ref, initializer];
@@ -4764,8 +4770,8 @@ ${js}`
       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;
     }
@@ -4784,7 +4790,7 @@ ${js}`
         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");
           }
           ;
@@ -4908,9 +4914,12 @@ ${js}`
   }
   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, ")"];
@@ -4919,20 +4928,20 @@ ${js}`
     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,
@@ -5009,7 +5018,7 @@ ${js}`
         { type: "Await", children: "await" },
         " ",
         imp,
-        insertTrimmingSpace(ws2, ""),
+        trimFirstSpace(ws2),
         dynamizeFromClause(from),
         {
           type: "PropertyGlob",
@@ -5085,7 +5094,9 @@ ${js}`
       if (pre.length) {
         return {
           type: "UnaryExpression",
-          children: [...pre, exp]
+          children: [pre, exp],
+          pre,
+          expression: exp
         };
       }
       return exp;
@@ -5137,7 +5148,10 @@ ${js}`
     }
     return {
       type: "UnaryExpression",
-      children: [...pre, exp, post]
+      children: [pre, exp, post],
+      pre,
+      expression: exp,
+      post
     };
   }
   function processUnaryNestedExpression(pre, args, post) {
@@ -6177,12 +6191,16 @@ ${js}`
     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 };
   }
@@ -6660,19 +6678,23 @@ ${js}`
         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,
                 ")"
               ]
             })
@@ -6684,7 +6706,7 @@ ${js}`
           ...node,
           children: [
             makeLeftHandSideExpression(refAssignment ?? prefix),
-            {
+            makeNode({
               ...glob,
               mod: false,
               expression: call,
@@ -6695,7 +6717,7 @@ ${js}`
                 (ref3 = glob.children)[ref3.length - 1]
                 // "]" token
               ]
-            },
+            }),
             ...children.slice(i + 1)
           ]
         });
@@ -6745,7 +6767,7 @@ ${js}`
           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;
@@ -7458,12 +7480,12 @@ ${js}`
     } 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);
     }
@@ -7482,7 +7504,11 @@ ${js}`
       }
       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++) {
@@ -7494,7 +7520,7 @@ ${js}`
           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}`, ";"]);
         }
       }
     }
@@ -7503,7 +7529,7 @@ ${js}`
       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}`, ";"]);
       }
     }
   }
@@ -8045,6 +8071,7 @@ ${js}`
     ArrayElementDelimiter,
     ElementListWithIndentedApplicationForbidden,
     ElementList,
+    SingleLineElementList,
     ElementListRest,
     ArrayElementExpression,
     NestedBulletedArray,
@@ -8057,6 +8084,7 @@ ${js}`
     BulletedArrayWithTrailing,
     ObjectLiteral,
     BracedObjectLiteral,
+    SingleLineObjectProperties,
     BracedObjectLiteralContent,
     NestedImplicitObjectLiteral,
     NestedImplicitPropertyDefinitions,
@@ -8337,6 +8365,7 @@ ${js}`
     Dot,
     DotDot,
     DotDotDot,
+    InsertDotDotDot,
     DoubleColon,
     DoubleColonAsColon,
     DoubleQuote,
@@ -8897,7 +8926,7 @@ ${js}`
   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"));
@@ -9759,9 +9788,7 @@ ${js}`
   }
   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",
@@ -11695,13 +11722,13 @@ ${js}`
       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,
@@ -12403,7 +12430,30 @@ ${js}`
   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;
@@ -12424,8 +12474,8 @@ ${js}`
       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$$);
   }
@@ -12598,7 +12648,12 @@ ${js}`
   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)
@@ -12609,9 +12664,8 @@ ${js}`
       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) {
@@ -12790,7 +12844,29 @@ ${js}`
   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;
@@ -12802,13 +12878,13 @@ ${js}`
       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)
@@ -12820,6 +12896,13 @@ ${js}`
       };
       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) {
@@ -12951,19 +13034,48 @@ ${js}`
   }
   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;
@@ -12985,7 +13097,7 @@ ${js}`
       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") {
@@ -12997,7 +13109,7 @@ ${js}`
       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;
@@ -13009,7 +13121,7 @@ ${js}`
       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;
@@ -13074,7 +13186,7 @@ ${js}`
       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$$);
   }
@@ -15731,8 +15843,9 @@ ${js}`
     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");
     }
@@ -15742,9 +15855,15 @@ ${js}`
         `${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);
@@ -16048,7 +16167,7 @@ ${js}`
   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)));
@@ -16687,6 +16806,12 @@ ${js}`
   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 };
   });