fix working dir

patricklx · Nov 26, 2024 · 92c2b95 · 92c2b95
1 parent 1e5cd7c
commit 92c2b95
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 10 deletions.
diff --git a/lib/ember-template-lint/info.js b/lib/ember-template-lint/info.js
@@ -90,10 +90,17 @@ 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]) => {
-  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);
@@ -105,7 +112,7 @@ 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] || [];
+    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);

diff --git a/lib/rules/hbs-worker.js b/lib/rules/hbs-worker.js
@@ -119,6 +119,17 @@ async function runTemplateLint(filename, text, options, columnOffset=0) {
   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;

diff --git a/lib/rules/lint.js b/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) {

diff --git a/package.json b/package.json
@@ -11,10 +11,11 @@
   "main": "lib/index.js",
   "repository": "patricklx/eslint-plugin-ember-template-lint",
   "scripts": {
-    "test": "jest",
+    "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"
+    "test-watch": "jest --watchAll"
   },
   "dependencies": {
     "@glimmer/syntax": "^0.93.0",

diff --git a/test-projects/run-lint.js b/test-projects/run-lint.js
@@ -0,0 +1,20 @@
+const ESLint = require('eslint');
+const fs = require('fs');
+const path = require('path');
+
+
+
+async function run(filename) {
+  const lint = new ESLint.ESLint()
+  const r = await lint.lintText(fs.readFileSync(filename).toString(), {
+    filePath: path.resolve(filename),
+  });
+
+  console.log(filename)
+  console.log(r[0].messages);
+}
+
+run('./gjs/src/placeholer.gjs');
+run('./gts/src/await.gts');
+run('./gjs/src/placeholer.gjs');
+
diff --git a/tests/lib/gts-test.js b/tests/lib/gts-test.js
@@ -37,15 +37,13 @@ function initESLint(options) {
           files: ['**/*.hbs'],
           parser: 'ember-template-lint/lib/parser/hbs-parser',
           extends: [
-            'plugin:ember-template-lint/config',
             'plugin:ember-template-lint/recommended',
           ],
         },
         {
           files: ['**/*.gts'],
           parser: 'ember-eslint-parser',
           extends: [
-            'plugin:ember-template-lint/config',
             'plugin:ember-template-lint/recommended',
           ],
         },

diff --git a/tests/lib/hbs-test.js b/tests/lib/hbs-test.js
@@ -41,15 +41,13 @@ function initESLint(options) {
           files: ['**/*.hbs'],
           parser: require.resolve('../../lib/parser/hbs-parser'),
           extends: [
-            'plugin:ember-template-lint/config',
             'plugin:ember-template-lint/recommended',
           ],
         },
         {
           files: ['**/*.gts'],
           parser: 'ember-eslint-parser',
           extends: [
-            'plugin:ember-template-lint/config',
             'plugin:ember-template-lint/recommended',
           ],
         },