htmljs-parser 2.11.0 → 2.11.3

package/Parser.js

@@ -2198,7 +2198,13 @@ class Parser extends BaseParser {
                             openTagEOL();
                         }
                         return;
-                    } else if (currentPart.parentState === STATE_TAG_NAME) {
+                    } else if (
+                        currentPart.parentState === STATE_TAG_NAME ||
+                        (isConcise && (
+                            currentPart.parentState === STATE_TAG_ARGS ||
+                            currentPart.parentState === STATE_WITHIN_OPEN_TAG)
+                        )
+                    ) {
                         currentPart.endPos = parser.pos;
                         endExpression();
 
@@ -2596,11 +2602,14 @@ class Parser extends BaseParser {
                             parser.rewind(1);
                             parser.enterState(STATE_WITHIN_OPEN_TAG);
                             return;
-                        } else if (parser.lookAtCharCodeAhead(1) === CODE_OPEN_PAREN && currentPart.value) {
-                            currentPart.value += ch;
-                            endExpression();
-                            parser.enterState(STATE_TAG_ARGS);
-                            return;
+                        } else if (
+                            parser.lookAtCharCodeAhead(1) === CODE_OPEN_PAREN &&
+                            (currentPart.parentState === STATE_TAG_NAME || currentPart.value)
+                        ) {
+                          currentPart.value += ch;
+                          endExpression();
+                          parser.enterState(STATE_TAG_ARGS);
+                          return;
                         }
                     }
                 }
@@ -2648,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.0"
+  "version": "2.11.3"
 }

package/test/autotest/argument-tag/expected.html

@@ -1,2 +1,9 @@
 <for ARGS=(x in y)>
 </for>
+text:"\n"
+<ab ARGS=('c') SELF_CLOSED>
+</ab>
+text:"\n"
+<a ARGS=('b') SELF_CLOSED>
+</a>
+text:"\n"

package/test/autotest/argument-tag/input.htmljs

@@ -1 +1,3 @@
-<for(x in y)></for>
+<for(x in y)></for>
+<ab('c')/>
+<a('b')/>

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

@@ -26,15 +26,26 @@ text:"\n"
 </foo>
 text:"\n"
 text:"\n"
-<foo VAR=(bar) DEFAULT=function(event) { 
+<foo onclick=function(event) { 
   console.log("hello"); 
   event.preventDefault();
-} SELF_CLOSED>
+}>
 </foo>
 text:"\n"
+<foo onclick=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+}>
+</foo>
 text:"\n"
-<foo VAR=(bar) DEFAULT=function(event) { 
+<foo DEFAULT=function(event) { 
   console.log("hello"); 
   event.preventDefault();
-} SELF_CLOSED>
+}>
+</foo>
+text:"\n"
+<foo DEFAULT=function(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+}>
 </foo>

package/test/autotest/attr-method-shorthand/input.htmljs

@@ -18,12 +18,22 @@
   event.preventDefault();
 }/>
 
-<foo/bar(event) { 
+foo onclick(event) { 
   console.log("hello"); 
   event.preventDefault();
-}/>
+}
+
+foo onclick (event) { 
+  console.log("hello"); 
+  event.preventDefault();
+}
+
+foo(event) { 
+  console.log("hello"); 
+  event.preventDefault();
+}
 
-<foo/bar (event) { 
+foo (event) { 
   console.log("hello"); 
   event.preventDefault();
-}/>
+}

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/>