@danielx/civet 0.8.13 → 0.8.14

package/CHANGELOG.md

@@ -4,6 +4,13 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.8.14 (2024-11-07, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.13...v0.8.14), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.14))
+* Syntax highlighting: fix leading `_` being treated as a number [[#1578](https://github.com/DanielXMoore/Civet/pull/1578)]
+* Scientific numeric literals take priority over access [[#1579](https://github.com/DanielXMoore/Civet/pull/1579)]
+* Fix parenthesized `⧺` and `—` shorthands for `++` and `--` [[#1584](https://github.com/DanielXMoore/Civet/pull/1584)]
+* Fix wrapping of braced objects in parentheses [[#1585](https://github.com/DanielXMoore/Civet/pull/1585)]
+* Object comprehensions via loops in braces [[#1563](https://github.com/DanielXMoore/Civet/pull/1563)]
+
 ## 0.8.13 (2024-11-05, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.12...v0.8.13), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.13))
 * Playground copy button for large text fragments [[#1569](https://github.com/DanielXMoore/Civet/pull/1569)]
 * Fix unplugin `typecheck`: source mapping and `rewriteCivetImports` combination [[#1571](https://github.com/DanielXMoore/Civet/pull/1571)]

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;
@@ -3146,6 +3146,8 @@ ${js}`
           }
         }
       })());
+    } else if (statement.object) {
+      declaration.children.push("={}");
     } else {
       if (decl === "const") {
         declaration.children.push("=[]");
@@ -3161,6 +3163,9 @@ ${js}`
       }
       if (!block.empty) {
         assignResults(block, (node) => {
+          if (statement.object) {
+            return ["Object.assign(", resultsRef, ",", node, ")"];
+          }
           if (!reduction) {
             return [resultsRef, ".push(", node, ")"];
           }
@@ -4765,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;
     }
@@ -4785,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");
           }
           ;
@@ -5089,7 +5094,9 @@ ${js}`
       if (pre.length) {
         return {
           type: "UnaryExpression",
-          children: [...pre, exp]
+          children: [pre, exp],
+          pre,
+          expression: exp
         };
       }
       return exp;
@@ -5141,7 +5148,10 @@ ${js}`
     }
     return {
       type: "UnaryExpression",
-      children: [...pre, exp, post]
+      children: [pre, exp, post],
+      pre,
+      expression: exp,
+      post
     };
   }
   function processUnaryNestedExpression(pre, args, post) {
@@ -6181,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 };
   }
@@ -6753,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;
@@ -7466,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);
     }
@@ -7490,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++) {
@@ -7502,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}`, ";"]);
         }
       }
     }
@@ -7511,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}`, ";"]);
       }
     }
   }
@@ -8347,6 +8365,7 @@ ${js}`
     Dot,
     DotDot,
     DotDotDot,
+    InsertDotDotDot,
     DoubleColon,
     DoubleColonAsColon,
     DoubleQuote,
@@ -8907,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"));
@@ -9769,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",
@@ -11705,7 +11722,7 @@ ${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/")), (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;
@@ -13024,12 +13041,41 @@ ${js}`
   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;
@@ -13051,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") {
@@ -13063,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;
@@ -13075,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;
@@ -13140,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$$);
   }
@@ -16121,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)));
@@ -16760,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 };
   });