@danielx/civet 0.5.15 → 0.5.17

package/README.md

@@ -217,6 +217,11 @@ Things Added that CoffeeScript didn't
     (assuming they are not preceded by text); this is unambiguous because
     `>` isn't valid JSX text. For example, `<For> (item) => ...`
     (where function body can be indented).
+  - `#foo` shorthand for `id="foo"`;
+    also `#"foo bar"`, `` #`foo ${bar}` ``, `#{expr}`
+  - `.foo` shorthand for `class="foo"` (but must be at least one space after
+    tag name); also `.foo.bar`, `."foo bar"`, `` .`foo ${bar}` ``, `.{expr}`
+    - `"civet react"` flag uses `className` instead of `class`
   - Any braced object literal can be used as an attribute:
     `{foo}` → `foo={foo}`, `{foo: bar}` → `foo={bar}`,
     `{...foo}` remains as is; methods and getters/setters work too.

package/dist/browser.js

@@ -780,6 +780,7 @@ ${input.slice(result.pos)}
         JSXIdentifierName,
         JSXAttributes,
         JSXAttribute,
+        JSXShorthandString,
         JSXAttributeName,
         JSXAttributeInitializer,
         JSXAttributeValue,
@@ -1099,14 +1100,15 @@ ${input.slice(result.pos)}
       var $R43 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
       var $R44 = $R(new RegExp("\\s", "suy"));
       var $R45 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-      var $R46 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-      var $R47 = $R(new RegExp("[+-]?", "suy"));
-      var $R48 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-      var $R49 = $R(new RegExp("[\\t ]*", "suy"));
-      var $R50 = $R(new RegExp("[\\s]*", "suy"));
-      var $R51 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-      var $R52 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-      var $R53 = $R(new RegExp("[ \\t]*", "suy"));
+      var $R46 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
+      var $R47 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
+      var $R48 = $R(new RegExp("[+-]?", "suy"));
+      var $R49 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+      var $R50 = $R(new RegExp("[\\t ]*", "suy"));
+      var $R51 = $R(new RegExp("[\\s]*", "suy"));
+      var $R52 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+      var $R53 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+      var $R54 = $R(new RegExp("[ \\t]*", "suy"));
       var Program$0 = $TS($S(Reset, Init, __, $Q(TopLevelStatement), __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var statements = $4;
         module.processProgram(statements);
@@ -4968,7 +4970,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, ImplicitInlineObjectPropertyDelimiter, $Q($S(NamedProperty, ImplicitInlineObjectPropertyDelimiter)), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+      var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, ImplicitInlineObjectPropertyDelimiter, $Q($S($C(Samedent, $Q(_)), NamedProperty, ImplicitInlineObjectPropertyDelimiter)), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
         var open = $1;
         var close = $5;
         return [open, $2, $3, ...$4, close];
@@ -4992,7 +4994,7 @@ ${input.slice(result.pos)}
         }
       }
       var ImplicitInlineObjectPropertyDelimiter$0 = $S($Q(TrailingComment), Comma);
-      var ImplicitInlineObjectPropertyDelimiter$1 = $T($S($Y($S(EOS, NamedProperty)), InsertComma), function(value) {
+      var ImplicitInlineObjectPropertyDelimiter$1 = $T($S($Y($S($C(Samedent, $Q(_)), NamedProperty)), InsertComma), function(value) {
         return value[1];
       });
       var ImplicitInlineObjectPropertyDelimiter$2 = $T($Y($S(__, $C($EXPECT($L29, fail, 'ImplicitInlineObjectPropertyDelimiter ":"'), $EXPECT($L15, fail, 'ImplicitInlineObjectPropertyDelimiter ")"'), $EXPECT($L28, fail, 'ImplicitInlineObjectPropertyDelimiter "]"'), $EXPECT($L17, fail, 'ImplicitInlineObjectPropertyDelimiter "}"'), ReservedWord))), function(value) {
@@ -5094,7 +5096,14 @@ ${input.slice(result.pos)}
           value
         };
       });
-      var PropertyDefinition$2 = NamedProperty;
+      var PropertyDefinition$2 = $TS($S(__, NamedProperty), function($skip, $loc, $0, $1, $2) {
+        var ws = $1;
+        var prop = $2;
+        return {
+          ...prop,
+          children: [...ws, ...prop.children]
+        };
+      });
       var PropertyDefinition$3 = $TS($S(__, MethodDefinition), function($skip, $loc, $0, $1, $2) {
         var ws = $1;
         var def = $2;
@@ -5137,9 +5146,9 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var NamedProperty$0 = $TS($S(__, PropertyName, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-        var name = $2;
-        var exp = $5;
+      var NamedProperty$0 = $TS($S(PropertyName, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var name = $1;
+        var exp = $4;
         return {
           type: "Property",
           children: $0,
@@ -5478,7 +5487,9 @@ ${input.slice(result.pos)}
       var AssignmentOpSymbol$15 = $T($EXPECT($L45, fail, 'AssignmentOpSymbol "?="'), function(value) {
         return "??=";
       });
-      var AssignmentOpSymbol$16 = $EXPECT($L26, fail, 'AssignmentOpSymbol "="');
+      var AssignmentOpSymbol$16 = $T($S($EXPECT($L26, fail, 'AssignmentOpSymbol "="'), $N($EXPECT($L26, fail, 'AssignmentOpSymbol "="'))), function(value) {
+        return value[0];
+      });
       var AssignmentOpSymbol$17 = $T($S(CoffeeWordAssignmentOp), function(value) {
         return value[0];
       });
@@ -5844,9 +5855,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var ElseClause$0 = $T($S($Y(EOS), Samedent, Else, Block), function(value) {
-        return [value[1], value[2], value[3]];
-      });
+      var ElseClause$0 = $S(Samedent, Else, Block);
       var ElseClause$1 = $S($Q(TrailingComment), Else, Block);
       function ElseClause(state) {
         if (state.events) {
@@ -10907,7 +10916,7 @@ ${input.slice(result.pos)}
         }
       }
       var JSXElement$0 = JSXSelfClosingElement;
-      var JSXElement$1 = $TS($S(JSXOpeningElement, $E(JSXChildren), __, JSXClosingElement), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var JSXElement$1 = $TS($S(JSXOpeningElement, $E(JSXChildren), $E(Whitespace), JSXClosingElement), function($skip, $loc, $0, $1, $2, $3, $4) {
         if ($1[1] !== $4[2])
           return $skip;
         return { type: "JSXElement", children: $0 };
@@ -10942,7 +10951,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L153, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L153, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
         return { type: "JSXElement", children: $0 };
       });
       function JSXSelfClosingElement(state) {
@@ -10963,7 +10972,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
+      var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
       function JSXOpeningElement(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXOpeningElement", state);
@@ -10982,7 +10991,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXClosingElement$0 = $S($EXPECT($L154, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L27, fail, 'JSXClosingElement ">"'));
+      var JSXClosingElement$0 = $S($EXPECT($L154, fail, 'JSXClosingElement "</"'), $E(Whitespace), $TEXT(JSXElementName), $E(Whitespace), $EXPECT($L27, fail, 'JSXClosingElement ">"'));
       function JSXClosingElement(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXClosingElement", state);
@@ -11027,7 +11036,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXFragment$0 = $TS($S($EXPECT($L155, fail, 'JSXFragment "<>"'), $E(JSXChildren), __, $EXPECT($L156, fail, 'JSXFragment "</>"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var JSXFragment$0 = $TS($S($EXPECT($L155, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), $EXPECT($L156, fail, 'JSXFragment "</>"')), function($skip, $loc, $0, $1, $2, $3, $4) {
         if ($2) {
           return { type: "JSXFragment", children: $0, jsxChildren: $2.jsxChildren };
         } else {
@@ -11093,7 +11102,62 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXAttributes$0 = $Q($S(__, JSXAttribute));
+      var JSXAttributes$0 = $TV($Q($S($E(Whitespace), JSXAttribute)), function($skip, $loc, $0, $1) {
+        const classes = [];
+        let attrs = $0.filter((pair) => {
+          const [, attr] = pair;
+          if (attr.type === "JSXClass") {
+            classes.push(attr.class);
+            return false;
+          }
+          return true;
+        });
+        if (classes.length) {
+          let braced = function(c) {
+            return c[0] === "{" || c[0]?.token === "{";
+          }, parseClass = function(c) {
+            c = c.token || c;
+            if (c.startsWith("'")) {
+              c = '"' + c.slice(1, -1).replace(/\\*"/g, (m) => m.length % 2 == 0 ? m : "\\" + m) + '"';
+            }
+            return JSON.parse(c);
+          };
+          let className = module.config.react ? "className" : "class";
+          attrs = attrs.filter((pair) => {
+            const [, attr] = pair;
+            if ((attr[0][0] === "class" || attr[0][0] === "className") && !attr[0][1]) {
+              className = attr[0][0];
+              classes.push(attr[1][attr[1].length - 1]);
+              return false;
+            }
+            return true;
+          });
+          let classValue;
+          if (classes.some(braced)) {
+            classValue = ["{`"];
+            classes.forEach((c, i) => {
+              if (i > 0)
+                classValue.push(" ");
+              if (braced(c)) {
+                classValue.push("$", c);
+              } else {
+                classValue.push(parseClass(c));
+              }
+            });
+            classValue.push("`}");
+          } else {
+            classValue = JSON.stringify(classes.map(parseClass).join(" "));
+          }
+          attrs.splice(0, 0, [" ", [className, ["=", classValue]]]);
+        }
+        return attrs.map((pair) => {
+          const [space, attr] = pair;
+          if (space && attr[0] === " ") {
+            pair = [space, attr.slice(1)];
+          }
+          return pair;
+        });
+      });
       function JSXAttributes(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXAttributes", state);
@@ -11168,6 +11232,15 @@ ${input.slice(result.pos)}
         }
       });
       var JSXAttribute$2 = $S(InsertInlineOpenBrace, DotDotDot, InlineJSXAttributeValue, InsertCloseBrace);
+      var JSXAttribute$3 = $TS($S($EXPECT($L8, 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) {
+        return {
+          type: "JSXClass",
+          class: $2
+        };
+      });
       function JSXAttribute(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXAttribute", state);
@@ -11175,17 +11248,49 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("JSXAttribute", state, JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state));
+          const result = $TOKEN("JSXAttribute", state, JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state) || JSXAttribute$3(state) || JSXAttribute$4(state));
           if (state.events)
             state.events.exit?.("JSXAttribute", state, result);
           return result;
         } else {
-          const result = JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state);
+          const result = JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state) || JSXAttribute$3(state) || JSXAttribute$4(state);
           if (state.events)
             state.events.exit?.("JSXAttribute", state, result);
           return result;
         }
       }
+      var JSXShorthandString$0 = $TR($EXPECT($R46, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        return module.quoteString($0);
+      });
+      var JSXShorthandString$1 = $TS($S(StringLiteral), function($skip, $loc, $0, $1) {
+        if (module.isTemplateLiteral($1)) {
+          return ["{", $1, "}"];
+        } else {
+          return $1;
+        }
+      });
+      var JSXShorthandString$2 = $TS($S(TemplateLiteral), function($skip, $loc, $0, $1) {
+        return ["{", $1, "}"];
+      });
+      var JSXShorthandString$3 = $S(OpenBrace, ExtendedExpression, $E(Whitespace), CloseBrace);
+      function JSXShorthandString(state) {
+        if (state.events) {
+          const result = state.events.enter?.("JSXShorthandString", state);
+          if (result)
+            return result.cache;
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("JSXShorthandString", state, JSXShorthandString$0(state) || JSXShorthandString$1(state) || JSXShorthandString$2(state) || JSXShorthandString$3(state));
+          if (state.events)
+            state.events.exit?.("JSXShorthandString", state, result);
+          return result;
+        } else {
+          const result = JSXShorthandString$0(state) || JSXShorthandString$1(state) || JSXShorthandString$2(state) || JSXShorthandString$3(state);
+          if (state.events)
+            state.events.exit?.("JSXShorthandString", state, result);
+          return result;
+        }
+      }
       var JSXAttributeName$0 = $S(JSXIdentifierName, $E($S(Colon, JSXIdentifierName)));
       var JSXAttributeName$1 = ComputedPropertyName;
       function JSXAttributeName(state) {
@@ -11206,7 +11311,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXAttributeInitializer$0 = $S(__, Equals, __, JSXAttributeValue);
+      var JSXAttributeInitializer$0 = $S($E(Whitespace), Equals, $E(Whitespace), JSXAttributeValue);
       function JSXAttributeInitializer(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXAttributeInitializer", state);
@@ -11230,7 +11335,7 @@ ${input.slice(result.pos)}
           return $skip;
         return $1;
       });
-      var JSXAttributeValue$1 = $S(OpenBrace, ExtendedExpression, __, CloseBrace);
+      var JSXAttributeValue$1 = $S(OpenBrace, ExtendedExpression, $E(Whitespace), CloseBrace);
       var JSXAttributeValue$2 = JSXElement;
       var JSXAttributeValue$3 = JSXFragment;
       var JSXAttributeValue$4 = $S(InsertInlineOpenBrace, InlineJSXAttributeValue, InsertCloseBrace);
@@ -11630,7 +11735,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXText$0 = $TR($EXPECT($R46, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var JSXText$0 = $TR($EXPECT($R47, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return {
           type: "JSXText",
           token: $0,
@@ -11655,7 +11760,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXChildExpression$0 = $S(__, $E($S(DotDotDot, __)), ExtendedExpression);
+      var JSXChildExpression$0 = $S($E(Whitespace), $E($S(DotDotDot, $E(Whitespace))), ExtendedExpression);
       function JSXChildExpression(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXChildExpression", state);
@@ -11964,7 +12069,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R47, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L129, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R4, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+      var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R48, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L129, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R4, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
       function TypeIndexSignature(state) {
         if (state.events) {
           const result = state.events.enter?.("TypeIndexSignature", state);
@@ -12566,7 +12671,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Shebang$0 = $S($R$0($EXPECT($R48, fail, "Shebang /#![^\\r\\n]*/")), EOL);
+      var Shebang$0 = $S($R$0($EXPECT($R49, fail, "Shebang /#![^\\r\\n]*/")), EOL);
       function Shebang(state) {
         if (state.events) {
           const result = state.events.enter?.("Shebang", state);
@@ -12585,11 +12690,11 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CivetPrologue$0 = $T($S($EXPECT($R49, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+      var CivetPrologue$0 = $T($S($EXPECT($R50, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
         var content = value[2];
         return content;
       });
-      var CivetPrologue$1 = $T($S($EXPECT($R49, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+      var CivetPrologue$1 = $T($S($EXPECT($R50, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
         var content = value[2];
         return content;
       });
@@ -12611,7 +12716,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CivetPrologueContent$0 = $TS($S($EXPECT($L165, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R50, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
+      var CivetPrologueContent$0 = $TS($S($EXPECT($L165, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R51, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
         var options = $2;
         return {
           type: "CivetPrologue",
@@ -12637,7 +12742,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var CivetOption$0 = $TR($EXPECT($R51, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var CivetOption$0 = $TR($EXPECT($R52, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
           if (l)
             return l.toUpperCase();
@@ -12669,7 +12774,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var UnknownPrologue$0 = $S($R$0($EXPECT($R49, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
+      var UnknownPrologue$0 = $S($R$0($EXPECT($R50, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
       function UnknownPrologue(state) {
         if (state.events) {
           const result = state.events.enter?.("UnknownPrologue", state);
@@ -12727,7 +12832,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var EOL$0 = $TR($EXPECT($R52, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var EOL$0 = $TR($EXPECT($R53, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         return { $loc, token: $0 };
       });
       function EOL(state) {
@@ -13368,6 +13473,7 @@ ${input.slice(result.pos)}
           coffeeNot: false,
           coffeeOf: false,
           implicitReturns: true,
+          react: false,
           solid: false,
           client: false,
           server: false,
@@ -13525,6 +13631,14 @@ ${input.slice(result.pos)}
         module.modifyString = function(str) {
           return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
         };
+        module.quoteString = function(str) {
+          str = str.replace(/\\/g, "\\\\");
+          if (str.includes('"') && !str.includes("'")) {
+            return "'" + str.replace(/'/g, "\\'") + "'";
+          } else {
+            return '"' + str.replace(/"/g, '\\"') + '"';
+          }
+        };
       });
       function Reset(state) {
         if (state.events) {
@@ -14503,7 +14617,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var Indent$0 = $TR($EXPECT($R53, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      var Indent$0 = $TR($EXPECT($R54, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
         let level;
         if (module.config.tab) {
           const tabs = $0.match(/\t/g);
@@ -15126,7 +15240,7 @@ ${input.slice(result.pos)}
       ({ prune } = gen = require_generate());
       ({ SourceMap, base64Encode } = util = require_util());
       defaultOptions = {};
-      uncacheable = /* @__PURE__ */ new Set(["TrackIndented", "Samedent", "IndentedFurther", "PushIndent", "PopIndent", "Nested", "InsertIndent", "Arguments", "ArgumentsWithTrailingCallExpressions", "ApplicationStart", "CallExpression", "CallExpressionRest", "LeftHandSideExpression", "ActualAssignment", "UpdateExpression", "UnaryExpression", "BinaryOpExpression", "BinaryOpRHS", "ConditionalExpression", "ShortCircuitExpression", "ImplicitNestedBlock", "ObjectLiteral", "NestedObject", "NestedImplicitObjectLiteral", "BracedObjectLiteralContent", "NestedPropertyDefinitions", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedBlockStatement", "NestedElement", "NestedElementList", "NestedBindingElement", "NestedBindingElements", "NestedInterfaceProperty", "MemberExpression", "PrimaryExpression", "IndentedApplicationAllowed", "ExpressionWithIndentedApplicationSuppressed", "SuppressIndentedApplication", "AssignmentExpressionTail", "AssignmentExpression", "ExtendedExpression", "Expression", "MemberExpressionRest", "ElseClause", "CoffeeCommentEnabled", "SingleLineComment", "Debugger", "JSXElement", "TypedJSXElement", "JSXFragment", "TypedJSXFragment", "JSXChild", "JSXChildren", "JSXNestedChildren", "JSXMixedChildren"]);
+      uncacheable = /* @__PURE__ */ new Set(["TrackIndented", "Samedent", "IndentedFurther", "PushIndent", "PopIndent", "Nested", "InsertIndent", "Arguments", "ArgumentsWithTrailingCallExpressions", "ApplicationStart", "CallExpression", "CallExpressionRest", "LeftHandSideExpression", "ActualAssignment", "UpdateExpression", "UnaryExpression", "BinaryOpExpression", "BinaryOpRHS", "ConditionalExpression", "ShortCircuitExpression", "InlineObjectLiteral", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "ObjectLiteral", "NestedObject", "NestedImplicitObjectLiteral", "BracedObjectLiteralContent", "NestedPropertyDefinitions", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedBlockStatement", "NestedElement", "NestedElementList", "NestedBindingElement", "NestedBindingElements", "NestedInterfaceProperty", "MemberExpression", "PrimaryExpression", "IndentedApplicationAllowed", "ExpressionWithIndentedApplicationSuppressed", "SuppressIndentedApplication", "AssignmentExpressionTail", "AssignmentExpression", "ExtendedExpression", "Expression", "MemberExpressionRest", "ElseClause", "CoffeeCommentEnabled", "SingleLineComment", "Debugger", "JSXElement", "TypedJSXElement", "JSXFragment", "TypedJSXFragment", "JSXChild", "JSXChildren", "JSXNestedChildren", "JSXMixedChildren"]);
       module.exports = {
         parse,
         compile: function(src, options = defaultOptions) {

package/dist/civet

@@ -6,7 +6,7 @@ if (process.argv.includes("--version")) {
   process.exit(0);
 }
 if (process.argv.includes("--help")) {
-  process.stdout.write(`       \u2584\u2584\xB7 \u25AA   \u258C \u2590\xB7\u2584\u2584\u2584 .\u2584\u2584\u2584\u2584\u2584
+  process.stderr.write(`       \u2584\u2584\xB7 \u25AA   \u258C \u2590\xB7\u2584\u2584\u2584 .\u2584\u2584\u2584\u2584\u2584
       \u2590\u2588 \u258C\u25AA\u2588\u2588 \u25AA\u2588\xB7\u2588\u258C\u2580\u2584.\u2580\xB7\u2022\u2588\u2588       _._     _,-'""\`-._
       \u2588\u2588 \u2584\u2584\u2590\u2588\xB7\u2590\u2588\u2590\u2588\u2022\u2590\u2580\u2580\u25AA\u2584 \u2590\u2588.\u25AA    (,-.\`._,'(       |\\\`-/|
       \u2590\u2588\u2588\u2588\u258C\u2590\u2588\u258C \u2588\u2588\u2588 \u2590\u2588\u2584\u2584\u258C \u2590\u2588\u258C\xB7        \`-.-' \\ )-\`( , o o)
@@ -47,15 +47,14 @@ readLines = function(rl) {
       return parts.push(buffer + "\n");
     });
     rl.on("SIGINT", function() {
-      rl.write("^C\n");
-      return reject();
+      return reject("^C");
     });
     return rl.on("close", function() {
       return resolve(parts.join(""));
     });
   });
 };
-readLines(readline.createInterface(process.stdin)).then(function(input) {
+readLines(readline.createInterface(process.stdin, process.stdout)).then(function(input) {
   var ast, filename, inlineMap, js, noCache, output;
   ast = process.argv.includes("--ast");
   noCache = process.argv.includes("--no-cache");

package/dist/main.js

@@ -779,6 +779,7 @@ ${input.slice(result.pos)}
       JSXIdentifierName,
       JSXAttributes,
       JSXAttribute,
+      JSXShorthandString,
       JSXAttributeName,
       JSXAttributeInitializer,
       JSXAttributeValue,
@@ -1098,14 +1099,15 @@ ${input.slice(result.pos)}
     var $R43 = $R(new RegExp("(?!\\p{ID_Continue})", "suy"));
     var $R44 = $R(new RegExp("\\s", "suy"));
     var $R45 = $R(new RegExp("(?:\\p{ID_Start}|[_$])(?:\\p{ID_Continue}|[\\u200C\\u200D$-])*", "suy"));
-    var $R46 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
-    var $R47 = $R(new RegExp("[+-]?", "suy"));
-    var $R48 = $R(new RegExp("#![^\\r\\n]*", "suy"));
-    var $R49 = $R(new RegExp("[\\t ]*", "suy"));
-    var $R50 = $R(new RegExp("[\\s]*", "suy"));
-    var $R51 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
-    var $R52 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
-    var $R53 = $R(new RegExp("[ \\t]*", "suy"));
+    var $R46 = $R(new RegExp("(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+", "suy"));
+    var $R47 = $R(new RegExp("[^{}<>\\r\\n]+", "suy"));
+    var $R48 = $R(new RegExp("[+-]?", "suy"));
+    var $R49 = $R(new RegExp("#![^\\r\\n]*", "suy"));
+    var $R50 = $R(new RegExp("[\\t ]*", "suy"));
+    var $R51 = $R(new RegExp("[\\s]*", "suy"));
+    var $R52 = $R(new RegExp("\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?", "suy"));
+    var $R53 = $R(new RegExp("\\r\\n|\\n|\\r|$", "suy"));
+    var $R54 = $R(new RegExp("[ \\t]*", "suy"));
     var Program$0 = $TS($S(Reset, Init, __, $Q(TopLevelStatement), __), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var statements = $4;
       module2.processProgram(statements);
@@ -4967,7 +4969,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, ImplicitInlineObjectPropertyDelimiter, $Q($S(NamedProperty, ImplicitInlineObjectPropertyDelimiter)), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
+    var InlineObjectLiteral$0 = $TS($S(InsertInlineOpenBrace, SnugNamedProperty, ImplicitInlineObjectPropertyDelimiter, $Q($S($C(Samedent, $Q(_)), NamedProperty, ImplicitInlineObjectPropertyDelimiter)), InsertCloseBrace), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
       var open = $1;
       var close = $5;
       return [open, $2, $3, ...$4, close];
@@ -4991,7 +4993,7 @@ ${input.slice(result.pos)}
       }
     }
     var ImplicitInlineObjectPropertyDelimiter$0 = $S($Q(TrailingComment), Comma);
-    var ImplicitInlineObjectPropertyDelimiter$1 = $T($S($Y($S(EOS, NamedProperty)), InsertComma), function(value) {
+    var ImplicitInlineObjectPropertyDelimiter$1 = $T($S($Y($S($C(Samedent, $Q(_)), NamedProperty)), InsertComma), function(value) {
       return value[1];
     });
     var ImplicitInlineObjectPropertyDelimiter$2 = $T($Y($S(__, $C($EXPECT($L29, fail, 'ImplicitInlineObjectPropertyDelimiter ":"'), $EXPECT($L15, fail, 'ImplicitInlineObjectPropertyDelimiter ")"'), $EXPECT($L28, fail, 'ImplicitInlineObjectPropertyDelimiter "]"'), $EXPECT($L17, fail, 'ImplicitInlineObjectPropertyDelimiter "}"'), ReservedWord))), function(value) {
@@ -5093,7 +5095,14 @@ ${input.slice(result.pos)}
         value
       };
     });
-    var PropertyDefinition$2 = NamedProperty;
+    var PropertyDefinition$2 = $TS($S(__, NamedProperty), function($skip, $loc, $0, $1, $2) {
+      var ws = $1;
+      var prop = $2;
+      return {
+        ...prop,
+        children: [...ws, ...prop.children]
+      };
+    });
     var PropertyDefinition$3 = $TS($S(__, MethodDefinition), function($skip, $loc, $0, $1, $2) {
       var ws = $1;
       var def = $2;
@@ -5136,9 +5145,9 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var NamedProperty$0 = $TS($S(__, PropertyName, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4, $5) {
-      var name = $2;
-      var exp = $5;
+    var NamedProperty$0 = $TS($S(PropertyName, __, Colon, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var name = $1;
+      var exp = $4;
       return {
         type: "Property",
         children: $0,
@@ -5477,7 +5486,9 @@ ${input.slice(result.pos)}
     var AssignmentOpSymbol$15 = $T($EXPECT($L45, fail, 'AssignmentOpSymbol "?="'), function(value) {
       return "??=";
     });
-    var AssignmentOpSymbol$16 = $EXPECT($L26, fail, 'AssignmentOpSymbol "="');
+    var AssignmentOpSymbol$16 = $T($S($EXPECT($L26, fail, 'AssignmentOpSymbol "="'), $N($EXPECT($L26, fail, 'AssignmentOpSymbol "="'))), function(value) {
+      return value[0];
+    });
     var AssignmentOpSymbol$17 = $T($S(CoffeeWordAssignmentOp), function(value) {
       return value[0];
     });
@@ -5843,9 +5854,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var ElseClause$0 = $T($S($Y(EOS), Samedent, Else, Block), function(value) {
-      return [value[1], value[2], value[3]];
-    });
+    var ElseClause$0 = $S(Samedent, Else, Block);
     var ElseClause$1 = $S($Q(TrailingComment), Else, Block);
     function ElseClause(state) {
       if (state.events) {
@@ -10906,7 +10915,7 @@ ${input.slice(result.pos)}
       }
     }
     var JSXElement$0 = JSXSelfClosingElement;
-    var JSXElement$1 = $TS($S(JSXOpeningElement, $E(JSXChildren), __, JSXClosingElement), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var JSXElement$1 = $TS($S(JSXOpeningElement, $E(JSXChildren), $E(Whitespace), JSXClosingElement), function($skip, $loc, $0, $1, $2, $3, $4) {
       if ($1[1] !== $4[2])
         return $skip;
       return { type: "JSXElement", children: $0 };
@@ -10941,7 +10950,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L153, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L153, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
       return { type: "JSXElement", children: $0 };
     });
     function JSXSelfClosingElement(state) {
@@ -10962,7 +10971,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
+    var JSXOpeningElement$0 = $S($EXPECT($L5, fail, 'JSXOpeningElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), $E(Whitespace), $EXPECT($L27, fail, 'JSXOpeningElement ">"'));
     function JSXOpeningElement(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXOpeningElement", state);
@@ -10981,7 +10990,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXClosingElement$0 = $S($EXPECT($L154, fail, 'JSXClosingElement "</"'), __, $TEXT(JSXElementName), __, $EXPECT($L27, fail, 'JSXClosingElement ">"'));
+    var JSXClosingElement$0 = $S($EXPECT($L154, fail, 'JSXClosingElement "</"'), $E(Whitespace), $TEXT(JSXElementName), $E(Whitespace), $EXPECT($L27, fail, 'JSXClosingElement ">"'));
     function JSXClosingElement(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXClosingElement", state);
@@ -11026,7 +11035,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXFragment$0 = $TS($S($EXPECT($L155, fail, 'JSXFragment "<>"'), $E(JSXChildren), __, $EXPECT($L156, fail, 'JSXFragment "</>"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+    var JSXFragment$0 = $TS($S($EXPECT($L155, fail, 'JSXFragment "<>"'), $E(JSXChildren), $E(Whitespace), $EXPECT($L156, fail, 'JSXFragment "</>"')), function($skip, $loc, $0, $1, $2, $3, $4) {
       if ($2) {
         return { type: "JSXFragment", children: $0, jsxChildren: $2.jsxChildren };
       } else {
@@ -11092,7 +11101,62 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXAttributes$0 = $Q($S(__, JSXAttribute));
+    var JSXAttributes$0 = $TV($Q($S($E(Whitespace), JSXAttribute)), function($skip, $loc, $0, $1) {
+      const classes = [];
+      let attrs = $0.filter((pair) => {
+        const [, attr] = pair;
+        if (attr.type === "JSXClass") {
+          classes.push(attr.class);
+          return false;
+        }
+        return true;
+      });
+      if (classes.length) {
+        let braced = function(c) {
+          return c[0] === "{" || c[0]?.token === "{";
+        }, parseClass = function(c) {
+          c = c.token || c;
+          if (c.startsWith("'")) {
+            c = '"' + c.slice(1, -1).replace(/\\*"/g, (m) => m.length % 2 == 0 ? m : "\\" + m) + '"';
+          }
+          return JSON.parse(c);
+        };
+        let className = module2.config.react ? "className" : "class";
+        attrs = attrs.filter((pair) => {
+          const [, attr] = pair;
+          if ((attr[0][0] === "class" || attr[0][0] === "className") && !attr[0][1]) {
+            className = attr[0][0];
+            classes.push(attr[1][attr[1].length - 1]);
+            return false;
+          }
+          return true;
+        });
+        let classValue;
+        if (classes.some(braced)) {
+          classValue = ["{`"];
+          classes.forEach((c, i) => {
+            if (i > 0)
+              classValue.push(" ");
+            if (braced(c)) {
+              classValue.push("$", c);
+            } else {
+              classValue.push(parseClass(c));
+            }
+          });
+          classValue.push("`}");
+        } else {
+          classValue = JSON.stringify(classes.map(parseClass).join(" "));
+        }
+        attrs.splice(0, 0, [" ", [className, ["=", classValue]]]);
+      }
+      return attrs.map((pair) => {
+        const [space, attr] = pair;
+        if (space && attr[0] === " ") {
+          pair = [space, attr.slice(1)];
+        }
+        return pair;
+      });
+    });
     function JSXAttributes(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXAttributes", state);
@@ -11167,6 +11231,15 @@ ${input.slice(result.pos)}
       }
     });
     var JSXAttribute$2 = $S(InsertInlineOpenBrace, DotDotDot, InlineJSXAttributeValue, InsertCloseBrace);
+    var JSXAttribute$3 = $TS($S($EXPECT($L8, 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) {
+      return {
+        type: "JSXClass",
+        class: $2
+      };
+    });
     function JSXAttribute(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXAttribute", state);
@@ -11174,17 +11247,49 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("JSXAttribute", state, JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state));
+        const result = $TOKEN("JSXAttribute", state, JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state) || JSXAttribute$3(state) || JSXAttribute$4(state));
         if (state.events)
           state.events.exit?.("JSXAttribute", state, result);
         return result;
       } else {
-        const result = JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state);
+        const result = JSXAttribute$0(state) || JSXAttribute$1(state) || JSXAttribute$2(state) || JSXAttribute$3(state) || JSXAttribute$4(state);
         if (state.events)
           state.events.exit?.("JSXAttribute", state, result);
         return result;
       }
     }
+    var JSXShorthandString$0 = $TR($EXPECT($R46, fail, "JSXShorthandString /(?:[\\w\\-:]+|\\([^()]*\\)|\\[[^\\[\\]]*\\])+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      return module2.quoteString($0);
+    });
+    var JSXShorthandString$1 = $TS($S(StringLiteral), function($skip, $loc, $0, $1) {
+      if (module2.isTemplateLiteral($1)) {
+        return ["{", $1, "}"];
+      } else {
+        return $1;
+      }
+    });
+    var JSXShorthandString$2 = $TS($S(TemplateLiteral), function($skip, $loc, $0, $1) {
+      return ["{", $1, "}"];
+    });
+    var JSXShorthandString$3 = $S(OpenBrace, ExtendedExpression, $E(Whitespace), CloseBrace);
+    function JSXShorthandString(state) {
+      if (state.events) {
+        const result = state.events.enter?.("JSXShorthandString", state);
+        if (result)
+          return result.cache;
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("JSXShorthandString", state, JSXShorthandString$0(state) || JSXShorthandString$1(state) || JSXShorthandString$2(state) || JSXShorthandString$3(state));
+        if (state.events)
+          state.events.exit?.("JSXShorthandString", state, result);
+        return result;
+      } else {
+        const result = JSXShorthandString$0(state) || JSXShorthandString$1(state) || JSXShorthandString$2(state) || JSXShorthandString$3(state);
+        if (state.events)
+          state.events.exit?.("JSXShorthandString", state, result);
+        return result;
+      }
+    }
     var JSXAttributeName$0 = $S(JSXIdentifierName, $E($S(Colon, JSXIdentifierName)));
     var JSXAttributeName$1 = ComputedPropertyName;
     function JSXAttributeName(state) {
@@ -11205,7 +11310,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXAttributeInitializer$0 = $S(__, Equals, __, JSXAttributeValue);
+    var JSXAttributeInitializer$0 = $S($E(Whitespace), Equals, $E(Whitespace), JSXAttributeValue);
     function JSXAttributeInitializer(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXAttributeInitializer", state);
@@ -11229,7 +11334,7 @@ ${input.slice(result.pos)}
         return $skip;
       return $1;
     });
-    var JSXAttributeValue$1 = $S(OpenBrace, ExtendedExpression, __, CloseBrace);
+    var JSXAttributeValue$1 = $S(OpenBrace, ExtendedExpression, $E(Whitespace), CloseBrace);
     var JSXAttributeValue$2 = JSXElement;
     var JSXAttributeValue$3 = JSXFragment;
     var JSXAttributeValue$4 = $S(InsertInlineOpenBrace, InlineJSXAttributeValue, InsertCloseBrace);
@@ -11629,7 +11734,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXText$0 = $TR($EXPECT($R46, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var JSXText$0 = $TR($EXPECT($R47, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return {
         type: "JSXText",
         token: $0,
@@ -11654,7 +11759,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXChildExpression$0 = $S(__, $E($S(DotDotDot, __)), ExtendedExpression);
+    var JSXChildExpression$0 = $S($E(Whitespace), $E($S(DotDotDot, $E(Whitespace))), ExtendedExpression);
     function JSXChildExpression(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXChildExpression", state);
@@ -11963,7 +12068,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R47, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L129, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R4, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
+    var TypeIndexSignature$0 = $S($E($S($R$0($EXPECT($R48, fail, "TypeIndexSignature /[+-]?/")), $EXPECT($L129, fail, 'TypeIndexSignature "readonly"'), __)), OpenBracket, TypeIndex, CloseBracket, $E($S(__, $R$0($EXPECT($R4, fail, "TypeIndexSignature /[+-]/")), QuestionMark)));
     function TypeIndexSignature(state) {
       if (state.events) {
         const result = state.events.enter?.("TypeIndexSignature", state);
@@ -12565,7 +12670,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Shebang$0 = $S($R$0($EXPECT($R48, fail, "Shebang /#![^\\r\\n]*/")), EOL);
+    var Shebang$0 = $S($R$0($EXPECT($R49, fail, "Shebang /#![^\\r\\n]*/")), EOL);
     function Shebang(state) {
       if (state.events) {
         const result = state.events.enter?.("Shebang", state);
@@ -12584,11 +12689,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologue$0 = $T($S($EXPECT($R49, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+    var CivetPrologue$0 = $T($S($EXPECT($R50, fail, "CivetPrologue /[\\t ]*/"), DoubleQuote, CivetPrologueContent, DoubleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
       var content = value[2];
       return content;
     });
-    var CivetPrologue$1 = $T($S($EXPECT($R49, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
+    var CivetPrologue$1 = $T($S($EXPECT($R50, fail, "CivetPrologue /[\\t ]*/"), SingleQuote, CivetPrologueContent, SingleQuote, $TEXT(StatementDelimiter), EOS), function(value) {
       var content = value[2];
       return content;
     });
@@ -12610,7 +12715,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetPrologueContent$0 = $TS($S($EXPECT($L165, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R50, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
+    var CivetPrologueContent$0 = $TS($S($EXPECT($L165, fail, 'CivetPrologueContent "civet"'), $Q(CivetOption), $EXPECT($R51, fail, "CivetPrologueContent /[\\s]*/")), function($skip, $loc, $0, $1, $2, $3) {
       var options = $2;
       return {
         type: "CivetPrologue",
@@ -12636,7 +12741,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var CivetOption$0 = $TR($EXPECT($R51, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var CivetOption$0 = $TR($EXPECT($R52, fail, "CivetOption /\\s+([+-]?)([a-zA-Z0-9-]+)(\\s*=\\s*([a-zA-Z0-9.+-]*))?/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       const optionName = $2.replace(/-+([a-z]?)/g, (_2, l) => {
         if (l)
           return l.toUpperCase();
@@ -12668,7 +12773,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var UnknownPrologue$0 = $S($R$0($EXPECT($R49, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
+    var UnknownPrologue$0 = $S($R$0($EXPECT($R50, fail, "UnknownPrologue /[\\t ]*/")), BasicStringLiteral, $TEXT(StatementDelimiter), EOS);
     function UnknownPrologue(state) {
       if (state.events) {
         const result = state.events.enter?.("UnknownPrologue", state);
@@ -12726,7 +12831,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var EOL$0 = $TR($EXPECT($R52, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var EOL$0 = $TR($EXPECT($R53, fail, "EOL /\\r\\n|\\n|\\r|$/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       return { $loc, token: $0 };
     });
     function EOL(state) {
@@ -13367,6 +13472,7 @@ ${input.slice(result.pos)}
         coffeeNot: false,
         coffeeOf: false,
         implicitReturns: true,
+        react: false,
         solid: false,
         client: false,
         server: false,
@@ -13524,6 +13630,14 @@ ${input.slice(result.pos)}
       module2.modifyString = function(str) {
         return str.replace(/(^.?|[^\\]{2})(\\\\)*\n/g, "$1$2\\n");
       };
+      module2.quoteString = function(str) {
+        str = str.replace(/\\/g, "\\\\");
+        if (str.includes('"') && !str.includes("'")) {
+          return "'" + str.replace(/'/g, "\\'") + "'";
+        } else {
+          return '"' + str.replace(/"/g, '\\"') + '"';
+        }
+      };
     });
     function Reset(state) {
       if (state.events) {
@@ -14502,7 +14616,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var Indent$0 = $TR($EXPECT($R53, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+    var Indent$0 = $TR($EXPECT($R54, fail, "Indent /[ \\t]*/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
       let level;
       if (module2.config.tab) {
         const tabs = $0.match(/\t/g);
@@ -15123,7 +15237,7 @@ var util;
 ({ prune } = gen = require_generate());
 ({ SourceMap, base64Encode } = util = require_util());
 defaultOptions = {};
-uncacheable = /* @__PURE__ */ new Set(["TrackIndented", "Samedent", "IndentedFurther", "PushIndent", "PopIndent", "Nested", "InsertIndent", "Arguments", "ArgumentsWithTrailingCallExpressions", "ApplicationStart", "CallExpression", "CallExpressionRest", "LeftHandSideExpression", "ActualAssignment", "UpdateExpression", "UnaryExpression", "BinaryOpExpression", "BinaryOpRHS", "ConditionalExpression", "ShortCircuitExpression", "ImplicitNestedBlock", "ObjectLiteral", "NestedObject", "NestedImplicitObjectLiteral", "BracedObjectLiteralContent", "NestedPropertyDefinitions", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedBlockStatement", "NestedElement", "NestedElementList", "NestedBindingElement", "NestedBindingElements", "NestedInterfaceProperty", "MemberExpression", "PrimaryExpression", "IndentedApplicationAllowed", "ExpressionWithIndentedApplicationSuppressed", "SuppressIndentedApplication", "AssignmentExpressionTail", "AssignmentExpression", "ExtendedExpression", "Expression", "MemberExpressionRest", "ElseClause", "CoffeeCommentEnabled", "SingleLineComment", "Debugger", "JSXElement", "TypedJSXElement", "JSXFragment", "TypedJSXFragment", "JSXChild", "JSXChildren", "JSXNestedChildren", "JSXMixedChildren"]);
+uncacheable = /* @__PURE__ */ new Set(["TrackIndented", "Samedent", "IndentedFurther", "PushIndent", "PopIndent", "Nested", "InsertIndent", "Arguments", "ArgumentsWithTrailingCallExpressions", "ApplicationStart", "CallExpression", "CallExpressionRest", "LeftHandSideExpression", "ActualAssignment", "UpdateExpression", "UnaryExpression", "BinaryOpExpression", "BinaryOpRHS", "ConditionalExpression", "ShortCircuitExpression", "InlineObjectLiteral", "ImplicitInlineObjectPropertyDelimiter", "ImplicitNestedBlock", "ObjectLiteral", "NestedObject", "NestedImplicitObjectLiteral", "BracedObjectLiteralContent", "NestedPropertyDefinitions", "NestedImplicitPropertyDefinition", "NestedImplicitPropertyDefinitions", "NestedBlockStatement", "NestedElement", "NestedElementList", "NestedBindingElement", "NestedBindingElements", "NestedInterfaceProperty", "MemberExpression", "PrimaryExpression", "IndentedApplicationAllowed", "ExpressionWithIndentedApplicationSuppressed", "SuppressIndentedApplication", "AssignmentExpressionTail", "AssignmentExpression", "ExtendedExpression", "Expression", "MemberExpressionRest", "ElseClause", "CoffeeCommentEnabled", "SingleLineComment", "Debugger", "JSXElement", "TypedJSXElement", "JSXFragment", "TypedJSXFragment", "JSXChild", "JSXChildren", "JSXNestedChildren", "JSXMixedChildren"]);
 module.exports = {
   parse,
   compile: function(src, options = defaultOptions) {

package/package.json

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