@danielx/civet 0.7.26 → 0.7.28

package/dist/main.mjs

@@ -504,6 +504,7 @@ __export(lib_exports, {
   expressionizeTypeIf: () => expressionizeTypeIf,
   forRange: () => forRange,
   gatherBindingCode: () => gatherBindingCode,
+  gatherBindingPatternTypeSuffix: () => gatherBindingPatternTypeSuffix,
   gatherRecursive: () => gatherRecursive,
   gatherRecursiveAll: () => gatherRecursiveAll,
   gatherRecursiveWithinFunction: () => gatherRecursiveWithinFunction,
@@ -1307,7 +1308,7 @@ function maybeRefAssignment(exp, base = "ref") {
 
 // source/parser/binding.civet
 function adjustAtBindings(statements, asThis = false) {
-  gatherRecursiveAll(statements, (n) => n.type === "AtBindingProperty").forEach((binding) => {
+  gatherRecursiveAll(statements, ($) => $.type === "AtBindingProperty").forEach((binding) => {
     const { ref } = binding;
     if (asThis) {
       const atBinding = binding.binding;
@@ -1326,17 +1327,19 @@ function adjustAtBindings(statements, asThis = false) {
   });
 }
 function adjustBindingElements(elements) {
-  const names = elements.flatMap((p) => p.names || []), { length } = elements;
+  const names = elements.flatMap(($1) => $1.names || []);
+  const { length } = elements;
   let blockPrefix, restIndex = -1, restCount = 0;
-  elements.forEach(({ type }, i) => {
+  for (let i1 = 0, len3 = elements.length; i1 < len3; i1++) {
+    const i = i1;
+    const { type } = elements[i1];
     if (type === "BindingRestElement") {
-      if (restIndex < 0)
+      if (restIndex < 0) {
         restIndex = i;
-      return restCount++;
+      }
+      restCount++;
     }
-    ;
-    return;
-  });
+  }
   if (restCount === 0) {
     return {
       children: elements,
@@ -1355,7 +1358,7 @@ function adjustBindingElements(elements) {
         l++;
       blockPrefix = {
         type: "PostRestBindingElements",
-        children: ["[", insertTrimmingSpace(after, ""), "] = ", restIdentifier, ".splice(-", l.toString(), ")"],
+        children: ["[", trimFirstSpace(after), "] = ", restIdentifier, ".splice(-", l.toString(), ")"],
         names: after.flatMap((p) => p.names)
       };
     }
@@ -1415,6 +1418,100 @@ function arrayElementHasTrailingComma(elementNode) {
   const lastChild = (ref1 = elementNode.children)[ref1.length - 1];
   return lastChild && lastChild[lastChild.length - 1]?.token === ",";
 }
+function gatherBindingPatternTypeSuffix(pattern) {
+  if (pattern.typeSuffix != null) {
+    return pattern;
+  }
+  let count = 0;
+  switch (pattern.type) {
+    case "ArrayBindingPattern": {
+      const results = [];
+      for (let ref2 = pattern.elements, i2 = 0, len1 = ref2.length; i2 < len1; i2++) {
+        const elem = ref2[i2];
+        let { typeSuffix } = elem;
+        typeSuffix ??= elem.binding?.typeSuffix;
+        if (typeSuffix) {
+          count++;
+        }
+        let typeElement = [typeSuffix?.t, elem.delim];
+        if (typeSuffix?.optional) {
+          typeElement[0] = parenthesizeType(typeElement[0]);
+          typeElement.unshift("undefined |");
+        }
+        if (elem.type === "BindingRestElement") {
+          typeElement[0] ??= "unknown[]";
+          typeElement.unshift(elem.dots);
+        } else {
+          typeElement[0] ??= "unknown";
+        }
+        results.push(typeElement);
+      }
+      ;
+      const types = results;
+      if (count) {
+        const t = [": [", types, "]"];
+        pattern.typeSuffix = {
+          type: "TypeSuffix",
+          ts: true,
+          t,
+          children: [t]
+        };
+      }
+      ;
+      break;
+    }
+    case "ObjectBindingPattern": {
+      let restType;
+      const results1 = [];
+      for (let ref3 = pattern.properties, i3 = 0, len22 = ref3.length; i3 < len22; i3++) {
+        const prop = ref3[i3];
+        let { typeSuffix } = prop;
+        typeSuffix ??= prop.value?.typeSuffix;
+        if (typeSuffix) {
+          count++;
+        }
+        typeSuffix ??= {
+          type: "TypeSuffix",
+          ts: true,
+          children: [": unknown"]
+        };
+        switch (prop.type) {
+          case "BindingProperty": {
+            const ws = prop.children.slice(0, prop.children.indexOf(prop.name));
+            results1.push([...ws, prop.name, typeSuffix, prop.delim]);
+            break;
+          }
+          case "AtBindingProperty": {
+            const ws = prop.children.slice(0, prop.children.indexOf(prop.binding));
+            results1.push([...ws, prop.ref.id, typeSuffix, prop.delim]);
+            break;
+          }
+          case "BindingRestProperty": {
+            restType = prop.typeSuffix?.t;
+            continue;
+          }
+        }
+      }
+      ;
+      const types = results1;
+      if (count) {
+        const t = ["{", types, "}"];
+        if (restType != null) {
+          t.push(" & ", parenthesizeType(trimFirstSpace(restType)));
+        }
+        pattern.typeSuffix = {
+          type: "TypeSuffix",
+          ts: true,
+          t,
+          children: [": ", t]
+        };
+      }
+      ;
+      break;
+    }
+  }
+  return pattern;
+}
 
 // source/parser/function.civet
 function isVoidType(t) {
@@ -2934,12 +3031,14 @@ function getPatternConditions(pattern, ref, conditions = []) {
       });
       const { blockPrefix } = pattern;
       if (blockPrefix) {
-        const postElements = blockPrefix.children[1], { length: postLength } = postElements;
+        const postElements = blockPrefix.children[1];
+        const { length: postLength } = postElements;
         postElements.forEach(({ children: [, e] }, i) => {
           const subRef = [ref, "[", ref, ".length - ", (postLength + i).toString(), "]"];
           return getPatternConditions(e, subRef, conditions);
         });
       }
+      ;
       break;
     }
     case "ObjectBindingPattern": {
@@ -2947,34 +3046,46 @@ function getPatternConditions(pattern, ref, conditions = []) {
         ["typeof ", ref, " === 'object'"],
         [ref, " != null"]
       );
-      pattern.properties.forEach((p) => {
+      for (let ref1 = pattern.properties, i4 = 0, len3 = ref1.length; i4 < len3; i4++) {
+        const p = ref1[i4];
         switch (p.type) {
           case "PinProperty":
           case "BindingProperty": {
             const { name, value } = p;
             let subRef;
             switch (name.type) {
-              case "ComputedPropertyName":
+              case "ComputedPropertyName": {
                 conditions.push([name.expression, " in ", ref]);
                 subRef = [ref, name];
                 break;
+              }
               case "Literal":
               case "StringLiteral":
-              case "NumericLiteral":
+              case "NumericLiteral": {
                 conditions.push([name, " in ", ref]);
                 subRef = [ref, "[", name, "]"];
                 break;
-              default:
-                conditions.push(["'", name, "' in ", ref]);
-                subRef = [ref, ".", name];
+              }
+              case "Identifier": {
+                conditions.push(["'", name.name, "' in ", ref]);
+                subRef = [ref, ".", name.name];
+                break;
+              }
+              case "AtBinding": {
+                conditions.push(["'", name.ref.id, "' in ", ref]);
+                subRef = [ref, ".", name.ref.id];
+                break;
+              }
             }
             if (value) {
               getPatternConditions(value, subRef, conditions);
             }
+            ;
             break;
           }
         }
-      });
+      }
+      ;
       break;
     }
     case "ConditionFragment": {
@@ -2998,22 +3109,22 @@ function getPatternConditions(pattern, ref, conditions = []) {
       );
       break;
     }
-    case "PinPattern":
+    case "PinPattern": {
       conditions.push([
         ref,
         " === ",
         pattern.expression
       ]);
       break;
-    case "Literal":
+    }
+    case "Literal": {
       conditions.push([
         ref,
         " === ",
         pattern
       ]);
       break;
-    default:
-      break;
+    }
   }
   return conditions;
 }
@@ -3244,6 +3355,9 @@ function processAssignmentDeclaration(decl, pattern, suffix, ws, assign, e) {
   let [splices, assignments] = gatherBindingCode(pattern);
   splices = splices.map((s) => [", ", s]);
   const thisAssignments = assignments.map((a) => ["", a, ";"]);
+  if ("typeSuffix" in pattern) {
+    suffix ??= pattern.typeSuffix;
+  }
   const initializer = makeNode({
     type: "Initializer",
     expression: e,
@@ -6514,6 +6628,7 @@ var grammar = {
   NestedBindingPropertyList,
   BindingProperty,
   BindingRestProperty,
+  BindingTypeSuffix,
   NestedBindingElements,
   BindingElement,
   BindingRestElement,
@@ -6851,6 +6966,7 @@ var grammar = {
   DotDot,
   DotDotDot,
   DoubleColon,
+  DoubleColonAsColon,
   DoubleQuote,
   Each,
   Else,
@@ -6954,17 +7070,24 @@ var grammar = {
   InlineJSXMemberExpressionRest,
   InlineJSXPrimaryExpression,
   JSXMixedChildren,
+  JSXSameLineChildren,
   JSXChildren,
   JSXNestedChildren,
   JSXEOS,
   JSXNested,
   JSXChild,
+  JSXChildForcedCode,
+  JSXChildForcedNoCode,
+  JSXChildGeneral,
   JSXComment,
   JSXCommentContent,
   JSXText,
   JSXChildExpression,
   IndentedJSXChildExpression,
   NestedJSXChildExpression,
+  JSXAngleChild,
+  JSXCodeChild,
+  JSXCodeChildExpression,
   UsingDeclaration,
   UsingBinding,
   UsingJSModeError,
@@ -7097,6 +7220,8 @@ var grammar = {
   CoffeeNotEnabled,
   CoffeeOfEnabled,
   CoffeePrototypeEnabled,
+  JSXCodeNestedEnabled,
+  JSXCodeSameLineEnabled,
   ObjectIsEnabled,
   Reset,
   Init,
@@ -7357,7 +7482,7 @@ var $R2 = (0, import_lib3.$R)(new RegExp("(as|of|satisfies|then|when|implements|
 var $R3 = (0, import_lib3.$R)(new RegExp("[0-9]", "suy"));
 var $R4 = (0, import_lib3.$R)(new RegExp("(?!\\p{ID_Start}|[_$0-9(\\[{])", "suy"));
 var $R5 = (0, import_lib3.$R)(new RegExp("[ \\t]", "suy"));
-var $R6 = (0, import_lib3.$R)(new RegExp("\\p{ID_Continue}|[\\u200C\\u200D$.#]", "suy"));
+var $R6 = (0, import_lib3.$R)(new RegExp("\\p{ID_Continue}|[\\u200C\\u200D$.#{]", "suy"));
 var $R7 = (0, import_lib3.$R)(new RegExp("[&=]", "suy"));
 var $R8 = (0, import_lib3.$R)(new RegExp("(?=['\"`])", "suy"));
 var $R9 = (0, import_lib3.$R)(new RegExp("(?=[\\/?])", "suy"));
@@ -8343,7 +8468,7 @@ var ParenthesizedExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenPar
 function ParenthesizedExpression(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ParenthesizedExpression", ParenthesizedExpression$0);
 }
-var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /\\p{ID_Continue}|[\\u200C\\u200D$.#]/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
+var Placeholder$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Dot, (0, import_lib3.$N)((0, import_lib3.$EXPECT)($R6, "Placeholder /\\p{ID_Continue}|[\\u200C\\u200D$.#{]/")), (0, import_lib3.$E)(PlaceholderTypeSuffix)), function($skip, $loc, $0, $1, $2, $3) {
   var dot = $1;
   var typeSuffix = $3;
   return {
@@ -8363,7 +8488,7 @@ var Placeholder$1 = (0, import_lib3.$TS)((0, import_lib3.$S)(Ampersand, (0, impo
     children: [amp]
   };
 });
-var Placeholder$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Y)(ExplicitAccessStart), (0, import_lib3.$Y)(PropertyAccess), (0, import_lib3.$N)(NumericLiteral)), function($skip, $loc, $0, $1, $2, $3) {
+var Placeholder$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Y)(ExplicitAccessStart), (0, import_lib3.$Y)((0, import_lib3.$C)(PropertyAccess, PropertyGlob)), (0, import_lib3.$N)(NumericLiteral)), function($skip, $loc, $0, $1, $2, $3) {
   return {
     type: "Placeholder",
     subtype: "&",
@@ -9432,9 +9557,10 @@ var ParameterElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib
   var typeSuffix = $5;
   var initializer = $6;
   var delim = $7;
+  typeSuffix ??= binding.typeSuffix;
   return {
     type: "Parameter",
-    children: $0,
+    children: [$1, accessModifier, $3, binding, typeSuffix, initializer, delim],
     names: binding.names,
     typeSuffix,
     accessModifier,
@@ -9550,12 +9676,13 @@ var ObjectBindingPattern$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import
   var c = $3;
   var ws2 = $4;
   var close = $5;
-  return {
+  const properties = c.children;
+  return gatherBindingPatternTypeSuffix({
     type: "ObjectBindingPattern",
-    children: [ws1, open, c.children, ws2, close],
+    children: [ws1, open, properties, ws2, close],
     names: c.names,
-    properties: c.children
-  };
+    properties
+  });
 });
 function ObjectBindingPattern(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ObjectBindingPattern", ObjectBindingPattern$0);
@@ -9590,13 +9717,13 @@ var ArrayBindingPattern$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_
   var c = $3;
   var ws2 = $4;
   var close = $5;
-  return {
+  return gatherBindingPatternTypeSuffix({
     ...c,
     // names, blockPrefix, length
     type: "ArrayBindingPattern",
     elements: c.children,
     children: [ws1, open, c.children, ws2, close]
-  };
+  });
 });
 function ArrayBindingPattern(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "ArrayBindingPattern", ArrayBindingPattern$0);
@@ -9617,6 +9744,7 @@ var BindingElementList$0 = (0, import_lib3.$TV)((0, import_lib3.$P)((0, import_l
   return elements.map(([element, delim]) => {
     return {
       ...element,
+      delim,
       // BindingElement.children is a tuple of the form [ws, element]
       children: [...element.children, delim]
     };
@@ -9667,38 +9795,57 @@ function NestedBindingPropertyList(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "NestedBindingPropertyList", NestedBindingPropertyList$0);
 }
 var BindingProperty$0 = BindingRestProperty;
-var BindingProperty$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), PropertyName, (0, import_lib3.$E)(_), Colon, (0, import_lib3.$E)(_), (0, import_lib3.$C)(BindingIdentifier, BindingPattern), (0, import_lib3.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+var BindingProperty$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), PropertyName, (0, import_lib3.$E)(_), Colon, (0, import_lib3.$E)(_), (0, import_lib3.$C)(BindingIdentifier, BindingPattern), (0, import_lib3.$E)(BindingTypeSuffix), (0, import_lib3.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
   var name = $2;
   var value = $6;
-  var initializer = $7;
+  var typeSuffix = $7;
+  var initializer = $8;
   return {
     type: "BindingProperty",
-    children: $0,
+    children: [$1, name, $3, $4, $5, value, initializer],
+    // omit typeSuffix
     name,
     value,
+    typeSuffix,
     initializer,
     names: value.names
   };
 });
-var BindingProperty$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$E)(Caret), BindingIdentifier, (0, import_lib3.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
+var BindingProperty$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$E)(Caret), BindingIdentifier, (0, import_lib3.$E)(BindingTypeSuffix), (0, import_lib3.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var ws = $1;
   var pin = $2;
   var binding = $3;
-  var initializer = $4;
+  var typeSuffix = $4;
+  var initializer = $5;
+  let children = [ws, binding, initializer];
   if (binding.type === "AtBinding") {
     return {
       type: "AtBindingProperty",
-      children: $0,
+      children,
       binding,
+      typeSuffix,
       ref: binding.ref,
       initializer,
       names: []
     };
   }
   if (pin) {
+    children = [ws, binding];
+    if (typeSuffix) {
+      children.push({
+        type: "Error",
+        message: "Pinned properties cannot have type annotations"
+      });
+    }
+    if (initializer) {
+      children.push({
+        type: "Error",
+        message: "Pinned properties cannot have initializers"
+      });
+    }
     return {
       type: "PinProperty",
-      children: [ws, binding],
+      children,
       name: binding,
       value: {
         type: "PinPattern",
@@ -9708,9 +9855,10 @@ var BindingProperty$2 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3
   }
   return {
     type: "BindingProperty",
-    children: $0,
+    children,
     name: binding,
     value: void 0,
+    typeSuffix,
     initializer,
     names: binding.names,
     identifier: binding
@@ -9720,13 +9868,15 @@ var BindingProperty$$ = [BindingProperty$0, BindingProperty$1, BindingProperty$2
 function BindingProperty(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "BindingProperty", BindingProperty$$);
 }
-var BindingRestProperty$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), DotDotDot, BindingIdentifier), function($skip, $loc, $0, $1, $2, $3) {
+var BindingRestProperty$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), DotDotDot, BindingIdentifier, (0, import_lib3.$E)(BindingTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws = $1;
   var dots = $2;
   var id = $3;
+  var typeSuffix = $4;
   return {
     ...id,
     type: "BindingRestProperty",
+    typeSuffix,
     children: [...ws || [], dots, ...id.children]
   };
 });
@@ -9737,6 +9887,7 @@ var BindingRestProperty$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_
   return {
     ...id,
     type: "BindingRestProperty",
+    typeSuffix: void 0,
     children: [...ws || [], dots, ...id.children]
   };
 });
@@ -9744,6 +9895,21 @@ var BindingRestProperty$$ = [BindingRestProperty$0, BindingRestProperty$1];
 function BindingRestProperty(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "BindingRestProperty", BindingRestProperty$$);
 }
+var BindingTypeSuffix$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$E)(QuestionMark), (0, import_lib3.$E)(_), DoubleColonAsColon, MaybeNestedType), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+  var optional = $2;
+  var colon = $4;
+  var t = $5;
+  return {
+    type: "TypeSuffix",
+    ts: true,
+    optional,
+    t,
+    children: $0
+  };
+});
+function BindingTypeSuffix(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "BindingTypeSuffix", BindingTypeSuffix$0);
+}
 var NestedBindingElements$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(PushIndent, (0, import_lib3.$Q)(NestedBindingElementList), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
   var elements = $2;
   if (!elements.length)
@@ -9754,10 +9920,11 @@ function NestedBindingElements(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "NestedBindingElements", NestedBindingElements$0);
 }
 var BindingElement$0 = BindingRestElement;
-var BindingElement$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$C)(BindingIdentifier, BindingPattern), (0, import_lib3.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3) {
+var BindingElement$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$C)(BindingIdentifier, BindingPattern), (0, import_lib3.$E)(BindingTypeSuffix), (0, import_lib3.$E)(Initializer)), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws = $1;
   var binding = $2;
-  var initializer = $3;
+  var typeSuffix = $3;
+  var initializer = $4;
   if (binding.children) {
     binding = {
       ...binding,
@@ -9766,16 +9933,17 @@ var BindingElement$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.
     };
   }
   return {
+    type: "BindingElement",
     names: binding.names,
+    typeSuffix,
+    binding,
     children: [ws, binding]
   };
 });
 var BindingElement$2 = (0, import_lib3.$TV)((0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$E)(_), (0, import_lib3.$EXPECT)($L17, 'BindingElement ","'))), function($skip, $loc, $0, $1) {
   return {
-    children: [{
-      type: "ElisionElement",
-      children: [""]
-    }],
+    type: "ElisionElement",
+    children: [""],
     names: []
   };
 });
@@ -9783,14 +9951,17 @@ var BindingElement$$ = [BindingElement$0, BindingElement$1, BindingElement$2];
 function BindingElement(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "BindingElement", BindingElement$$);
 }
-var BindingRestElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), DotDotDot, (0, import_lib3.$C)(BindingIdentifier, BindingPattern, EmptyBindingPattern)), function($skip, $loc, $0, $1, $2, $3) {
+var BindingRestElement$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$E)(_), DotDotDot, (0, import_lib3.$C)(BindingIdentifier, BindingPattern, EmptyBindingPattern), (0, import_lib3.$E)(BindingTypeSuffix)), function($skip, $loc, $0, $1, $2, $3, $4) {
   var ws = $1;
   var dots = $2;
   var binding = $3;
+  var typeSuffix = $4;
   return {
     type: "BindingRestElement",
     children: [ws, [dots, binding]],
+    dots,
     binding,
+    typeSuffix,
     name: binding.name,
     names: binding.names,
     rest: true
@@ -9803,6 +9974,7 @@ var BindingRestElement$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_l
   return {
     type: "BindingRestElement",
     children: [...ws || [], dots, binding],
+    dots,
     binding,
     name: binding.name,
     names: binding.names,
@@ -13897,9 +14069,10 @@ var LexicalBinding$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(BindingPattern,
   var suffix = $2;
   var initializer = $3;
   const [splices, thisAssignments] = gatherBindingCode(pattern);
+  suffix ??= pattern.typeSuffix;
   return {
     type: "Binding",
-    children: $0,
+    children: [pattern, suffix, initializer],
     names: pattern.names,
     pattern,
     suffix,
@@ -14619,6 +14792,12 @@ var DoubleColon$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L155, 'Double
 function DoubleColon(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "DoubleColon", DoubleColon$0);
 }
+var DoubleColonAsColon$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L155, 'DoubleColonAsColon "::"'), function($skip, $loc, $0, $1) {
+  return { $loc, token: ":" };
+});
+function DoubleColonAsColon(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "DoubleColonAsColon", DoubleColonAsColon$0);
+}
 var DoubleQuote$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L156, 'DoubleQuote "\\\\\\""'), function($skip, $loc, $0, $1) {
   return { $loc, token: $1 };
 });
@@ -15419,9 +15598,22 @@ var JSXAttributeName$$ = [JSXAttributeName$0, JSXAttributeName$1];
 function JSXAttributeName(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXAttributeName", JSXAttributeName$$);
 }
-var JSXAttributeInitializer$0 = (0, import_lib3.$S)((0, import_lib3.$E)(Whitespace), Equals, (0, import_lib3.$E)(Whitespace), JSXAttributeValue);
+var JSXAttributeInitializer$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(CoffeeJSXEnabled), (0, import_lib3.$E)(Whitespace), Equals, (0, import_lib3.$Y)((0, import_lib3.$S)((0, import_lib3.$Q)(NonNewlineWhitespace), EOL)), InsertInlineOpenBrace, PushIndent, (0, import_lib3.$E)(PostfixedExpression), PopIndent, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+  var ws1 = $2;
+  var equals = $3;
+  var ws2 = $4;
+  var open = $5;
+  var indent = $6;
+  var expression = $7;
+  var close = $9;
+  if (!expression)
+    return $skip;
+  return [ws1, equals, ws2, open, indent, expression, close];
+});
+var JSXAttributeInitializer$1 = (0, import_lib3.$S)((0, import_lib3.$E)(Whitespace), Equals, (0, import_lib3.$E)(Whitespace), JSXAttributeValue);
+var JSXAttributeInitializer$$ = [JSXAttributeInitializer$0, JSXAttributeInitializer$1];
 function JSXAttributeInitializer(ctx, state2) {
-  return (0, import_lib3.$EVENT)(ctx, state2, "JSXAttributeInitializer", JSXAttributeInitializer$0);
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXAttributeInitializer", JSXAttributeInitializer$$);
 }
 var JSXAttributeValue$0 = (0, import_lib3.$S)(OpenBrace, PostfixedExpression, (0, import_lib3.$E)(Whitespace), CloseBrace);
 var JSXAttributeValue$1 = JSXElement;
@@ -15591,7 +15783,7 @@ var InlineJSXPrimaryExpression$$ = [InlineJSXPrimaryExpression$0, InlineJSXPrima
 function InlineJSXPrimaryExpression(ctx, state2) {
   return (0, import_lib3.$EVENT_C)(ctx, state2, "InlineJSXPrimaryExpression", InlineJSXPrimaryExpression$$);
 }
-var JSXMixedChildren$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Q)(JSXChild), JSXNestedChildren), function($skip, $loc, $0, $1, $2) {
+var JSXMixedChildren$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(JSXSameLineChildren, JSXNestedChildren), function($skip, $loc, $0, $1, $2) {
   var c1 = $1;
   var c2 = $2;
   return {
@@ -15602,6 +15794,18 @@ var JSXMixedChildren$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib
 function JSXMixedChildren(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "JSXMixedChildren", JSXMixedChildren$0);
 }
+var JSXSameLineChildren$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(JSXCodeSameLineEnabled, (0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$E)(NonNewlineWhitespace), (0, import_lib3.$N)(EOL), JSXChildForcedCode))), function($skip, $loc, $0, $1, $2) {
+  var children = $2;
+  return children.map(([, , c]) => c);
+});
+var JSXSameLineChildren$1 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)(JSXCodeSameLineEnabled), (0, import_lib3.$Q)(JSXChildForcedNoCode)), function(value) {
+  var children = value[1];
+  return children;
+});
+var JSXSameLineChildren$$ = [JSXSameLineChildren$0, JSXSameLineChildren$1];
+function JSXSameLineChildren(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXSameLineChildren", JSXSameLineChildren$$);
+}
 var JSXChildren$0 = (0, import_lib3.$TV)((0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$Q)((0, import_lib3.$S)((0, import_lib3.$E)(NonNewlineWhitespace), EOL, (0, import_lib3.$E)(NonNewlineWhitespace))), JSXChild)), function($skip, $loc, $0, $1) {
   return {
     children: $1,
@@ -15643,10 +15847,33 @@ var JSXNested$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(JSXEOS, Indent), func
 function JSXNested(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "JSXNested", JSXNested$0);
 }
-var JSXChild$0 = JSXElement;
-var JSXChild$1 = JSXFragment;
-var JSXChild$2 = JSXComment;
-var JSXChild$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenBrace, IndentedJSXChildExpression, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+var JSXChild$0 = JSXChildGeneral;
+var JSXChild$1 = (0, import_lib3.$T)((0, import_lib3.$S)(JSXCodeNestedEnabled, JSXCodeChild), function(value) {
+  return value[1];
+});
+var JSXChild$2 = (0, import_lib3.$T)((0, import_lib3.$S)((0, import_lib3.$N)(JSXCodeNestedEnabled), JSXText), function(value) {
+  return value[1];
+});
+var JSXChild$$ = [JSXChild$0, JSXChild$1, JSXChild$2];
+function JSXChild(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXChild", JSXChild$$);
+}
+var JSXChildForcedCode$0 = JSXChildGeneral;
+var JSXChildForcedCode$1 = JSXCodeChild;
+var JSXChildForcedCode$$ = [JSXChildForcedCode$0, JSXChildForcedCode$1];
+function JSXChildForcedCode(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXChildForcedCode", JSXChildForcedCode$$);
+}
+var JSXChildForcedNoCode$0 = JSXChildGeneral;
+var JSXChildForcedNoCode$1 = JSXText;
+var JSXChildForcedNoCode$$ = [JSXChildForcedNoCode$0, JSXChildForcedNoCode$1];
+function JSXChildForcedNoCode(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXChildForcedNoCode", JSXChildForcedNoCode$$);
+}
+var JSXChildGeneral$0 = JSXElement;
+var JSXChildGeneral$1 = JSXFragment;
+var JSXChildGeneral$2 = JSXComment;
+var JSXChildGeneral$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenBrace, IndentedJSXChildExpression, __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
   var expression = $2;
   return {
     type: "JSXChildExpression",
@@ -15654,7 +15881,7 @@ var JSXChild$3 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenBrace, IndentedJSX
     expression
   };
 });
-var JSXChild$4 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenBrace, (0, import_lib3.$E)(JSXChildExpression), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+var JSXChildGeneral$4 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenBrace, (0, import_lib3.$E)(JSXChildExpression), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
   var expression = $2;
   return {
     type: "JSXChildExpression",
@@ -15662,7 +15889,7 @@ var JSXChild$4 = (0, import_lib3.$TS)((0, import_lib3.$S)(OpenBrace, (0, import_
     expression
   };
 });
-var JSXChild$5 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertInlineOpenBrace, ArrowFunction, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+var JSXChildGeneral$5 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertInlineOpenBrace, ArrowFunction, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
   var expression = $2;
   return {
     type: "JSXChildExpression",
@@ -15670,10 +15897,10 @@ var JSXChild$5 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertInlineOpenBrace,
     expression
   };
 });
-var JSXChild$6 = JSXText;
-var JSXChild$$ = [JSXChild$0, JSXChild$1, JSXChild$2, JSXChild$3, JSXChild$4, JSXChild$5, JSXChild$6];
-function JSXChild(ctx, state2) {
-  return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXChild", JSXChild$$);
+var JSXChildGeneral$6 = JSXAngleChild;
+var JSXChildGeneral$$ = [JSXChildGeneral$0, JSXChildGeneral$1, JSXChildGeneral$2, JSXChildGeneral$3, JSXChildGeneral$4, JSXChildGeneral$5, JSXChildGeneral$6];
+function JSXChildGeneral(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXChildGeneral", JSXChildGeneral$$);
 }
 var JSXComment$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$EXPECT)($L224, 'JSXComment "<!--"'), JSXCommentContent, (0, import_lib3.$EXPECT)($L225, 'JSXComment "-->"')), function($skip, $loc, $0, $1, $2, $3) {
   return ["{/*", $2, "*/}"];
@@ -15713,6 +15940,48 @@ var NestedJSXChildExpression$0 = (0, import_lib3.$S)(JSXNested, JSXChildExpressi
 function NestedJSXChildExpression(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "NestedJSXChildExpression", NestedJSXChildExpression$0);
 }
+var JSXAngleChild$0 = (0, import_lib3.$T)((0, import_lib3.$S)(CloseAngleBracket, JSXCodeChild), function(value) {
+  return value[1];
+});
+function JSXAngleChild(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "JSXAngleChild", JSXAngleChild$0);
+}
+var JSXCodeChild$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(InsertInlineOpenBrace, JSXCodeChildExpression, InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3) {
+  var open = $1;
+  var expression = $2;
+  var close = $3;
+  if (!expression)
+    return $skip;
+  return [open, expression, close];
+});
+function JSXCodeChild(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "JSXCodeChild", JSXCodeChild$0);
+}
+var JSXCodeChildExpression$0 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$N)(JSXEOS), ForbidNewlineBinaryOp, (0, import_lib3.$E)(JSXChildExpression), RestoreNewlineBinaryOp), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var expression = $3;
+  if (!expression)
+    return $skip;
+  return expression;
+});
+var JSXCodeChildExpression$1 = (0, import_lib3.$TS)((0, import_lib3.$S)((0, import_lib3.$Y)(JSXEOS), ImplicitNestedBlock), function($skip, $loc, $0, $1, $2) {
+  var block = $2;
+  if (!block)
+    return $skip;
+  const statement = {
+    type: "DoStatement",
+    children: [block],
+    block
+  };
+  return {
+    type: "StatementExpression",
+    statement,
+    children: [statement]
+  };
+});
+var JSXCodeChildExpression$$ = [JSXCodeChildExpression$0, JSXCodeChildExpression$1];
+function JSXCodeChildExpression(ctx, state2) {
+  return (0, import_lib3.$EVENT_C)(ctx, state2, "JSXCodeChildExpression", JSXCodeChildExpression$$);
+}
 var UsingDeclaration$0 = (0, import_lib3.$TS)((0, import_lib3.$S)(Using, (0, import_lib3.$E)(_), UsingBinding, (0, import_lib3.$Q)((0, import_lib3.$S)(__, Comma, __, UsingBinding)), UsingJSModeError), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
   var decl = $1;
   var binding = $3;
@@ -16937,6 +17206,22 @@ var CoffeePrototypeEnabled$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0
 function CoffeePrototypeEnabled(ctx, state2) {
   return (0, import_lib3.$EVENT)(ctx, state2, "CoffeePrototypeEnabled", CoffeePrototypeEnabled$0);
 }
+var JSXCodeNestedEnabled$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'JSXCodeNestedEnabled ""'), function($skip, $loc, $0, $1) {
+  if (config.jsxCodeNested)
+    return;
+  return $skip;
+});
+function JSXCodeNestedEnabled(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "JSXCodeNestedEnabled", JSXCodeNestedEnabled$0);
+}
+var JSXCodeSameLineEnabled$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'JSXCodeSameLineEnabled ""'), function($skip, $loc, $0, $1) {
+  if (config.jsxCodeSameLine)
+    return;
+  return $skip;
+});
+function JSXCodeSameLineEnabled(ctx, state2) {
+  return (0, import_lib3.$EVENT)(ctx, state2, "JSXCodeSameLineEnabled", JSXCodeSameLineEnabled$0);
+}
 var ObjectIsEnabled$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'ObjectIsEnabled ""'), function($skip, $loc, $0, $1) {
   if (config.objectIs)
     return;
@@ -16980,6 +17265,7 @@ var Reset$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'Reset ""'), fu
     coffeePrototype: false,
     defaultElement: "div",
     implicitReturns: true,
+    jsxCode: false,
     objectIs: false,
     react: false,
     solid: false,
@@ -17024,6 +17310,16 @@ var Reset$0 = (0, import_lib3.$TV)((0, import_lib3.$EXPECT)($L0, 'Reset ""'), fu
       }
     }
   });
+  Object.defineProperty(config, "jsxCode", {
+    set(b) {
+      for (const option of [
+        "jsxCodeNested",
+        "jsxCodeSameLine"
+      ]) {
+        config[option] = b;
+      }
+    }
+  });
   Object.assign(config, initialConfig);
   return {
     type: "ParserMeta",