htmljs-parser 5.8.2 → 5.10.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { type ParserOptions, type Range } from "./internal";
 export { TagType, ErrorCode, getLines, getLocation, getPosition, type ParserOptions as Handlers, type Position, type Location, type Ranges, type Range, } from "./internal";
-export { isValidStatement, isValidAttrValue, Validity, } from "./util/validators";
+export { isValidStatement, isValidScriptlet, isValidAttrValue, Validity, } from "./util/validators";
 /**
  * Creates a new Marko parser.
  */

package/dist/index.js

@@ -28,6 +28,7 @@ __export(src_exports, {
   getLocation: () => getLocation,
   getPosition: () => getPosition,
   isValidAttrValue: () => isValidAttrValue,
+  isValidScriptlet: () => isValidScriptlet,
   isValidStatement: () => isValidStatement
 });
 module.exports = __toCommonJS(src_exports);
@@ -98,7 +99,18 @@ function getLines(src) {
   return lines;
 }
 function htmlEOF() {
-  this.endText();
+  if (!this.activeTag || this.activeTag.concise) {
+    const pos = this.pos;
+    let cur = this.pos;
+    while (cur && isWhitespaceCode(this.data.charCodeAt(cur - 1))) {
+      cur--;
+    }
+    this.pos = cur;
+    this.endText();
+    this.pos = pos;
+  } else {
+    this.endText();
+  }
   while (this.activeTag) {
     if (this.activeTag.concise) {
       this.closeTagEnd(this.pos, this.pos, void 0);
@@ -239,7 +251,9 @@ var Parser = class {
     var _a, _b;
     const start = this.textPos;
     if (start !== -1) {
-      (_b = (_a = this.options).onText) == null ? void 0 : _b.call(_a, { start, end: this.pos });
+      if (start !== this.pos) {
+        (_b = (_a = this.options).onText) == null ? void 0 : _b.call(_a, { start, end: this.pos });
+      }
       this.textPos = -1;
     }
   }
@@ -1179,7 +1193,7 @@ var BEGIN_DELIMITED_HTML_BLOCK = {
   },
   eol(len, block) {
     this.beginHtmlBlock(block.delimiter, false);
-    handleDelimitedBlockEOL(this, len, block);
+    handleDelimitedBlockEOL(this, true, len, block);
   },
   eof: htmlEOF,
   return() {
@@ -1193,21 +1207,20 @@ function handleDelimitedEOL(parser, newLineLength, content) {
     return true;
   }
   if (content.delimiter) {
-    handleDelimitedBlockEOL(parser, newLineLength, content);
+    handleDelimitedBlockEOL(parser, false, newLineLength, content);
     return true;
   }
   return false;
 }
-function handleDelimitedBlockEOL(parser, newLineLength, {
+function handleDelimitedBlockEOL(parser, first, newLineLength, {
   indent,
   delimiter
 }) {
   const endHtmlBlockLookahead = indent + delimiter;
   if (parser.lookAheadFor(endHtmlBlockLookahead, parser.pos + newLineLength)) {
-    parser.startText();
-    parser.pos += newLineLength;
     parser.endText();
-    parser.pos += endHtmlBlockLookahead.length;
+    parser.pos += newLineLength + endHtmlBlockLookahead.length;
+    parser.forward = 0;
     if (parser.consumeWhitespaceOnLine(0)) {
       parser.exitState();
       parser.exitState();
@@ -1219,14 +1232,24 @@ function handleDelimitedBlockEOL(parser, newLineLength, {
       );
     }
   } else if (parser.lookAheadFor(indent, parser.pos + newLineLength)) {
-    parser.startText();
+    if (!first)
+      parser.startText();
+    parser.pos += newLineLength;
+    parser.endText();
     parser.pos += indent.length;
+    parser.forward = 0;
+    parser.startText();
   } else if (indent && !parser.onlyWhitespaceRemainsOnLine(newLineLength)) {
+    const pos = parser.pos;
+    let cur = parser.pos;
+    while (cur && isWhitespaceCode(parser.data.charCodeAt(cur - 1))) {
+      cur--;
+    }
+    parser.pos = cur;
     parser.endText();
+    parser.pos = pos;
     parser.exitState();
     parser.exitState();
-  } else if (parser.pos + newLineLength !== parser.maxPos) {
-    parser.startText();
   }
 }
 
@@ -2877,6 +2900,13 @@ function prepareStatement(expr) {
   expr.terminatedByEOL = true;
   expr.consumeIndentedContent = true;
 }
+function isValidScriptlet(code) {
+  return isValid(code, true, prepareScriptlet);
+}
+function prepareScriptlet(expr) {
+  expr.operators = true;
+  expr.terminatedByEOL = true;
+}
 function isValidAttrValue(code, concise) {
   return isValid(code, concise, prepareAttrValue);
 }
@@ -2968,5 +2998,6 @@ function createParser(handlers) {
   getLocation,
   getPosition,
   isValidAttrValue,
+  isValidScriptlet,
   isValidStatement
 });

package/dist/index.mjs

@@ -70,7 +70,18 @@ function getLines(src) {
   return lines;
 }
 function htmlEOF() {
-  this.endText();
+  if (!this.activeTag || this.activeTag.concise) {
+    const pos = this.pos;
+    let cur = this.pos;
+    while (cur && isWhitespaceCode(this.data.charCodeAt(cur - 1))) {
+      cur--;
+    }
+    this.pos = cur;
+    this.endText();
+    this.pos = pos;
+  } else {
+    this.endText();
+  }
   while (this.activeTag) {
     if (this.activeTag.concise) {
       this.closeTagEnd(this.pos, this.pos, void 0);
@@ -211,7 +222,9 @@ var Parser = class {
     var _a, _b;
     const start = this.textPos;
     if (start !== -1) {
-      (_b = (_a = this.options).onText) == null ? void 0 : _b.call(_a, { start, end: this.pos });
+      if (start !== this.pos) {
+        (_b = (_a = this.options).onText) == null ? void 0 : _b.call(_a, { start, end: this.pos });
+      }
       this.textPos = -1;
     }
   }
@@ -1151,7 +1164,7 @@ var BEGIN_DELIMITED_HTML_BLOCK = {
   },
   eol(len, block) {
     this.beginHtmlBlock(block.delimiter, false);
-    handleDelimitedBlockEOL(this, len, block);
+    handleDelimitedBlockEOL(this, true, len, block);
   },
   eof: htmlEOF,
   return() {
@@ -1165,21 +1178,20 @@ function handleDelimitedEOL(parser, newLineLength, content) {
     return true;
   }
   if (content.delimiter) {
-    handleDelimitedBlockEOL(parser, newLineLength, content);
+    handleDelimitedBlockEOL(parser, false, newLineLength, content);
     return true;
   }
   return false;
 }
-function handleDelimitedBlockEOL(parser, newLineLength, {
+function handleDelimitedBlockEOL(parser, first, newLineLength, {
   indent,
   delimiter
 }) {
   const endHtmlBlockLookahead = indent + delimiter;
   if (parser.lookAheadFor(endHtmlBlockLookahead, parser.pos + newLineLength)) {
-    parser.startText();
-    parser.pos += newLineLength;
     parser.endText();
-    parser.pos += endHtmlBlockLookahead.length;
+    parser.pos += newLineLength + endHtmlBlockLookahead.length;
+    parser.forward = 0;
     if (parser.consumeWhitespaceOnLine(0)) {
       parser.exitState();
       parser.exitState();
@@ -1191,14 +1203,24 @@ function handleDelimitedBlockEOL(parser, newLineLength, {
       );
     }
   } else if (parser.lookAheadFor(indent, parser.pos + newLineLength)) {
-    parser.startText();
+    if (!first)
+      parser.startText();
+    parser.pos += newLineLength;
+    parser.endText();
     parser.pos += indent.length;
+    parser.forward = 0;
+    parser.startText();
   } else if (indent && !parser.onlyWhitespaceRemainsOnLine(newLineLength)) {
+    const pos = parser.pos;
+    let cur = parser.pos;
+    while (cur && isWhitespaceCode(parser.data.charCodeAt(cur - 1))) {
+      cur--;
+    }
+    parser.pos = cur;
     parser.endText();
+    parser.pos = pos;
     parser.exitState();
     parser.exitState();
-  } else if (parser.pos + newLineLength !== parser.maxPos) {
-    parser.startText();
   }
 }
 
@@ -2849,6 +2871,13 @@ function prepareStatement(expr) {
   expr.terminatedByEOL = true;
   expr.consumeIndentedContent = true;
 }
+function isValidScriptlet(code) {
+  return isValid(code, true, prepareScriptlet);
+}
+function prepareScriptlet(expr) {
+  expr.operators = true;
+  expr.terminatedByEOL = true;
+}
 function isValidAttrValue(code, concise) {
   return isValid(code, concise, prepareAttrValue);
 }
@@ -2939,5 +2968,6 @@ export {
   getLocation,
   getPosition,
   isValidAttrValue,
+  isValidScriptlet,
   isValidStatement
 };

package/dist/util/validators.d.ts

@@ -4,4 +4,5 @@ export declare enum Validity {
     enclosed = 2
 }
 export declare function isValidStatement(code: string): Validity;
+export declare function isValidScriptlet(code: string): Validity;
 export declare function isValidAttrValue(code: string, concise: boolean): Validity;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "htmljs-parser",
   "description": "An HTML parser recognizes content and string placeholders and allows JavaScript expressions as attribute values",
-  "version": "5.8.2",
+  "version": "5.10.0",
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.1",