@danielx/civet 0.6.1 → 0.6.2

package/dist/browser.js

@@ -31,6 +31,18 @@ var Civet = (() => {
   var require_lib = __commonJS({
     "source/lib.js"(exports, module) {
       "use strict";
+      function aliasBinding(p, ref) {
+        if (p.type === "Identifier") {
+          p.children[0] = ref;
+        } else if (p.type === "BindingRestElement") {
+          aliasBinding(p.binding, ref);
+        } else if (p.value?.type === "Identifier") {
+          aliasBinding(p.value, ref);
+        } else {
+          p.value = ref;
+          p.children.push(": ", ref);
+        }
+      }
       function blockWithPrefix(prefixStatements, block) {
         if (prefixStatements && prefixStatements.length) {
           const indent = getIndent(block.expressions[0]);
@@ -608,6 +620,7 @@ var Civet = (() => {
         };
       }
       module.exports = {
+        aliasBinding,
         blockWithPrefix,
         clone,
         convertMethodToFunction,
@@ -1298,6 +1311,8 @@ ${input.slice(result.pos)}
         NestedCaseClauses,
         NestedCaseClause,
         CaseClause,
+        PatternExpressionList,
+        ConditionFragment,
         CaseExpressionList,
         ImpliedColon,
         TryStatement,
@@ -1601,6 +1616,7 @@ ${input.slice(result.pos)}
         ImportType,
         TypeTuple,
         TypeList,
+        TypeElement,
         NestedTypeList,
         NestedType,
         TypeConditional,
@@ -4893,13 +4909,8 @@ ${input.slice(result.pos)}
         var close = $7;
         const names = pes.flatMap((p) => p.names);
         if (rest) {
-          let restIdentifier;
-          if (rest.binding.ref) {
-            restIdentifier = rest.binding.ref;
-          } else {
-            names.push(...rest.names);
-            restIdentifier = rest.names[0];
-          }
+          const restIdentifier = rest.binding.ref || rest.binding;
+          names.push(...rest.names || []);
           let blockPrefix;
           if (after.length) {
             blockPrefix = {
@@ -4957,7 +4968,7 @@ ${input.slice(result.pos)}
           type: "FunctionRestParameter",
           children: $0,
           names: id.names,
-          binding: id
+          binding: id.binding
         };
       });
       function FunctionRestParameter(state) {
@@ -5721,8 +5732,11 @@ ${input.slice(result.pos)}
         var dots = $2;
         var binding = $3;
         return {
-          ...binding,
-          children: [...ws || [], dots, ...binding.children],
+          type: "BindingRestElement",
+          children: [...ws || [], dots, binding],
+          binding,
+          name: binding.name,
+          names: binding.names,
           rest: true
         };
       });
@@ -5731,8 +5745,11 @@ ${input.slice(result.pos)}
         var binding = $2;
         var dots = $3;
         return {
-          ...binding,
-          children: [...ws || [], dots, ...binding.children],
+          type: "BindingRestElement",
+          children: [...ws || [], dots, binding],
+          binding,
+          name: binding.name,
+          names: binding.names,
           rest: true
         };
       });
@@ -10610,33 +10627,20 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CaseClause$0 = $TS($S(BindingPattern, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
-        var pattern = $1;
-        var block = $2;
-        return {
-          type: "PatternClause",
-          children: $0,
-          block,
-          pattern
-        };
-      });
-      var CaseClause$1 = $TS($S($P(SingleLineBinaryOpRHS), $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
-        var pattern = $1;
+      var CaseClause$0 = $TS($S(PatternExpressionList, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
+        var patterns = $1;
         var block = $2;
         return {
           type: "PatternClause",
           children: $0,
           block,
-          pattern: {
-            type: "ConditionFragment",
-            children: pattern
-          }
+          patterns
         };
       });
-      var CaseClause$2 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
+      var CaseClause$1 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
         return { "type": "CaseClause", "children": value };
       });
-      var CaseClause$3 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, EmptyBareBlock), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+      var CaseClause$2 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, EmptyBareBlock), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
         var cases = $2;
         var block = $4;
         var b = $5;
@@ -10648,7 +10652,7 @@ ${input.slice(result.pos)}
           children: $0
         };
       });
-      var CaseClause$4 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
+      var CaseClause$3 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
         var block = $3;
         return {
           type: "DefaultClause",
@@ -10656,7 +10660,7 @@ ${input.slice(result.pos)}
           children: $0
         };
       });
-      var CaseClause$5 = $TS($S(Else, ImpliedColon, $C(ThenClause, BracedBlock, EmptyBlock)), function($skip, $loc, $0, $1, $2, $3) {
+      var CaseClause$4 = $TS($S(Else, ImpliedColon, $C(ThenClause, BracedBlock, EmptyBlock)), function($skip, $loc, $0, $1, $2, $3) {
         var block = $3;
         $1.token = "default";
         return {
@@ -10676,17 +10680,74 @@ ${input.slice(result.pos)}
           }
         }
         if (state.tokenize) {
-          const result = $TOKEN("CaseClause", state, CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state) || CaseClause$5(state));
+          const result = $TOKEN("CaseClause", state, CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state));
           if (state.events)
             state.events.exit?.("CaseClause", state, result, eventData);
           return result;
         } else {
-          const result = CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state) || CaseClause$5(state);
+          const result = CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state);
           if (state.events)
             state.events.exit?.("CaseClause", state, result, eventData);
           return result;
         }
       }
+      var PatternExpressionList$0 = $TS($S(ConditionFragment, $Q($S($E(_), Comma, $E(_), ConditionFragment))), function($skip, $loc, $0, $1, $2) {
+        var first = $1;
+        var rest = $2;
+        return [first, ...rest.map(([, , , p]) => p)];
+      });
+      function PatternExpressionList(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("PatternExpressionList", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("PatternExpressionList", state, PatternExpressionList$0(state));
+          if (state.events)
+            state.events.exit?.("PatternExpressionList", state, result, eventData);
+          return result;
+        } else {
+          const result = PatternExpressionList$0(state);
+          if (state.events)
+            state.events.exit?.("PatternExpressionList", state, result, eventData);
+          return result;
+        }
+      }
+      var ConditionFragment$0 = BindingPattern;
+      var ConditionFragment$1 = $TV($P(SingleLineBinaryOpRHS), function($skip, $loc, $0, $1) {
+        var pattern = $0;
+        return {
+          type: "ConditionFragment",
+          children: pattern
+        };
+      });
+      function ConditionFragment(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("ConditionFragment", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("ConditionFragment", state, ConditionFragment$0(state) || ConditionFragment$1(state));
+          if (state.events)
+            state.events.exit?.("ConditionFragment", state, result, eventData);
+          return result;
+        } else {
+          const result = ConditionFragment$0(state) || ConditionFragment$1(state);
+          if (state.events)
+            state.events.exit?.("ConditionFragment", state, result, eventData);
+          return result;
+        }
+      }
       var CaseExpressionList$0 = $TS($S(ForbidMultiLineImplicitObjectLiteral, $E($S($Q(_), ExpressionWithIndentedApplicationForbidden, ImpliedColon)), $Q($S(__, Comma, ExpressionWithIndentedApplicationForbidden, ImpliedColon)), RestoreMultiLineImplicitObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4) {
         var first = $2;
         var rest = $3;
@@ -19183,7 +19244,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeList$0 = $S(Type, $Q($S(__, Comma, Type)));
+      var TypeList$0 = $S(TypeElement, $Q($S(__, Comma, TypeElement)));
       function TypeList(state) {
         let eventData;
         if (state.events) {
@@ -19206,6 +19267,36 @@ ${input.slice(result.pos)}
           return result;
         }
       }
+      var TypeElement$0 = $S($S(__, DotDotDot, __), Type);
+      var TypeElement$1 = $TS($S(Type, $E($S($E(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
+        var type = $1;
+        var dots = $2;
+        if (!dots)
+          return type;
+        return [dots, type];
+      });
+      function TypeElement(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("TypeElement", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state));
+          if (state.events)
+            state.events.exit?.("TypeElement", state, result, eventData);
+          return result;
+        } else {
+          const result = TypeElement$0(state) || TypeElement$1(state);
+          if (state.events)
+            state.events.exit?.("TypeElement", state, result, eventData);
+          return result;
+        }
+      }
       var NestedTypeList$0 = $TS($S(PushIndent, $Q(NestedType), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
         var types = $2;
         if (types.length)
@@ -21795,8 +21886,8 @@ ${input.slice(result.pos)}
         module.adjustBindingElements = function(elements) {
           const names = elements.flatMap((p) => p.names || []), { length } = elements;
           let blockPrefix, restIndex = -1, restCount = 0;
-          elements.forEach(({ rest }, i) => {
-            if (rest) {
+          elements.forEach(({ type }, i) => {
+            if (type === "BindingRestElement") {
               if (restIndex < 0)
                 restIndex = i;
               restCount++;
@@ -21812,13 +21903,8 @@ ${input.slice(result.pos)}
           } else if (restCount === 1) {
             const rest = elements[restIndex];
             const after = elements.slice(restIndex + 1);
-            let restIdentifier;
-            if (rest.ref) {
-              restIdentifier = rest.ref;
-            } else {
-              restIdentifier = rest.names[0];
-              names.push(...rest.names);
-            }
+            const restIdentifier = rest.binding.ref || rest.binding;
+            names.push(...rest.names || []);
             if (after.length) {
               blockPrefix = {
                 type: "PostRestBindingElements",
@@ -22292,7 +22378,11 @@ ${input.slice(result.pos)}
           }
         }
         function elideMatchersFromArrayBindings(elements) {
-          return elements.map(({ children: [ws, e, sep] }) => {
+          return elements.map((el) => {
+            if (el.type === "BindingRestElement") {
+              return ["", el, void 0];
+            }
+            const { children: [ws, e, sep] } = el;
             switch (e.type) {
               case "Literal":
               case "RegularExpressionLiteral":
@@ -22339,8 +22429,15 @@ ${input.slice(result.pos)}
         }
         function nonMatcherBindings(pattern) {
           switch (pattern.type) {
-            case "ArrayBindingPattern":
-              return ["[", elideMatchersFromArrayBindings(pattern.elements), "]"];
+            case "ArrayBindingPattern": {
+              const elements = elideMatchersFromArrayBindings(pattern.elements);
+              const children = ["[", elements, "]"];
+              return {
+                ...pattern,
+                children,
+                elements
+              };
+            }
             case "PostRestBindingElements": {
               const els = elideMatchersFromArrayBindings(pattern.children[1]);
               return {
@@ -22360,11 +22457,25 @@ ${input.slice(result.pos)}
         }
         function aggregateDuplicateBindings(bindings) {
           const props = gatherRecursiveAll(bindings, (n) => n.type === "BindingProperty");
+          const arrayBindings = gatherRecursiveAll(bindings, (n) => n.type === "ArrayBindingPattern");
+          arrayBindings.forEach((a) => {
+            const { elements } = a;
+            elements.forEach((element) => {
+              if (Array.isArray(element)) {
+                const [, e] = element;
+                if (e.type === "Identifier") {
+                  props.push(e);
+                } else if (e.type === "BindingRestElement") {
+                  props.push(e);
+                }
+              }
+            });
+          });
           const declarations = [];
           const propsGroupedByName = /* @__PURE__ */ new Map();
           for (const p of props) {
             const { name, value } = p;
-            const key = value?.name || name.name;
+            const key = value?.name || name?.name || name;
             if (propsGroupedByName.has(key)) {
               propsGroupedByName.get(key).push(p);
             } else {
@@ -22384,7 +22495,7 @@ ${input.slice(result.pos)}
                   base: `_${key}`,
                   id: key
                 };
-                p.children.push(": ", ref);
+                aliasBinding(p, ref);
               });
               return;
             }
@@ -22396,7 +22507,7 @@ ${input.slice(result.pos)}
                 base: key,
                 id: key
               };
-              p.children.push(": ", ref);
+              aliasBinding(p, ref);
               return ref;
             });
             declarations.push(["const ", key, " = [", ...refs.map((r, i) => {
@@ -22437,18 +22548,28 @@ ${input.slice(result.pos)}
                 prev.push(c.block);
                 return;
               }
-              let { pattern, block } = c;
+              let { patterns, block } = c;
+              let pattern = patterns[0];
               const indent = block.expressions?.[0]?.[0] || "";
-              const conditions = [];
-              getPatternConditions(pattern, ref, conditions);
-              const condition = {
-                type: "ParenthesizedExpression",
-                children: ["(", conditions.map((c2, i2) => {
-                  if (i2 === 0)
+              const alternativeConditions = patterns.map((pattern2, i2) => {
+                const conditions = [];
+                getPatternConditions(pattern2, ref, conditions);
+                return conditions;
+              });
+              const conditionExpression = alternativeConditions.map((conditions, i2) => {
+                const conditionArray = conditions.map((c2, i3) => {
+                  if (i3 === 0)
                     return c2;
                   return [" && ", ...c2];
-                }), ")"],
-                expression: conditions
+                });
+                if (i2 === 0)
+                  return conditionArray;
+                return [" || ", ...conditionArray];
+              });
+              const condition = {
+                type: "ParenthesizedExpression",
+                children: ["(", conditionExpression, ")"],
+                expression: conditionExpression
               };
               const prefix = [];
               switch (pattern.type) {
@@ -23162,6 +23283,7 @@ ${input.slice(result.pos)}
       exports.parse = parse2;
       exports.default = { parse: parse2 };
       var {
+        aliasBinding,
         blockWithPrefix,
         clone,
         convertMethodToFunction,
@@ -23633,7 +23755,7 @@ ${input.slice(result.pos)}
   var uncacheable;
   ({ parse } = import_parser.default);
   ({ SourceMap: SourceMap2 } = util_exports);
-  uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowNewlineBinaryOp", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidNewlineBinaryOp", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NewlineBinaryOpAllowed", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RestoreNewlineBinaryOp", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineBinaryOpRHS", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
+  uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowNewlineBinaryOp", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "ConditionFragment", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidNewlineBinaryOp", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NewlineBinaryOpAllowed", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PatternExpressionList", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RestoreNewlineBinaryOp", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineBinaryOpRHS", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
   var compile = function(src, options) {
     var ast, code, events, filename, ref, result, sm;
     if (!options) {

package/dist/main.js

@@ -30,6 +30,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var require_lib = __commonJS({
   "source/lib.js"(exports, module2) {
     "use strict";
+    function aliasBinding(p, ref) {
+      if (p.type === "Identifier") {
+        p.children[0] = ref;
+      } else if (p.type === "BindingRestElement") {
+        aliasBinding(p.binding, ref);
+      } else if (p.value?.type === "Identifier") {
+        aliasBinding(p.value, ref);
+      } else {
+        p.value = ref;
+        p.children.push(": ", ref);
+      }
+    }
     function blockWithPrefix(prefixStatements, block) {
       if (prefixStatements && prefixStatements.length) {
         const indent = getIndent(block.expressions[0]);
@@ -607,6 +619,7 @@ var require_lib = __commonJS({
       };
     }
     module2.exports = {
+      aliasBinding,
       blockWithPrefix,
       clone,
       convertMethodToFunction,
@@ -1297,6 +1310,8 @@ ${input.slice(result.pos)}
       NestedCaseClauses,
       NestedCaseClause,
       CaseClause,
+      PatternExpressionList,
+      ConditionFragment,
       CaseExpressionList,
       ImpliedColon,
       TryStatement,
@@ -1600,6 +1615,7 @@ ${input.slice(result.pos)}
       ImportType,
       TypeTuple,
       TypeList,
+      TypeElement,
       NestedTypeList,
       NestedType,
       TypeConditional,
@@ -4892,13 +4908,8 @@ ${input.slice(result.pos)}
       var close = $7;
       const names = pes.flatMap((p) => p.names);
       if (rest) {
-        let restIdentifier;
-        if (rest.binding.ref) {
-          restIdentifier = rest.binding.ref;
-        } else {
-          names.push(...rest.names);
-          restIdentifier = rest.names[0];
-        }
+        const restIdentifier = rest.binding.ref || rest.binding;
+        names.push(...rest.names || []);
         let blockPrefix;
         if (after.length) {
           blockPrefix = {
@@ -4956,7 +4967,7 @@ ${input.slice(result.pos)}
         type: "FunctionRestParameter",
         children: $0,
         names: id.names,
-        binding: id
+        binding: id.binding
       };
     });
     function FunctionRestParameter(state) {
@@ -5720,8 +5731,11 @@ ${input.slice(result.pos)}
       var dots = $2;
       var binding = $3;
       return {
-        ...binding,
-        children: [...ws || [], dots, ...binding.children],
+        type: "BindingRestElement",
+        children: [...ws || [], dots, binding],
+        binding,
+        name: binding.name,
+        names: binding.names,
         rest: true
       };
     });
@@ -5730,8 +5744,11 @@ ${input.slice(result.pos)}
       var binding = $2;
       var dots = $3;
       return {
-        ...binding,
-        children: [...ws || [], dots, ...binding.children],
+        type: "BindingRestElement",
+        children: [...ws || [], dots, binding],
+        binding,
+        name: binding.name,
+        names: binding.names,
         rest: true
       };
     });
@@ -10609,33 +10626,20 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CaseClause$0 = $TS($S(BindingPattern, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
-      var pattern = $1;
-      var block = $2;
-      return {
-        type: "PatternClause",
-        children: $0,
-        block,
-        pattern
-      };
-    });
-    var CaseClause$1 = $TS($S($P(SingleLineBinaryOpRHS), $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
-      var pattern = $1;
+    var CaseClause$0 = $TS($S(PatternExpressionList, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
+      var patterns = $1;
       var block = $2;
       return {
         type: "PatternClause",
         children: $0,
         block,
-        pattern: {
-          type: "ConditionFragment",
-          children: pattern
-        }
+        patterns
       };
     });
-    var CaseClause$2 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
+    var CaseClause$1 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
       return { "type": "CaseClause", "children": value };
     });
-    var CaseClause$3 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, EmptyBareBlock), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var CaseClause$2 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, EmptyBareBlock), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       var cases = $2;
       var block = $4;
       var b = $5;
@@ -10647,7 +10651,7 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var CaseClause$4 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
+    var CaseClause$3 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var block = $3;
       return {
         type: "DefaultClause",
@@ -10655,7 +10659,7 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var CaseClause$5 = $TS($S(Else, ImpliedColon, $C(ThenClause, BracedBlock, EmptyBlock)), function($skip, $loc, $0, $1, $2, $3) {
+    var CaseClause$4 = $TS($S(Else, ImpliedColon, $C(ThenClause, BracedBlock, EmptyBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var block = $3;
       $1.token = "default";
       return {
@@ -10675,17 +10679,74 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("CaseClause", state, CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state) || CaseClause$5(state));
+        const result = $TOKEN("CaseClause", state, CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state));
         if (state.events)
           state.events.exit?.("CaseClause", state, result, eventData);
         return result;
       } else {
-        const result = CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state) || CaseClause$5(state);
+        const result = CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state);
         if (state.events)
           state.events.exit?.("CaseClause", state, result, eventData);
         return result;
       }
     }
+    var PatternExpressionList$0 = $TS($S(ConditionFragment, $Q($S($E(_), Comma, $E(_), ConditionFragment))), function($skip, $loc, $0, $1, $2) {
+      var first = $1;
+      var rest = $2;
+      return [first, ...rest.map(([, , , p]) => p)];
+    });
+    function PatternExpressionList(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("PatternExpressionList", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("PatternExpressionList", state, PatternExpressionList$0(state));
+        if (state.events)
+          state.events.exit?.("PatternExpressionList", state, result, eventData);
+        return result;
+      } else {
+        const result = PatternExpressionList$0(state);
+        if (state.events)
+          state.events.exit?.("PatternExpressionList", state, result, eventData);
+        return result;
+      }
+    }
+    var ConditionFragment$0 = BindingPattern;
+    var ConditionFragment$1 = $TV($P(SingleLineBinaryOpRHS), function($skip, $loc, $0, $1) {
+      var pattern = $0;
+      return {
+        type: "ConditionFragment",
+        children: pattern
+      };
+    });
+    function ConditionFragment(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("ConditionFragment", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("ConditionFragment", state, ConditionFragment$0(state) || ConditionFragment$1(state));
+        if (state.events)
+          state.events.exit?.("ConditionFragment", state, result, eventData);
+        return result;
+      } else {
+        const result = ConditionFragment$0(state) || ConditionFragment$1(state);
+        if (state.events)
+          state.events.exit?.("ConditionFragment", state, result, eventData);
+        return result;
+      }
+    }
     var CaseExpressionList$0 = $TS($S(ForbidMultiLineImplicitObjectLiteral, $E($S($Q(_), ExpressionWithIndentedApplicationForbidden, ImpliedColon)), $Q($S(__, Comma, ExpressionWithIndentedApplicationForbidden, ImpliedColon)), RestoreMultiLineImplicitObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4) {
       var first = $2;
       var rest = $3;
@@ -19182,7 +19243,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeList$0 = $S(Type, $Q($S(__, Comma, Type)));
+    var TypeList$0 = $S(TypeElement, $Q($S(__, Comma, TypeElement)));
     function TypeList(state) {
       let eventData;
       if (state.events) {
@@ -19205,6 +19266,36 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var TypeElement$0 = $S($S(__, DotDotDot, __), Type);
+    var TypeElement$1 = $TS($S(Type, $E($S($E(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
+      var type = $1;
+      var dots = $2;
+      if (!dots)
+        return type;
+      return [dots, type];
+    });
+    function TypeElement(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("TypeElement", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state));
+        if (state.events)
+          state.events.exit?.("TypeElement", state, result, eventData);
+        return result;
+      } else {
+        const result = TypeElement$0(state) || TypeElement$1(state);
+        if (state.events)
+          state.events.exit?.("TypeElement", state, result, eventData);
+        return result;
+      }
+    }
     var NestedTypeList$0 = $TS($S(PushIndent, $Q(NestedType), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
       var types = $2;
       if (types.length)
@@ -21794,8 +21885,8 @@ ${input.slice(result.pos)}
       module2.adjustBindingElements = function(elements) {
         const names = elements.flatMap((p) => p.names || []), { length } = elements;
         let blockPrefix, restIndex = -1, restCount = 0;
-        elements.forEach(({ rest }, i) => {
-          if (rest) {
+        elements.forEach(({ type }, i) => {
+          if (type === "BindingRestElement") {
             if (restIndex < 0)
               restIndex = i;
             restCount++;
@@ -21811,13 +21902,8 @@ ${input.slice(result.pos)}
         } else if (restCount === 1) {
           const rest = elements[restIndex];
           const after = elements.slice(restIndex + 1);
-          let restIdentifier;
-          if (rest.ref) {
-            restIdentifier = rest.ref;
-          } else {
-            restIdentifier = rest.names[0];
-            names.push(...rest.names);
-          }
+          const restIdentifier = rest.binding.ref || rest.binding;
+          names.push(...rest.names || []);
           if (after.length) {
             blockPrefix = {
               type: "PostRestBindingElements",
@@ -22291,7 +22377,11 @@ ${input.slice(result.pos)}
         }
       }
       function elideMatchersFromArrayBindings(elements) {
-        return elements.map(({ children: [ws, e, sep] }) => {
+        return elements.map((el) => {
+          if (el.type === "BindingRestElement") {
+            return ["", el, void 0];
+          }
+          const { children: [ws, e, sep] } = el;
           switch (e.type) {
             case "Literal":
             case "RegularExpressionLiteral":
@@ -22338,8 +22428,15 @@ ${input.slice(result.pos)}
       }
       function nonMatcherBindings(pattern) {
         switch (pattern.type) {
-          case "ArrayBindingPattern":
-            return ["[", elideMatchersFromArrayBindings(pattern.elements), "]"];
+          case "ArrayBindingPattern": {
+            const elements = elideMatchersFromArrayBindings(pattern.elements);
+            const children = ["[", elements, "]"];
+            return {
+              ...pattern,
+              children,
+              elements
+            };
+          }
           case "PostRestBindingElements": {
             const els = elideMatchersFromArrayBindings(pattern.children[1]);
             return {
@@ -22359,11 +22456,25 @@ ${input.slice(result.pos)}
       }
       function aggregateDuplicateBindings(bindings) {
         const props = gatherRecursiveAll(bindings, (n) => n.type === "BindingProperty");
+        const arrayBindings = gatherRecursiveAll(bindings, (n) => n.type === "ArrayBindingPattern");
+        arrayBindings.forEach((a) => {
+          const { elements } = a;
+          elements.forEach((element) => {
+            if (Array.isArray(element)) {
+              const [, e] = element;
+              if (e.type === "Identifier") {
+                props.push(e);
+              } else if (e.type === "BindingRestElement") {
+                props.push(e);
+              }
+            }
+          });
+        });
         const declarations = [];
         const propsGroupedByName = /* @__PURE__ */ new Map();
         for (const p of props) {
           const { name, value } = p;
-          const key = value?.name || name.name;
+          const key = value?.name || name?.name || name;
           if (propsGroupedByName.has(key)) {
             propsGroupedByName.get(key).push(p);
           } else {
@@ -22383,7 +22494,7 @@ ${input.slice(result.pos)}
                 base: `_${key}`,
                 id: key
               };
-              p.children.push(": ", ref);
+              aliasBinding(p, ref);
             });
             return;
           }
@@ -22395,7 +22506,7 @@ ${input.slice(result.pos)}
               base: key,
               id: key
             };
-            p.children.push(": ", ref);
+            aliasBinding(p, ref);
             return ref;
           });
           declarations.push(["const ", key, " = [", ...refs.map((r, i) => {
@@ -22436,18 +22547,28 @@ ${input.slice(result.pos)}
               prev.push(c.block);
               return;
             }
-            let { pattern, block } = c;
+            let { patterns, block } = c;
+            let pattern = patterns[0];
             const indent = block.expressions?.[0]?.[0] || "";
-            const conditions = [];
-            getPatternConditions(pattern, ref, conditions);
-            const condition = {
-              type: "ParenthesizedExpression",
-              children: ["(", conditions.map((c2, i2) => {
-                if (i2 === 0)
+            const alternativeConditions = patterns.map((pattern2, i2) => {
+              const conditions = [];
+              getPatternConditions(pattern2, ref, conditions);
+              return conditions;
+            });
+            const conditionExpression = alternativeConditions.map((conditions, i2) => {
+              const conditionArray = conditions.map((c2, i3) => {
+                if (i3 === 0)
                   return c2;
                 return [" && ", ...c2];
-              }), ")"],
-              expression: conditions
+              });
+              if (i2 === 0)
+                return conditionArray;
+              return [" || ", ...conditionArray];
+            });
+            const condition = {
+              type: "ParenthesizedExpression",
+              children: ["(", conditionExpression, ")"],
+              expression: conditionExpression
             };
             const prefix = [];
             switch (pattern.type) {
@@ -23161,6 +23282,7 @@ ${input.slice(result.pos)}
     exports.parse = parse2;
     exports.default = { parse: parse2 };
     var {
+      aliasBinding,
       blockWithPrefix,
       clone,
       convertMethodToFunction,
@@ -23633,7 +23755,7 @@ var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2 } = util_exports);
-uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowNewlineBinaryOp", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidNewlineBinaryOp", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NewlineBinaryOpAllowed", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RestoreNewlineBinaryOp", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineBinaryOpRHS", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
+uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowNewlineBinaryOp", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "ConditionFragment", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidNewlineBinaryOp", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NewlineBinaryOpAllowed", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PatternExpressionList", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RestoreNewlineBinaryOp", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineBinaryOpRHS", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
 var compile = function(src, options) {
   var ast, code, events, filename, ref, result, sm;
   if (!options) {

package/dist/main.mjs

@@ -28,6 +28,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var require_lib = __commonJS({
   "source/lib.js"(exports, module) {
     "use strict";
+    function aliasBinding(p, ref) {
+      if (p.type === "Identifier") {
+        p.children[0] = ref;
+      } else if (p.type === "BindingRestElement") {
+        aliasBinding(p.binding, ref);
+      } else if (p.value?.type === "Identifier") {
+        aliasBinding(p.value, ref);
+      } else {
+        p.value = ref;
+        p.children.push(": ", ref);
+      }
+    }
     function blockWithPrefix(prefixStatements, block) {
       if (prefixStatements && prefixStatements.length) {
         const indent = getIndent(block.expressions[0]);
@@ -605,6 +617,7 @@ var require_lib = __commonJS({
       };
     }
     module.exports = {
+      aliasBinding,
       blockWithPrefix,
       clone,
       convertMethodToFunction,
@@ -1295,6 +1308,8 @@ ${input.slice(result.pos)}
       NestedCaseClauses,
       NestedCaseClause,
       CaseClause,
+      PatternExpressionList,
+      ConditionFragment,
       CaseExpressionList,
       ImpliedColon,
       TryStatement,
@@ -1598,6 +1613,7 @@ ${input.slice(result.pos)}
       ImportType,
       TypeTuple,
       TypeList,
+      TypeElement,
       NestedTypeList,
       NestedType,
       TypeConditional,
@@ -4890,13 +4906,8 @@ ${input.slice(result.pos)}
       var close = $7;
       const names = pes.flatMap((p) => p.names);
       if (rest) {
-        let restIdentifier;
-        if (rest.binding.ref) {
-          restIdentifier = rest.binding.ref;
-        } else {
-          names.push(...rest.names);
-          restIdentifier = rest.names[0];
-        }
+        const restIdentifier = rest.binding.ref || rest.binding;
+        names.push(...rest.names || []);
         let blockPrefix;
         if (after.length) {
           blockPrefix = {
@@ -4954,7 +4965,7 @@ ${input.slice(result.pos)}
         type: "FunctionRestParameter",
         children: $0,
         names: id.names,
-        binding: id
+        binding: id.binding
       };
     });
     function FunctionRestParameter(state) {
@@ -5718,8 +5729,11 @@ ${input.slice(result.pos)}
       var dots = $2;
       var binding = $3;
       return {
-        ...binding,
-        children: [...ws || [], dots, ...binding.children],
+        type: "BindingRestElement",
+        children: [...ws || [], dots, binding],
+        binding,
+        name: binding.name,
+        names: binding.names,
         rest: true
       };
     });
@@ -5728,8 +5742,11 @@ ${input.slice(result.pos)}
       var binding = $2;
       var dots = $3;
       return {
-        ...binding,
-        children: [...ws || [], dots, ...binding.children],
+        type: "BindingRestElement",
+        children: [...ws || [], dots, binding],
+        binding,
+        name: binding.name,
+        names: binding.names,
         rest: true
       };
     });
@@ -10607,33 +10624,20 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CaseClause$0 = $TS($S(BindingPattern, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
-      var pattern = $1;
-      var block = $2;
-      return {
-        type: "PatternClause",
-        children: $0,
-        block,
-        pattern
-      };
-    });
-    var CaseClause$1 = $TS($S($P(SingleLineBinaryOpRHS), $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
-      var pattern = $1;
+    var CaseClause$0 = $TS($S(PatternExpressionList, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
+      var patterns = $1;
       var block = $2;
       return {
         type: "PatternClause",
         children: $0,
         block,
-        pattern: {
-          type: "ConditionFragment",
-          children: pattern
-        }
+        patterns
       };
     });
-    var CaseClause$2 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
+    var CaseClause$1 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
       return { "type": "CaseClause", "children": value };
     });
-    var CaseClause$3 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, EmptyBareBlock), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var CaseClause$2 = $TS($S(When, CaseExpressionList, InsertOpenBrace, $C(ThenClause, NestedBlockStatements, EmptyBareBlock), InsertBreak, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       var cases = $2;
       var block = $4;
       var b = $5;
@@ -10645,7 +10649,7 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var CaseClause$4 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
+    var CaseClause$3 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var block = $3;
       return {
         type: "DefaultClause",
@@ -10653,7 +10657,7 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var CaseClause$5 = $TS($S(Else, ImpliedColon, $C(ThenClause, BracedBlock, EmptyBlock)), function($skip, $loc, $0, $1, $2, $3) {
+    var CaseClause$4 = $TS($S(Else, ImpliedColon, $C(ThenClause, BracedBlock, EmptyBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var block = $3;
       $1.token = "default";
       return {
@@ -10673,17 +10677,74 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("CaseClause", state, CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state) || CaseClause$5(state));
+        const result = $TOKEN("CaseClause", state, CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state));
         if (state.events)
           state.events.exit?.("CaseClause", state, result, eventData);
         return result;
       } else {
-        const result = CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state) || CaseClause$5(state);
+        const result = CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state);
         if (state.events)
           state.events.exit?.("CaseClause", state, result, eventData);
         return result;
       }
     }
+    var PatternExpressionList$0 = $TS($S(ConditionFragment, $Q($S($E(_), Comma, $E(_), ConditionFragment))), function($skip, $loc, $0, $1, $2) {
+      var first = $1;
+      var rest = $2;
+      return [first, ...rest.map(([, , , p]) => p)];
+    });
+    function PatternExpressionList(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("PatternExpressionList", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("PatternExpressionList", state, PatternExpressionList$0(state));
+        if (state.events)
+          state.events.exit?.("PatternExpressionList", state, result, eventData);
+        return result;
+      } else {
+        const result = PatternExpressionList$0(state);
+        if (state.events)
+          state.events.exit?.("PatternExpressionList", state, result, eventData);
+        return result;
+      }
+    }
+    var ConditionFragment$0 = BindingPattern;
+    var ConditionFragment$1 = $TV($P(SingleLineBinaryOpRHS), function($skip, $loc, $0, $1) {
+      var pattern = $0;
+      return {
+        type: "ConditionFragment",
+        children: pattern
+      };
+    });
+    function ConditionFragment(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("ConditionFragment", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("ConditionFragment", state, ConditionFragment$0(state) || ConditionFragment$1(state));
+        if (state.events)
+          state.events.exit?.("ConditionFragment", state, result, eventData);
+        return result;
+      } else {
+        const result = ConditionFragment$0(state) || ConditionFragment$1(state);
+        if (state.events)
+          state.events.exit?.("ConditionFragment", state, result, eventData);
+        return result;
+      }
+    }
     var CaseExpressionList$0 = $TS($S(ForbidMultiLineImplicitObjectLiteral, $E($S($Q(_), ExpressionWithIndentedApplicationForbidden, ImpliedColon)), $Q($S(__, Comma, ExpressionWithIndentedApplicationForbidden, ImpliedColon)), RestoreMultiLineImplicitObjectLiteral), function($skip, $loc, $0, $1, $2, $3, $4) {
       var first = $2;
       var rest = $3;
@@ -19180,7 +19241,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeList$0 = $S(Type, $Q($S(__, Comma, Type)));
+    var TypeList$0 = $S(TypeElement, $Q($S(__, Comma, TypeElement)));
     function TypeList(state) {
       let eventData;
       if (state.events) {
@@ -19203,6 +19264,36 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var TypeElement$0 = $S($S(__, DotDotDot, __), Type);
+    var TypeElement$1 = $TS($S(Type, $E($S($E(_), DotDotDot))), function($skip, $loc, $0, $1, $2) {
+      var type = $1;
+      var dots = $2;
+      if (!dots)
+        return type;
+      return [dots, type];
+    });
+    function TypeElement(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("TypeElement", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TypeElement", state, TypeElement$0(state) || TypeElement$1(state));
+        if (state.events)
+          state.events.exit?.("TypeElement", state, result, eventData);
+        return result;
+      } else {
+        const result = TypeElement$0(state) || TypeElement$1(state);
+        if (state.events)
+          state.events.exit?.("TypeElement", state, result, eventData);
+        return result;
+      }
+    }
     var NestedTypeList$0 = $TS($S(PushIndent, $Q(NestedType), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
       var types = $2;
       if (types.length)
@@ -21792,8 +21883,8 @@ ${input.slice(result.pos)}
       module.adjustBindingElements = function(elements) {
         const names = elements.flatMap((p) => p.names || []), { length } = elements;
         let blockPrefix, restIndex = -1, restCount = 0;
-        elements.forEach(({ rest }, i) => {
-          if (rest) {
+        elements.forEach(({ type }, i) => {
+          if (type === "BindingRestElement") {
             if (restIndex < 0)
               restIndex = i;
             restCount++;
@@ -21809,13 +21900,8 @@ ${input.slice(result.pos)}
         } else if (restCount === 1) {
           const rest = elements[restIndex];
           const after = elements.slice(restIndex + 1);
-          let restIdentifier;
-          if (rest.ref) {
-            restIdentifier = rest.ref;
-          } else {
-            restIdentifier = rest.names[0];
-            names.push(...rest.names);
-          }
+          const restIdentifier = rest.binding.ref || rest.binding;
+          names.push(...rest.names || []);
           if (after.length) {
             blockPrefix = {
               type: "PostRestBindingElements",
@@ -22289,7 +22375,11 @@ ${input.slice(result.pos)}
         }
       }
       function elideMatchersFromArrayBindings(elements) {
-        return elements.map(({ children: [ws, e, sep] }) => {
+        return elements.map((el) => {
+          if (el.type === "BindingRestElement") {
+            return ["", el, void 0];
+          }
+          const { children: [ws, e, sep] } = el;
           switch (e.type) {
             case "Literal":
             case "RegularExpressionLiteral":
@@ -22336,8 +22426,15 @@ ${input.slice(result.pos)}
       }
       function nonMatcherBindings(pattern) {
         switch (pattern.type) {
-          case "ArrayBindingPattern":
-            return ["[", elideMatchersFromArrayBindings(pattern.elements), "]"];
+          case "ArrayBindingPattern": {
+            const elements = elideMatchersFromArrayBindings(pattern.elements);
+            const children = ["[", elements, "]"];
+            return {
+              ...pattern,
+              children,
+              elements
+            };
+          }
           case "PostRestBindingElements": {
             const els = elideMatchersFromArrayBindings(pattern.children[1]);
             return {
@@ -22357,11 +22454,25 @@ ${input.slice(result.pos)}
       }
       function aggregateDuplicateBindings(bindings) {
         const props = gatherRecursiveAll(bindings, (n) => n.type === "BindingProperty");
+        const arrayBindings = gatherRecursiveAll(bindings, (n) => n.type === "ArrayBindingPattern");
+        arrayBindings.forEach((a) => {
+          const { elements } = a;
+          elements.forEach((element) => {
+            if (Array.isArray(element)) {
+              const [, e] = element;
+              if (e.type === "Identifier") {
+                props.push(e);
+              } else if (e.type === "BindingRestElement") {
+                props.push(e);
+              }
+            }
+          });
+        });
         const declarations = [];
         const propsGroupedByName = /* @__PURE__ */ new Map();
         for (const p of props) {
           const { name, value } = p;
-          const key = value?.name || name.name;
+          const key = value?.name || name?.name || name;
           if (propsGroupedByName.has(key)) {
             propsGroupedByName.get(key).push(p);
           } else {
@@ -22381,7 +22492,7 @@ ${input.slice(result.pos)}
                 base: `_${key}`,
                 id: key
               };
-              p.children.push(": ", ref);
+              aliasBinding(p, ref);
             });
             return;
           }
@@ -22393,7 +22504,7 @@ ${input.slice(result.pos)}
               base: key,
               id: key
             };
-            p.children.push(": ", ref);
+            aliasBinding(p, ref);
             return ref;
           });
           declarations.push(["const ", key, " = [", ...refs.map((r, i) => {
@@ -22434,18 +22545,28 @@ ${input.slice(result.pos)}
               prev.push(c.block);
               return;
             }
-            let { pattern, block } = c;
+            let { patterns, block } = c;
+            let pattern = patterns[0];
             const indent = block.expressions?.[0]?.[0] || "";
-            const conditions = [];
-            getPatternConditions(pattern, ref, conditions);
-            const condition = {
-              type: "ParenthesizedExpression",
-              children: ["(", conditions.map((c2, i2) => {
-                if (i2 === 0)
+            const alternativeConditions = patterns.map((pattern2, i2) => {
+              const conditions = [];
+              getPatternConditions(pattern2, ref, conditions);
+              return conditions;
+            });
+            const conditionExpression = alternativeConditions.map((conditions, i2) => {
+              const conditionArray = conditions.map((c2, i3) => {
+                if (i3 === 0)
                   return c2;
                 return [" && ", ...c2];
-              }), ")"],
-              expression: conditions
+              });
+              if (i2 === 0)
+                return conditionArray;
+              return [" || ", ...conditionArray];
+            });
+            const condition = {
+              type: "ParenthesizedExpression",
+              children: ["(", conditionExpression, ")"],
+              expression: conditionExpression
             };
             const prefix = [];
             switch (pattern.type) {
@@ -23159,6 +23280,7 @@ ${input.slice(result.pos)}
     exports.parse = parse2;
     exports.default = { parse: parse2 };
     var {
+      aliasBinding,
       blockWithPrefix,
       clone,
       convertMethodToFunction,
@@ -23621,7 +23743,7 @@ var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2 } = util_exports);
-uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowNewlineBinaryOp", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidNewlineBinaryOp", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NewlineBinaryOpAllowed", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RestoreNewlineBinaryOp", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineBinaryOpRHS", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
+uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "AllowNewlineBinaryOp", "AllowTrailingMemberProperty", "AllowedTrailingMemberExpressions", "ApplicationStart", "Arguments", "ArgumentsWithTrailingMemberExpressions", "ArrowFunction", "ArrowFunctionTail", "AssignmentExpression", "AssignmentExpressionTail", "BinaryOpExpression", "BinaryOpRHS", "BracedBlock", "BracedObjectLiteralContent", "BracedOrEmptyBlock", "CallExpression", "CallExpressionRest", "ClassImplicitCallForbidden", "CoffeeCommentEnabled", "CommaDelimiter", "ConditionalExpression", "ConditionFragment", "Declaration", "Debugger", "Dedented", "ElementListWithIndentedApplicationForbidden", "ElseClause", "Expression", "ExpressionStatement", "ExpressionWithIndentedApplicationForbidden", "ExtendedExpression", "FatArrowBody", "ForbidClassImplicitCall", "ForbidIndentedApplication", "ForbidMultiLineImplicitObjectLiteral", "ForbidNewlineBinaryOp", "ForbidTrailingMemberProperty", "FunctionDeclaration", "FunctionExpression", "HoistableDeclaration", "ImplicitArguments", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "IndentedApplicationAllowed", "IndentedFurther", "IndentedJSXChildExpression", "InlineObjectLiteral", "InsertIndent", "JSXChild", "JSXChildren", "JSXElement", "JSXFragment", "JSXImplicitFragment", "JSXMixedChildren", "JSXNested", "JSXNestedChildren", "JSXOptionalClosingElement", "JSXOptionalClosingFragment", "JSXTag", "LeftHandSideExpression", "MemberExpression", "MemberExpressionRest", "Nested", "NestedBindingElement", "NestedBindingElements", "NestedBlockExpression", "NestedBlockExpression", "NestedBlockStatement", "NestedBlockStatements", "NestedClassSignatureElement", "NestedClassSignatureElements", "NestedDeclareElement", "NestedDeclareElements", "NestedElement", "NestedElementList", "NestedImplicitObjectLiteral", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedInterfaceProperty", "NestedJSXChildExpression", "NestedModuleItem", "NestedModuleItems", "NestedNonAssignmentExtendedExpression", "NestedObject", "NestedPropertyDefinitions", "NewlineBinaryOpAllowed", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PatternExpressionList", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RestoreNewlineBinaryOp", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "SingleLineBinaryOpRHS", "SingleLineComment", "SingleLineStatements", "SnugNamedProperty", "Statement", "StatementListItem", "SuffixedExpression", "SuffixedStatement", "ThinArrowFunction", "TrackIndented", "TrailingMemberExpressions", "TrailingMemberPropertyAllowed", "TypedJSXElement", "TypedJSXFragment", "UnaryExpression", "UpdateExpression"]);
 var compile = function(src, options) {
   var ast, code, events, filename, ref, result, sm;
   if (!options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",