@danielx/civet 0.5.93 → 0.6.0

package/dist/main.js

@@ -385,6 +385,82 @@ var require_lib = __commonJS({
         return '"' + str.replace(/"/g, '\\"') + '"';
       }
     }
+    function lastAccessInCallExpression(exp) {
+      let children, i;
+      do {
+        ({ children } = exp);
+        i = children.length - 1;
+        while (i >= 0 && (children[i].type === "Call" || children[i].type === "NonNullAssertion" || children[i].type === "Optional"))
+          i--;
+        if (i < 0)
+          return;
+      } while (children[i].type === "MemberExpression" && (exp = children[i]));
+      return children[i];
+    }
+    function convertMethodToFunction(method) {
+      const { signature, block } = method;
+      let { modifier } = signature;
+      if (modifier) {
+        if (modifier.get || modifier.set) {
+          return;
+        } else if (modifier.async) {
+          modifier = [modifier.children[0][0], " function ", ...modifier.children.slice(1)];
+        } else {
+          modifier = ["function ", ...modifier.children];
+        }
+      } else {
+        modifier = "function ";
+      }
+      return {
+        ...signature,
+        id: signature.name,
+        type: "FunctionExpression",
+        children: [
+          [modifier, ...signature.children.slice(1)],
+          block
+        ],
+        block
+      };
+    }
+    function convertObjectToJSXAttributes(obj) {
+      const { properties } = obj;
+      const parts = [];
+      const rest = [];
+      for (let i = 0; i < properties.length; i++) {
+        if (i > 0)
+          parts.push(" ");
+        const part = properties[i];
+        switch (part.type) {
+          case "Identifier":
+            parts.push([part.name, "={", part.name, "}"]);
+            break;
+          case "Property":
+            if (part.name.type === "ComputedPropertyName") {
+              rest.push(part);
+            } else {
+              parts.push([part.name, "={", insertTrimmingSpace(part.value, ""), "}"]);
+            }
+            break;
+          case "SpreadProperty":
+            parts.push(["{", part.dots, part.value, "}"]);
+            break;
+          case "MethodDefinition":
+            const func = convertMethodToFunction(part);
+            if (func) {
+              parts.push([part.name, "={", convertMethodToFunction(part), "}"]);
+            } else {
+              rest.push(part);
+            }
+            break;
+          default:
+            throw new Error(`invalid object literal type in JSX attribute: ${part.type}`);
+        }
+      }
+      if (rest.length) {
+        parts.push(["{...{", ...rest, "}}"]);
+      }
+      return parts;
+    }
     function processCoffeeInterpolation(s, parts, e, $loc) {
       if (parts.length === 0 || parts.length === 1 && parts[0].token != null) {
         return {
@@ -533,6 +609,8 @@ var require_lib = __commonJS({
     module2.exports = {
       blockWithPrefix,
       clone,
+      convertMethodToFunction,
+      convertObjectToJSXAttributes,
       deepCopy,
       findAncestor,
       forRange,
@@ -548,6 +626,7 @@ var require_lib = __commonJS({
       hoistRefDecs,
       insertTrimmingSpace,
       isFunction,
+      lastAccessInCallExpression,
       literalValue,
       modifyString,
       processCoffeeInterpolation,
@@ -989,6 +1068,7 @@ ${input.slice(result.pos)}
       NonPipelineArgumentPart,
       BinaryOpExpression,
       BinaryOpRHS,
+      SingleLineBinaryOpRHS,
       RHS,
       ParenthesizedAssignment,
       UnaryExpression,
@@ -1051,6 +1131,7 @@ ${input.slice(result.pos)}
       SliceParameters,
       PropertyAccess,
       PropertyGlob,
+      PropertyBind,
       SuperProperty,
       MetaProperty,
       ReturnValue,
@@ -1063,6 +1144,7 @@ ${input.slice(result.pos)}
       BindingIdentifier,
       NWBindingIdentifier,
       AtIdentifierRef,
+      PinPattern,
       BindingPattern,
       ObjectBindingPattern,
       ObjectBindingPatternContent,
@@ -1081,21 +1163,6 @@ ${input.slice(result.pos)}
       BindingElement,
       BindingRestElement,
       EmptyBindingPattern,
-      MatchingPattern,
-      ObjectMatchingPattern,
-      ObjectMatchingPatternContent,
-      NestedMatchingProperties,
-      MatchingPropertyList,
-      NestedMatchingPropertyList,
-      MatchingProperty,
-      MatchingRestProperty,
-      ArrayMatchingPattern,
-      ArrayMatchingPatternContent,
-      NestedMatchingElements,
-      MatchingElementList,
-      NestedMatchingElementList,
-      MatchingElement,
-      MatchingRestElement,
       FunctionDeclaration,
       FunctionSignature,
       FunctionExpression,
@@ -1257,6 +1324,10 @@ ${input.slice(result.pos)}
       AllowMultiLineImplicitObjectLiteral,
       RestoreMultiLineImplicitObjectLiteral,
       MultiLineImplicitObjectLiteralAllowed,
+      AllowNewlineBinaryOp,
+      ForbidNewlineBinaryOp,
+      RestoreNewlineBinaryOp,
+      NewlineBinaryOpAllowed,
       AllowAll,
       RestoreAll,
       ExpressionStatement,
@@ -1838,7 +1909,7 @@ ${input.slice(result.pos)}
     var $R48 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
     var $R49 = $R(new RegExp("\\s", "suy"));
     var $R50 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-    var $R51 = $R(new RegExp("[\\s>]", "suy"));
+    var $R51 = $R(new RegExp("[\\s>]|\\/>", "suy"));
     var $R52 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
     var $R53 = $R(new RegExp(`"[^"]*"|'[^']*'`, "suy"));
     var $R54 = $R(new RegExp("[<>]", "suy"));
@@ -2671,7 +2742,13 @@ ${input.slice(result.pos)}
       var rhs = $2;
       return [[], op, [], rhs];
     });
-    var BinaryOpRHS$1 = $S(NotDedented, BinaryOp, $C(_, $S(EOS, __)), RHS);
+    var BinaryOpRHS$1 = $T($S(NewlineBinaryOpAllowed, $S(NotDedented, BinaryOp, $C(_, $S(EOS, __)), RHS)), function(value) {
+      var rhs = value[1];
+      return rhs;
+    });
+    var BinaryOpRHS$2 = $T($S($N(NewlineBinaryOpAllowed), SingleLineBinaryOpRHS), function(value) {
+      return value[1];
+    });
     function BinaryOpRHS(state) {
       let eventData;
       if (state.events) {
@@ -2683,17 +2760,46 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("BinaryOpRHS", state, BinaryOpRHS$0(state) || BinaryOpRHS$1(state));
+        const result = $TOKEN("BinaryOpRHS", state, BinaryOpRHS$0(state) || BinaryOpRHS$1(state) || BinaryOpRHS$2(state));
         if (state.events)
           state.events.exit?.("BinaryOpRHS", state, result, eventData);
         return result;
       } else {
-        const result = BinaryOpRHS$0(state) || BinaryOpRHS$1(state);
+        const result = BinaryOpRHS$0(state) || BinaryOpRHS$1(state) || BinaryOpRHS$2(state);
         if (state.events)
           state.events.exit?.("BinaryOpRHS", state, result, eventData);
         return result;
       }
     }
+    var SingleLineBinaryOpRHS$0 = $TS($S($E(_), BinaryOp, $C(_, $S(EOS, __)), RHS), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ws1 = $1;
+      var op = $2;
+      var ws2 = $3;
+      var rhs = $4;
+      return [ws1 || [], op, ws2, rhs];
+    });
+    function SingleLineBinaryOpRHS(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("SingleLineBinaryOpRHS", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("SingleLineBinaryOpRHS", state, SingleLineBinaryOpRHS$0(state));
+        if (state.events)
+          state.events.exit?.("SingleLineBinaryOpRHS", state, result, eventData);
+        return result;
+      } else {
+        const result = SingleLineBinaryOpRHS$0(state);
+        if (state.events)
+          state.events.exit?.("SingleLineBinaryOpRHS", state, result, eventData);
+        return result;
+      }
+    }
     var RHS$0 = ParenthesizedAssignment;
     var RHS$1 = UnaryExpression;
     var RHS$2 = ExpressionizedStatement;
@@ -4147,14 +4253,14 @@ ${input.slice(result.pos)}
     }
     var CallExpression$0 = $TS($S($EXPECT($L14, fail, 'CallExpression "super"'), ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
       var rest = $3;
-      return module2.processGlob({
+      return module2.processCallMemberExpression({
         type: "CallExpression",
         children: [$1, ...$2, ...rest.flat()]
       });
     });
     var CallExpression$1 = $TS($S($EXPECT($L15, fail, 'CallExpression "import"'), ArgumentsWithTrailingMemberExpressions, $Q(CallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
       var rest = $3;
-      return module2.processGlob({
+      return module2.processCallMemberExpression({
         type: "CallExpression",
         children: [$1, ...$2, ...rest.flat()]
       });
@@ -4165,7 +4271,7 @@ ${input.slice(result.pos)}
       var rest = $3;
       if (rest.length || trailing.length) {
         rest = rest.flat();
-        return module2.processGlob({
+        return module2.processCallMemberExpression({
           type: "CallExpression",
           children: [member, ...trailing, ...rest]
         });
@@ -4308,7 +4414,7 @@ ${input.slice(result.pos)}
     var MemberExpression$0 = $TS($S($C(PrimaryExpression, SuperProperty, MetaProperty), $Q(MemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
       var rest = $2;
       if (rest.length || Array.isArray($1)) {
-        return module2.processGlob({
+        return module2.processCallMemberExpression({
           type: "MemberExpression",
           children: [$1, ...rest].flat()
         });
@@ -4348,7 +4454,8 @@ ${input.slice(result.pos)}
     });
     var MemberExpressionRest$1 = PropertyAccess;
     var MemberExpressionRest$2 = PropertyGlob;
-    var MemberExpressionRest$3 = NonNullAssertion;
+    var MemberExpressionRest$3 = PropertyBind;
+    var MemberExpressionRest$4 = NonNullAssertion;
     function MemberExpressionRest(state) {
       let eventData;
       if (state.events) {
@@ -4360,12 +4467,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("MemberExpressionRest", state, MemberExpressionRest$0(state) || MemberExpressionRest$1(state) || MemberExpressionRest$2(state) || MemberExpressionRest$3(state));
+        const result = $TOKEN("MemberExpressionRest", state, MemberExpressionRest$0(state) || MemberExpressionRest$1(state) || MemberExpressionRest$2(state) || MemberExpressionRest$3(state) || MemberExpressionRest$4(state));
         if (state.events)
           state.events.exit?.("MemberExpressionRest", state, result, eventData);
         return result;
       } else {
-        const result = MemberExpressionRest$0(state) || MemberExpressionRest$1(state) || MemberExpressionRest$2(state) || MemberExpressionRest$3(state);
+        const result = MemberExpressionRest$0(state) || MemberExpressionRest$1(state) || MemberExpressionRest$2(state) || MemberExpressionRest$3(state) || MemberExpressionRest$4(state);
         if (state.events)
           state.events.exit?.("MemberExpressionRest", state, result, eventData);
         return result;
@@ -4575,9 +4682,11 @@ ${input.slice(result.pos)}
       }
     }
     var PropertyGlob$0 = $TS($S(OptionalDot, BracedObjectLiteral), function($skip, $loc, $0, $1, $2) {
+      var dot = $1;
       var object = $2;
       return {
         type: "PropertyGlob",
+        dot,
         object,
         children: $0
       };
@@ -4604,6 +4713,38 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var PropertyBind$0 = $TS($S($E($C(QuestionMark, NonNullAssertion)), At, OptionalDot, $C(IdentifierName, PrivateIdentifier)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var modifier = $1;
+      var dot = $3;
+      var id = $4;
+      return {
+        type: "PropertyBind",
+        name: id.name,
+        children: [modifier, dot, id]
+      };
+    });
+    function PropertyBind(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("PropertyBind", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("PropertyBind", state, PropertyBind$0(state));
+        if (state.events)
+          state.events.exit?.("PropertyBind", state, result, eventData);
+        return result;
+      } else {
+        const result = PropertyBind$0(state);
+        if (state.events)
+          state.events.exit?.("PropertyBind", state, result, eventData);
+        return result;
+      }
+    }
     var SuperProperty$0 = $S($EXPECT($L14, fail, 'SuperProperty "super"'), MemberBracketContent);
     var SuperProperty$1 = $S($EXPECT($L14, fail, 'SuperProperty "super"'), $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
     function SuperProperty(state) {
@@ -4996,20 +5137,41 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BindingPattern$0 = $TS($S(__, ObjectBindingPattern), function($skip, $loc, $0, $1, $2) {
-      var p = $2;
-      return {
-        children: [...$1, p],
-        names: p.names
-      };
-    });
-    var BindingPattern$1 = $TS($S(__, ArrayBindingPattern), function($skip, $loc, $0, $1, $2) {
-      var p = $2;
+    var PinPattern$0 = $TS($S($EXPECT($L17, fail, 'PinPattern "^"'), Identifier), function($skip, $loc, $0, $1, $2) {
+      var identifier = $2;
       return {
-        children: [...$1, p.children],
-        names: p.names
+        type: "PinPattern",
+        children: $0,
+        identifier
       };
     });
+    function PinPattern(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("PinPattern", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("PinPattern", state, PinPattern$0(state));
+        if (state.events)
+          state.events.exit?.("PinPattern", state, result, eventData);
+        return result;
+      } else {
+        const result = PinPattern$0(state);
+        if (state.events)
+          state.events.exit?.("PinPattern", state, result, eventData);
+        return result;
+      }
+    }
+    var BindingPattern$0 = ObjectBindingPattern;
+    var BindingPattern$1 = ArrayBindingPattern;
+    var BindingPattern$2 = PinPattern;
+    var BindingPattern$3 = Literal;
+    var BindingPattern$4 = RegularExpressionLiteral;
     function BindingPattern(state) {
       let eventData;
       if (state.events) {
@@ -5021,24 +5183,24 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("BindingPattern", state, BindingPattern$0(state) || BindingPattern$1(state));
+        const result = $TOKEN("BindingPattern", state, BindingPattern$0(state) || BindingPattern$1(state) || BindingPattern$2(state) || BindingPattern$3(state) || BindingPattern$4(state));
         if (state.events)
           state.events.exit?.("BindingPattern", state, result, eventData);
         return result;
       } else {
-        const result = BindingPattern$0(state) || BindingPattern$1(state);
+        const result = BindingPattern$0(state) || BindingPattern$1(state) || BindingPattern$2(state) || BindingPattern$3(state) || BindingPattern$4(state);
         if (state.events)
           state.events.exit?.("BindingPattern", state, result, eventData);
         return result;
       }
     }
-    var ObjectBindingPattern$0 = $TS($S(OpenBrace, ObjectBindingPatternContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var c = $2;
+    var ObjectBindingPattern$0 = $TS($S($E(_), OpenBrace, ObjectBindingPatternContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var c = $3;
       return {
         type: "ObjectBindingPattern",
-        children: [$1, ...c.children, $3, $4],
-        content: c.children,
-        names: c.names
+        children: $0,
+        names: c.names,
+        properties: c.children
       };
     });
     function ObjectBindingPattern(state) {
@@ -5065,10 +5227,10 @@ ${input.slice(result.pos)}
     }
     var ObjectBindingPatternContent$0 = NestedBindingProperties;
     var ObjectBindingPatternContent$1 = $TV($E(BindingPropertyList), function($skip, $loc, $0, $1) {
-      var props2 = $0;
-      if (!props2)
+      var props = $0;
+      if (!props)
         return { children: [], names: [] };
-      return module2.reorderBindingRestProperty(props2);
+      return module2.reorderBindingRestProperty(props);
     });
     function ObjectBindingPatternContent(state) {
       let eventData;
@@ -5093,8 +5255,8 @@ ${input.slice(result.pos)}
       }
     }
     var BindingPropertyList$0 = $TV($P($S(BindingProperty, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
-      var props2 = $0;
-      return props2.map(([prop, delim]) => {
+      var props = $0;
+      return props.map(([prop, delim]) => {
         return {
           ...prop,
           children: [...prop.children, delim]
@@ -5123,12 +5285,14 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ArrayBindingPattern$0 = $TS($S(OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
-      var c = $2;
+    var ArrayBindingPattern$0 = $TS($S($E(_), OpenBracket, ArrayBindingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var c = $3;
       return {
         type: "ArrayBindingPattern",
+        children: $0,
         names: c.names,
-        children: $0
+        elements: c.children,
+        length: c.length
       };
     });
     function ArrayBindingPattern(state) {
@@ -5157,7 +5321,7 @@ ${input.slice(result.pos)}
     var ArrayBindingPatternContent$1 = $TV($E(BindingElementList), function($skip, $loc, $0, $1) {
       var elements = $0;
       if (!elements)
-        return { children: [], names: [] };
+        return { children: [], names: [], length: 0 };
       return module2.adjustBindingElements(elements);
     });
     function ArrayBindingPatternContent(state) {
@@ -5271,10 +5435,10 @@ ${input.slice(result.pos)}
       }
     }
     var NestedBindingProperties$0 = $TS($S(PushIndent, $Q(NestedBindingPropertyList), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-      var props2 = $2;
-      if (!props2.length)
+      var props = $2;
+      if (!props.length)
         return $skip;
-      return module2.reorderBindingRestProperty(props2.flat());
+      return module2.reorderBindingRestProperty(props.flat());
     });
     function NestedBindingProperties(state) {
       let eventData;
@@ -5300,8 +5464,8 @@ ${input.slice(result.pos)}
     }
     var NestedBindingPropertyList$0 = $TS($S(Nested, BindingPropertyList), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
-      var props2 = $2;
-      return props2.map((prop, i) => {
+      var props = $2;
+      return props.map((prop, i) => {
         if (i > 0)
           return prop;
         return {
@@ -5333,35 +5497,53 @@ ${input.slice(result.pos)}
       }
     }
     var BindingProperty$0 = BindingRestProperty;
-    var BindingProperty$1 = $TS($S($E(_), PropertyName, $E(_), Colon, $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var BindingProperty$1 = $TS($S($E(_), PropertyName, $E(_), Colon, $E(_), $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
       var name = $2;
-      var b = $5;
-      var init = $6;
+      var value = $6;
+      var init = $7;
       return {
+        type: "BindingProperty",
+        children: $0,
         name,
-        value: b,
+        value,
         init,
-        names: b.names,
-        children: $0
+        names: value.names
       };
     });
-    var BindingProperty$2 = $TS($S(BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2) {
-      var b = $1;
-      var init = $2;
-      if (b.type === "AtBinding") {
+    var BindingProperty$2 = $TS($S($E(_), $E($EXPECT($L17, fail, 'BindingProperty "^"')), BindingIdentifier, $E(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var ws = $1;
+      var pin = $2;
+      var binding = $3;
+      var init = $4;
+      if (binding.type === "AtBinding") {
         return {
           type: "AtBindingProperty",
-          ref: b.ref,
+          children: $0,
+          binding,
+          ref: binding.ref,
           init,
-          names: [],
-          children: $0
+          names: []
+        };
+      }
+      if (pin) {
+        return {
+          type: "PinProperty",
+          children: [ws, binding],
+          name: binding,
+          value: {
+            type: "PinPattern",
+            identifier: binding
+          }
         };
       }
       return {
-        name: b,
+        type: "BindingProperty",
+        children: $0,
+        name: binding,
+        value: void 0,
         init,
-        names: b.names,
-        children: $0
+        names: binding.names,
+        identifier: binding
       };
     });
     function BindingProperty(state) {
@@ -5487,11 +5669,19 @@ ${input.slice(result.pos)}
       }
     }
     var BindingElement$0 = BindingRestElement;
-    var BindingElement$1 = $TS($S($C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2) {
-      var binding = $1;
+    var BindingElement$1 = $TS($S($E(_), $C(BindingIdentifier, BindingPattern), $E(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
+      var ws = $1;
+      var binding = $2;
+      var initializer = $3;
+      if (binding.children) {
+        binding = {
+          ...binding,
+          children: [...binding.children, initializer]
+        };
+      }
       return {
         names: binding.names,
-        children: $0
+        children: [ws, binding]
       };
     });
     var BindingElement$2 = $TV($Y($S($E(_), $EXPECT($L21, fail, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
@@ -5573,512 +5763,17 @@ ${input.slice(result.pos)}
         base: "ref",
         id: "ref"
       };
-      return {
-        type: "EmptyBinding",
-        children: [ref],
-        names: [],
-        ref
-      };
-    });
-    function EmptyBindingPattern(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("EmptyBindingPattern", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("EmptyBindingPattern", state, EmptyBindingPattern$0(state));
-        if (state.events)
-          state.events.exit?.("EmptyBindingPattern", state, result, eventData);
-        return result;
-      } else {
-        const result = EmptyBindingPattern$0(state);
-        if (state.events)
-          state.events.exit?.("EmptyBindingPattern", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingPattern$0 = ObjectMatchingPattern;
-    var MatchingPattern$1 = ArrayMatchingPattern;
-    var MatchingPattern$2 = Literal;
-    var MatchingPattern$3 = RegularExpressionLiteral;
-    function MatchingPattern(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingPattern", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingPattern", state, MatchingPattern$0(state) || MatchingPattern$1(state) || MatchingPattern$2(state) || MatchingPattern$3(state));
-        if (state.events)
-          state.events.exit?.("MatchingPattern", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingPattern$0(state) || MatchingPattern$1(state) || MatchingPattern$2(state) || MatchingPattern$3(state);
-        if (state.events)
-          state.events.exit?.("MatchingPattern", state, result, eventData);
-        return result;
-      }
-    }
-    var ObjectMatchingPattern$0 = $TS($S($E(_), OpenBrace, ObjectMatchingPatternContent, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var ws = $1;
-      var open = $2;
-      var properties = $3;
-      var ws = $4;
-      var close = $5;
-      return {
-        type: "ObjectMatchingPattern",
-        children: [ws, open, ...properties.children, ...ws, close],
-        properties: properties.children
-      };
-    });
-    function ObjectMatchingPattern(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ObjectMatchingPattern", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ObjectMatchingPattern", state, ObjectMatchingPattern$0(state));
-        if (state.events)
-          state.events.exit?.("ObjectMatchingPattern", state, result, eventData);
-        return result;
-      } else {
-        const result = ObjectMatchingPattern$0(state);
-        if (state.events)
-          state.events.exit?.("ObjectMatchingPattern", state, result, eventData);
-        return result;
-      }
-    }
-    var ObjectMatchingPatternContent$0 = NestedMatchingProperties;
-    var ObjectMatchingPatternContent$1 = $TV($E(MatchingPropertyList), function($skip, $loc, $0, $1) {
-      var properties = $0;
-      if (!properties)
-        return { children: [], names: [] };
-      return module2.reorderBindingRestProperty(properties);
-    });
-    function ObjectMatchingPatternContent(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ObjectMatchingPatternContent", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ObjectMatchingPatternContent", state, ObjectMatchingPatternContent$0(state) || ObjectMatchingPatternContent$1(state));
-        if (state.events)
-          state.events.exit?.("ObjectMatchingPatternContent", state, result, eventData);
-        return result;
-      } else {
-        const result = ObjectMatchingPatternContent$0(state) || ObjectMatchingPatternContent$1(state);
-        if (state.events)
-          state.events.exit?.("ObjectMatchingPatternContent", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingProperties$0 = $TS($S(PushIndent, $Q(NestedMatchingPropertyList), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-      var properties = $2;
-      if (!props.length)
-        return $skip;
-      return module2.reorderBindingRestProperty(props.flat());
-    });
-    function NestedMatchingProperties(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingProperties", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingProperties", state, NestedMatchingProperties$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingProperties", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingProperties$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingProperties", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingPropertyList$0 = $TV($P($S(MatchingProperty, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
-      var props2 = $0;
-      return props2.map(([prop, delim]) => {
-        return {
-          ...prop,
-          children: [...prop.children, delim]
-        };
-      });
-    });
-    function MatchingPropertyList(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingPropertyList", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingPropertyList", state, MatchingPropertyList$0(state));
-        if (state.events)
-          state.events.exit?.("MatchingPropertyList", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingPropertyList$0(state);
-        if (state.events)
-          state.events.exit?.("MatchingPropertyList", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingPropertyList$0 = $TS($S(Nested, MatchingPropertyList), function($skip, $loc, $0, $1, $2) {
-      var ws = $1;
-      var props2 = $2;
-      return props2.map((prop, i) => {
-        if (i > 0)
-          return prop;
-        return {
-          ...prop,
-          children: [ws, ...prop.children]
-        };
-      });
-    });
-    function NestedMatchingPropertyList(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingPropertyList", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingPropertyList", state, NestedMatchingPropertyList$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingPropertyList", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingPropertyList$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingPropertyList", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingProperty$0 = MatchingRestProperty;
-    var MatchingProperty$1 = $TS($S($E(_), PropertyName, $E(_), Colon, $E(_), $C(BindingIdentifier, MatchingPattern)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      var name = $2;
-      var match = $6;
-      return {
-        type: "BindingMatchProperty",
-        name,
-        match,
-        children: $0
-      };
-    });
-    var MatchingProperty$2 = $TS($S($E(_), BindingIdentifier), function($skip, $loc, $0, $1, $2) {
-      var ws = $1;
-      var b = $2;
-      if (b.type === "AtBinding") {
-        return {
-          type: "AtBindingProperty",
-          ref: b.ref,
-          names: [],
-          children: [ws, b]
-        };
-      }
-      return {
-        type: "BindingProperty",
-        names: b.names,
-        children: [ws, b],
-        identifier: b
-      };
-    });
-    function MatchingProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingProperty", state, MatchingProperty$0(state) || MatchingProperty$1(state) || MatchingProperty$2(state));
-        if (state.events)
-          state.events.exit?.("MatchingProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingProperty$0(state) || MatchingProperty$1(state) || MatchingProperty$2(state);
-        if (state.events)
-          state.events.exit?.("MatchingProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingRestProperty$0 = BindingRestProperty;
-    function MatchingRestProperty(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingRestProperty", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingRestProperty", state, MatchingRestProperty$0(state));
-        if (state.events)
-          state.events.exit?.("MatchingRestProperty", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingRestProperty$0(state);
-        if (state.events)
-          state.events.exit?.("MatchingRestProperty", state, result, eventData);
-        return result;
-      }
-    }
-    var ArrayMatchingPattern$0 = $TS($S($E(_), OpenBracket, ArrayMatchingPatternContent, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var ws = $1;
-      var elements = $3;
-      return {
-        type: "ArrayMatchingPattern",
-        children: $0,
-        elements: elements.children,
-        length: elements.length
-      };
-    });
-    function ArrayMatchingPattern(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ArrayMatchingPattern", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ArrayMatchingPattern", state, ArrayMatchingPattern$0(state));
-        if (state.events)
-          state.events.exit?.("ArrayMatchingPattern", state, result, eventData);
-        return result;
-      } else {
-        const result = ArrayMatchingPattern$0(state);
-        if (state.events)
-          state.events.exit?.("ArrayMatchingPattern", state, result, eventData);
-        return result;
-      }
-    }
-    var ArrayMatchingPatternContent$0 = NestedMatchingElements;
-    var ArrayMatchingPatternContent$1 = $TV($E(MatchingElementList), function($skip, $loc, $0, $1) {
-      var elements = $0;
-      if (!elements)
-        return { children: [], names: [], length: 0 };
-      return module2.adjustBindingElements(elements);
-    });
-    function ArrayMatchingPatternContent(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("ArrayMatchingPatternContent", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("ArrayMatchingPatternContent", state, ArrayMatchingPatternContent$0(state) || ArrayMatchingPatternContent$1(state));
-        if (state.events)
-          state.events.exit?.("ArrayMatchingPatternContent", state, result, eventData);
-        return result;
-      } else {
-        const result = ArrayMatchingPatternContent$0(state) || ArrayMatchingPatternContent$1(state);
-        if (state.events)
-          state.events.exit?.("ArrayMatchingPatternContent", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingElements$0 = $TS($S(PushIndent, $Q(NestedMatchingElementList), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-      var elements = $2;
-      return module2.adjustBindingElements(elements.flat());
-    });
-    function NestedMatchingElements(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingElements", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingElements", state, NestedMatchingElements$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingElements", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingElements$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingElements", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingElementList$0 = $TV($P($S(MatchingElement, ArrayElementDelimiter)), function($skip, $loc, $0, $1) {
-      var elements = $0;
-      return elements.map(([element, delim]) => {
-        return {
-          ...element,
-          children: [...element.children, delim]
-        };
-      });
-    });
-    function MatchingElementList(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingElementList", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingElementList", state, MatchingElementList$0(state));
-        if (state.events)
-          state.events.exit?.("MatchingElementList", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingElementList$0(state);
-        if (state.events)
-          state.events.exit?.("MatchingElementList", state, result, eventData);
-        return result;
-      }
-    }
-    var NestedMatchingElementList$0 = $TS($S(Nested, MatchingElementList), function($skip, $loc, $0, $1, $2) {
-      var ws = $1;
-      var elements = $2;
-      return elements.map((element, i) => {
-        if (i > 0)
-          return element;
-        return {
-          ...element,
-          children: [ws, ...element.children]
-        };
-      });
-    });
-    function NestedMatchingElementList(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("NestedMatchingElementList", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("NestedMatchingElementList", state, NestedMatchingElementList$0(state));
-        if (state.events)
-          state.events.exit?.("NestedMatchingElementList", state, result, eventData);
-        return result;
-      } else {
-        const result = NestedMatchingElementList$0(state);
-        if (state.events)
-          state.events.exit?.("NestedMatchingElementList", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingElement$0 = MatchingRestElement;
-    var MatchingElement$1 = $TS($S($E(_), BindingIdentifier, $E(_), Colon, $E(_), $C(BindingIdentifier, MatchingPattern)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
-      var ws = $1;
-      var name = $2;
-      var match = $6;
-      let blockPrefix;
-      switch (match.type) {
-        case "ArrayMatchingPattern":
-        case "ObjectMatchingPattern":
-          blockPrefix = [match, " = ", name];
-          break;
-        default:
-          break;
-      }
-      return {
-        names: name.names,
-        children: [ws, {
-          type: "BindingMatchElement",
-          name,
-          match,
-          children: [name],
-          blockPrefix
-        }]
-      };
-    });
-    var MatchingElement$2 = $TS($S($E(_), $C(BindingIdentifier, MatchingPattern)), function($skip, $loc, $0, $1, $2) {
-      var ws = $1;
-      var binding = $2;
-      return {
-        names: binding.names,
-        children: [ws, binding]
-      };
-    });
-    var MatchingElement$3 = $TV($Y($S($E(_), $EXPECT($L21, fail, 'MatchingElement ","'))), function($skip, $loc, $0, $1) {
-      return {
-        children: [{
-          type: "ElisionElement",
-          children: [""]
-        }],
-        names: []
-      };
-    });
-    function MatchingElement(state) {
-      let eventData;
-      if (state.events) {
-        const result = state.events.enter?.("MatchingElement", state);
-        if (result) {
-          if (result.cache)
-            return result.cache;
-          eventData = result.data;
-        }
-      }
-      if (state.tokenize) {
-        const result = $TOKEN("MatchingElement", state, MatchingElement$0(state) || MatchingElement$1(state) || MatchingElement$2(state) || MatchingElement$3(state));
-        if (state.events)
-          state.events.exit?.("MatchingElement", state, result, eventData);
-        return result;
-      } else {
-        const result = MatchingElement$0(state) || MatchingElement$1(state) || MatchingElement$2(state) || MatchingElement$3(state);
-        if (state.events)
-          state.events.exit?.("MatchingElement", state, result, eventData);
-        return result;
-      }
-    }
-    var MatchingRestElement$0 = BindingRestElement;
-    function MatchingRestElement(state) {
+      return {
+        type: "EmptyBinding",
+        children: [ref],
+        names: [],
+        ref
+      };
+    });
+    function EmptyBindingPattern(state) {
       let eventData;
       if (state.events) {
-        const result = state.events.enter?.("MatchingRestElement", state);
+        const result = state.events.enter?.("EmptyBindingPattern", state);
         if (result) {
           if (result.cache)
             return result.cache;
@@ -6086,14 +5781,14 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("MatchingRestElement", state, MatchingRestElement$0(state));
+        const result = $TOKEN("EmptyBindingPattern", state, EmptyBindingPattern$0(state));
         if (state.events)
-          state.events.exit?.("MatchingRestElement", state, result, eventData);
+          state.events.exit?.("EmptyBindingPattern", state, result, eventData);
         return result;
       } else {
-        const result = MatchingRestElement$0(state);
+        const result = EmptyBindingPattern$0(state);
         if (state.events)
-          state.events.exit?.("MatchingRestElement", state, result, eventData);
+          state.events.exit?.("EmptyBindingPattern", state, result, eventData);
         return result;
       }
     }
@@ -7798,16 +7493,16 @@ ${input.slice(result.pos)}
       var open = $1;
       if (!$3)
         return $skip;
-      const [content, ...close] = $3;
-      if (content) {
-        const children = [open, ...content, close];
+      const [properties, ...close] = $3;
+      if (properties) {
+        const children = [open, ...properties, close];
         return {
           type: "ObjectExpression",
-          content,
           children,
           names: children.flatMap((c) => {
             return c.names || [];
-          })
+          }),
+          properties
         };
       }
       return {
@@ -8124,11 +7819,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PropertyDefinition$0 = $TS($S(__, At, IdentifierReference), function($skip, $loc, $0, $1, $2, $3) {
+    var PropertyDefinition$0 = $TS($S(__, AtThis, IdentifierReference), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var at = $2;
       var id = $3;
-      const value = [{ ...at, token: "this." }, id];
+      const value = [at, ".", id];
       return {
         type: "Property",
         children: [ws, id, ": ", ...value],
@@ -8186,26 +7881,19 @@ ${input.slice(result.pos)}
       if (value.type === "Identifier") {
         return { ...value, children: [ws, ...value.children] };
       }
-      let exp = value, children, i;
-      do {
-        ({ children } = exp);
-        i = children.length - 1;
-        while (i >= 0 && (children[i].type === "Call" || children[i].type === "NonNullAssertion" || children[i].type === "Optional"))
-          i--;
-        if (i < 0)
-          return $skip;
-      } while (children[i].type === "MemberExpression" && (exp = children[i]));
-      const last = children[i];
+      const last = lastAccessInCallExpression(value);
+      if (!last)
+        return $skip;
       let name;
-      if (last.name) {
-        ({ name } = last);
-      } else if (last.type === "Index") {
+      if (last.type === "Index") {
         name = {
           type: "ComputedPropertyName",
           children: last.children
         };
       } else {
-        return $skip;
+        ({ name } = last);
+        if (!name)
+          return $skip;
       }
       return {
         type: "Property",
@@ -10921,7 +10609,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CaseClause$0 = $TS($S(MatchingPattern, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
+    var CaseClause$0 = $TS($S(BindingPattern, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
       var pattern = $1;
       var block = $2;
       return {
@@ -10931,10 +10619,23 @@ ${input.slice(result.pos)}
         pattern
       };
     });
-    var CaseClause$1 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
+    var CaseClause$1 = $TS($S(SingleLineBinaryOpRHS, $C(ThenClause, NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2) {
+      var pattern = $1;
+      var block = $2;
+      return {
+        type: "PatternClause",
+        children: $0,
+        block,
+        pattern: {
+          type: "ConditionFragment",
+          children: pattern
+        }
+      };
+    });
+    var CaseClause$2 = $T($S(Case, CaseExpressionList, $C(NestedBlockStatements, EmptyBareBlock)), function(value) {
       return { "type": "CaseClause", "children": value };
     });
-    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 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 cases = $2;
       var block = $4;
       var b = $5;
@@ -10946,7 +10647,7 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var CaseClause$3 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
+    var CaseClause$4 = $TS($S(Default, ImpliedColon, $C(NestedBlockStatements, EmptyBareBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var block = $3;
       return {
         type: "DefaultClause",
@@ -10954,7 +10655,7 @@ ${input.slice(result.pos)}
         children: $0
       };
     });
-    var CaseClause$4 = $TS($S(Else, ImpliedColon, $C(ThenClause, BracedBlock, EmptyBlock)), function($skip, $loc, $0, $1, $2, $3) {
+    var CaseClause$5 = $TS($S(Else, ImpliedColon, $C(ThenClause, BracedBlock, EmptyBlock)), function($skip, $loc, $0, $1, $2, $3) {
       var block = $3;
       $1.token = "default";
       return {
@@ -10974,12 +10675,12 @@ ${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));
+        const result = $TOKEN("CaseClause", state, CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state) || CaseClause$5(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);
+        const result = CaseClause$0(state) || CaseClause$1(state) || CaseClause$2(state) || CaseClause$3(state) || CaseClause$4(state) || CaseClause$5(state);
         if (state.events)
           state.events.exit?.("CaseClause", state, result, eventData);
         return result;
@@ -11333,8 +11034,8 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ExpressionWithIndentedApplicationForbidden$0 = $TS($S(ForbidIndentedApplication, $E(ExtendedExpression), RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3) {
-      var exp = $2;
+    var ExpressionWithIndentedApplicationForbidden$0 = $TS($S(ForbidIndentedApplication, ForbidNewlineBinaryOp, $E(ExtendedExpression), RestoreNewlineBinaryOp, RestoreIndentedApplication), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var exp = $3;
       if (exp)
         return exp;
       return $skip;
@@ -11776,7 +11477,111 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var AllowAll$0 = $S(AllowTrailingMemberProperty, AllowIndentedApplication, AllowMultiLineImplicitObjectLiteral, AllowClassImplicitCall);
+    var AllowNewlineBinaryOp$0 = $TV($EXPECT($L0, fail, 'AllowNewlineBinaryOp ""'), function($skip, $loc, $0, $1) {
+      module2.forbidNewlineBinaryOp.push(false);
+    });
+    function AllowNewlineBinaryOp(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("AllowNewlineBinaryOp", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("AllowNewlineBinaryOp", state, AllowNewlineBinaryOp$0(state));
+        if (state.events)
+          state.events.exit?.("AllowNewlineBinaryOp", state, result, eventData);
+        return result;
+      } else {
+        const result = AllowNewlineBinaryOp$0(state);
+        if (state.events)
+          state.events.exit?.("AllowNewlineBinaryOp", state, result, eventData);
+        return result;
+      }
+    }
+    var ForbidNewlineBinaryOp$0 = $TV($EXPECT($L0, fail, 'ForbidNewlineBinaryOp ""'), function($skip, $loc, $0, $1) {
+      module2.forbidNewlineBinaryOp.push(true);
+    });
+    function ForbidNewlineBinaryOp(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("ForbidNewlineBinaryOp", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("ForbidNewlineBinaryOp", state, ForbidNewlineBinaryOp$0(state));
+        if (state.events)
+          state.events.exit?.("ForbidNewlineBinaryOp", state, result, eventData);
+        return result;
+      } else {
+        const result = ForbidNewlineBinaryOp$0(state);
+        if (state.events)
+          state.events.exit?.("ForbidNewlineBinaryOp", state, result, eventData);
+        return result;
+      }
+    }
+    var RestoreNewlineBinaryOp$0 = $TV($EXPECT($L0, fail, 'RestoreNewlineBinaryOp ""'), function($skip, $loc, $0, $1) {
+      module2.forbidNewlineBinaryOp.pop();
+    });
+    function RestoreNewlineBinaryOp(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("RestoreNewlineBinaryOp", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("RestoreNewlineBinaryOp", state, RestoreNewlineBinaryOp$0(state));
+        if (state.events)
+          state.events.exit?.("RestoreNewlineBinaryOp", state, result, eventData);
+        return result;
+      } else {
+        const result = RestoreNewlineBinaryOp$0(state);
+        if (state.events)
+          state.events.exit?.("RestoreNewlineBinaryOp", state, result, eventData);
+        return result;
+      }
+    }
+    var NewlineBinaryOpAllowed$0 = $TV($EXPECT($L0, fail, 'NewlineBinaryOpAllowed ""'), function($skip, $loc, $0, $1) {
+      if (module2.config.verbose) {
+        console.log("forbidNewlineBinaryOp:", module2.forbidNewlineBinaryOp);
+      }
+      if (module2.newlineBinaryOpForbidden)
+        return $skip;
+    });
+    function NewlineBinaryOpAllowed(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("NewlineBinaryOpAllowed", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("NewlineBinaryOpAllowed", state, NewlineBinaryOpAllowed$0(state));
+        if (state.events)
+          state.events.exit?.("NewlineBinaryOpAllowed", state, result, eventData);
+        return result;
+      } else {
+        const result = NewlineBinaryOpAllowed$0(state);
+        if (state.events)
+          state.events.exit?.("NewlineBinaryOpAllowed", state, result, eventData);
+        return result;
+      }
+    }
+    var AllowAll$0 = $S(AllowTrailingMemberProperty, AllowIndentedApplication, AllowMultiLineImplicitObjectLiteral, AllowClassImplicitCall, AllowNewlineBinaryOp);
     function AllowAll(state) {
       let eventData;
       if (state.events) {
@@ -11799,7 +11604,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var RestoreAll$0 = $S(RestoreTrailingMemberProperty, RestoreIndentedApplication, RestoreMultiLineImplicitObjectLiteral, RestoreClassImplicitCall);
+    var RestoreAll$0 = $S(RestoreTrailingMemberProperty, RestoreIndentedApplication, RestoreMultiLineImplicitObjectLiteral, RestoreClassImplicitCall, RestoreNewlineBinaryOp);
     function RestoreAll(state) {
       let eventData;
       if (state.events) {
@@ -12511,7 +12316,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ExportDeclaration$0 = $TS($S(Export, __, Default, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var ExportDeclaration$0 = $TS($S($E(Decorators), Export, __, Default, __, $C(HoistableDeclaration, ClassDeclaration, ExtendedExpression)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return { type: "ExportDeclaration", children: $0 };
     });
     var ExportDeclaration$1 = $TS($S(Export, __, ExportFromClause, __, FromClause), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
@@ -17192,42 +16997,7 @@ ${input.slice(result.pos)}
       }
     }
     var JSXAttribute$0 = $TS($S(BracedObjectLiteral), function($skip, $loc, $0, $1) {
-      const { children } = $1;
-      const parts = [];
-      const rest = [];
-      for (let i = 1; i < children.length - 1; i++) {
-        if (i > 1)
-          parts.push(" ");
-        const part = children[i];
-        switch (part.type) {
-          case "Identifier":
-            parts.push([part.name, "={", part.name, "}"]);
-            break;
-          case "Property":
-            if (part.name.type === "ComputedPropertyName") {
-              rest.push(part);
-            } else {
-              parts.push([part.name, "={", insertTrimmingSpace(part.value, ""), "}"]);
-            }
-            break;
-          case "SpreadProperty":
-            parts.push(["{", part.dots, part.value, "}"]);
-            break;
-          case "MethodDefinition":
-            try {
-              parts.push([part.name, "={", module2.convertMethodToFunction(part), "}"]);
-            } catch {
-              rest.push(part);
-            }
-            break;
-          default:
-            throw new Error(`invalid object literal type in JSX attribute: ${part.type}`);
-        }
-      }
-      if (rest.length) {
-        parts.push(["{...{", ...rest, "}}"]);
-      }
-      return parts;
+      return convertObjectToJSXAttributes($1);
     });
     var JSXAttribute$1 = $TS($S(JSXAttributeName, $C(JSXAttributeInitializer, $Y(JSXAttributeSpace))), function($skip, $loc, $0, $1, $2) {
       var name = $1;
@@ -17247,16 +17017,73 @@ ${input.slice(result.pos)}
       }
     });
     var JSXAttribute$2 = $S(InsertInlineOpenBrace, DotDotDot, InlineJSXAttributeValue, InsertCloseBrace, $Y(JSXAttributeSpace));
-    var JSXAttribute$3 = $TS($S($EXPECT($L13, fail, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+    var JSXAttribute$3 = $TS($S(AtThis, $E(Identifier), $Q(InlineJSXCallExpressionRest), $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var at = $1;
+      var id = $2;
+      var rest = $3;
+      const access = id && {
+        type: "PropertyAccess",
+        children: [".", id],
+        name: id
+      };
+      const expr = module2.processCallMemberExpression({
+        type: "CallExpression",
+        children: [at, access, ...rest.flat()]
+      });
+      const last = lastAccessInCallExpression(expr);
+      if (!last)
+        return $skip;
+      let name;
+      if (last.type === "Index") {
+        return [
+          "{...{",
+          { ...last, type: "ComputedPropertyName" },
+          ": ",
+          expr,
+          "}}"
+        ];
+      } else if (last.name) {
+        return [last.name, "={", expr, "}"];
+      }
+      return $skip;
+    });
+    var JSXAttribute$4 = $TS($S(Identifier, $P(InlineJSXCallExpressionRest), $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
+      var id = $1;
+      var rest = $2;
+      const expr = module2.processCallMemberExpression({
+        type: "CallExpression",
+        children: [id, ...rest.flat()]
+      });
+      if (expr.type === "ObjectExpression") {
+        return convertObjectToJSXAttributes(expr);
+      }
+      const last = lastAccessInCallExpression(expr);
+      if (!last)
+        return $skip;
+      let name;
+      if (last.type === "Index") {
+        return [
+          "{...{",
+          { ...last, type: "ComputedPropertyName" },
+          ": ",
+          expr,
+          "}}"
+        ];
+      } else if (last.name) {
+        return [last.name, "={", expr, "}"];
+      }
+      return $skip;
+    });
+    var JSXAttribute$5 = $TS($S($EXPECT($L13, fail, 'JSXAttribute "#"'), JSXShorthandString), function($skip, $loc, $0, $1, $2) {
       return [" ", "id=", $2];
     });
-    var JSXAttribute$4 = $TS($S(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
+    var JSXAttribute$6 = $TS($S(Dot, JSXShorthandString), function($skip, $loc, $0, $1, $2) {
       return {
         type: "JSXClass",
         class: $2
       };
     });
-    var JSXAttribute$5 = $TS($S($TEXT($EXPECT($R6, fail, "JSXAttribute /[!+-]/")), JSXAttributeName), function($skip, $loc, $0, $1, $2) {
+    var JSXAttribute$7 = $TS($S($TEXT($EXPECT($R6, fail, "JSXAttribute /[!+-]/")), JSXAttributeName, $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3) {
       var toggle = $1;
       var id = $2;
       const value = toggle === "+" ? "true" : "false";
@@ -17273,18 +17100,18 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("JSXAttribute", state, JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state) || JSXAttribute$3(state) || JSXAttribute$4(state) || JSXAttribute$5(state));
+        const result = $TOKEN("JSXAttribute", state, JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state) || JSXAttribute$3(state) || JSXAttribute$4(state) || JSXAttribute$5(state) || JSXAttribute$6(state) || JSXAttribute$7(state));
         if (state.events)
           state.events.exit?.("JSXAttribute", state, result, eventData);
         return result;
       } else {
-        const result = JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state) || JSXAttribute$3(state) || JSXAttribute$4(state) || JSXAttribute$5(state);
+        const result = JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state) || JSXAttribute$3(state) || JSXAttribute$4(state) || JSXAttribute$5(state) || JSXAttribute$6(state) || JSXAttribute$7(state);
         if (state.events)
           state.events.exit?.("JSXAttribute", state, result, eventData);
         return result;
       }
     }
-    var JSXAttributeSpace$0 = $R$0($EXPECT($R51, fail, "JSXAttributeSpace /[\\s>]/"));
+    var JSXAttributeSpace$0 = $R$0($EXPECT($R51, fail, "JSXAttributeSpace /[\\s>]|\\/>/"));
     function JSXAttributeSpace(state) {
       let eventData;
       if (state.events) {
@@ -17387,12 +17214,14 @@ ${input.slice(result.pos)}
     var JSXAttributeValue$0 = $S(OpenBrace, PostfixedExpression, $E(Whitespace), CloseBrace);
     var JSXAttributeValue$1 = JSXElement;
     var JSXAttributeValue$2 = JSXFragment;
-    var JSXAttributeValue$3 = $TS($S(InsertInlineOpenBrace, InlineJSXAttributeValue, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+    var JSXAttributeValue$3 = $TS($S(InsertInlineOpenBrace, InlineJSXAttributeValue, InsertCloseBrace, $Y(JSXAttributeSpace)), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var open = $1;
       var value = $2;
+      var close = $3;
       if (value.type === "StringLiteral") {
         return $skip;
       }
-      return $0;
+      return [open, value, close];
     });
     var JSXAttributeValue$4 = $R$0($EXPECT($R53, fail, `JSXAttributeValue /"[^"]*"|'[^']*'/`));
     function JSXAttributeValue(state) {
@@ -17575,12 +17404,41 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineJSXCallExpression$0 = $S($EXPECT($L14, fail, 'InlineJSXCallExpression "super"'), ExplicitArguments);
-    var InlineJSXCallExpression$1 = $S($EXPECT($L15, fail, 'InlineJSXCallExpression "import"'), OpenParen, PostfixedExpression, __, CloseParen);
+    var InlineJSXCallExpression$0 = $TS($S($EXPECT($L14, fail, 'InlineJSXCallExpression "super"'), ExplicitArguments, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+      var args = $2;
+      var rest = $3;
+      return module2.processCallMemberExpression({
+        type: "CallExpression",
+        children: [
+          $1,
+          { type: "Call", children: args },
+          ...rest.flat()
+        ]
+      });
+    });
+    var InlineJSXCallExpression$1 = $TS($S($EXPECT($L15, fail, 'InlineJSXCallExpression "import"'), ExplicitArguments, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2, $3) {
+      var args = $2;
+      var rest = $3;
+      return module2.processCallMemberExpression({
+        type: "CallExpression",
+        children: [
+          $1,
+          { type: "Call", children: args },
+          ...rest.flat()
+        ]
+      });
+    });
     var InlineJSXCallExpression$2 = $TS($S(InlineJSXMemberExpression, $Q(InlineJSXCallExpressionRest)), function($skip, $loc, $0, $1, $2) {
-      if ($2.length)
-        return $0;
-      return $1;
+      var member = $1;
+      var rest = $2;
+      if (rest.length) {
+        rest = rest.flat();
+        return module2.processCallMemberExpression({
+          type: "CallExpression",
+          children: [member, ...rest]
+        });
+      }
+      return member;
     });
     function InlineJSXCallExpression(state) {
       let eventData;
@@ -17604,9 +17462,20 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineJSXCallExpressionRest$0 = MemberExpressionRest;
-    var InlineJSXCallExpressionRest$1 = TemplateLiteral;
-    var InlineJSXCallExpressionRest$2 = $S($E($C(OptionalShorthand, NonNullAssertion)), ExplicitArguments);
+    var InlineJSXCallExpressionRest$0 = InlineJSXMemberExpressionRest;
+    var InlineJSXCallExpressionRest$1 = $TV($C(TemplateLiteral, StringLiteral), function($skip, $loc, $0, $1) {
+      if ($1.type === "StringLiteral") {
+        return "`" + $1.token.slice(1, -1).replace(/(`|\$\{)/g, "\\$1") + "`";
+      }
+      return $1;
+    });
+    var InlineJSXCallExpressionRest$2 = $TS($S($E($C(OptionalShorthand, NonNullAssertion)), ExplicitArguments), function($skip, $loc, $0, $1, $2) {
+      var args = $2;
+      args = { type: "Call", children: args };
+      if (!$1)
+        return args;
+      return [$1, args];
+    });
     function InlineJSXCallExpressionRest(state) {
       let eventData;
       if (state.events) {
@@ -17629,13 +17498,16 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineJSXMemberExpression$0 = $TS($S(InlineJSXPrimaryExpression, $Q(InlineJSXMemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
-      if ($2.length)
-        return $0;
+    var InlineJSXMemberExpression$0 = $TS($S($C(InlineJSXPrimaryExpression, SuperProperty, MetaProperty), $Q(InlineJSXMemberExpressionRest)), function($skip, $loc, $0, $1, $2) {
+      var rest = $2;
+      if (rest.length || Array.isArray($1)) {
+        return module2.processCallMemberExpression({
+          type: "MemberExpression",
+          children: [$1, ...rest].flat()
+        });
+      }
       return $1;
     });
-    var InlineJSXMemberExpression$1 = SuperProperty;
-    var InlineJSXMemberExpression$2 = MetaProperty;
     function InlineJSXMemberExpression(state) {
       let eventData;
       if (state.events) {
@@ -17647,12 +17519,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("InlineJSXMemberExpression", state, InlineJSXMemberExpression$0(state) || InlineJSXMemberExpression$1(state) || InlineJSXMemberExpression$2(state));
+        const result = $TOKEN("InlineJSXMemberExpression", state, InlineJSXMemberExpression$0(state));
         if (state.events)
           state.events.exit?.("InlineJSXMemberExpression", state, result, eventData);
         return result;
       } else {
-        const result = InlineJSXMemberExpression$0(state) || InlineJSXMemberExpression$1(state) || InlineJSXMemberExpression$2(state);
+        const result = InlineJSXMemberExpression$0(state);
         if (state.events)
           state.events.exit?.("InlineJSXMemberExpression", state, result, eventData);
         return result;
@@ -17668,7 +17540,9 @@ ${input.slice(result.pos)}
       return $2;
     });
     var InlineJSXMemberExpressionRest$1 = PropertyAccess;
-    var InlineJSXMemberExpressionRest$2 = NonNullAssertion;
+    var InlineJSXMemberExpressionRest$2 = PropertyGlob;
+    var InlineJSXMemberExpressionRest$3 = PropertyBind;
+    var InlineJSXMemberExpressionRest$4 = NonNullAssertion;
     function InlineJSXMemberExpressionRest(state) {
       let eventData;
       if (state.events) {
@@ -17680,12 +17554,12 @@ ${input.slice(result.pos)}
         }
       }
       if (state.tokenize) {
-        const result = $TOKEN("InlineJSXMemberExpressionRest", state, InlineJSXMemberExpressionRest$0(state) || InlineJSXMemberExpressionRest$1(state) || InlineJSXMemberExpressionRest$2(state));
+        const result = $TOKEN("InlineJSXMemberExpressionRest", state, InlineJSXMemberExpressionRest$0(state) || InlineJSXMemberExpressionRest$1(state) || InlineJSXMemberExpressionRest$2(state) || InlineJSXMemberExpressionRest$3(state) || InlineJSXMemberExpressionRest$4(state));
         if (state.events)
           state.events.exit?.("InlineJSXMemberExpressionRest", state, result, eventData);
         return result;
       } else {
-        const result = InlineJSXMemberExpressionRest$0(state) || InlineJSXMemberExpressionRest$1(state) || InlineJSXMemberExpressionRest$2(state);
+        const result = InlineJSXMemberExpressionRest$0(state) || InlineJSXMemberExpressionRest$1(state) || InlineJSXMemberExpressionRest$2(state) || InlineJSXMemberExpressionRest$3(state) || InlineJSXMemberExpressionRest$4(state);
         if (state.events)
           state.events.exit?.("InlineJSXMemberExpressionRest", state, result, eventData);
         return result;
@@ -18398,9 +18272,9 @@ ${input.slice(result.pos)}
       }
     }
     var NestedInterfaceProperties$0 = $TS($S(PushIndent, $Q(NestedInterfaceProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-      var props2 = $2;
-      if (props2.length)
-        return props2;
+      var props = $2;
+      if (props.length)
+        return props;
       return $skip;
     });
     function NestedInterfaceProperties(state) {
@@ -18781,23 +18655,23 @@ ${input.slice(result.pos)}
       }
     }
     var EnumBlock$0 = $TS($S(__, OpenBrace, NestedEnumProperties, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var props2 = $3;
+      var props = $3;
       return {
-        properties: props2.properties,
+        properties: props.properties,
         children: $0
       };
     });
     var EnumBlock$1 = $TS($S(__, OpenBrace, $Q($S(__, EnumProperty)), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var props2 = $3;
+      var props = $3;
       return {
-        properties: props2.map((p) => p[1]),
+        properties: props.map((p) => p[1]),
         children: $0
       };
     });
     var EnumBlock$2 = $TS($S(InsertOpenBrace, NestedEnumProperties, InsertNewline, InsertIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var props2 = $2;
+      var props = $2;
       return {
-        properties: props2.properties,
+        properties: props.properties,
         children: $0
       };
     });
@@ -18824,11 +18698,11 @@ ${input.slice(result.pos)}
       }
     }
     var NestedEnumProperties$0 = $TS($S(PushIndent, $Q(NestedEnumProperty), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-      var props2 = $2;
-      if (!props2.length)
+      var props = $2;
+      if (!props.length)
         return $skip;
       return {
-        properties: props2.map((p) => p.property),
+        properties: props.map((p) => p.property),
         children: $0
       };
     });
@@ -19803,7 +19677,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameter$0 = $S(__, Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
+    var TypeParameter$0 = $S(__, $E($S($EXPECT($L129, fail, 'TypeParameter "const"'), $E(_))), Identifier, $E(TypeConstraint), $E(TypeInitializer), TypeParameterDelimiter);
     function TypeParameter(state) {
       let eventData;
       if (state.events) {
@@ -21000,6 +20874,7 @@ ${input.slice(result.pos)}
       module2.forbidIndentedApplication = [false];
       module2.forbidTrailingMemberProperty = [false];
       module2.forbidMultiLineImplicitObjectLiteral = [false];
+      module2.forbidNewlineBinaryOp = [false];
       module2.JSXTagStack = [];
       module2.operators = /* @__PURE__ */ new Set();
       if (!module2._init) {
@@ -21035,6 +20910,12 @@ ${input.slice(result.pos)}
               return s[s.length - 1];
             }
           },
+          newlineBinaryOpForbidden: {
+            get() {
+              const { forbidNewlineBinaryOp: s } = module2;
+              return s[s.length - 1];
+            }
+          },
           currentJSXTag: {
             get() {
               const { JSXTagStack: s } = module2;
@@ -21302,14 +21183,14 @@ ${input.slice(result.pos)}
           Object.assign(module2.config, directive.config);
         }
       });
-      module2.processGlob = (node) => {
+      module2.processCallMemberExpression = (node) => {
         const { children } = node;
         for (let i = 0; i < children.length; i++) {
           const glob = children[i];
           if (glob?.type === "PropertyGlob") {
-            const prefix = children.slice(0, i).concat(glob.children[0]);
+            const prefix = children.slice(0, i).concat(glob.dot);
             const parts = [];
-            for (const part of glob.object.content) {
+            for (const part of glob.object.properties) {
               if (part.type === "MethodDefinition") {
                 throw new Error("Glob pattern cannot have method definition");
               }
@@ -21332,7 +21213,7 @@ ${input.slice(result.pos)}
                 });
               } else {
                 parts.push({
-                  type: part.type,
+                  type: part.type === "Identifier" ? "Property" : part.type,
                   name: part.name,
                   value,
                   delim: part.delim,
@@ -21354,14 +21235,29 @@ ${input.slice(result.pos)}
                 glob.object.children[0],
                 ...parts,
                 glob.object.children.at(-1)
-              ]
+              ],
+              properties: parts
             };
             if (i === children.length - 1)
               return object;
-            return module2.processGlob({
+            return module2.processCallMemberExpression({
               ...node,
               children: [object, ...children.slice(i + 1)]
             });
+          } else if (glob?.type === "PropertyBind") {
+            const prefix = children.slice(0, i);
+            return module2.processCallMemberExpression({
+              ...node,
+              children: [
+                prefix,
+                {
+                  ...glob,
+                  type: "PropertyAccess",
+                  children: [...glob.children, ".bind(", prefix, ")"]
+                },
+                ...children.slice(i + 1)
+              ]
+            });
           }
         }
         return node;
@@ -21950,11 +21846,11 @@ ${input.slice(result.pos)}
           length
         };
       };
-      module2.reorderBindingRestProperty = function(props2) {
-        const names = props2.flatMap((p) => p.names);
+      module2.reorderBindingRestProperty = function(props) {
+        const names = props.flatMap((p) => p.names);
         let restIndex = -1;
         let restCount = 0;
-        props2.forEach(({ type }, i) => {
+        props.forEach(({ type }, i) => {
           if (type === "BindingRestProperty") {
             if (restIndex < 0)
               restIndex = i;
@@ -21963,19 +21859,19 @@ ${input.slice(result.pos)}
         });
         if (restCount === 0) {
           return {
-            children: props2,
+            children: props,
             names
           };
         } else if (restCount === 1) {
-          let after = props2.slice(restIndex + 1);
-          let rest = props2[restIndex];
-          props2 = props2.slice(0, restIndex);
+          let after = props.slice(restIndex + 1);
+          let rest = props[restIndex];
+          props = props.slice(0, restIndex);
           if (after.length) {
             const [restDelim] = rest.children.slice(-1), lastAfterProp = after[after.length - 1], lastAfterChildren = lastAfterProp.children, [lastDelim] = lastAfterChildren.slice(-1);
             rest = { ...rest, children: [...rest.children.slice(0, -1), lastDelim] };
             after = [...after.slice(0, -1), { ...lastAfterProp, children: [...lastAfterChildren.slice(0, -1), restDelim] }];
           }
-          const children = [...props2, ...after, rest];
+          const children = [...props, ...after, rest];
           return {
             children,
             names
@@ -21985,7 +21881,7 @@ ${input.slice(result.pos)}
           children: [{
             type: "Error",
             message: "Multiple rest properties in object pattern"
-          }, props2]
+          }, props]
         };
       };
       function addParentPointers(node, parent) {
@@ -22059,7 +21955,7 @@ ${input.slice(result.pos)}
         gatherRecursiveAll(statements, (n) => n.type === "AtBindingProperty").forEach((binding) => {
           const { ref } = binding;
           if (asThis) {
-            const atBinding = binding.children[0];
+            const atBinding = binding.binding;
             atBinding.children.pop();
             atBinding.type = void 0;
             binding.children.unshift(ref.id, ": this.", ref.base);
@@ -22305,34 +22201,11 @@ ${input.slice(result.pos)}
             throw new Error("Unknown postfix statement");
         }
       };
-      module2.convertMethodToFunction = function(method) {
-        const { signature, block } = method;
-        let { modifier } = signature;
-        if (modifier) {
-          if (modifier.get || modifier.set) {
-            throw new Error("cannot convert get/set method to function");
-          } else if (modifier.async) {
-            modifier = [modifier.children[0][0], " function ", ...modifier.children.slice(1)];
-          } else {
-            modifier = ["function ", ...modifier.children];
-          }
-        } else {
-          modifier = "function ";
-        }
-        return {
-          ...signature,
-          id: signature.name,
-          type: "FunctionExpression",
-          children: [
-            [modifier, ...signature.children.slice(1)],
-            block
-          ],
-          block
-        };
-      };
       function getPatternConditions(pattern, ref, conditions) {
+        if (pattern.rest)
+          return;
         switch (pattern.type) {
-          case "ArrayMatchingPattern": {
+          case "ArrayBindingPattern": {
             const { elements, length } = pattern, hasRest = elements.some((e) => e.rest), comparator = hasRest ? " >= " : " === ", l = [comparator, (length - hasRest).toString()];
             conditions.push(
               ["Array.isArray(", ref, ")"],
@@ -22340,46 +22213,28 @@ ${input.slice(result.pos)}
             );
             elements.forEach(({ children: [, e] }, i) => {
               const subRef = [ref, "[", i.toString(), "]"];
-              switch (e.type) {
-                case "ArrayMatchingPattern":
-                case "ObjectMatchingPattern":
-                case "RegularExpressionLiteral":
-                  getPatternConditions(e, subRef, conditions);
-                  break;
-                case "BindingMatchElement":
-                  getPatternConditions(e.match, subRef, conditions);
-                  break;
-              }
+              getPatternConditions(e, subRef, conditions);
             });
             const postRest = pattern.children.find((c) => c?.blockPrefix);
             if (postRest) {
               const postElements = postRest.blockPrefix.children[1], { length: postLength } = postElements;
               postElements.forEach(({ children: [, e] }, i) => {
                 const subRef = [ref, "[", ref, ".length - ", (postLength + i).toString(), "]"];
-                switch (e.type) {
-                  case "ArrayMatchingPattern":
-                  case "ObjectMatchingPattern":
-                  case "RegularExpressionLiteral":
-                  case "Literal":
-                    getPatternConditions(e, subRef, conditions);
-                    break;
-                  case "BindingMatchElement":
-                    getPatternConditions(e.match, subRef, conditions);
-                    break;
-                }
+                getPatternConditions(e, subRef, conditions);
               });
             }
             break;
           }
-          case "ObjectMatchingPattern": {
+          case "ObjectBindingPattern": {
             conditions.push(
               ["typeof ", ref, " === 'object'"],
               [ref, " != null"]
             );
             pattern.properties.forEach((p) => {
               switch (p.type) {
-                case "BindingMatchProperty": {
-                  const { name, match } = p;
+                case "PinProperty":
+                case "BindingProperty": {
+                  const { name, value } = p;
                   let subRef;
                   switch (name.type) {
                     case "ComputedPropertyName":
@@ -22396,16 +22251,20 @@ ${input.slice(result.pos)}
                       conditions.push(["'", name, "' in ", ref]);
                       subRef = [ref, ".", name];
                   }
-                  getPatternConditions(p.match, subRef, conditions);
+                  if (value) {
+                    getPatternConditions(value, subRef, conditions);
+                  }
                   break;
                 }
-                case "BindingProperty":
-                  conditions.push(["'", p.identifier, "' in ", ref]);
-                  break;
               }
             });
             break;
           }
+          case "ConditionFragment":
+            conditions.push(
+              [ref, " ", pattern.children]
+            );
+            break;
           case "RegularExpressionLiteral": {
             conditions.push(
               ["typeof ", ref, " === 'string'"],
@@ -22413,13 +22272,22 @@ ${input.slice(result.pos)}
             );
             break;
           }
-          default: {
+          case "PinPattern":
+            conditions.push([
+              ref,
+              " === ",
+              pattern.identifier
+            ]);
+            break;
+          case "Literal":
             conditions.push([
               ref,
               " === ",
               pattern
             ]);
-          }
+            break;
+          default:
+            break;
         }
       }
       function elideMatchersFromArrayBindings(elements) {
@@ -22428,6 +22296,7 @@ ${input.slice(result.pos)}
             case "Literal":
             case "RegularExpressionLiteral":
             case "StringLiteral":
+            case "PinPattern":
               return sep;
             default:
               return [ws, nonMatcherBindings(e), sep];
@@ -22437,27 +22306,19 @@ ${input.slice(result.pos)}
       function elideMatchersFromPropertyBindings(properties) {
         return properties.map((p) => {
           switch (p.type) {
-            case "BindingMatchProperty": {
-              const { children, name, match } = p;
-              const [ws, , , , , , sep] = children;
-              switch (match.type) {
-                case "ArrayMatchingPattern":
-                case "ObjectMatchingPattern":
+            case "BindingProperty": {
+              const { children, name, value } = p;
+              const [ws] = children;
+              const sep = children[children.length - 1];
+              switch (value && value.type) {
+                case "ArrayBindingPattern":
+                case "ObjectBindingPattern":
                   return {
                     ...p,
-                    children: [ws, name, ": ", nonMatcherBindings(match)]
+                    children: [ws, name, ": ", nonMatcherBindings(value)]
                   };
                 case "Identifier":
-                  switch (name.type) {
-                    case "ComputedPropertyName":
-                    case "Literal":
-                    case "StringLiteral":
-                    case "NumericLiteral":
-                      return {
-                        ...p,
-                        children: [ws, name, ": ", match, sep]
-                      };
-                  }
+                  return p;
                 case "Literal":
                 case "RegularExpressionLiteral":
                 case "StringLiteral":
@@ -22468,7 +22329,7 @@ ${input.slice(result.pos)}
                   };
               }
             }
-            case "BindingProperty":
+            case "PinProperty":
             case "BindingRestProperty":
             default:
               return p;
@@ -22477,7 +22338,7 @@ ${input.slice(result.pos)}
       }
       function nonMatcherBindings(pattern) {
         switch (pattern.type) {
-          case "ArrayMatchingPattern":
+          case "ArrayBindingPattern":
             return ["[", elideMatchersFromArrayBindings(pattern.elements), "]"];
           case "PostRestBindingElements": {
             const els = elideMatchersFromArrayBindings(pattern.children[1]);
@@ -22490,19 +22351,19 @@ ${input.slice(result.pos)}
               ]
             };
           }
-          case "ObjectMatchingPattern":
+          case "ObjectBindingPattern":
             return ["{", elideMatchersFromPropertyBindings(pattern.properties), "}"];
           default:
             return pattern;
         }
       }
       function aggregateDuplicateBindings(bindings) {
-        const props2 = gatherRecursiveAll(bindings, (n) => n.type === "BindingMatchProperty");
+        const props = gatherRecursiveAll(bindings, (n) => n.type === "BindingProperty");
         const declarations = [];
         const propsGroupedByName = /* @__PURE__ */ new Map();
-        for (const p of props2) {
-          const { name } = p;
-          const key = name.name;
+        for (const p of props) {
+          const { name, value } = p;
+          const key = value?.name || name.name;
           if (propsGroupedByName.has(key)) {
             propsGroupedByName.get(key).push(p);
           } else {
@@ -22590,10 +22451,10 @@ ${input.slice(result.pos)}
             };
             const prefix = [];
             switch (pattern.type) {
-              case "ArrayMatchingPattern":
+              case "ArrayBindingPattern":
                 if (pattern.length === 0)
                   break;
-              case "ObjectMatchingPattern": {
+              case "ObjectBindingPattern": {
                 if (pattern.properties?.length === 0)
                   break;
                 let [splices, thisAssignments] = gatherBindingCode(pattern);
@@ -23302,6 +23163,8 @@ ${input.slice(result.pos)}
     var {
       blockWithPrefix,
       clone,
+      convertMethodToFunction,
+      convertObjectToJSXAttributes,
       deepCopy,
       findAncestor,
       forRange,
@@ -23317,6 +23180,7 @@ ${input.slice(result.pos)}
       hoistRefDecs,
       insertTrimmingSpace,
       isFunction,
+      lastAccessInCallExpression,
       literalValue,
       modifyString,
       processCoffeeInterpolation,
@@ -23769,7 +23633,7 @@ var parse;
 var uncacheable;
 ({ parse } = import_parser.default);
 ({ SourceMap: SourceMap2 } = util_exports);
-uncacheable = /* @__PURE__ */ new Set(["ActualAssignment", "AllowAll", "AllowClassImplicitCall", "AllowIndentedApplication", "AllowMultiLineImplicitObjectLiteral", "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", "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", "NonSingleBracedBlock", "NotDedented", "ObjectLiteral", "PopIndent", "PopJSXStack", "PostfixedExpression", "PostfixedStatement", "PrimaryExpression", "PushIndent", "PushJSXOpeningElement", "PushJSXOpeningFragment", "RestoreAll", "RestoreClassImplicitCall", "RestoreMultiLineImplicitObjectLiteral", "RestoreIndentedApplication", "RestoreTrailingMemberProperty", "RHS", "Samedent", "ShortCircuitExpression", "SingleLineAssignmentExpression", "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", "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"]);
 var compile = function(src, options) {
   var ast, code, events, filename, ref, result, sm;
   if (!options) {