astro-eslint-parser 1.3.0 → 1.3.2

package/lib/index.d.mts

@@ -314,7 +314,7 @@ declare class ParseError extends SyntaxError {
 }
 
 var name = "astro-eslint-parser";
-var version = "1.3.0";
+var version = "1.3.2";
 
 declare const meta_name: typeof name;
 declare const meta_version: typeof version;

package/lib/index.d.ts

@@ -314,7 +314,7 @@ declare class ParseError extends SyntaxError {
 }
 
 var name = "astro-eslint-parser";
-var version = "1.3.0";
+var version = "1.3.2";
 
 declare const meta_name: typeof name;
 declare const meta_version: typeof version;

package/lib/index.js

@@ -2282,25 +2282,93 @@ function parse2(code, ctx) {
 }
 function adjustHTML(ast, htmlElement, ctx) {
   const htmlEnd = ctx.code.indexOf("</html");
-  if (htmlEnd == null) {
+  if (htmlEnd < 0) {
     return;
   }
+  const isOffsetAfter = buildComparableOffsetComparator(ctx.code);
   const hasTokenAfter = Boolean(ctx.code.slice(htmlEnd + 7).trim());
   const children = [...htmlElement.children];
   for (const child of children) {
     const offset = child.position?.start.offset;
     if (hasTokenAfter && offset != null) {
-      if (htmlEnd <= offset) {
+      if (isOffsetAfter(offset, htmlEnd)) {
         htmlElement.children.splice(htmlElement.children.indexOf(child), 1);
         ast.children.push(child);
       }
     }
     if (child.type === "element" && child.name === "body") {
-      adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfter, child, ctx);
+      adjustHTMLBody(
+        ast,
+        htmlElement,
+        htmlEnd,
+        hasTokenAfter,
+        child,
+        ctx,
+        isOffsetAfter
+      );
     }
   }
+  function buildComparableOffsetComparator(code) {
+    let remapOffset;
+    const comparableOffsetCache = /* @__PURE__ */ new Map();
+    return (offset, threshold) => {
+      if (threshold > offset) {
+        return false;
+      }
+      let comparableOffset = comparableOffsetCache.get(offset);
+      if (comparableOffset == null) {
+        remapOffset || (remapOffset = buildComparableOffsetRemapper(code));
+        comparableOffset = remapOffset(offset);
+        comparableOffsetCache.set(offset, comparableOffset);
+      }
+      return threshold <= comparableOffset;
+    };
+  }
+  function buildComparableOffsetRemapper(code) {
+    let byteOffsets, codeUnitOffsets;
+    for (let index = 0, byteOffset = 0; index < code.length; ) {
+      const codePoint = code.codePointAt(index);
+      const codeUnitLength = codePoint > 65535 ? 2 : 1;
+      const nextIndex = index + codeUnitLength;
+      const nextByteOffset = byteOffset + getUTF8ByteLength(codePoint);
+      if (byteOffsets) {
+        byteOffsets.push(nextByteOffset);
+        codeUnitOffsets.push(nextIndex);
+      } else if (codePoint > 127) {
+        byteOffsets = [0];
+        codeUnitOffsets = [0];
+        for (let asciiOffset = 1; asciiOffset <= index; asciiOffset++) {
+          byteOffsets.push(asciiOffset);
+          codeUnitOffsets.push(asciiOffset);
+        }
+        byteOffsets.push(nextByteOffset);
+        codeUnitOffsets.push(nextIndex);
+      }
+      index = nextIndex;
+      byteOffset = nextByteOffset;
+    }
+    if (!byteOffsets || !codeUnitOffsets) {
+      return (offset) => offset;
+    }
+    return (offset) => {
+      const index = sortedLastIndex(byteOffsets, (target) => target - offset) - 1;
+      return codeUnitOffsets[Math.max(index, 0)];
+    };
+  }
+  function getUTF8ByteLength(codePoint) {
+    if (codePoint <= 127) {
+      return 1;
+    }
+    if (codePoint <= 2047) {
+      return 2;
+    }
+    if (codePoint <= 65535) {
+      return 3;
+    }
+    return 4;
+  }
 }
-function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyElement, ctx) {
+function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyElement, ctx, isOffsetAfter) {
   const bodyEnd = ctx.code.indexOf("</body");
   if (bodyEnd == null) {
     return;
@@ -2312,15 +2380,13 @@ function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyEle
   const children = [...bodyElement.children];
   for (const child of children) {
     const offset = child.position?.start.offset;
-    if (offset != null) {
-      if (bodyEnd <= offset) {
-        if (hasTokenAfterHtmlEnd && htmlEnd <= offset) {
-          bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
-          ast.children.push(child);
-        } else if (hasTokenAfter) {
-          bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
-          htmlElement.children.push(child);
-        }
+    if (offset != null && isOffsetAfter(offset, bodyEnd)) {
+      if (hasTokenAfterHtmlEnd && isOffsetAfter(offset, htmlEnd)) {
+        bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
+        ast.children.push(child);
+      } else if (hasTokenAfter) {
+        bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
+        htmlElement.children.push(child);
       }
     }
   }
@@ -2874,7 +2940,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "1.3.0";
+var version = "1.3.2";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/lib/index.mjs

@@ -2257,25 +2257,93 @@ function parse2(code, ctx) {
 }
 function adjustHTML(ast, htmlElement, ctx) {
   const htmlEnd = ctx.code.indexOf("</html");
-  if (htmlEnd == null) {
+  if (htmlEnd < 0) {
     return;
   }
+  const isOffsetAfter = buildComparableOffsetComparator(ctx.code);
   const hasTokenAfter = Boolean(ctx.code.slice(htmlEnd + 7).trim());
   const children = [...htmlElement.children];
   for (const child of children) {
     const offset = child.position?.start.offset;
     if (hasTokenAfter && offset != null) {
-      if (htmlEnd <= offset) {
+      if (isOffsetAfter(offset, htmlEnd)) {
         htmlElement.children.splice(htmlElement.children.indexOf(child), 1);
         ast.children.push(child);
       }
     }
     if (child.type === "element" && child.name === "body") {
-      adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfter, child, ctx);
+      adjustHTMLBody(
+        ast,
+        htmlElement,
+        htmlEnd,
+        hasTokenAfter,
+        child,
+        ctx,
+        isOffsetAfter
+      );
     }
   }
+  function buildComparableOffsetComparator(code) {
+    let remapOffset;
+    const comparableOffsetCache = /* @__PURE__ */ new Map();
+    return (offset, threshold) => {
+      if (threshold > offset) {
+        return false;
+      }
+      let comparableOffset = comparableOffsetCache.get(offset);
+      if (comparableOffset == null) {
+        remapOffset || (remapOffset = buildComparableOffsetRemapper(code));
+        comparableOffset = remapOffset(offset);
+        comparableOffsetCache.set(offset, comparableOffset);
+      }
+      return threshold <= comparableOffset;
+    };
+  }
+  function buildComparableOffsetRemapper(code) {
+    let byteOffsets, codeUnitOffsets;
+    for (let index = 0, byteOffset = 0; index < code.length; ) {
+      const codePoint = code.codePointAt(index);
+      const codeUnitLength = codePoint > 65535 ? 2 : 1;
+      const nextIndex = index + codeUnitLength;
+      const nextByteOffset = byteOffset + getUTF8ByteLength(codePoint);
+      if (byteOffsets) {
+        byteOffsets.push(nextByteOffset);
+        codeUnitOffsets.push(nextIndex);
+      } else if (codePoint > 127) {
+        byteOffsets = [0];
+        codeUnitOffsets = [0];
+        for (let asciiOffset = 1; asciiOffset <= index; asciiOffset++) {
+          byteOffsets.push(asciiOffset);
+          codeUnitOffsets.push(asciiOffset);
+        }
+        byteOffsets.push(nextByteOffset);
+        codeUnitOffsets.push(nextIndex);
+      }
+      index = nextIndex;
+      byteOffset = nextByteOffset;
+    }
+    if (!byteOffsets || !codeUnitOffsets) {
+      return (offset) => offset;
+    }
+    return (offset) => {
+      const index = sortedLastIndex(byteOffsets, (target) => target - offset) - 1;
+      return codeUnitOffsets[Math.max(index, 0)];
+    };
+  }
+  function getUTF8ByteLength(codePoint) {
+    if (codePoint <= 127) {
+      return 1;
+    }
+    if (codePoint <= 2047) {
+      return 2;
+    }
+    if (codePoint <= 65535) {
+      return 3;
+    }
+    return 4;
+  }
 }
-function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyElement, ctx) {
+function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyElement, ctx, isOffsetAfter) {
   const bodyEnd = ctx.code.indexOf("</body");
   if (bodyEnd == null) {
     return;
@@ -2287,15 +2355,13 @@ function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyEle
   const children = [...bodyElement.children];
   for (const child of children) {
     const offset = child.position?.start.offset;
-    if (offset != null) {
-      if (bodyEnd <= offset) {
-        if (hasTokenAfterHtmlEnd && htmlEnd <= offset) {
-          bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
-          ast.children.push(child);
-        } else if (hasTokenAfter) {
-          bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
-          htmlElement.children.push(child);
-        }
+    if (offset != null && isOffsetAfter(offset, bodyEnd)) {
+      if (hasTokenAfterHtmlEnd && isOffsetAfter(offset, htmlEnd)) {
+        bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
+        ast.children.push(child);
+      } else if (hasTokenAfter) {
+        bodyElement.children.splice(bodyElement.children.indexOf(child), 1);
+        htmlElement.children.push(child);
       }
     }
   }
@@ -2849,7 +2915,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "1.3.0";
+var version = "1.3.2";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Astro component parser for ESLint",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -21,11 +21,11 @@
     "cover": "nyc --reporter=lcov npm run test",
     "debug": "npm run mocha -- \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
     "preversion": "npm run lint && npm test",
-    "update-fixtures": "env-cmd -e debug npm run ts -- ./tools/update-fixtures.ts",
+    "update-fixtures": "env-cmd -e debug -- npm run ts -- ./tools/update-fixtures.ts",
     "debug-parser": "npm run ts -- ./tools/parser-test.ts",
     "eslint-playground": "eslint tests/fixtures --ext .astro --config .eslintrc-for-playground.js --format codeframe",
     "benchmark": "npm run ts -- benchmark/index.ts",
-    "ts": "env-cmd -e basic node -r esbuild-register",
+    "ts": "env-cmd -e basic -- node -r esbuild-register",
     "mocha": "npm run ts -- ./node_modules/mocha/bin/mocha.js",
     "prerelease": "npm run clean && npm run build",
     "release": "changeset publish"
@@ -53,7 +53,7 @@
     "@typescript-eslint/types": "^7.0.0 || ^8.0.0",
     "astrojs-compiler-sync": "^1.0.0",
     "debug": "^4.3.4",
-    "entities": "^6.0.0",
+    "entities": "^7.0.0",
     "eslint-scope": "^8.0.1",
     "eslint-visitor-keys": "^4.0.0",
     "espree": "^10.0.0",
@@ -62,7 +62,7 @@
     "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@changesets/changelog-github": "^0.5.0",
+    "@changesets/changelog-github": "^0.6.0",
     "@changesets/cli": "^2.24.2",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
     "@ota-meshi/eslint-plugin": "^0.20.0",
@@ -74,48 +74,48 @@
     "@types/eslint-visitor-keys": "^3.0.0",
     "@types/is-glob": "^4.0.4",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^22.0.0",
+    "@types/node": "^24.0.0",
     "@types/semver": "^7.3.9",
     "@typescript-eslint/eslint-plugin": "^8.21.0",
     "@typescript-eslint/parser": "^8.21.0",
     "@typescript-eslint/typescript-estree": "^8.21.0",
-    "astro": "^5.0.0",
+    "astro": "^6.0.0",
     "astro-eslint-parser": ">=0.1.0",
     "benchmark": "^2.1.4",
-    "chai": "^5.0.0",
-    "env-cmd": "^10.1.0",
-    "esbuild": "^0.25.0",
+    "chai": "^6.0.0",
+    "env-cmd": "^11.0.0",
+    "esbuild": "^0.27.0",
     "esbuild-register": "^3.3.3",
     "eslint": "^9.19.0",
     "eslint-config-prettier": "^10.0.0",
     "eslint-formatter-codeframe": "^7.32.1",
     "eslint-plugin-astro": "^1.0.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-jsdoc": "^50.6.3",
-    "eslint-plugin-json-schema-validator": "^5.0.0",
-    "eslint-plugin-jsonc": "^2.0.0",
+    "eslint-plugin-jsdoc": "^62.0.0",
+    "eslint-plugin-json-schema-validator": "^6.0.0",
+    "eslint-plugin-jsonc": "^3.0.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-node-dependencies": "^1.0.0",
+    "eslint-plugin-node-dependencies": "^2.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.29.4",
-    "eslint-plugin-regexp": "^2.0.0",
+    "eslint-plugin-regexp": "^3.0.0",
     "eslint-plugin-simple-import-sort": "^12.0.0",
     "eslint-plugin-svelte": "^3.0.0-0",
     "estree-walker": "^3.0.0",
-    "globals": "^16.0.0",
+    "globals": "^17.0.0",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.0",
     "mocha": "^11.0.0",
     "mocha-chai-jest-snapshot": "^1.1.3",
-    "nyc": "^17.0.0",
+    "nyc": "^18.0.0",
     "prettier": "^3.0.0",
     "prettier-plugin-astro": "^0.14.0",
     "prettier-plugin-svelte": "^3.0.0",
     "string-replace-loader": "^3.0.3",
     "svelte": "^5.19.3",
     "tsup": "^8.0.0",
-    "typescript": "~5.8.0",
+    "typescript": "~5.9.0",
     "typescript-eslint": "^8.21.0",
     "typescript-eslint-parser-for-extra-files": "^0.9.0"
   },