eslint-plugin-ember-template-lint 0.15.0 → 0.17.0

package/README.md

@@ -57,14 +57,24 @@ require('eslint-plugin-ember-template-lint/lib/ember-teplate-lint/config').regis
 
 
 module.exports = {
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/base',
-    'plugin:ember-template-lint/config',
-    'plugin:ember-template-lint/recommended',
-    //optional:
-    'plugin:ember-template-lint/ember-template-lint-plugin-prettier:recommended'
-  ]
+  overrides: [
+    {
+      files: ['**/*.hbs'],
+      parser: 'ember-template-lint/lib/parser/hbs-parser',
+      extends: [
+        'plugin:ember-template-lint/config',
+        'plugin:ember-template-lint/recommended',
+      ],
+    },
+    {
+      files: ['**/*.gjs'],
+      parser: 'ember-eslint-parser',
+      extends: [
+        'plugin:ember-template-lint/config',
+        'plugin:ember-template-lint/recommended',
+      ],
+    },
+  ],
 };
 ```
 

package/lib/config/base.js

@@ -13,7 +13,7 @@ module.exports = {
     },
     {
       files: ['**/*.gts', '**/*.gjs'],
-      parser: require.resolve('../parser/gts-parser'),
+      parser: 'ember-eslint-parser',
       processor: 'ember-template-lint/noop'
     },
   ],

package/lib/ember-teplate-lint/info.js

@@ -58,8 +58,8 @@ class Rule {
     return {
       'Program': (node) => node.isHbs && visitor.enter(node),
       'Program:exit': (node) => node.isHbs && visitor.exit(node),
-      '__TEMPLATE__Template': visitor.enter,
-      '__TEMPLATE__Template:exit': visitor.exit,
+      'GlimmerTemplate': visitor.enter,
+      'GlimmerTemplate:exit': visitor.exit,
     };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-ember-template-lint",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "Provide linting for ember template",
   "keywords": [
     "eslint",
@@ -19,18 +19,18 @@
     "@glimmer/syntax": "^0.84.3",
     "@typescript-eslint/parser": "^5.59.7",
     "@typescript-eslint/typescript-estree": "^5.59.7",
-    "ember-template-imports": "^3.4.2",
-    "ember-template-lint": "^5.7.3",
-    "ember-template-recast": "^6.1.4",
+    "ember-eslint-parser": "^0.5.6",
+    "ember-template-recast": "^6.1.5",
+    "ember-template-lint": "^6.0.0",
     "prettier-linter-helpers": "^1.0.0",
     "synckit": "^0.8.5",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "ember-template-lint": "^5.7.3"
+    "ember-template-lint": "^6.0.0"
   },
   "devDependencies": {
-    "ember-template-lint-plugin-prettier": "^4.1.0",
+    "ember-template-lint-plugin-prettier": "^5.0.0",
     "eslint": "^8.41.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-node": "^11.1.0",

package/lib/parser/gts-parser.js

@@ -1,57 +0,0 @@
-const gts =  require('ember-template-imports');
-const typescriptParser =  require('@typescript-eslint/parser');
-const typescriptEstree = require('@typescript-eslint/typescript-estree');
-
-
-function replaceRange(s, start, end, substitute) {
-  return s.substring(0, start) + substitute + s.substring(end);
-}
-
-module.exports = {
-  parseForESLint(code, options) {
-    let jsCode = code;
-    const templateInfos = gts.parseTemplates(jsCode, options.filePath);
-    templateInfos.forEach((tpl) => {
-      const range = [tpl.start.index, tpl.end.index + tpl.end[0].length];
-      tpl.range = range;
-      const template = jsCode.slice(...range);
-      const lines = template.split('\n');
-      lines.forEach((line, i) => {
-        lines[i] = ' '.repeat(line.length);
-      });
-      const emptyText = '[`' + lines.join('\n').slice(4) + '`]';
-      jsCode = replaceRange(jsCode, ...range, emptyText);
-      const ast = {
-        type: '__TEMPLATE__Template',
-      };
-      ast.range = range;
-      ast.contents = template;
-      tpl.ast = ast;
-    });
-    const result = typescriptParser.parseForESLint(jsCode, options);
-    const visitorKeys = {...result.visitorKeys, '__TEMPLATE__Template': []};
-    result.ast.tokens.forEach((token) => {
-      if (token.type === 'Template') {
-        const range = [token.range[0] - 1, token.range[1] + 1];
-        const template = templateInfos.find(t => t.range[0] >= range[0] && t.range[1] <= range[1]);
-        if (!template) return;
-        const ast = template.ast;
-        ast.loc = token.loc;
-        Object.assign(token, ast);
-      }
-    });
-    typescriptEstree.simpleTraverse(result.ast, {
-      enter(node) {
-        if (node.type === 'TemplateLiteral') {
-          const range = [node.range[0] - 1, node.range[1] + 1];
-          const template = templateInfos.find(t => t.range[0] >= range[0] && t.range[1] <= range[1]);
-          if (!template) return;
-          const ast = template.ast;
-          Object.assign(node, ast);
-        }
-      }
-    });
-
-    return { ...result, visitorKeys };
-  }
-};