@danielx/civet 0.4.28 → 0.4.30

package/README.md

@@ -55,10 +55,8 @@ Things Kept from CoffeeScript
 ---
 
 - `is` -> `===`
-- `or` -> `||`
-- `and` -> `&&`
-- `or=` -> `||=`
-- `and=` -> `&&=`
+- `or`,  `or=`  -> `||`, `||=`
+- `and`, `and=` -> `&&`, `&&=`
 - `loop` -> `while(true)`
 - `unless exp` -> `if(!exp)`
 - `until condition` -> `while(!condition)`
@@ -123,9 +121,7 @@ Civet.
 - `a of b` (use `a in b` matching JS, or `"civet coffeeCompat"`, or `"civet coffeeOf"`)
 - Backtick embedded JS (replaced by template literals)
 - Will likely add later
-  - Optional assignment `x?.y = 3` -> `x != null ? x.y = 3 : undefined`
   - Conditional assignment `a?[x] = 3` -> `a ? a[x] = 3 : undefined`
-- Might add later
   - Multiple slice assignment `otherNumbers[0...] = numbers[3..6] = [-3, -4, -5, -6]`
 
 Things Changed from CoffeeScript
@@ -156,7 +152,8 @@ Things Changed from CoffeeScript
     x    +    3
   ```
   remains as is.
-- Heregex
+- Heregex / re.X
+  - Stay closer to the [Python spec](https://docs.python.org/3/library/re.html#re.X)
   - Allows both kinds of substitutions `#{..}`, `${..}`.
   - Also allows both kinds of single line comments `//`, `#`.
   - Keeps non-newline whitespace inside of character classes.

package/dist/browser.js

@@ -939,19 +939,19 @@ ${input.slice(result.pos)}
       var $L13 = $L("import.meta");
       var $L14 = $L(")");
       var $L15 = $L("->");
-      var $L16 = $L("null");
-      var $L17 = $L("true");
-      var $L18 = $L("false");
-      var $L19 = $L("yes");
-      var $L20 = $L("on");
-      var $L21 = $L("no");
-      var $L22 = $L("off");
-      var $L23 = $L(",");
-      var $L24 = $L("=");
-      var $L25 = $L(">");
-      var $L26 = $L("]");
-      var $L27 = $L(":");
-      var $L28 = $L("}");
+      var $L16 = $L("}");
+      var $L17 = $L("null");
+      var $L18 = $L("true");
+      var $L19 = $L("false");
+      var $L20 = $L("yes");
+      var $L21 = $L("on");
+      var $L22 = $L("no");
+      var $L23 = $L("off");
+      var $L24 = $L(",");
+      var $L25 = $L("=");
+      var $L26 = $L(">");
+      var $L27 = $L("]");
+      var $L28 = $L(":");
       var $L29 = $L("**=");
       var $L30 = $L("*=");
       var $L31 = $L("/=");
@@ -3808,8 +3808,15 @@ ${input.slice(result.pos)}
         return {
           type: "BlockStatement",
           expressions,
-          children: [$1, expressions],
-          bare: true
+          children: [$1, expressions]
+        };
+      });
+      var BracedContent$2 = $TV($Y($S(__, $EXPECT($L16, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
+        const expressions = [];
+        return {
+          type: "BlockStatement",
+          expressions,
+          children: [expressions]
         };
       });
       function BracedContent(state) {
@@ -3819,12 +3826,12 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("BracedContent", state, BracedContent$0(state) || BracedContent$1(state));
+          const result = $TOKEN("BracedContent", state, BracedContent$0(state) || BracedContent$1(state) || BracedContent$2(state));
           if (state.events)
             state.events.exit?.("BracedContent", state, result);
           return result;
         } else {
-          const result = BracedContent$0(state) || BracedContent$1(state);
+          const result = BracedContent$0(state) || BracedContent$1(state) || BracedContent$2(state);
           if (state.events)
             state.events.exit?.("BracedContent", state, result);
           return result;
@@ -3929,7 +3936,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var NullLiteral$0 = $TV($EXPECT($L16, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
+      var NullLiteral$0 = $TV($EXPECT($L17, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function NullLiteral(state) {
@@ -3953,7 +3960,7 @@ ${input.slice(result.pos)}
       var BooleanLiteral$0 = $T($S(CoffeeBooleansEnabled, CoffeeScriptBooleanLiteral), function(value) {
         return value[1];
       });
-      var BooleanLiteral$1 = $TS($S($C($EXPECT($L17, fail, 'BooleanLiteral "true"'), $EXPECT($L18, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var BooleanLiteral$1 = $TS($S($C($EXPECT($L18, fail, 'BooleanLiteral "true"'), $EXPECT($L19, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: $1 };
       });
       function BooleanLiteral(state) {
@@ -3974,10 +3981,10 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L19, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L20, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L20, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L21, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "true" };
       });
-      var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L21, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L22, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+      var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L22, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L23, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
         return { $loc, token: "false" };
       });
       function CoffeeScriptBooleanLiteral(state) {
@@ -3998,7 +4005,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Comma$0 = $TV($EXPECT($L23, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
+      var Comma$0 = $TV($EXPECT($L24, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Comma(state) {
@@ -4088,7 +4095,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var UpcomingAssignment$0 = $Y($S(__, $EXPECT($L24, fail, 'UpcomingAssignment "="'), $N($C($EXPECT($L24, fail, 'UpcomingAssignment "="'), $EXPECT($L25, fail, 'UpcomingAssignment ">"')))));
+      var UpcomingAssignment$0 = $Y($S(__, $EXPECT($L25, fail, 'UpcomingAssignment "="'), $N($C($EXPECT($L25, fail, 'UpcomingAssignment "="'), $EXPECT($L26, fail, 'UpcomingAssignment ">"')))));
       function UpcomingAssignment(state) {
         if (state.events) {
           const result = state.events.enter?.("UpcomingAssignment", state);
@@ -4327,7 +4334,7 @@ ${input.slice(result.pos)}
         }
       }
       var ArrayElementDelimiter$0 = $S(__, Comma);
-      var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L26, fail, 'ArrayElementDelimiter "]"')));
+      var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L27, fail, 'ArrayElementDelimiter "]"')));
       var ArrayElementDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
@@ -4692,11 +4699,11 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ImplicitInlineObjectPropertyDelimiter$0 = $S($Q(TrailingComment), $EXPECT($L23, fail, 'ImplicitInlineObjectPropertyDelimiter ","'));
+      var ImplicitInlineObjectPropertyDelimiter$0 = $S($Q(TrailingComment), $EXPECT($L24, fail, 'ImplicitInlineObjectPropertyDelimiter ","'));
       var ImplicitInlineObjectPropertyDelimiter$1 = $T($Y($S(EOS, NamedProperty)), function(value) {
         return ",";
       });
-      var ImplicitInlineObjectPropertyDelimiter$2 = $T($Y($S(__, $C($EXPECT($L27, fail, 'ImplicitInlineObjectPropertyDelimiter ":"'), $EXPECT($L14, fail, 'ImplicitInlineObjectPropertyDelimiter ")"'), $EXPECT($L26, fail, 'ImplicitInlineObjectPropertyDelimiter "]"'), $EXPECT($L28, fail, 'ImplicitInlineObjectPropertyDelimiter "}"'), ReservedWord))), function(value) {
+      var ImplicitInlineObjectPropertyDelimiter$2 = $T($Y($S(__, $C($EXPECT($L28, fail, 'ImplicitInlineObjectPropertyDelimiter ":"'), $EXPECT($L14, fail, 'ImplicitInlineObjectPropertyDelimiter ")"'), $EXPECT($L27, fail, 'ImplicitInlineObjectPropertyDelimiter "]"'), $EXPECT($L16, fail, 'ImplicitInlineObjectPropertyDelimiter "}"'), ReservedWord))), function(value) {
         return "";
       });
       var ImplicitInlineObjectPropertyDelimiter$3 = $T($Y(EOS), function(value) {
@@ -4721,7 +4728,7 @@ ${input.slice(result.pos)}
         }
       }
       var ObjectPropertyDelimiter$0 = $S($Q(_), Comma);
-      var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L28, fail, 'ObjectPropertyDelimiter "}"')));
+      var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L16, fail, 'ObjectPropertyDelimiter "}"')));
       var ObjectPropertyDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
@@ -4773,14 +4780,24 @@ ${input.slice(result.pos)}
         var ws = $1;
         var at = $2;
         var id = $3;
+        const value = [{ ...at, token: "this." }, id];
         return {
           type: "Property",
-          children: [...ws, id, ": ", { ...at, token: "this." }, id],
-          names: id.names
+          children: [...ws, id, ": ", ...value],
+          name: id,
+          names: id.names,
+          value
         };
       });
       var PropertyDefinition$1 = NamedProperty;
-      var PropertyDefinition$2 = MethodDefinition;
+      var PropertyDefinition$2 = $TS($S(__, MethodDefinition), function($skip, $loc, $0, $1, $2) {
+        var ws = $1;
+        var def = $2;
+        return {
+          ...def,
+          children: [...ws, ...def.children]
+        };
+      });
       var PropertyDefinition$3 = $TS($S(__, DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
         var ws = $1;
         var dots = $2;
@@ -4788,7 +4805,8 @@ ${input.slice(result.pos)}
         return {
           type: "SpreadProperty",
           children: [...ws, dots, exp],
-          names: exp.names
+          names: exp.names,
+          value: [dots, exp]
         };
       });
       var PropertyDefinition$4 = $TS($S(__, IdentifierReference), function($skip, $loc, $0, $1, $2) {
@@ -4815,11 +4833,14 @@ ${input.slice(result.pos)}
         }
       }
       var NamedProperty$0 = $TS($S(__, PropertyName, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+        var name = $2;
         var exp = $5;
         return {
           type: "Property",
           children: $0,
-          names: exp.names || []
+          name,
+          names: exp.names || [],
+          value: exp
         };
       });
       function NamedProperty(state) {
@@ -4869,7 +4890,12 @@ ${input.slice(result.pos)}
       var PropertyName$0 = NumericLiteral;
       var PropertyName$1 = StringLiteral;
       var PropertyName$2 = IdentifierName;
-      var PropertyName$3 = $S(OpenBracket, ExtendedExpression, __, CloseBracket);
+      var PropertyName$3 = $TS($S(OpenBracket, ExtendedExpression, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+        return {
+          type: "ComputedPropertyName",
+          children: $0
+        };
+      });
       function PropertyName(state) {
         if (state.events) {
           const result = state.events.enter?.("PropertyName", state);
@@ -4927,11 +4953,14 @@ ${input.slice(result.pos)}
         }
       }
       var MethodDefinition$0 = $TS($S($E(Decorators), MethodSignature, BracedBlock), function($skip, $loc, $0, $1, $2, $3) {
+        var decorators = $1;
         var signature = $2;
         var block = $3;
         return {
           type: "MethodDefinition",
           children: $0,
+          name: signature.name,
+          decorators,
           signature,
           block,
           parameters: signature.parameters
@@ -4958,7 +4987,6 @@ ${input.slice(result.pos)}
       var MethodModifier$0 = $S(GetOrSet, $Q(TrailingComment));
       var MethodModifier$1 = $S($S(Async, __), $E($S(Star, __)));
       var MethodModifier$2 = $S(Star, __);
-      var MethodModifier$3 = $S(Async, __);
       function MethodModifier(state) {
         if (state.events) {
           const result = state.events.enter?.("MethodModifier", state);
@@ -4966,12 +4994,12 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("MethodModifier", state, MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state) || MethodModifier$3(state));
+          const result = $TOKEN("MethodModifier", state, MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state));
           if (state.events)
             state.events.exit?.("MethodModifier", state, result);
           return result;
         } else {
-          const result = MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state) || MethodModifier$3(state);
+          const result = MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state);
           if (state.events)
             state.events.exit?.("MethodModifier", state, result);
           return result;
@@ -5117,7 +5145,7 @@ ${input.slice(result.pos)}
       var AssignmentOpSymbol$15 = $T($EXPECT($L44, fail, 'AssignmentOpSymbol "?="'), function(value) {
         return "??=";
       });
-      var AssignmentOpSymbol$16 = $EXPECT($L24, fail, 'AssignmentOpSymbol "="');
+      var AssignmentOpSymbol$16 = $EXPECT($L25, fail, 'AssignmentOpSymbol "="');
       var AssignmentOpSymbol$17 = $T($S(CoffeeWordAssignmentOp), function(value) {
         return value[0];
       });
@@ -5200,7 +5228,7 @@ ${input.slice(result.pos)}
       });
       var BinaryOpSymbol$10 = $EXPECT($L56, fail, 'BinaryOpSymbol ">>>"');
       var BinaryOpSymbol$11 = $EXPECT($L57, fail, 'BinaryOpSymbol ">>"');
-      var BinaryOpSymbol$12 = $EXPECT($L25, fail, 'BinaryOpSymbol ">"');
+      var BinaryOpSymbol$12 = $EXPECT($L26, fail, 'BinaryOpSymbol ">"');
       var BinaryOpSymbol$13 = $EXPECT($L58, fail, 'BinaryOpSymbol "!=="');
       var BinaryOpSymbol$14 = $TV($EXPECT($L59, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
         if (module.config.coffeeEq)
@@ -5432,7 +5460,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var BlockStatement$0 = $T($S(ExplicitBlock, $N($S(__, $EXPECT($L24, fail, 'BlockStatement "="')))), function(value) {
+      var BlockStatement$0 = $T($S(ExplicitBlock, $N($S(__, $EXPECT($L25, fail, 'BlockStatement "="')))), function(value) {
         return value[0];
       });
       function BlockStatement(state) {
@@ -8980,7 +9008,7 @@ ${input.slice(result.pos)}
         }
       }
       var Async$0 = $TV($EXPECT($L92, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
-        return { $loc, token: $1 };
+        return { $loc, token: $1, type: "Async" };
       });
       function Async(state) {
         if (state.events) {
@@ -9126,7 +9154,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CloseBrace$0 = $TV($EXPECT($L28, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
+      var CloseBrace$0 = $TV($EXPECT($L16, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseBrace(state) {
@@ -9147,7 +9175,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CloseBracket$0 = $TV($EXPECT($L26, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
+      var CloseBracket$0 = $TV($EXPECT($L27, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function CloseBracket(state) {
@@ -9210,7 +9238,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Colon$0 = $TV($EXPECT($L27, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
+      var Colon$0 = $TV($EXPECT($L28, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Colon(state) {
@@ -9441,7 +9469,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Equals$0 = $TV($EXPECT($L24, fail, 'Equals "="'), function($skip, $loc, $0, $1) {
+      var Equals$0 = $TV($EXPECT($L25, fail, 'Equals "="'), function($skip, $loc, $0, $1) {
         return { $loc, token: $1 };
       });
       function Equals(state) {
@@ -9547,7 +9575,7 @@ ${input.slice(result.pos)}
         }
       }
       var GetOrSet$0 = $TS($S($C($EXPECT($L111, fail, 'GetOrSet "get"'), $EXPECT($L112, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-        return { $loc, token: $1 };
+        return { $loc, token: $1, type: "GetOrSet" };
       });
       function GetOrSet(state) {
         if (state.events) {
@@ -10382,7 +10410,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L25, fail, 'JSXOpeningElement ">"'));
+      var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L26, fail, 'JSXOpeningElement ">"'));
       function JSXOpeningElement(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXOpeningElement", state);
@@ -10401,7 +10429,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXClosingElement$0 = $S($EXPECT($L144, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L25, fail, 'JSXClosingElement ">"'));
+      var JSXClosingElement$0 = $S($EXPECT($L144, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L26, fail, 'JSXClosingElement ">"'));
       function JSXClosingElement(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXClosingElement", state);
@@ -10499,7 +10527,44 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXAttribute$0 = $S(OpenBrace, __, DotDotDot, ExtendedExpression, __, CloseBrace);
+      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, "={", module.insertTrimmingSpace(part.value, ""), "}"]);
+              }
+              break;
+            case "SpreadProperty":
+              parts.push(["{", part.value, "}"]);
+              break;
+            case "MethodDefinition":
+              try {
+                parts.push([part.name, "={", module.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;
+      });
       var JSXAttribute$1 = $S(JSXAttributeName, $E(JSXAttributeInitializer));
       function JSXAttribute(state) {
         if (state.events) {
@@ -11409,7 +11474,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeArguments$0 = $S(__, $EXPECT($L5, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L25, fail, 'TypeArguments ">"'));
+      var TypeArguments$0 = $S(__, $EXPECT($L5, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L26, fail, 'TypeArguments ">"'));
       function TypeArguments(state) {
         if (state.events) {
           const result = state.events.enter?.("TypeArguments", state);
@@ -11428,7 +11493,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L25, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+      var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L26, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
         return { ts: true, children: $0 };
       });
       function TypeParameters(state) {
@@ -11488,8 +11553,8 @@ ${input.slice(result.pos)}
         }
       }
       var TypeParameterDelimiter$0 = $S($Q(_), Comma);
-      var TypeParameterDelimiter$1 = $Y($S($Q(_), $EXPECT($L25, fail, 'TypeParameterDelimiter ">"')));
-      var TypeParameterDelimiter$2 = $TV($Y($S(__, $EXPECT($L25, fail, 'TypeParameterDelimiter ">"'))), function($skip, $loc, $0, $1) {
+      var TypeParameterDelimiter$1 = $Y($S($Q(_), $EXPECT($L26, fail, 'TypeParameterDelimiter ">"')));
+      var TypeParameterDelimiter$2 = $TV($Y($S(__, $EXPECT($L26, fail, 'TypeParameterDelimiter ">"'))), function($skip, $loc, $0, $1) {
         return { $loc, token: "," };
       });
       var TypeParameterDelimiter$3 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
@@ -12607,6 +12672,8 @@ ${input.slice(result.pos)}
         module.isWhitespaceOrEmpty = function(node) {
           if (!node)
             return true;
+          if (node.token)
+            return node.token.match(/^\s*$/);
           if (!node.length)
             return true;
           if (typeof node === "string")
@@ -13003,6 +13070,32 @@ ${input.slice(result.pos)}
               throw new Error("Unknown postfix statement");
           }
         };
+        module.convertMethodToFunction = function(method) {
+          const { decorators, signature, block } = method;
+          let opening = signature.children[0];
+          if (opening) {
+            if (opening[0].type === "GetOrSet") {
+              throw new Error("cannot convert get/set method to function");
+            } else if (opening[0][0]?.type === "Async") {
+              opening = [opening[0][0], " function ", ...opening.slice(1)];
+            } else {
+              opening = ["function ", ...opening];
+            }
+          } else {
+            opening = "function ";
+          }
+          return {
+            ...signature,
+            id: signature.name,
+            type: "FunctionExpression",
+            children: [
+              decorators,
+              [opening, ...signature.children.slice(1)],
+              block
+            ],
+            block
+          };
+        };
         module.processProgram = function(statements) {
           processAssignments(statements);
           processFunctions(statements);

package/dist/main.js

@@ -938,19 +938,19 @@ ${input.slice(result.pos)}
     var $L13 = $L("import.meta");
     var $L14 = $L(")");
     var $L15 = $L("->");
-    var $L16 = $L("null");
-    var $L17 = $L("true");
-    var $L18 = $L("false");
-    var $L19 = $L("yes");
-    var $L20 = $L("on");
-    var $L21 = $L("no");
-    var $L22 = $L("off");
-    var $L23 = $L(",");
-    var $L24 = $L("=");
-    var $L25 = $L(">");
-    var $L26 = $L("]");
-    var $L27 = $L(":");
-    var $L28 = $L("}");
+    var $L16 = $L("}");
+    var $L17 = $L("null");
+    var $L18 = $L("true");
+    var $L19 = $L("false");
+    var $L20 = $L("yes");
+    var $L21 = $L("on");
+    var $L22 = $L("no");
+    var $L23 = $L("off");
+    var $L24 = $L(",");
+    var $L25 = $L("=");
+    var $L26 = $L(">");
+    var $L27 = $L("]");
+    var $L28 = $L(":");
     var $L29 = $L("**=");
     var $L30 = $L("*=");
     var $L31 = $L("/=");
@@ -3807,8 +3807,15 @@ ${input.slice(result.pos)}
       return {
         type: "BlockStatement",
         expressions,
-        children: [$1, expressions],
-        bare: true
+        children: [$1, expressions]
+      };
+    });
+    var BracedContent$2 = $TV($Y($S(__, $EXPECT($L16, fail, 'BracedContent "}"'))), function($skip, $loc, $0, $1) {
+      const expressions = [];
+      return {
+        type: "BlockStatement",
+        expressions,
+        children: [expressions]
       };
     });
     function BracedContent(state) {
@@ -3818,12 +3825,12 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("BracedContent", state, BracedContent$0(state) || BracedContent$1(state));
+        const result = $TOKEN("BracedContent", state, BracedContent$0(state) || BracedContent$1(state) || BracedContent$2(state));
         if (state.events)
           state.events.exit?.("BracedContent", state, result);
         return result;
       } else {
-        const result = BracedContent$0(state) || BracedContent$1(state);
+        const result = BracedContent$0(state) || BracedContent$1(state) || BracedContent$2(state);
         if (state.events)
           state.events.exit?.("BracedContent", state, result);
         return result;
@@ -3928,7 +3935,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NullLiteral$0 = $TV($EXPECT($L16, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
+    var NullLiteral$0 = $TV($EXPECT($L17, fail, 'NullLiteral "null"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function NullLiteral(state) {
@@ -3952,7 +3959,7 @@ ${input.slice(result.pos)}
     var BooleanLiteral$0 = $T($S(CoffeeBooleansEnabled, CoffeeScriptBooleanLiteral), function(value) {
       return value[1];
     });
-    var BooleanLiteral$1 = $TS($S($C($EXPECT($L17, fail, 'BooleanLiteral "true"'), $EXPECT($L18, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var BooleanLiteral$1 = $TS($S($C($EXPECT($L18, fail, 'BooleanLiteral "true"'), $EXPECT($L19, fail, 'BooleanLiteral "false"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: $1 };
     });
     function BooleanLiteral(state) {
@@ -3973,10 +3980,10 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L19, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L20, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var CoffeeScriptBooleanLiteral$0 = $TS($S($C($EXPECT($L20, fail, 'CoffeeScriptBooleanLiteral "yes"'), $EXPECT($L21, fail, 'CoffeeScriptBooleanLiteral "on"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "true" };
     });
-    var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L21, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L22, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
+    var CoffeeScriptBooleanLiteral$1 = $TS($S($C($EXPECT($L22, fail, 'CoffeeScriptBooleanLiteral "no"'), $EXPECT($L23, fail, 'CoffeeScriptBooleanLiteral "off"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
       return { $loc, token: "false" };
     });
     function CoffeeScriptBooleanLiteral(state) {
@@ -3997,7 +4004,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Comma$0 = $TV($EXPECT($L23, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
+    var Comma$0 = $TV($EXPECT($L24, fail, 'Comma ","'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Comma(state) {
@@ -4087,7 +4094,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var UpcomingAssignment$0 = $Y($S(__, $EXPECT($L24, fail, 'UpcomingAssignment "="'), $N($C($EXPECT($L24, fail, 'UpcomingAssignment "="'), $EXPECT($L25, fail, 'UpcomingAssignment ">"')))));
+    var UpcomingAssignment$0 = $Y($S(__, $EXPECT($L25, fail, 'UpcomingAssignment "="'), $N($C($EXPECT($L25, fail, 'UpcomingAssignment "="'), $EXPECT($L26, fail, 'UpcomingAssignment ">"')))));
     function UpcomingAssignment(state) {
       if (state.events) {
         const result = state.events.enter?.("UpcomingAssignment", state);
@@ -4326,7 +4333,7 @@ ${input.slice(result.pos)}
       }
     }
     var ArrayElementDelimiter$0 = $S(__, Comma);
-    var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L26, fail, 'ArrayElementDelimiter "]"')));
+    var ArrayElementDelimiter$1 = $Y($S(__, $EXPECT($L27, fail, 'ArrayElementDelimiter "]"')));
     var ArrayElementDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
       return { $loc, token: "," };
     });
@@ -4691,11 +4698,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ImplicitInlineObjectPropertyDelimiter$0 = $S($Q(TrailingComment), $EXPECT($L23, fail, 'ImplicitInlineObjectPropertyDelimiter ","'));
+    var ImplicitInlineObjectPropertyDelimiter$0 = $S($Q(TrailingComment), $EXPECT($L24, fail, 'ImplicitInlineObjectPropertyDelimiter ","'));
     var ImplicitInlineObjectPropertyDelimiter$1 = $T($Y($S(EOS, NamedProperty)), function(value) {
       return ",";
     });
-    var ImplicitInlineObjectPropertyDelimiter$2 = $T($Y($S(__, $C($EXPECT($L27, fail, 'ImplicitInlineObjectPropertyDelimiter ":"'), $EXPECT($L14, fail, 'ImplicitInlineObjectPropertyDelimiter ")"'), $EXPECT($L26, fail, 'ImplicitInlineObjectPropertyDelimiter "]"'), $EXPECT($L28, fail, 'ImplicitInlineObjectPropertyDelimiter "}"'), ReservedWord))), function(value) {
+    var ImplicitInlineObjectPropertyDelimiter$2 = $T($Y($S(__, $C($EXPECT($L28, fail, 'ImplicitInlineObjectPropertyDelimiter ":"'), $EXPECT($L14, fail, 'ImplicitInlineObjectPropertyDelimiter ")"'), $EXPECT($L27, fail, 'ImplicitInlineObjectPropertyDelimiter "]"'), $EXPECT($L16, fail, 'ImplicitInlineObjectPropertyDelimiter "}"'), ReservedWord))), function(value) {
       return "";
     });
     var ImplicitInlineObjectPropertyDelimiter$3 = $T($Y(EOS), function(value) {
@@ -4720,7 +4727,7 @@ ${input.slice(result.pos)}
       }
     }
     var ObjectPropertyDelimiter$0 = $S($Q(_), Comma);
-    var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L28, fail, 'ObjectPropertyDelimiter "}"')));
+    var ObjectPropertyDelimiter$1 = $Y($S(__, $EXPECT($L16, fail, 'ObjectPropertyDelimiter "}"')));
     var ObjectPropertyDelimiter$2 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
       return { $loc, token: "," };
     });
@@ -4772,14 +4779,24 @@ ${input.slice(result.pos)}
       var ws = $1;
       var at = $2;
       var id = $3;
+      const value = [{ ...at, token: "this." }, id];
       return {
         type: "Property",
-        children: [...ws, id, ": ", { ...at, token: "this." }, id],
-        names: id.names
+        children: [...ws, id, ": ", ...value],
+        name: id,
+        names: id.names,
+        value
       };
     });
     var PropertyDefinition$1 = NamedProperty;
-    var PropertyDefinition$2 = MethodDefinition;
+    var PropertyDefinition$2 = $TS($S(__, MethodDefinition), function($skip, $loc, $0, $1, $2) {
+      var ws = $1;
+      var def = $2;
+      return {
+        ...def,
+        children: [...ws, ...def.children]
+      };
+    });
     var PropertyDefinition$3 = $TS($S(__, DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
       var ws = $1;
       var dots = $2;
@@ -4787,7 +4804,8 @@ ${input.slice(result.pos)}
       return {
         type: "SpreadProperty",
         children: [...ws, dots, exp],
-        names: exp.names
+        names: exp.names,
+        value: [dots, exp]
       };
     });
     var PropertyDefinition$4 = $TS($S(__, IdentifierReference), function($skip, $loc, $0, $1, $2) {
@@ -4814,11 +4832,14 @@ ${input.slice(result.pos)}
       }
     }
     var NamedProperty$0 = $TS($S(__, PropertyName, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var name = $2;
       var exp = $5;
       return {
         type: "Property",
         children: $0,
-        names: exp.names || []
+        name,
+        names: exp.names || [],
+        value: exp
       };
     });
     function NamedProperty(state) {
@@ -4868,7 +4889,12 @@ ${input.slice(result.pos)}
     var PropertyName$0 = NumericLiteral;
     var PropertyName$1 = StringLiteral;
     var PropertyName$2 = IdentifierName;
-    var PropertyName$3 = $S(OpenBracket, ExtendedExpression, __, CloseBracket);
+    var PropertyName$3 = $TS($S(OpenBracket, ExtendedExpression, __, CloseBracket), function($skip, $loc, $0, $1, $2, $3, $4) {
+      return {
+        type: "ComputedPropertyName",
+        children: $0
+      };
+    });
     function PropertyName(state) {
       if (state.events) {
         const result = state.events.enter?.("PropertyName", state);
@@ -4926,11 +4952,14 @@ ${input.slice(result.pos)}
       }
     }
     var MethodDefinition$0 = $TS($S($E(Decorators), MethodSignature, BracedBlock), function($skip, $loc, $0, $1, $2, $3) {
+      var decorators = $1;
       var signature = $2;
       var block = $3;
       return {
         type: "MethodDefinition",
         children: $0,
+        name: signature.name,
+        decorators,
         signature,
         block,
         parameters: signature.parameters
@@ -4957,7 +4986,6 @@ ${input.slice(result.pos)}
     var MethodModifier$0 = $S(GetOrSet, $Q(TrailingComment));
     var MethodModifier$1 = $S($S(Async, __), $E($S(Star, __)));
     var MethodModifier$2 = $S(Star, __);
-    var MethodModifier$3 = $S(Async, __);
     function MethodModifier(state) {
       if (state.events) {
         const result = state.events.enter?.("MethodModifier", state);
@@ -4965,12 +4993,12 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("MethodModifier", state, MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state) || MethodModifier$3(state));
+        const result = $TOKEN("MethodModifier", state, MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state));
         if (state.events)
           state.events.exit?.("MethodModifier", state, result);
         return result;
       } else {
-        const result = MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state) || MethodModifier$3(state);
+        const result = MethodModifier$0(state) || MethodModifier$1(state) || MethodModifier$2(state);
         if (state.events)
           state.events.exit?.("MethodModifier", state, result);
         return result;
@@ -5116,7 +5144,7 @@ ${input.slice(result.pos)}
     var AssignmentOpSymbol$15 = $T($EXPECT($L44, fail, 'AssignmentOpSymbol "?="'), function(value) {
       return "??=";
     });
-    var AssignmentOpSymbol$16 = $EXPECT($L24, fail, 'AssignmentOpSymbol "="');
+    var AssignmentOpSymbol$16 = $EXPECT($L25, fail, 'AssignmentOpSymbol "="');
     var AssignmentOpSymbol$17 = $T($S(CoffeeWordAssignmentOp), function(value) {
       return value[0];
     });
@@ -5199,7 +5227,7 @@ ${input.slice(result.pos)}
     });
     var BinaryOpSymbol$10 = $EXPECT($L56, fail, 'BinaryOpSymbol ">>>"');
     var BinaryOpSymbol$11 = $EXPECT($L57, fail, 'BinaryOpSymbol ">>"');
-    var BinaryOpSymbol$12 = $EXPECT($L25, fail, 'BinaryOpSymbol ">"');
+    var BinaryOpSymbol$12 = $EXPECT($L26, fail, 'BinaryOpSymbol ">"');
     var BinaryOpSymbol$13 = $EXPECT($L58, fail, 'BinaryOpSymbol "!=="');
     var BinaryOpSymbol$14 = $TV($EXPECT($L59, fail, 'BinaryOpSymbol "!="'), function($skip, $loc, $0, $1) {
       if (module2.config.coffeeEq)
@@ -5431,7 +5459,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var BlockStatement$0 = $T($S(ExplicitBlock, $N($S(__, $EXPECT($L24, fail, 'BlockStatement "="')))), function(value) {
+    var BlockStatement$0 = $T($S(ExplicitBlock, $N($S(__, $EXPECT($L25, fail, 'BlockStatement "="')))), function(value) {
       return value[0];
     });
     function BlockStatement(state) {
@@ -8979,7 +9007,7 @@ ${input.slice(result.pos)}
       }
     }
     var Async$0 = $TV($EXPECT($L92, fail, 'Async "async"'), function($skip, $loc, $0, $1) {
-      return { $loc, token: $1 };
+      return { $loc, token: $1, type: "Async" };
     });
     function Async(state) {
       if (state.events) {
@@ -9125,7 +9153,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CloseBrace$0 = $TV($EXPECT($L28, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
+    var CloseBrace$0 = $TV($EXPECT($L16, fail, 'CloseBrace "}"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseBrace(state) {
@@ -9146,7 +9174,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CloseBracket$0 = $TV($EXPECT($L26, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
+    var CloseBracket$0 = $TV($EXPECT($L27, fail, 'CloseBracket "]"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function CloseBracket(state) {
@@ -9209,7 +9237,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Colon$0 = $TV($EXPECT($L27, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
+    var Colon$0 = $TV($EXPECT($L28, fail, 'Colon ":"'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Colon(state) {
@@ -9440,7 +9468,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Equals$0 = $TV($EXPECT($L24, fail, 'Equals "="'), function($skip, $loc, $0, $1) {
+    var Equals$0 = $TV($EXPECT($L25, fail, 'Equals "="'), function($skip, $loc, $0, $1) {
       return { $loc, token: $1 };
     });
     function Equals(state) {
@@ -9546,7 +9574,7 @@ ${input.slice(result.pos)}
       }
     }
     var GetOrSet$0 = $TS($S($C($EXPECT($L111, fail, 'GetOrSet "get"'), $EXPECT($L112, fail, 'GetOrSet "set"')), NonIdContinue), function($skip, $loc, $0, $1, $2) {
-      return { $loc, token: $1 };
+      return { $loc, token: $1, type: "GetOrSet" };
     });
     function GetOrSet(state) {
       if (state.events) {
@@ -10381,7 +10409,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L25, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(JSXAttributes), __, $EXPECT($L26, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXOpeningElement", state);
@@ -10400,7 +10428,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingElement$0 = $S($EXPECT($L144, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L25, fail, 'JSXClosingElement ">"'));
+    var JSXClosingElement$0 = $S($EXPECT($L144, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L26, fail, 'JSXClosingElement ">"'));
     function JSXClosingElement(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXClosingElement", state);
@@ -10498,7 +10526,44 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXAttribute$0 = $S(OpenBrace, __, DotDotDot, ExtendedExpression, __, CloseBrace);
+    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, "={", module2.insertTrimmingSpace(part.value, ""), "}"]);
+            }
+            break;
+          case "SpreadProperty":
+            parts.push(["{", 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;
+    });
     var JSXAttribute$1 = $S(JSXAttributeName, $E(JSXAttributeInitializer));
     function JSXAttribute(state) {
       if (state.events) {
@@ -11408,7 +11473,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeArguments$0 = $S(__, $EXPECT($L5, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L25, fail, 'TypeArguments ">"'));
+    var TypeArguments$0 = $S(__, $EXPECT($L5, fail, 'TypeArguments "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L26, fail, 'TypeArguments ">"'));
     function TypeArguments(state) {
       if (state.events) {
         const result = state.events.enter?.("TypeArguments", state);
@@ -11427,7 +11492,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L25, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
+    var TypeParameters$0 = $TS($S(__, $EXPECT($L5, fail, 'TypeParameters "<"'), __, Type, $Q($S(__, Comma, __, Type)), $E($S(__, Comma)), __, $EXPECT($L26, fail, 'TypeParameters ">"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
       return { ts: true, children: $0 };
     });
     function TypeParameters(state) {
@@ -11487,8 +11552,8 @@ ${input.slice(result.pos)}
       }
     }
     var TypeParameterDelimiter$0 = $S($Q(_), Comma);
-    var TypeParameterDelimiter$1 = $Y($S($Q(_), $EXPECT($L25, fail, 'TypeParameterDelimiter ">"')));
-    var TypeParameterDelimiter$2 = $TV($Y($S(__, $EXPECT($L25, fail, 'TypeParameterDelimiter ">"'))), function($skip, $loc, $0, $1) {
+    var TypeParameterDelimiter$1 = $Y($S($Q(_), $EXPECT($L26, fail, 'TypeParameterDelimiter ">"')));
+    var TypeParameterDelimiter$2 = $TV($Y($S(__, $EXPECT($L26, fail, 'TypeParameterDelimiter ">"'))), function($skip, $loc, $0, $1) {
       return { $loc, token: "," };
     });
     var TypeParameterDelimiter$3 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
@@ -12606,6 +12671,8 @@ ${input.slice(result.pos)}
       module2.isWhitespaceOrEmpty = function(node) {
         if (!node)
           return true;
+        if (node.token)
+          return node.token.match(/^\s*$/);
         if (!node.length)
           return true;
         if (typeof node === "string")
@@ -13002,6 +13069,32 @@ ${input.slice(result.pos)}
             throw new Error("Unknown postfix statement");
         }
       };
+      module2.convertMethodToFunction = function(method) {
+        const { decorators, signature, block } = method;
+        let opening = signature.children[0];
+        if (opening) {
+          if (opening[0].type === "GetOrSet") {
+            throw new Error("cannot convert get/set method to function");
+          } else if (opening[0][0]?.type === "Async") {
+            opening = [opening[0][0], " function ", ...opening.slice(1)];
+          } else {
+            opening = ["function ", ...opening];
+          }
+        } else {
+          opening = "function ";
+        }
+        return {
+          ...signature,
+          id: signature.name,
+          type: "FunctionExpression",
+          children: [
+            decorators,
+            [opening, ...signature.children.slice(1)],
+            block
+          ],
+          block
+        };
+      };
       module2.processProgram = function(statements) {
         processAssignments(statements);
         processFunctions(statements);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.4.28",
+  "version": "0.4.30",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "exports": {