From 7aa4eafcfb43040e6f29c6de7d0e9238032534c4 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 15 Dec 2021 20:18:48 -0500 Subject: [PATCH 1/2] feat: use cosmiconfig --- dist/cli/htmlhint.js | 74 ++++++++++++++++++----------------- package-lock.json | 92 +++++++++++--------------------------------- package.json | 2 +- src/cli/htmlhint.ts | 90 +++++++++++++++++++------------------------ 4 files changed, 103 insertions(+), 155 deletions(-) diff --git a/dist/cli/htmlhint.js b/dist/cli/htmlhint.js index a8a17d81c..f3ad73f38 100644 --- a/dist/cli/htmlhint.js +++ b/dist/cli/htmlhint.js @@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); const async_1 = require("async"); const chalk = require("chalk"); const commander_1 = require("commander"); +const cosmiconfig_1 = require("cosmiconfig"); const fs_1 = require("fs"); const glob = require("glob"); const parseGlob = require("parse-glob"); const path_1 = require("path"); const node_fetch_1 = require("node-fetch"); -const stripJsonComments = require("strip-json-comments"); const HTMLHint = require('../htmlhint.js').HTMLHint; const formatter = require('./formatter'); const pkg = require('../../package.json'); @@ -160,7 +160,43 @@ function hintAllFiles(target, options, onFinished) { const arrTargetMessages = []; let ruleset = options.ruleset; if (ruleset === undefined) { - ruleset = getConfig(cliOptions.config, globInfo.base, formatter); + let result; + const explorerSync = (0, cosmiconfig_1.cosmiconfigSync)('htmlhint'); + explorerSync.clearCaches(); + try { + let configPath = cliOptions.config; + if (configPath) { + result = explorerSync.load(configPath); + if (result == null) { + console.error(`Could not resolve config file at ${configPath}`); + process.exit(2); + } + else if (result.isEmpty) { + console.error('Config file is empty'); + process.exit(2); + } + ruleset = result.config; + } + else { + result = explorerSync.search(globInfo.base); + if (result == null || result.isEmpty) { + ruleset = {}; + configPath = ''; + } + else { + ruleset = result.config; + configPath = result.filepath; + } + } + formatter.emit('config', { + ruleset: ruleset, + configPath: configPath, + }); + } + catch (err) { + console.log(err); + process.exit(2); + } } const hintQueue = (0, async_1.queue)((filepath, next) => { const startTime = new Date().getTime(); @@ -256,38 +292,6 @@ function getGlobInfo(target) { pattern: pattern, }; } -function getConfig(configPath, base, formatter) { - if (configPath === undefined && (0, fs_1.existsSync)(base)) { - if ((0, fs_1.statSync)(base).isDirectory() === false) { - base = (0, path_1.dirname)(base); - } - while (base) { - const tmpConfigFile = (0, path_1.resolve)(base, '.htmlhintrc'); - if ((0, fs_1.existsSync)(tmpConfigFile)) { - configPath = tmpConfigFile; - break; - } - if (!base) { - break; - } - base = base.substring(0, base.lastIndexOf(path_1.sep)); - } - } - if (configPath !== undefined && (0, fs_1.existsSync)(configPath)) { - const config = (0, fs_1.readFileSync)(configPath, 'utf-8'); - let ruleset = {}; - try { - ruleset = JSON.parse(stripJsonComments(config)); - formatter.emit('config', { - ruleset: ruleset, - configPath: configPath, - }); - } - catch (e) { - } - return ruleset; - } -} function walkPath(globInfo, callback, onFinish) { let base = globInfo.base; const pattern = globInfo.pattern; @@ -351,4 +355,4 @@ function hintUrl(url, ruleset, callback) { } }, errorFn); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlhint.js","sourceRoot":"","sources":["../../src/cli/htmlhint.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlhint.js","sourceRoot":"","sources":["../../src/cli/htmlhint.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b75885e44..0df03f9be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,10 +12,10 @@ "async": "3.2.2", "chalk": "^4.1.2", "commander": "^8.3.0", + "cosmiconfig": "^7.0.1", "glob": "^7.2.0", "node-fetch": "^2.6.2", "parse-glob": "3.0.4", - "strip-json-comments": "3.1.0", "xml": "1.0.1" }, "bin": { @@ -54,7 +54,6 @@ "version": "7.16.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==", - "dev": true, "dependencies": { "@babel/highlight": "^7.16.0" }, @@ -312,7 +311,6 @@ "version": "7.15.7", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -343,7 +341,6 @@ "version": "7.16.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz", "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==", - "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.15.7", "chalk": "^2.0.0", @@ -357,7 +354,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -1272,8 +1268,7 @@ "node_modules/@types/parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "node_modules/@types/resolve": { "version": "1.17.1", @@ -1588,7 +1583,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "dependencies": { "color-convert": "^1.9.0" }, @@ -1761,7 +1755,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, "engines": { "node": ">=6" } @@ -2144,7 +2137,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "dependencies": { "color-name": "1.1.3" } @@ -2152,8 +2144,7 @@ "node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "node_modules/colorette": { "version": "2.0.16", @@ -2364,7 +2355,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", - "dev": true, "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -2380,7 +2370,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -2665,7 +2654,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, "dependencies": { "is-arrayish": "^0.2.1" } @@ -2689,7 +2677,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true, "engines": { "node": ">=0.8.0" } @@ -3612,7 +3599,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true, "engines": { "node": ">=4" } @@ -3712,7 +3698,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", - "dev": true, "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -3725,7 +3710,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, "engines": { "node": ">=4" } @@ -3809,8 +3793,7 @@ "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "node_modules/is-binary-path": { "version": "2.1.0", @@ -4149,8 +4132,7 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { "version": "3.13.1", @@ -4186,8 +4168,7 @@ "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" }, "node_modules/json-schema-traverse": { "version": "0.4.1", @@ -4275,8 +4256,7 @@ "node_modules/lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, "node_modules/lint-staged": { "version": "12.1.2", @@ -5615,7 +5595,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "dependencies": { "callsites": "^3.0.0" }, @@ -5682,7 +5661,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, "engines": { "node": ">=8" } @@ -6398,6 +6376,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz", "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==", + "dev": true, "engines": { "node": ">=8" } @@ -6406,7 +6385,6 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "dependencies": { "has-flag": "^3.0.0" }, @@ -6808,7 +6786,6 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, "engines": { "node": ">= 6" } @@ -6978,7 +6955,6 @@ "version": "7.16.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==", - "dev": true, "requires": { "@babel/highlight": "^7.16.0" } @@ -7245,8 +7221,7 @@ "@babel/helper-validator-identifier": { "version": "7.15.7", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", - "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", - "dev": true + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==" }, "@babel/helpers": { "version": "7.10.1", @@ -7276,7 +7251,6 @@ "version": "7.16.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz", "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==", - "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.15.7", "chalk": "^2.0.0", @@ -7287,7 +7261,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -8005,8 +7978,7 @@ "@types/parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true + "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "@types/resolve": { "version": "1.17.1", @@ -8209,7 +8181,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -8351,8 +8322,7 @@ "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, "camelcase": { "version": "6.0.0", @@ -8628,7 +8598,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -8636,8 +8605,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "colorette": { "version": "2.0.16", @@ -8813,7 +8781,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", - "dev": true, "requires": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -8826,7 +8793,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, "requires": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -9044,7 +9010,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, "requires": { "is-arrayish": "^0.2.1" } @@ -9064,8 +9029,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { "version": "8.4.1", @@ -9760,8 +9724,7 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "hasha": { "version": "5.2.0", @@ -9833,7 +9796,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", - "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -9842,8 +9804,7 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" } } }, @@ -9916,8 +9877,7 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "2.1.0", @@ -10182,8 +10142,7 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "js-yaml": { "version": "3.13.1", @@ -10210,8 +10169,7 @@ "json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" }, "json-schema-traverse": { "version": "0.4.1", @@ -10278,8 +10236,7 @@ "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, "lint-staged": { "version": "12.1.2", @@ -11261,7 +11218,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "requires": { "callsites": "^3.0.0" } @@ -11309,8 +11265,7 @@ "path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, "picomatch": { "version": "2.3.0", @@ -11857,13 +11812,13 @@ "strip-json-comments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz", - "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==" + "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==", + "dev": true }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "requires": { "has-flag": "^3.0.0" } @@ -12174,8 +12129,7 @@ "yaml": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" }, "yargs": { "version": "16.2.0", diff --git a/package.json b/package.json index 4434b3141..21802035f 100644 --- a/package.json +++ b/package.json @@ -75,10 +75,10 @@ "async": "3.2.2", "chalk": "^4.1.2", "commander": "^8.3.0", + "cosmiconfig": "^7.0.1", "glob": "^7.2.0", "node-fetch": "^2.6.2", "parse-glob": "3.0.4", - "strip-json-comments": "3.1.0", "xml": "1.0.1" }, "devDependencies": { diff --git a/src/cli/htmlhint.ts b/src/cli/htmlhint.ts index 91bfe400a..cc6eb157e 100644 --- a/src/cli/htmlhint.ts +++ b/src/cli/htmlhint.ts @@ -3,13 +3,13 @@ import { queue as asyncQueue, series as asyncSeries } from 'async' import * as chalk from 'chalk' import { Command } from 'commander' +import { cosmiconfigSync } from 'cosmiconfig' import { existsSync, readFileSync, statSync } from 'fs' import * as glob from 'glob' import { IGlob } from 'glob' import * as parseGlob from 'parse-glob' -import { dirname, resolve, sep } from 'path' +import { resolve, sep } from 'path' import fetch from 'node-fetch' -import * as stripJsonComments from 'strip-json-comments' import type { HTMLHint as IHTMLHint } from '../core/core' import type { Hint, Ruleset } from '../core/types' import { Formatter } from './formatter' @@ -248,7 +248,44 @@ function hintAllFiles( // init ruleset let ruleset = options.ruleset if (ruleset === undefined) { - ruleset = getConfig(cliOptions.config, globInfo.base, formatter) + let result + const explorerSync = cosmiconfigSync('htmlhint') + explorerSync.clearCaches() //debugging + + try { + let configPath = cliOptions.config + + // load config if directly passed + if (configPath) { + result = explorerSync.load(configPath) + + if (result == null) { + console.error(`Could not resolve config file at ${configPath}`) + process.exit(2) + } else if (result.isEmpty) { + console.error('Config file is empty') + process.exit(2) + } + ruleset = result.config as Ruleset + } else { + result = explorerSync.search(globInfo.base) + if (result == null || result.isEmpty) { + ruleset = {} as Ruleset + configPath = '' + } else { + ruleset = result.config as Ruleset + configPath = result.filepath + } + } + + formatter.emit('config', { + ruleset: ruleset, + configPath: configPath, + }) + } catch (err) { + console.log(err) + process.exit(2) + } } // hint queue @@ -367,53 +404,6 @@ function getGlobInfo(target: string): { } } -// search and load config -function getConfig( - configPath: string | undefined, - base: string, - formatter: Formatter -) { - if (configPath === undefined && existsSync(base)) { - // find default config file in parent directory - if (statSync(base).isDirectory() === false) { - base = dirname(base) - } - - while (base) { - const tmpConfigFile = resolve(base, '.htmlhintrc') - - if (existsSync(tmpConfigFile)) { - configPath = tmpConfigFile - break - } - - if (!base) { - break - } - - base = base.substring(0, base.lastIndexOf(sep)) - } - } - - // TODO: can configPath be undefined here? - if (configPath !== undefined && existsSync(configPath)) { - const config = readFileSync(configPath, 'utf-8') - let ruleset: Ruleset = {} - - try { - ruleset = JSON.parse(stripJsonComments(config)) - formatter.emit('config', { - ruleset: ruleset, - configPath: configPath, - }) - } catch (e) { - // ignore - } - - return ruleset - } -} - // walk path function walkPath( globInfo: { base: string; pattern: string; ignore?: string }, From aac0829063a34e78e3e8dabec983fe9c451711a7 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Wed, 15 Dec 2021 20:28:41 -0500 Subject: [PATCH 2/2] test: add tests --- .prettierignore | 3 +++ test/config/bad.json | 1 + test/config/good.json | 3 +++ test/executable.spec.js | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 test/config/bad.json create mode 100644 test/config/good.json diff --git a/.prettierignore b/.prettierignore index 6c31cb9d0..4f86cd497 100644 --- a/.prettierignore +++ b/.prettierignore @@ -31,3 +31,6 @@ CHANGELOG.md # Report created by test report.html + +# malformed test files +test/config/bad.json diff --git a/test/config/bad.json b/test/config/bad.json new file mode 100644 index 000000000..98232c64f --- /dev/null +++ b/test/config/bad.json @@ -0,0 +1 @@ +{ diff --git a/test/config/good.json b/test/config/good.json new file mode 100644 index 000000000..a403174a7 --- /dev/null +++ b/test/config/good.json @@ -0,0 +1,3 @@ +{ + "tag-pair": true +} diff --git a/test/executable.spec.js b/test/executable.spec.js index bba5bef47..da564f67b 100644 --- a/test/executable.spec.js +++ b/test/executable.spec.js @@ -67,3 +67,39 @@ describe('Executable', () => { }) } }) + +describe('Configfiles', () => { + it('Malformed config should error', (done) => { + ChildProcess.exec( + [ + 'node', + path.resolve(__dirname, '../../bin/htmlhint'), + path.resolve(__dirname, 'example.html'), + '--config', + 'config/bad.json', + ].join(' '), + (error, stdout, stderr) => { + expect(error).to.be.an('object') + expect(error.code).to.be.equal(2) + } + ) + done() + }) + + it('Good config should load and show enabled error', (done) => { + ChildProcess.exec( + [ + 'node', + path.resolve(__dirname, '../../bin/htmlhint'), + path.resolve(__dirname, 'example.html'), + '--config', + 'config/good.json', + ].join(' '), + (error, stdout, stderr) => { + expect(error).to.be.an('object') + expect(error.code).to.be.equal(2) + } + ) + done() + }) +})