ember-eslint-parser 0.3.5 → 0.3.7

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.5",
+  "version": "0.3.7",
   "description": "",
   "keywords": [],
   "repository": {
@@ -20,6 +20,7 @@
   "devDependencies": {
     "@babel/core": "^7.23.6",
     "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/visitor-keys": "^6.21.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^9.1.0",

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/transforms.js

@@ -312,29 +312,45 @@ module.exports.preprocessGlimmerTemplates = function preprocessGlimmerTemplates(
 
       if (n.type === 'ElementNode') {
         n.name = n.tag;
-        n.parts = n.parts.map((p) => ({
-          ...p,
-          parent: n,
-          type: 'GlimmerElementNodePart',
-          name: p.value,
-          range: [
+        n.parts = n.parts.map((p) => {
+          const range = [
             offset + docLines.positionToOffset(p.loc.start),
             offset + docLines.positionToOffset(p.loc.end),
-          ],
-        }));
+          ];
+          const loc = {
+            start: codeLines.offsetToPosition(range[0]),
+            end: codeLines.offsetToPosition(range[1]),
+          };
+          return {
+            ...p,
+            parent: n,
+            type: 'GlimmerElementNodePart',
+            name: p.value,
+            range,
+            loc,
+          };
+        });
       }
 
       if ('blockParams' in n) {
         // program does have blockParams but not blockParamNodes
-        n.params = (n.blockParamNodes || []).map((p) => ({
-          ...p,
-          parent: n,
-          name: p.value,
-          range: [
+        n.params = (n.blockParamNodes || []).map((p) => {
+          const range = [
             offset + docLines.positionToOffset(p.loc.start),
             offset + docLines.positionToOffset(p.loc.end),
-          ],
-        }));
+          ];
+          const loc = {
+            start: codeLines.offsetToPosition(range[0]),
+            end: codeLines.offsetToPosition(range[1]),
+          };
+          return {
+            ...p,
+            parent: n,
+            name: p.value,
+            range,
+            loc,
+          };
+        });
       }
       n.type = `Glimmer${n.type}`;
       allNodeTypes.add(n.type);