ember-eslint-parser 0.3.6 → 0.3.8

package/README.md

@@ -28,6 +28,9 @@ It's recommended to only use _overrides_ when defining your eslint config, so us
     },
 ```
 
+if we detect a typescript parser, it will also be used for all files, otherwise babel parser will be used.
+If we cannot find a typescript parser when linting gts we throw an error. 
+
 ## Support
 
 eslint-plugin-ember is the primary consumer of this parser library, so SemVer _may_ not be respected for other consumers.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-eslint-parser",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "",
   "keywords": [],
   "repository": {

package/src/parser/gjs-gts-parser.js

@@ -28,6 +28,11 @@ module.exports = {
     jsCode = info.output;
 
     const isTypescript = options.filePath.endsWith('.gts') || options.filePath.endsWith('.ts');
+    let useTypescript = true;
+
+    if (options.useBabel || !typescriptParser) {
+      useTypescript = false;
+    }
 
     let result = null;
     const filePath = options.filePath;
@@ -40,13 +45,19 @@ module.exports = {
     }
 
     try {
-      result = isTypescript
-        ? typescriptParser.parseForESLint(jsCode, { ...options, ranges: true, filePath })
-        : babelParser.parseForESLint(jsCode, {
-            ...options,
-            requireConfigFile: false,
-            ranges: true,
-          });
+      result =
+        isTypescript || useTypescript
+          ? typescriptParser.parseForESLint(jsCode, {
+              ...options,
+              ranges: true,
+              extraFileExtensions: ['.gts', '.gjs'],
+              filePath,
+            })
+          : babelParser.parseForESLint(jsCode, {
+              ...options,
+              requireConfigFile: false,
+              ranges: true,
+            });
       if (!info.templateInfos?.length) {
         return result;
       }
@@ -54,7 +65,7 @@ module.exports = {
       preprocessedResult.code = code;
       const { templateVisitorKeys } = preprocessedResult;
       const visitorKeys = { ...result.visitorKeys, ...templateVisitorKeys };
-      result.isTypescript = isTypescript;
+      result.isTypescript = isTypescript || useTypescript;
       convertAst(result, preprocessedResult, visitorKeys);
       if (result.services?.program) {
         syncMtsGtsSourceFiles(result.services?.program);

package/src/parser/ts-patch.js

@@ -23,15 +23,19 @@ try {
         ];
       },
       fileExists(fileName) {
-        return fs.existsSync(fileName.replace(/\.mts$/, '.gts')) || fs.existsSync(fileName);
+        return fs.existsSync(fileName.replace(/\.m?ts$/, '.gts')) || fs.existsSync(fileName);
       },
       readFile(fname) {
         let fileName = fname;
         let content = '';
+        if (fileName.endsWith('tsconfig.tsbuildinfo')) {
+          return content;
+        }
+
         try {
           content = fs.readFileSync(fileName).toString();
         } catch {
-          fileName = fileName.replace(/\.mts$/, '.gts');
+          fileName = fileName.replace(/\.m?ts$/, '.gts');
           content = fs.readFileSync(fileName).toString();
         }
         if (fileName.endsWith('.gts')) {
@@ -83,8 +87,8 @@ try {
     const sourceFiles = program.getSourceFiles();
     for (const sourceFile of sourceFiles) {
       // check for deleted gts files, need to remove mts as well
-      if (sourceFile.path.endsWith('.mts') && sourceFile.isVirtualGts) {
-        const gtsFile = program.getSourceFile(sourceFile.path.replace(/\.mts$/, '.gts'));
+      if (sourceFile.path.match(/\.m?ts$/) && sourceFile.isVirtualGts) {
+        const gtsFile = program.getSourceFile(sourceFile.path.replace(/\.m?ts$/, '.gts'));
         if (!gtsFile) {
           sourceFile.version = null;
         }
@@ -93,7 +97,10 @@ try {
         /**
          * @type {ts.SourceFile}
          */
-        const mtsSourceFile = program.getSourceFile(sourceFile.path.replace(/\.gts$/, '.mts'));
+        let mtsSourceFile = program.getSourceFile(sourceFile.path.replace(/\.gts$/, '.mts'));
+        if (!mtsSourceFile) {
+          mtsSourceFile = program.getSourceFile(sourceFile.path.replace(/\.gts$/, '.ts'));
+        }
         if (mtsSourceFile) {
           const keep = {
             fileName: mtsSourceFile.fileName,