@danielx/civet 0.9.4 → 0.9.5

package/dist/main.js

@@ -1650,6 +1650,15 @@ function gatherRecursiveAll(node, predicate) {
 }
 
 // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\ref.civet.jsx
+var range = (start, end) => {
+  const length = end - start;
+  if (length <= 0) return [];
+  const 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",
@@ -1662,7 +1671,7 @@ function needsRef(expression, base = "ref") {
     return;
   }
   if (Array.isArray(expression)) {
-    const nonempty = ((s) => Array.from({ length: expression.length - s }, (_2, i) => s + i))(0).filter((i) => !isWhitespaceOrEmpty(expression[i]));
+    const nonempty = range(0, expression.length).filter((i) => !isWhitespaceOrEmpty(expression[i]));
     if (nonempty.length === 1) {
       let ref1;
       if (ref1 = needsRef(expression[nonempty[0]], base)) {
@@ -1678,8 +1687,9 @@ function needsRef(expression, base = "ref") {
     case "Ref":
     case "Identifier":
     case "Literal":
-    case "Placeholder":
+    case "Placeholder": {
       return;
+    }
   }
   return makeRef(base);
 }
@@ -1709,10 +1719,34 @@ function maybeRefAssignment(exp, base = "ref") {
     return { ref, ...makeRefAssignment(ref, exp) };
   }
 }
+function populateRefs(statements) {
+  const refNodes = gatherRecursive(statements, ($) => $.type === "Ref");
+  if (!refNodes.length) {
+    return;
+  }
+  const ids = gatherRecursive(statements, ($1) => $1.type === "Identifier");
+  const names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
+  for (let i1 = 0, len3 = refNodes.length; i1 < len3; i1++) {
+    const ref = refNodes[i1];
+    if (!(ref.type === "Ref")) {
+      continue;
+    }
+    const { base } = ref;
+    ref.type = "Identifier";
+    let n = 0;
+    let name = base;
+    while (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 = false) {
-  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++) {
     const binding = ref1[i1];
     const { ref } = binding;
     if (asThis) {
@@ -1730,7 +1764,7 @@ function adjustAtBindings(statements, asThis = false) {
   }
 }
 function adjustBindingElements(elements) {
-  const names = elements.flatMap(($1) => $1.names || []);
+  const names = elements.flatMap(($2) => $2.names || []);
   const { length } = elements;
   let blockPrefix, restIndex = -1, restCount = 0;
   for (let i2 = 0, len1 = elements.length; i2 < len1; i2++) {
@@ -1788,16 +1822,40 @@ function adjustBindingElements(elements) {
     length
   };
 }
+function gatherSubbindings(node, subbindings = []) {
+  for (let ref2 = gatherRecursiveAll(node, ($) => $.subbinding != null), i3 = 0, len22 = ref2.length; i3 < len22; i3++) {
+    const p = ref2[i3];
+    const { subbinding } = p;
+    subbindings.push(", ", subbinding);
+    gatherSubbindings(subbinding, subbindings);
+  }
+  return subbindings;
+}
+function simplifyBindingProperties(node) {
+  const results = [];
+  for (let ref3 = gatherRecursiveAll(node, ($3) => $3.type === "BindingProperty"), i4 = 0, len3 = ref3.length; i4 < len3; i4++) {
+    const p = ref3[i4];
+    const { name, value } = p;
+    if (value?.type === "NamedBindingPattern" && value.binding === name) {
+      const [ws] = p.children;
+      results.push(p.children = [ws, name, p.delim]);
+    } else {
+      results.push(void 0);
+    }
+  }
+  ;
+  return results;
+}
 function gatherBindingCode(statements, opts) {
   const thisAssignments = [];
   const 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") {
         const { ref } = n;
         const { id } = ref;
@@ -1806,7 +1864,7 @@ function gatherBindingCode(statements, opts) {
       }
       if (opts?.assignPins) {
         if (n.type === "PinProperty") {
-          n.children = n.children.flatMap(($2) => $2 === n.name ? [n.name, ": ", n.value] : $2);
+          n.children = n.children.flatMap(($4) => $4 === n.name ? [n.name, ": ", n.value] : $4);
           updateParentPointers(n);
           n = n.value;
         }
@@ -1828,8 +1886,8 @@ function gatherBindingCode(statements, opts) {
         }
       }
       if (opts?.injectParamProps && n.type === "Parameter" && n.accessModifier) {
-        for (let ref3 = n.names, i4 = 0, len3 = ref3.length; i4 < len3; i4++) {
-          const id = ref3[i4];
+        for (let ref5 = n.names, i6 = 0, len5 = ref5.length; i6 < len5; i6++) {
+          const id = ref5[i6];
           thisAssignments2.push({
             type: "AssignmentExpression",
             children: [`this.${id} = `, id],
@@ -1847,8 +1905,8 @@ function gatherBindingCode(statements, opts) {
   return [splices, thisAssignments];
 }
 function arrayElementHasTrailingComma(elementNode) {
-  let ref4;
-  const lastChild = (ref4 = elementNode.children)[ref4.length - 1];
+  let ref6;
+  const lastChild = (ref6 = elementNode.children)[ref6.length - 1];
   return lastChild && lastChild[lastChild.length - 1]?.token === ",";
 }
 function gatherBindingPatternTypeSuffix(pattern) {
@@ -1859,9 +1917,9 @@ function gatherBindingPatternTypeSuffix(pattern) {
   switch (pattern.type) {
     case "ArrayBindingPattern": {
       {
-        const results = [];
-        for (let ref5 = pattern.elements, i5 = 0, len4 = ref5.length; i5 < len4; i5++) {
-          const elem = ref5[i5];
+        const results1 = [];
+        for (let ref7 = pattern.elements, i7 = 0, len6 = ref7.length; i7 < len6; i7++) {
+          const elem = ref7[i7];
           let { typeSuffix } = elem;
           typeSuffix ??= elem.binding?.typeSuffix;
           if (typeSuffix) {
@@ -1878,10 +1936,10 @@ function gatherBindingPatternTypeSuffix(pattern) {
           } else {
             typeElement[0] ??= "unknown";
           }
-          results.push(typeElement);
+          results1.push(typeElement);
         }
         ;
-        const types = results;
+        const types = results1;
         if (count) {
           const t = [": [", types, "]"];
           pattern.typeSuffix = {
@@ -1898,9 +1956,9 @@ function gatherBindingPatternTypeSuffix(pattern) {
     case "ObjectBindingPattern": {
       {
         let restType;
-        const results1 = [];
-        for (let ref6 = pattern.properties, i6 = 0, len5 = ref6.length; i6 < len5; i6++) {
-          const prop = ref6[i6];
+        const results2 = [];
+        for (let ref8 = pattern.properties, i8 = 0, len7 = ref8.length; i8 < len7; i8++) {
+          const prop = ref8[i8];
           let { typeSuffix } = prop;
           typeSuffix ??= prop.value?.typeSuffix;
           if (typeSuffix) {
@@ -1914,12 +1972,12 @@ function gatherBindingPatternTypeSuffix(pattern) {
           switch (prop.type) {
             case "BindingProperty": {
               const 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": {
               const 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": {
@@ -1929,7 +1987,7 @@ function gatherBindingPatternTypeSuffix(pattern) {
           }
         }
         ;
-        const types = results1;
+        const types = results2;
         if (count) {
           const t = ["{", types, "}"];
           if (restType != null) {
@@ -3657,7 +3715,8 @@ function processParams(f) {
     parameters.names.push(...rest.names || []);
     rest.children.pop();
     if (after.length) {
-      if (rest.binding.type === "ArrayBindingPattern" || rest.binding.type === "ObjectBindingPattern") {
+      let m4;
+      if (m4 = rest.binding.type, m4 === "ArrayBindingPattern" || m4 === "ObjectBindingPattern" || m4 === "NamedBindingPattern") {
         parameters.parameters.push({
           type: "Error",
           message: "Non-end rest parameter cannot be binding pattern"
@@ -3789,6 +3848,9 @@ function processParams(f) {
     injectParamProps: isConstructor,
     assignPins: true
   });
+  const subbindings = gatherSubbindings(parameters.parameters);
+  simplifyBindingProperties(parameters.parameters);
+  simplifyBindingProperties(subbindings);
   if (isConstructor) {
     const { ancestor } = findAncestor(f, ($10) => $10.type === "ClassExpression");
     if (ancestor != null) {
@@ -3796,8 +3858,8 @@ function processParams(f) {
       const classExpressions = ancestor.body.expressions;
       let index2 = findChildIndex(classExpressions, f);
       assert.notEqual(index2, -1, "Could not find constructor in class");
-      let m4;
-      while (m4 = classExpressions[index2 - 1]?.[1], typeof m4 === "object" && m4 != null && "type" in m4 && m4.type === "MethodDefinition" && "name" in m4 && m4.name === "constructor") {
+      let m5;
+      while (m5 = classExpressions[index2 - 1]?.[1], typeof m5 === "object" && m5 != null && "type" in m5 && m5.type === "MethodDefinition" && "name" in m5 && m5.name === "constructor") {
         index2--;
       }
       const fStatement = classExpressions[index2];
@@ -3837,6 +3899,15 @@ function processParams(f) {
     children: [";"]
   };
   let prefix = [];
+  if (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++) {
     const binding = ref20[i11];
     assert.equal(binding.type, "PostRestBindingElements", "splice should be of type Binding");
@@ -3890,7 +3961,7 @@ function processSignature(f) {
       f.async.push("async ");
       signature.modifier.async = true;
     } 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++) {
         const a = ref21[i12];
         const i = findChildIndex(a.parent, a);
         a.parent.children.splice(i + 1, 0, {
@@ -3905,9 +3976,9 @@ function processSignature(f) {
       f.generator.push("*");
       signature.modifier.generator = true;
     } else {
-      for (let ref22 = gatherRecursiveWithinFunction(block, ($17) => $17.type === "YieldExpression"), i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
+      for (let ref22 = gatherRecursiveWithinFunction(block, ($18) => $18.type === "YieldExpression"), i13 = 0, len12 = ref22.length; i13 < len12; i13++) {
         const y = ref22[i13];
-        const i = y.children.findIndex(($18) => $18.type === "Yield");
+        const 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}`
@@ -3920,7 +3991,7 @@ function processSignature(f) {
   }
 }
 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++) {
     const f = ref23[i14];
     if (f.type === "FunctionExpression" || f.type === "MethodDefinition") {
       implicitFunctionBlock(f);
@@ -3990,7 +4061,7 @@ function expressionizeIteration(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++) {
     const s = ref25[i15];
     expressionizeIteration(s);
   }
@@ -4040,12 +4111,12 @@ function processCoffeeDo(ws, expression) {
     const 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 {
@@ -4067,7 +4138,7 @@ function makeAmpersandFunction(rhs) {
     ref = makeRef("$");
     inplacePrepend(ref, body);
   }
-  if (startsWithPredicate(body, ($23) => $23.type === "ObjectExpression")) {
+  if (startsWithPredicate(body, ($24) => $24.type === "ObjectExpression")) {
     body = makeLeftHandSideExpression(body);
   }
   const parameterList = [
@@ -4863,17 +4934,15 @@ function getPatternConditions(pattern, ref, conditions = []) {
       break;
     }
     case "ConditionFragment": {
-      let { children } = pattern;
-      if (children.length) {
-        let [first, ...rest] = children;
+      let { rhs } = pattern;
+      if (rhs.length) {
+        let [first, ...rest] = rhs;
         let [ws, ...op] = first;
         ws = [" "].concat(ws);
         first = [ws, ...op];
-        children = [first, ...rest];
+        rhs = [first, ...rest];
       }
-      conditions.push(
-        processBinaryOpExpression([ref, children])
-      );
+      conditions.push(processBinaryOpExpression([ref, rhs]));
       break;
     }
     case "RegularExpressionLiteral": {
@@ -4891,6 +4960,10 @@ function getPatternConditions(pattern, ref, conditions = []) {
       ]);
       break;
     }
+    case "NamedBindingPattern": {
+      getPatternConditions(pattern.pattern, ref, conditions);
+      break;
+    }
     case "Literal": {
       conditions.push([
         ref,
@@ -4920,43 +4993,60 @@ function getPatternBlockPrefix(pattern, ref, decl = "const ", typeSuffix) {
     }
     case "Literal":
     case "RegularExpressionLiteral":
-    case "PinPattern":
-    case "ConditionFragment": {
+    case "PinPattern": {
       return;
     }
+    case "ConditionFragment": {
+      if (!pattern.binding) {
+        return;
+      }
+      ;
+      break;
+    }
   }
   let [splices, thisAssignments] = gatherBindingCode(pattern);
   const patternBindings2 = nonMatcherBindings(pattern);
-  const results = [];
-  for (let ref2 = gatherRecursiveAll(patternBindings2, ($7) => $7.subbinding != null), i5 = 0, len4 = ref2.length; i5 < len4; i5++) {
-    const p = ref2[i5];
-    results.push(prepend(", ", p.subbinding));
-  }
-  ;
-  const subbindings = results;
-  splices = splices.map((s) => [", ", nonMatcherBindings(s)]);
-  thisAssignments = thisAssignments.map(($8) => ["", $8, ";"]);
-  const duplicateDeclarations = aggregateDuplicateBindings([patternBindings2, splices]);
-  return [
-    ["", {
+  const subbindings = gatherSubbindings(patternBindings2);
+  simplifyBindingProperties(patternBindings2);
+  simplifyBindingProperties(subbindings);
+  splices = splices.flatMap((s) => [", ", nonMatcherBindings(s)]);
+  thisAssignments = thisAssignments.map(($7) => ["", $7, ";"]);
+  const duplicateDeclarations = aggregateDuplicateBindings([patternBindings2, splices, subbindings]);
+  const blockPrefix = [];
+  if (ref || subbindings.length || splices.length) {
+    const children = [decl];
+    if (ref) {
+      children.push(patternBindings2, typeSuffix, " = ", ref);
+    }
+    children.push(...subbindings);
+    children.push(...splices);
+    if (!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, ";"])
-  ];
+    }, ";"]);
+  }
+  blockPrefix.push(...thisAssignments);
+  blockPrefix.push(...duplicateDeclarations.map(($8) => ["", $8, ";"]));
+  if (!blockPrefix.length) {
+    return;
+  }
+  return blockPrefix;
 }
 function elideMatchersFromArrayBindings(elements) {
-  const results1 = [];
-  for (let i6 = 0, len5 = elements.length; i6 < len5; i6++) {
-    const element = elements[i6];
+  const results = [];
+  for (let i5 = 0, len4 = elements.length; i5 < len4; i5++) {
+    const element = elements[i5];
     switch (element.type) {
       case "BindingRestElement":
       case "ElisionElement": {
-        results1.push(element);
+        results.push(element);
         break;
       }
       case "BindingElement": {
@@ -4965,12 +5055,12 @@ function elideMatchersFromArrayBindings(elements) {
           case "RegularExpressionLiteral":
           case "StringLiteral":
           case "PinPattern": {
-            results1.push(element.delim);
+            results.push(element.delim);
             break;
           }
           default: {
             const binding = nonMatcherBindings(element.binding);
-            results1.push(makeNode({
+            results.push(makeNode({
               ...element,
               binding,
               children: element.children.map((c) => {
@@ -4985,29 +5075,23 @@ function elideMatchersFromArrayBindings(elements) {
     }
   }
   ;
-  return results1;
+  return results;
 }
 function elideMatchersFromPropertyBindings(properties) {
-  const results2 = [];
-  for (let i7 = 0, len6 = properties.length; i7 < len6; i7++) {
-    const p = properties[i7];
+  const results1 = [];
+  for (let i6 = 0, len5 = properties.length; i6 < len5; i6++) {
+    const p = properties[i6];
     switch (p.type) {
       case "BindingProperty":
       case "PinProperty": {
-        const { children, name, value, bind } = p;
+        const { children, name, value } = p;
         const [ws] = children;
         const shouldElide = name.type === "NumericLiteral" && !value?.name || name.type === "ComputedPropertyName" && value?.subtype === "NumericLiteral";
         if (shouldElide) {
-          if (bind) {
-            results2.push({
-              type: "Error",
-              message: `Cannot bind ${name.type}`
-            });
-          } else {
-            continue;
-          }
+          continue;
         } else {
           let contents;
+          let m1;
           switch (value?.type) {
             case "ArrayBindingPattern":
             case "ObjectBindingPattern": {
@@ -5024,22 +5108,28 @@ function elideMatchersFromPropertyBindings(properties) {
               contents = p;
               break;
             }
+            case "NamedBindingPattern": {
+              const bindings = nonMatcherBindings(value.pattern);
+              contents = {
+                ...p,
+                subbinding: (m1 = bindings?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern" || m1 === "Identifier") ? [
+                  bindings,
+                  " = ",
+                  name
+                ] : void 0
+              };
+              if (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;
           }
@@ -5048,14 +5138,15 @@ function elideMatchersFromPropertyBindings(properties) {
         break;
       }
       default: {
-        results2.push(p);
+        results1.push(p);
       }
     }
   }
   ;
-  return results2;
+  return results1;
 }
 function nonMatcherBindings(pattern) {
+  let m2;
   switch (pattern.type) {
     case "ArrayBindingPattern":
     case "PostRestBindingElements": {
@@ -5063,7 +5154,7 @@ function nonMatcherBindings(pattern) {
       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": {
@@ -5071,9 +5162,19 @@ function nonMatcherBindings(pattern) {
       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": {
+      const 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;
     }
@@ -5089,11 +5190,11 @@ function aggregateDuplicateBindings(bindings) {
   );
   const declarations = [];
   const propsGroupedByName = /* @__PURE__ */ new Map();
-  for (let i8 = 0, len7 = props.length; i8 < len7; i8++) {
-    const p = props[i8];
+  for (let i7 = 0, len6 = props.length; i7 < len6; i7++) {
+    const p = props[i7];
     const { name, value } = p;
-    let m1;
-    if (m1 = value?.type, m1 === "ArrayBindingPattern" || m1 === "ObjectBindingPattern") {
+    let m3;
+    if (m3 = value?.type, m3 === "ArrayBindingPattern" || m3 === "ObjectBindingPattern") {
       continue;
     }
     const key = value?.name || name?.name || name;
@@ -5115,8 +5216,8 @@ function aggregateDuplicateBindings(bindings) {
       pos: 0,
       input: key
     })) {
-      for (let i9 = 0, len8 = shared.length; i9 < len8; i9++) {
-        const p = shared[i9];
+      for (let i8 = 0, len7 = shared.length; i8 < len7; i8++) {
+        const p = shared[i8];
         aliasBinding(p, makeRef(`_${key}`, key));
       }
       return;
@@ -5208,8 +5309,18 @@ function processDeclarations(statements) {
     if (!(bindings != null)) {
       continue;
     }
-    for (let i2 = 0, len22 = bindings.length; i2 < len22; i2++) {
-      const binding = bindings[i2];
+    for (let i2 = bindings.length + -1; i2 >= 0; --i2) {
+      const i = i2;
+      const binding = bindings[i];
+      const subbindings = gatherSubbindings(binding);
+      if (subbindings.length) {
+        simplifyBindingProperties(binding);
+        simplifyBindingProperties(subbindings);
+        spliceChild(declaration, binding, 1, binding, subbindings);
+      }
+    }
+    for (let i3 = 0, len22 = bindings.length; i3 < len22; i3++) {
+      const binding = bindings[i3];
       let { typeSuffix, initializer } = binding;
       if (typeSuffix && typeSuffix.optional) {
         if (initializer && !typeSuffix.t) {
@@ -5247,6 +5358,25 @@ function processDeclarations(statements) {
       }
     }
   }
+  for (let ref2 = gatherRecursiveAll(statements, ($1) => $1.type === "ForStatement"), i4 = 0, len3 = ref2.length; i4 < len3; i4++) {
+    const statement = ref2[i4];
+    const { declaration } = statement;
+    if (!(declaration?.type === "ForDeclaration")) {
+      continue;
+    }
+    const { binding } = declaration;
+    const blockPrefix = getPatternBlockPrefix(
+      binding.pattern,
+      void 0,
+      append(declaration.decl, " "),
+      binding.typeSuffix
+    );
+    simplifyBindingProperties(binding);
+    if (blockPrefix != null) {
+      statement.block.expressions.unshift(...blockPrefix);
+      braceBlock(statement.block);
+    }
+  }
 }
 function prependStatementExpressionBlock(initializer, statement) {
   let { expression: exp } = initializer;
@@ -5390,8 +5520,7 @@ function processDeclarationConditionStatement(s) {
   }
   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]) {
-    const { type: type1, children: [[], { type: type2, expression: expression2 }] } = expression;
-    const type = [type1, type2];
+    const { children: [[], { expression: expression2 }] } = expression;
     expression = expression2;
   }
   processDeclarationCondition(expression, condition.expression, s);
@@ -5416,8 +5545,8 @@ function processDeclarationConditionStatement(s) {
         ({ children } = condition.expression.children[1]);
       }
       children.unshift("(");
-      for (let i3 = 0, len3 = conditions.length; i3 < len3; i3++) {
-        const c = conditions[i3];
+      for (let i5 = 0, len4 = conditions.length; i5 < len4; i5++) {
+        const c = conditions[i5];
         children.push(" && ", c);
       }
       children.push(")");
@@ -5439,11 +5568,11 @@ function processDeclarationConditionStatement(s) {
     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) {
-          const elseBlock = ref2;
+        if (ref3 = s.else?.block) {
+          const elseBlock = ref3;
           if (elseBlock.bare && !elseBlock.semicolon) {
             elseBlock.children.push(elseBlock.semicolon = ";");
           }
@@ -5467,13 +5596,13 @@ function processDeclarationConditionStatement(s) {
       if (s.negated) {
         if (e != null) {
           const block = blockWithPrefix(blockPrefix, e.block);
-          e.children = e.children.map(($1) => $1 === e.block ? block : $1);
+          e.children = e.children.map(($2) => $2 === e.block ? block : $2);
           e.block = block;
           updateParentPointers(e);
         }
       } else {
         const block = blockWithPrefix(blockPrefix, s.then);
-        s.children = s.children.map(($2) => $2 === s.then ? block : $2);
+        s.children = s.children.map(($3) => $3 === s.then ? block : $3);
         s.then = block;
         updateParentPointers(s);
       }
@@ -5486,7 +5615,7 @@ function processDeclarationConditionStatement(s) {
       }
       const { children, block } = s;
       const newBlock = blockWithPrefix(blockPrefix, block);
-      s.children = children.map(($3) => $3 === block ? newBlock : $3);
+      s.children = children.map(($4) => $4 === block ? newBlock : $4);
       updateParentPointers(s);
       break;
     }
@@ -5514,7 +5643,7 @@ function processDeclarationConditionStatement(s) {
         const block = makeEmptyBlock();
         replaceBlockExpression(s.parent, s, block);
         block.expressions.push(["", s]);
-        s.children.splice(s.children.findIndex(($4) => $4.token === "switch"), 0, blockPrefix);
+        s.children.splice(s.children.findIndex(($5) => $5.token === "switch"), 0, blockPrefix);
         s.parent = block;
       } else {
         const block = blockWithPrefix([["", [{
@@ -5534,12 +5663,12 @@ function processDeclarationConditionStatement(s) {
 function dynamizeFromClause(from) {
   from = from.slice(1);
   from = trimFirstSpace(from);
-  let ref3;
-  if (ref3 = from[from.length - 1]?.assertion) {
-    const assert2 = ref3;
-    let ref4;
-    ref4 = from[from.length - 1];
-    ref4.children = ref4.children.filter((a2) => a2 !== assert2);
+  let ref4;
+  if (ref4 = from[from.length - 1]?.assertion) {
+    const assert2 = ref4;
+    let ref5;
+    ref5 = from[from.length - 1];
+    ref5.children = ref5.children.filter((a2) => a2 !== assert2);
     from.push(", {", assert2.keyword, ":", assert2.object, "}");
   }
   return ["(", ...from, ")"];
@@ -5548,20 +5677,20 @@ function dynamizeImportDeclaration(decl) {
   const { imports } = decl;
   let { star, binding, specifiers } = imports;
   const justDefault = binding && !specifiers && !star;
-  let ref5;
+  let ref6;
   {
     if (binding) {
       if (specifiers) {
-        ref5 = makeRef();
+        ref6 = makeRef();
       } else {
-        ref5 = binding;
+        ref6 = binding;
       }
     } else {
-      ref5 = convertNamedImportsToObject(imports, true);
+      ref6 = convertNamedImportsToObject(imports, true);
     }
   }
   ;
-  const pattern = ref5;
+  const pattern = ref6;
   const c = "const";
   const expression = [
     justDefault ? "(" : void 0,
@@ -5826,7 +5955,7 @@ function processUnaryNestedExpression(pre, args, post) {
           children: args.children.map(
             (arg) => {
               if (typeof arg === "object" && arg != null && "type" in arg && arg.type === "ArrayElement" && "expression" in arg && "children" in arg) {
-                const { type, expression: exp, children } = arg;
+                const { expression: exp, children } = arg;
                 let expression = processUnaryExpression([last], trimFirstSpace(exp));
                 expression = prepend(getTrimmingSpace(exp), expression);
                 return {
@@ -6072,12 +6201,12 @@ function processPipelineExpressions(statements) {
 }
 
 // unplugin-civet:C:\Users\edemaine\Projects\Civet\source\parser\for.civet.jsx
-function processRangeExpression(start, ws1, range, end) {
-  ws1 = [ws1, range.children[0]];
-  const ws2 = range.children[1];
-  const comma = { $loc: range.$loc, token: "," };
+function processRangeExpression(start, ws1, range2, end) {
+  ws1 = [ws1, range2.children[0]];
+  const ws2 = range2.children[1];
+  const comma = { $loc: range2.$loc, token: "," };
   let ref;
-  switch (range.increasing) {
+  switch (range2.increasing) {
     case true: {
       ref = ($) => $;
       break;
@@ -6092,7 +6221,7 @@ function processRangeExpression(start, ws1, range, end) {
   }
   ;
   const abs = ref;
-  const lengthAdjust = 1 - Number(!range.left.inclusive) - Number(!range.right.inclusive);
+  const lengthAdjust = 1 - Number(!range2.left.inclusive) - Number(!range2.right.inclusive);
   let 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);
@@ -6105,7 +6234,7 @@ function processRangeExpression(start, ws1, range, end) {
       let endCode = endValue.charCodeAt(0);
       const step = startCode <= endCode ? 1 : -1;
       const length = abs(endCode - startCode) + lengthAdjust;
-      if (!range.left.inclusive) {
+      if (!range2.left.inclusive) {
         startCode += step;
       }
       if (length <= 26) {
@@ -6126,13 +6255,13 @@ function processRangeExpression(start, ws1, range, end) {
           ")"
         ];
       }
-      if (range.error != null) {
-        children.unshift(range.error);
+      if (range2.error != null) {
+        children.unshift(range2.error);
       }
     } else if (typeof startValue === "number" && typeof endValue === "number") {
       const step = startValue <= endValue ? 1 : -1;
       const length = abs(endValue - startValue) + lengthAdjust;
-      if (!range.left.inclusive) {
+      if (!range2.left.inclusive) {
         startValue += step;
       }
       if (length <= 20) {
@@ -6141,22 +6270,22 @@ function processRangeExpression(start, ws1, range, end) {
           Array.from({ length }, (_2, i) => startValue + i * step).join(", "),
           "]"
         ];
-        if (range.error != null) {
-          children.unshift(range.error);
+        if (range2.error != null) {
+          children.unshift(range2.error);
         }
       }
     }
   }
   if (!(children != null)) {
-    if (range.increasing != null) {
-      const sign = range.increasing ? "+" : "-";
+    if (range2.increasing != null) {
+      const 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,
         ")"
       ];
@@ -6165,11 +6294,11 @@ function processRangeExpression(start, ws1, range, end) {
         "((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,
@@ -6186,14 +6315,14 @@ function processRangeExpression(start, ws1, range, end) {
     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;
+function forRange(open, forDeclaration, range2, stepExp, close) {
+  let { start, end, left, right, increasing } = range2;
   const counterRef = makeRef("i");
   const infinite = typeof end === "object" && end != null && "type" in end && end.type === "Identifier" && "name" in end && end.name === "Infinity";
   let stepRef, asc;
@@ -6292,7 +6421,7 @@ function forRange(open, forDeclaration, range, stepExp, close) {
     // 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
   };
 }
@@ -6352,6 +6481,7 @@ function processForInOf($0) {
       declaration = {
         type: "Declaration",
         children: ["let ", ...expRefDec, counterRef, " = 0, ", lenRef, " = ", trimFirstSpace(expRef2), ".length"],
+        decl: "let",
         names: []
       };
       const condition = [counterRef, " < ", lenRef, "; "];
@@ -6375,6 +6505,9 @@ function processForInOf($0) {
   }
   const { binding } = declaration;
   let pattern = binding?.pattern;
+  if (pattern?.type === "NamedBindingPattern") {
+    pattern = pattern.binding;
+  }
   if (binding?.typeSuffix || inOf.token === "in" && declaration2 && pattern.type !== "Identifier") {
     const itemRef = makeRef(inOf.token === "in" ? "key" : "item");
     blockPrefix.push(["", {
@@ -6413,12 +6546,14 @@ function processForInOf($0) {
       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;
     }
@@ -6428,7 +6563,8 @@ function processForInOf($0) {
         hoistDec = {
           type: "Declaration",
           children: ["let ", expRef2],
-          names: []
+          names: [],
+          decl: "let"
         };
         exp = {
           type: "AssignmentExpression",
@@ -6440,20 +6576,58 @@ function processForInOf($0) {
         blockPrefix.push(["", ["if (!", hasPropRef, "(", trimFirstSpace(expRef2), ", ", trimFirstSpace(pattern), ")) continue"], ";"]);
       }
       if (decl2) {
-        blockPrefix.push(["", {
-          type: "Declaration",
+        const trimmedPattern = trimFirstSpace(pattern);
+        const expression = makeNode({
+          type: "MemberExpression",
           children: [
-            trimFirstSpace(ws2),
-            decl2,
-            " = ",
             trimFirstSpace(expRef2),
-            "[",
-            trimFirstSpace(pattern),
-            "]"
-          ],
-          decl: decl2,
-          names: decl2.names
-        }, ";"]);
+            makeNode({
+              type: "Index",
+              expression: trimmedPattern,
+              children: ["[", trimmedPattern, "]"]
+            })
+          ]
+        });
+        blockPrefix.push([
+          "",
+          (() => {
+            if (decl2.type === "ForDeclaration") {
+              const { binding: binding2, children } = decl2;
+              binding2.children.push(binding2.initializer = makeNode({
+                type: "Initializer",
+                expression,
+                children: [" = ", expression]
+              }));
+              return 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;
@@ -6983,7 +7157,7 @@ function processTryBlock($0) {
     const clauses = cs.map((clause) => {
       let ref1;
       if ((ref1 = clause.binding?.parameter) && typeof ref1 === "object" && "type" in ref1 && ref1.type === "CatchPattern" && "patterns" in ref1) {
-        const { type, patterns } = ref1;
+        const { patterns } = ref1;
         return {
           type: "PatternClause",
           patterns,
@@ -7587,7 +7761,14 @@ function makeGetterMethod(name, ws, value, returnType, block, kind = { token: "g
 function processBindingPatternLHS(lhs, tail) {
   adjustAtBindings(lhs, true);
   const [splices, thisAssignments] = gatherBindingCode(lhs);
-  tail.push(...splices.map((s) => [", ", s]), ...thisAssignments.map((a) => [", ", a]));
+  const 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++) {
@@ -7756,7 +7937,7 @@ function processAssignments(statements) {
             message: "Slice range cannot be decreasing in assignment"
           });
           break;
-        } else if (m3 = lhs.type, m3 === "ObjectBindingPattern" || m3 === "ArrayBindingPattern") {
+        } else if (m3 = lhs.type, m3 === "ObjectBindingPattern" || m3 === "ArrayBindingPattern" || m3 === "NamedBindingPattern") {
           processBindingPatternLHS(lhs, tail);
           gatherRecursiveAll(lhs, ($9) => $9.type === "Ref").forEach(refsToDeclare.add.bind(refsToDeclare));
         }
@@ -7905,7 +8086,7 @@ function processTypes(node) {
     while (suffixIndex >= 0) {
       const suffix = unary.suffix[suffixIndex];
       if (typeof suffix === "object" && suffix != null && "token" in suffix && suffix.token === "?") {
-        const { token } = suffix;
+        const {} = suffix;
         let count = 0;
         let m4;
         while (m4 = unary.suffix[suffixIndex], typeof m4 === "object" && m4 != null && "token" in m4 && m4.token === "?") {
@@ -7963,7 +8144,7 @@ function processTypes(node) {
         }
         results2.push(replaceNode(unary, replace, parent));
       } else if (typeof suffix === "object" && suffix != null && "type" in suffix && suffix.type === "NonNullAssertion") {
-        const { type } = suffix;
+        const {} = suffix;
         let m6;
         while (m6 = unary.suffix[suffixIndex], typeof m6 === "object" && m6 != null && "type" in m6 && m6.type === "NonNullAssertion") {
           unary.suffix.splice(suffixIndex--, 1);
@@ -8361,30 +8542,10 @@ function processRepl(root, rootIIFE) {
     }
   }
 }
-function populateRefs(statements) {
-  const refNodes = gatherRecursive(statements, ($21) => $21.type === "Ref");
-  if (refNodes.length) {
-    const ids = gatherRecursive(statements, (s) => s.type === "Identifier");
-    const names = new Set(ids.flatMap(({ names: names2 }) => names2 || []));
-    refNodes.forEach((ref) => {
-      const { type, base } = ref;
-      if (type !== "Ref") return;
-      ref.type = "Identifier";
-      let n = 0;
-      let name = base;
-      while (names.has(name)) {
-        n++;
-        name = `${base}${n}`;
-      }
-      names.add(name);
-      return ref.children = ref.names = [name];
-    });
-  }
-}
 function processPlaceholders(statements) {
   const placeholderMap = /* @__PURE__ */ new Map();
   const 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++) {
     const exp = ref25[i17];
     let ancestor;
     if (exp.subtype === ".") {
@@ -8827,6 +8988,7 @@ var grammar = {
   NWBindingIdentifier,
   AtIdentifierRef,
   PinPattern,
+  NamedBindingPattern,
   BindingPattern,
   ObjectBindingPattern,
   ObjectBindingPatternContent,
@@ -11376,8 +11538,9 @@ var LeftHandSideExpression$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, impo
     expression
   };
 });
-var LeftHandSideExpression$1 = CallExpression;
-var LeftHandSideExpression$$ = [LeftHandSideExpression$0, LeftHandSideExpression$1];
+var LeftHandSideExpression$1 = NamedBindingPattern;
+var LeftHandSideExpression$2 = CallExpression;
+var LeftHandSideExpression$$ = [LeftHandSideExpression$0, LeftHandSideExpression$1, LeftHandSideExpression$2];
 function LeftHandSideExpression(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "LeftHandSideExpression", LeftHandSideExpression$$);
 }
@@ -12000,7 +12163,7 @@ var FunctionRestParameter$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, impor
 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;
   var binding = $4;
   var typeSuffix = $5;
@@ -12113,12 +12276,31 @@ var PinPattern$$ = [PinPattern$0, PinPattern$1, PinPattern$2, PinPattern$3];
 function PinPattern(ctx, state2) {
   return (0, import_lib2.$EVENT_C)(ctx, state2, "PinPattern", PinPattern$$);
 }
+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;
+  var ws = $3;
+  var pattern = $4;
+  pattern = prepend(ws, pattern);
+  return {
+    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;
 var BindingPattern$1 = ArrayBindingPattern;
 var BindingPattern$2 = PinPattern;
 var BindingPattern$3 = Literal;
 var BindingPattern$4 = RegularExpressionLiteral;
-var BindingPattern$$ = [BindingPattern$0, BindingPattern$1, BindingPattern$2, BindingPattern$3, BindingPattern$4];
+var BindingPattern$5 = NamedBindingPattern;
+var 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$$);
 }
@@ -12242,7 +12424,7 @@ function NestedBindingPropertyList(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NestedBindingPropertyList", NestedBindingPropertyList$0);
 }
 var BindingProperty$0 = BindingRestProperty;
-var 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$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;
   var name = $2;
   var bind = $3;
@@ -12252,6 +12434,19 @@ var BindingProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
   var value = $7;
   var typeSuffix = $8;
   var initializer = $9;
+  if (bind) {
+    const 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],
@@ -12260,8 +12455,7 @@ var BindingProperty$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
     value,
     typeSuffix,
     initializer,
-    names: value.names,
-    bind: !!bind
+    names: value.names
   };
 });
 var 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) {
@@ -12326,8 +12520,7 @@ var BindingProperty$3 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2
     typeSuffix,
     initializer,
     names: binding.names,
-    identifier: binding,
-    bind: !!bind
+    identifier: binding
   };
 });
 var BindingProperty$$ = [BindingProperty$0, BindingProperty$1, BindingProperty$2, BindingProperty$3];
@@ -12385,7 +12578,7 @@ function NestedBindingElements(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "NestedBindingElements", NestedBindingElements$0);
 }
 var BindingElement$0 = BindingRestElement;
-var 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$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;
   var binding = $2;
   var typeSuffix = $3;
@@ -12410,7 +12603,7 @@ var BindingElement$$ = [BindingElement$0, BindingElement$1, BindingElement$2];
 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;
   var dots = $2;
   var binding = $3;
@@ -12426,7 +12619,7 @@ var BindingRestElement$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_l
     rest: true
   };
 });
-var 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) {
+var 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;
   var binding = $2;
   var dots = $3;
@@ -13435,9 +13628,9 @@ function RangeEnd(ctx, state2) {
 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;
   var ws = $2;
-  var range = $3;
+  var range2 = $3;
   var end = $4;
-  return processRangeExpression(start, ws, range, end);
+  return processRangeExpression(start, ws, range2, end);
 });
 var 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;
@@ -15575,10 +15768,13 @@ var ForDeclaration$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(LetOrConstOrVar,
 var 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;
   var binding = $3;
+  if (gatherRecursive(binding, ($) => $.type === "PinPattern").length) {
+    return $skip;
+  }
   return {
     type: "ForDeclaration",
     children: [c, binding],
-    decl: c.token,
+    decl: c.token.trimEnd(),
     binding,
     names: binding.names
   };
@@ -15748,12 +15944,17 @@ function PatternExpressionList(ctx, state2) {
   return (0, import_lib2.$EVENT)(ctx, state2, "PatternExpressionList", PatternExpressionList$0);
 }
 var PatternExpression$0 = BindingPattern;
-var 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;
-  if (!pattern) return $skip;
+var 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;
+  const [named, rhs] = body;
+  let binding;
+  if (named) [binding] = named;
   return {
     type: "ConditionFragment",
-    children: pattern
+    children: [binding, rhs],
+    binding,
+    rhs
   };
 });
 var PatternExpression$$ = [PatternExpression$0, PatternExpression$1];
@@ -15865,31 +16066,31 @@ var FinallyClause$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(Finally, (0, impo
 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 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;
   var typeSuffix = $2;
   return {
     type: "CatchParameter",
     binding,
     typeSuffix,
-    children: $0
+    children: [binding, typeSuffix]
+  };
+});
+var CatchParameter$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(PatternExpressionList), function($skip, $loc, $0, $1) {
+  return {
+    type: "CatchPattern",
+    children: $0,
+    patterns: $1
   };
 });
-var 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$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(BindingIdentifier, (0, import_lib2.$E)(TypeSuffix)), function($skip, $loc, $0, $1, $2) {
   var binding = $1;
   var typeSuffix = $2;
   return {
     type: "CatchParameter",
     binding,
     typeSuffix,
-    children: [binding, typeSuffix]
-  };
-});
-var CatchParameter$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(PatternExpressionList), function($skip, $loc, $0, $1) {
-  return {
-    type: "CatchPattern",
-    children: $0,
-    patterns: $1
+    children: $0
   };
 });
 var CatchParameter$$ = [CatchParameter$0, CatchParameter$1, CatchParameter$2];
@@ -17505,7 +17706,7 @@ var By$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$EXPECT)($L1
 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) {