eslint-plugin-ember-template-lint 0.19.0 → 0.21.0

package/lib/config/base.js

@@ -1,20 +1,9 @@
 module.exports = {
   root: true,
 
-  plugins: ['ember-template-lint'],
+  plugins: {
+    'ember-template-lint': require('../index'),
+  },
 
-  rules: {},
-
-  overrides: [
-    {
-      files: ['**/*.hbs'],
-      parser: require.resolve('../parser/hbs-parser'),
-      processor: 'ember-template-lint/noop'
-    },
-    {
-      files: ['**/*.gts', '**/*.gjs'],
-      parser: 'ember-eslint-parser',
-      processor: 'ember-template-lint/noop'
-    },
-  ],
+  rules: {}
 };

package/lib/config/index.js

@@ -13,7 +13,8 @@ Object.entries(info.configs).forEach(([name, config]) => {
 });
 configs['config'] = {
   ...base,
-  rules: info.configuredRules
+  rules: info.configuredRules,
+  overrides: info.configuredOverrides,
 };
 
 module.exports = configs;

package/lib/config-legacy/base.js

@@ -0,0 +1,7 @@
+module.exports = {
+  root: true,
+
+  plugins: ['ember-template-lint'],
+
+  rules: {}
+};

package/lib/config-legacy/index.js

@@ -0,0 +1,21 @@
+const info = require('../ember-template-lint/info');
+const base = require('./base');
+
+const configs = {};
+
+Object.entries(info.configs).forEach(([name, config]) => {
+  Object.entries(config.rules).forEach(([name, conf]) => {
+    if (typeof conf == 'boolean') {
+      config.rules[name] = [conf ? 'error' : 'off'];
+    }
+  });
+  configs[name] = {...base, rules: config.rules};
+});
+configs['config'] = {
+  ...base,
+  rules: info.configuredRules,
+  overrides: info.configuredOverrides,
+};
+
+module.exports = configs;
+

package/lib/ember-template-lint/config.js

@@ -1,18 +1,35 @@
 const templateLintConfig = {
   rules: {},
   plugins: [],
+  overrides: [],
 };
 
+let current = templateLintConfig;
+
 function registerRule(name, config) {
-  templateLintConfig.rules[name] = Array.isArray(config) ? config[0] : config;
+  current.rules[name] = Array.isArray(config) ? config[0] : config;
 }
 
 function registerPlugin(name) {
-  templateLintConfig.plugins.push(name);
+  current.plugins.push(name);
+}
+
+function startOverride(files) {
+  current = {
+    files,
+    rules: {}
+  };
+  templateLintConfig.overrides.push(current);
+}
+
+function finishOverride() {
+  current = templateLintConfig;
 }
 
 module.exports = {
   registerRule,
   registerPlugin,
+  startOverride,
+  finishOverride,
   templateLintConfig
-};
+};

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

@@ -90,20 +90,44 @@ Object.values(configs).forEach((config) => {
   config.rules = rules;
 });
 
-
+// enable all rules
 const configuredRules = {};
+
+for (const rule of rules) {
+  configuredRules['ember-template-lint/' + rule] = [];
+  configuredRules['ember-template-lint/' + rule].push(2);
+  configuredRules['ember-template-lint/' + rule].push({ __placeholder__: true });
+}
+
 Object.entries(lintConfigs.configuredRules).forEach(([name, conf]) => {
-  if (conf.severity) {
-    configuredRules['ember-template-lint/' + name] = configuredRules['ember-template-lint/' + name] || [];
+  configuredRules['ember-template-lint/' + name] = [];
+  configuredRules['ember-template-lint/' + name].push(conf.severity);
+  if (typeof conf.config !== 'boolean') {
+    configuredRules['ember-template-lint/' + name].push(conf.config);
+  }
+});
+
+const configuredOverrides = [];
+
+for (const configuredOverride of lintConfigs.configuredOverrides) {
+  const configuredRules = {};
+  Object.entries(configuredOverride.rules).forEach(([name, conf]) => {
+    configuredRules['ember-template-lint/' + name] = [];
     configuredRules['ember-template-lint/' + name].push(conf.severity);
     if (typeof conf.config !== 'boolean') {
       configuredRules['ember-template-lint/' + name].push(conf.config);
     }
-  }
-});
+  });
+  configuredOverrides.push({
+    files: configuredOverride.files,
+    rules: configuredRules
+  });
+}
+
 
 module.exports = {
   configs: configs,
   rules: createRules(rules),
-  configuredRules: configuredRules
+  configuredRules,
+  configuredOverrides
 };

package/lib/ember-template-lint/worker.js

@@ -8,5 +8,6 @@ runAsWorker(async (options) => {
     configs: lint.config.loadedConfigurations,
     rules: Object.keys(lint.config.loadedRules),
     configuredRules: lint.config.rules,
+    configuredOverrides: lint.config.overrides,
   };
 });

package/lib/index.js

@@ -8,10 +8,9 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const configs = require('./config');
-const base = require('./config/base');
+const configs = require('./config-legacy');
+const base = require('./config-legacy/base');
 const templateRules = require('./ember-template-lint/info');
-const processor = require('./processor');
 
 //------------------------------------------------------------------------------
 // Plugin Definition
@@ -25,8 +24,5 @@ module.exports = {
   configs: {
     base,
     ...configs
-  },
-  processors: {
-    'noop': processor,
   }
 };

package/lib/rules/hbs-worker.js

@@ -113,12 +113,23 @@ async function _applyFixes(options, results, columnOffset) {
   return currentSource;
 }
 
-runAsWorker(async (filename, text, options, columnOffset=0) => {
+async function runTemplateLint(filename, text, options, columnOffset=0) {
   const Lint = await import('ember-template-lint');
   const lint = new Lint.default(options);
   process.env.emberTemplateLintFileName = filename;
   process.env.emberTemplateLintFixMode = false;
   await lint.loadConfig();
+  const processedConf = lint.config;
+  delete options.config;
+  await lint.loadConfig();
+  lint.config.rules = {
+    ...lint.config.rules,
+    ...processedConf.rules
+  };
+  lint.config.overrides = [
+    ...lint.config.overrides,
+    ...processedConf.overrides
+  ];
   let fileConfig = lint._moduleStatusCache.getConfigForFile(options);
   if (fileConfig.loadedRules['prettier']) {
     const rule = fileConfig.loadedRules['prettier'].prototype;
@@ -131,14 +142,16 @@ runAsWorker(async (filename, text, options, columnOffset=0) => {
 
   const messages = await lint.verify({
     source: text,
-    filePath: filename.replace('.gts', '.hbs')
+    filePath: filename,
   });
   process.env.emberTemplateLintFixMode = true;
   await _applyFixes.call(lint,{
     source: text,
-    filePath: filename.replace('.gts', '.hbs'),
+    filePath: filename,
   }, messages, columnOffset);
   return {
     messages,
   };
-});
+}
+
+runAsWorker(runTemplateLint);

package/lib/rules/lint.js

@@ -1,5 +1,6 @@
 'use strict';
 const synckit = require('synckit');
+const path = require('path');
 const DocumentLines = require('../utils/document');
 const { templateLintConfig } = require('../ember-template-lint/config');
 
@@ -22,7 +23,13 @@ function runTemplateLint(node, context) {
 
   try {
     const syncFn = synckit.createSyncFn(require.resolve('./hbs-worker'));
-    const response = syncFn(filename, text, { config: templateLintConfig }, columnOffset);
+    const config = JSON.parse(JSON.stringify(templateLintConfig));
+    for (const key of Object.keys(config.rules)) {
+      if (config.rules[key].__placeholder__) {
+        delete config.rules[key];
+      }
+    }
+    const response = syncFn(filename, text, { config, workingDir: path.dirname(filename) }, columnOffset);
     const lintMessages = response.messages;
     lintMessages.forEach((m) => {
       if (m.fix) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-ember-template-lint",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "Provide linting for ember template",
   "keywords": [
     "eslint",
@@ -10,20 +10,15 @@
   "author": "Patrick Pircher",
   "main": "lib/index.js",
   "repository": "patricklx/eslint-plugin-ember-template-lint",
-  "scripts": {
-    "test": "jest",
-    "lint:js": "eslint --cache .",
-    "test:watch": "jest --watchAll"
-  },
   "dependencies": {
-    "@glimmer/syntax": "^0.84.3",
-    "@typescript-eslint/parser": "^5.59.7",
-    "@typescript-eslint/typescript-estree": "^5.59.7",
+    "@glimmer/syntax": "^0.93.0",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@typescript-eslint/typescript-estree": "^8.16.0",
     "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",
+    "synckit": "^0.9.2",
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
@@ -33,7 +28,7 @@
     "ember-template-lint-plugin-prettier": "^5.0.0",
     "eslint": "^8.41.0",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-n": "^17.14.0",
     "jest": "^29.5.0"
   },
   "jest": {
@@ -47,5 +42,12 @@
   "license": "ISC",
   "files": [
     "lib/**/*.js"
-  ]
-}
+  ],
+  "scripts": {
+    "test": "pnpm run /test:.*/",
+    "test:jest": "jest",
+    "lint:js": "eslint --cache lib tests",
+    "lint:js:fix": "eslint --cache lib tests --fix",
+    "test-watch": "jest --watchAll"
+  }
+}

package/lib/processor.js

@@ -1,11 +0,0 @@
-
-
-module.exports = {
-  preprocess: (text, filename) => {
-    return [{text: text, filename}];
-  },
-  postprocess: (messages) => {
-    return messages.flat();
-  },
-  supportsAutofix: true
-};