@danielx/civet 0.5.4 → 0.5.6

package/README.md

@@ -11,6 +11,11 @@ The CoffeeScript of TypeScript. Much closer to ES2015+ (for better or worse).
 - [Online Civet Playground](https://civet-web.vercel.app/)
 - [Civet VSCode Extension](https://marketplace.visualstudio.com/items?itemName=DanielX.civet)
 - [Discord Server](https://discord.gg/xkrW9GebBc)
+- Plugins for
+  [Vite](https://github.com/lorefnon/vite-plugin-civet),
+  [esbuild](source/esbuild-plugin.civet),
+  [ESM module resolution](source/esm.civet)
+- Starter templates for [Solid](https://github.com/orenelbaum/solid-civet-template) and [Solid Start](https://github.com/orenelbaum/solid-start-civet-template)
 
 Quickstart Guide
 ---
@@ -217,6 +222,11 @@ Things Added that CoffeeScript didn't
     `sum=x+1` → `sum={x+1}`, `list=[1, 2, 3]` → `list={[1, 2, 3]}`
   - Attributes can use computed property names:
     `[expr]={value}` → `{...{[expr]: value}}`
+  - `"civet solid"` flag adds correct types for JSX elements and fragments.
+    Use `"civet solid client"` (default) for client-only code,
+    `"civet solid server"` for server-only code (SSR only), or
+    `"civet solid client server"` for isomorphic code that runs on
+    client and server (SSR + hydration).
 - CoffeeScript improvements
   - Postfix loop `run() loop` → `while(true) run()`
   - Character range literals `["a".."z"]`, `['f'..'a']`, `['0'..'9']`
@@ -235,7 +245,7 @@ Things Changed from ES6
   behave more differently than they already do is bad. Passing an anonymous function to an
   application without parens is also convenient.
 - `for(i of x) ...` defaults to const declaration → `for(const i of x) ...`
-- Disallow comma operator in conditionals and many other places. `if x, y` is not allowed.
+- Disallow comma operator in conditionals and many other places. `if x, y` is not allowed. But `for i = 0, l = a.length; i < l; i++, i *= 2` is allowed.
 - Comma operator in `case`/`when` instead becomes multiple conditions.
 - Numbers can't end with a dot (otherwise would be ambiguous with CoffeeScript slices `y[0..x]`). This also implies that you can't access properties
 of numbers with `1..toString()` use `1.toString()` instead. When exponent follows a dot it is treated as a property access since an exponent

package/dist/browser.js

@@ -833,10 +833,12 @@ ${input.slice(result.pos)}
         When,
         While,
         Yield,
+        TypedJSXElement,
         JSXElement,
         JSXSelfClosingElement,
         JSXOpeningElement,
         JSXClosingElement,
+        TypedJSXFragment,
         JSXFragment,
         JSXElementName,
         JSXIdentifierName,
@@ -2003,8 +2005,8 @@ ${input.slice(result.pos)}
       var PrimaryExpression$7 = RegularExpressionLiteral;
       var PrimaryExpression$8 = TemplateLiteral;
       var PrimaryExpression$9 = ParenthesizedExpression;
-      var PrimaryExpression$10 = JSXElement;
-      var PrimaryExpression$11 = JSXFragment;
+      var PrimaryExpression$10 = TypedJSXElement;
+      var PrimaryExpression$11 = TypedJSXFragment;
       function PrimaryExpression(state) {
         if (state.events) {
           const result = state.events.enter?.("PrimaryExpression", state);
@@ -2720,6 +2722,7 @@ ${input.slice(result.pos)}
         }
       }
       var SuperProperty$0 = $S($EXPECT($L13, fail, 'SuperProperty "super["'), ExtendedExpression, __, CloseBracket);
+      var SuperProperty$1 = $S($EXPECT($L10, fail, 'SuperProperty "super"'), $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
       function SuperProperty(state) {
         if (state.events) {
           const result = state.events.enter?.("SuperProperty", state);
@@ -2727,12 +2730,12 @@ ${input.slice(result.pos)}
             return result.cache;
         }
         if (state.tokenize) {
-          const result = $TOKEN("SuperProperty", state, SuperProperty$0(state));
+          const result = $TOKEN("SuperProperty", state, SuperProperty$0(state) || SuperProperty$1(state));
           if (state.events)
             state.events.exit?.("SuperProperty", state, result);
           return result;
         } else {
-          const result = SuperProperty$0(state);
+          const result = SuperProperty$0(state) || SuperProperty$1(state);
           if (state.events)
             state.events.exit?.("SuperProperty", state, result);
           return result;
@@ -10570,20 +10573,45 @@ ${input.slice(result.pos)}
           return result;
         }
       }
+      var TypedJSXElement$0 = $TS($S(JSXElement), function($skip, $loc, $0, $1) {
+        const type = module.typeOfJSXElement($1);
+        return type ? [
+          { ts: true, children: ["("] },
+          $1,
+          { ts: true, children: [" as any as ", type, ")"] }
+        ] : $1;
+      });
+      function TypedJSXElement(state) {
+        if (state.events) {
+          const result = state.events.enter?.("TypedJSXElement", state);
+          if (result)
+            return result.cache;
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("TypedJSXElement", state, TypedJSXElement$0(state));
+          if (state.events)
+            state.events.exit?.("TypedJSXElement", state, result);
+          return result;
+        } else {
+          const result = TypedJSXElement$0(state);
+          if (state.events)
+            state.events.exit?.("TypedJSXElement", state, result);
+          return result;
+        }
+      }
       var JSXElement$0 = JSXSelfClosingElement;
       var JSXElement$1 = $TS($S(JSXOpeningElement, $E(JSXChildren), __, JSXClosingElement), function($skip, $loc, $0, $1, $2, $3, $4) {
         if ($1[1] !== $4[2])
           return $skip;
-        return $0;
+        return { type: "JSXElement", children: $0 };
       });
       var JSXElement$2 = $TS($S(JSXOpeningElement, JSXMixedChildren, InsertNewline, InsertIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
         var open = $1;
         var children = $2;
-        if (children.length) {
-          return [...$0, ["</", open[1], ">"]];
-        } else {
-          return [open.slice(0, -1), " />"];
-        }
+        return {
+          type: "JSXElement",
+          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}`);
@@ -10606,7 +10634,9 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXSelfClosingElement$0 = $S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L147, fail, 'JSXSelfClosingElement "/>"'));
+      var JSXSelfClosingElement$0 = $TS($S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L147, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+        return { type: "JSXElement", children: $0 };
+      });
       function JSXSelfClosingElement(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXSelfClosingElement", state);
@@ -10663,9 +10693,41 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXFragment$0 = $S($EXPECT($L149, fail, 'JSXFragment "<>"'), $E(JSXChildren), __, $EXPECT($L150, fail, 'JSXFragment "</>"'));
+      var TypedJSXFragment$0 = $TS($S(JSXFragment), function($skip, $loc, $0, $1) {
+        const type = module.typeOfJSXFragment($1);
+        return type ? [
+          { ts: true, children: ["("] },
+          $1,
+          { ts: true, children: [" as any as ", type, ")"] }
+        ] : $1;
+      });
+      function TypedJSXFragment(state) {
+        if (state.events) {
+          const result = state.events.enter?.("TypedJSXFragment", state);
+          if (result)
+            return result.cache;
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("TypedJSXFragment", state, TypedJSXFragment$0(state));
+          if (state.events)
+            state.events.exit?.("TypedJSXFragment", state, result);
+          return result;
+        } else {
+          const result = TypedJSXFragment$0(state);
+          if (state.events)
+            state.events.exit?.("TypedJSXFragment", state, result);
+          return result;
+        }
+      }
+      var JSXFragment$0 = $TS($S($EXPECT($L149, fail, 'JSXFragment "<>"'), $E(JSXChildren), __, $EXPECT($L150, fail, 'JSXFragment "</>"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+        if ($2) {
+          return { type: "JSXFragment", children: $0, jsxChildren: $2.jsxChildren };
+        } else {
+          return { type: "JSXFragment", children: $0, jsxChildren: [] };
+        }
+      });
       var JSXFragment$1 = $TS($S($EXPECT($L149, fail, 'JSXFragment "<>"'), JSXMixedChildren, InsertNewline, InsertIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
-        return [...$0, "</>"];
+        return { type: "JSXFragment", children: [...$0, "</>"], jsxChildren: $2.jsxChildren };
       });
       function JSXFragment(state) {
         if (state.events) {
@@ -11143,10 +11205,13 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXMixedChildren$0 = $TS($S($Q($C(_, JSXChild)), JSXNestedChildren), function($skip, $loc, $0, $1, $2) {
+      var JSXMixedChildren$0 = $TS($S($Q(JSXChild), JSXNestedChildren), function($skip, $loc, $0, $1, $2) {
         var c1 = $1;
         var c2 = $2;
-        return c1.concat(c2);
+        return {
+          children: c1.concat(c2),
+          jsxChildren: c1.concat(c2.jsxChildren)
+        };
       });
       function JSXMixedChildren(state) {
         if (state.events) {
@@ -11166,7 +11231,12 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXChildren$0 = $Q($S(__, JSXChild));
+      var JSXChildren$0 = $TV($Q($S($Q($S($E(NonNewlineWhitespace), EOL, $E(NonNewlineWhitespace))), JSXChild)), function($skip, $loc, $0, $1) {
+        return {
+          children: $1,
+          jsxChildren: $1.map((children) => children[1])
+        };
+      });
       function JSXChildren(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXChildren", state);
@@ -11186,12 +11256,16 @@ ${input.slice(result.pos)}
         }
       }
       var JSXNestedChildren$0 = $TS($S(PushIndent, $Q($S(Nested, $P(JSXChild))), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-        if ($2.length)
-          return $2;
+        if ($2.length) {
+          return {
+            children: $2,
+            jsxChildren: [].concat(...$2.map((nestedChildren) => nestedChildren[1]))
+          };
+        }
         return $skip;
       });
       var JSXNestedChildren$1 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
-        return [];
+        return { children: [], jsxChildren: [] };
       });
       function JSXNestedChildren(state) {
         if (state.events) {
@@ -11214,7 +11288,14 @@ ${input.slice(result.pos)}
       var JSXChild$0 = JSXText;
       var JSXChild$1 = JSXElement;
       var JSXChild$2 = JSXFragment;
-      var JSXChild$3 = $S(OpenBrace, $E(JSXChildExpression), __, CloseBrace);
+      var JSXChild$3 = $TS($S(OpenBrace, $E(JSXChildExpression), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+        var expression = $2;
+        return {
+          type: "JSXChildExpression",
+          children: $0,
+          expression
+        };
+      });
       function JSXChild(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXChild", state);
@@ -11233,7 +11314,13 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var JSXText$0 = $R$0($EXPECT($R46, fail, "JSXText /[^{}<>\\r\\n]+/"));
+      var JSXText$0 = $TR($EXPECT($R46, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+        return {
+          type: "JSXText",
+          token: $0,
+          $loc
+        };
+      });
       function JSXText(state) {
         if (state.events) {
           const result = state.events.enter?.("JSXText", state);
@@ -12965,6 +13052,9 @@ ${input.slice(result.pos)}
           coffeeNot: false,
           coffeeOf: false,
           implicitReturns: true,
+          solid: false,
+          client: false,
+          server: false,
           tab: void 0,
           verbose: false
         };
@@ -12987,6 +13077,34 @@ ${input.slice(result.pos)}
               children: [": <T>(this: T, prop: keyof T) => boolean"]
             };
             module.prelude.push(["", ["const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", module.asAny, "\n"]]);
+          },
+          JSX(jsxRef) {
+            module.prelude.push({
+              ts: true,
+              children: [
+                "import type { JSX as ",
+                jsxRef,
+                " } from 'solid-js';\n"
+              ]
+            });
+          },
+          IntrinsicElements(intrinsicElementsRef) {
+            const JSX = module.getRef("JSX");
+            module.prelude.push({
+              ts: true,
+              children: [
+                "type ",
+                intrinsicElementsRef,
+                "<K extends keyof ",
+                JSX,
+                ".IntrinsicElements> =\n",
+                "  ",
+                JSX,
+                ".IntrinsicElements[K] extends ",
+                JSX,
+                ".DOMAttributes<infer T> ? T : unknown;\n"
+              ]
+            });
           }
         };
         const refs = {};
@@ -13004,11 +13122,55 @@ ${input.slice(result.pos)}
         };
         module.typeOfJSXElement = function($12) {
           if (module.config.solid) {
-            let open = $12;
+            if (module.config.server && !module.config.client) {
+              return ["string"];
+            }
+            let open = $12.children;
             while (Array.isArray(open[0]))
               open = open[0];
             open = open[1];
-            return typeof open === "string" && open[0] === open[0].toLowerCase() ? [module.getRef("IntrinsicElements"), '<"', open, '">'] : ["ReturnType<typeof ", open, ">"];
+            const clientType = typeof open === "string" && open[0] === open[0].toLowerCase() ? [module.getRef("IntrinsicElements"), '<"', open, '">'] : ["ReturnType<typeof ", open, ">"];
+            if (module.config.server) {
+              return ["string", " | ", clientType];
+            } else {
+              return clientType;
+            }
+          }
+        };
+        module.typeOfJSXFragment = function($12) {
+          if (module.config.solid) {
+            let type = [];
+            let lastType;
+            for (let child of $12.jsxChildren) {
+              switch (child.type) {
+                case "JSXText":
+                  if (lastType !== "JSXText") {
+                    type.push("string");
+                  }
+                  break;
+                case "JSXElement":
+                  type.push(module.typeOfJSXElement(child));
+                  break;
+                case "JSXFragment":
+                  type.push(...module.typeOfJSXFragment(child));
+                  break;
+                case "JSXChildExpression":
+                  if (child.expression) {
+                    type.push(["typeof ", child.expression]);
+                  }
+                  break;
+                default:
+                  throw new Error(`unknown child in JSXFragment: ${JSON.stringify(child)}`);
+              }
+              lastType = child.type;
+            }
+            if (type.length === 1) {
+              return type[0];
+            } else {
+              type = type.map((t) => [t, ", "]).flat();
+              type.pop();
+              return ["[", type, "]"];
+            }
           }
         };
         Object.defineProperty(module.config, "coffeeCompat", {
@@ -13566,12 +13728,12 @@ ${input.slice(result.pos)}
           if (node == null)
             return [];
           if (Array.isArray(node)) {
-            return node.flatMap((n) => gatherNodes(n, predicate));
+            return node.flatMap((n) => gatherRecursive(n, predicate));
           }
           if (predicate(node)) {
             return [node];
           }
-          return gatherNodes(node.children, predicate);
+          return gatherRecursive(node.children, predicate);
         }
         function gatherRecursiveAll(node, predicate) {
           if (node == null)
@@ -13889,6 +14051,13 @@ ${input.slice(result.pos)}
           function hasDec(name) {
             return scopes.some((s) => s.has(name));
           }
+          function findVarDecs(statements2, decs) {
+            const declarationNames = gatherRecursive(
+              statements2,
+              (node) => node.type === "Declaration" && node.children && node.children.length > 0 && node.children[0].token && node.children[0].token.startsWith("var") || node.type === "FunctionExpression"
+            ).filter((node) => node.type === "Declaration").flatMap((node) => node.names);
+            return new Set(declarationNames);
+          }
           function insertBeforeAssignment(assignment, content) {
             if (assignment.children && assignment.children.length) {
               let indent = assignment.children[0][0][0];
@@ -13901,10 +14070,11 @@ ${input.slice(result.pos)}
           scopes.push(currentScope);
           const fnNodes = gatherNodes(statements, (s) => s.type === "FunctionExpression");
           const forNodes = gatherNodes(statements, (s) => s.type === "ForStatement");
-          const nodes = gatherNodes(statements, (s) => s.type === "BlockStatement" || s.type === "AssignmentExpression");
+          const nodes = gatherNodes(statements, (s) => s.type === "BlockStatement" || s.type === "AssignmentExpression" || s.type === "Declaration");
+          let declaredIdentifiers = findVarDecs(statements);
           for (const node of nodes) {
             if (node.type == "AssignmentExpression") {
-              let undeclaredIdentifiers = node.names.filter((name) => !hasDec(name));
+              let undeclaredIdentifiers = node.names.filter((name) => !(hasDec(name) || declaredIdentifiers.has(name)));
               if (node.children.length)
                 createLetDecs(node.children, scopes);
               undeclaredIdentifiers.forEach((name) => currentScope.add(name));
@@ -13913,6 +14083,8 @@ ${input.slice(result.pos)}
               } else if (undeclaredIdentifiers.length > 0) {
                 insertBeforeAssignment(node, ["let ", undeclaredIdentifiers.join(", "), "\n"]);
               }
+            } else if (node.type == "Declaration") {
+              node.names.forEach((name) => currentScope.add(name));
             } else {
               let block = node;
               let fnNode = fnNodes.find((fnNode2) => fnNode2.block === block);
@@ -14613,9 +14785,11 @@ ${"//#"} sourceMappingURL=data:application/json;base64,${base64Encode(JSON.strin
                 case "SingleLineComment":
                 case "Debugger":
                 case "JSXElement":
+                case "TypedJSXElement":
+                case "JSXFragment":
+                case "TypedJSXFragment":
                 case "JSXChild":
                 case "JSXChildren":
-                case "JSXFragment":
                 case "JSXNestedChildren":
                 case "JSXMixedChildren":
                   break;

package/dist/main.js

@@ -832,10 +832,12 @@ ${input.slice(result.pos)}
       When,
       While,
       Yield,
+      TypedJSXElement,
       JSXElement,
       JSXSelfClosingElement,
       JSXOpeningElement,
       JSXClosingElement,
+      TypedJSXFragment,
       JSXFragment,
       JSXElementName,
       JSXIdentifierName,
@@ -2002,8 +2004,8 @@ ${input.slice(result.pos)}
     var PrimaryExpression$7 = RegularExpressionLiteral;
     var PrimaryExpression$8 = TemplateLiteral;
     var PrimaryExpression$9 = ParenthesizedExpression;
-    var PrimaryExpression$10 = JSXElement;
-    var PrimaryExpression$11 = JSXFragment;
+    var PrimaryExpression$10 = TypedJSXElement;
+    var PrimaryExpression$11 = TypedJSXFragment;
     function PrimaryExpression(state) {
       if (state.events) {
         const result = state.events.enter?.("PrimaryExpression", state);
@@ -2719,6 +2721,7 @@ ${input.slice(result.pos)}
       }
     }
     var SuperProperty$0 = $S($EXPECT($L13, fail, 'SuperProperty "super["'), ExtendedExpression, __, CloseBracket);
+    var SuperProperty$1 = $S($EXPECT($L10, fail, 'SuperProperty "super"'), $N($C(QuestionMark, NonNullAssertion)), PropertyAccess);
     function SuperProperty(state) {
       if (state.events) {
         const result = state.events.enter?.("SuperProperty", state);
@@ -2726,12 +2729,12 @@ ${input.slice(result.pos)}
           return result.cache;
       }
       if (state.tokenize) {
-        const result = $TOKEN("SuperProperty", state, SuperProperty$0(state));
+        const result = $TOKEN("SuperProperty", state, SuperProperty$0(state) || SuperProperty$1(state));
         if (state.events)
           state.events.exit?.("SuperProperty", state, result);
         return result;
       } else {
-        const result = SuperProperty$0(state);
+        const result = SuperProperty$0(state) || SuperProperty$1(state);
         if (state.events)
           state.events.exit?.("SuperProperty", state, result);
         return result;
@@ -10569,20 +10572,45 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var TypedJSXElement$0 = $TS($S(JSXElement), function($skip, $loc, $0, $1) {
+      const type = module2.typeOfJSXElement($1);
+      return type ? [
+        { ts: true, children: ["("] },
+        $1,
+        { ts: true, children: [" as any as ", type, ")"] }
+      ] : $1;
+    });
+    function TypedJSXElement(state) {
+      if (state.events) {
+        const result = state.events.enter?.("TypedJSXElement", state);
+        if (result)
+          return result.cache;
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TypedJSXElement", state, TypedJSXElement$0(state));
+        if (state.events)
+          state.events.exit?.("TypedJSXElement", state, result);
+        return result;
+      } else {
+        const result = TypedJSXElement$0(state);
+        if (state.events)
+          state.events.exit?.("TypedJSXElement", state, result);
+        return result;
+      }
+    }
     var JSXElement$0 = JSXSelfClosingElement;
     var JSXElement$1 = $TS($S(JSXOpeningElement, $E(JSXChildren), __, JSXClosingElement), function($skip, $loc, $0, $1, $2, $3, $4) {
       if ($1[1] !== $4[2])
         return $skip;
-      return $0;
+      return { type: "JSXElement", children: $0 };
     });
     var JSXElement$2 = $TS($S(JSXOpeningElement, JSXMixedChildren, InsertNewline, InsertIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
       var open = $1;
       var children = $2;
-      if (children.length) {
-        return [...$0, ["</", open[1], ">"]];
-      } else {
-        return [open.slice(0, -1), " />"];
-      }
+      return {
+        type: "JSXElement",
+        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}`);
@@ -10605,7 +10633,9 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXSelfClosingElement$0 = $S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L147, fail, 'JSXSelfClosingElement "/>"'));
+    var JSXSelfClosingElement$0 = $TS($S($EXPECT($L5, fail, 'JSXSelfClosingElement "<"'), $TEXT(JSXElementName), $E(CompactTypeArguments), $E(JSXAttributes), __, $EXPECT($L147, fail, 'JSXSelfClosingElement "/>"')), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+      return { type: "JSXElement", children: $0 };
+    });
     function JSXSelfClosingElement(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXSelfClosingElement", state);
@@ -10662,9 +10692,41 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXFragment$0 = $S($EXPECT($L149, fail, 'JSXFragment "<>"'), $E(JSXChildren), __, $EXPECT($L150, fail, 'JSXFragment "</>"'));
+    var TypedJSXFragment$0 = $TS($S(JSXFragment), function($skip, $loc, $0, $1) {
+      const type = module2.typeOfJSXFragment($1);
+      return type ? [
+        { ts: true, children: ["("] },
+        $1,
+        { ts: true, children: [" as any as ", type, ")"] }
+      ] : $1;
+    });
+    function TypedJSXFragment(state) {
+      if (state.events) {
+        const result = state.events.enter?.("TypedJSXFragment", state);
+        if (result)
+          return result.cache;
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("TypedJSXFragment", state, TypedJSXFragment$0(state));
+        if (state.events)
+          state.events.exit?.("TypedJSXFragment", state, result);
+        return result;
+      } else {
+        const result = TypedJSXFragment$0(state);
+        if (state.events)
+          state.events.exit?.("TypedJSXFragment", state, result);
+        return result;
+      }
+    }
+    var JSXFragment$0 = $TS($S($EXPECT($L149, fail, 'JSXFragment "<>"'), $E(JSXChildren), __, $EXPECT($L150, fail, 'JSXFragment "</>"')), function($skip, $loc, $0, $1, $2, $3, $4) {
+      if ($2) {
+        return { type: "JSXFragment", children: $0, jsxChildren: $2.jsxChildren };
+      } else {
+        return { type: "JSXFragment", children: $0, jsxChildren: [] };
+      }
+    });
     var JSXFragment$1 = $TS($S($EXPECT($L149, fail, 'JSXFragment "<>"'), JSXMixedChildren, InsertNewline, InsertIndent), function($skip, $loc, $0, $1, $2, $3, $4) {
-      return [...$0, "</>"];
+      return { type: "JSXFragment", children: [...$0, "</>"], jsxChildren: $2.jsxChildren };
     });
     function JSXFragment(state) {
       if (state.events) {
@@ -11142,10 +11204,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXMixedChildren$0 = $TS($S($Q($C(_, JSXChild)), JSXNestedChildren), function($skip, $loc, $0, $1, $2) {
+    var JSXMixedChildren$0 = $TS($S($Q(JSXChild), JSXNestedChildren), function($skip, $loc, $0, $1, $2) {
       var c1 = $1;
       var c2 = $2;
-      return c1.concat(c2);
+      return {
+        children: c1.concat(c2),
+        jsxChildren: c1.concat(c2.jsxChildren)
+      };
     });
     function JSXMixedChildren(state) {
       if (state.events) {
@@ -11165,7 +11230,12 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXChildren$0 = $Q($S(__, JSXChild));
+    var JSXChildren$0 = $TV($Q($S($Q($S($E(NonNewlineWhitespace), EOL, $E(NonNewlineWhitespace))), JSXChild)), function($skip, $loc, $0, $1) {
+      return {
+        children: $1,
+        jsxChildren: $1.map((children) => children[1])
+      };
+    });
     function JSXChildren(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXChildren", state);
@@ -11185,12 +11255,16 @@ ${input.slice(result.pos)}
       }
     }
     var JSXNestedChildren$0 = $TS($S(PushIndent, $Q($S(Nested, $P(JSXChild))), PopIndent), function($skip, $loc, $0, $1, $2, $3) {
-      if ($2.length)
-        return $2;
+      if ($2.length) {
+        return {
+          children: $2,
+          jsxChildren: [].concat(...$2.map((nestedChildren) => nestedChildren[1]))
+        };
+      }
       return $skip;
     });
     var JSXNestedChildren$1 = $TV($Y(EOS), function($skip, $loc, $0, $1) {
-      return [];
+      return { children: [], jsxChildren: [] };
     });
     function JSXNestedChildren(state) {
       if (state.events) {
@@ -11213,7 +11287,14 @@ ${input.slice(result.pos)}
     var JSXChild$0 = JSXText;
     var JSXChild$1 = JSXElement;
     var JSXChild$2 = JSXFragment;
-    var JSXChild$3 = $S(OpenBrace, $E(JSXChildExpression), __, CloseBrace);
+    var JSXChild$3 = $TS($S(OpenBrace, $E(JSXChildExpression), __, CloseBrace), function($skip, $loc, $0, $1, $2, $3, $4) {
+      var expression = $2;
+      return {
+        type: "JSXChildExpression",
+        children: $0,
+        expression
+      };
+    });
     function JSXChild(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXChild", state);
@@ -11232,7 +11313,13 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var JSXText$0 = $R$0($EXPECT($R46, fail, "JSXText /[^{}<>\\r\\n]+/"));
+    var JSXText$0 = $TR($EXPECT($R46, fail, "JSXText /[^{}<>\\r\\n]+/"), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8, $9) {
+      return {
+        type: "JSXText",
+        token: $0,
+        $loc
+      };
+    });
     function JSXText(state) {
       if (state.events) {
         const result = state.events.enter?.("JSXText", state);
@@ -12964,6 +13051,9 @@ ${input.slice(result.pos)}
         coffeeNot: false,
         coffeeOf: false,
         implicitReturns: true,
+        solid: false,
+        client: false,
+        server: false,
         tab: void 0,
         verbose: false
       };
@@ -12986,6 +13076,34 @@ ${input.slice(result.pos)}
             children: [": <T>(this: T, prop: keyof T) => boolean"]
           };
           module2.prelude.push(["", ["const ", hasPropRef, typeSuffix, " = {}.hasOwnProperty", module2.asAny, "\n"]]);
+        },
+        JSX(jsxRef) {
+          module2.prelude.push({
+            ts: true,
+            children: [
+              "import type { JSX as ",
+              jsxRef,
+              " } from 'solid-js';\n"
+            ]
+          });
+        },
+        IntrinsicElements(intrinsicElementsRef) {
+          const JSX = module2.getRef("JSX");
+          module2.prelude.push({
+            ts: true,
+            children: [
+              "type ",
+              intrinsicElementsRef,
+              "<K extends keyof ",
+              JSX,
+              ".IntrinsicElements> =\n",
+              "  ",
+              JSX,
+              ".IntrinsicElements[K] extends ",
+              JSX,
+              ".DOMAttributes<infer T> ? T : unknown;\n"
+            ]
+          });
         }
       };
       const refs = {};
@@ -13003,11 +13121,55 @@ ${input.slice(result.pos)}
       };
       module2.typeOfJSXElement = function($12) {
         if (module2.config.solid) {
-          let open = $12;
+          if (module2.config.server && !module2.config.client) {
+            return ["string"];
+          }
+          let open = $12.children;
           while (Array.isArray(open[0]))
             open = open[0];
           open = open[1];
-          return typeof open === "string" && open[0] === open[0].toLowerCase() ? [module2.getRef("IntrinsicElements"), '<"', open, '">'] : ["ReturnType<typeof ", open, ">"];
+          const clientType = typeof open === "string" && open[0] === open[0].toLowerCase() ? [module2.getRef("IntrinsicElements"), '<"', open, '">'] : ["ReturnType<typeof ", open, ">"];
+          if (module2.config.server) {
+            return ["string", " | ", clientType];
+          } else {
+            return clientType;
+          }
+        }
+      };
+      module2.typeOfJSXFragment = function($12) {
+        if (module2.config.solid) {
+          let type = [];
+          let lastType;
+          for (let child of $12.jsxChildren) {
+            switch (child.type) {
+              case "JSXText":
+                if (lastType !== "JSXText") {
+                  type.push("string");
+                }
+                break;
+              case "JSXElement":
+                type.push(module2.typeOfJSXElement(child));
+                break;
+              case "JSXFragment":
+                type.push(...module2.typeOfJSXFragment(child));
+                break;
+              case "JSXChildExpression":
+                if (child.expression) {
+                  type.push(["typeof ", child.expression]);
+                }
+                break;
+              default:
+                throw new Error(`unknown child in JSXFragment: ${JSON.stringify(child)}`);
+            }
+            lastType = child.type;
+          }
+          if (type.length === 1) {
+            return type[0];
+          } else {
+            type = type.map((t) => [t, ", "]).flat();
+            type.pop();
+            return ["[", type, "]"];
+          }
         }
       };
       Object.defineProperty(module2.config, "coffeeCompat", {
@@ -13565,12 +13727,12 @@ ${input.slice(result.pos)}
         if (node == null)
           return [];
         if (Array.isArray(node)) {
-          return node.flatMap((n) => gatherNodes(n, predicate));
+          return node.flatMap((n) => gatherRecursive(n, predicate));
         }
         if (predicate(node)) {
           return [node];
         }
-        return gatherNodes(node.children, predicate);
+        return gatherRecursive(node.children, predicate);
       }
       function gatherRecursiveAll(node, predicate) {
         if (node == null)
@@ -13888,6 +14050,13 @@ ${input.slice(result.pos)}
         function hasDec(name) {
           return scopes.some((s) => s.has(name));
         }
+        function findVarDecs(statements2, decs) {
+          const declarationNames = gatherRecursive(
+            statements2,
+            (node) => node.type === "Declaration" && node.children && node.children.length > 0 && node.children[0].token && node.children[0].token.startsWith("var") || node.type === "FunctionExpression"
+          ).filter((node) => node.type === "Declaration").flatMap((node) => node.names);
+          return new Set(declarationNames);
+        }
         function insertBeforeAssignment(assignment, content) {
           if (assignment.children && assignment.children.length) {
             let indent = assignment.children[0][0][0];
@@ -13900,10 +14069,11 @@ ${input.slice(result.pos)}
         scopes.push(currentScope);
         const fnNodes = gatherNodes(statements, (s) => s.type === "FunctionExpression");
         const forNodes = gatherNodes(statements, (s) => s.type === "ForStatement");
-        const nodes = gatherNodes(statements, (s) => s.type === "BlockStatement" || s.type === "AssignmentExpression");
+        const nodes = gatherNodes(statements, (s) => s.type === "BlockStatement" || s.type === "AssignmentExpression" || s.type === "Declaration");
+        let declaredIdentifiers = findVarDecs(statements);
         for (const node of nodes) {
           if (node.type == "AssignmentExpression") {
-            let undeclaredIdentifiers = node.names.filter((name) => !hasDec(name));
+            let undeclaredIdentifiers = node.names.filter((name) => !(hasDec(name) || declaredIdentifiers.has(name)));
             if (node.children.length)
               createLetDecs(node.children, scopes);
             undeclaredIdentifiers.forEach((name) => currentScope.add(name));
@@ -13912,6 +14082,8 @@ ${input.slice(result.pos)}
             } else if (undeclaredIdentifiers.length > 0) {
               insertBeforeAssignment(node, ["let ", undeclaredIdentifiers.join(", "), "\n"]);
             }
+          } else if (node.type == "Declaration") {
+            node.names.forEach((name) => currentScope.add(name));
           } else {
             let block = node;
             let fnNode = fnNodes.find((fnNode2) => fnNode2.block === block);
@@ -14610,9 +14782,11 @@ makeCache = function() {
           case "SingleLineComment":
           case "Debugger":
           case "JSXElement":
+          case "TypedJSXElement":
+          case "JSXFragment":
+          case "TypedJSXFragment":
           case "JSXChild":
           case "JSXChildren":
-          case "JSXFragment":
           case "JSXNestedChildren":
           case "JSXMixedChildren":
             break;

package/package.json

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