astro-eslint-parser 1.2.1 → 1.3.0

package/lib/index.d.mts

@@ -314,7 +314,7 @@ declare class ParseError extends SyntaxError {
 }
 
 var name = "astro-eslint-parser";
-var version = "1.2.1";
+var version = "1.3.0";
 
 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.2.1";
+var version = "1.3.0";
 
 declare const meta_name: typeof name;
 declare const meta_version: typeof version;

package/lib/index.js

@@ -513,7 +513,6 @@ function isTSESLintParserObject(value) {
 // src/parser/script.ts
 var import_types = require("@typescript-eslint/types");
 var import_scope_manager2 = require("@typescript-eslint/scope-manager");
-var import_eslint_scope = require("eslint-scope");
 
 // src/traverse.ts
 function fallbackKeysFilter(key) {
@@ -848,7 +847,52 @@ function addReference(list, reference) {
   );
 }
 
+// src/parser/eslint-scope.ts
+var eslintScope = __toESM(require("eslint-scope"));
+var import_semver2 = __toESM(require("semver"));
+var import_path3 = __toESM(require("path"));
+var import_module3 = require("module");
+var eslintScopeCache = null;
+function getEslintScope() {
+  return eslintScopeCache ?? (eslintScopeCache = getNewest());
+}
+function getNewest() {
+  let newest = eslintScope;
+  const userEslintScope = getEslintScopeFromUser();
+  if (userEslintScope && userEslintScope.version != null && import_semver2.default.lte(newest.version, userEslintScope.version)) {
+    newest = userEslintScope;
+  }
+  const eslintEslintScope = getEslintScopeFromEslint();
+  if (eslintEslintScope && eslintEslintScope.version != null && import_semver2.default.lte(newest.version, eslintEslintScope.version)) {
+    newest = eslintEslintScope;
+  }
+  return newest;
+}
+function getEslintScopeFromUser() {
+  try {
+    const cwd = process.cwd();
+    const relativeTo = import_path3.default.join(cwd, "__placeholder__.js");
+    return (0, import_module3.createRequire)(relativeTo)("eslint-scope");
+  } catch {
+    return null;
+  }
+}
+function getEslintScopeFromEslint() {
+  try {
+    const cwd = process.cwd();
+    const requireFromUser = (0, import_module3.createRequire)(import_path3.default.join(cwd, "__placeholder__.js"));
+    const eslintPackagePath = requireFromUser.resolve("eslint/package.json");
+    const requireFromEslint = (0, import_module3.createRequire)(
+      eslintPackagePath.replace(/package\.json$/, "__placeholder__.js")
+    );
+    return requireFromEslint("eslint-scope");
+  } catch {
+    return null;
+  }
+}
+
 // src/parser/script.ts
+var eslintScope2 = getEslintScope();
 function parseScript(code, ctx, parserOptionsCtx) {
   const result = parseScriptInternal(code, ctx, parserOptionsCtx);
   const parserOptions = parserOptionsCtx.parserOptions;
@@ -914,7 +958,7 @@ ${code}`
     patchResult?.terminate();
   }
 }
-var Referencer = class extends import_eslint_scope.Referencer {
+var Referencer = class extends eslintScope2.Referencer {
   JSXAttribute(node) {
     this.visit(node.value);
   }
@@ -973,7 +1017,7 @@ function analyzeForEcmaScript(tree, providedOptions) {
     },
     providedOptions
   );
-  const scopeManager = new import_eslint_scope.ScopeManager(
+  const scopeManager = new eslintScope2.ScopeManager(
     // @ts-expect-error -- No typings
     options
   );
@@ -1327,6 +1371,14 @@ function getTokenInfo(ctx, tokens, position) {
     while (searchOffset < search.length) {
       const searchChar = search[searchOffset];
       if (ctx.code[codeOffset] === searchChar) {
+        if (searchChar === "&") {
+          const entityCandidate = ctx.code.slice(codeOffset, codeOffset + 5);
+          if (entityCandidate === "&amp;" || entityCandidate === "&AMP;") {
+            codeOffset += 5;
+            searchOffset++;
+            continue;
+          }
+        }
         codeOffset++;
         searchOffset++;
         continue;
@@ -2543,18 +2595,18 @@ function remap(result, normalized, originalCode, ctxForAstro) {
 }
 
 // src/context/parser-options.ts
-var import_path4 = __toESM(require("path"));
+var import_path5 = __toESM(require("path"));
 var import_fs2 = __toESM(require("fs"));
 
 // src/context/resolve-parser/espree.ts
-var import_module3 = require("module");
-var import_path3 = __toESM(require("path"));
+var import_module4 = require("module");
+var import_path4 = __toESM(require("path"));
 var espreeCache = null;
 function isLinterPath(p) {
   return (
     // ESLint 6 and above
-    p.includes(`eslint${import_path3.default.sep}lib${import_path3.default.sep}linter${import_path3.default.sep}linter.js`) || // ESLint 5
-    p.includes(`eslint${import_path3.default.sep}lib${import_path3.default.sep}linter.js`)
+    p.includes(`eslint${import_path4.default.sep}lib${import_path4.default.sep}linter${import_path4.default.sep}linter.js`) || // ESLint 5
+    p.includes(`eslint${import_path4.default.sep}lib${import_path4.default.sep}linter.js`)
   );
 }
 function getEspree() {
@@ -2562,7 +2614,7 @@ function getEspree() {
     const linterPath = Object.keys(require.cache || {}).find(isLinterPath);
     if (linterPath) {
       try {
-        espreeCache = (0, import_module3.createRequire)(linterPath)("espree");
+        espreeCache = (0, import_module4.createRequire)(linterPath)("espree");
       } catch {
       }
     }
@@ -2658,7 +2710,7 @@ var ParserOptionsContext = class {
     if (TS_PARSER_NAMES.some((nm) => parserName.includes(nm))) {
       let targetPath = parserName;
       while (targetPath) {
-        const pkgPath = import_path4.default.join(targetPath, "package.json");
+        const pkgPath = import_path5.default.join(targetPath, "package.json");
         if (import_fs2.default.existsSync(pkgPath)) {
           try {
             const pkgName = JSON.parse(import_fs2.default.readFileSync(pkgPath, "utf-8"))?.name;
@@ -2673,7 +2725,7 @@ var ParserOptionsContext = class {
             return null;
           }
         }
-        const parent = import_path4.default.dirname(targetPath);
+        const parent = import_path5.default.dirname(targetPath);
         if (targetPath === parent) {
           break;
         }
@@ -2822,7 +2874,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "1.2.1";
+var version = "1.3.0";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/lib/index.mjs

@@ -485,10 +485,6 @@ import {
   analyze as analyzeForTypeScript,
   Reference
 } from "@typescript-eslint/scope-manager";
-import {
-  Referencer as BaseReferencer,
-  ScopeManager
-} from "eslint-scope";
 
 // src/traverse.ts
 function fallbackKeysFilter(key) {
@@ -826,7 +822,52 @@ function addReference(list, reference) {
   );
 }
 
+// src/parser/eslint-scope.ts
+import * as eslintScope from "eslint-scope";
+import semver from "semver";
+import path5 from "path";
+import { createRequire as createRequire3 } from "module";
+var eslintScopeCache = null;
+function getEslintScope() {
+  return eslintScopeCache ?? (eslintScopeCache = getNewest());
+}
+function getNewest() {
+  let newest = eslintScope;
+  const userEslintScope = getEslintScopeFromUser();
+  if (userEslintScope && userEslintScope.version != null && semver.lte(newest.version, userEslintScope.version)) {
+    newest = userEslintScope;
+  }
+  const eslintEslintScope = getEslintScopeFromEslint();
+  if (eslintEslintScope && eslintEslintScope.version != null && semver.lte(newest.version, eslintEslintScope.version)) {
+    newest = eslintEslintScope;
+  }
+  return newest;
+}
+function getEslintScopeFromUser() {
+  try {
+    const cwd = process.cwd();
+    const relativeTo = path5.join(cwd, "__placeholder__.js");
+    return createRequire3(relativeTo)("eslint-scope");
+  } catch {
+    return null;
+  }
+}
+function getEslintScopeFromEslint() {
+  try {
+    const cwd = process.cwd();
+    const requireFromUser = createRequire3(path5.join(cwd, "__placeholder__.js"));
+    const eslintPackagePath = requireFromUser.resolve("eslint/package.json");
+    const requireFromEslint = createRequire3(
+      eslintPackagePath.replace(/package\.json$/, "__placeholder__.js")
+    );
+    return requireFromEslint("eslint-scope");
+  } catch {
+    return null;
+  }
+}
+
 // src/parser/script.ts
+var eslintScope2 = getEslintScope();
 function parseScript(code, ctx, parserOptionsCtx) {
   const result = parseScriptInternal(code, ctx, parserOptionsCtx);
   const parserOptions = parserOptionsCtx.parserOptions;
@@ -892,7 +933,7 @@ ${code}`
     patchResult?.terminate();
   }
 }
-var Referencer = class extends BaseReferencer {
+var Referencer = class extends eslintScope2.Referencer {
   JSXAttribute(node) {
     this.visit(node.value);
   }
@@ -951,7 +992,7 @@ function analyzeForEcmaScript(tree, providedOptions) {
     },
     providedOptions
   );
-  const scopeManager = new ScopeManager(
+  const scopeManager = new eslintScope2.ScopeManager(
     // @ts-expect-error -- No typings
     options
   );
@@ -1305,6 +1346,14 @@ function getTokenInfo(ctx, tokens, position) {
     while (searchOffset < search.length) {
       const searchChar = search[searchOffset];
       if (ctx.code[codeOffset] === searchChar) {
+        if (searchChar === "&") {
+          const entityCandidate = ctx.code.slice(codeOffset, codeOffset + 5);
+          if (entityCandidate === "&amp;" || entityCandidate === "&AMP;") {
+            codeOffset += 5;
+            searchOffset++;
+            continue;
+          }
+        }
         codeOffset++;
         searchOffset++;
         continue;
@@ -2521,18 +2570,18 @@ function remap(result, normalized, originalCode, ctxForAstro) {
 }
 
 // src/context/parser-options.ts
-import path6 from "path";
+import path7 from "path";
 import fs3 from "fs";
 
 // src/context/resolve-parser/espree.ts
-import { createRequire as createRequire3 } from "module";
-import path5 from "path";
+import { createRequire as createRequire4 } from "module";
+import path6 from "path";
 var espreeCache = null;
 function isLinterPath(p) {
   return (
     // ESLint 6 and above
-    p.includes(`eslint${path5.sep}lib${path5.sep}linter${path5.sep}linter.js`) || // ESLint 5
-    p.includes(`eslint${path5.sep}lib${path5.sep}linter.js`)
+    p.includes(`eslint${path6.sep}lib${path6.sep}linter${path6.sep}linter.js`) || // ESLint 5
+    p.includes(`eslint${path6.sep}lib${path6.sep}linter.js`)
   );
 }
 function getEspree() {
@@ -2540,7 +2589,7 @@ function getEspree() {
     const linterPath = Object.keys(__require.cache || {}).find(isLinterPath);
     if (linterPath) {
       try {
-        espreeCache = createRequire3(linterPath)("espree");
+        espreeCache = createRequire4(linterPath)("espree");
       } catch {
       }
     }
@@ -2636,7 +2685,7 @@ var ParserOptionsContext = class {
     if (TS_PARSER_NAMES.some((nm) => parserName.includes(nm))) {
       let targetPath = parserName;
       while (targetPath) {
-        const pkgPath = path6.join(targetPath, "package.json");
+        const pkgPath = path7.join(targetPath, "package.json");
         if (fs3.existsSync(pkgPath)) {
           try {
             const pkgName = JSON.parse(fs3.readFileSync(pkgPath, "utf-8"))?.name;
@@ -2651,7 +2700,7 @@ var ParserOptionsContext = class {
             return null;
           }
         }
-        const parent = path6.dirname(targetPath);
+        const parent = path7.dirname(targetPath);
         if (targetPath === parent) {
           break;
         }
@@ -2800,7 +2849,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "1.2.1";
+var version = "1.3.0";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Astro component parser for ESLint",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -65,12 +65,12 @@
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.24.2",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
-    "@ota-meshi/eslint-plugin": "^0.17.6",
+    "@ota-meshi/eslint-plugin": "^0.20.0",
     "@types/benchmark": "^2.1.1",
     "@types/chai": "^5.0.0",
     "@types/debug": "^4.1.7",
     "@types/eslint": "^9.0.0",
-    "@types/eslint-scope": "^3.7.0",
+    "@types/eslint-scope": "^8.0.0",
     "@types/eslint-visitor-keys": "^3.0.0",
     "@types/is-glob": "^4.0.4",
     "@types/mocha": "^10.0.0",
@@ -84,7 +84,7 @@
     "benchmark": "^2.1.4",
     "chai": "^5.0.0",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.25.0",
     "esbuild-register": "^3.3.3",
     "eslint": "^9.19.0",
     "eslint-config-prettier": "^10.0.0",
@@ -96,14 +96,14 @@
     "eslint-plugin-jsonc": "^2.0.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-node-dependencies": "^0.12.0",
+    "eslint-plugin-node-dependencies": "^1.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-regexp": "^2.0.0",
     "eslint-plugin-simple-import-sort": "^12.0.0",
     "eslint-plugin-svelte": "^3.0.0-0",
     "estree-walker": "^3.0.0",
-    "globals": "^15.0.0",
+    "globals": "^16.0.0",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.0",
     "mocha": "^11.0.0",
@@ -115,9 +115,9 @@
     "string-replace-loader": "^3.0.3",
     "svelte": "^5.19.3",
     "tsup": "^8.0.0",
-    "typescript": "~5.7.0",
+    "typescript": "~5.8.0",
     "typescript-eslint": "^8.21.0",
-    "typescript-eslint-parser-for-extra-files": "^0.7.0"
+    "typescript-eslint-parser-for-extra-files": "^0.9.0"
   },
   "publishConfig": {
     "access": "public"