@danielx/civet 0.8.13 → 0.8.14

package/dist/main.js

@@ -30,9 +30,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 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"(exports2, module2) {
+  "node_modules/.pnpm/@danielx+hera@0.8.16/node_modules/@danielx/hera/dist/machine.js"(exports2, module2) {
     "use strict";
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -3122,6 +3122,8 @@ function iterationDeclaration(statement) {
         }
       }
     })());
+  } else if (statement.object) {
+    declaration.children.push("={}");
   } else {
     if (decl === "const") {
       declaration.children.push("=[]");
@@ -3137,6 +3139,9 @@ function iterationDeclaration(statement) {
     }
     if (!block.empty) {
       assignResults(block, (node) => {
+        if (statement.object) {
+          return ["Object.assign(", resultsRef, ",", node, ")"];
+        }
         if (!reduction) {
           return [resultsRef, ".push(", node, ")"];
         }
@@ -4741,8 +4746,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;
   }
@@ -4761,7 +4766,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");
         }
         ;
@@ -5065,7 +5070,9 @@ function processUnaryExpression(pre, exp, post) {
     if (pre.length) {
       return {
         type: "UnaryExpression",
-        children: [...pre, exp]
+        children: [pre, exp],
+        pre,
+        expression: exp
       };
     }
     return exp;
@@ -5117,7 +5124,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) {
@@ -6157,12 +6167,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 };
 }
@@ -6729,7 +6743,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;
@@ -7442,12 +7456,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);
   }
@@ -7466,7 +7480,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++) {
@@ -7478,7 +7496,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}`, ";"]);
       }
     }
   }
@@ -7487,7 +7505,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}`, ";"]);
     }
   }
 }
@@ -8323,6 +8341,7 @@ var grammar = {
   Dot,
   DotDot,
   DotDotDot,
+  InsertDotDotDot,
   DoubleColon,
   DoubleColonAsColon,
   DoubleQuote,
@@ -8883,7 +8902,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"));
@@ -9745,9 +9764,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",
@@ -11681,7 +11698,7 @@ 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/")), (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 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 = $5;
@@ -13000,12 +13017,41 @@ var ObjectPropertyDelimiter$$ = [ObjectPropertyDelimiter$0, ObjectPropertyDelimi
 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;
@@ -13027,7 +13073,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") {
@@ -13039,7 +13085,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;
@@ -13051,7 +13097,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;
@@ -13116,7 +13162,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$$);
 }
@@ -16097,7 +16143,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)));
@@ -16736,6 +16782,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 };
 });

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;
@@ -3102,6 +3102,8 @@ function iterationDeclaration(statement) {
         }
       }
     })());
+  } else if (statement.object) {
+    declaration.children.push("={}");
   } else {
     if (decl === "const") {
       declaration.children.push("=[]");
@@ -3117,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, ")"];
         }
@@ -4721,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;
   }
@@ -4741,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");
         }
         ;
@@ -5045,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;
@@ -5097,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) {
@@ -6137,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 };
 }
@@ -6709,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;
@@ -7422,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);
   }
@@ -7446,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++) {
@@ -7458,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}`, ";"]);
       }
     }
   }
@@ -7467,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}`, ";"]);
     }
   }
 }
@@ -8303,6 +8321,7 @@ var grammar = {
   Dot,
   DotDot,
   DotDotDot,
+  InsertDotDotDot,
   DoubleColon,
   DoubleColonAsColon,
   DoubleQuote,
@@ -8863,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"));
@@ -9725,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",
@@ -11661,7 +11678,7 @@ 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/")), (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 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 = $5;
@@ -12980,12 +12997,41 @@ var ObjectPropertyDelimiter$$ = [ObjectPropertyDelimiter$0, ObjectPropertyDelimi
 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;
@@ -13007,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") {
@@ -13019,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;
@@ -13031,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;
@@ -13096,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$$);
 }
@@ -16077,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)));
@@ -16716,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 };
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",