htmljs-parser 5.8.0 → 5.8.2

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,
@@ -2862,6 +2863,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 +2899,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 +2918,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 +2962,7 @@ function createParser(handlers) {
 0 && (module.exports = {
   ErrorCode,
   TagType,
+  Validity,
   createParser,
   getLines,
   getLocation,

package/dist/index.mjs

@@ -2835,6 +2835,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 +2871,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 +2890,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 +2933,7 @@ function createParser(handlers) {
 export {
   ErrorCode,
   TagType,
+  Validity,
   createParser,
   getLines,
   getLocation,

package/dist/util/constants.d.ts

@@ -126,7 +126,7 @@ export declare enum ErrorCode {
     INVALID_TAG_TYPES = 27,
     INVALID_ATTR_TYPE_PARAMS = 28
 }
-export declare const enum TagType {
+export declare enum TagType {
     html = 0,
     text = 1,
     void = 2,

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