astro-eslint-parser 0.9.5 → 0.10.1

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import * as eslint from 'eslint';
 import { TSESTree } from '@typescript-eslint/types';
-import { ScopeManager } from 'eslint-scope';
+import { ScopeManager } from '@typescript-eslint/scope-manager';
 import { ParseResult } from '@astrojs/compiler';
 import { Node, AttributeNode, ParentNode } from '@astrojs/compiler/types';
 import { VisitorKeys as VisitorKeys$1 } from '@typescript-eslint/visitor-keys';

package/lib/index.js

@@ -137,21 +137,31 @@ function isTSESLintParserObject(value) {
 }
 
 // src/parser/script.ts
-function parseScript(code, _ctx, parserOptions) {
-  const parser = parserOptions.getParser();
+var import_scope_manager = require("@typescript-eslint/scope-manager");
+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,
+      globalReturn: parserOptions.ecmaFeatures?.globalReturn,
+      jsxPragma: parserOptions.jsxPragma,
+      jsxFragmentName: parserOptions.jsxFragmentName,
+      lib: parserOptions.lib,
+      sourceType: parserOptions.sourceType
+    });
+  }
+  return result;
+}
+function parseScriptInternal(code, _ctx, parserOptionsCtx) {
+  const parser = parserOptionsCtx.getParser();
   let patchResult;
   try {
-    const scriptParserOptions = {
-      ...parserOptions.parserOptions
-    };
-    scriptParserOptions.ecmaFeatures = {
-      ...scriptParserOptions.ecmaFeatures || {},
-      jsx: true
-    };
-    if (parserOptions.isTypeScript() && scriptParserOptions.filePath && scriptParserOptions.project) {
-      patchResult = tsPatch(scriptParserOptions);
+    const parserOptions = parserOptionsCtx.parserOptions;
+    if (parserOptionsCtx.isTypeScript() && parserOptions.filePath && parserOptions.project) {
+      patchResult = tsPatch(parserOptions);
     }
-    const result = isEnhancedParserObject(parser) ? parser.parseForESLint(code, scriptParserOptions) : parser.parse(code, scriptParserOptions);
+    const result = isEnhancedParserObject(parser) ? parser.parseForESLint(code, parserOptions) : parser.parse(code, parserOptions);
     if ("ast" in result && result.ast != null) {
       return result;
     }
@@ -1763,7 +1773,6 @@ var ParserOptionsContext = class {
       tokens: true,
       comment: true,
       eslintVisitorKeys: true,
-      eslintScopeManager: true,
       ...options || {}
     };
     parserOptions.ecmaFeatures = {
@@ -1816,7 +1825,10 @@ var ParserOptionsContext = class {
 };
 
 // src/parser/scope/index.ts
-var import_eslint_scope = require("eslint-scope");
+var import_scope_manager2 = require("@typescript-eslint/scope-manager");
+var READ_FLAG = 1;
+var WRITE_FLAG = 2;
+var READ_WRITE_FLAG = 3;
 function getProgramScope(scopeManager) {
   const globalScope = scopeManager.globalScope;
   return globalScope.childScopes.find((s) => s.type === "module") || globalScope;
@@ -1851,15 +1863,12 @@ function removeAllScopeAndVariableAndReference(target, info) {
   }
 }
 function addVirtualReference(node, variable, scope, readWrite) {
-  const reference = new import_eslint_scope.Reference();
+  const reference = new import_scope_manager2.Reference(
+    node,
+    scope,
+    readWrite.write && readWrite.read ? READ_WRITE_FLAG : readWrite.write ? WRITE_FLAG : READ_FLAG
+  );
   reference.astroVirtualReference = true;
-  reference.from = scope;
-  reference.identifier = node;
-  reference.isWrite = () => Boolean(readWrite.write);
-  reference.isWriteOnly = () => Boolean(readWrite.write) && !readWrite.read;
-  reference.isRead = () => Boolean(readWrite.read);
-  reference.isReadOnly = () => Boolean(readWrite.read) && !readWrite.write;
-  reference.isReadWrite = () => Boolean(readWrite.read && readWrite.write);
   addReference(variable.references, reference);
   reference.resolved = variable;
   return reference;
@@ -1869,9 +1878,7 @@ function addGlobalVariable(reference, scopeManager) {
   const name = reference.identifier.name;
   let variable = globalScope.set.get(name);
   if (!variable) {
-    variable = new import_eslint_scope.Variable();
-    variable.name = name;
-    variable.scope = globalScope;
+    variable = new import_scope_manager2.Variable(name, globalScope);
     globalScope.variables.push(variable);
     globalScope.set.set(name, variable);
   }

package/lib/index.mjs

@@ -108,21 +108,31 @@ function isTSESLintParserObject(value) {
 }
 
 // src/parser/script.ts
-function parseScript(code, _ctx, parserOptions) {
-  const parser = parserOptions.getParser();
+import { analyze } from "@typescript-eslint/scope-manager";
+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,
+      globalReturn: parserOptions.ecmaFeatures?.globalReturn,
+      jsxPragma: parserOptions.jsxPragma,
+      jsxFragmentName: parserOptions.jsxFragmentName,
+      lib: parserOptions.lib,
+      sourceType: parserOptions.sourceType
+    });
+  }
+  return result;
+}
+function parseScriptInternal(code, _ctx, parserOptionsCtx) {
+  const parser = parserOptionsCtx.getParser();
   let patchResult;
   try {
-    const scriptParserOptions = {
-      ...parserOptions.parserOptions
-    };
-    scriptParserOptions.ecmaFeatures = {
-      ...scriptParserOptions.ecmaFeatures || {},
-      jsx: true
-    };
-    if (parserOptions.isTypeScript() && scriptParserOptions.filePath && scriptParserOptions.project) {
-      patchResult = tsPatch(scriptParserOptions);
+    const parserOptions = parserOptionsCtx.parserOptions;
+    if (parserOptionsCtx.isTypeScript() && parserOptions.filePath && parserOptions.project) {
+      patchResult = tsPatch(parserOptions);
     }
-    const result = isEnhancedParserObject(parser) ? parser.parseForESLint(code, scriptParserOptions) : parser.parse(code, scriptParserOptions);
+    const result = isEnhancedParserObject(parser) ? parser.parseForESLint(code, parserOptions) : parser.parse(code, parserOptions);
     if ("ast" in result && result.ast != null) {
       return result;
     }
@@ -1734,7 +1744,6 @@ var ParserOptionsContext = class {
       tokens: true,
       comment: true,
       eslintVisitorKeys: true,
-      eslintScopeManager: true,
       ...options || {}
     };
     parserOptions.ecmaFeatures = {
@@ -1790,7 +1799,10 @@ var ParserOptionsContext = class {
 import {
   Reference as ReferenceClass,
   Variable as VariableClass
-} from "eslint-scope";
+} from "@typescript-eslint/scope-manager";
+var READ_FLAG = 1;
+var WRITE_FLAG = 2;
+var READ_WRITE_FLAG = 3;
 function getProgramScope(scopeManager) {
   const globalScope = scopeManager.globalScope;
   return globalScope.childScopes.find((s) => s.type === "module") || globalScope;
@@ -1825,15 +1837,12 @@ function removeAllScopeAndVariableAndReference(target, info) {
   }
 }
 function addVirtualReference(node, variable, scope, readWrite) {
-  const reference = new ReferenceClass();
+  const reference = new ReferenceClass(
+    node,
+    scope,
+    readWrite.write && readWrite.read ? READ_WRITE_FLAG : readWrite.write ? WRITE_FLAG : READ_FLAG
+  );
   reference.astroVirtualReference = true;
-  reference.from = scope;
-  reference.identifier = node;
-  reference.isWrite = () => Boolean(readWrite.write);
-  reference.isWriteOnly = () => Boolean(readWrite.write) && !readWrite.read;
-  reference.isRead = () => Boolean(readWrite.read);
-  reference.isReadOnly = () => Boolean(readWrite.read) && !readWrite.write;
-  reference.isReadWrite = () => Boolean(readWrite.read && readWrite.write);
   addReference(variable.references, reference);
   reference.resolved = variable;
   return reference;
@@ -1843,9 +1852,7 @@ function addGlobalVariable(reference, scopeManager) {
   const name = reference.identifier.name;
   let variable = globalScope.set.get(name);
   if (!variable) {
-    variable = new VariableClass();
-    variable.name = name;
-    variable.scope = globalScope;
+    variable = new VariableClass(name, globalScope);
     globalScope.variables.push(variable);
     globalScope.set.set(name, variable);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "0.9.5",
+  "version": "0.10.1",
   "description": "Astro component parser for ESLint",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -47,11 +47,11 @@
   },
   "homepage": "https://github.com/ota-meshi/astro-eslint-parser#readme",
   "dependencies": {
-    "@astrojs/compiler": "0.27.0 - 0.32.0 || ^0.32.0",
+    "@astrojs/compiler": "^0.33.0",
+    "@typescript-eslint/scope-manager": "^5.48.2",
     "@typescript-eslint/types": "^5.25.0",
     "astrojs-compiler-sync": "^0.3.0",
     "debug": "^4.3.4",
-    "eslint-scope": "^7.1.1",
     "eslint-visitor-keys": "^3.0.0",
     "espree": "^9.0.0"
   },
@@ -91,7 +91,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-regexp": "^1.5.0",
-    "eslint-plugin-simple-import-sort": "^8.0.0",
+    "eslint-plugin-simple-import-sort": "^9.0.0",
     "eslint-plugin-svelte": "^2.0.0",
     "estree-walker": "^3.0.0",
     "locate-character": "^2.0.5",