htmljs-parser 2.10.0 → 2.11.2

package/Parser.js

@@ -429,16 +429,6 @@ class Parser extends BaseParser {
                         }
                     }
                 }
-
-                if (currentOpenTag.hasUnenclosedWhitespace && attributes.length > 1) {
-                    for(let i = 0; i < attributes.length-1; i++) {
-                        if(!attributes[i].endedWithComma) {
-                            notifyError(attributes[i].pos,
-                                'COMMAS_REQUIRED',
-                                'commas are required to separate all attributes when using complex attribute values with un-enclosed whitespace');
-                        }
-                    }
-                }
             }
 
 
@@ -2208,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();
 
@@ -2606,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;
                         }
                     }
                 }

package/package.json

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

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

@@ -1,40 +1,14 @@
-<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 VAR=(bar) DEFAULT=function(event) { 
-  console.log("hello"); 
-  event.preventDefault();
-} SELF_CLOSED>
-</foo>
-text:"\n"
-text:"\n"
-<foo VAR=(bar) DEFAULT=function(event) { 
-  console.log("hello"); 
-  event.preventDefault();
-} SELF_CLOSED>
-</foo>
+<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>

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/attr-unenclosed-whitespace-multiple-attrs/expected.html

@@ -0,0 +1,5 @@
+<test a=(123 + 456) b=789>
+</test>
+text:"\n"
+<test a=123 b=(456 + 789)>
+</test>

package/test/autotest/attr-unenclosed-whitespace-no-comma/expected.html

@@ -1 +0,0 @@
-error:"commas are required to separate all attributes when using complex attribute values with un-enclosed whitespace" (code: "COMMAS_REQUIRED")