eslint-plugin-ember-template-lint 0.2.0 → 0.5.0

package/lib/rules/config.js

@@ -14,7 +14,7 @@ const runTemplateLint = (text, filename, context, scopeVars=[], offset=0, option
     const diffs = response.diff;
     const document = new DocumentLines(text);
     diffs.forEach((d) => {
-      d.range = [d.offset, d.offset + d.deleteText.length];
+      d.range = [d.offset, d.offset + (d.deleteText?.length || 0)];
     });
     lintMessages.forEach((m) => {
       m.range = [

package/lib/rules/hbs-worker.js

@@ -1,21 +1,68 @@
 const { runAsWorker } = require('synckit');
 const { generateDifferences } = require('prettier-linter-helpers');
 
+async function _applyFixes(options, results) {
+  const { transform } = await import('ember-template-recast');
+  let currentSource = options.source;
+  let fixableIssues = results.filter((r) => r.isFixable);
+
+  // nothing to do, bail out
+  if (fixableIssues.length === 0) {
+    return currentSource;
+  }
+
+  let fileConfig = this._moduleStatusCache.getConfigForFile(options);
+
+  let ruleNames = new Set(fixableIssues.map((r) => r.rule));
+
+  for (let ruleName of ruleNames) {
+    let templateInfos = [{
+      template: currentSource,
+      columnOffset: 0,
+      isStrictMode: false
+    }];
+
+    for (let templateInfo of templateInfos) {
+
+      let rule = this._buildRule(ruleName, {
+        shouldFix: true,
+        filePath: options.filePath,
+        columnOffset: templateInfo.columnOffset,
+        rawSource: templateInfo.template,
+        isStrictMode: templateInfo.isStrictMode,
+        fileConfig,
+      });
+
+      let visitor = await rule.getVisitor();
+      let { code } = transform(templateInfo.template, () => visitor);
+
+      if (code !== templateInfo.template) {
+        const diffs = generateDifferences(templateInfo.template, code);
+        fixableIssues.filter(r => r.rule === ruleName).forEach((r, i) => {
+          r.fix = diffs[i];
+        });
+      }
+    }
+  }
+
+  return currentSource;
+}
+
 runAsWorker(async (filename, text, options) => {
   const Lint = await import('ember-template-lint');
   const lint = new Lint.default(options);
   process.env.emberTemplateLintFileName = filename;
   process.env.emberTemplateLintFixMode = false;
   const messages = await lint.verify({
-    source: text
+    source: text,
+    filePath: filename.replace('.gts', '.hbs')
   });
   process.env.emberTemplateLintFixMode = true;
-  const fixedText = (await lint.verifyAndFix({
-    source: text
-  })).output;
-  const diff = generateDifferences(text, fixedText);
+  await _applyFixes.call(lint,{
+    source: text,
+    filePath: filename.replace('.gts', '.hbs')
+  }, messages);
   return {
     messages,
-    diff
   };
 });

package/lib/rules/lint.js

@@ -4,52 +4,57 @@ const DocumentLines = require('../utils/document');
 const { templateLintConfig } = require('../ember-teplate-lint/config');
 
 function runTemplateLint(text, filename, context, scopeVars=[], offset=0) {
+  const originalDocument = new DocumentLines(text);
   try {
+    let columnOffset = 0;
+    let lineOffset = 0;
+    if (text.startsWith('\n')) {
+      text = text.slice(1);
+      lineOffset += 1;
+    }
+    columnOffset = text.match(/\s+/)[0].length;
+    text = text.split('\n').map(l => l.replace(new RegExp(`^\\s{1,${columnOffset}}`), '')).join('\n');
+    text = text.trim();
     const syncFn = synckit.createSyncFn(require.resolve('./hbs-worker'));
     const response = syncFn(filename, text, { config: templateLintConfig });
     const lintMessages = response.messages;
-    const diffs = response.diff;
     const document = new DocumentLines(text);
-    diffs.forEach((d) => {
-      d.range = [d.offset, d.offset + d.deleteText.length];
-    });
     lintMessages.forEach((m) => {
+      if (m.fix) {
+        const d = m.fix;
+        if (d.insertText) {
+          d.insertText = d.insertText.replace(/\n/g, '\n' + ' '.repeat(columnOffset));
+        }
+        m.fix.range = [d.offset, d.offset + (d.deleteText?.length || 0)];
+        m.range = m.fix.range;
+        const start = document.offsetToPosition(m.fix.range[0]);
+        const end = document.offsetToPosition(m.fix.range[1]);
+        m.fix.range = [
+          originalDocument.positionToOffset({
+            line: start.line + lineOffset,
+            character: start.character + columnOffset - 1
+          }),
+          originalDocument.positionToOffset({
+            line: end.line + lineOffset,
+            character: end.character + columnOffset - 1
+          })
+        ];
+        m.fix.range = m.fix.range.map(x => offset + x);
+        m.range = m.fix.range;
+        return;
+      }
       m.range = [
-        document.positionToOffset({
-          line: m.line - 1,
-          character: m.column - 1
+        originalDocument.positionToOffset({
+          line: m.line - 1 + lineOffset,
+          character: m.column + columnOffset - 1
         }),
-        document.positionToOffset({
-          line: m.endLine - 1,
-          character: m.endColumn - 1
+        originalDocument.positionToOffset({
+          line: m.endLine - 1 + lineOffset,
+          character: m.endColumn + columnOffset - 1
         })];
-      const isInside = (d) => d.range[0] >= m.range[0] && d.range[1] <= m.range[1];
-      const doesContain = (d) => d.range[0] <= m.range[0] && d.range[1] >= m.range[1];
-      const idx = diffs.findIndex(d => isInside(d) || doesContain(d));
-      if (idx !== -1) {
-        const d = diffs.splice(idx, 1);
-        m.fix = d[0];
-        m.fix.range = m.fix.range.map(x => offset + x);
-      }
       m.range = m.range.map(x => offset + x);
     });
 
-    if (diffs.length) {
-      diffs.forEach((d) => {
-        const range = d.range;
-        const [start, end] = range.map(index =>
-          context.getSourceCode().getLocFromIndex(index)
-        );
-        context.report({
-          fix: (fixer) => {
-            return fixer.replaceTextRange(range, d.fix.insertText || '');
-          },
-          loc: { start, end },
-          message: 'template error',
-        });
-      });
-    }
-
     lintMessages.forEach((msg) => {
       if (msg.rule === 'no-implicit-this') {
         if (scopeVars.includes(msg.source)) {
@@ -80,4 +85,4 @@ function runTemplateLint(text, filename, context, scopeVars=[], offset=0) {
 
 module.exports = {
   runTemplateLint
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-ember-template-lint",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "description": "Provide linting for ember template",
   "keywords": [
     "eslint",
@@ -17,13 +17,14 @@
   },
   "dependencies": {
     "@glimmer/syntax": "^0.84.3",
-    "typescript": "^5.0.4",
     "@typescript-eslint/parser": "^5.59.7",
     "@typescript-eslint/typescript-estree": "^5.59.7",
     "ember-template-imports": "^3.4.2",
-    "prettier-linter-helpers": "^1.0.0",
     "ember-template-lint": "^5.7.3",
-    "synckit": "^0.8.5"
+    "ember-template-recast": "^6.1.4",
+    "prettier-linter-helpers": "^1.0.0",
+    "synckit": "^0.8.5",
+    "typescript": "^5.0.4"
   },
   "peerDependencies": {
     "ember-template-lint": "^5.7.3"