@danielx/civet 0.5.14 → 0.5.16

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

@@ -5,88 +5,6 @@ var Civet = (() => {
     return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
   };
 
-  // source/generate.coffee
-  var require_generate = __commonJS({
-    "source/generate.coffee"(exports, module) {
-      "civet coffeeCompat";
-      var gen;
-      var prune;
-      gen = function(node, options) {
-        var $loc, token;
-        if (node === null || node === void 0) {
-          return "";
-        }
-        if (typeof node === "string") {
-          if (options != null) {
-            if (typeof options.updateSourceMap === "function") {
-              options.updateSourceMap(node);
-            }
-          }
-          return node;
-        }
-        if (Array.isArray(node)) {
-          return node.map(function(child) {
-            return gen(child, options);
-          }).join("");
-        }
-        if (typeof node === "object") {
-          if (options.js && node.ts) {
-            return "";
-          }
-          if (!options.js && node.js) {
-            return "";
-          }
-          if (node.$loc != null) {
-            ({ token, $loc } = node);
-            if (options != null) {
-              if (typeof options.updateSourceMap === "function") {
-                options.updateSourceMap(token, $loc.pos);
-              }
-            }
-            return token;
-          }
-          if (!node.children) {
-            debugger;
-            throw new Error("Unknown node", JSON.stringify(node));
-          }
-          return gen(node.children, options);
-        }
-        debugger;
-        throw new Error("Unknown node", JSON.stringify(node));
-      };
-      module.exports = gen;
-      prune = function(node) {
-        var a;
-        if (node === null || node === void 0) {
-          return;
-        }
-        if (node.length === 0) {
-          return;
-        }
-        if (Array.isArray(node)) {
-          a = node.map(function(n) {
-            return prune(n);
-          }).filter(function(n) {
-            return !!n;
-          });
-          if (a.length > 1) {
-            return a;
-          }
-          if (a.length === 1) {
-            return a[0];
-          }
-          return;
-        }
-        if (node.children != null) {
-          node.children = prune(node.children) || [];
-          return node;
-        }
-        return node;
-      };
-      gen.prune = prune;
-    }
-  });
-
   // source/parser.hera
   var require_parser = __commonJS({
     "source/parser.hera"(exports, module) {
@@ -862,6 +780,7 @@ ${input.slice(result.pos)}
         JSXIdentifierName,
         JSXAttributes,
         JSXAttribute,
+        JSXShorthandString,
         JSXAttributeName,
         JSXAttributeInitializer,
         JSXAttributeValue,
@@ -1181,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);
@@ -10989,7 +10909,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 };
@@ -11002,8 +10922,9 @@ ${input.slice(result.pos)}
           children: children.jsxChildren.length ? [...$0, ["</", open[1], ">"]] : [open.slice(0, -1), " />"]
         };
       });
-      var JSXElement$3 = $TS($S(JSXOpeningElement), function($skip, $loc, $0, $1) {
-        throw new Error(`could not parse JSX element "${require_generate()($0)}" at pos ${$loc.pos}`);
+      var JSXElement$3 = $TV(JSXOpeningElement, function($skip, $loc, $0, $1) {
+        var elt = $0;
+        throw new Error(`could not parse JSX element "${elt[0]}${elt[1]}${elt[elt.length - 1]}" at pos ${$loc.pos}`);
       });
       function JSXElement(state) {
         if (state.events) {
@@ -11023,7 +10944,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) {
@@ -11044,7 +10965,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);
@@ -11063,7 +10984,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);
@@ -11108,7 +11029,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 {
@@ -11174,7 +11095,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);
@@ -11249,6 +11225,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);
@@ -11256,17 +11241,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) {
@@ -11287,7 +11304,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);
@@ -11311,7 +11328,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);
@@ -11653,7 +11670,7 @@ ${input.slice(result.pos)}
         }
         return $skip;
       });
-      var JSXNestedChildren$1 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
+      var JSXNestedChildren$1 = $TV($Y($C(EOS, $EXPECT($L17, fail, 'JSXNestedChildren "}"'))), function($skip, $loc, $0, $1) {
         return { children: [], jsxChildren: [] };
       });
       function JSXNestedChildren(state) {
@@ -11711,7 +11728,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,
@@ -11736,7 +11753,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);
@@ -12045,7 +12062,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);
@@ -12647,7 +12664,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);
@@ -12666,11 +12683,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;
       });
@@ -12692,7 +12709,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",
@@ -12718,7 +12735,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();
@@ -12750,7 +12767,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);
@@ -12808,7 +12825,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) {
@@ -13449,6 +13466,7 @@ ${input.slice(result.pos)}
           coffeeNot: false,
           coffeeOf: false,
           implicitReturns: true,
+          react: false,
           solid: false,
           client: false,
           server: false,
@@ -13606,6 +13624,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) {
@@ -14584,7 +14610,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);
@@ -14782,6 +14808,88 @@ ${input.slice(result.pos)}
     }
   });
 
+  // source/generate.coffee
+  var require_generate = __commonJS({
+    "source/generate.coffee"(exports, module) {
+      "civet coffeeCompat";
+      var gen;
+      var prune;
+      gen = function(node, options) {
+        var $loc, token;
+        if (node === null || node === void 0) {
+          return "";
+        }
+        if (typeof node === "string") {
+          if (options != null) {
+            if (typeof options.updateSourceMap === "function") {
+              options.updateSourceMap(node);
+            }
+          }
+          return node;
+        }
+        if (Array.isArray(node)) {
+          return node.map(function(child) {
+            return gen(child, options);
+          }).join("");
+        }
+        if (typeof node === "object") {
+          if (options.js && node.ts) {
+            return "";
+          }
+          if (!options.js && node.js) {
+            return "";
+          }
+          if (node.$loc != null) {
+            ({ token, $loc } = node);
+            if (options != null) {
+              if (typeof options.updateSourceMap === "function") {
+                options.updateSourceMap(token, $loc.pos);
+              }
+            }
+            return token;
+          }
+          if (!node.children) {
+            debugger;
+            throw new Error("Unknown node", JSON.stringify(node));
+          }
+          return gen(node.children, options);
+        }
+        debugger;
+        throw new Error("Unknown node", JSON.stringify(node));
+      };
+      module.exports = gen;
+      prune = function(node) {
+        var a;
+        if (node === null || node === void 0) {
+          return;
+        }
+        if (node.length === 0) {
+          return;
+        }
+        if (Array.isArray(node)) {
+          a = node.map(function(n) {
+            return prune(n);
+          }).filter(function(n) {
+            return !!n;
+          });
+          if (a.length > 1) {
+            return a;
+          }
+          if (a.length === 1) {
+            return a[0];
+          }
+          return;
+        }
+        if (node.children != null) {
+          node.children = prune(node.children) || [];
+          return node;
+        }
+        return node;
+      };
+      gen.prune = prune;
+    }
+  });
+
   // source/util.coffee
   var require_util = __commonJS({
     "source/util.coffee"(exports, module) {
@@ -15119,11 +15227,13 @@ ${input.slice(result.pos)}
       var makeCache;
       var parse;
       var prune;
+      var uncacheable;
       var util;
       ({ parse } = require_parser());
       ({ 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"]);
       module.exports = {
         parse,
         compile: function(src, options = defaultOptions) {
@@ -15176,69 +15286,9 @@ ${"//#"} sourceMappingURL=data:application/json;base64,${base64Encode(JSON.strin
           exit: function(ruleName, state, result) {
             var cache;
             cache = caches.get(ruleName);
-            if (!cache) {
-              switch (ruleName) {
-                case "TrackIndented":
-                case "Samedent":
-                case "IndentedFurther":
-                case "PushIndent":
-                case "PopIndent":
-                case "Nested":
-                case "InsertIndent":
-                case "Arguments":
-                case "ArgumentsWithTrailingCallExpressions":
-                case "ApplicationStart":
-                case "CallExpression":
-                case "CallExpressionRest":
-                case "LeftHandSideExpression":
-                case "ActualAssignment":
-                case "UpdateExpression":
-                case "UnaryExpression":
-                case "BinaryOpExpression":
-                case "BinaryOpRHS":
-                case "ConditionalExpression":
-                case "ShortCircuitExpression":
-                case "ImplicitNestedBlock":
-                case "ObjectLiteral":
-                case "NestedObject":
-                case "NestedImplicitObjectLiteral":
-                case "BracedObjectLiteralContent":
-                case "NestedPropertyDefinitions":
-                case "NestedImplicitPropertyDefinition":
-                case "NestedImplicitPropertyDefinitions":
-                case "NestedBlockStatement":
-                case "NestedElement":
-                case "NestedElementList":
-                case "NestedBindingElement":
-                case "NestedBindingElements":
-                case "NestedInterfaceProperty":
-                case "MemberExpression":
-                case "PrimaryExpression":
-                case "IndentedApplicationAllowed":
-                case "ExpressionWithIndentedApplicationSuppressed":
-                case "SuppressIndentedApplication":
-                case "AssignmentExpressionTail":
-                case "AssignmentExpression":
-                case "ExtendedExpression":
-                case "Expression":
-                case "MemberExpressionRest":
-                case "ElseClause":
-                case "CoffeeCommentEnabled":
-                case "SingleLineComment":
-                case "Debugger":
-                case "JSXElement":
-                case "TypedJSXElement":
-                case "JSXFragment":
-                case "TypedJSXFragment":
-                case "JSXChild":
-                case "JSXChildren":
-                case "JSXNestedChildren":
-                case "JSXMixedChildren":
-                  break;
-                default:
-                  cache = /* @__PURE__ */ new Map();
-                  caches.set(ruleName, cache);
-              }
+            if (!cache && !uncacheable.has(ruleName)) {
+              cache = /* @__PURE__ */ new Map();
+              caches.set(ruleName, cache);
             }
             if (cache) {
               if (result) {

package/dist/main.js

@@ -4,88 +4,6 @@ var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
-// source/generate.coffee
-var require_generate = __commonJS({
-  "source/generate.coffee"(exports2, module2) {
-    "civet coffeeCompat";
-    var gen2;
-    var prune2;
-    gen2 = function(node, options) {
-      var $loc, token;
-      if (node === null || node === void 0) {
-        return "";
-      }
-      if (typeof node === "string") {
-        if (options != null) {
-          if (typeof options.updateSourceMap === "function") {
-            options.updateSourceMap(node);
-          }
-        }
-        return node;
-      }
-      if (Array.isArray(node)) {
-        return node.map(function(child) {
-          return gen2(child, options);
-        }).join("");
-      }
-      if (typeof node === "object") {
-        if (options.js && node.ts) {
-          return "";
-        }
-        if (!options.js && node.js) {
-          return "";
-        }
-        if (node.$loc != null) {
-          ({ token, $loc } = node);
-          if (options != null) {
-            if (typeof options.updateSourceMap === "function") {
-              options.updateSourceMap(token, $loc.pos);
-            }
-          }
-          return token;
-        }
-        if (!node.children) {
-          debugger;
-          throw new Error("Unknown node", JSON.stringify(node));
-        }
-        return gen2(node.children, options);
-      }
-      debugger;
-      throw new Error("Unknown node", JSON.stringify(node));
-    };
-    module2.exports = gen2;
-    prune2 = function(node) {
-      var a;
-      if (node === null || node === void 0) {
-        return;
-      }
-      if (node.length === 0) {
-        return;
-      }
-      if (Array.isArray(node)) {
-        a = node.map(function(n) {
-          return prune2(n);
-        }).filter(function(n) {
-          return !!n;
-        });
-        if (a.length > 1) {
-          return a;
-        }
-        if (a.length === 1) {
-          return a[0];
-        }
-        return;
-      }
-      if (node.children != null) {
-        node.children = prune2(node.children) || [];
-        return node;
-      }
-      return node;
-    };
-    gen2.prune = prune2;
-  }
-});
-
 // source/parser.hera
 var require_parser = __commonJS({
   "source/parser.hera"(exports2, module2) {
@@ -861,6 +779,7 @@ ${input.slice(result.pos)}
       JSXIdentifierName,
       JSXAttributes,
       JSXAttribute,
+      JSXShorthandString,
       JSXAttributeName,
       JSXAttributeInitializer,
       JSXAttributeValue,
@@ -1180,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);
@@ -10988,7 +10908,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 };
@@ -11001,8 +10921,9 @@ ${input.slice(result.pos)}
         children: children.jsxChildren.length ? [...$0, ["</", open[1], ">"]] : [open.slice(0, -1), " />"]
       };
     });
-    var JSXElement$3 = $TS($S(JSXOpeningElement), function($skip, $loc, $0, $1) {
-      throw new Error(`could not parse JSX element "${require_generate()($0)}" at pos ${$loc.pos}`);
+    var JSXElement$3 = $TV(JSXOpeningElement, function($skip, $loc, $0, $1) {
+      var elt = $0;
+      throw new Error(`could not parse JSX element "${elt[0]}${elt[1]}${elt[elt.length - 1]}" at pos ${$loc.pos}`);
     });
     function JSXElement(state) {
       if (state.events) {
@@ -11022,7 +10943,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) {
@@ -11043,7 +10964,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);
@@ -11062,7 +10983,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);
@@ -11107,7 +11028,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 {
@@ -11173,7 +11094,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);
@@ -11248,6 +11224,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);
@@ -11255,17 +11240,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) {
@@ -11286,7 +11303,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);
@@ -11310,7 +11327,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);
@@ -11652,7 +11669,7 @@ ${input.slice(result.pos)}
       }
       return $skip;
     });
-    var JSXNestedChildren$1 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
+    var JSXNestedChildren$1 = $TV($Y($C(EOS, $EXPECT($L17, fail, 'JSXNestedChildren "}"'))), function($skip, $loc, $0, $1) {
       return { children: [], jsxChildren: [] };
     });
     function JSXNestedChildren(state) {
@@ -11710,7 +11727,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,
@@ -11735,7 +11752,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);
@@ -12044,7 +12061,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);
@@ -12646,7 +12663,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);
@@ -12665,11 +12682,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;
     });
@@ -12691,7 +12708,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",
@@ -12717,7 +12734,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();
@@ -12749,7 +12766,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);
@@ -12807,7 +12824,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) {
@@ -13448,6 +13465,7 @@ ${input.slice(result.pos)}
         coffeeNot: false,
         coffeeOf: false,
         implicitReturns: true,
+        react: false,
         solid: false,
         client: false,
         server: false,
@@ -13605,6 +13623,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) {
@@ -14583,7 +14609,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);
@@ -14781,6 +14807,88 @@ ${input.slice(result.pos)}
   }
 });
 
+// source/generate.coffee
+var require_generate = __commonJS({
+  "source/generate.coffee"(exports2, module2) {
+    "civet coffeeCompat";
+    var gen2;
+    var prune2;
+    gen2 = function(node, options) {
+      var $loc, token;
+      if (node === null || node === void 0) {
+        return "";
+      }
+      if (typeof node === "string") {
+        if (options != null) {
+          if (typeof options.updateSourceMap === "function") {
+            options.updateSourceMap(node);
+          }
+        }
+        return node;
+      }
+      if (Array.isArray(node)) {
+        return node.map(function(child) {
+          return gen2(child, options);
+        }).join("");
+      }
+      if (typeof node === "object") {
+        if (options.js && node.ts) {
+          return "";
+        }
+        if (!options.js && node.js) {
+          return "";
+        }
+        if (node.$loc != null) {
+          ({ token, $loc } = node);
+          if (options != null) {
+            if (typeof options.updateSourceMap === "function") {
+              options.updateSourceMap(token, $loc.pos);
+            }
+          }
+          return token;
+        }
+        if (!node.children) {
+          debugger;
+          throw new Error("Unknown node", JSON.stringify(node));
+        }
+        return gen2(node.children, options);
+      }
+      debugger;
+      throw new Error("Unknown node", JSON.stringify(node));
+    };
+    module2.exports = gen2;
+    prune2 = function(node) {
+      var a;
+      if (node === null || node === void 0) {
+        return;
+      }
+      if (node.length === 0) {
+        return;
+      }
+      if (Array.isArray(node)) {
+        a = node.map(function(n) {
+          return prune2(n);
+        }).filter(function(n) {
+          return !!n;
+        });
+        if (a.length > 1) {
+          return a;
+        }
+        if (a.length === 1) {
+          return a[0];
+        }
+        return;
+      }
+      if (node.children != null) {
+        node.children = prune2(node.children) || [];
+        return node;
+      }
+      return node;
+    };
+    gen2.prune = prune2;
+  }
+});
+
 // source/util.coffee
 var require_util = __commonJS({
   "source/util.coffee"(exports2, module2) {
@@ -15116,11 +15224,13 @@ var gen;
 var makeCache;
 var parse;
 var prune;
+var uncacheable;
 var util;
 ({ parse } = require_parser());
 ({ 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"]);
 module.exports = {
   parse,
   compile: function(src, options = defaultOptions) {
@@ -15173,69 +15283,9 @@ makeCache = function() {
     exit: function(ruleName, state, result) {
       var cache;
       cache = caches.get(ruleName);
-      if (!cache) {
-        switch (ruleName) {
-          case "TrackIndented":
-          case "Samedent":
-          case "IndentedFurther":
-          case "PushIndent":
-          case "PopIndent":
-          case "Nested":
-          case "InsertIndent":
-          case "Arguments":
-          case "ArgumentsWithTrailingCallExpressions":
-          case "ApplicationStart":
-          case "CallExpression":
-          case "CallExpressionRest":
-          case "LeftHandSideExpression":
-          case "ActualAssignment":
-          case "UpdateExpression":
-          case "UnaryExpression":
-          case "BinaryOpExpression":
-          case "BinaryOpRHS":
-          case "ConditionalExpression":
-          case "ShortCircuitExpression":
-          case "ImplicitNestedBlock":
-          case "ObjectLiteral":
-          case "NestedObject":
-          case "NestedImplicitObjectLiteral":
-          case "BracedObjectLiteralContent":
-          case "NestedPropertyDefinitions":
-          case "NestedImplicitPropertyDefinition":
-          case "NestedImplicitPropertyDefinitions":
-          case "NestedBlockStatement":
-          case "NestedElement":
-          case "NestedElementList":
-          case "NestedBindingElement":
-          case "NestedBindingElements":
-          case "NestedInterfaceProperty":
-          case "MemberExpression":
-          case "PrimaryExpression":
-          case "IndentedApplicationAllowed":
-          case "ExpressionWithIndentedApplicationSuppressed":
-          case "SuppressIndentedApplication":
-          case "AssignmentExpressionTail":
-          case "AssignmentExpression":
-          case "ExtendedExpression":
-          case "Expression":
-          case "MemberExpressionRest":
-          case "ElseClause":
-          case "CoffeeCommentEnabled":
-          case "SingleLineComment":
-          case "Debugger":
-          case "JSXElement":
-          case "TypedJSXElement":
-          case "JSXFragment":
-          case "TypedJSXFragment":
-          case "JSXChild":
-          case "JSXChildren":
-          case "JSXNestedChildren":
-          case "JSXMixedChildren":
-            break;
-          default:
-            cache = /* @__PURE__ */ new Map();
-            caches.set(ruleName, cache);
-        }
+      if (!cache && !uncacheable.has(ruleName)) {
+        cache = /* @__PURE__ */ new Map();
+        caches.set(ruleName, cache);
       }
       if (cache) {
         if (result) {

package/package.json

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