fix: improve typescript generic parsing

Author: DylanPiercey

.changeset/major-experts-start.md

@@ -0,0 +1,5 @@
+---
+"htmljs-parser": minor
+---
+
+Improve expression parsing for typescript, especially around multi line generics.

README.md

@@ -201,15 +201,18 @@ const parser = createParser({
         // TagType.void makes this a void element (cannot have children).
         return TagType.void;
       case "html-comment":
+      case "html-script":
+      case "html-style":
       case "script":
       case "style":
       case "textarea":
         // TagType.text makes the child content text only (with placeholders).
         return TagType.text;
-      case "class":
       case "export":
       case "import":
       case "static":
+      case "client":
+      case "server":
         // TagType.statement makes this a statement tag where the content following the tag name will be parsed as script code until we reach a new line, eg for `import x from "y"`).
         return TagType.statement;
     }

package.json

@@ -63,18 +63,16 @@
     "bench": "tsx bench.mts",
     "build": "tsc -b && tsx build.mts",
     "change": "changeset add",
-    "ci:test": "nyc npm run mocha -- --forbid-only",
+    "ci:test": "nyc npm test -- --forbid-only",
     "format": "npm run lint:eslint -- --fix && npm run lint:prettier -- --write && (fixpack || true)",
     "lint": "tsc -b && npm run lint:eslint && npm run lint:prettier -- -l && fixpack",
     "lint:eslint": "eslint -f visualstudio .",
     "lint:prettier": "prettier \"./**/*{.ts,.js,.json,.md,.yml,rc}\"",
-    "mocha": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
     "prepare": "husky",
     "release": "npm run build && changeset publish",
     "report": "open ./coverage/lcov-report/index.html",
-    "test": "npm run mocha -- --watch",
-    "test:inspect": "npm test -- --inspect",
-    "test:update": "npm run mocha -- --update",
+    "test": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
+    "test:update": "npm test -- --update",
     "version": "changeset version && npm i --package-lock-only"
   },
   "types": "dist/index.d.ts"

src/__tests__/fixtures/ts-function-type/__snapshots__/ts-function-type.expected.txt

@@ -0,0 +1,7 @@
+1╭─ <div value=fn as (x: number) => string />
+ │  ││   │    ││                           ╰─ openTagEnd:selfClosed "/>"
+ │  ││   │    │╰─ attrValue.value "fn as (x: number) => string"
+ │  ││   │    ╰─ attrValue "=fn as (x: number) => string"
+ │  ││   ╰─ attrName "value"
+ │  │╰─ tagName "div"
+ ╰─ ╰─ openTagStart

src/__tests__/fixtures/ts-function-type/input.marko

@@ -0,0 +1 @@
+<div value=fn as (x: number) => string />

src/__tests__/fixtures/ts-generic-complex/__snapshots__/ts-generic-complex.expected.txt

@@ -0,0 +1,15 @@
+1╭─ <div value=x as Map<string, Array<Record<K, V>>> />
+ │  ││   │    ││                                     ╰─ openTagEnd:selfClosed "/>"
+ │  ││   │    │╰─ attrValue.value "x as Map<string, Array<Record<K, V>>>"
+ │  ││   │    ╰─ attrValue "=x as Map<string, Array<Record<K, V>>>"
+ │  ││   ╰─ attrName "value"
+ │  │╰─ tagName "div"
+ ╰─ ╰─ openTagStart
+2╭─ <div value=x satisfies Map<string, Array<Record<K, V>>> />
+ │  ││   │    ││                                            ╰─ openTagEnd:selfClosed "/>"
+ │  ││   │    │╰─ attrValue.value "x satisfies Map<string, Array<Record<K, V>>>"
+ │  ││   │    ╰─ attrValue "=x satisfies Map<string, Array<Record<K, V>>>"
+ │  ││   ╰─ attrName "value"
+ │  │╰─ tagName "div"
+ ╰─ ╰─ openTagStart
+3╰─ 

src/__tests__/fixtures/ts-generic-complex/input.marko

@@ -0,0 +1,2 @@
+<div value=x as Map<string, Array<Record<K, V>>> />
+<div value=x satisfies Map<string, Array<Record<K, V>>> />

src/__tests__/fixtures/ts-generic-function-type/__snapshots__/ts-generic-function-type.expected.txt

@@ -0,0 +1,15 @@
+1╭─ <div value=fn as <T>(x: T) => T />
+ │  ││   │    ││                    ╰─ openTagEnd:selfClosed "/>"
+ │  ││   │    │╰─ attrValue.value "fn as <T>(x: T) => T"
+ │  ││   │    ╰─ attrValue "=fn as <T>(x: T) => T"
+ │  ││   ╰─ attrName "value"
+ │  │╰─ tagName "div"
+ ╰─ ╰─ openTagStart
+2╭─ <div value=fn as < T >(x: T) => T />
+ │  ││   │    ││                      ╰─ openTagEnd:selfClosed "/>"
+ │  ││   │    │╰─ attrValue.value "fn as < T >(x: T) => T"
+ │  ││   │    ╰─ attrValue "=fn as < T >(x: T) => T"
+ │  ││   ╰─ attrName "value"
+ │  │╰─ tagName "div"
+ ╰─ ╰─ openTagStart
+3╰─ 

src/__tests__/fixtures/ts-generic-function-type/input.marko

@@ -0,0 +1,2 @@
+<div value=fn as <T>(x: T) => T />
+<div value=fn as < T >(x: T) => T />

src/__tests__/fixtures/ts-generic-simple/__snapshots__/ts-generic-simple.expected.txt

@@ -0,0 +1,15 @@
+1╭─ <div value=x as Array<T> />
+ │  ││   │    ││             ╰─ openTagEnd:selfClosed "/>"
+ │  ││   │    │╰─ attrValue.value "x as Array<T>"
+ │  ││   │    ╰─ attrValue "=x as Array<T>"
+ │  ││   ╰─ attrName "value"
+ │  │╰─ tagName "div"
+ ╰─ ╰─ openTagStart
+2╭─ <div value=x as Array< T > />
+ │  ││   │    ││               ╰─ openTagEnd:selfClosed "/>"
+ │  ││   │    │╰─ attrValue.value "x as Array< T >"
+ │  ││   │    ╰─ attrValue "=x as Array< T >"
+ │  ││   ╰─ attrName "value"
+ │  │╰─ tagName "div"
+ ╰─ ╰─ openTagStart
+3╰─