htmljs-parser 3.0.0 → 3.2.1

package/dist/core/Parser.d.ts

@@ -1,4 +1,4 @@
-import { STATE, Range, Handlers } from "../internal";
+import { STATE, Range, ParserOptions as Options } from "../internal";
 export interface Meta extends Range {
     parent: Meta;
     state: StateDefinition;
@@ -15,7 +15,7 @@ export interface StateDefinition<P extends Meta = Meta> {
     return: (this: Parser, child: Meta, activeRange: P) => void;
 }
 export declare class Parser {
-    handlers: Handlers;
+    options: Options;
     pos: number;
     maxPos: number;
     data: string;
@@ -30,7 +30,7 @@ export declare class Parser {
     endingMixedModeAtEOL?: boolean;
     textPos: number;
     lines: undefined | number[];
-    constructor(handlers: Handlers);
+    constructor(options: Options);
     read(range: Range): string;
     positionAt(index: number): import("../internal").Position;
     locationAt(range: Range): import("../internal").Location;

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { type Handlers, type Range } from "./internal";
-export { OpenTagEnding, type Handlers, type Position, type Location, type Ranges, type Range, } from "./internal";
+import { type ParserOptions, type Range } from "./internal";
+export { TagType, type ParserOptions as Handlers, type Position, type Location, type Ranges, type Range, } from "./internal";
 /**
  * Creates a new Marko parser.
  */
-export declare function createParser(handlers: Handlers): {
+export declare function createParser(handlers: ParserOptions): {
     /**
      * Parses code and calls the provided handlers.
      */

package/dist/index.js

@@ -19,19 +19,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  OpenTagEnding: () => OpenTagEnding,
+  TagType: () => TagType,
   createParser: () => createParser
 });
 module.exports = __toCommonJS(src_exports);
 
 // src/util/constants.ts
-var OpenTagEnding = /* @__PURE__ */ ((OpenTagEnding2) => {
-  OpenTagEnding2[OpenTagEnding2["tag"] = 0] = "tag";
-  OpenTagEnding2[OpenTagEnding2["self"] = 1] = "self";
-  OpenTagEnding2[OpenTagEnding2["void"] = 2] = "void";
-  OpenTagEnding2[OpenTagEnding2["code"] = 4] = "code";
-  return OpenTagEnding2;
-})(OpenTagEnding || {});
+var TagType = /* @__PURE__ */ ((TagType2) => {
+  TagType2[TagType2["html"] = 0] = "html";
+  TagType2[TagType2["text"] = 1] = "text";
+  TagType2[TagType2["void"] = 2] = "void";
+  TagType2[TagType2["statement"] = 3] = "statement";
+  return TagType2;
+})(TagType || {});
 
 // src/util/util.ts
 function isWhitespaceCode(code) {
@@ -80,9 +80,9 @@ function htmlEOF() {
 
 // src/core/Parser.ts
 var Parser = class {
-  constructor(handlers) {
-    this.handlers = handlers;
-    this.handlers = handlers;
+  constructor(options) {
+    this.options = options;
+    this.options = options;
   }
   pos;
   maxPos;
@@ -173,13 +173,13 @@ var Parser = class {
     var _a, _b;
     const start = this.textPos;
     if (start !== -1) {
-      (_b = (_a = this.handlers).onText) == null ? void 0 : _b.call(_a, { start, end: this.pos });
+      (_b = (_a = this.options).onText) == null ? void 0 : _b.call(_a, { start, end: this.pos });
       this.textPos = -1;
     }
   }
   beginHtmlBlock(delimiter, singleLine) {
     var _a;
-    const content = this.enterState(((_a = this.activeTag) == null ? void 0 : _a.bodyMode) === 1 /* PARSED_TEXT */ ? states_exports.PARSED_TEXT_CONTENT : states_exports.HTML_CONTENT);
+    const content = this.enterState(((_a = this.activeTag) == null ? void 0 : _a.type) === 1 /* text */ ? states_exports.PARSED_TEXT_CONTENT : states_exports.HTML_CONTENT);
     content.singleLine = singleLine;
     content.delimiter = delimiter;
     content.indent = this.indent;
@@ -193,7 +193,7 @@ var Parser = class {
       start = range.start;
       end = range.end;
     }
-    (_b = (_a = this.handlers).onError) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onError) == null ? void 0 : _b.call(_a, {
       start,
       end,
       code,
@@ -207,7 +207,7 @@ var Parser = class {
     if (beginMixedMode)
       this.endingMixedModeAtEOL = true;
     this.activeTag = parentTag;
-    (_b = (_a = this.handlers).onCloseTag) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onCloseTag) == null ? void 0 : _b.call(_a, {
       start,
       end,
       value
@@ -454,7 +454,7 @@ var ATTRIBUTE = {
           start: child.start,
           end: child.end
         };
-        (_b = (_a = this.handlers).onAttrName) == null ? void 0 : _b.call(_a, attr.name);
+        (_b = (_a = this.options).onAttrName) == null ? void 0 : _b.call(_a, attr.name);
         break;
       }
       case 3 /* ARGUMENT */: {
@@ -476,7 +476,7 @@ var ATTRIBUTE = {
           };
         } else {
           attr.args = true;
-          (_d = (_c = this.handlers).onAttrArgs) == null ? void 0 : _d.call(_c, {
+          (_d = (_c = this.options).onAttrArgs) == null ? void 0 : _d.call(_c, {
             start,
             end,
             value
@@ -488,7 +488,7 @@ var ATTRIBUTE = {
         const params = attr.args;
         const start = params.start;
         const end = ++this.pos;
-        (_f = (_e = this.handlers).onAttrMethod) == null ? void 0 : _f.call(_e, {
+        (_f = (_e = this.options).onAttrMethod) == null ? void 0 : _f.call(_e, {
           start,
           end,
           params,
@@ -509,7 +509,7 @@ var ATTRIBUTE = {
           return this.emitError(child, "ILLEGAL_ATTRIBUTE_VALUE", "Missing value for attribute");
         }
         if (attr.spread) {
-          (_h = (_g = this.handlers).onAttrSpread) == null ? void 0 : _h.call(_g, {
+          (_h = (_g = this.options).onAttrSpread) == null ? void 0 : _h.call(_g, {
             start: attr.valueStart,
             end: child.end,
             value: {
@@ -518,7 +518,7 @@ var ATTRIBUTE = {
             }
           });
         } else {
-          (_j = (_i = this.handlers).onAttrValue) == null ? void 0 : _j.call(_i, {
+          (_j = (_i = this.options).onAttrValue) == null ? void 0 : _j.call(_i, {
             start: attr.valueStart,
             end: child.end,
             bound: attr.bound,
@@ -537,7 +537,7 @@ var ATTRIBUTE = {
 function ensureAttrName(parser, attr) {
   var _a, _b;
   if (!attr.name) {
-    (_b = (_a = parser.handlers).onAttrName) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = parser.options).onAttrName) == null ? void 0 : _b.call(_a, {
       start: attr.start,
       end: attr.start
     });
@@ -634,7 +634,7 @@ var CDATA = {
   },
   exit(cdata) {
     var _a, _b;
-    (_b = (_a = this.handlers).onCDATA) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onCDATA) == null ? void 0 : _b.call(_a, {
       start: cdata.start,
       end: cdata.end,
       value: {
@@ -782,11 +782,7 @@ var CONCISE_HTML_CONTENT = {
         return;
       }
       if (parentTag) {
-        if (parentTag.ending !== 0 /* tag */) {
-          this.emitError(this.pos, "INVALID_BODY", `The "${this.read(parentTag.tagName)}" tag does not allow nested body content`);
-          return;
-        }
-        if (parentTag.bodyMode === 1 /* PARSED_TEXT */ && code !== 45 /* HTML_BLOCK_DELIMITER */) {
+        if (parentTag.type === 1 /* text */ && code !== 45 /* HTML_BLOCK_DELIMITER */) {
           this.emitError(this.pos, "ILLEGAL_LINE_START", 'A line within a tag that only allows text content must begin with a "-" character');
           return;
         }
@@ -847,7 +843,7 @@ var CONCISE_HTML_CONTENT = {
     this.isConcise = true;
     switch (child.state) {
       case states_exports.JS_COMMENT_LINE:
-        (_b = (_a = this.handlers).onComment) == null ? void 0 : _b.call(_a, {
+        (_b = (_a = this.options).onComment) == null ? void 0 : _b.call(_a, {
           start: child.start,
           end: child.end,
           value: {
@@ -857,7 +853,7 @@ var CONCISE_HTML_CONTENT = {
         });
         break;
       case states_exports.JS_COMMENT_BLOCK: {
-        (_d = (_c = this.handlers).onComment) == null ? void 0 : _d.call(_c, {
+        (_d = (_c = this.options).onComment) == null ? void 0 : _d.call(_c, {
           start: child.start,
           end: child.end,
           value: {
@@ -909,7 +905,7 @@ function exitDeclaration(parser, declaration, closeOffset) {
   var _a, _b;
   parser.pos += closeOffset;
   parser.exitState();
-  (_b = (_a = parser.handlers).onDeclaration) == null ? void 0 : _b.call(_a, {
+  (_b = (_a = parser.options).onDeclaration) == null ? void 0 : _b.call(_a, {
     start: declaration.start,
     end: declaration.end,
     value: {
@@ -933,7 +929,7 @@ var DTD = {
   },
   exit(documentType) {
     var _a, _b;
-    (_b = (_a = this.handlers).onDoctype) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onDoctype) == null ? void 0 : _b.call(_a, {
       start: documentType.start,
       end: documentType.end,
       value: {
@@ -1071,7 +1067,7 @@ var EXPRESSION = {
   }
 };
 function buildOperatorPattern(isConcise) {
-  const binary = `[!~*%&^|?:]+|(?<=[!=<>&^~|/*?%+-])=|=(?=[!=<>&^~|/*?%+-])|(?<!\\+)\\s*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!-)${isConcise ? "-" : "\\s*-(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${isConcise ? "" : ">"}])|(?<!${isConcise ? "^\\s*|" : ""}\\.)\\.(?!\\.)|<${isConcise ? "{2,}|(?<!^\\s*)<" : "+"}|>${isConcise ? "+" : "{2,}"}|\\bin(?:stanceof)?(?=\\s+[^=/,;:>])`;
+  const binary = `[!~*%&^|?:]+|(?<=[!=<>&^~|/*?%+-])=|=(?=[!=<>&^~|/*?%+-])|(?<!\\+)\\s*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!^\\s*|-)-${isConcise ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${isConcise ? "" : ">"}])|(?<!${isConcise ? "^\\s*|" : ""}\\.)\\.(?!\\.)|<${isConcise ? "{2,}|(?<!^\\s*)<" : "+"}|>${isConcise ? "+" : "{2,}"}|\\bin(?:stanceof)?(?=\\s+[^=/,;:>])`;
   const unary = "\\b(?:a(?:sync|wait)|class|function|new|typeof|void)\\b";
   const lookAheadPattern = "\\s*(?:" + binary + `)\\s*|\\s+(?=[${isConcise ? "" : "["}{(])`;
   const lookBehindPattern = `(?<=${unary}|${binary})`;
@@ -1132,7 +1128,7 @@ var HTML_COMMENT = {
   },
   exit(comment) {
     var _a, _b;
-    (_b = (_a = this.handlers).onComment) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onComment) == null ? void 0 : _b.call(_a, {
       start: comment.start,
       end: comment.end,
       value: {
@@ -1262,7 +1258,7 @@ var INLINE_SCRIPT = {
   },
   exit(inlineScript) {
     var _a, _b;
-    (_b = (_a = this.handlers).onScriptlet) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onScriptlet) == null ? void 0 : _b.call(_a, {
       start: inlineScript.start,
       end: inlineScript.end,
       block: inlineScript.block,
@@ -1342,7 +1338,7 @@ var JS_COMMENT_LINE = {
   },
   char(code) {
     var _a;
-    if (!this.isConcise && code === 60 /* OPEN_ANGLE_BRACKET */ && ((_a = this.activeTag) == null ? void 0 : _a.bodyMode) === 1 /* PARSED_TEXT */) {
+    if (!this.isConcise && code === 60 /* OPEN_ANGLE_BRACKET */ && ((_a = this.activeTag) == null ? void 0 : _a.type) === 1 /* text */) {
       states_exports.checkForClosingTag(this);
     }
   },
@@ -1426,7 +1422,7 @@ var PLACEHOLDER = {
   },
   exit(placeholder) {
     var _a, _b;
-    (_b = (_a = this.handlers).onPlaceholder) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onPlaceholder) == null ? void 0 : _b.call(_a, {
       start: placeholder.start,
       end: placeholder.end,
       escape: placeholder.escape,
@@ -1562,23 +1558,6 @@ var STRING = {
 };
 
 // src/states/TAG_NAME.ts
-var VOID_TAGS = [
-  "area",
-  "base",
-  "br",
-  "col",
-  "hr",
-  "embed",
-  "img",
-  "input",
-  "link",
-  "meta",
-  "param",
-  "source",
-  "track",
-  "wbr"
-];
-var CODE_TAGS = ["import", "export", "static", "class"];
 var TAG_NAME = {
   name: "TAG_NAME",
   enter(parent, start) {
@@ -1603,7 +1582,7 @@ var TAG_NAME = {
           return this.emitError(tagName, "INVALID_TAG_SHORTHAND", "Multiple shorthand ID parts are not allowed on the same tag");
         }
         this.activeTag.hasShorthandId = true;
-        (_b = (_a = this.handlers).onTagShorthandId) == null ? void 0 : _b.call(_a, {
+        (_b = (_a = this.options).onTagShorthandId) == null ? void 0 : _b.call(_a, {
           start,
           end,
           quasis,
@@ -1611,7 +1590,7 @@ var TAG_NAME = {
         });
         break;
       case 46 /* PERIOD */:
-        (_d = (_c = this.handlers).onTagShorthandClass) == null ? void 0 : _d.call(_c, {
+        (_d = (_c = this.options).onTagShorthandClass) == null ? void 0 : _d.call(_c, {
           start,
           end,
           quasis,
@@ -1620,28 +1599,26 @@ var TAG_NAME = {
         break;
       default: {
         const tag = this.activeTag;
+        const tagType = (_f = (_e = this.options).onTagName) == null ? void 0 : _f.call(_e, {
+          start,
+          end,
+          quasis,
+          expressions,
+          concise: this.isConcise
+        });
         tag.tagName = tagName;
-        if (tagName.expressions.length === 0) {
-          if (this.matchAnyAtPos(tagName, VOID_TAGS)) {
-            tag.ending |= 2 /* void */;
-          } else if (this.matchAnyAtPos(tagName, CODE_TAGS)) {
+        if (tagType) {
+          tag.type = tagType;
+          if (tagType === 3 /* statement */) {
             if (!tag.concise) {
               return this.emitError(tagName, "RESERVED_TAG_NAME", `The "${this.read(tagName)}" tag is reserved and cannot be used as an HTML tag.`);
             }
             if (tag.parentTag) {
               return this.emitError(tagName, "ROOT_TAG_ONLY", `"${this.read(tagName)}" can only be used at the root of the template.`);
             }
-            tag.ending |= 4 /* code */;
             this.enterState(states_exports.EXPRESSION).terminatedByEOL = true;
           }
         }
-        (_f = (_e = this.handlers).onTagName) == null ? void 0 : _f.call(_e, {
-          start,
-          end,
-          quasis,
-          expressions,
-          concise: this.isConcise
-        });
         break;
       }
     }
@@ -1733,7 +1710,6 @@ var TEMPLATE_STRING = {
 };
 
 // src/states/OPEN_TAG.ts
-var PARSED_TEXT_TAGS = ["script", "style", "textarea", "html-comment"];
 var CONCISE_TAG_VAR_TERMINATORS = [
   59 /* SEMICOLON */,
   40 /* OPEN_PAREN */,
@@ -1754,6 +1730,7 @@ var OPEN_TAG = {
   enter(parent, start) {
     const tag = this.activeTag = {
       state: OPEN_TAG,
+      type: 0 /* html */,
       parent,
       start,
       end: start,
@@ -1764,11 +1741,10 @@ var OPEN_TAG = {
       hasShorthandId: false,
       hasArgs: false,
       hasAttrs: false,
+      selfClosed: false,
       shorthandEnd: -1,
       tagName: void 0,
-      ending: 0 /* tag */,
       concise: this.isConcise,
-      bodyMode: 0 /* HTML */,
       beginMixedMode: this.beginMixedMode || this.endingMixedModeAtEOL
     };
     this.beginMixedMode = false;
@@ -1778,21 +1754,27 @@ var OPEN_TAG = {
   },
   exit(tag) {
     var _a, _b;
-    const { tagName, ending } = tag;
-    (_b = (_a = this.handlers).onOpenTagEnd) == null ? void 0 : _b.call(_a, {
-      start: this.pos - (this.isConcise ? 0 : ending & 1 /* self */ ? 2 : 1),
+    const { selfClosed } = tag;
+    (_b = (_a = this.options).onOpenTagEnd) == null ? void 0 : _b.call(_a, {
+      start: this.pos - (this.isConcise ? 0 : selfClosed ? 2 : 1),
       end: this.pos,
-      ending
+      selfClosed
     });
-    if (!this.isConcise && ending !== 0 /* tag */) {
-      this.closeTag(this.pos, this.pos, void 0);
-    } else if (tagName.expressions.length === 0 && this.matchAnyAtPos(tagName, PARSED_TEXT_TAGS)) {
-      tag.bodyMode = 1 /* PARSED_TEXT */;
-      if (this.isConcise) {
-        this.enterState(states_exports.CONCISE_HTML_CONTENT);
-      } else {
-        this.enterState(states_exports.PARSED_TEXT_CONTENT);
+    switch (selfClosed ? 2 /* void */ : tag.type) {
+      case 2 /* void */:
+      case 3 /* statement */: {
+        if (tag.beginMixedMode)
+          this.endingMixedModeAtEOL = true;
+        this.activeTag = tag.parentTag;
+        break;
       }
+      case 1 /* text */:
+        if (this.isConcise) {
+          this.enterState(states_exports.CONCISE_HTML_CONTENT);
+        } else {
+          this.enterState(states_exports.PARSED_TEXT_CONTENT);
+        }
+        break;
     }
   },
   eol(_, tag) {
@@ -1891,7 +1873,7 @@ var OPEN_TAG = {
       this.exitState();
       return;
     } else if (code === 47 /* FORWARD_SLASH */ && this.lookAtCharCodeAhead(1) === 62 /* CLOSE_ANGLE_BRACKET */) {
-      tag.ending |= 1 /* self */;
+      tag.selfClosed = true;
       this.pos += 2;
       this.exitState();
       return;
@@ -1957,7 +1939,7 @@ var OPEN_TAG = {
             if (child.start === child.end) {
               return this.emitError(child, "MISSING_TAG_VARIABLE", "A slash was found that was not followed by a variable name or lhs expression");
             }
-            (_b = (_a = this.handlers).onTagVar) == null ? void 0 : _b.call(_a, {
+            (_b = (_a = this.options).onTagVar) == null ? void 0 : _b.call(_a, {
               start: child.start - 1,
               end: child.end,
               value: {
@@ -1982,7 +1964,7 @@ var OPEN_TAG = {
               this.pos--;
             } else {
               tag.hasArgs = true;
-              (_d = (_c = this.handlers).onTagArgs) == null ? void 0 : _d.call(_c, {
+              (_d = (_c = this.options).onTagArgs) == null ? void 0 : _d.call(_c, {
                 start,
                 end,
                 value
@@ -1992,7 +1974,7 @@ var OPEN_TAG = {
           }
           case 3 /* PARAMS */: {
             const end = ++this.pos;
-            (_f = (_e = this.handlers).onTagParams) == null ? void 0 : _f.call(_e, {
+            (_f = (_e = this.options).onTagParams) == null ? void 0 : _f.call(_e, {
               start: child.start - 1,
               end,
               value: {
@@ -2029,6 +2011,6 @@ function createParser(handlers) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  OpenTagEnding,
+  TagType,
   createParser
 });

package/dist/index.mjs

@@ -5,13 +5,13 @@ var __export = (target, all) => {
 };
 
 // src/util/constants.ts
-var OpenTagEnding = /* @__PURE__ */ ((OpenTagEnding2) => {
-  OpenTagEnding2[OpenTagEnding2["tag"] = 0] = "tag";
-  OpenTagEnding2[OpenTagEnding2["self"] = 1] = "self";
-  OpenTagEnding2[OpenTagEnding2["void"] = 2] = "void";
-  OpenTagEnding2[OpenTagEnding2["code"] = 4] = "code";
-  return OpenTagEnding2;
-})(OpenTagEnding || {});
+var TagType = /* @__PURE__ */ ((TagType2) => {
+  TagType2[TagType2["html"] = 0] = "html";
+  TagType2[TagType2["text"] = 1] = "text";
+  TagType2[TagType2["void"] = 2] = "void";
+  TagType2[TagType2["statement"] = 3] = "statement";
+  return TagType2;
+})(TagType || {});
 
 // src/util/util.ts
 function isWhitespaceCode(code) {
@@ -60,9 +60,9 @@ function htmlEOF() {
 
 // src/core/Parser.ts
 var Parser = class {
-  constructor(handlers) {
-    this.handlers = handlers;
-    this.handlers = handlers;
+  constructor(options) {
+    this.options = options;
+    this.options = options;
   }
   pos;
   maxPos;
@@ -153,13 +153,13 @@ var Parser = class {
     var _a, _b;
     const start = this.textPos;
     if (start !== -1) {
-      (_b = (_a = this.handlers).onText) == null ? void 0 : _b.call(_a, { start, end: this.pos });
+      (_b = (_a = this.options).onText) == null ? void 0 : _b.call(_a, { start, end: this.pos });
       this.textPos = -1;
     }
   }
   beginHtmlBlock(delimiter, singleLine) {
     var _a;
-    const content = this.enterState(((_a = this.activeTag) == null ? void 0 : _a.bodyMode) === 1 /* PARSED_TEXT */ ? states_exports.PARSED_TEXT_CONTENT : states_exports.HTML_CONTENT);
+    const content = this.enterState(((_a = this.activeTag) == null ? void 0 : _a.type) === 1 /* text */ ? states_exports.PARSED_TEXT_CONTENT : states_exports.HTML_CONTENT);
     content.singleLine = singleLine;
     content.delimiter = delimiter;
     content.indent = this.indent;
@@ -173,7 +173,7 @@ var Parser = class {
       start = range.start;
       end = range.end;
     }
-    (_b = (_a = this.handlers).onError) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onError) == null ? void 0 : _b.call(_a, {
       start,
       end,
       code,
@@ -187,7 +187,7 @@ var Parser = class {
     if (beginMixedMode)
       this.endingMixedModeAtEOL = true;
     this.activeTag = parentTag;
-    (_b = (_a = this.handlers).onCloseTag) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onCloseTag) == null ? void 0 : _b.call(_a, {
       start,
       end,
       value
@@ -434,7 +434,7 @@ var ATTRIBUTE = {
           start: child.start,
           end: child.end
         };
-        (_b = (_a = this.handlers).onAttrName) == null ? void 0 : _b.call(_a, attr.name);
+        (_b = (_a = this.options).onAttrName) == null ? void 0 : _b.call(_a, attr.name);
         break;
       }
       case 3 /* ARGUMENT */: {
@@ -456,7 +456,7 @@ var ATTRIBUTE = {
           };
         } else {
           attr.args = true;
-          (_d = (_c = this.handlers).onAttrArgs) == null ? void 0 : _d.call(_c, {
+          (_d = (_c = this.options).onAttrArgs) == null ? void 0 : _d.call(_c, {
             start,
             end,
             value
@@ -468,7 +468,7 @@ var ATTRIBUTE = {
         const params = attr.args;
         const start = params.start;
         const end = ++this.pos;
-        (_f = (_e = this.handlers).onAttrMethod) == null ? void 0 : _f.call(_e, {
+        (_f = (_e = this.options).onAttrMethod) == null ? void 0 : _f.call(_e, {
           start,
           end,
           params,
@@ -489,7 +489,7 @@ var ATTRIBUTE = {
           return this.emitError(child, "ILLEGAL_ATTRIBUTE_VALUE", "Missing value for attribute");
         }
         if (attr.spread) {
-          (_h = (_g = this.handlers).onAttrSpread) == null ? void 0 : _h.call(_g, {
+          (_h = (_g = this.options).onAttrSpread) == null ? void 0 : _h.call(_g, {
             start: attr.valueStart,
             end: child.end,
             value: {
@@ -498,7 +498,7 @@ var ATTRIBUTE = {
             }
           });
         } else {
-          (_j = (_i = this.handlers).onAttrValue) == null ? void 0 : _j.call(_i, {
+          (_j = (_i = this.options).onAttrValue) == null ? void 0 : _j.call(_i, {
             start: attr.valueStart,
             end: child.end,
             bound: attr.bound,
@@ -517,7 +517,7 @@ var ATTRIBUTE = {
 function ensureAttrName(parser, attr) {
   var _a, _b;
   if (!attr.name) {
-    (_b = (_a = parser.handlers).onAttrName) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = parser.options).onAttrName) == null ? void 0 : _b.call(_a, {
       start: attr.start,
       end: attr.start
     });
@@ -614,7 +614,7 @@ var CDATA = {
   },
   exit(cdata) {
     var _a, _b;
-    (_b = (_a = this.handlers).onCDATA) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onCDATA) == null ? void 0 : _b.call(_a, {
       start: cdata.start,
       end: cdata.end,
       value: {
@@ -762,11 +762,7 @@ var CONCISE_HTML_CONTENT = {
         return;
       }
       if (parentTag) {
-        if (parentTag.ending !== 0 /* tag */) {
-          this.emitError(this.pos, "INVALID_BODY", `The "${this.read(parentTag.tagName)}" tag does not allow nested body content`);
-          return;
-        }
-        if (parentTag.bodyMode === 1 /* PARSED_TEXT */ && code !== 45 /* HTML_BLOCK_DELIMITER */) {
+        if (parentTag.type === 1 /* text */ && code !== 45 /* HTML_BLOCK_DELIMITER */) {
           this.emitError(this.pos, "ILLEGAL_LINE_START", 'A line within a tag that only allows text content must begin with a "-" character');
           return;
         }
@@ -827,7 +823,7 @@ var CONCISE_HTML_CONTENT = {
     this.isConcise = true;
     switch (child.state) {
       case states_exports.JS_COMMENT_LINE:
-        (_b = (_a = this.handlers).onComment) == null ? void 0 : _b.call(_a, {
+        (_b = (_a = this.options).onComment) == null ? void 0 : _b.call(_a, {
           start: child.start,
           end: child.end,
           value: {
@@ -837,7 +833,7 @@ var CONCISE_HTML_CONTENT = {
         });
         break;
       case states_exports.JS_COMMENT_BLOCK: {
-        (_d = (_c = this.handlers).onComment) == null ? void 0 : _d.call(_c, {
+        (_d = (_c = this.options).onComment) == null ? void 0 : _d.call(_c, {
           start: child.start,
           end: child.end,
           value: {
@@ -889,7 +885,7 @@ function exitDeclaration(parser, declaration, closeOffset) {
   var _a, _b;
   parser.pos += closeOffset;
   parser.exitState();
-  (_b = (_a = parser.handlers).onDeclaration) == null ? void 0 : _b.call(_a, {
+  (_b = (_a = parser.options).onDeclaration) == null ? void 0 : _b.call(_a, {
     start: declaration.start,
     end: declaration.end,
     value: {
@@ -913,7 +909,7 @@ var DTD = {
   },
   exit(documentType) {
     var _a, _b;
-    (_b = (_a = this.handlers).onDoctype) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onDoctype) == null ? void 0 : _b.call(_a, {
       start: documentType.start,
       end: documentType.end,
       value: {
@@ -1051,7 +1047,7 @@ var EXPRESSION = {
   }
 };
 function buildOperatorPattern(isConcise) {
-  const binary = `[!~*%&^|?:]+|(?<=[!=<>&^~|/*?%+-])=|=(?=[!=<>&^~|/*?%+-])|(?<!\\+)\\s*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!-)${isConcise ? "-" : "\\s*-(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${isConcise ? "" : ">"}])|(?<!${isConcise ? "^\\s*|" : ""}\\.)\\.(?!\\.)|<${isConcise ? "{2,}|(?<!^\\s*)<" : "+"}|>${isConcise ? "+" : "{2,}"}|\\bin(?:stanceof)?(?=\\s+[^=/,;:>])`;
+  const binary = `[!~*%&^|?:]+|(?<=[!=<>&^~|/*?%+-])=|=(?=[!=<>&^~|/*?%+-])|(?<!\\+)\\s*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!^\\s*|-)-${isConcise ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${isConcise ? "" : ">"}])|(?<!${isConcise ? "^\\s*|" : ""}\\.)\\.(?!\\.)|<${isConcise ? "{2,}|(?<!^\\s*)<" : "+"}|>${isConcise ? "+" : "{2,}"}|\\bin(?:stanceof)?(?=\\s+[^=/,;:>])`;
   const unary = "\\b(?:a(?:sync|wait)|class|function|new|typeof|void)\\b";
   const lookAheadPattern = "\\s*(?:" + binary + `)\\s*|\\s+(?=[${isConcise ? "" : "["}{(])`;
   const lookBehindPattern = `(?<=${unary}|${binary})`;
@@ -1112,7 +1108,7 @@ var HTML_COMMENT = {
   },
   exit(comment) {
     var _a, _b;
-    (_b = (_a = this.handlers).onComment) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onComment) == null ? void 0 : _b.call(_a, {
       start: comment.start,
       end: comment.end,
       value: {
@@ -1242,7 +1238,7 @@ var INLINE_SCRIPT = {
   },
   exit(inlineScript) {
     var _a, _b;
-    (_b = (_a = this.handlers).onScriptlet) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onScriptlet) == null ? void 0 : _b.call(_a, {
       start: inlineScript.start,
       end: inlineScript.end,
       block: inlineScript.block,
@@ -1322,7 +1318,7 @@ var JS_COMMENT_LINE = {
   },
   char(code) {
     var _a;
-    if (!this.isConcise && code === 60 /* OPEN_ANGLE_BRACKET */ && ((_a = this.activeTag) == null ? void 0 : _a.bodyMode) === 1 /* PARSED_TEXT */) {
+    if (!this.isConcise && code === 60 /* OPEN_ANGLE_BRACKET */ && ((_a = this.activeTag) == null ? void 0 : _a.type) === 1 /* text */) {
       states_exports.checkForClosingTag(this);
     }
   },
@@ -1406,7 +1402,7 @@ var PLACEHOLDER = {
   },
   exit(placeholder) {
     var _a, _b;
-    (_b = (_a = this.handlers).onPlaceholder) == null ? void 0 : _b.call(_a, {
+    (_b = (_a = this.options).onPlaceholder) == null ? void 0 : _b.call(_a, {
       start: placeholder.start,
       end: placeholder.end,
       escape: placeholder.escape,
@@ -1542,23 +1538,6 @@ var STRING = {
 };
 
 // src/states/TAG_NAME.ts
-var VOID_TAGS = [
-  "area",
-  "base",
-  "br",
-  "col",
-  "hr",
-  "embed",
-  "img",
-  "input",
-  "link",
-  "meta",
-  "param",
-  "source",
-  "track",
-  "wbr"
-];
-var CODE_TAGS = ["import", "export", "static", "class"];
 var TAG_NAME = {
   name: "TAG_NAME",
   enter(parent, start) {
@@ -1583,7 +1562,7 @@ var TAG_NAME = {
           return this.emitError(tagName, "INVALID_TAG_SHORTHAND", "Multiple shorthand ID parts are not allowed on the same tag");
         }
         this.activeTag.hasShorthandId = true;
-        (_b = (_a = this.handlers).onTagShorthandId) == null ? void 0 : _b.call(_a, {
+        (_b = (_a = this.options).onTagShorthandId) == null ? void 0 : _b.call(_a, {
           start,
           end,
           quasis,
@@ -1591,7 +1570,7 @@ var TAG_NAME = {
         });
         break;
       case 46 /* PERIOD */:
-        (_d = (_c = this.handlers).onTagShorthandClass) == null ? void 0 : _d.call(_c, {
+        (_d = (_c = this.options).onTagShorthandClass) == null ? void 0 : _d.call(_c, {
           start,
           end,
           quasis,
@@ -1600,28 +1579,26 @@ var TAG_NAME = {
         break;
       default: {
         const tag = this.activeTag;
+        const tagType = (_f = (_e = this.options).onTagName) == null ? void 0 : _f.call(_e, {
+          start,
+          end,
+          quasis,
+          expressions,
+          concise: this.isConcise
+        });
         tag.tagName = tagName;
-        if (tagName.expressions.length === 0) {
-          if (this.matchAnyAtPos(tagName, VOID_TAGS)) {
-            tag.ending |= 2 /* void */;
-          } else if (this.matchAnyAtPos(tagName, CODE_TAGS)) {
+        if (tagType) {
+          tag.type = tagType;
+          if (tagType === 3 /* statement */) {
             if (!tag.concise) {
               return this.emitError(tagName, "RESERVED_TAG_NAME", `The "${this.read(tagName)}" tag is reserved and cannot be used as an HTML tag.`);
             }
             if (tag.parentTag) {
               return this.emitError(tagName, "ROOT_TAG_ONLY", `"${this.read(tagName)}" can only be used at the root of the template.`);
             }
-            tag.ending |= 4 /* code */;
             this.enterState(states_exports.EXPRESSION).terminatedByEOL = true;
           }
         }
-        (_f = (_e = this.handlers).onTagName) == null ? void 0 : _f.call(_e, {
-          start,
-          end,
-          quasis,
-          expressions,
-          concise: this.isConcise
-        });
         break;
       }
     }
@@ -1713,7 +1690,6 @@ var TEMPLATE_STRING = {
 };
 
 // src/states/OPEN_TAG.ts
-var PARSED_TEXT_TAGS = ["script", "style", "textarea", "html-comment"];
 var CONCISE_TAG_VAR_TERMINATORS = [
   59 /* SEMICOLON */,
   40 /* OPEN_PAREN */,
@@ -1734,6 +1710,7 @@ var OPEN_TAG = {
   enter(parent, start) {
     const tag = this.activeTag = {
       state: OPEN_TAG,
+      type: 0 /* html */,
       parent,
       start,
       end: start,
@@ -1744,11 +1721,10 @@ var OPEN_TAG = {
       hasShorthandId: false,
       hasArgs: false,
       hasAttrs: false,
+      selfClosed: false,
       shorthandEnd: -1,
       tagName: void 0,
-      ending: 0 /* tag */,
       concise: this.isConcise,
-      bodyMode: 0 /* HTML */,
       beginMixedMode: this.beginMixedMode || this.endingMixedModeAtEOL
     };
     this.beginMixedMode = false;
@@ -1758,21 +1734,27 @@ var OPEN_TAG = {
   },
   exit(tag) {
     var _a, _b;
-    const { tagName, ending } = tag;
-    (_b = (_a = this.handlers).onOpenTagEnd) == null ? void 0 : _b.call(_a, {
-      start: this.pos - (this.isConcise ? 0 : ending & 1 /* self */ ? 2 : 1),
+    const { selfClosed } = tag;
+    (_b = (_a = this.options).onOpenTagEnd) == null ? void 0 : _b.call(_a, {
+      start: this.pos - (this.isConcise ? 0 : selfClosed ? 2 : 1),
       end: this.pos,
-      ending
+      selfClosed
     });
-    if (!this.isConcise && ending !== 0 /* tag */) {
-      this.closeTag(this.pos, this.pos, void 0);
-    } else if (tagName.expressions.length === 0 && this.matchAnyAtPos(tagName, PARSED_TEXT_TAGS)) {
-      tag.bodyMode = 1 /* PARSED_TEXT */;
-      if (this.isConcise) {
-        this.enterState(states_exports.CONCISE_HTML_CONTENT);
-      } else {
-        this.enterState(states_exports.PARSED_TEXT_CONTENT);
+    switch (selfClosed ? 2 /* void */ : tag.type) {
+      case 2 /* void */:
+      case 3 /* statement */: {
+        if (tag.beginMixedMode)
+          this.endingMixedModeAtEOL = true;
+        this.activeTag = tag.parentTag;
+        break;
       }
+      case 1 /* text */:
+        if (this.isConcise) {
+          this.enterState(states_exports.CONCISE_HTML_CONTENT);
+        } else {
+          this.enterState(states_exports.PARSED_TEXT_CONTENT);
+        }
+        break;
     }
   },
   eol(_, tag) {
@@ -1871,7 +1853,7 @@ var OPEN_TAG = {
       this.exitState();
       return;
     } else if (code === 47 /* FORWARD_SLASH */ && this.lookAtCharCodeAhead(1) === 62 /* CLOSE_ANGLE_BRACKET */) {
-      tag.ending |= 1 /* self */;
+      tag.selfClosed = true;
       this.pos += 2;
       this.exitState();
       return;
@@ -1937,7 +1919,7 @@ var OPEN_TAG = {
             if (child.start === child.end) {
               return this.emitError(child, "MISSING_TAG_VARIABLE", "A slash was found that was not followed by a variable name or lhs expression");
             }
-            (_b = (_a = this.handlers).onTagVar) == null ? void 0 : _b.call(_a, {
+            (_b = (_a = this.options).onTagVar) == null ? void 0 : _b.call(_a, {
               start: child.start - 1,
               end: child.end,
               value: {
@@ -1962,7 +1944,7 @@ var OPEN_TAG = {
               this.pos--;
             } else {
               tag.hasArgs = true;
-              (_d = (_c = this.handlers).onTagArgs) == null ? void 0 : _d.call(_c, {
+              (_d = (_c = this.options).onTagArgs) == null ? void 0 : _d.call(_c, {
                 start,
                 end,
                 value
@@ -1972,7 +1954,7 @@ var OPEN_TAG = {
           }
           case 3 /* PARAMS */: {
             const end = ++this.pos;
-            (_f = (_e = this.handlers).onTagParams) == null ? void 0 : _f.call(_e, {
+            (_f = (_e = this.options).onTagParams) == null ? void 0 : _f.call(_e, {
               start: child.start - 1,
               end,
               value: {
@@ -2008,6 +1990,6 @@ function createParser(handlers) {
   };
 }
 export {
-  OpenTagEnding,
+  TagType,
   createParser
 };

package/dist/states/OPEN_TAG.d.ts

@@ -1,4 +1,4 @@
-import { StateDefinition, BODY_MODE, OpenTagEnding, Ranges, Meta } from "../internal";
+import { StateDefinition, Ranges, Meta, TagType } from "../internal";
 declare const enum TAG_STAGE {
     UNKNOWN = 0,
     VAR = 1,
@@ -7,7 +7,7 @@ declare const enum TAG_STAGE {
     ATTR_GROUP = 4
 }
 export interface OpenTagMeta extends Meta {
-    bodyMode: BODY_MODE;
+    type: TagType;
     stage: TAG_STAGE;
     concise: boolean;
     beginMixedMode?: boolean;
@@ -16,7 +16,7 @@ export interface OpenTagMeta extends Meta {
     hasArgs: boolean;
     hasAttrs: boolean;
     hasShorthandId: boolean;
-    ending: OpenTagEnding;
+    selfClosed: boolean;
     indent: string;
     nestedIndent: string | undefined;
     parentTag: OpenTagMeta | undefined;

package/dist/util/constants.d.ts

@@ -37,10 +37,6 @@ export declare const enum CODE {
     SPACE = 32,
     TAB = 9
 }
-export declare const enum BODY_MODE {
-    HTML = 0,
-    PARSED_TEXT = 1
-}
 export interface Position {
     /**
      * Line position in a document (zero-based).
@@ -94,19 +90,19 @@ export declare namespace Ranges {
         params: Value;
     }
     interface OpenTagEnd extends Range {
-        ending: OpenTagEnding;
+        selfClosed: boolean;
     }
     interface CloseTag extends Range {
         value: Range | undefined;
     }
 }
-export declare const enum OpenTagEnding {
-    tag = 0,
-    self = 1,
+export declare const enum TagType {
+    html = 0,
+    text = 1,
     void = 2,
-    code = 4
+    statement = 3
 }
-export interface Handlers {
+export interface ParserOptions {
     onError?(data: Ranges.Error): void;
     onText?(data: Range): void;
     onComment?(data: Ranges.Value): void;
@@ -115,7 +111,7 @@ export interface Handlers {
     onDoctype?(data: Ranges.Value): void;
     onScriptlet?(data: Ranges.Scriptlet): void;
     onPlaceholder?(data: Ranges.Placeholder): void;
-    onTagName?(data: Ranges.TagName): void;
+    onTagName?(data: Ranges.TagName): TagType | void;
     onTagShorthandId?(data: Ranges.Template): void;
     onTagShorthandClass?(data: Ranges.Template): void;
     onTagVar?(data: Ranges.Value): void;

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": "3.0.0",
+  "version": "3.2.1",
   "author": "Phillip Gates-Idem <phillip.idem@gmail.com>",
   "devDependencies": {
     "@commitlint/cli": "^16.2.3",
@@ -63,7 +63,7 @@
   "scripts": {
     "bench": "npm run build && node -r esbuild-register ./src/__tests__/bench",
     "build": "tsc -b && node -r esbuild-register build",
-    "ci:test": "nyc npm run mocha -- --forbid-pending --forbid-only",
+    "ci:test": "nyc npm run mocha -- --forbid-only",
     "format": "npm run lint:eslint -- --fix && npm run lint:prettier -- --write && (fixpack || true)",
     "lint": "tsc -b && npm run lint:eslint && npm run lint:prettier -- -l && fixpack",
     "lint:eslint": "eslint -f visualstudio .",