htmljs-parser 5.7.3 → 5.8.0

package/dist/index.d.ts

@@ -1,5 +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";
 /**
  * Creates a new Marko parser.
  */

package/dist/index.js

@@ -25,7 +25,9 @@ __export(src_exports, {
   createParser: () => createParser,
   getLines: () => getLines,
   getLocation: () => getLocation,
-  getPosition: () => getPosition
+  getPosition: () => getPosition,
+  isValidAttrValue: () => isValidAttrValue,
+  isValidStatement: () => isValidStatement
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -411,7 +413,9 @@ __export(states_exports, {
   checkForCDATA: () => checkForCDATA,
   checkForClosingTag: () => checkForClosingTag,
   checkForPlaceholder: () => checkForPlaceholder,
-  handleDelimitedEOL: () => handleDelimitedEOL
+  handleDelimitedEOL: () => handleDelimitedEOL,
+  shouldTerminateConciseAttrValue: () => shouldTerminateConciseAttrValue,
+  shouldTerminateHtmlAttrValue: () => shouldTerminateHtmlAttrValue
 });
 
 // src/states/OPEN_TAG.ts
@@ -1792,7 +1796,12 @@ var EXPRESSION = {
       case 41 /* CLOSE_PAREN */:
       case 93 /* CLOSE_SQUARE_BRACKET */:
       case 125 /* CLOSE_CURLY_BRACE */:
-      case (expression.inType && 62 /* CLOSE_ANGLE_BRACKET */): {
+      case 62 /* CLOSE_ANGLE_BRACKET */: {
+        if (code === 62 /* CLOSE_ANGLE_BRACKET */) {
+          if (!expression.inType || this.lookAtCharCodeAhead(-1) === 61 /* EQUAL */) {
+            break;
+          }
+        }
         if (!expression.groupStack.length) {
           return this.emitError(
             expression,
@@ -2830,6 +2839,80 @@ var PARSED_STRING = {
   }
 };
 
+// src/util/validators.ts
+var ROOT_STATE = {
+  name: "ROOT",
+  enter() {
+    return ROOT_RANGE;
+  },
+  exit() {
+  },
+  char() {
+  },
+  eol() {
+  },
+  eof() {
+  },
+  return() {
+  }
+};
+var ROOT_RANGE = {
+  state: ROOT_STATE,
+  parent: void 0,
+  start: 0,
+  end: 0
+};
+function isValidStatement(code) {
+  return isValid(code, true, prepareStatement);
+}
+function prepareStatement(expr) {
+  expr.operators = true;
+  expr.terminatedByEOL = true;
+  expr.consumeIndentedContent = true;
+}
+function isValidAttrValue(code, concise) {
+  return isValid(code, concise, prepareAttrValue);
+}
+function prepareAttrValue(expr, concise) {
+  expr.operators = true;
+  expr.terminatedByWhitespace = true;
+  expr.shouldTerminate = concise ? shouldTerminateConciseAttrValue : shouldTerminateHtmlAttrValue;
+}
+function isValid(data, concise, prepare) {
+  const parser = new Parser({});
+  const maxPos = parser.maxPos = data.length;
+  parser.pos = 0;
+  parser.data = data;
+  parser.indent = "";
+  parser.forward = 1;
+  parser.textPos = -1;
+  parser.isConcise = concise;
+  parser.beginMixedMode = parser.endingMixedModeAtEOL = false;
+  parser.lines = parser.activeTag = parser.activeAttr = void 0;
+  parser.activeState = ROOT_STATE;
+  parser.activeRange = ROOT_RANGE;
+  const expr = parser.enterState(states_exports.EXPRESSION);
+  prepare(expr, concise);
+  while (parser.pos < maxPos) {
+    const code = data.charCodeAt(parser.pos);
+    if (code === 10 /* NEWLINE */) {
+      parser.forward = 1;
+      parser.activeState.eol.call(parser, 1, parser.activeRange);
+    } else if (code === 13 /* CARRIAGE_RETURN */ && data.charCodeAt(parser.pos + 1) === 10 /* NEWLINE */) {
+      parser.forward = 2;
+      parser.activeState.eol.call(parser, 2, parser.activeRange);
+    } else {
+      parser.forward = 1;
+      parser.activeState.char.call(parser, code, parser.activeRange);
+    }
+    if (parser.activeRange === ROOT_RANGE) {
+      return false;
+    }
+    parser.pos += parser.forward;
+  }
+  return parser.pos === maxPos && parser.activeRange === expr && !expr.groupStack.length;
+}
+
 // src/index.ts
 function createParser(handlers) {
   const parser = new Parser(handlers);
@@ -2867,5 +2950,7 @@ function createParser(handlers) {
   createParser,
   getLines,
   getLocation,
-  getPosition
+  getPosition,
+  isValidAttrValue,
+  isValidStatement
 });

package/dist/index.mjs

@@ -386,7 +386,9 @@ __export(states_exports, {
   checkForCDATA: () => checkForCDATA,
   checkForClosingTag: () => checkForClosingTag,
   checkForPlaceholder: () => checkForPlaceholder,
-  handleDelimitedEOL: () => handleDelimitedEOL
+  handleDelimitedEOL: () => handleDelimitedEOL,
+  shouldTerminateConciseAttrValue: () => shouldTerminateConciseAttrValue,
+  shouldTerminateHtmlAttrValue: () => shouldTerminateHtmlAttrValue
 });
 
 // src/states/OPEN_TAG.ts
@@ -1767,7 +1769,12 @@ var EXPRESSION = {
       case 41 /* CLOSE_PAREN */:
       case 93 /* CLOSE_SQUARE_BRACKET */:
       case 125 /* CLOSE_CURLY_BRACE */:
-      case (expression.inType && 62 /* CLOSE_ANGLE_BRACKET */): {
+      case 62 /* CLOSE_ANGLE_BRACKET */: {
+        if (code === 62 /* CLOSE_ANGLE_BRACKET */) {
+          if (!expression.inType || this.lookAtCharCodeAhead(-1) === 61 /* EQUAL */) {
+            break;
+          }
+        }
         if (!expression.groupStack.length) {
           return this.emitError(
             expression,
@@ -2805,6 +2812,80 @@ var PARSED_STRING = {
   }
 };
 
+// src/util/validators.ts
+var ROOT_STATE = {
+  name: "ROOT",
+  enter() {
+    return ROOT_RANGE;
+  },
+  exit() {
+  },
+  char() {
+  },
+  eol() {
+  },
+  eof() {
+  },
+  return() {
+  }
+};
+var ROOT_RANGE = {
+  state: ROOT_STATE,
+  parent: void 0,
+  start: 0,
+  end: 0
+};
+function isValidStatement(code) {
+  return isValid(code, true, prepareStatement);
+}
+function prepareStatement(expr) {
+  expr.operators = true;
+  expr.terminatedByEOL = true;
+  expr.consumeIndentedContent = true;
+}
+function isValidAttrValue(code, concise) {
+  return isValid(code, concise, prepareAttrValue);
+}
+function prepareAttrValue(expr, concise) {
+  expr.operators = true;
+  expr.terminatedByWhitespace = true;
+  expr.shouldTerminate = concise ? shouldTerminateConciseAttrValue : shouldTerminateHtmlAttrValue;
+}
+function isValid(data, concise, prepare) {
+  const parser = new Parser({});
+  const maxPos = parser.maxPos = data.length;
+  parser.pos = 0;
+  parser.data = data;
+  parser.indent = "";
+  parser.forward = 1;
+  parser.textPos = -1;
+  parser.isConcise = concise;
+  parser.beginMixedMode = parser.endingMixedModeAtEOL = false;
+  parser.lines = parser.activeTag = parser.activeAttr = void 0;
+  parser.activeState = ROOT_STATE;
+  parser.activeRange = ROOT_RANGE;
+  const expr = parser.enterState(states_exports.EXPRESSION);
+  prepare(expr, concise);
+  while (parser.pos < maxPos) {
+    const code = data.charCodeAt(parser.pos);
+    if (code === 10 /* NEWLINE */) {
+      parser.forward = 1;
+      parser.activeState.eol.call(parser, 1, parser.activeRange);
+    } else if (code === 13 /* CARRIAGE_RETURN */ && data.charCodeAt(parser.pos + 1) === 10 /* NEWLINE */) {
+      parser.forward = 2;
+      parser.activeState.eol.call(parser, 2, parser.activeRange);
+    } else {
+      parser.forward = 1;
+      parser.activeState.char.call(parser, code, parser.activeRange);
+    }
+    if (parser.activeRange === ROOT_RANGE) {
+      return false;
+    }
+    parser.pos += parser.forward;
+  }
+  return parser.pos === maxPos && parser.activeRange === expr && !expr.groupStack.length;
+}
+
 // src/index.ts
 function createParser(handlers) {
   const parser = new Parser(handlers);
@@ -2841,5 +2922,7 @@ export {
   createParser,
   getLines,
   getLocation,
-  getPosition
+  getPosition,
+  isValidAttrValue,
+  isValidStatement
 };

package/dist/states/ATTRIBUTE.d.ts

@@ -1,4 +1,4 @@
-import { type StateDefinition, type Range, type Ranges, type Meta } from "../internal";
+import { STATE, type StateDefinition, type Range, type Ranges, type Meta } from "../internal";
 declare const enum ATTR_STAGE {
     UNKNOWN = 0,
     NAME = 1,
@@ -17,4 +17,6 @@ export interface AttrMeta extends Meta {
     bound: boolean;
 }
 export declare const ATTRIBUTE: StateDefinition<AttrMeta>;
+export declare function shouldTerminateHtmlAttrValue(this: STATE.ExpressionMeta, code: number, data: string, pos: number): boolean;
+export declare function shouldTerminateConciseAttrValue(code: number, data: string, pos: number): boolean;
 export {};

package/dist/util/validators.d.ts

@@ -0,0 +1,2 @@
+export declare function isValidStatement(code: string): boolean;
+export declare function isValidAttrValue(code: string, concise: boolean): boolean;

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.7.3",
+  "version": "5.8.0",
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.1",