astro-eslint-parser 1.0.2 → 1.1.0

package/lib/index.d.mts

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

package/lib/index.js

@@ -123,8 +123,7 @@ var TSService = class {
       filePath: normalized
     };
     for (const { filePath: targetPath } of [this.currTarget, lastTarget]) {
-      if (!targetPath)
-        continue;
+      if (!targetPath) continue;
       this.fileWatchCallbacks.get(targetPath)?.update();
     }
     const program = this.watch.getProgram().getProgram();
@@ -496,12 +495,10 @@ function getTSParserNameFromObject(value) {
   return null;
 }
 function isTSESLintParserObject(value) {
-  if (!isEnhancedParserObject(value))
-    return false;
+  if (!isEnhancedParserObject(value)) return false;
   if (value.name === "typescript-eslint-parser-for-extra-files")
     return true;
-  if (value.meta?.name === "typescript-eslint/parser")
-    return true;
+  if (value.meta?.name === "typescript-eslint/parser") return true;
   try {
     const result = value.parseForESLint("", {});
     const services = result.services;
@@ -755,8 +752,7 @@ function removeIdentifierVariable(node, scope) {
     if (variable.defs.length === 0) {
       referencesToThrough(variable.references, scope);
       variable.references.forEach((r) => {
-        if (r.init)
-          r.init = false;
+        if (r.init) r.init = false;
         r.resolved = null;
       });
       scope.variables.splice(varIndex, 1);
@@ -891,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 },
+        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) {
@@ -1161,12 +1165,9 @@ function getEndOffset(node, ctx) {
   if (node.position.end?.offset != null) {
     return node.position.end.offset;
   }
-  if (isTag(node))
-    return calcTagEndOffset(node, ctx);
-  if (node.type === "expression")
-    return calcExpressionEndOffset(node, ctx);
-  if (node.type === "comment")
-    return calcCommentEndOffset(node, ctx);
+  if (isTag(node)) return calcTagEndOffset(node, ctx);
+  if (node.type === "expression") return calcExpressionEndOffset(node, ctx);
+  if (node.type === "comment") return calcCommentEndOffset(node, ctx);
   if (node.type === "frontmatter") {
     const start = node.position.start.offset;
     return ctx.code.indexOf("---", start + 3) + 3;
@@ -1344,8 +1345,7 @@ function getTokenInfo(ctx, tokens, position) {
     };
     function getHTMLEntity(position3) {
       let codeOffset2 = position3;
-      if (ctx.code[codeOffset2++] !== "&")
-        return null;
+      if (ctx.code[codeOffset2++] !== "&") return null;
       let entity = "";
       const entityDecoder = new import_decode.EntityDecoder(
         import_decode.htmlDecodeTree,
@@ -2818,7 +2818,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "1.0.2";
+var version = "1.1.0";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/lib/index.mjs

@@ -2,8 +2,7 @@ var __defProp = Object.defineProperty;
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
+  if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var __export = (target, all) => {
@@ -93,8 +92,7 @@ var TSService = class {
       filePath: normalized
     };
     for (const { filePath: targetPath } of [this.currTarget, lastTarget]) {
-      if (!targetPath)
-        continue;
+      if (!targetPath) continue;
       this.fileWatchCallbacks.get(targetPath)?.update();
     }
     const program = this.watch.getProgram().getProgram();
@@ -466,12 +464,10 @@ function getTSParserNameFromObject(value) {
   return null;
 }
 function isTSESLintParserObject(value) {
-  if (!isEnhancedParserObject(value))
-    return false;
+  if (!isEnhancedParserObject(value)) return false;
   if (value.name === "typescript-eslint-parser-for-extra-files")
     return true;
-  if (value.meta?.name === "typescript-eslint/parser")
-    return true;
+  if (value.meta?.name === "typescript-eslint/parser") return true;
   try {
     const result = value.parseForESLint("", {});
     const services = result.services;
@@ -734,8 +730,7 @@ function removeIdentifierVariable(node, scope) {
     if (variable.defs.length === 0) {
       referencesToThrough(variable.references, scope);
       variable.references.forEach((r) => {
-        if (r.init)
-          r.init = false;
+        if (r.init) r.init = false;
         r.resolved = null;
       });
       scope.variables.splice(varIndex, 1);
@@ -870,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 },
+        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) {
@@ -1144,12 +1147,9 @@ function getEndOffset(node, ctx) {
   if (node.position.end?.offset != null) {
     return node.position.end.offset;
   }
-  if (isTag(node))
-    return calcTagEndOffset(node, ctx);
-  if (node.type === "expression")
-    return calcExpressionEndOffset(node, ctx);
-  if (node.type === "comment")
-    return calcCommentEndOffset(node, ctx);
+  if (isTag(node)) return calcTagEndOffset(node, ctx);
+  if (node.type === "expression") return calcExpressionEndOffset(node, ctx);
+  if (node.type === "comment") return calcCommentEndOffset(node, ctx);
   if (node.type === "frontmatter") {
     const start = node.position.start.offset;
     return ctx.code.indexOf("---", start + 3) + 3;
@@ -1327,8 +1327,7 @@ function getTokenInfo(ctx, tokens, position) {
     };
     function getHTMLEntity(position3) {
       let codeOffset2 = position3;
-      if (ctx.code[codeOffset2++] !== "&")
-        return null;
+      if (ctx.code[codeOffset2++] !== "&") return null;
       let entity = "";
       const entityDecoder = new EntityDecoder(
         htmlDecodeTree,
@@ -2801,7 +2800,7 @@ __export(meta_exports, {
 
 // package.json
 var name = "astro-eslint-parser";
-var version = "1.0.2";
+var version = "1.1.0";
 
 // src/index.ts
 function parseForESLint2(code, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Astro component parser for ESLint",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -49,9 +49,9 @@
   "homepage": "https://github.com/ota-meshi/astro-eslint-parser#readme",
   "dependencies": {
     "@astrojs/compiler": "^2.0.0",
-    "@typescript-eslint/scope-manager": "^7.0.0",
-    "@typescript-eslint/types": "^7.0.0",
-    "@typescript-eslint/typescript-estree": "^7.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",
@@ -67,23 +67,23 @@
     "@changesets/cli": "^2.24.2",
     "@ota-meshi/eslint-plugin": "^0.15.0",
     "@types/benchmark": "^2.1.1",
-    "@types/chai": "^4.3.0",
+    "@types/chai": "^5.0.0",
     "@types/debug": "^4.1.7",
-    "@types/eslint": "^8.0.0",
+    "@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": "^7.7.1",
-    "@typescript-eslint/parser": "^7.7.1",
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "^8.0.0",
     "astro": "^4.0.0",
     "astro-eslint-parser": ">=0.1.0",
     "benchmark": "^2.1.4",
     "chai": "^5.0.0",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.24.0",
     "esbuild-register": "^3.3.3",
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^9.0.0",
@@ -106,15 +106,15 @@
     "magic-string": "^0.30.0",
     "mocha": "^10.0.0",
     "mocha-chai-jest-snapshot": "^1.1.3",
-    "nyc": "^15.1.0",
+    "nyc": "^17.0.0",
     "prettier": "^3.0.0",
-    "prettier-plugin-astro": "^0.13.0",
+    "prettier-plugin-astro": "^0.14.0",
     "prettier-plugin-svelte": "^3.0.0",
     "string-replace-loader": "^3.0.3",
     "svelte": "^4.0.0",
     "tsup": "^8.0.0",
-    "typescript": "~5.4.0",
-    "typescript-eslint-parser-for-extra-files": "^0.6.0"
+    "typescript": "~5.6.0",
+    "typescript-eslint-parser-for-extra-files": "^0.7.0"
   },
   "publishConfig": {
     "access": "public"