htmljs-parser 5.5.3 → 5.6.0

package/dist/core/Parser.d.ts

@@ -32,8 +32,8 @@ export declare class Parser {
     lines: undefined | number[];
     constructor(options: Options);
     read(range: Range): string;
-    positionAt(offset: number): import("../internal").Position;
-    locationAt(range: Range): import("../internal").Location;
+    positionAt(offset: number): import("..").Position;
+    locationAt(range: Range): import("..").Location;
     enterState<P extends Meta>(state: StateDefinition<P>): P;
     exitState(): void;
     /**

package/dist/index.js

@@ -74,6 +74,9 @@ var TagType = /* @__PURE__ */ ((TagType2) => {
 function isWhitespaceCode(code) {
   return code <= 32 /* SPACE */;
 }
+function isIndentCode(code) {
+  return code === 9 /* TAB */ || code === 32 /* SPACE */;
+}
 function getLocation(lines, startOffset, endOffset) {
   const start = getPosition(lines, startOffset);
   const end = startOffset === endOffset ? start : getPosAfterLine(lines, start.line, endOffset);
@@ -558,8 +561,7 @@ var OPEN_TAG = {
           ;
         const indentStart = ++curPos;
         while (curPos < maxPos) {
-          const nextCode = this.data.charCodeAt(curPos);
-          if (nextCode === 32 /* SPACE */ || nextCode === 9 /* TAB */) {
+          if (isIndentCode(this.data.charCodeAt(curPos))) {
             curPos++;
           } else {
             break;
@@ -1644,8 +1646,10 @@ var EXPRESSION = {
       groupStack: [],
       shouldTerminate,
       operators: false,
+      wasComment: false,
       terminatedByEOL: false,
-      terminatedByWhitespace: false
+      terminatedByWhitespace: false,
+      consumeIndentedContent: false
     };
   },
   exit() {
@@ -1739,10 +1743,11 @@ var EXPRESSION = {
       }
     }
   },
-  eol(_, expression) {
-    if (!expression.groupStack.length && (expression.terminatedByEOL || expression.terminatedByWhitespace) && !checkForOperators(this, expression, true)) {
+  eol(len, expression) {
+    if (!expression.groupStack.length && (expression.terminatedByEOL || expression.terminatedByWhitespace) && (expression.wasComment || !checkForOperators(this, expression, true)) && !(expression.consumeIndentedContent && isIndentCode(this.lookAtCharCodeAhead(len + 1)))) {
       this.exitState();
     }
+    expression.wasComment = false;
   },
   eof(expression) {
     if (!expression.groupStack.length && (this.isConcise || expression.terminatedByEOL)) {
@@ -1785,7 +1790,10 @@ var EXPRESSION = {
       );
     }
   },
-  return() {
+  return(child, expression) {
+    if (child.state === states_exports.JS_COMMENT_LINE) {
+      expression.wasComment = true;
+    }
   }
 };
 function checkForOperators(parser, expression, eol) {
@@ -1941,9 +1949,6 @@ function canFollowDivision(code) {
 function isWordCode(code) {
   return code >= 65 /* UPPER_A */ && code <= 90 /* UPPER_Z */ || code >= 97 /* LOWER_A */ && code <= 122 /* LOWER_Z */ || code >= 48 /* NUMBER_0 */ && code <= 57 /* NUMBER_9 */ || code == 36 /* DOLLAR */ || code === 95 /* UNDERSCORE */;
 }
-function isIndentCode(code) {
-  return code === 9 /* TAB */ || code === 32 /* SPACE */;
-}
 function lookAheadWhile(match, data, pos) {
   const max = data.length;
   for (let i = pos; i < max; i++) {
@@ -2594,6 +2599,7 @@ var TAG_NAME = {
             const expr = this.enterState(states_exports.EXPRESSION);
             expr.operators = true;
             expr.terminatedByEOL = true;
+            expr.consumeIndentedContent = true;
           }
         }
         break;

package/dist/index.mjs

@@ -49,6 +49,9 @@ var TagType = /* @__PURE__ */ ((TagType2) => {
 function isWhitespaceCode(code) {
   return code <= 32 /* SPACE */;
 }
+function isIndentCode(code) {
+  return code === 9 /* TAB */ || code === 32 /* SPACE */;
+}
 function getLocation(lines, startOffset, endOffset) {
   const start = getPosition(lines, startOffset);
   const end = startOffset === endOffset ? start : getPosAfterLine(lines, start.line, endOffset);
@@ -533,8 +536,7 @@ var OPEN_TAG = {
           ;
         const indentStart = ++curPos;
         while (curPos < maxPos) {
-          const nextCode = this.data.charCodeAt(curPos);
-          if (nextCode === 32 /* SPACE */ || nextCode === 9 /* TAB */) {
+          if (isIndentCode(this.data.charCodeAt(curPos))) {
             curPos++;
           } else {
             break;
@@ -1619,8 +1621,10 @@ var EXPRESSION = {
       groupStack: [],
       shouldTerminate,
       operators: false,
+      wasComment: false,
       terminatedByEOL: false,
-      terminatedByWhitespace: false
+      terminatedByWhitespace: false,
+      consumeIndentedContent: false
     };
   },
   exit() {
@@ -1714,10 +1718,11 @@ var EXPRESSION = {
       }
     }
   },
-  eol(_, expression) {
-    if (!expression.groupStack.length && (expression.terminatedByEOL || expression.terminatedByWhitespace) && !checkForOperators(this, expression, true)) {
+  eol(len, expression) {
+    if (!expression.groupStack.length && (expression.terminatedByEOL || expression.terminatedByWhitespace) && (expression.wasComment || !checkForOperators(this, expression, true)) && !(expression.consumeIndentedContent && isIndentCode(this.lookAtCharCodeAhead(len + 1)))) {
       this.exitState();
     }
+    expression.wasComment = false;
   },
   eof(expression) {
     if (!expression.groupStack.length && (this.isConcise || expression.terminatedByEOL)) {
@@ -1760,7 +1765,10 @@ var EXPRESSION = {
       );
     }
   },
-  return() {
+  return(child, expression) {
+    if (child.state === states_exports.JS_COMMENT_LINE) {
+      expression.wasComment = true;
+    }
   }
 };
 function checkForOperators(parser, expression, eol) {
@@ -1916,9 +1924,6 @@ function canFollowDivision(code) {
 function isWordCode(code) {
   return code >= 65 /* UPPER_A */ && code <= 90 /* UPPER_Z */ || code >= 97 /* LOWER_A */ && code <= 122 /* LOWER_Z */ || code >= 48 /* NUMBER_0 */ && code <= 57 /* NUMBER_9 */ || code == 36 /* DOLLAR */ || code === 95 /* UNDERSCORE */;
 }
-function isIndentCode(code) {
-  return code === 9 /* TAB */ || code === 32 /* SPACE */;
-}
 function lookAheadWhile(match, data, pos) {
   const max = data.length;
   for (let i = pos; i < max; i++) {
@@ -2569,6 +2574,7 @@ var TAG_NAME = {
             const expr = this.enterState(states_exports.EXPRESSION);
             expr.operators = true;
             expr.terminatedByEOL = true;
+            expr.consumeIndentedContent = true;
           }
         }
         break;

package/dist/states/EXPRESSION.d.ts

@@ -2,8 +2,10 @@ import { type StateDefinition, type Meta } from "../internal";
 export interface ExpressionMeta extends Meta {
     groupStack: number[];
     operators: boolean;
+    wasComment: boolean;
     terminatedByEOL: boolean;
     terminatedByWhitespace: boolean;
+    consumeIndentedContent: boolean;
     shouldTerminate(code: number, data: string, pos: number): boolean;
 }
 export declare const EXPRESSION: StateDefinition<ExpressionMeta>;

package/dist/util/util.d.ts

@@ -1,6 +1,7 @@
-import { type Parser } from "../internal";
+import { CODE, type Parser } from "../internal";
 import { type Location, type Position } from "./constants";
 export declare function isWhitespaceCode(code: number): boolean;
+export declare function isIndentCode(code: number): code is CODE.SPACE | CODE.TAB;
 /**
  * Given a source code line offsets, a start offset and an end offset, returns a Location object with line & character information for the start and end offsets.
  */
@@ -15,7 +16,7 @@ export declare function getPosition(lines: number[], offset: number): Position;
  */
 export declare function getLines(src: string): number[];
 export declare function htmlEOF(this: Parser): void;
-export declare function matchesCloseAngleBracket(code: number): boolean;
-export declare function matchesCloseParen(code: number): boolean;
-export declare function matchesCloseCurlyBrace(code: number): boolean;
-export declare function matchesPipe(code: number): boolean;
+export declare function matchesCloseAngleBracket(code: number): code is CODE.CLOSE_ANGLE_BRACKET;
+export declare function matchesCloseParen(code: number): code is CODE.CLOSE_PAREN;
+export declare function matchesCloseCurlyBrace(code: number): code is CODE.CLOSE_CURLY_BRACE;
+export declare function matchesPipe(code: number): code is CODE.PIPE;

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.5.3",
+  "version": "5.6.0",
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.1",
@@ -26,7 +26,7 @@
     "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
     "prettier": "^3.2.5",
-    "tsx": "^4.7.0",
+    "tsx": "^4.19.2",
     "typescript": "^5.3.3"
   },
   "exports": {