astro-eslint-parser 1.0.3 → 1.2.0

package/lib/index.d.mts

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

package/lib/index.js

@@ -28,8 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   AST: () => ast_exports,
   ParseError: () => ParseError,
   VisitorKeys: () => VisitorKeys,
@@ -39,7 +39,7 @@ __export(src_exports, {
   parseTemplate: () => parseTemplate2,
   traverseNodes: () => traverseNodes
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // src/visitor-keys.ts
 var import_eslint_visitor_keys = require("eslint-visitor-keys");
@@ -132,7 +132,7 @@ var TSService = class {
   }
   createWatch(tsconfigPath) {
     const { ts } = this;
-    const createAbstractBuilder = (...args) => {
+    const createAbstractBuilder = (...buildArgs) => {
       const [
         rootNames,
         options,
@@ -140,7 +140,7 @@ var TSService = class {
         oldProgram,
         configFileParsingDiagnostics,
         projectReferences
-      ] = args;
+      ] = buildArgs;
       const host = argHost;
       if (!this.patchedHostSet.has(host)) {
         this.patchedHostSet.add(host);
@@ -161,22 +161,22 @@ var TSService = class {
           getSourceFile: host.getSourceFile,
           getSourceFileByPath: host.getSourceFileByPath
         };
-        host.getSourceFile = (fileName, languageVersionOrOptions, ...args2) => {
+        host.getSourceFile = (fileName, languageVersionOrOptions, ...args) => {
           const originalSourceFile = original2.getSourceFile.call(
             host,
             fileName,
             languageVersionOrOptions,
-            ...args2
+            ...args
           );
           return getTargetSourceFile(fileName, languageVersionOrOptions) ?? originalSourceFile;
         };
-        host.getSourceFileByPath = (fileName, path7, languageVersionOrOptions, ...args2) => {
+        host.getSourceFileByPath = (fileName, filePath, languageVersionOrOptions, ...args) => {
           const originalSourceFile = original2.getSourceFileByPath.call(
             host,
             fileName,
-            path7,
+            filePath,
             languageVersionOrOptions,
-            ...args2
+            ...args
           );
           return getTargetSourceFile(fileName, languageVersionOrOptions) ?? originalSourceFile;
         };
@@ -327,7 +327,7 @@ function correctPathCasing(filePath) {
       path3.join(process.cwd(), "__placeholder__.js")
     )("typescript");
     const useCaseSensitiveFileNames = ts.sys !== void 0 ? ts.sys.useCaseSensitiveFileNames : true;
-    _correctPathCasing = useCaseSensitiveFileNames ? (filePath2) => filePath2 : (filePath2) => filePath2.toLowerCase();
+    _correctPathCasing = useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase();
   }
   return _correctPathCasing(filePath);
 }
@@ -610,31 +610,31 @@ function getProgramScope(scopeManager) {
   return globalScope.childScopes.find((s) => s.type === "module") || globalScope;
 }
 function removeAllScopeAndVariableAndReference(target, info) {
-  const targetScopes = /* @__PURE__ */ new Set();
+  const removeTargetScopes = /* @__PURE__ */ new Set();
   traverseNodes(target, {
     visitorKeys: info.visitorKeys,
     enterNode(node) {
       const scope = info.scopeManager.acquire(node);
       if (scope) {
-        targetScopes.add(scope);
+        removeTargetScopes.add(scope);
         return;
       }
-      if (node.type === "Identifier") {
-        let scope2 = getInnermostScopeFromNode(info.scopeManager, node);
-        while (scope2 && scope2.block.type !== "Program" && target.range[0] <= scope2.block.range[0] && scope2.block.range[1] <= target.range[1]) {
-          scope2 = scope2.upper;
+      if (node.type === "Identifier" || node.type === "JSXIdentifier") {
+        let targetScope = getInnermostScopeFromNode(info.scopeManager, node);
+        while (targetScope && targetScope.block.type !== "Program" && target.range[0] <= targetScope.block.range[0] && targetScope.block.range[1] <= target.range[1]) {
+          targetScope = targetScope.upper;
         }
-        if (targetScopes.has(scope2)) {
+        if (removeTargetScopes.has(targetScope)) {
           return;
         }
-        removeIdentifierVariable(node, scope2);
-        removeIdentifierReference(node, scope2);
+        removeIdentifierVariable(node, targetScope);
+        removeIdentifierReference(node, targetScope);
       }
     },
     leaveNode() {
     }
   });
-  for (const scope of targetScopes) {
+  for (const scope of removeTargetScopes) {
     removeScope(info.scopeManager, scope);
   }
 }
@@ -887,6 +887,14 @@ function parseScriptInternal(code, _ctx, parserOptionsCtx) {
     const parserOptions = parserOptionsCtx.parserOptions;
     if (parserOptionsCtx.isTypeScript() && parserOptions.filePath && parserOptions.project) {
       patchResult = tsPatch(parserOptions, parserOptionsCtx.getTSParserName());
+    } else if (parserOptionsCtx.isTypeScript() && parserOptions.filePath && parserOptions.projectService) {
+      console.warn(
+        "`astro-eslint-parser` does not support the `projectService` option, it will parse it as `project: true` instead."
+      );
+      patchResult = tsPatch(
+        { ...parserOptions, project: true, projectService: void 0 },
+        parserOptionsCtx.getTSParserName()
+      );
     }
     const result = isEnhancedParserObject(parser) ? patchResult?.parse ? patchResult.parse(code, parser) : parser.parseForESLint(code, parserOptions) : parser.parse(code, parserOptions);
     if ("ast" in result && result.ast != null) {
@@ -988,7 +996,7 @@ function sort(tokens) {
 var import_types2 = require("@typescript-eslint/types");
 
 // src/astro/index.ts
-var import_decode = require("entities/lib/decode.js");
+var import_decode = require("entities/decode");
 
 // src/errors.ts
 var ParseError = class extends SyntaxError {
@@ -1911,6 +1919,10 @@ function processTemplate(ctx, resultTemplate) {
               (scriptNode, context) => {
                 const parent2 = context.getParent(scriptNode);
                 if (scriptNode.range[0] === offset && scriptNode.type === import_types2.AST_NODE_TYPES.JSXClosingElement && parent2.type === import_types2.AST_NODE_TYPES.JSXElement) {
+                  removeAllScopeAndVariableAndReference(scriptNode, {
+                    visitorKeys: context.result.visitorKeys,
+                    scopeManager: context.result.scopeManager
+                  });
                   parent2.closingElement = null;
                   return true;
                 }
@@ -2810,7 +2822,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "1.0.3";
+var version = "1.2.0";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/lib/index.mjs

@@ -101,7 +101,7 @@ var TSService = class {
   }
   createWatch(tsconfigPath) {
     const { ts } = this;
-    const createAbstractBuilder = (...args) => {
+    const createAbstractBuilder = (...buildArgs) => {
       const [
         rootNames,
         options,
@@ -109,7 +109,7 @@ var TSService = class {
         oldProgram,
         configFileParsingDiagnostics,
         projectReferences
-      ] = args;
+      ] = buildArgs;
       const host = argHost;
       if (!this.patchedHostSet.has(host)) {
         this.patchedHostSet.add(host);
@@ -130,22 +130,22 @@ var TSService = class {
           getSourceFile: host.getSourceFile,
           getSourceFileByPath: host.getSourceFileByPath
         };
-        host.getSourceFile = (fileName, languageVersionOrOptions, ...args2) => {
+        host.getSourceFile = (fileName, languageVersionOrOptions, ...args) => {
           const originalSourceFile = original2.getSourceFile.call(
             host,
             fileName,
             languageVersionOrOptions,
-            ...args2
+            ...args
           );
           return getTargetSourceFile(fileName, languageVersionOrOptions) ?? originalSourceFile;
         };
-        host.getSourceFileByPath = (fileName, path7, languageVersionOrOptions, ...args2) => {
+        host.getSourceFileByPath = (fileName, filePath, languageVersionOrOptions, ...args) => {
           const originalSourceFile = original2.getSourceFileByPath.call(
             host,
             fileName,
-            path7,
+            filePath,
             languageVersionOrOptions,
-            ...args2
+            ...args
           );
           return getTargetSourceFile(fileName, languageVersionOrOptions) ?? originalSourceFile;
         };
@@ -296,7 +296,7 @@ function correctPathCasing(filePath) {
       path3.join(process.cwd(), "__placeholder__.js")
     )("typescript");
     const useCaseSensitiveFileNames = ts.sys !== void 0 ? ts.sys.useCaseSensitiveFileNames : true;
-    _correctPathCasing = useCaseSensitiveFileNames ? (filePath2) => filePath2 : (filePath2) => filePath2.toLowerCase();
+    _correctPathCasing = useCaseSensitiveFileNames ? (f) => f : (f) => f.toLowerCase();
   }
   return _correctPathCasing(filePath);
 }
@@ -588,31 +588,31 @@ function getProgramScope(scopeManager) {
   return globalScope.childScopes.find((s) => s.type === "module") || globalScope;
 }
 function removeAllScopeAndVariableAndReference(target, info) {
-  const targetScopes = /* @__PURE__ */ new Set();
+  const removeTargetScopes = /* @__PURE__ */ new Set();
   traverseNodes(target, {
     visitorKeys: info.visitorKeys,
     enterNode(node) {
       const scope = info.scopeManager.acquire(node);
       if (scope) {
-        targetScopes.add(scope);
+        removeTargetScopes.add(scope);
         return;
       }
-      if (node.type === "Identifier") {
-        let scope2 = getInnermostScopeFromNode(info.scopeManager, node);
-        while (scope2 && scope2.block.type !== "Program" && target.range[0] <= scope2.block.range[0] && scope2.block.range[1] <= target.range[1]) {
-          scope2 = scope2.upper;
+      if (node.type === "Identifier" || node.type === "JSXIdentifier") {
+        let targetScope = getInnermostScopeFromNode(info.scopeManager, node);
+        while (targetScope && targetScope.block.type !== "Program" && target.range[0] <= targetScope.block.range[0] && targetScope.block.range[1] <= target.range[1]) {
+          targetScope = targetScope.upper;
         }
-        if (targetScopes.has(scope2)) {
+        if (removeTargetScopes.has(targetScope)) {
           return;
         }
-        removeIdentifierVariable(node, scope2);
-        removeIdentifierReference(node, scope2);
+        removeIdentifierVariable(node, targetScope);
+        removeIdentifierReference(node, targetScope);
       }
     },
     leaveNode() {
     }
   });
-  for (const scope of targetScopes) {
+  for (const scope of removeTargetScopes) {
     removeScope(info.scopeManager, scope);
   }
 }
@@ -865,6 +865,14 @@ function parseScriptInternal(code, _ctx, parserOptionsCtx) {
     const parserOptions = parserOptionsCtx.parserOptions;
     if (parserOptionsCtx.isTypeScript() && parserOptions.filePath && parserOptions.project) {
       patchResult = tsPatch(parserOptions, parserOptionsCtx.getTSParserName());
+    } else if (parserOptionsCtx.isTypeScript() && parserOptions.filePath && parserOptions.projectService) {
+      console.warn(
+        "`astro-eslint-parser` does not support the `projectService` option, it will parse it as `project: true` instead."
+      );
+      patchResult = tsPatch(
+        { ...parserOptions, project: true, projectService: void 0 },
+        parserOptionsCtx.getTSParserName()
+      );
     }
     const result = isEnhancedParserObject(parser) ? patchResult?.parse ? patchResult.parse(code, parser) : parser.parseForESLint(code, parserOptions) : parser.parse(code, parserOptions);
     if ("ast" in result && result.ast != null) {
@@ -966,11 +974,7 @@ function sort(tokens) {
 import { AST_TOKEN_TYPES, AST_NODE_TYPES as AST_NODE_TYPES2 } from "@typescript-eslint/types";
 
 // src/astro/index.ts
-import {
-  EntityDecoder,
-  DecodingMode,
-  htmlDecodeTree
-} from "entities/lib/decode.js";
+import { EntityDecoder, DecodingMode, htmlDecodeTree } from "entities/decode";
 
 // src/errors.ts
 var ParseError = class extends SyntaxError {
@@ -1893,6 +1897,10 @@ function processTemplate(ctx, resultTemplate) {
               (scriptNode, context) => {
                 const parent2 = context.getParent(scriptNode);
                 if (scriptNode.range[0] === offset && scriptNode.type === AST_NODE_TYPES2.JSXClosingElement && parent2.type === AST_NODE_TYPES2.JSXElement) {
+                  removeAllScopeAndVariableAndReference(scriptNode, {
+                    visitorKeys: context.result.visitorKeys,
+                    scopeManager: context.result.scopeManager
+                  });
                   parent2.closingElement = null;
                   return true;
                 }
@@ -2792,7 +2800,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "1.0.3";
+var version = "1.2.0";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "Astro component parser for ESLint",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -15,7 +15,7 @@
     "build": "npm run build:tsup",
     "build:tsup": "tsup",
     "clean": "rimraf .nyc_output lib coverage",
-    "lint": "eslint . --ext .js,.ts,.json,.astro,.svelte",
+    "lint": "eslint .",
     "eslint-fix": "npm run lint -- --fix",
     "test": "npm run mocha -- \"tests/src/**/*.ts\" --reporter dot --timeout 60000",
     "cover": "nyc --reporter=lcov npm run test",
@@ -51,45 +51,47 @@
     "@astrojs/compiler": "^2.0.0",
     "@typescript-eslint/scope-manager": "^7.0.0 || ^8.0.0",
     "@typescript-eslint/types": "^7.0.0 || ^8.0.0",
-    "@typescript-eslint/typescript-estree": "^7.0.0 || ^8.0.0",
     "astrojs-compiler-sync": "^1.0.0",
     "debug": "^4.3.4",
-    "entities": "^4.5.0",
+    "entities": "^6.0.0",
     "eslint-scope": "^8.0.1",
     "eslint-visitor-keys": "^4.0.0",
     "espree": "^10.0.0",
-    "globby": "^11.1.0",
+    "globby": "^14.0.0",
     "is-glob": "^4.0.3",
     "semver": "^7.3.8"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.24.2",
-    "@ota-meshi/eslint-plugin": "^0.15.0",
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
+    "@ota-meshi/eslint-plugin": "^0.17.6",
     "@types/benchmark": "^2.1.1",
-    "@types/chai": "^4.3.0",
+    "@types/chai": "^5.0.0",
     "@types/debug": "^4.1.7",
     "@types/eslint": "^9.0.0",
     "@types/eslint-scope": "^3.7.0",
     "@types/eslint-visitor-keys": "^3.0.0",
     "@types/is-glob": "^4.0.4",
     "@types/mocha": "^10.0.0",
-    "@types/node": "^20.0.0",
+    "@types/node": "^22.0.0",
     "@types/semver": "^7.3.9",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
-    "astro": "^4.0.0",
+    "@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-eslint-parser": ">=0.1.0",
     "benchmark": "^2.1.4",
     "chai": "^5.0.0",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.24.0",
     "esbuild-register": "^3.3.3",
-    "eslint": "^8.15.0",
-    "eslint-config-prettier": "^9.0.0",
+    "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-jsx-a11y": "^6.5.1",
@@ -99,21 +101,22 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-regexp": "^2.0.0",
     "eslint-plugin-simple-import-sort": "^12.0.0",
-    "eslint-plugin-svelte": "^2.0.0",
+    "eslint-plugin-svelte": "^3.0.0-0",
     "estree-walker": "^3.0.0",
     "globals": "^15.0.0",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.0",
-    "mocha": "^10.0.0",
+    "mocha": "^11.0.0",
     "mocha-chai-jest-snapshot": "^1.1.3",
     "nyc": "^17.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": "^4.0.0",
+    "svelte": "^5.19.3",
     "tsup": "^8.0.0",
-    "typescript": "~5.6.0",
+    "typescript": "~5.7.0",
+    "typescript-eslint": "^8.21.0",
     "typescript-eslint-parser-for-extra-files": "^0.7.0"
   },
   "publishConfig": {