htmljs-parser 5.0.2 → 5.1.0

package/dist/core/Parser.d.ts

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

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { type ParserOptions, type Range } from "./internal";
-export { TagType, ErrorCode, type ParserOptions as Handlers, type Position, type Location, type Ranges, type Range, } from "./internal";
+export { TagType, ErrorCode, getLines, getLocation, getPosition, type ParserOptions as Handlers, type Position, type Location, type Ranges, type Range, } from "./internal";
 /**
  * Creates a new Marko parser.
  */

package/dist/index.js

@@ -21,7 +21,10 @@ var src_exports = {};
 __export(src_exports, {
   ErrorCode: () => ErrorCode,
   TagType: () => TagType,
-  createParser: () => createParser
+  createParser: () => createParser,
+  getLines: () => getLines,
+  getLocation: () => getLocation,
+  getPosition: () => getPosition
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -67,26 +70,13 @@ var TagType = /* @__PURE__ */ ((TagType2) => {
 function isWhitespaceCode(code) {
   return code <= 32 /* SPACE */;
 }
-function getLoc(lines, range) {
-  const start = getPos(lines, 0, range.start);
-  const end = range.start === range.end ? start : getPos(lines, start.line, range.end);
+function getLocation(lines, startOffset, endOffset) {
+  const start = getPosition(lines, startOffset);
+  const end = startOffset === endOffset ? start : getPosAfterLine(lines, start.line, endOffset);
   return { start, end };
 }
-function getPos(lines, startLine, index) {
-  let max = lines.length - 1;
-  let line = startLine;
-  while (line < max) {
-    const mid = 1 + line + max >>> 1;
-    if (lines[mid] <= index) {
-      line = mid;
-    } else {
-      max = mid - 1;
-    }
-  }
-  return {
-    line,
-    character: index - lines[line]
-  };
+function getPosition(lines, offset) {
+  return getPosAfterLine(lines, 0, offset);
 }
 function getLines(src) {
   const lines = [0];
@@ -107,6 +97,22 @@ function htmlEOF() {
     }
   }
 }
+function getPosAfterLine(lines, startLine, index) {
+  let max = lines.length - 1;
+  let line = startLine;
+  while (line < max) {
+    const mid = 1 + line + max >>> 1;
+    if (lines[mid] <= index) {
+      line = mid;
+    } else {
+      max = mid - 1;
+    }
+  }
+  return {
+    line,
+    character: index - lines[line]
+  };
+}
 
 // src/core/Parser.ts
 var Parser = class {
@@ -131,11 +137,11 @@ var Parser = class {
   read(range) {
     return this.data.slice(range.start, range.end);
   }
-  positionAt(index) {
-    return getPos(this.lines || (this.lines = getLines(this.data)), 0, index);
+  positionAt(offset) {
+    return getPosition(this.lines || (this.lines = getLines(this.data)), offset);
   }
   locationAt(range) {
-    return getLoc(this.lines || (this.lines = getLines(this.data)), range);
+    return getLocation(this.lines || (this.lines = getLines(this.data)), range.start, range.end);
   }
   enterState(state) {
     this.activeState = state;
@@ -1042,7 +1048,10 @@ var EXPRESSION = {
             this.pos++;
             break;
           default: {
-            if (!canCharCodeBeFollowedByDivision(this.getPreviousNonWhitespaceCharCode())) {
+            if (canCharCodeBeFollowedByDivision(this.getPreviousNonWhitespaceCharCode())) {
+              this.pos++;
+              this.consumeWhitespace();
+            } else {
               this.enterState(states_exports.REGULAR_EXPRESSION);
             }
             break;
@@ -1103,9 +1112,9 @@ var EXPRESSION = {
 };
 function buildPattern(type) {
   const space = type === 1 /* CONCISE_ATTRS */ ? "[ \\t]" : "\\s";
-  const binary = `(?:[!~*%&^|?<]+=*)+|:+(?!=)|[>/+=-]+=|=>|(?<!\\+)[ \\t]*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!-)-${type === 1 /* CONCISE_ATTRS */ ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${type === 0 /* HTML_ATTRS */ ? ">" : ""}])|(?<!\\.)\\.(?!\\.)|>${type === 0 /* HTML_ATTRS */ ? "{2,}" : "+"}|[ \\t]+(?:in(?:stanceof)?|as|extends)(?=[ \\t]+[^=/,;:>])`;
+  const binary = `(?:[!~*%&^|?<]+=*)+|:+(?!=)|[>/+=-]+=|=>|(?<!\\+)[ \\t]*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!-)-${type === 1 /* CONCISE_ATTRS */ ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<!\\.)\\.(?!\\.)|>${type === 0 /* HTML_ATTRS */ ? "{2,}" : "+"}|[ \\t]+(?:in(?:stanceof)?|as|extends)(?=[ \\t]+[^=/,;:>])`;
   const unary = "\\b(?<![.]\\s*)(?:a(?:sync|wait)|keyof|class|function|new|typeof|void)\\b";
-  const lookAheadPattern = `${space}*(?:${binary})\\s*|${space}+(?=[{(])`;
+  const lookAheadPattern = `${space}*(?:${binary})\\s*|${space}+(?=[{(]|/[^>])`;
   const lookBehindPattern = `(?<=${unary}|${binary})`;
   return new RegExp(`${lookAheadPattern}|${lookBehindPattern}`, "ym");
 }
@@ -1807,6 +1816,7 @@ var CONCISE_TAG_VAR_TERMINATORS = [
   40 /* OPEN_PAREN */,
   124 /* PIPE */,
   61 /* EQUAL */,
+  44 /* COMMA */,
   [58 /* COLON */, 61 /* EQUAL */]
 ];
 var HTML_TAG_VAR_TERMINATORS = [
@@ -1814,6 +1824,7 @@ var HTML_TAG_VAR_TERMINATORS = [
   40 /* OPEN_PAREN */,
   124 /* PIPE */,
   61 /* EQUAL */,
+  44 /* COMMA */,
   [58 /* COLON */, 61 /* EQUAL */],
   [47 /* FORWARD_SLASH */, 62 /* CLOSE_ANGLE_BRACKET */]
 ];
@@ -2114,5 +2125,8 @@ function createParser(handlers) {
 0 && (module.exports = {
   ErrorCode,
   TagType,
-  createParser
+  createParser,
+  getLines,
+  getLocation,
+  getPosition
 });

package/dist/index.mjs

@@ -46,26 +46,13 @@ var TagType = /* @__PURE__ */ ((TagType2) => {
 function isWhitespaceCode(code) {
   return code <= 32 /* SPACE */;
 }
-function getLoc(lines, range) {
-  const start = getPos(lines, 0, range.start);
-  const end = range.start === range.end ? start : getPos(lines, start.line, range.end);
+function getLocation(lines, startOffset, endOffset) {
+  const start = getPosition(lines, startOffset);
+  const end = startOffset === endOffset ? start : getPosAfterLine(lines, start.line, endOffset);
   return { start, end };
 }
-function getPos(lines, startLine, index) {
-  let max = lines.length - 1;
-  let line = startLine;
-  while (line < max) {
-    const mid = 1 + line + max >>> 1;
-    if (lines[mid] <= index) {
-      line = mid;
-    } else {
-      max = mid - 1;
-    }
-  }
-  return {
-    line,
-    character: index - lines[line]
-  };
+function getPosition(lines, offset) {
+  return getPosAfterLine(lines, 0, offset);
 }
 function getLines(src) {
   const lines = [0];
@@ -86,6 +73,22 @@ function htmlEOF() {
     }
   }
 }
+function getPosAfterLine(lines, startLine, index) {
+  let max = lines.length - 1;
+  let line = startLine;
+  while (line < max) {
+    const mid = 1 + line + max >>> 1;
+    if (lines[mid] <= index) {
+      line = mid;
+    } else {
+      max = mid - 1;
+    }
+  }
+  return {
+    line,
+    character: index - lines[line]
+  };
+}
 
 // src/core/Parser.ts
 var Parser = class {
@@ -110,11 +113,11 @@ var Parser = class {
   read(range) {
     return this.data.slice(range.start, range.end);
   }
-  positionAt(index) {
-    return getPos(this.lines || (this.lines = getLines(this.data)), 0, index);
+  positionAt(offset) {
+    return getPosition(this.lines || (this.lines = getLines(this.data)), offset);
   }
   locationAt(range) {
-    return getLoc(this.lines || (this.lines = getLines(this.data)), range);
+    return getLocation(this.lines || (this.lines = getLines(this.data)), range.start, range.end);
   }
   enterState(state) {
     this.activeState = state;
@@ -1021,7 +1024,10 @@ var EXPRESSION = {
             this.pos++;
             break;
           default: {
-            if (!canCharCodeBeFollowedByDivision(this.getPreviousNonWhitespaceCharCode())) {
+            if (canCharCodeBeFollowedByDivision(this.getPreviousNonWhitespaceCharCode())) {
+              this.pos++;
+              this.consumeWhitespace();
+            } else {
               this.enterState(states_exports.REGULAR_EXPRESSION);
             }
             break;
@@ -1082,9 +1088,9 @@ var EXPRESSION = {
 };
 function buildPattern(type) {
   const space = type === 1 /* CONCISE_ATTRS */ ? "[ \\t]" : "\\s";
-  const binary = `(?:[!~*%&^|?<]+=*)+|:+(?!=)|[>/+=-]+=|=>|(?<!\\+)[ \\t]*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!-)-${type === 1 /* CONCISE_ATTRS */ ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<![/*])/(?![/*${type === 0 /* HTML_ATTRS */ ? ">" : ""}])|(?<!\\.)\\.(?!\\.)|>${type === 0 /* HTML_ATTRS */ ? "{2,}" : "+"}|[ \\t]+(?:in(?:stanceof)?|as|extends)(?=[ \\t]+[^=/,;:>])`;
+  const binary = `(?:[!~*%&^|?<]+=*)+|:+(?!=)|[>/+=-]+=|=>|(?<!\\+)[ \\t]*\\+(?:\\s*\\+\\s*\\+)*\\s*(?!\\+)|(?<!-)-${type === 1 /* CONCISE_ATTRS */ ? "" : "(?:\\s*-\\s*-)*\\s*"}(?!-)|(?<!\\.)\\.(?!\\.)|>${type === 0 /* HTML_ATTRS */ ? "{2,}" : "+"}|[ \\t]+(?:in(?:stanceof)?|as|extends)(?=[ \\t]+[^=/,;:>])`;
   const unary = "\\b(?<![.]\\s*)(?:a(?:sync|wait)|keyof|class|function|new|typeof|void)\\b";
-  const lookAheadPattern = `${space}*(?:${binary})\\s*|${space}+(?=[{(])`;
+  const lookAheadPattern = `${space}*(?:${binary})\\s*|${space}+(?=[{(]|/[^>])`;
   const lookBehindPattern = `(?<=${unary}|${binary})`;
   return new RegExp(`${lookAheadPattern}|${lookBehindPattern}`, "ym");
 }
@@ -1786,6 +1792,7 @@ var CONCISE_TAG_VAR_TERMINATORS = [
   40 /* OPEN_PAREN */,
   124 /* PIPE */,
   61 /* EQUAL */,
+  44 /* COMMA */,
   [58 /* COLON */, 61 /* EQUAL */]
 ];
 var HTML_TAG_VAR_TERMINATORS = [
@@ -1793,6 +1800,7 @@ var HTML_TAG_VAR_TERMINATORS = [
   40 /* OPEN_PAREN */,
   124 /* PIPE */,
   61 /* EQUAL */,
+  44 /* COMMA */,
   [58 /* COLON */, 61 /* EQUAL */],
   [47 /* FORWARD_SLASH */, 62 /* CLOSE_ANGLE_BRACKET */]
 ];
@@ -2092,5 +2100,8 @@ function createParser(handlers) {
 export {
   ErrorCode,
   TagType,
-  createParser
+  createParser,
+  getLines,
+  getLocation,
+  getPosition
 };

package/dist/util/util.d.ts

@@ -1,7 +1,17 @@
 import { type Parser } from "../internal";
-import { Location, Position, Range } from "./constants";
+import { Location, Position } from "./constants";
 export declare function isWhitespaceCode(code: number): boolean;
-export declare function getLoc(lines: number[], range: Range): Location;
-export declare function getPos(lines: number[], startLine: number, index: number): Position;
+/**
+ * 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.
+ */
+export declare function getLocation(lines: number[], startOffset: number, endOffset: number): Location;
+/**
+ * Given a source code line offsets and an offset, returns a Position object with line & character information.
+ */
+export declare function getPosition(lines: number[], offset: number): Position;
+/**
+ * Scan through some source code and generate an array of offsets for each newline.
+ * Useful for generating line/column information for source code.
+ */
 export declare function getLines(src: string): number[];
 export declare function htmlEOF(this: Parser): 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": "5.0.2",
+  "version": "5.1.0",
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.4",
     "@changesets/cli": "^2.22.0",