Merge pull request #1993 from ember-template-lint/decay-by-rule

ember-template-lint · Jun 16, 2021 · 55e92c9 · 55e92c9
2 parents 0acfbea + b5a31bd
commit 55e92c9
Show file tree

Hide file tree

Showing 6 changed files with 790 additions and 618 deletions.
diff --git a/bin/ember-template-lint.js b/bin/ember-template-lint.js
@@ -9,7 +9,11 @@ const fs = require('fs');
 const path = require('path');
 const { promisify } = require('util');
 
-const { getTodoStorageDirPath, getTodoConfig } = require('@ember-template-lint/todo-utils');
+const {
+  getTodoStorageDirPath,
+  getTodoConfig,
+  validateConfig,
+} = require('@ember-template-lint/todo-utils');
 const chalk = require('chalk');
 const getStdin = require('get-stdin');
 const globby = require('globby');
@@ -296,14 +300,6 @@ async function run() {
   let positional = options._;
   let config;
   let isOverridingConfig = _isOverridingConfig(options);
-  let todoInfo = {
-    added: 0,
-    removed: 0,
-    todoConfig: getTodoConfig(
-      options.workingDirectory,
-      getTodoConfigFromCommandLineOptions(options)
-    ),
-  };
 
   if (options.config) {
     try {
@@ -319,7 +315,25 @@ async function run() {
     options.configPath = false;
   }
 
+  let todoConfigResult = validateConfig(options.workingDirectory);
+
+  if (!todoConfigResult.isValid) {
+    console.error(todoConfigResult.message);
+    process.exitCode = 1;
+    return;
+  }
+
   let linter;
+  let todoInfo = {
+    added: 0,
+    removed: 0,
+    todoConfig: getTodoConfig(
+      options.workingDirectory,
+      'ember-template-lint',
+      getTodoConfigFromCommandLineOptions(options)
+    ),
+  };
+
   try {
     linter = new Linter({
       workingDir: options.workingDirectory,

diff --git a/lib/formatters/pretty.js b/lib/formatters/pretty.js
@@ -67,16 +67,16 @@ class PrettyPrinter {
         todoSummary += `, ${todoInfo.removed} todos removed`;
       }
 
-      if (todoInfo.todoConfig) {
-        let todoConfig = todoInfo.todoConfig;
+      if (todoInfo.todoConfig && todoInfo.todoConfig.daysToDecay) {
+        let daysToDecay = todoInfo.todoConfig.daysToDecay;
         let todoConfigSummary = [];
 
-        if (todoConfig.warn) {
-          todoConfigSummary.push(`warn after ${todoConfig.warn}`);
+        if (daysToDecay.warn) {
+          todoConfigSummary.push(`warn after ${daysToDecay.warn}`);
         }
 
-        if (todoConfig.error) {
-          todoConfigSummary.push(`error after ${todoConfig.error}`);
+        if (daysToDecay.error) {
+          todoConfigSummary.push(`error after ${daysToDecay.error}`);
         }
 
         if (todoConfigSummary.length) {

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     ]
   },
   "dependencies": {
-    "@ember-template-lint/todo-utils": "^8.1.0",
+    "@ember-template-lint/todo-utils": "^9.1.2",
     "chalk": "^4.1.1",
     "date-fns": "^2.22.1",
     "ember-template-recast": "^5.0.3",