@danielx/civet 0.6.18 → 0.6.19

package/dist/main.mjs

@@ -154,15 +154,8 @@ var require_lib = __commonJS({
       }
     }
     function arrayElementHasTrailingComma(elementNode) {
-      const { children } = elementNode, { length } = children;
-      const lastChild = children[length - 1];
-      if (lastChild) {
-        const l2 = lastChild.length;
-        if (lastChild[l2 - 1]?.token === ",") {
-          return true;
-        }
-      }
-      return false;
+      const lastChild = elementNode.children.at(-1);
+      return lastChild && lastChild[lastChild.length - 1]?.token === ",";
     }
     var assert = {
       equal(a, b, msg) {
@@ -589,7 +582,15 @@ var require_lib = __commonJS({
         case "EmptyStatement":
         case "ReturnStatement":
         case "ThrowStatement":
+          return;
         case "Declaration":
+          exp.children.push(["", [
+            ";",
+            ref,
+            ".push(",
+            patternAsValue(exp.bindings.at(-1).pattern),
+            ")"
+          ]]);
           return;
         case "ForStatement":
         case "IterationStatement":
@@ -842,6 +843,39 @@ var require_lib = __commonJS({
       const indent = expressions[index][0];
       expressions.splice(index, 0, [indent, dec, ";"]);
     }
+    function patternAsValue(pattern) {
+      switch (pattern.type) {
+        case "ArrayBindingPattern": {
+          const children = [...pattern.children];
+          const index = children.indexOf(pattern.elements);
+          if (index < 0)
+            throw new Error("failed to find elements in ArrayBindingPattern");
+          children[index] = pattern.elements.map((el) => {
+            const [ws, e, delim] = el.children;
+            return { ...el, children: [ws, patternAsValue(e), delim] };
+          });
+          return { ...pattern, children };
+        }
+        case "ObjectBindingPattern": {
+          const children = [...pattern.children];
+          const index = children.indexOf(pattern.properties);
+          if (index < 0)
+            throw new Error("failed to find properties in ArrayBindingPattern");
+          children[index] = pattern.properties.map(patternAsValue);
+          return { ...pattern, children };
+        }
+        case "Identifier":
+        case "BindingProperty": {
+          const children = [pattern.name, pattern.delim];
+          if (isWhitespaceOrEmpty(pattern.children[0])) {
+            children.unshift(pattern.children[0]);
+          }
+          return { ...pattern, children };
+        }
+        default:
+          return pattern;
+      }
+    }
     function insertReturn(node) {
       if (!node)
         return;
@@ -883,7 +917,12 @@ var require_lib = __commonJS({
         case "EmptyStatement":
         case "ReturnStatement":
         case "ThrowStatement":
+          return;
         case "Declaration":
+          exp.children.push(["", {
+            type: "ReturnStatement",
+            children: [";return ", patternAsValue(exp.bindings.at(-1).pattern)]
+          }]);
           return;
         case "ForStatement":
         case "IterationStatement":
@@ -1298,72 +1337,59 @@ var require_lib = __commonJS({
         children: [s, parts, e]
       };
     }
-    function processConstAssignmentDeclaration(c, id, suffix, ws, ca, e) {
-      c = {
-        ...c,
+    function processAssignmentDeclaration(decl, id, suffix, ws, assign, e) {
+      decl = {
+        ...decl,
         $loc: {
-          pos: ca.$loc.pos - 1,
-          length: ca.$loc.length + 1
+          pos: assign.$loc.pos - 1,
+          length: assign.$loc.length + 1
         }
       };
-      let exp;
-      if (e.type === "FunctionExpression") {
-        exp = e;
-      } else {
-        exp = e[1];
-      }
-      if (exp?.children?.[0]?.token?.match(/^\s+$/))
-        exp.children.shift();
-      if (id.type === "Identifier" && exp?.type === "FunctionExpression" && !exp.id) {
-        const i = exp.children.findIndex((c2) => c2?.token === "function") + 1;
-        exp = {
-          ...exp,
-          children: [...exp.children.slice(0, i), " ", id, suffix, ws, ...exp.children.slice(i)]
-        };
-        return {
-          type: "Declaration",
-          children: [exp],
-          names: id.names
-        };
+      if (decl.token.startsWith("const")) {
+        let exp;
+        if (e.type === "FunctionExpression") {
+          exp = e;
+        } else {
+          exp = e[1];
+        }
+        if (exp?.children?.[0]?.token?.match(/^\s+$/))
+          exp.children.shift();
+        if (id.type === "Identifier" && exp?.type === "FunctionExpression" && !exp.id) {
+          const i = exp.children.findIndex((c) => c?.token === "function") + 1;
+          exp = {
+            ...exp,
+            children: [...exp.children.slice(0, i), " ", id, suffix, ws, ...exp.children.slice(i)]
+          };
+          return {
+            type: "Declaration",
+            decl,
+            children: [exp],
+            names: id.names
+          };
+        }
       }
       let [splices, thisAssignments] = gatherBindingCode(id);
       splices = splices.map((s) => [", ", s]);
       thisAssignments = thisAssignments.map((a) => ["", a, ";"]);
-      const binding = [c, id, suffix, ...ws];
-      const initializer = [ca, e];
-      const children = [binding, initializer];
-      return {
-        type: "Declaration",
-        names: id.names,
-        children,
-        binding,
+      const initializer = [ws, assign, e];
+      const binding = {
+        type: "Binding",
+        pattern: id,
         initializer,
         splices,
-        thisAssignments
-      };
-    }
-    function processLetAssignmentDeclaration(l, id, suffix, ws, la, e) {
-      l = {
-        ...l,
-        $loc: {
-          pos: la.$loc.pos - 1,
-          length: la.$loc.length + 1
-        }
+        suffix,
+        thisAssignments,
+        children: [id, suffix, initializer]
       };
-      let [splices, thisAssignments] = gatherBindingCode(id);
-      splices = splices.map((s) => [", ", s]);
-      thisAssignments = thisAssignments.map((a) => ["", a, ";"]);
-      const binding = [l, id, suffix, ...ws];
-      const initializer = [la, e];
-      const children = [binding, initializer];
+      const children = [decl, binding];
       return {
         type: "Declaration",
         names: id.names,
-        children,
-        binding,
-        initializer,
+        decl,
+        bindings: [binding],
         splices,
-        thisAssignments
+        thisAssignments,
+        children
       };
     }
     function implicitFunctionBlock(f) {
@@ -1574,9 +1600,9 @@ var require_lib = __commonJS({
             const subRef = [ref, "[", i.toString(), "]"];
             getPatternConditions(e, subRef, conditions);
           });
-          const postRest = pattern.children.find((c) => c?.blockPrefix);
-          if (postRest) {
-            const postElements = postRest.blockPrefix.children[1], { length: postLength } = postElements;
+          const { blockPrefix } = pattern;
+          if (blockPrefix) {
+            const postElements = blockPrefix.children[1], { length: postLength } = postElements;
             postElements.forEach(({ children: [, e] }, i) => {
               const subRef = [ref, "[", ref, ".length - ", (postLength + i).toString(), "]"];
               getPatternConditions(e, subRef, conditions);
@@ -1663,15 +1689,15 @@ var require_lib = __commonJS({
         if (el.type === "BindingRestElement") {
           return ["", el, void 0];
         }
-        const { children: [ws, e, sep] } = el;
+        const { children: [ws, e, delim] } = el;
         switch (e.type) {
           case "Literal":
           case "RegularExpressionLiteral":
           case "StringLiteral":
           case "PinPattern":
-            return sep;
+            return delim;
           default:
-            return [ws, nonMatcherBindings(e), sep];
+            return [ws, nonMatcherBindings(e), delim];
         }
       });
     }
@@ -1681,13 +1707,12 @@ var require_lib = __commonJS({
           case "BindingProperty": {
             const { children, name, value } = p;
             const [ws] = children;
-            const sep = children[children.length - 1];
             switch (value && value.type) {
               case "ArrayBindingPattern":
               case "ObjectBindingPattern":
                 return {
                   ...p,
-                  children: [ws, name, ": ", nonMatcherBindings(value)]
+                  children: [ws, name, ": ", nonMatcherBindings(value), p.delim]
                 };
               case "Identifier":
                 return p;
@@ -1697,7 +1722,7 @@ var require_lib = __commonJS({
               default:
                 return {
                   ...p,
-                  children: [ws, name, sep]
+                  children: [ws, name, p.delim]
                 };
             }
           }
@@ -2367,9 +2392,20 @@ var require_lib = __commonJS({
         let rest = props[restIndex];
         props = props.slice(0, restIndex);
         if (after.length) {
-          const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
-          rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
-          after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
+          const { delim: restDelim } = rest, lastAfterProp = after[after.length - 1], { delim: lastDelim, children: lastAfterChildren } = lastAfterProp;
+          rest = {
+            ...rest,
+            delim: lastDelim,
+            children: [...rest.children.slice(0, -1), lastDelim]
+          };
+          after = [
+            ...after.slice(0, -1),
+            {
+              ...lastAfterProp,
+              delim: restDelim,
+              children: [...lastAfterChildren.slice(0, -1), restDelim]
+            }
+          ];
         }
         const children = [...props, ...after, rest];
         return {
@@ -2549,8 +2585,7 @@ var require_lib = __commonJS({
       processBinaryOpExpression,
       processCallMemberExpression,
       processCoffeeInterpolation,
-      processConstAssignmentDeclaration,
-      processLetAssignmentDeclaration,
+      processAssignmentDeclaration,
       processParams,
       processProgram,
       processReturnValue,
@@ -3091,7 +3126,6 @@ ${input.slice(result.pos)}
       BindingProperty,
       BindingRestProperty,
       NestedBindingElements,
-      NestedBindingElement,
       BindingElement,
       BindingRestElement,
       EmptyBindingPattern,
@@ -3313,7 +3347,6 @@ ${input.slice(result.pos)}
       Initializer,
       VariableStatement,
       VariableDeclarationList,
-      VariableDeclaration,
       NumericLiteral,
       NumericLiteralKind,
       DecimalBigIntegerLiteral,
@@ -7339,7 +7372,7 @@ ${input.slice(result.pos)}
       var c = $3;
       return {
         type: "ObjectBindingPattern",
-        children: $0,
+        children: [$1, $2, c.children, $4, $5],
         names: c.names,
         properties: c.children
       };
@@ -7400,6 +7433,7 @@ ${input.slice(result.pos)}
       return props.map(([prop, delim]) => {
         return {
           ...prop,
+          delim,
           children: [...prop.children, delim]
         };
       });
@@ -7429,11 +7463,10 @@ ${input.slice(result.pos)}
     var ArrayBindingPattern$0 = $TS($S($E(_), OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var c = $3;
       return {
+        ...c,
         type: "ArrayBindingPattern",
-        children: $0,
-        names: c.names,
         elements: c.children,
-        length: c.length
+        children: [$1, $2, c.children, $4, $5]
       };
     });
     function ArrayBindingPattern(state) {
@@ -7519,14 +7552,14 @@ ${input.slice(result.pos)}
       }
     }
     var NestedBindingElementList$0 = $TS($S(Nested, BindingElementList), function($skip, $loc, $0, $1, $2) {
-      var ws = $1;
+      var indent = $1;
       var elements = $2;
       return elements.map((element, i) => {
         if (i > 0)
           return element;
         return {
           ...element,
-          children: [ws, ...element.children]
+          children: [indent, ...element.children.slice(1)]
         };
       });
     });
@@ -7641,13 +7674,13 @@ ${input.slice(result.pos)}
     var BindingProperty$1 = $TS($S($E(_), PropertyName, $E(_), Colon, $E(_), $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
       var name = $2;
       var value = $6;
-      var init = $7;
+      var initializer = $7;
       return {
         type: "BindingProperty",
         children: $0,
         name,
         value,
-        init,
+        initializer,
         names: value.names
       };
     });
@@ -7655,14 +7688,14 @@ ${input.slice(result.pos)}
       var ws = $1;
       var pin = $2;
       var binding = $3;
-      var init = $4;
+      var initializer = $4;
       if (binding.type === "AtBinding") {
         return {
           type: "AtBindingProperty",
           children: $0,
           binding,
           ref: binding.ref,
-          init,
+          initializer,
           names: []
         };
       }
@@ -7682,7 +7715,7 @@ ${input.slice(result.pos)}
         children: $0,
         name: binding,
         value: void 0,
-        init,
+        initializer,
         names: binding.names,
         identifier: binding
       };
@@ -7779,36 +7812,6 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NestedBindingElement$0 = $TS($S(Nested, BindingElement), function($skip, $loc, $0, $1, $2) {
-      var indent = $1;
-      var element = $2;
-      return {
-        ...element,
-        children: [indent, ...element.children]
-      };
-    });
-    function NestedBindingElement(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedBindingElement", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedBindingElement", state, NestedBindingElement$0(state));
-        if (state.events)
-          state.events.exit?.("NestedBindingElement", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedBindingElement$0(state);
-        if (state.events)
-          state.events.exit?.("NestedBindingElement", state, result, eventData);
-        return result;
-      }
-    }
     var BindingElement$0 = BindingRestElement;
     var BindingElement$1 = $TS($S($E(_), $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
@@ -7817,6 +7820,7 @@ ${input.slice(result.pos)}
       if (binding.children) {
         binding = {
           ...binding,
+          initializer,
           children: [...binding.children, initializer]
         };
       }
@@ -7862,7 +7866,7 @@ ${input.slice(result.pos)}
       var binding = $3;
       return {
         type: "BindingRestElement",
-        children: [...ws || [], dots, binding],
+        children: [ws, [dots, binding]],
         binding,
         name: binding.name,
         names: binding.names,
@@ -13473,17 +13477,19 @@ ${input.slice(result.pos)}
         type: "Ref",
         base: "ref"
       };
-      const { binding, initializer, splices, thisAssignments } = dec;
+      const { decl, bindings } = dec;
+      const binding = bindings[0];
+      const { pattern, suffix, initializer, splices, thisAssignments } = binding;
       const initCondition = {
         type: "AssignmentExpression",
-        children: [ref, " ", initializer],
+        children: [ref, initializer],
         hoistDec: {
           type: "Declaration",
-          children: ["let ", ref],
+          children: ["let ", ref, suffix],
           names: []
         },
         blockPrefix: [
-          ["", [binding, "= ", ref, ...splices], ";"],
+          ["", [decl, pattern, suffix, " = ", ref, ...splices], ";"],
           ...thisAssignments
         ]
       };
@@ -15182,26 +15188,23 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LexicalDeclaration$0 = $TS($S(LetOrConst, LexicalBinding, $Q($S(__, Comma, LexicalBinding))), function($skip, $loc, $0, $1, $2, $3) {
-      var d = $1;
+    var LexicalDeclaration$0 = $TS($S(LetOrConst, LexicalBinding, $Q($S(__, Comma, __, LexicalBinding))), function($skip, $loc, $0, $1, $2, $3) {
+      var decl = $1;
       var binding = $2;
       var tail = $3;
-      const { splices, thisAssignments } = binding;
+      const bindings = [binding].concat(tail.map(([, , , b]) => b));
       return {
         type: "Declaration",
         children: $0,
-        names: [...binding.names].concat(tail.flatMap(([, , b]) => b.names)),
-        binding: {
-          ...binding.binding,
-          children: [d, ...binding.binding.children]
-        },
-        initializer: binding.initializer,
-        splices,
-        thisAssignments
+        names: bindings.flatMap((b) => b.names),
+        bindings,
+        decl,
+        splices: bindings.flatMap((b) => b.splices),
+        thisAssignments: bindings.flatMap((b) => b.thisAssignments)
       };
     });
     var LexicalDeclaration$1 = $TS($S(InsertConst, $C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, ConstAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      return processConstAssignmentDeclaration(...$0);
+      return processAssignmentDeclaration(...$0);
     });
     var LexicalDeclaration$2 = $TS($S(InsertLet, $C(BindingPattern, BindingIdentifier), $E(TypeSuffix), __, LetAssignment, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       var l = $1;
@@ -15210,7 +15213,7 @@ ${input.slice(result.pos)}
       var ws = $4;
       var la = $5;
       var e = $6;
-      return processLetAssignmentDeclaration(...$0);
+      return processAssignmentDeclaration(...$0);
     });
     function LexicalDeclaration(state) {
       let eventData;
@@ -15284,48 +15287,32 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var LexicalBinding$0 = $TS($S(BindingPattern, $E(TypeSuffix), $E(_), Initializer), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var binding = $1;
+    var LexicalBinding$0 = $TS($S(BindingPattern, $E(TypeSuffix), Initializer), function($skip, $loc, $0, $1, $2, $3) {
+      var pattern = $1;
       var suffix = $2;
-      var ws = $3;
-      var initializer = $4;
-      const bindingChildren = [...binding.children];
-      if (suffix)
-        bindingChildren.push(suffix);
-      if (ws)
-        bindingChildren.push(...ws);
-      binding = {
-        ...binding,
-        children: bindingChildren
-      };
-      const [splices, thisAssignments] = gatherBindingCode(binding.children);
+      var initializer = $3;
+      const [splices, thisAssignments] = gatherBindingCode(pattern);
       return {
-        children: [binding, initializer],
-        names: binding.names,
-        binding,
+        type: "Binding",
+        children: $0,
+        names: pattern.names,
+        pattern,
+        suffix,
         initializer,
         splices: splices.map((s) => [",", s]),
         thisAssignments: thisAssignments.map((s) => ["", s, ";"])
       };
     });
-    var LexicalBinding$1 = $TS($S(BindingIdentifier, $E(TypeSuffix), $E(_), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var binding = $1;
+    var LexicalBinding$1 = $TS($S(BindingIdentifier, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
+      var pattern = $1;
       var suffix = $2;
-      var ws = $3;
-      var initializer = $4;
-      const bindingChildren = [...binding.children];
-      if (suffix)
-        bindingChildren.push(suffix);
-      if (ws)
-        bindingChildren.push(...ws);
-      binding = {
-        ...binding,
-        children: bindingChildren
-      };
+      var initializer = $3;
       return {
-        children: [binding, initializer],
-        names: binding.names,
-        binding,
+        type: "Binding",
+        children: $0,
+        names: pattern.names,
+        pattern,
+        suffix,
         initializer,
         splices: [],
         thisAssignments: []
@@ -15377,9 +15364,10 @@ ${input.slice(result.pos)}
       }
     }
     var VariableStatement$0 = $TS($S(Var, __, VariableDeclarationList), function($skip, $loc, $0, $1, $2, $3) {
-      return Object.assign({}, $3, {
+      return {
+        ...$3,
         children: [$1, ...$2, ...$3.children]
-      });
+      };
     });
     function VariableStatement(state) {
       let eventData;
@@ -15403,18 +15391,15 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var VariableDeclarationList$0 = $TS($S(VariableDeclaration, $Q($S(__, Comma, __, VariableDeclaration))), function($skip, $loc, $0, $1, $2) {
-      let children;
-      if ($2.length) {
-        children = [$1, ...$2];
-      } else {
-        children = [$1];
-      }
-      const names = children.flatMap((c) => c.names || []);
+    var VariableDeclarationList$0 = $TS($S(LexicalBinding, $Q($S(__, Comma, __, LexicalBinding))), function($skip, $loc, $0, $1, $2) {
+      var binding = $1;
+      var tail = $2;
+      const bindings = [binding].concat(tail.map(([, , , b]) => b));
       return {
         type: "Declaration",
-        children,
-        names
+        children: [binding, ...tail],
+        bindings,
+        names: bindings.flatMap((b) => b.names)
       };
     });
     function VariableDeclarationList(state) {
@@ -15439,49 +15424,6 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var VariableDeclaration$0 = $TS($S(BindingPattern, $E(TypeSuffix), Initializer), function($skip, $loc, $0, $1, $2, $3) {
-      const children = [...$1.children];
-      if ($2)
-        children.push($2);
-      children.push($3);
-      return {
-        children,
-        names: $1.names
-      };
-    });
-    var VariableDeclaration$1 = $TS($S(BindingIdentifier, $E(TypeSuffix), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
-      const children = [...$1.children];
-      if ($2)
-        children.push($2);
-      if ($3)
-        children.push($3);
-      return {
-        children,
-        names: $1.names
-      };
-    });
-    function VariableDeclaration(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("VariableDeclaration", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("VariableDeclaration", state, VariableDeclaration$0(state) || VariableDeclaration$1(state));
-        if (state.events)
-          state.events.exit?.("VariableDeclaration", state, result, eventData);
-        return result;
-      } else {
-        const result = VariableDeclaration$0(state) || VariableDeclaration$1(state);
-        if (state.events)
-          state.events.exit?.("VariableDeclaration", state, result, eventData);
-        return result;
-      }
-    }
     var NumericLiteral$0 = $TS($S(NumericLiteralKind), function($skip, $loc, $0, $1) {
       return { type: "NumericLiteral", $loc, token: $1 };
     });
@@ -21242,9 +21184,9 @@ ${input.slice(result.pos)}
             ["let ", id, " = {};\n"],
             ...block.properties.map((property, i) => {
               let init, isString;
-              if (property.init) {
+              if (property.initializer) {
                 init = replaceNodes(
-                  deepCopy(property.init),
+                  deepCopy(property.initializer),
                   (n) => n.type === "Identifier" && names.has(n.name),
                   (n) => [id, '["', n.name, '"]']
                 );
@@ -21407,11 +21349,11 @@ ${input.slice(result.pos)}
     }
     var EnumProperty$0 = $TS($S(Identifier, $E($S(__, Equals, ExtendedExpression)), ObjectPropertyDelimiter), function($skip, $loc, $0, $1, $2, $3) {
       var name = $1;
-      var init = $2;
+      var initializer = $2;
       return {
         type: "EnumProperty",
         name,
-        init,
+        initializer,
         children: $0
       };
     });
@@ -24224,8 +24166,7 @@ ${input.slice(result.pos)}
       processBinaryOpExpression,
       processCallMemberExpression,
       processCoffeeInterpolation,
-      processConstAssignmentDeclaration,
-      processLetAssignmentDeclaration,
+      processAssignmentDeclaration,
       processProgram,
       processUnaryExpression,
       quoteString,