fix: ensure type args directly follow tag name (#152)

* fix: ensure type args directly follow tag name

.changeset/stale-pants-relate.md

@@ -0,0 +1,5 @@
+---
+"htmljs-parser": minor
+---
+
+Improve handling ambiguity with tag type args vs type params. Type args must now always be directly adjacent the tag name, otherwise it will become type params.

src/__tests__/fixtures/attr-method-shorthand-with-type-parameters/__snapshots__/attr-method-shorthand-with-type-parameters.expected.txt

@@ -1,11 +1,11 @@
 1╭─ <foo<A>(event: A){
  │  ││  ││ ││        ╰─ attrMethod.body "{\n  console.log(event.type)\n}"
  │  ││  ││ │╰─ attrMethod.params.value "event: A"
- │  ││  ││ ╰─ attrMethod.params "(event: A)"
- │  ││  │╰─ attrMethod.typeParams.value
- │  ││  ├─ attrMethod.typeParams "<A>"
- │  ││  ├─ attrMethod "<A>(event: A){\n  console.log(event.type)\n}"
- │  ││  ╰─ attrName
+ │  ││  ││ ├─ attrMethod.params "(event: A)"
+ │  ││  ││ ├─ attrMethod "(event: A){\n  console.log(event.type)\n}"
+ │  ││  ││ ╰─ attrName
+ │  ││  │╰─ tagTypeArgs.value
+ │  ││  ╰─ tagTypeArgs "<A>"
  │  │╰─ tagName "foo"
  ╰─ ╰─ openTagStart
 2╭─   console.log(event.type)
@@ -16,11 +16,11 @@
 5╭─ <foo<A> (event: A){
  │  ││  ││  ││        ╰─ attrMethod.body "{\n  console.log(event.type)\n}"
  │  ││  ││  │╰─ attrMethod.params.value "event: A"
- │  ││  ││  ╰─ attrMethod.params "(event: A)"
- │  ││  │╰─ attrMethod.typeParams.value
- │  ││  ├─ attrMethod.typeParams "<A>"
- │  ││  ├─ attrMethod "<A> (event: A){\n  console.log(event.type)\n}"
- │  ││  ╰─ attrName
+ │  ││  ││  ├─ attrMethod.params "(event: A)"
+ │  ││  ││  ├─ attrMethod "(event: A){\n  console.log(event.type)\n}"
+ │  ││  ││  ╰─ attrName
+ │  ││  │╰─ tagTypeArgs.value
+ │  ││  ╰─ tagTypeArgs "<A>"
  │  │╰─ tagName "foo"
  ╰─ ╰─ openTagStart
 6╭─   console.log(event.type)
@@ -61,11 +61,11 @@
 17╭─ <foo<A, B = string>(event: A & B){
   │  ││  ││             ││            ╰─ attrMethod.body "{\n  console.log(event.type)\n}"
   │  ││  ││             │╰─ attrMethod.params.value "event: A & B"
-  │  ││  ││             ╰─ attrMethod.params "(event: A & B)"
-  │  ││  │╰─ attrMethod.typeParams.value "A, B = string"
-  │  ││  ├─ attrMethod.typeParams "<A, B = string>"
-  │  ││  ├─ attrMethod "<A, B = string>(event: A & B){\n  console.log(event.type)\n}"
-  │  ││  ╰─ attrName
+  │  ││  ││             ├─ attrMethod.params "(event: A & B)"
+  │  ││  ││             ├─ attrMethod "(event: A & B){\n  console.log(event.type)\n}"
+  │  ││  ││             ╰─ attrName
+  │  ││  │╰─ tagTypeArgs.value "A, B = string"
+  │  ││  ╰─ tagTypeArgs "<A, B = string>"
   │  │╰─ tagName "foo"
   ╰─ ╰─ openTagStart
 18╭─   console.log(event.type)
@@ -76,11 +76,11 @@
 21╭─ <foo<A, B = string> (event: A & B){
   │  ││  ││              ││            ╰─ attrMethod.body "{\n  console.log(event.type)\n}"
   │  ││  ││              │╰─ attrMethod.params.value "event: A & B"
-  │  ││  ││              ╰─ attrMethod.params "(event: A & B)"
-  │  ││  │╰─ attrMethod.typeParams.value "A, B = string"
-  │  ││  ├─ attrMethod.typeParams "<A, B = string>"
-  │  ││  ├─ attrMethod "<A, B = string> (event: A & B){\n  console.log(event.type)\n}"
-  │  ││  ╰─ attrName
+  │  ││  ││              ├─ attrMethod.params "(event: A & B)"
+  │  ││  ││              ├─ attrMethod "(event: A & B){\n  console.log(event.type)\n}"
+  │  ││  ││              ╰─ attrName
+  │  ││  │╰─ tagTypeArgs.value "A, B = string"
+  │  ││  ╰─ tagTypeArgs "<A, B = string>"
   │  │╰─ tagName "foo"
   ╰─ ╰─ openTagStart
 22╭─   console.log(event.type)

src/__tests__/fixtures/attr-name-with-html-chars/__snapshots__/attr-name-with-html-chars.expected.txt

@@ -1,7 +1,3 @@
 1╭─ tagname <span>hello frank</span>
- │  │       ││    │     │     ╰─ error(INVALID_ATTR_TYPE_PARAMS:Attribute cannot contain type parameters unless it is a shorthand method) "/span"
- │  │       ││    │     ╰─ attrName "frank"
- │  │       ││    ╰─ attrName "hello"
- │  │       │╰─ tagTypeArgs.value "span"
- │  │       ╰─ tagTypeArgs "<span>"
+ │  │        ╰─ error(INVALID_TAG_TYPES:Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters.) "span"
  ╰─ ╰─ tagName "tagname"

src/__tests__/fixtures/invalid-multiple-tag-type-params/__snapshots__/invalid-multiple-tag-type-params.expected.txt

@@ -1,5 +1,5 @@
 1╭─ <foo<A><B>/>
- │  ││  ││  ╰─ error(INVALID_TAG_TYPES:Unexpected types. Type arguments must follow a tag name and type paremeters must precede a method or tag parameters.)
+ │  ││  ││  ╰─ error(INVALID_TAG_TYPES:Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters.)
  │  ││  │╰─ tagTypeArgs.value
  │  ││  ╰─ tagTypeArgs "<A>"
  │  │╰─ tagName "foo"

src/__tests__/fixtures/invalid-type-args-after-space/__snapshots__/invalid-type-args-after-space.expected.txt

@@ -0,0 +1,7 @@
+1╭─ <foo <A>>
+ │  ││    ╰─ error(INVALID_TAG_TYPES:Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters.)
+ │  │╰─ tagName "foo"
+ ╰─ ╰─ openTagStart
+2├─   hi
+3├─ </>
+4╰─ 

src/__tests__/fixtures/invalid-type-args-after-space/input.marko

@@ -0,0 +1,3 @@
+<foo <A>>
+  hi
+</>

src/__tests__/fixtures/invalid-type-params-after-args/__snapshots__/invalid-type-params-after-args.expected.txt

@@ -1,5 +1,5 @@
 1╭─ <foo(a)<A>/>
- │  ││  ││  ╰─ error(INVALID_TAG_TYPES:Unexpected types. Type arguments must follow a tag name and type paremeters must precede a method or tag parameters.)
+ │  ││  ││  ╰─ error(INVALID_TAG_TYPES:Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters.)
  │  ││  │╰─ tagArgs.value
  │  ││  ╰─ tagArgs "(a)"
  │  │╰─ tagName "foo"

src/__tests__/fixtures/invalid-type-params-after-params/__snapshots__/invalid-type-params-after-params.expected.txt

@@ -1,5 +1,5 @@
 1╭─ <foo|a|<A>/>
- │  ││  ││  ╰─ error(INVALID_TAG_TYPES:Unexpected types. Type arguments must follow a tag name and type paremeters must precede a method or tag parameters.)
+ │  ││  ││  ╰─ error(INVALID_TAG_TYPES:Unexpected types. Type arguments must directly follow a tag name and type paremeters must precede a method or tag parameters.)
  │  ││  │╰─ tagParams.value
  │  ││  ╰─ tagParams "|a|"
  │  │╰─ tagName "foo"

src/__tests__/fixtures/tag-params-with-type-parameters/__snapshots__/tag-params-with-type-parameters.expected.txt

@@ -2,8 +2,8 @@
  │  ││  ││ ││       ╰─ openTagEnd
  │  ││  ││ │╰─ tagParams.value "data: A"
  │  ││  ││ ╰─ tagParams "|data: A|"
- │  ││  │╰─ tagTypeParams.value
- │  ││  ╰─ tagTypeParams "<A>"
+ │  ││  │╰─ tagTypeArgs.value
+ │  ││  ╰─ tagTypeArgs "<A>"
  │  │╰─ tagName "foo"
  ╰─ ╰─ openTagStart
 2╭─   hi
@@ -17,8 +17,8 @@
  │  ││  ││  ││       ╰─ openTagEnd
  │  ││  ││  │╰─ tagParams.value "data: A"
  │  ││  ││  ╰─ tagParams "|data: A|"
- │  ││  │╰─ tagTypeParams.value
- │  ││  ╰─ tagTypeParams "<A>"
+ │  ││  │╰─ tagTypeArgs.value
+ │  ││  ╰─ tagTypeArgs "<A>"
  │  │╰─ tagName "foo"
  ╰─ ╰─ openTagStart
 6╭─   hi
@@ -62,8 +62,8 @@
   │  ││  ││             ││           ╰─ openTagEnd
   │  ││  ││             │╰─ tagParams.value "data: A & B"
   │  ││  ││             ╰─ tagParams "|data: A & B|"
-  │  ││  │╰─ tagTypeParams.value "A, B = string"
-  │  ││  ╰─ tagTypeParams "<A, B = string>"
+  │  ││  │╰─ tagTypeArgs.value "A, B = string"
+  │  ││  ╰─ tagTypeArgs "<A, B = string>"
   │  │╰─ tagName "foo"
   ╰─ ╰─ openTagStart
 18╭─   hi
@@ -77,8 +77,8 @@
   │  ││  ││              ││           ╰─ openTagEnd
   │  ││  ││              │╰─ tagParams.value "data: A & B"
   │  ││  ││              ╰─ tagParams "|data: A & B|"
-  │  ││  │╰─ tagTypeParams.value "A, B = string"
-  │  ││  ╰─ tagTypeParams "<A, B = string>"
+  │  ││  │╰─ tagTypeArgs.value "A, B = string"
+  │  ││  ╰─ tagTypeArgs "<A, B = string>"
   │  │╰─ tagName "foo"
   ╰─ ╰─ openTagStart
 22╭─   hi
@@ -117,4 +117,54 @@
   │  │ ├─ closeTagEnd(foo)
   │  │ ╰─ closeTagName
   ╰─ ╰─ closeTagStart "</"
-32╰─ 
+32├─ 
+33╭─ <foo()<A> |data: A|>
+  │  ││  ││││  ││       ╰─ openTagEnd
+  │  ││  ││││  │╰─ tagParams.value "data: A"
+  │  ││  ││││  ╰─ tagParams "|data: A|"
+  │  ││  │││╰─ tagTypeParams.value
+  │  ││  ││╰─ tagTypeParams "<A>"
+  │  ││  │╰─ tagArgs.value
+  │  ││  ╰─ tagArgs "()"
+  │  │╰─ tagName "foo"
+  ╰─ ╰─ openTagStart
+34╭─   hi
+  ╰─ ╰─ text "\n  hi\n"
+35╭─ </>
+  │  │ ├─ closeTagEnd(foo)
+  │  │ ╰─ closeTagName
+  ╰─ ╰─ closeTagStart "</"
+36├─ 
+37╭─ <foo/x<A> |data: A|>
+  │  ││  ││││  ││       ╰─ openTagEnd
+  │  ││  ││││  │╰─ tagParams.value "data: A"
+  │  ││  ││││  ╰─ tagParams "|data: A|"
+  │  ││  │││╰─ tagTypeParams.value
+  │  ││  ││╰─ tagTypeParams "<A>"
+  │  ││  │╰─ tagVar.value
+  │  ││  ╰─ tagVar "/x"
+  │  │╰─ tagName "foo"
+  ╰─ ╰─ openTagStart
+38╭─   hi
+  ╰─ ╰─ text "\n  hi\n"
+39╭─ </>
+  │  │ ├─ closeTagEnd(foo)
+  │  │ ╰─ closeTagName
+  ╰─ ╰─ closeTagStart "</"
+40├─ 
+41╭─ <foo<string><A> |data: A|>
+  │  ││  ││      ││  ││       ╰─ openTagEnd
+  │  ││  ││      ││  │╰─ tagParams.value "data: A"
+  │  ││  ││      ││  ╰─ tagParams "|data: A|"
+  │  ││  ││      │╰─ tagTypeParams.value
+  │  ││  ││      ╰─ tagTypeParams "<A>"
+  │  ││  │╰─ tagTypeArgs.value "string"
+  │  ││  ╰─ tagTypeArgs "<string>"
+  │  │╰─ tagName "foo"
+  ╰─ ╰─ openTagStart
+42╭─   hi
+  ╰─ ╰─ text "\n  hi\n"
+43╭─ </>
+  │  │ ├─ closeTagEnd(foo)
+  │  │ ╰─ closeTagName
+  ╰─ ╰─ closeTagStart "</"

src/__tests__/fixtures/tag-params-with-type-parameters/input.marko

@@ -29,3 +29,15 @@
 <foo <A, B = string> |data: A & B|>
   hi
 </>
+
+<foo()<A> |data: A|>
+  hi
+</>
+
+<foo/x<A> |data: A|>
+  hi
+</>
+
+<foo<string><A> |data: A|>
+  hi
+</>