astro-eslint-parser 0.13.1 → 0.13.3

package/lib/index.js

@@ -132,6 +132,64 @@ var TSService = class {
   }
   createWatch(tsconfigPath) {
     const { ts } = this;
+    const createAbstractBuilder = (...args) => {
+      const [
+        rootNames,
+        options,
+        argHost,
+        oldProgram,
+        configFileParsingDiagnostics,
+        projectReferences
+      ] = args;
+      const host = argHost;
+      if (!this.patchedHostSet.has(host)) {
+        this.patchedHostSet.add(host);
+        const getTargetSourceFile = (fileName, languageVersionOrOptions) => {
+          var _a;
+          if (this.currTarget.filePath === normalizeFileName(ts, fileName)) {
+            return (_a = this.currTarget).sourceFile ?? (_a.sourceFile = ts.createSourceFile(
+              this.currTarget.filePath,
+              this.currTarget.code,
+              languageVersionOrOptions,
+              true,
+              ts.ScriptKind.TSX
+            ));
+          }
+          return null;
+        };
+        const original2 = {
+          getSourceFile: host.getSourceFile,
+          getSourceFileByPath: host.getSourceFileByPath
+        };
+        host.getSourceFile = (fileName, languageVersionOrOptions, ...args2) => {
+          const originalSourceFile = original2.getSourceFile.call(
+            host,
+            fileName,
+            languageVersionOrOptions,
+            ...args2
+          );
+          return getTargetSourceFile(fileName, languageVersionOrOptions) ?? originalSourceFile;
+        };
+        host.getSourceFileByPath = (fileName, path6, languageVersionOrOptions, ...args2) => {
+          const originalSourceFile = original2.getSourceFileByPath.call(
+            host,
+            fileName,
+            path6,
+            languageVersionOrOptions,
+            ...args2
+          );
+          return getTargetSourceFile(fileName, languageVersionOrOptions) ?? originalSourceFile;
+        };
+      }
+      return ts.createAbstractBuilder(
+        rootNames,
+        options,
+        host,
+        oldProgram,
+        configFileParsingDiagnostics,
+        projectReferences
+      );
+    };
     const watchCompilerHost = ts.createWatchCompilerHost(
       tsconfigPath,
       {
@@ -143,54 +201,7 @@ var TSService = class {
         allowNonTsExtensions: true
       },
       ts.sys,
-      (rootNames, options, argHost, oldProgram, configFileParsingDiagnostics, projectReferences) => {
-        const host = argHost;
-        if (!this.patchedHostSet.has(host)) {
-          this.patchedHostSet.add(host);
-          const getTargetSourceFile = (fileName, languageVersionOrOptions) => {
-            var _a;
-            if (this.currTarget.filePath === normalizeFileName(ts, fileName)) {
-              return (_a = this.currTarget).sourceFile ?? (_a.sourceFile = ts.createSourceFile(
-                this.currTarget.filePath,
-                this.currTarget.code,
-                languageVersionOrOptions,
-                true,
-                ts.ScriptKind.TSX
-              ));
-            }
-            return null;
-          };
-          const original2 = {
-            getSourceFile: host.getSourceFile,
-            getSourceFileByPath: host.getSourceFileByPath
-          };
-          host.getSourceFile = (fileName, languageVersionOrOptions, ...args) => {
-            return getTargetSourceFile(fileName, languageVersionOrOptions) ?? original2.getSourceFile.call(
-              host,
-              fileName,
-              languageVersionOrOptions,
-              ...args
-            );
-          };
-          host.getSourceFileByPath = (fileName, path6, languageVersionOrOptions, ...args) => {
-            return getTargetSourceFile(fileName, languageVersionOrOptions) ?? original2.getSourceFileByPath.call(
-              host,
-              fileName,
-              path6,
-              languageVersionOrOptions,
-              ...args
-            );
-          };
-        }
-        return ts.createAbstractBuilder(
-          rootNames,
-          options,
-          host,
-          oldProgram,
-          configFileParsingDiagnostics,
-          projectReferences
-        );
-      },
+      createAbstractBuilder,
       (diagnostic) => {
         throw new Error(formatDiagnostics(ts, [diagnostic]));
       },
@@ -2169,6 +2180,8 @@ var import_scope_manager2 = require("@typescript-eslint/scope-manager");
 var READ_FLAG = 1;
 var WRITE_FLAG = 2;
 var READ_WRITE_FLAG = 3;
+var REFERENCE_TYPE_VALUE_FLAG = 1;
+var REFERENCE_TYPE_TYPE_FLAG = 2;
 function getProgramScope(scopeManager) {
   const globalScope = scopeManager.globalScope;
   return globalScope.childScopes.find((s) => s.type === "module") || globalScope;
@@ -2202,15 +2215,25 @@ function removeAllScopeAndVariableAndReference(target, info) {
     removeScope(info.scopeManager, scope);
   }
 }
-function addVirtualReference(node, variable, scope, readWrite) {
+function addVirtualReference(node, variable, scope, status) {
   const reference = new import_scope_manager2.Reference(
     node,
     scope,
-    readWrite.write && readWrite.read ? READ_WRITE_FLAG : readWrite.write ? WRITE_FLAG : READ_FLAG
+    status.write && status.read ? READ_WRITE_FLAG : status.write ? WRITE_FLAG : READ_FLAG,
+    void 0,
+    // writeExpr
+    void 0,
+    // maybeImplicitGlobal
+    void 0,
+    // init
+    status.typeRef ? REFERENCE_TYPE_TYPE_FLAG : REFERENCE_TYPE_VALUE_FLAG
   );
   reference.astroVirtualReference = true;
   addReference(variable.references, reference);
   reference.resolved = variable;
+  if (status.forceUsed) {
+    variable.eslintUsed = true;
+  }
   return reference;
 }
 function addGlobalVariable(reference, scopeManager) {
@@ -2432,7 +2455,9 @@ function parseForESLint(code, options) {
               propsVariable,
               scope,
               {
-                read: true
+                read: true,
+                typeRef: true,
+                forceUsed: true
               }
             );
           }

package/lib/index.mjs

@@ -98,6 +98,64 @@ var TSService = class {
   }
   createWatch(tsconfigPath) {
     const { ts } = this;
+    const createAbstractBuilder = (...args) => {
+      const [
+        rootNames,
+        options,
+        argHost,
+        oldProgram,
+        configFileParsingDiagnostics,
+        projectReferences
+      ] = args;
+      const host = argHost;
+      if (!this.patchedHostSet.has(host)) {
+        this.patchedHostSet.add(host);
+        const getTargetSourceFile = (fileName, languageVersionOrOptions) => {
+          var _a;
+          if (this.currTarget.filePath === normalizeFileName(ts, fileName)) {
+            return (_a = this.currTarget).sourceFile ?? (_a.sourceFile = ts.createSourceFile(
+              this.currTarget.filePath,
+              this.currTarget.code,
+              languageVersionOrOptions,
+              true,
+              ts.ScriptKind.TSX
+            ));
+          }
+          return null;
+        };
+        const original2 = {
+          getSourceFile: host.getSourceFile,
+          getSourceFileByPath: host.getSourceFileByPath
+        };
+        host.getSourceFile = (fileName, languageVersionOrOptions, ...args2) => {
+          const originalSourceFile = original2.getSourceFile.call(
+            host,
+            fileName,
+            languageVersionOrOptions,
+            ...args2
+          );
+          return getTargetSourceFile(fileName, languageVersionOrOptions) ?? originalSourceFile;
+        };
+        host.getSourceFileByPath = (fileName, path6, languageVersionOrOptions, ...args2) => {
+          const originalSourceFile = original2.getSourceFileByPath.call(
+            host,
+            fileName,
+            path6,
+            languageVersionOrOptions,
+            ...args2
+          );
+          return getTargetSourceFile(fileName, languageVersionOrOptions) ?? originalSourceFile;
+        };
+      }
+      return ts.createAbstractBuilder(
+        rootNames,
+        options,
+        host,
+        oldProgram,
+        configFileParsingDiagnostics,
+        projectReferences
+      );
+    };
     const watchCompilerHost = ts.createWatchCompilerHost(
       tsconfigPath,
       {
@@ -109,54 +167,7 @@ var TSService = class {
         allowNonTsExtensions: true
       },
       ts.sys,
-      (rootNames, options, argHost, oldProgram, configFileParsingDiagnostics, projectReferences) => {
-        const host = argHost;
-        if (!this.patchedHostSet.has(host)) {
-          this.patchedHostSet.add(host);
-          const getTargetSourceFile = (fileName, languageVersionOrOptions) => {
-            var _a;
-            if (this.currTarget.filePath === normalizeFileName(ts, fileName)) {
-              return (_a = this.currTarget).sourceFile ?? (_a.sourceFile = ts.createSourceFile(
-                this.currTarget.filePath,
-                this.currTarget.code,
-                languageVersionOrOptions,
-                true,
-                ts.ScriptKind.TSX
-              ));
-            }
-            return null;
-          };
-          const original2 = {
-            getSourceFile: host.getSourceFile,
-            getSourceFileByPath: host.getSourceFileByPath
-          };
-          host.getSourceFile = (fileName, languageVersionOrOptions, ...args) => {
-            return getTargetSourceFile(fileName, languageVersionOrOptions) ?? original2.getSourceFile.call(
-              host,
-              fileName,
-              languageVersionOrOptions,
-              ...args
-            );
-          };
-          host.getSourceFileByPath = (fileName, path6, languageVersionOrOptions, ...args) => {
-            return getTargetSourceFile(fileName, languageVersionOrOptions) ?? original2.getSourceFileByPath.call(
-              host,
-              fileName,
-              path6,
-              languageVersionOrOptions,
-              ...args
-            );
-          };
-        }
-        return ts.createAbstractBuilder(
-          rootNames,
-          options,
-          host,
-          oldProgram,
-          configFileParsingDiagnostics,
-          projectReferences
-        );
-      },
+      createAbstractBuilder,
       (diagnostic) => {
         throw new Error(formatDiagnostics(ts, [diagnostic]));
       },
@@ -2138,6 +2149,8 @@ import {
 var READ_FLAG = 1;
 var WRITE_FLAG = 2;
 var READ_WRITE_FLAG = 3;
+var REFERENCE_TYPE_VALUE_FLAG = 1;
+var REFERENCE_TYPE_TYPE_FLAG = 2;
 function getProgramScope(scopeManager) {
   const globalScope = scopeManager.globalScope;
   return globalScope.childScopes.find((s) => s.type === "module") || globalScope;
@@ -2171,15 +2184,25 @@ function removeAllScopeAndVariableAndReference(target, info) {
     removeScope(info.scopeManager, scope);
   }
 }
-function addVirtualReference(node, variable, scope, readWrite) {
+function addVirtualReference(node, variable, scope, status) {
   const reference = new ReferenceClass(
     node,
     scope,
-    readWrite.write && readWrite.read ? READ_WRITE_FLAG : readWrite.write ? WRITE_FLAG : READ_FLAG
+    status.write && status.read ? READ_WRITE_FLAG : status.write ? WRITE_FLAG : READ_FLAG,
+    void 0,
+    // writeExpr
+    void 0,
+    // maybeImplicitGlobal
+    void 0,
+    // init
+    status.typeRef ? REFERENCE_TYPE_TYPE_FLAG : REFERENCE_TYPE_VALUE_FLAG
   );
   reference.astroVirtualReference = true;
   addReference(variable.references, reference);
   reference.resolved = variable;
+  if (status.forceUsed) {
+    variable.eslintUsed = true;
+  }
   return reference;
 }
 function addGlobalVariable(reference, scopeManager) {
@@ -2401,7 +2424,9 @@ function parseForESLint(code, options) {
               propsVariable,
               scope,
               {
-                read: true
+                read: true,
+                typeRef: true,
+                forceUsed: true
               }
             );
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "0.13.1",
+  "version": "0.13.3",
   "description": "Astro component parser for ESLint",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -69,8 +69,8 @@
     "@types/mocha": "^10.0.0",
     "@types/node": "^18.0.0",
     "@types/semver": "^7.3.9",
-    "@typescript-eslint/eslint-plugin": "~5.56.0",
-    "@typescript-eslint/parser": "~5.56.0",
+    "@typescript-eslint/eslint-plugin": "~5.57.0",
+    "@typescript-eslint/parser": "~5.57.0",
     "astro": "^2.0.0",
     "astro-eslint-parser": ">=0.1.0",
     "benchmark": "^2.1.4",
@@ -106,7 +106,7 @@
     "svelte": "^3.48.0",
     "tsup": "^6.2.3",
     "typescript": "~5.0.0",
-    "typescript-eslint-parser-for-extra-files": "^0.2.0"
+    "typescript-eslint-parser-for-extra-files": "^0.3.0"
   },
   "publishConfig": {
     "access": "public"