htmljs-parser 5.8.1 → 5.9.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 } from "./util/validators";
+export { isValidStatement, isValidAttrValue, Validity, } from "./util/validators";
 /**
  * Creates a new Marko parser.
  */

package/dist/index.js

@@ -22,6 +22,7 @@ var src_exports = {};
 __export(src_exports, {
   ErrorCode: () => ErrorCode,
   TagType: () => TagType,
+  Validity: () => Validity,
   createParser: () => createParser,
   getLines: () => getLines,
   getLocation: () => getLocation,
@@ -97,7 +98,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);
@@ -238,7 +250,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;
     }
   }
@@ -1178,7 +1192,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() {
@@ -1192,21 +1206,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();
@@ -1218,14 +1231,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();
   }
 }
 
@@ -2862,6 +2885,12 @@ var ROOT_RANGE = {
   start: 0,
   end: 0
 };
+var Validity = /* @__PURE__ */ ((Validity2) => {
+  Validity2[Validity2["invalid"] = 0] = "invalid";
+  Validity2[Validity2["valid"] = 1] = "valid";
+  Validity2[Validity2["enclosed"] = 2] = "enclosed";
+  return Validity2;
+})(Validity || {});
 function isValidStatement(code) {
   return isValid(code, true, prepareStatement);
 }
@@ -2892,13 +2921,18 @@ function isValid(data, concise, prepare) {
   parser.activeState = ROOT_STATE;
   parser.activeRange = ROOT_RANGE;
   const expr = parser.enterState(states_exports.EXPRESSION);
+  let isEnclosed = true;
   prepare(expr, concise);
   while (parser.pos < maxPos) {
     const code = data.charCodeAt(parser.pos);
     if (code === 10 /* NEWLINE */) {
+      if (isEnclosed && !expr.groupStack.length)
+        isEnclosed = false;
       parser.forward = 1;
       parser.activeState.eol.call(parser, 1, parser.activeRange);
     } else if (code === 13 /* CARRIAGE_RETURN */ && data.charCodeAt(parser.pos + 1) === 10 /* NEWLINE */) {
+      if (isEnclosed && !expr.groupStack.length)
+        isEnclosed = false;
       parser.forward = 2;
       parser.activeState.eol.call(parser, 2, parser.activeRange);
     } else {
@@ -2906,11 +2940,14 @@ function isValid(data, concise, prepare) {
       parser.activeState.char.call(parser, code, parser.activeRange);
     }
     if (parser.activeRange === ROOT_RANGE) {
-      return false;
+      return 0 /* invalid */;
     }
     parser.pos += parser.forward;
   }
-  return parser.pos === maxPos && parser.activeRange === expr && !expr.groupStack.length;
+  if (parser.pos === maxPos && parser.activeRange === expr && !expr.groupStack.length) {
+    return isEnclosed ? 2 /* enclosed */ : 1 /* valid */;
+  }
+  return 0 /* invalid */;
 }
 
 // src/index.ts
@@ -2947,6 +2984,7 @@ function createParser(handlers) {
 0 && (module.exports = {
   ErrorCode,
   TagType,
+  Validity,
   createParser,
   getLines,
   getLocation,

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();
   }
 }
 
@@ -2835,6 +2857,12 @@ var ROOT_RANGE = {
   start: 0,
   end: 0
 };
+var Validity = /* @__PURE__ */ ((Validity2) => {
+  Validity2[Validity2["invalid"] = 0] = "invalid";
+  Validity2[Validity2["valid"] = 1] = "valid";
+  Validity2[Validity2["enclosed"] = 2] = "enclosed";
+  return Validity2;
+})(Validity || {});
 function isValidStatement(code) {
   return isValid(code, true, prepareStatement);
 }
@@ -2865,13 +2893,18 @@ function isValid(data, concise, prepare) {
   parser.activeState = ROOT_STATE;
   parser.activeRange = ROOT_RANGE;
   const expr = parser.enterState(states_exports.EXPRESSION);
+  let isEnclosed = true;
   prepare(expr, concise);
   while (parser.pos < maxPos) {
     const code = data.charCodeAt(parser.pos);
     if (code === 10 /* NEWLINE */) {
+      if (isEnclosed && !expr.groupStack.length)
+        isEnclosed = false;
       parser.forward = 1;
       parser.activeState.eol.call(parser, 1, parser.activeRange);
     } else if (code === 13 /* CARRIAGE_RETURN */ && data.charCodeAt(parser.pos + 1) === 10 /* NEWLINE */) {
+      if (isEnclosed && !expr.groupStack.length)
+        isEnclosed = false;
       parser.forward = 2;
       parser.activeState.eol.call(parser, 2, parser.activeRange);
     } else {
@@ -2879,11 +2912,14 @@ function isValid(data, concise, prepare) {
       parser.activeState.char.call(parser, code, parser.activeRange);
     }
     if (parser.activeRange === ROOT_RANGE) {
-      return false;
+      return 0 /* invalid */;
     }
     parser.pos += parser.forward;
   }
-  return parser.pos === maxPos && parser.activeRange === expr && !expr.groupStack.length;
+  if (parser.pos === maxPos && parser.activeRange === expr && !expr.groupStack.length) {
+    return isEnclosed ? 2 /* enclosed */ : 1 /* valid */;
+  }
+  return 0 /* invalid */;
 }
 
 // src/index.ts
@@ -2919,6 +2955,7 @@ function createParser(handlers) {
 export {
   ErrorCode,
   TagType,
+  Validity,
   createParser,
   getLines,
   getLocation,

package/dist/util/validators.d.ts

@@ -1,2 +1,7 @@
-export declare function isValidStatement(code: string): boolean;
-export declare function isValidAttrValue(code: string, concise: boolean): boolean;
+export declare enum Validity {
+    invalid = 0,
+    valid = 1,
+    enclosed = 2
+}
+export declare function isValidStatement(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.1",
+  "version": "5.9.0",
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.1",