@danielx/civet 0.9.4 → 0.9.5

package/dist/browser.js

@@ -1271,6 +1271,14 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
   }
 
   // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
+  var range = (start, end) => {
+    let length = end - start;
+    if (length <= 0) return [];
+    let arr = Array(length);
+    for (let i = 0; i < length; ++i)
+      arr[i] = i + start;
+    return arr;
+  };
   function makeRef(base = "ref", id = base) {
     return {
       type: "Ref",
@@ -1281,7 +1289,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
   function needsRef(expression, base = "ref") {
     if (expression != null && typeof expression == "object") {
       if (Array.isArray(expression)) {
-        let nonempty = ((s) => Array.from({ length: expression.length - s }, (_2, i) => s + i))(0).filter((i) => !isWhitespaceOrEmpty(expression[i]));
+        let nonempty = range(0, expression.length).filter((i) => !isWhitespaceOrEmpty(expression[i]));
         if (nonempty.length === 1) {
           let ref1;
           return (ref1 = needsRef(expression[nonempty[0]], base)) ? ref1 : void 0;
@@ -1320,10 +1328,27 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     let ref = maybeRef(exp, base);
     return ref === exp ? { ref, refAssignmentComma: [] } : { ref, ...makeRefAssignment(ref, exp) };
   }
+  function populateRefs(statements) {
+    let refNodes = gatherRecursive(statements, ($) => $.type === "Ref");
+    if (!refNodes.length)
+      return;
+    let ids = gatherRecursive(statements, ($1) => $1.type === "Identifier"), names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
+    for (let i1 = 0, len3 = refNodes.length; i1 < len3; i1++) {
+      let ref = refNodes[i1];
+      if (ref.type !== "Ref")
+        continue;
+      let { base } = ref;
+      ref.type = "Identifier";
+      let n = 0, name = base;
+      for (; names.has(name); )
+        n++, name = `${base}${n}`;
+      names.add(name), ref.children = ref.names = [name];
+    }
+  }
 
   // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\binding.civet.jsx
   function adjustAtBindings(statements, asThis = !1) {
-    for (let ref1 = gatherRecursiveAll(statements, ($) => $.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
+    for (let ref1 = gatherRecursiveAll(statements, ($1) => $1.type === "AtBindingProperty"), i1 = 0, len3 = ref1.length; i1 < len3; i1++) {
       let binding = ref1[i1], { ref } = binding;
       if (asThis) {
         let atBinding = binding.binding;
@@ -1334,7 +1359,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     }
   }
   function adjustBindingElements(elements) {
-    let names = elements.flatMap(($1) => $1.names || []), { length } = elements, blockPrefix, restIndex = -1, restCount = 0;
+    let names = elements.flatMap(($2) => $2.names || []), { length } = elements, blockPrefix, restIndex = -1, restCount = 0;
     for (let i2 = 0, len1 = elements.length; i2 < len1; i2++) {
       let i = i2, { type } = elements[i2];
       type === "BindingRestElement" && (restIndex < 0 && (restIndex = i), restCount++);
@@ -1382,21 +1407,40 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
       length
     };
   }
+  function gatherSubbindings(node, subbindings = []) {
+    for (let ref2 = gatherRecursiveAll(node, ($) => $.subbinding != null), i3 = 0, len22 = ref2.length; i3 < len22; i3++) {
+      let p = ref2[i3], { subbinding } = p;
+      subbindings.push(", ", subbinding), gatherSubbindings(subbinding, subbindings);
+    }
+    return subbindings;
+  }
+  function simplifyBindingProperties(node) {
+    let results = [];
+    for (let ref3 = gatherRecursiveAll(node, ($3) => $3.type === "BindingProperty"), i4 = 0, len3 = ref3.length; i4 < len3; i4++) {
+      let p = ref3[i4], { name, value } = p;
+      if (value?.type === "NamedBindingPattern" && value.binding === name) {
+        let [ws] = p.children;
+        results.push(p.children = [ws, name, p.delim]);
+      } else
+        results.push(void 0);
+    }
+    return results;
+  }
   function gatherBindingCode(statements, opts) {
     let thisAssignments = [], splices = [];
     function insertRestSplices(s, p, thisAssignments2) {
       let m;
-      for (let ref2 = gatherRecursiveAll(
+      for (let ref4 = gatherRecursiveAll(
         s,
         (n) => n.blockPrefix || opts?.injectParamProps && n.accessModifier || n.type === "AtBinding" || opts?.assignPins && (m = n.type, m === "PinPattern" || m === "PinProperty")
-      ), i3 = 0, len22 = ref2.length; i3 < len22; i3++) {
-        let n = ref2[i3];
+      ), i5 = 0, len4 = ref4.length; i5 < len4; i5++) {
+        let n = ref4[i5];
         if (n.type === "AtBinding") {
           let { ref } = n, { id } = ref;
           thisAssignments2.push([`this.${id} = `, ref]);
           continue;
         }
-        if (opts?.assignPins && (n.type === "PinProperty" && (n.children = n.children.flatMap(($2) => $2 === n.name ? [n.name, ": ", n.value] : $2), updateParentPointers(n), n = n.value), n.type === "PinPattern")) {
+        if (opts?.assignPins && (n.type === "PinProperty" && (n.children = n.children.flatMap(($4) => $4 === n.name ? [n.name, ": ", n.value] : $4), updateParentPointers(n), n = n.value), n.type === "PinPattern")) {
           n.ref = makeRef(
             n.expression.type === "Identifier" ? n.expression.name : "pin"
           ), n.children = [n.ref], updateParentPointers(n), thisAssignments2.push({
@@ -1410,8 +1454,8 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
           continue;
         }
         if (opts?.injectParamProps && n.type === "Parameter" && n.accessModifier) {
-          for (let ref3 = n.names, i4 = 0, len3 = ref3.length; i4 < len3; i4++) {
-            let id = ref3[i4];
+          for (let ref5 = n.names, i6 = 0, len5 = ref5.length; i6 < len5; i6++) {
+            let id = ref5[i6];
             thisAssignments2.push({
               type: "AssignmentExpression",
               children: [`this.${id} = `, id],
@@ -1427,7 +1471,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     return insertRestSplices(statements, splices, thisAssignments), [splices, thisAssignments];
   }
   function arrayElementHasTrailingComma(elementNode) {
-    let ref4, lastChild = (ref4 = elementNode.children)[ref4.length - 1];
+    let ref6, lastChild = (ref6 = elementNode.children)[ref6.length - 1];
     return lastChild && lastChild[lastChild.length - 1]?.token === ",";
   }
   function gatherBindingPatternTypeSuffix(pattern) {
@@ -1437,14 +1481,14 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
     switch (pattern.type) {
       case "ArrayBindingPattern": {
         {
-          let results = [];
-          for (let ref5 = pattern.elements, i5 = 0, len4 = ref5.length; i5 < len4; i5++) {
-            let elem = ref5[i5], { typeSuffix } = elem;
+          let results1 = [];
+          for (let ref7 = pattern.elements, i7 = 0, len6 = ref7.length; i7 < len6; i7++) {
+            let elem = ref7[i7], { typeSuffix } = elem;
             typeSuffix ??= elem.binding?.typeSuffix, typeSuffix && count++;
             let typeElement = [typeSuffix?.t, elem.delim];
-            typeSuffix?.optional && (typeElement[0] = parenthesizeType(typeElement[0]), typeElement.unshift("undefined |")), elem.type === "BindingRestElement" ? (typeElement[0] ??= "unknown[]", typeElement.unshift(elem.dots)) : typeElement[0] ??= "unknown", results.push(typeElement);
+            typeSuffix?.optional && (typeElement[0] = parenthesizeType(typeElement[0]), typeElement.unshift("undefined |")), elem.type === "BindingRestElement" ? (typeElement[0] ??= "unknown[]", typeElement.unshift(elem.dots)) : typeElement[0] ??= "unknown", results1.push(typeElement);
           }
-          let types = results;
+          let types = results1;
           if (count) {
             let t = [": [", types, "]"];
             pattern.typeSuffix = {
@@ -1459,9 +1503,9 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
       }
       case "ObjectBindingPattern": {
         {
-          let restType, results1 = [];
-          for (let ref6 = pattern.properties, i6 = 0, len5 = ref6.length; i6 < len5; i6++) {
-            let prop = ref6[i6], { typeSuffix } = prop;
+          let restType, results2 = [];
+          for (let ref8 = pattern.properties, i8 = 0, len7 = ref8.length; i8 < len7; i8++) {
+            let prop = ref8[i8], { typeSuffix } = prop;
             switch (typeSuffix ??= prop.value?.typeSuffix, typeSuffix && count++, typeSuffix ??= {
               type: "TypeSuffix",
               ts: !0,
@@ -1469,12 +1513,12 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
             }, prop.type) {
               case "BindingProperty": {
                 let ws = prop.children.slice(0, prop.children.indexOf(prop.name));
-                results1.push([...ws, prop.name, typeSuffix, prop.delim]);
+                results2.push([...ws, prop.name, typeSuffix, prop.delim]);
                 break;
               }
               case "AtBindingProperty": {
                 let ws = prop.children.slice(0, prop.children.indexOf(prop.binding));
-                results1.push([...ws, prop.ref.id, typeSuffix, prop.delim]);
+                results2.push([...ws, prop.ref.id.replace(/^#/, ""), typeSuffix, prop.delim]);
                 break;
               }
               case "BindingRestProperty": {
@@ -1483,7 +1527,7 @@ ${body}`), super(message), this.header = header, this.body = body, this.filename
               }
             }
           }
-          let types = results1;
+          let types = results2;
           if (count) {
             let t = ["{", types, "}"];
             restType != null && t.push(" & ", parenthesizeType(trimFirstSpace(restType))), pattern.typeSuffix = {
@@ -2828,7 +2872,8 @@ ${js}`
     if (parameters.names = before.flatMap(($7) => $7.names), parameters.parameters.splice(0, 1 / 0), tt && parameters.parameters.push(tt), parameters.parameters.push(...before), rest) {
       let restIdentifier = rest.binding.ref || rest.binding;
       if (parameters.names.push(...rest.names || []), rest.children.pop(), after.length) {
-        (rest.binding.type === "ArrayBindingPattern" || rest.binding.type === "ObjectBindingPattern") && parameters.parameters.push({
+        let m4;
+        m4 = rest.binding.type, (m4 === "ArrayBindingPattern" || m4 === "ObjectBindingPattern" || m4 === "NamedBindingPattern") && parameters.parameters.push({
           type: "Error",
           message: "Non-end rest parameter cannot be binding pattern"
         }), after = trimFirstSpace(after);
@@ -2924,14 +2969,14 @@ ${js}`
     let [splices, thisAssignments] = gatherBindingCode(parameters, {
       injectParamProps: isConstructor,
       assignPins: !0
-    });
-    if (isConstructor) {
+    }), subbindings = gatherSubbindings(parameters.parameters);
+    if (simplifyBindingProperties(parameters.parameters), simplifyBindingProperties(subbindings), isConstructor) {
       let { ancestor } = findAncestor(f, ($10) => $10.type === "ClassExpression");
       if (ancestor != null) {
         let fields = new Set(gatherRecursiveWithinFunction(ancestor, ($11) => $11.type === "FieldDefinition").map(($12) => $12.id).filter((a3) => typeof a3 == "object" && a3 != null && "type" in a3 && a3.type === "Identifier").map(($13) => $13.name)), classExpressions = ancestor.body.expressions, index2 = findChildIndex(classExpressions, f);
         assert.notEqual(index2, -1, "Could not find constructor in class");
-        let m4;
-        for (; m4 = classExpressions[index2 - 1]?.[1], typeof m4 == "object" && m4 != null && "type" in m4 && m4.type === "MethodDefinition" && "name" in m4 && m4.name === "constructor"; )
+        let m5;
+        for (; m5 = classExpressions[index2 - 1]?.[1], typeof m5 == "object" && m5 != null && "type" in m5 && m5.type === "MethodDefinition" && "name" in m5 && m5.name === "constructor"; )
           index2--;
         let fStatement = classExpressions[index2];
         for (let ref18 = gatherRecursive(parameters, ($14) => $14.type === "Parameter"), i9 = 0, len8 = ref18.length; i9 < len8; i9++) {
@@ -2957,6 +3002,13 @@ ${js}`
       type: "SemicolonDelimiter",
       children: [";"]
     }, prefix = [];
+    subbindings.length && prefix.push(makeNode({
+      type: "Declaration",
+      children: ["const ", subbindings.slice(1)],
+      names: subbindings.flatMap(($16) => $16.names ?? []),
+      bindings: [],
+      decl: "const"
+    }));
     for (let ref20 = splices, i11 = 0, len10 = ref20.length; i11 < len10; i11++) {
       let binding = ref20[i11];
       assert.equal(binding.type, "PostRestBindingElements", "splice should be of type Binding"), prefix.push(makeNode({
@@ -2996,7 +3048,7 @@ ${js}`
       if (f.async != null)
         f.async.push("async "), signature.modifier.async = !0;
       else
-        for (let ref21 = gatherRecursiveWithinFunction(block, ($16) => $16.type === "Await"), i12 = 0, len11 = ref21.length; i12 < len11; i12++) {
+        for (let ref21 = gatherRecursiveWithinFunction(block, ($17) => $17.type === "Await"), i12 = 0, len11 = ref21.length; i12 < len11; i12++) {
           let a = ref21[i12], i = findChildIndex(a.parent, a);
           a.parent.children.splice(i + 1, 0, {
             type: "Error",
@@ -3007,8 +3059,8 @@ ${js}`
       if (f.generator != null)
         f.generator.push("*"), signature.modifier.generator = !0;
       else
-        for (let ref22 = gatherRecursiveWithinFunction(block, ($17) => $17.type === "YieldExpression"), i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
-          let y = ref22[i13], i = y.children.findIndex(($18) => $18.type === "Yield");
+        for (let ref22 = gatherRecursiveWithinFunction(block, ($18) => $18.type === "YieldExpression"), i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
+          let y = ref22[i13], i = y.children.findIndex(($19) => $19.type === "Yield");
           y.children.splice(i + 1, 0, {
             type: "Error",
             message: `yield invalid in ${f.type === "ArrowFunction" ? "=> arrow function" : signature.modifier.get ? "getter" : signature.modifier.set ? "setter" : signature.name}`
@@ -3017,7 +3069,7 @@ ${js}`
     signature.modifier.async && !signature.modifier.generator && signature.returnType && !isPromiseType(signature.returnType.t) && replaceNode(signature.returnType.t, wrapTypeInPromise(signature.returnType.t));
   }
   function processFunctions(statements, config2) {
-    for (let ref23 = gatherRecursiveAll(statements, ($19) => $19.type === "FunctionExpression" || $19.type === "ArrowFunction" || $19.type === "MethodDefinition"), i14 = 0, len13 = ref23.length; i14 < len13; i14++) {
+    for (let ref23 = gatherRecursiveAll(statements, ($20) => $20.type === "FunctionExpression" || $20.type === "ArrowFunction" || $20.type === "MethodDefinition"), i14 = 0, len13 = ref23.length; i14 < len13; i14++) {
       let f = ref23[i14];
       (f.type === "FunctionExpression" || f.type === "MethodDefinition") && implicitFunctionBlock(f), processSignature(f), processParams(f), processReturn(f, config2.implicitReturns);
     }
@@ -3064,7 +3116,7 @@ ${js}`
     done || (generator || (statements[statements.length - 1][1] = wrapWithReturn(statements[statements.length - 1][1])), children.splice(i, 1, wrapIIFE(statements, async, generator)), updateParentPointers(exp));
   }
   function processIterationExpressions(statements) {
-    for (let ref25 = gatherRecursiveAll(statements, ($20) => $20.type === "IterationExpression"), i15 = 0, len14 = ref25.length; i15 < len14; i15++) {
+    for (let ref25 = gatherRecursiveAll(statements, ($21) => $21.type === "IterationExpression"), i15 = 0, len14 = ref25.length; i15 < len14; i15++) {
       let s = ref25[i15];
       expressionizeIteration(s);
     }
@@ -3102,12 +3154,12 @@ ${js}`
       let newParameterList = results1, newParameters = {
         ...parameters,
         parameters: newParameterList,
-        children: parameters.children.map(($21) => $21 === parameterList ? newParameterList : $21)
+        children: parameters.children.map(($22) => $22 === parameterList ? newParameterList : $22)
       };
       expression = {
         ...expression,
         parameters: newParameters,
-        children: expression.children.map(($22) => $22 === parameters ? newParameters : $22)
+        children: expression.children.map(($23) => $23 === parameters ? newParameters : $23)
       };
     }
     return {
@@ -3125,7 +3177,7 @@ ${js}`
   }
   function makeAmpersandFunction(rhs) {
     let { ref, typeSuffix, body } = rhs;
-    ref == null && (ref = makeRef("$"), inplacePrepend(ref, body)), startsWithPredicate(body, ($23) => $23.type === "ObjectExpression") && (body = makeLeftHandSideExpression(body));
+    ref == null && (ref = makeRef("$"), inplacePrepend(ref, body)), startsWithPredicate(body, ($24) => $24.type === "ObjectExpression") && (body = makeLeftHandSideExpression(body));
     let parameterList = [
       typeSuffix ? [ref, typeSuffix] : ref
     ], parameters = makeNode({
@@ -3642,14 +3694,12 @@ ${js}`
         break;
       }
       case "ConditionFragment": {
-        let { children } = pattern;
-        if (children.length) {
-          let [first, ...rest] = children, [ws, ...op] = first;
-          ws = [" "].concat(ws), first = [ws, ...op], children = [first, ...rest];
+        let { rhs } = pattern;
+        if (rhs.length) {
+          let [first, ...rest] = rhs, [ws, ...op] = first;
+          ws = [" "].concat(ws), first = [ws, ...op], rhs = [first, ...rest];
         }
-        conditions.push(
-          processBinaryOpExpression([ref, children])
-        );
+        conditions.push(processBinaryOpExpression([ref, rhs]));
         break;
       }
       case "RegularExpressionLiteral": {
@@ -3667,6 +3717,10 @@ ${js}`
         ]);
         break;
       }
+      case "NamedBindingPattern": {
+        getPatternConditions(pattern.pattern, ref, conditions);
+        break;
+      }
       case "Literal": {
         conditions.push([
           ref,
@@ -3693,37 +3747,38 @@ ${js}`
       case "Literal":
       case "RegularExpressionLiteral":
       case "PinPattern":
-      case "ConditionFragment":
         return;
+      case "ConditionFragment": {
+        if (!pattern.binding)
+          return;
+        break;
+      }
     }
-    let [splices, thisAssignments] = gatherBindingCode(pattern), patternBindings2 = nonMatcherBindings(pattern), results = [];
-    for (let ref2 = gatherRecursiveAll(patternBindings2, ($7) => $7.subbinding != null), i5 = 0, len4 = ref2.length; i5 < len4; i5++) {
-      let p = ref2[i5];
-      results.push(prepend(", ", p.subbinding));
-    }
-    let subbindings = results;
-    splices = splices.map((s) => [", ", nonMatcherBindings(s)]), thisAssignments = thisAssignments.map(($8) => ["", $8, ";"]);
-    let duplicateDeclarations = aggregateDuplicateBindings([patternBindings2, splices]);
-    return [
-      ["", {
+    let [splices, thisAssignments] = gatherBindingCode(pattern), patternBindings2 = nonMatcherBindings(pattern), subbindings = gatherSubbindings(patternBindings2);
+    simplifyBindingProperties(patternBindings2), simplifyBindingProperties(subbindings), splices = splices.flatMap((s) => [", ", nonMatcherBindings(s)]), thisAssignments = thisAssignments.map(($7) => ["", $7, ";"]);
+    let duplicateDeclarations = aggregateDuplicateBindings([patternBindings2, splices, subbindings]), blockPrefix = [];
+    if (ref || subbindings.length || splices.length) {
+      let children = [decl];
+      ref && children.push(patternBindings2, typeSuffix, " = ", ref), children.push(...subbindings), children.push(...splices), ref || children.splice(1, 1), blockPrefix.push(["", {
         type: "Declaration",
-        children: [decl, patternBindings2, typeSuffix, " = ", ref, ...subbindings, ...splices],
+        children,
+        decl,
         names: [],
         bindings: []
         // avoid implicit return of any bindings
-      }, ";"],
-      ...thisAssignments,
-      ...duplicateDeclarations.map(($9) => ["", $9, ";"])
-    ];
+      }, ";"]);
+    }
+    if (blockPrefix.push(...thisAssignments), blockPrefix.push(...duplicateDeclarations.map(($8) => ["", $8, ";"])), !!blockPrefix.length)
+      return blockPrefix;
   }
   function elideMatchersFromArrayBindings(elements) {
-    let results1 = [];
-    for (let i6 = 0, len5 = elements.length; i6 < len5; i6++) {
-      let element = elements[i6];
+    let results = [];
+    for (let i5 = 0, len4 = elements.length; i5 < len4; i5++) {
+      let element = elements[i5];
       switch (element.type) {
         case "BindingRestElement":
         case "ElisionElement": {
-          results1.push(element);
+          results.push(element);
           break;
         }
         case "BindingElement": {
@@ -3732,12 +3787,12 @@ ${js}`
             case "RegularExpressionLiteral":
             case "StringLiteral":
             case "PinPattern": {
-              results1.push(element.delim);
+              results.push(element.delim);
               break;
             }
             default: {
               let binding = nonMatcherBindings(element.binding);
-              results1.push(makeNode({
+              results.push(makeNode({
                 ...element,
                 binding,
                 children: element.children.map((c) => c === element.binding ? binding : c)
@@ -3748,26 +3803,20 @@ ${js}`
         }
       }
     }
-    return results1;
+    return results;
   }
   function elideMatchersFromPropertyBindings(properties) {
-    let results2 = [];
-    for (let i7 = 0, len6 = properties.length; i7 < len6; i7++) {
-      let p = properties[i7];
+    let results1 = [];
+    for (let i6 = 0, len5 = properties.length; i6 < len5; i6++) {
+      let p = properties[i6];
       switch (p.type) {
         case "BindingProperty":
         case "PinProperty": {
-          let { children, name, value, bind } = p, [ws] = children;
+          let { children, name, value } = p, [ws] = children;
           if (name.type === "NumericLiteral" && !value?.name || name.type === "ComputedPropertyName" && value?.subtype === "NumericLiteral")
-            if (bind)
-              results2.push({
-                type: "Error",
-                message: `Cannot bind ${name.type}`
-              });
-            else
-              continue;
-          else {
-            let contents;
+            continue;
+          {
+            let contents, m1;
             switch (value?.type) {
               case "ArrayBindingPattern":
               case "ObjectBindingPattern": {
@@ -3784,33 +3833,36 @@ ${js}`
                 contents = p;
                 break;
               }
+              case "NamedBindingPattern": {
+                let bindings = nonMatcherBindings(value.pattern);
+                contents = {
+                  ...p,
+                  subbinding: (m1 = bindings?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern" || m1 === "Identifier" ? [
+                    bindings,
+                    " = ",
+                    name
+                  ] : void 0)
+                }, p.name === value.binding && (contents.children = [ws, name, p.delim]);
+                break;
+              }
               default:
                 contents = void 0;
             }
-            if (bind)
-              results2.push({
-                ...p,
-                children: [ws, name, p.delim],
-                subbinding: contents?.value ? [
-                  contents.value,
-                  " = ",
-                  name
-                ] : void 0
-              });
-            else if (contents)
-              results2.push(contents);
+            if (contents)
+              results1.push(contents);
             else
               continue;
           }
           break;
         }
         default:
-          results2.push(p);
+          results1.push(p);
       }
     }
-    return results2;
+    return results1;
   }
   function nonMatcherBindings(pattern) {
+    let m2;
     switch (pattern.type) {
       case "ArrayBindingPattern":
       case "PostRestBindingElements": {
@@ -3818,7 +3870,7 @@ ${js}`
         return makeNode({
           ...pattern,
           elements,
-          children: pattern.children.map(($10) => $10 === pattern.elements ? elements : $10)
+          children: pattern.children.map(($9) => $9 === pattern.elements ? elements : $9)
         });
       }
       case "ObjectBindingPattern": {
@@ -3826,9 +3878,18 @@ ${js}`
         return makeNode({
           ...pattern,
           properties,
-          children: pattern.children.map(($11) => $11 === pattern.properties ? properties : $11)
+          children: pattern.children.map(($10) => $10 === pattern.properties ? properties : $10)
+        });
+      }
+      case "NamedBindingPattern": {
+        let bindings = nonMatcherBindings(pattern.pattern);
+        return makeNode({
+          ...pattern,
+          subbinding: (m2 = bindings?.type, m2 === "ArrayBindingPattern" || m2 === "ObjectBindingPattern" || m2 === "Identifier" ? [bindings, " = ", pattern.binding] : void 0)
         });
       }
+      case "ConditionFragment":
+        return pattern.binding;
       default:
         return pattern;
     }
@@ -3841,9 +3902,9 @@ ${js}`
       //$.type is "BindingRestProperty"
       $.type === "Identifier" && $.parent?.type === "BindingElement" || $.type === "BindingRestElement"
     ), declarations = [], propsGroupedByName = /* @__PURE__ */ new Map();
-    for (let i8 = 0, len7 = props.length; i8 < len7; i8++) {
-      let p = props[i8], { name, value } = p, m1;
-      if (m1 = value?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern")
+    for (let i7 = 0, len6 = props.length; i7 < len6; i7++) {
+      let p = props[i7], { name, value } = p, m3;
+      if (m3 = value?.type, m3 === "ArrayBindingPattern" || m3 === "ObjectBindingPattern")
         continue;
       let key = value?.name || name?.name || name;
       key?.type === "NumericLiteral" || key?.type === "ComputedPropertyName" || (propsGroupedByName.has(key) ? propsGroupedByName.get(key).push(p) : propsGroupedByName.set(key, [p]));
@@ -3856,8 +3917,8 @@ ${js}`
         pos: 0,
         input: key
       })) {
-        for (let i9 = 0, len8 = shared.length; i9 < len8; i9++) {
-          let p = shared[i9];
+        for (let i8 = 0, len7 = shared.length; i8 < len7; i8++) {
+          let p = shared[i8];
           aliasBinding(p, makeRef(`_${key}`, key));
         }
         return;
@@ -3938,9 +3999,13 @@ ${js}`
   function processDeclarations(statements) {
     for (let ref1 = gatherRecursiveAll(statements, ($) => $.type === "Declaration"), i1 = 0, len1 = ref1.length; i1 < len1; i1++) {
       let declaration = ref1[i1], { bindings } = declaration;
-      if (bindings != null)
-        for (let i2 = 0, len22 = bindings.length; i2 < len22; i2++) {
-          let binding = bindings[i2], { typeSuffix, initializer } = binding;
+      if (bindings != null) {
+        for (let i2 = bindings.length + -1; i2 >= 0; --i2) {
+          let binding = bindings[i2], subbindings = gatherSubbindings(binding);
+          subbindings.length && (simplifyBindingProperties(binding), simplifyBindingProperties(subbindings), spliceChild(declaration, binding, 1, binding, subbindings));
+        }
+        for (let i3 = 0, len22 = bindings.length; i3 < len22; i3++) {
+          let binding = bindings[i3], { typeSuffix, initializer } = binding;
           if (typeSuffix && typeSuffix.optional) {
             if (initializer && !typeSuffix.t) {
               let expression = trimFirstSpace(initializer.expression), m;
@@ -3968,6 +4033,19 @@ ${js}`
           }
           initializer && prependStatementExpressionBlock(initializer, declaration);
         }
+      }
+    }
+    for (let ref2 = gatherRecursiveAll(statements, ($1) => $1.type === "ForStatement"), i4 = 0, len3 = ref2.length; i4 < len3; i4++) {
+      let statement = ref2[i4], { declaration } = statement;
+      if (declaration?.type !== "ForDeclaration")
+        continue;
+      let { binding } = declaration, blockPrefix = getPatternBlockPrefix(
+        binding.pattern,
+        void 0,
+        append(declaration.decl, " "),
+        binding.typeSuffix
+      );
+      simplifyBindingProperties(binding), blockPrefix != null && (statement.block.expressions.unshift(...blockPrefix), braceBlock(statement.block));
     }
   }
   function prependStatementExpressionBlock(initializer, statement) {
@@ -4068,7 +4146,7 @@ ${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) && 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]) {
-      let { type: type1, children: [[], { type: type2, expression: expression2 }] } = expression, type = [type1, type2];
+      let { children: [[], { expression: expression2 }] } = expression;
       expression = expression2;
     }
     processDeclarationCondition(expression, condition.expression, s);
@@ -4090,8 +4168,8 @@ ${js}`
           ({ children } = condition.expression.children[1]);
         }
         children.unshift("(");
-        for (let i3 = 0, len3 = conditions.length; i3 < len3; i3++) {
-          let c = conditions[i3];
+        for (let i5 = 0, len4 = conditions.length; i5 < len4; i5++) {
+          let c = conditions[i5];
           children.push(" && ", c);
         }
         children.push(")");
@@ -4109,11 +4187,11 @@ ${js}`
       if (index < 0)
         throw new Error("Couldn't find where in block to put postfix declaration");
       ancestor.expressions.splice(index + 1, 0, ...blockPrefix), updateParentPointers(ancestor), braceBlock(ancestor);
-      let ref2;
+      let ref3;
       switch (s.type) {
         case "IfStatement": {
-          if (ref2 = s.else?.block) {
-            let elseBlock = ref2;
+          if (ref3 = s.else?.block) {
+            let elseBlock = ref3;
             elseBlock.bare && !elseBlock.semicolon && elseBlock.children.push(elseBlock.semicolon = ";"), ancestor.expressions.splice(index + 1 + blockPrefix.length, 0, ["", elseBlock]), s.children = s.children.filter((a1) => a1 !== s.else), s.else = void 0;
           }
           let block = s.then;
@@ -4129,11 +4207,11 @@ ${js}`
         if (s.negated) {
           if (e != null) {
             let block = blockWithPrefix(blockPrefix, e.block);
-            e.children = e.children.map(($1) => $1 === e.block ? block : $1), e.block = block, updateParentPointers(e);
+            e.children = e.children.map(($2) => $2 === e.block ? block : $2), e.block = block, updateParentPointers(e);
           }
         } else {
           let block = blockWithPrefix(blockPrefix, s.then);
-          s.children = s.children.map(($2) => $2 === s.then ? block : $2), s.then = block, updateParentPointers(s);
+          s.children = s.children.map(($3) => $3 === s.then ? block : $3), s.then = block, updateParentPointers(s);
         }
         break;
       }
@@ -4141,7 +4219,7 @@ ${js}`
         if (!blockPrefix)
           return;
         let { children, block } = s, newBlock = blockWithPrefix(blockPrefix, block);
-        s.children = children.map(($3) => $3 === block ? newBlock : $3), updateParentPointers(s);
+        s.children = children.map(($4) => $4 === block ? newBlock : $4), updateParentPointers(s);
         break;
       }
       case "SwitchStatement": {
@@ -4158,7 +4236,7 @@ ${js}`
           return c === s.condition ? newCondition : c;
         }), s.condition = newCondition, updateParentPointers(s), statementDeclaration) {
           let block = makeEmptyBlock();
-          replaceBlockExpression(s.parent, s, block), block.expressions.push(["", s]), s.children.splice(s.children.findIndex(($4) => $4.token === "switch"), 0, blockPrefix), s.parent = block;
+          replaceBlockExpression(s.parent, s, block), block.expressions.push(["", s]), s.children.splice(s.children.findIndex(($5) => $5.token === "switch"), 0, blockPrefix), s.parent = block;
         } else {
           let block = blockWithPrefix([["", [{
             type: "Declaration",
@@ -4172,17 +4250,17 @@ ${js}`
   }
   function dynamizeFromClause(from) {
     from = from.slice(1), from = trimFirstSpace(from);
-    let ref3;
-    if (ref3 = from[from.length - 1]?.assertion) {
-      let assert4 = ref3, ref4;
-      ref4 = from[from.length - 1], ref4.children = ref4.children.filter((a2) => a2 !== assert4), from.push(", {", assert4.keyword, ":", assert4.object, "}");
+    let ref4;
+    if (ref4 = from[from.length - 1]?.assertion) {
+      let assert2 = ref4, ref5;
+      ref5 = from[from.length - 1], ref5.children = ref5.children.filter((a2) => a2 !== assert2), from.push(", {", assert2.keyword, ":", assert2.object, "}");
     }
     return ["(", ...from, ")"];
   }
   function dynamizeImportDeclaration(decl) {
-    let { imports } = decl, { star, binding, specifiers } = imports, justDefault = binding && !specifiers && !star, ref5;
-    binding ? specifiers ? ref5 = makeRef() : ref5 = binding : ref5 = convertNamedImportsToObject(imports, !0);
-    let pattern = ref5, c = "const", expression = [
+    let { imports } = decl, { star, binding, specifiers } = imports, justDefault = binding && !specifiers && !star, ref6;
+    binding ? specifiers ? ref6 = makeRef() : ref6 = binding : ref6 = convertNamedImportsToObject(imports, !0);
+    let pattern = ref6, c = "const", expression = [
       justDefault ? "(" : void 0,
       { type: "Await", children: ["await"] },
       " ",
@@ -4362,7 +4440,7 @@ ${js}`
         children: args.children.map(
           (arg) => {
             if (typeof arg == "object" && arg != null && "type" in arg && arg.type === "ArrayElement" && "expression" in arg && "children" in arg) {
-              let { type, expression: exp, children } = arg, expression = processUnaryExpression([last], trimFirstSpace(exp));
+              let { expression: exp, children } = arg, expression = processUnaryExpression([last], trimFirstSpace(exp));
               return expression = prepend(getTrimmingSpace(exp), expression), {
                 ...arg,
                 expression,
@@ -4562,10 +4640,10 @@ ${js}`
   }
 
   // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
-  function processRangeExpression(start, ws1, range, end) {
-    ws1 = [ws1, range.children[0]];
-    let ws2 = range.children[1], comma = { $loc: range.$loc, token: "," }, ref;
-    switch (range.increasing) {
+  function processRangeExpression(start, ws1, range2, end) {
+    ws1 = [ws1, range2.children[0]];
+    let ws2 = range2.children[1], comma = { $loc: range2.$loc, token: "," }, ref;
+    switch (range2.increasing) {
       case !0: {
         ref = ($) => $;
         break;
@@ -4577,14 +4655,14 @@ ${js}`
       default:
         ref = Math.abs;
     }
-    let abs = ref, lengthAdjust = 1 - +!range.left.inclusive - +!range.right.inclusive, children;
+    let abs = ref, lengthAdjust = 1 - +!range2.left.inclusive - +!range2.right.inclusive, children;
     if (typeof start == "object" && start != null && "type" in start && start.type === "Literal" && typeof end == "object" && end != null && "type" in end && end.type === "Literal") {
       let startValue = literalValue(start), endValue = literalValue(end);
       if (typeof startValue == "string" && typeof endValue == "string") {
         if (!(startValue.length === 1 && endValue.length === 1))
           throw new Error("String range start and end must be a single character");
         let startCode = startValue.charCodeAt(0), endCode = endValue.charCodeAt(0), step = startCode <= endCode ? 1 : -1, length = abs(endCode - startCode) + lengthAdjust;
-        range.left.inclusive || (startCode += step), length <= 26 ? children = [
+        range2.left.inclusive || (startCode += step), length <= 26 ? children = [
           "[",
           Array.from({ length }, (_2, i) => JSON.stringify(String.fromCharCode(startCode + i * step))).join(", "),
           "]"
@@ -4595,25 +4673,25 @@ ${js}`
           ", ",
           length.toString(),
           ")"
-        ], range.error != null && children.unshift(range.error);
+        ], range2.error != null && children.unshift(range2.error);
       } else if (typeof startValue == "number" && typeof endValue == "number") {
         let step = startValue <= endValue ? 1 : -1, length = abs(endValue - startValue) + lengthAdjust;
-        range.left.inclusive || (startValue += step), length <= 20 && (children = [
+        range2.left.inclusive || (startValue += step), length <= 20 && (children = [
           "[",
           Array.from({ length }, (_2, i) => startValue + i * step).join(", "),
           "]"
-        ], range.error != null && children.unshift(range.error));
+        ], range2.error != null && children.unshift(range2.error));
       }
     }
     if (children == null)
-      if (range.increasing != null) {
-        let sign = range.increasing ? "+" : "-";
+      if (range2.increasing != null) {
+        let sign = range2.increasing ? "+" : "-";
         end = makeLeftHandSideExpression(end), children = [
-          getHelperRef(range.increasing ? "range" : "revRange"),
+          getHelperRef(range2.increasing ? "range" : "revRange"),
           "(",
-          range.left.inclusive ? start : [makeLeftHandSideExpression(start), ` ${sign} 1`],
+          range2.left.inclusive ? start : [makeLeftHandSideExpression(start), ` ${sign} 1`],
           ",",
-          range.right.inclusive ? [makeLeftHandSideExpression(end), ` ${sign} 1`] : end,
+          range2.right.inclusive ? [makeLeftHandSideExpression(end), ` ${sign} 1`] : end,
           ...ws1,
           ")"
         ];
@@ -4622,11 +4700,11 @@ ${js}`
           "((s, e) => s > e ? ",
           getHelperRef("revRange"),
           "(s, e",
-          range.right.inclusive ? " - 1" : void 0,
+          range2.right.inclusive ? " - 1" : void 0,
           ") : ",
           getHelperRef("range"),
           "(s, e",
-          range.right.inclusive ? " + 1" : void 0,
+          range2.right.inclusive ? " + 1" : void 0,
           "))",
           "(",
           start,
@@ -4641,14 +4719,14 @@ ${js}`
       children,
       start,
       end,
-      error: range.error,
-      left: range.left,
-      right: range.right,
-      increasing: range.increasing
+      error: range2.error,
+      left: range2.left,
+      right: range2.right,
+      increasing: range2.increasing
     };
   }
-  function forRange(open, forDeclaration, range, stepExp, close) {
-    let { start, end, left, right, increasing } = range, counterRef = makeRef("i"), infinite = typeof end == "object" && end != null && "type" in end && end.type === "Identifier" && "name" in end && end.name === "Infinity", stepRef, asc;
+  function forRange(open, forDeclaration, range2, stepExp, close) {
+    let { start, end, left, right, increasing } = range2, counterRef = makeRef("i"), infinite = typeof end == "object" && end != null && "type" in end && end.type === "Identifier" && "name" in end && end.name === "Infinity", stepRef, asc;
     stepExp ? (stepExp = trimFirstSpace(stepExp), stepRef = maybeRef(stepExp, "step")) : infinite ? stepExp = stepRef = makeNumericLiteral(1) : increasing != null && (increasing ? (stepExp = stepRef = makeNumericLiteral(1), asc = !0) : (stepExp = stepRef = makeNumericLiteral(-1), asc = !1));
     let ref1;
     if (stepExp?.type === "Literal")
@@ -4704,7 +4782,7 @@ ${js}`
       // This declaration doesn't always appear in the output,
       // but it's still helpful for determining the primary loop variable
       declaration: forDeclaration,
-      children: [range.error, open, declaration, "; ", ...condition, "; ", ...increment, close],
+      children: [range2.error, open, declaration, "; ", ...condition, "; ", ...increment, close],
       blockPrefix
     };
   }
@@ -4749,6 +4827,7 @@ ${js}`
         return declaration = {
           type: "Declaration",
           children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", trimFirstSpace(expRef2), ".length"],
+          decl: "let",
           names: []
         }, { declaration, eachDeclaration, children: [open, declaration, "; ", [counterRef, " < ", lenRef, "; "], counterRef, increment, close], blockPrefix };
       } else
@@ -4762,7 +4841,7 @@ ${js}`
       message: "'own' is only meaningful in for..in loops"
     });
     let { binding } = declaration, pattern = binding?.pattern;
-    if (binding?.typeSuffix || inOf.token === "in" && declaration2 && pattern.type !== "Identifier") {
+    if (pattern?.type === "NamedBindingPattern" && (pattern = pattern.binding), binding?.typeSuffix || inOf.token === "in" && declaration2 && pattern.type !== "Identifier") {
       let itemRef = makeRef(inOf.token === "in" ? "key" : "item");
       blockPrefix.push(["", {
         type: "Declaration",
@@ -4794,11 +4873,13 @@ ${js}`
         hoistDec = {
           type: "Declaration",
           children: ["let ", counterRef, " = 0"],
+          decl: "let",
           names: []
         }, blockPrefix.push(["", {
           type: "Declaration",
           children: [trimFirstSpace(ws2), decl2, " = ", counterRef, "++"],
-          names: decl2.names
+          names: decl2.names,
+          decl: decl2.decl
         }, ";"]);
         break;
       }
@@ -4807,7 +4888,8 @@ ${js}`
         if (expRef2 !== exp && (hoistDec = {
           type: "Declaration",
           children: ["let ", expRef2],
-          names: []
+          names: [],
+          decl: "let"
         }, exp = {
           type: "AssignmentExpression",
           children: [" ", expRef2, " =", exp]
@@ -4815,20 +4897,57 @@ ${js}`
           let hasPropRef = getHelperRef("hasProp");
           blockPrefix.push(["", ["if (!", hasPropRef, "(", trimFirstSpace(expRef2), ", ", trimFirstSpace(pattern), ")) continue"], ";"]);
         }
-        decl2 && blockPrefix.push(["", {
-          type: "Declaration",
-          children: [
-            trimFirstSpace(ws2),
-            decl2,
-            " = ",
-            trimFirstSpace(expRef2),
-            "[",
-            trimFirstSpace(pattern),
-            "]"
-          ],
-          decl: decl2,
-          names: decl2.names
-        }, ";"]);
+        if (decl2) {
+          let trimmedPattern = trimFirstSpace(pattern), expression = makeNode({
+            type: "MemberExpression",
+            children: [
+              trimFirstSpace(expRef2),
+              makeNode({
+                type: "Index",
+                expression: trimmedPattern,
+                children: ["[", trimmedPattern, "]"]
+              })
+            ]
+          });
+          blockPrefix.push([
+            "",
+            (() => {
+              if (decl2.type === "ForDeclaration") {
+                let { binding: binding2, children } = decl2;
+                return binding2.children.push(binding2.initializer = makeNode({
+                  type: "Initializer",
+                  expression,
+                  children: [" = ", expression]
+                })), makeNode({
+                  type: "Declaration",
+                  children: [
+                    trimFirstSpace(ws2),
+                    ...children
+                  ],
+                  bindings: [decl2.binding],
+                  decl: decl2.decl,
+                  names: decl2.names
+                });
+              } else
+                return makeNode({
+                  type: "AssignmentExpression",
+                  children: [
+                    trimFirstSpace(ws2),
+                    decl2,
+                    " = ",
+                    trimFirstSpace(expRef2),
+                    "[",
+                    trimFirstSpace(pattern),
+                    "]"
+                  ],
+                  names: decl2.names,
+                  lhs: decl2,
+                  assigned: decl2
+                });
+            })(),
+            ";"
+          ]);
+        }
         break;
       }
       default:
@@ -5168,7 +5287,7 @@ ${js}`
       }, defaultClause = !1, clauses = cs.map((clause) => {
         let ref1;
         if ((ref1 = clause.binding?.parameter) && typeof ref1 == "object" && "type" in ref1 && ref1.type === "CatchPattern" && "patterns" in ref1) {
-          let { type, patterns } = ref1;
+          let { patterns } = ref1;
           return {
             type: "PatternClause",
             patterns,
@@ -5648,8 +5767,12 @@ ${js}`
   }
   function processBindingPatternLHS(lhs, tail) {
     adjustAtBindings(lhs, !0);
-    let [splices, thisAssignments] = gatherBindingCode(lhs);
-    tail.push(...splices.map((s) => [", ", s]), ...thisAssignments.map((a) => [", ", a]));
+    let [splices, thisAssignments] = gatherBindingCode(lhs), subbindings = gatherSubbindings(lhs);
+    simplifyBindingProperties(lhs), simplifyBindingProperties(subbindings), tail.push(
+      ...splices.map((s) => [", ", s]),
+      ...thisAssignments.map((a) => [", ", a]),
+      ...subbindings
+    );
   }
   function processAssignments(statements) {
     for (let ref7 = gatherRecursiveAll(statements, ($4) => $4.type === "AssignmentExpression" || $4.type === "UpdateExpression"), i5 = 0, len3 = ref7.length; i5 < len3; i5++) {
@@ -5751,7 +5874,7 @@ ${js}`
               message: "Slice range cannot be decreasing in assignment"
             });
             break;
-          } else m3 = lhs.type, (m3 === "ObjectBindingPattern" || m3 === "ArrayBindingPattern") && (processBindingPatternLHS(lhs, tail), gatherRecursiveAll(lhs, ($9) => $9.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare)));
+          } else m3 = lhs.type, (m3 === "ObjectBindingPattern" || m3 === "ArrayBindingPattern" || m3 === "NamedBindingPattern") && (processBindingPatternLHS(lhs, tail), gatherRecursiveAll(lhs, ($9) => $9.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare)));
         }
         i--;
       }
@@ -5847,7 +5970,7 @@ ${js}`
       for (; suffixIndex >= 0; ) {
         let suffix = unary.suffix[suffixIndex];
         if (typeof suffix == "object" && suffix != null && "token" in suffix && suffix.token === "?") {
-          let { token } = suffix, count = 0, m4;
+          let {} = suffix, count = 0, m4;
           for (; m4 = unary.suffix[suffixIndex], typeof m4 == "object" && m4 != null && "token" in m4 && m4.token === "?"; )
             unary.suffix.splice(suffixIndex--, 1), count++;
           let m5;
@@ -5894,7 +6017,7 @@ ${js}`
             children: [prefix, replace, outer]
           })), results2.push(replaceNode(unary, replace, parent));
         } else if (typeof suffix == "object" && suffix != null && "type" in suffix && suffix.type === "NonNullAssertion") {
-          let { type } = suffix, m6;
+          let {} = suffix, m6;
           for (; m6 = unary.suffix[suffixIndex], typeof m6 == "object" && m6 != null && "type" in m6 && m6.type === "NonNullAssertion"; )
             unary.suffix.splice(suffixIndex--, 1);
           let m7;
@@ -6160,24 +6283,9 @@ ${js}`
       (classExp.name && classExp.parent === topBlock || (m8 = classExp.parent, typeof m8 == "object" && m8 != null && "type" in m8 && m8.type === "ReturnStatement" && "parent" in m8 && m8.parent === topBlock)) && (classExp.children.unshift(classExp.name, "="), root.expressions.splice(i++, 0, ["", `var ${classExp.name}`, ";"]));
     }
   }
-  function populateRefs(statements) {
-    let refNodes = gatherRecursive(statements, ($21) => $21.type === "Ref");
-    if (refNodes.length) {
-      let ids = gatherRecursive(statements, (s) => s.type === "Identifier"), names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
-      refNodes.forEach((ref) => {
-        let { type, base } = ref;
-        if (type !== "Ref") return;
-        ref.type = "Identifier";
-        let n = 0, name = base;
-        for (; names.has(name); )
-          n++, name = `${base}${n}`;
-        return names.add(name), ref.children = ref.names = [name];
-      });
-    }
-  }
   function processPlaceholders(statements) {
     let placeholderMap = /* @__PURE__ */ new Map(), liftedIfs = /* @__PURE__ */ new Set();
-    for (let ref25 = gatherRecursiveAll(statements, ($22) => $22.type === "Placeholder"), i17 = 0, len14 = ref25.length; i17 < len14; i17++) {
+    for (let ref25 = gatherRecursiveAll(statements, ($21) => $21.type === "Placeholder"), i17 = 0, len14 = ref25.length; i17 < len14; i17++) {
       let exp = ref25[i17], ancestor;
       if (exp.subtype === ".") {
         ({ ancestor } = findAncestor(
@@ -6525,6 +6633,7 @@ ${js}`
     NWBindingIdentifier,
     AtIdentifierRef,
     PinPattern,
+    NamedBindingPattern,
     BindingPattern,
     ObjectBindingPattern,
     ObjectBindingPatternContent,
@@ -8370,7 +8479,7 @@ ${js}`
       children: $0,
       expression
     };
-  }), LeftHandSideExpression$1 = CallExpression, LeftHandSideExpression$$ = [LeftHandSideExpression$0, LeftHandSideExpression$1];
+  }), LeftHandSideExpression$1 = NamedBindingPattern, LeftHandSideExpression$2 = CallExpression, LeftHandSideExpression$$ = [LeftHandSideExpression$0, LeftHandSideExpression$1, LeftHandSideExpression$2];
   function LeftHandSideExpression(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "LeftHandSideExpression", LeftHandSideExpression$$);
   }
@@ -8827,7 +8936,7 @@ ${js}`
   function FunctionRestParameter(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "FunctionRestParameter", FunctionRestParameter$0);
   }
-  var ParameterElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)(_), (0, import_lib2.$C)(NWBindingIdentifier, BindingPattern), (0, import_lib2.$E)(TypeSuffix), (0, import_lib2.$E)(Initializer), ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var ParameterElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$E)(AccessModifier), (0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingPattern, NWBindingIdentifier), (0, import_lib2.$E)(TypeSuffix), (0, import_lib2.$E)(Initializer), ParameterElementDelimiter), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
     var accessModifier = $2, binding = $4, typeSuffix = $5, initializer = $6, delim = $7;
     return typeSuffix ??= binding.typeSuffix, {
       type: "Parameter",
@@ -8920,7 +9029,22 @@ ${js}`
   function PinPattern(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "PinPattern", PinPattern$$);
   }
-  var BindingPattern$0 = ObjectBindingPattern, BindingPattern$1 = ArrayBindingPattern, BindingPattern$2 = PinPattern, BindingPattern$3 = Literal, BindingPattern$4 = RegularExpressionLiteral, BindingPattern$$ = [BindingPattern$0, BindingPattern$1, BindingPattern$2, BindingPattern$3, BindingPattern$4];
+  var NamedBindingPattern$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(BindingIdentifier, Caret, (0, import_lib2.$E)(_), BindingPattern), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var binding = $1, ws = $3, pattern = $4;
+    return pattern = prepend(ws, pattern), {
+      type: "NamedBindingPattern",
+      // NOTE: children just has binding, not pattern, for easy destructuring
+      children: [binding],
+      binding,
+      pattern,
+      subbinding: [pattern, " = ", binding],
+      typeSuffix: pattern.typeSuffix
+    };
+  });
+  function NamedBindingPattern(ctx, state2) {
+    return (0, import_lib2.$EVENT)(ctx, state2, "NamedBindingPattern", NamedBindingPattern$0);
+  }
+  var BindingPattern$0 = ObjectBindingPattern, BindingPattern$1 = ArrayBindingPattern, BindingPattern$2 = PinPattern, BindingPattern$3 = Literal, BindingPattern$4 = RegularExpressionLiteral, BindingPattern$5 = NamedBindingPattern, BindingPattern$$ = [BindingPattern$0, BindingPattern$1, BindingPattern$2, BindingPattern$3, BindingPattern$4, BindingPattern$5];
   function BindingPattern(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "BindingPattern", BindingPattern$$);
   }
@@ -9016,8 +9140,21 @@ ${js}`
   function NestedBindingPropertyList(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "NestedBindingPropertyList", NestedBindingPropertyList$0);
   }
-  var BindingProperty$0 = BindingRestProperty, BindingProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), PropertyName, (0, import_lib2.$E)(Caret), (0, import_lib2.$E)(_), Colon, (0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingIdentifier, BindingPattern), (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var BindingProperty$0 = BindingRestProperty, BindingProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), PropertyName, (0, import_lib2.$E)(Caret), (0, import_lib2.$E)(_), Colon, (0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingPattern, BindingIdentifier), (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
     var ws1 = $1, name = $2, bind = $3, ws2 = $4, colon = $5, ws3 = $6, value = $7, typeSuffix = $8, initializer = $9;
+    if (bind) {
+      let binding = name, pattern = value;
+      value = {
+        type: "NamedBindingPattern",
+        // NOTE: children just has binding, not pattern, for easy destructuring
+        children: [binding],
+        binding,
+        pattern,
+        subbinding: [pattern, " = ", binding],
+        typeSuffix: pattern.typeSuffix,
+        names: value.names
+      };
+    }
     return {
       type: "BindingProperty",
       children: [ws1, name, ws2, colon, ws3, value, initializer],
@@ -9026,8 +9163,7 @@ ${js}`
       value,
       typeSuffix,
       initializer,
-      names: value.names,
-      bind: !!bind
+      names: value.names
     };
   }), BindingProperty$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), Caret, BindingIdentifier, (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
     var ws = $1, pin = $2, binding = $3, typeSuffix = $4, initializer = $5;
@@ -9070,8 +9206,7 @@ ${js}`
       typeSuffix,
       initializer,
       names: binding.names,
-      identifier: binding,
-      bind: !!bind
+      identifier: binding
     };
   }), BindingProperty$$ = [BindingProperty$0, BindingProperty$1, BindingProperty$2, BindingProperty$3];
   function BindingProperty(ctx, state2) {
@@ -9117,7 +9252,7 @@ ${js}`
   function NestedBindingElements(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "NestedBindingElements", NestedBindingElements$0);
   }
-  var BindingElement$0 = BindingRestElement, BindingElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingIdentifier, BindingPattern), (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var BindingElement$0 = BindingRestElement, BindingElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingPattern, BindingIdentifier), (0, import_lib2.$E)(BindingTypeSuffix), (0, import_lib2.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
     var ws = $1, binding = $2, typeSuffix = $3, initializer = $4;
     return {
       type: "BindingElement",
@@ -9137,7 +9272,7 @@ ${js}`
   function BindingElement(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "BindingElement", BindingElement$$);
   }
-  var BindingRestElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, (0, import_lib2.$C)(BindingIdentifier, BindingPattern, EmptyBindingPattern), (0, import_lib2.$E)(BindingTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var BindingRestElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), DotDotDot, (0, import_lib2.$C)(BindingPattern, BindingIdentifier, EmptyBindingPattern), (0, import_lib2.$E)(BindingTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4) {
     var ws = $1, dots = $2, binding = $3, typeSuffix = $4;
     return {
       type: "BindingRestElement",
@@ -9149,7 +9284,7 @@ ${js}`
       names: binding.names,
       rest: !0
     };
-  }), BindingRestElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingIdentifier, BindingPattern), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
+  }), BindingRestElement$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$E)(_), (0, import_lib2.$C)(BindingPattern, BindingIdentifier), DotDotDot), function($skip, $loc, $0, $1, $2, $3) {
     var ws = $1, binding = $2, dots = $3;
     return {
       type: "BindingRestElement",
@@ -9933,8 +10068,8 @@ ${js}`
     return (0, import_lib2.$EVENT)(ctx, state2, "RangeEnd", RangeEnd$0);
   }
   var RangeExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Expression, __, RangeDots, Expression), function($skip, $loc, $0, $1, $2, $3, $4) {
-    var start = $1, ws = $2, range = $3, end = $4;
-    return processRangeExpression(start, ws, range, end);
+    var start = $1, ws = $2, range2 = $3, end = $4;
+    return processRangeExpression(start, ws, range2, end);
   }), RangeExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(Expression, __, DotDot, (0, import_lib2.$Y)((0, import_lib2.$S)(__, CloseBracket))), function($skip, $loc, $0, $1, $2, $3, $4) {
     var s = $1, ws = $2;
     return {
@@ -11547,10 +11682,10 @@ ${js}`
     };
   }), ForDeclaration$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(InsertConst, (0, import_lib2.$N)(ActualMemberExpression), ForBinding), function($skip, $loc, $0, $1, $2, $3) {
     var c = $1, binding = $3;
-    return {
+    return gatherRecursive(binding, ($) => $.type === "PinPattern").length ? $skip : {
       type: "ForDeclaration",
       children: [c, binding],
-      decl: c.token,
+      decl: c.token.trimEnd(),
       binding,
       names: binding.names
     };
@@ -11691,12 +11826,16 @@ ${js}`
   function PatternExpressionList(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "PatternExpressionList", PatternExpressionList$0);
   }
-  var PatternExpression$0 = BindingPattern, PatternExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(ForbidIndentedApplication, (0, import_lib2.$E)((0, import_lib2.$P)(SingleLineBinaryOpRHS)), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
-    var pattern = $2;
-    return pattern ? {
+  var PatternExpression$0 = BindingPattern, PatternExpression$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(ForbidIndentedApplication, (0, import_lib2.$E)((0, import_lib2.$S)((0, import_lib2.$E)((0, import_lib2.$S)(BindingIdentifier, (0, import_lib2.$E)(Caret))), (0, import_lib2.$P)(SingleLineBinaryOpRHS))), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
+    var body = $2;
+    if (!body) return $skip;
+    let [named, rhs] = body, binding;
+    return named && ([binding] = named), {
       type: "ConditionFragment",
-      children: pattern
-    } : $skip;
+      children: [binding, rhs],
+      binding,
+      rhs
+    };
   }), PatternExpression$$ = [PatternExpression$0, PatternExpression$1];
   function PatternExpression(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "PatternExpression", PatternExpression$$);
@@ -11779,15 +11918,7 @@ ${js}`
   function FinallyClause(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "FinallyClause", FinallyClause$0);
   }
-  var CatchParameter$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(BindingIdentifier, (0, import_lib2.$E)(TypeSuffix)), function($skip, $loc, $0, $1, $2) {
-    var binding = $1, typeSuffix = $2;
-    return {
-      type: "CatchParameter",
-      binding,
-      typeSuffix,
-      children: $0
-    };
-  }), CatchParameter$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)(ObjectBindingPattern, ArrayBindingPattern), TypeSuffix), function($skip, $loc, $0, $1, $2) {
+  var CatchParameter$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$C)(ObjectBindingPattern, ArrayBindingPattern), TypeSuffix), function($skip, $loc, $0, $1, $2) {
     var binding = $1, typeSuffix = $2;
     return {
       type: "CatchParameter",
@@ -11795,12 +11926,20 @@ ${js}`
       typeSuffix,
       children: [binding, typeSuffix]
     };
-  }), CatchParameter$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PatternExpressionList), function($skip, $loc, $0, $1) {
+  }), CatchParameter$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PatternExpressionList), function($skip, $loc, $0, $1) {
     return {
       type: "CatchPattern",
       children: $0,
       patterns: $1
     };
+  }), CatchParameter$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(BindingIdentifier, (0, import_lib2.$E)(TypeSuffix)), function($skip, $loc, $0, $1, $2) {
+    var binding = $1, typeSuffix = $2;
+    return {
+      type: "CatchParameter",
+      binding,
+      typeSuffix,
+      children: $0
+    };
   }), CatchParameter$$ = [CatchParameter$0, CatchParameter$1, CatchParameter$2];
   function CatchParameter(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "CatchParameter", CatchParameter$$);
@@ -13123,7 +13262,7 @@ ${js}`
   function By(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "By", By$0);
   }
-  var Caret$0 = (0, import_lib2.$TV)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'), function($skip, $loc, $0, $1) {
+  var Caret$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'), (0, import_lib2.$N)((0, import_lib2.$EXPECT)($L22, 'Caret "^"'))), function($skip, $loc, $0, $1, $2) {
     return { $loc, token: $1 };
   });
   function Caret(ctx, state2) {