astro-eslint-parser 0.13.0 → 0.13.2

package/lib/index.d.ts

@@ -41,6 +41,7 @@ declare class Context {
 }
 declare class LinesAndColumns {
     private readonly lineStartIndices;
+    private readonly code;
     private readonly normalizedLineFeed;
     constructor(origCode: string);
     getLocFromIndex(index: number): {

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]));
       },
@@ -1621,6 +1632,7 @@ ${next}`;
       }
     }
     this.lineStartIndices = lineStartIndices;
+    this.code = origCode;
     this.normalizedLineFeed = new NormalizedLineFeed(normalizedCode, crs);
   }
   getLocFromIndex(index) {
@@ -1634,9 +1646,15 @@ ${next}`;
     };
   }
   getIndexFromLoc(loc) {
-    const lineStartIndex = this.lineStartIndices[loc.line - 1];
-    const positionIndex = lineStartIndex + loc.column;
-    return positionIndex;
+    const lineIndex = loc.line - 1;
+    if (this.lineStartIndices.length > lineIndex) {
+      const lineStartIndex = this.lineStartIndices[lineIndex];
+      const positionIndex = lineStartIndex + loc.column;
+      return positionIndex;
+    } else if (this.lineStartIndices.length === lineIndex) {
+      return this.code.length + loc.column;
+    }
+    return this.code.length + loc.column;
   }
   getNormalizedLineFeed() {
     return this.normalizedLineFeed;

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]));
       },
@@ -1587,6 +1598,7 @@ ${next}`;
       }
     }
     this.lineStartIndices = lineStartIndices;
+    this.code = origCode;
     this.normalizedLineFeed = new NormalizedLineFeed(normalizedCode, crs);
   }
   getLocFromIndex(index) {
@@ -1600,9 +1612,15 @@ ${next}`;
     };
   }
   getIndexFromLoc(loc) {
-    const lineStartIndex = this.lineStartIndices[loc.line - 1];
-    const positionIndex = lineStartIndex + loc.column;
-    return positionIndex;
+    const lineIndex = loc.line - 1;
+    if (this.lineStartIndices.length > lineIndex) {
+      const lineStartIndex = this.lineStartIndices[lineIndex];
+      const positionIndex = lineStartIndex + loc.column;
+      return positionIndex;
+    } else if (this.lineStartIndices.length === lineIndex) {
+      return this.code.length + loc.column;
+    }
+    return this.code.length + loc.column;
   }
   getNormalizedLineFeed() {
     return this.normalizedLineFeed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "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.55.0",
-    "@typescript-eslint/parser": "~5.55.0",
+    "@typescript-eslint/eslint-plugin": "~5.56.0",
+    "@typescript-eslint/parser": "~5.56.0",
     "astro": "^2.0.0",
     "astro-eslint-parser": ">=0.1.0",
     "benchmark": "^2.1.4",
@@ -81,7 +81,7 @@
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-formatter-codeframe": "^7.32.1",
-    "eslint-plugin-astro": "^0.25.0",
+    "eslint-plugin-astro": "^0.26.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-json-schema-validator": "^4.0.0",
     "eslint-plugin-jsonc": "^2.0.0",