htmljs-parser 2.11.2 → 2.11.3

package/Parser.js

@@ -2657,13 +2657,20 @@ class Parser extends BaseParser {
 
             char(ch, code) {
                 var shorthand = currentPart;
-                if (!isConcise) {
-                    if (code === CODE_CLOSE_ANGLE_BRACKET || code === CODE_FORWARD_SLASH) {
-                        currentOpenTag.tagNameEnd = parser.pos;
-                        endTagNameShorthand();
-                        parser.rewind(1);
-                        return;
+                if (code === CODE_CLOSE_ANGLE_BRACKET && !isConcise) {
+                    currentOpenTag.tagNameEnd = parser.pos;
+                    endTagNameShorthand();
+                    parser.rewind(1);
+                    return;
+                } else if (code === CODE_FORWARD_SLASH) {
+                    currentOpenTag.tagNameEnd = parser.pos;
+                    endTagNameShorthand();
+                    parser.rewind(1);
+
+                    if (parser.lookAtCharCodeAhead(2) !== CODE_CLOSE_ANGLE_BRACKET) {
+                        parser.enterState(STATE_TAG_VAR);
                     }
+                    return;
                 }
 
                 if (isWhitespaceCode(code)) {

package/package.json

@@ -40,5 +40,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "2.11.2"
+  "version": "2.11.3"
 }

package/test/autotest/attr-method-shorthand/expected.html

@@ -1,14 +1,51 @@
-<let VAR=(count) DEFAULT=0>
-</let>
-<effect DEFAULT=function() {
-  const interval = setInterval(() => {
-    count += 1
-  }, 1000);
-  return () => clearInterval(interval)
-}>
-</effect>
-<div>
-    text:"The count is "
-    ${"$escapeXml(count)"}
-    text:"!"
-</div>
+<foo onclick=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+} SELF_CLOSED>
+</foo>
+text:"\n"
+text:"\n"
+<foo onclick=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+} SELF_CLOSED>
+</foo>
+text:"\n"
+text:"\n"
+<foo DEFAULT=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+} SELF_CLOSED>
+</foo>
+text:"\n"
+text:"\n"
+<foo DEFAULT=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+} SELF_CLOSED>
+</foo>
+text:"\n"
+text:"\n"
+<foo onclick=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+}>
+</foo>
+text:"\n"
+<foo onclick=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+}>
+</foo>
+text:"\n"
+<foo DEFAULT=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+}>
+</foo>
+text:"\n"
+<foo DEFAULT=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+}>
+</foo>

package/test/autotest/tag-var-declaration/expected.html

@@ -36,3 +36,8 @@ text:"\n"
 text:"\n"
 <div VAR=(ref) SELF_CLOSED>
 </div>
+text:"\n"
+text:"\n"
+<div VAR=(ref) shorthandId="ab" shorthandClassNames=["cd"] SELF_CLOSED>
+</div>
+text:"\n"

package/test/autotest/tag-var-declaration/input.htmljs

@@ -16,4 +16,6 @@
 </>
 
 <div/ref/>
-<div/ref />
+<div/ref />
+
+<div#ab.cd/ref/>