astro-eslint-parser 0.17.0 → 1.0.1

package/lib/index.d.mts

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

package/lib/index.js

@@ -515,20 +515,80 @@ function isTSESLintParserObject(value) {
 
 // src/parser/script.ts
 var import_scope_manager = require("@typescript-eslint/scope-manager");
+var import_eslint_scope = require("eslint-scope");
+
+// src/traverse.ts
+function fallbackKeysFilter(key) {
+  let value = null;
+  return key !== "comments" && key !== "leadingComments" && key !== "loc" && key !== "parent" && key !== "range" && key !== "tokens" && key !== "trailingComments" && (value = this[key]) !== null && typeof value === "object" && (typeof value.type === "string" || Array.isArray(value));
+}
+function getFallbackKeys(node) {
+  return Object.keys(node).filter(fallbackKeysFilter, node);
+}
+function getKeys(node, visitorKeys) {
+  const keys = (visitorKeys || KEYS)[node.type] || getFallbackKeys(node);
+  return keys.filter((key) => !getNodes(node, key).next().done);
+}
+function* getNodes(node, key) {
+  const child = node[key];
+  if (Array.isArray(child)) {
+    for (const c of child) {
+      if (isNode(c)) {
+        yield c;
+      }
+    }
+  } else if (isNode(child)) {
+    yield child;
+  }
+}
+function isNode(x) {
+  return x !== null && typeof x === "object" && typeof x.type === "string";
+}
+function traverse(node, parent, visitor) {
+  visitor.enterNode(node, parent);
+  const keys = getKeys(node, visitor.visitorKeys);
+  for (const key of keys) {
+    for (const child of getNodes(node, key)) {
+      traverse(child, node, visitor);
+    }
+  }
+  visitor.leaveNode(node, parent);
+}
+function traverseNodes(node, visitor) {
+  traverse(node, null, visitor);
+}
+
+// src/parser/script.ts
 function parseScript(code, ctx, parserOptionsCtx) {
   const result = parseScriptInternal(code, ctx, parserOptionsCtx);
   const parserOptions = parserOptionsCtx.parserOptions;
   if (!result.scopeManager && parserOptions.eslintScopeManager) {
-    result.scopeManager = (0, import_scope_manager.analyze)(result.ast, {
-      ecmaVersion: 1e8,
+    result.scopeManager = analyzeScope(result, parserOptions);
+  }
+  return result;
+}
+function analyzeScope(result, parserOptions) {
+  try {
+    return (0, import_scope_manager.analyze)(result.ast, {
       globalReturn: parserOptions.ecmaFeatures?.globalReturn,
       jsxPragma: parserOptions.jsxPragma,
       jsxFragmentName: parserOptions.jsxFragmentName,
       lib: parserOptions.lib,
       sourceType: parserOptions.sourceType
     });
+  } catch {
   }
-  return result;
+  const ecmaFeatures = parserOptions.ecmaFeatures || {};
+  return (0, import_eslint_scope.analyze)(result.ast, {
+    ignoreEval: true,
+    nodejsScope: ecmaFeatures.globalReturn,
+    impliedStrict: ecmaFeatures.impliedStrict,
+    ecmaVersion: 1e8,
+    sourceType: parserOptions.sourceType === "commonjs" ? "script" : parserOptions.sourceType || "script",
+    // @ts-expect-error -- Type bug?
+    childVisitorKeys: result.visitorKeys || KEYS,
+    fallback: getKeys
+  });
 }
 function parseScriptInternal(code, _ctx, parserOptionsCtx) {
   const parser = parserOptionsCtx.getParser();
@@ -986,47 +1046,6 @@ function getSortedChildren(parent, code) {
   return parent.children;
 }
 
-// src/traverse.ts
-function fallbackKeysFilter(key) {
-  let value = null;
-  return key !== "comments" && key !== "leadingComments" && key !== "loc" && key !== "parent" && key !== "range" && key !== "tokens" && key !== "trailingComments" && (value = this[key]) !== null && typeof value === "object" && (typeof value.type === "string" || Array.isArray(value));
-}
-function getFallbackKeys(node) {
-  return Object.keys(node).filter(fallbackKeysFilter, node);
-}
-function getKeys(node, visitorKeys) {
-  const keys = (visitorKeys || KEYS)[node.type] || getFallbackKeys(node);
-  return keys.filter((key) => !getNodes(node, key).next().done);
-}
-function* getNodes(node, key) {
-  const child = node[key];
-  if (Array.isArray(child)) {
-    for (const c of child) {
-      if (isNode(c)) {
-        yield c;
-      }
-    }
-  } else if (isNode(child)) {
-    yield child;
-  }
-}
-function isNode(x) {
-  return x !== null && typeof x === "object" && typeof x.type === "string";
-}
-function traverse(node, parent, visitor) {
-  visitor.enterNode(node, parent);
-  const keys = getKeys(node, visitor.visitorKeys);
-  for (const key of keys) {
-    for (const child of getNodes(node, key)) {
-      traverse(child, node, visitor);
-    }
-  }
-  visitor.leaveNode(node, parent);
-}
-function traverseNodes(node, visitor) {
-  traverse(node, null, visitor);
-}
-
 // src/context/restore.ts
 var RestoreNodeProcessContext = class {
   constructor(result, nodeMap) {
@@ -2729,7 +2748,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "0.17.0";
+var version = "1.0.1";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/lib/index.mjs

@@ -484,21 +484,81 @@ function isTSESLintParserObject(value) {
 }
 
 // src/parser/script.ts
-import { analyze } from "@typescript-eslint/scope-manager";
+import { analyze as analyzeForTypeScript } from "@typescript-eslint/scope-manager";
+import { analyze as analyzeForEcmaScript } from "eslint-scope";
+
+// src/traverse.ts
+function fallbackKeysFilter(key) {
+  let value = null;
+  return key !== "comments" && key !== "leadingComments" && key !== "loc" && key !== "parent" && key !== "range" && key !== "tokens" && key !== "trailingComments" && (value = this[key]) !== null && typeof value === "object" && (typeof value.type === "string" || Array.isArray(value));
+}
+function getFallbackKeys(node) {
+  return Object.keys(node).filter(fallbackKeysFilter, node);
+}
+function getKeys(node, visitorKeys) {
+  const keys = (visitorKeys || KEYS)[node.type] || getFallbackKeys(node);
+  return keys.filter((key) => !getNodes(node, key).next().done);
+}
+function* getNodes(node, key) {
+  const child = node[key];
+  if (Array.isArray(child)) {
+    for (const c of child) {
+      if (isNode(c)) {
+        yield c;
+      }
+    }
+  } else if (isNode(child)) {
+    yield child;
+  }
+}
+function isNode(x) {
+  return x !== null && typeof x === "object" && typeof x.type === "string";
+}
+function traverse(node, parent, visitor) {
+  visitor.enterNode(node, parent);
+  const keys = getKeys(node, visitor.visitorKeys);
+  for (const key of keys) {
+    for (const child of getNodes(node, key)) {
+      traverse(child, node, visitor);
+    }
+  }
+  visitor.leaveNode(node, parent);
+}
+function traverseNodes(node, visitor) {
+  traverse(node, null, visitor);
+}
+
+// src/parser/script.ts
 function parseScript(code, ctx, parserOptionsCtx) {
   const result = parseScriptInternal(code, ctx, parserOptionsCtx);
   const parserOptions = parserOptionsCtx.parserOptions;
   if (!result.scopeManager && parserOptions.eslintScopeManager) {
-    result.scopeManager = analyze(result.ast, {
-      ecmaVersion: 1e8,
+    result.scopeManager = analyzeScope(result, parserOptions);
+  }
+  return result;
+}
+function analyzeScope(result, parserOptions) {
+  try {
+    return analyzeForTypeScript(result.ast, {
       globalReturn: parserOptions.ecmaFeatures?.globalReturn,
       jsxPragma: parserOptions.jsxPragma,
       jsxFragmentName: parserOptions.jsxFragmentName,
       lib: parserOptions.lib,
       sourceType: parserOptions.sourceType
     });
+  } catch {
   }
-  return result;
+  const ecmaFeatures = parserOptions.ecmaFeatures || {};
+  return analyzeForEcmaScript(result.ast, {
+    ignoreEval: true,
+    nodejsScope: ecmaFeatures.globalReturn,
+    impliedStrict: ecmaFeatures.impliedStrict,
+    ecmaVersion: 1e8,
+    sourceType: parserOptions.sourceType === "commonjs" ? "script" : parserOptions.sourceType || "script",
+    // @ts-expect-error -- Type bug?
+    childVisitorKeys: result.visitorKeys || KEYS,
+    fallback: getKeys
+  });
 }
 function parseScriptInternal(code, _ctx, parserOptionsCtx) {
   const parser = parserOptionsCtx.getParser();
@@ -960,47 +1020,6 @@ function getSortedChildren(parent, code) {
   return parent.children;
 }
 
-// src/traverse.ts
-function fallbackKeysFilter(key) {
-  let value = null;
-  return key !== "comments" && key !== "leadingComments" && key !== "loc" && key !== "parent" && key !== "range" && key !== "tokens" && key !== "trailingComments" && (value = this[key]) !== null && typeof value === "object" && (typeof value.type === "string" || Array.isArray(value));
-}
-function getFallbackKeys(node) {
-  return Object.keys(node).filter(fallbackKeysFilter, node);
-}
-function getKeys(node, visitorKeys) {
-  const keys = (visitorKeys || KEYS)[node.type] || getFallbackKeys(node);
-  return keys.filter((key) => !getNodes(node, key).next().done);
-}
-function* getNodes(node, key) {
-  const child = node[key];
-  if (Array.isArray(child)) {
-    for (const c of child) {
-      if (isNode(c)) {
-        yield c;
-      }
-    }
-  } else if (isNode(child)) {
-    yield child;
-  }
-}
-function isNode(x) {
-  return x !== null && typeof x === "object" && typeof x.type === "string";
-}
-function traverse(node, parent, visitor) {
-  visitor.enterNode(node, parent);
-  const keys = getKeys(node, visitor.visitorKeys);
-  for (const key of keys) {
-    for (const child of getNodes(node, key)) {
-      traverse(child, node, visitor);
-    }
-  }
-  visitor.leaveNode(node, parent);
-}
-function traverseNodes(node, visitor) {
-  traverse(node, null, visitor);
-}
-
 // src/context/restore.ts
 var RestoreNodeProcessContext = class {
   constructor(result, nodeMap) {
@@ -2706,7 +2725,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "0.17.0";
+var version = "1.0.1";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "0.17.0",
+  "version": "1.0.1",
   "description": "Astro component parser for ESLint",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -8,7 +8,7 @@
     "lib"
   ],
   "engines": {
-    "node": "^14.18.0 || >=16.0.0"
+    "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
   },
   "scripts": {
     "prebuild": "npm run -s clean",
@@ -49,14 +49,15 @@
   "homepage": "https://github.com/ota-meshi/astro-eslint-parser#readme",
   "dependencies": {
     "@astrojs/compiler": "^2.0.0",
-    "@typescript-eslint/scope-manager": "^5.0.0",
-    "@typescript-eslint/types": "^5.0.0",
-    "@typescript-eslint/typescript-estree": "^5.0.0",
-    "astrojs-compiler-sync": "^0.3.0",
+    "@typescript-eslint/scope-manager": "^7.0.0",
+    "@typescript-eslint/types": "^7.0.0",
+    "@typescript-eslint/typescript-estree": "^7.0.0",
+    "astrojs-compiler-sync": "^1.0.0",
     "debug": "^4.3.4",
     "entities": "^4.5.0",
-    "eslint-visitor-keys": "^3.0.0",
-    "espree": "^9.0.0",
+    "eslint-scope": "^8.0.1",
+    "eslint-visitor-keys": "^4.0.0",
+    "espree": "^10.0.0",
     "globby": "^11.1.0",
     "is-glob": "^4.0.3",
     "semver": "^7.3.8"
@@ -75,8 +76,8 @@
     "@types/mocha": "^10.0.0",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.3.9",
-    "@typescript-eslint/eslint-plugin": "~6.21.0",
-    "@typescript-eslint/parser": "~6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.1",
+    "@typescript-eslint/parser": "^7.7.1",
     "astro": "^4.0.0",
     "astro-eslint-parser": ">=0.1.0",
     "benchmark": "^2.1.4",
@@ -87,13 +88,13 @@
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-formatter-codeframe": "^7.32.1",
-    "eslint-plugin-astro": "^0.33.0",
+    "eslint-plugin-astro": "^0.34.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-json-schema-validator": "^5.0.0",
     "eslint-plugin-jsonc": "^2.0.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-node-dependencies": "^0.11.0",
+    "eslint-plugin-n": "^17.0.0",
+    "eslint-plugin-node-dependencies": "^0.12.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-regexp": "^2.0.0",