From a990a17a1177858433117065be62fa93f627e661 Mon Sep 17 00:00:00 2001 From: Joey Parrish Date: Mon, 21 Mar 2022 18:12:54 -0700 Subject: [PATCH] fix: replace parse-glob (#927) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Add module to replace parse-glob (fix 664) * Improve parseGlob for non-glob, path only argument * Minor fix to parseGlob handling backslash * chore: Generate JS * fix: update parse-glob tests to use the same framework as the other tests Co-authored-by: Jørn Andre Sundt --- dist/cli/htmlhint.js | 6 +- dist/cli/parse-glob.js | 23 +++ package-lock.json | 289 +++++++++++++++--------------------- package.json | 5 +- src/cli/htmlhint.ts | 2 +- src/cli/parse-glob.ts | 36 +++++ test/cli/parse-glob.spec.js | 29 ++++ 7 files changed, 214 insertions(+), 176 deletions(-) create mode 100644 dist/cli/parse-glob.js create mode 100644 src/cli/parse-glob.ts create mode 100644 test/cli/parse-glob.spec.js diff --git a/dist/cli/htmlhint.js b/dist/cli/htmlhint.js index a8a17d81c..1b7162053 100644 --- a/dist/cli/htmlhint.js +++ b/dist/cli/htmlhint.js @@ -6,7 +6,7 @@ const chalk = require("chalk"); const commander_1 = require("commander"); const fs_1 = require("fs"); const glob = require("glob"); -const parseGlob = require("parse-glob"); +const parse_glob_1 = require("./parse-glob"); const path_1 = require("path"); const node_fetch_1 = require("node-fetch"); const stripJsonComments = require("strip-json-comments"); @@ -231,7 +231,7 @@ function hintAllFiles(target, options, onFinished) { } function getGlobInfo(target) { target = target.replace(/\\/g, '/'); - const globInfo = parseGlob(target); + const globInfo = (0, parse_glob_1.parseGlob)(target); let base = (0, path_1.resolve)(globInfo.base); base += /\/$/.test(base) ? '' : '/'; let pattern = globInfo.glob; @@ -351,4 +351,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/dist/cli/parse-glob.js b/dist/cli/parse-glob.js new file mode 100644 index 000000000..a9ca0f4a9 --- /dev/null +++ b/dist/cli/parse-glob.js @@ -0,0 +1,23 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.parseGlob = void 0; +const isGlob = require("is-glob"); +function parseGlob(target) { + const recursiveTokenIndex = Math.max(target.indexOf('**/'), target.indexOf('**\\')); + const lastSlashIndex = Math.max(target.lastIndexOf('/'), target.lastIndexOf('\\')); + const baseGlobSepIndex = recursiveTokenIndex >= 0 ? recursiveTokenIndex : Math.max(lastSlashIndex, 0); + return { + base: target.substring(0, baseGlobSepIndex).replace(/[/\\]$/, '') || '.', + glob: target.substring(baseGlobSepIndex).replace(/^[/\\]/, ''), + is: { + glob: isGlob(target), + }, + path: { + basename: target + .substring(Math.max(lastSlashIndex, 0)) + .replace(/^[/\\]/, ''), + }, + }; +} +exports.parseGlob = parseGlob; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2UtZ2xvYi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGkvcGFyc2UtZ2xvYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxrQ0FBaUM7QUFFakMsU0FBZ0IsU0FBUyxDQUFDLE1BQWM7SUFVdEMsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUNsQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUNyQixNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUN2QixDQUFBO0lBQ0QsTUFBTSxjQUFjLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FDN0IsTUFBTSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsRUFDdkIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FDekIsQ0FBQTtJQUNELE1BQU0sZ0JBQWdCLEdBQ3BCLG1CQUFtQixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBRTlFLE9BQU87UUFDTCxJQUFJLEVBQUUsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLEdBQUc7UUFDeEUsSUFBSSxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQztRQUM5RCxFQUFFLEVBQUU7WUFDRixJQUFJLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQztTQUNyQjtRQUNELElBQUksRUFBRTtZQUNKLFFBQVEsRUFBRSxNQUFNO2lCQUNiLFNBQVMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBQUMsQ0FBQztpQkFDdEMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUM7U0FDekI7S0FDRixDQUFBO0FBQ0gsQ0FBQztBQWpDRCw4QkFpQ0MifQ== \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 51ac1a76e..c0b4b95cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,8 +13,8 @@ "chalk": "^4.1.2", "commander": "^8.3.0", "glob": "^7.2.0", + "is-glob": "^4.0.3", "node-fetch": "^2.6.2", - "parse-glob": "3.0.4", "strip-json-comments": "3.1.0", "xml": "1.0.1" }, @@ -28,8 +28,8 @@ "@rollup/plugin-node-resolve": "^13.0.6", "@types/async": "^3.2.10", "@types/glob": "^7.2.0", + "@types/is-glob": "4.0.2", "@types/node-fetch": "^2.5.12", - "@types/parse-glob": "^3.0.29", "@types/xml": "^1.0.6", "@typescript-eslint/eslint-plugin": "^5.10.0", "@typescript-eslint/parser": "^5.10.0", @@ -40,6 +40,7 @@ "husky": "^7.0.4", "jest": "^27.4.3", "lint-staged": "^12.1.2", + "parse-glob": "3.0.4", "prettier": "^2.4.1", "rimraf": "^3.0.2", "rollup": "^2.60.1", @@ -1699,6 +1700,12 @@ "@types/node": "*" } }, + "node_modules/@types/is-glob": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/is-glob/-/is-glob-4.0.2.tgz", + "integrity": "sha512-4j5G9Y5jljDSICQ1R2f/Rcyoj6DZmYGneny+p/cDkjep0rkqNg0W73Ty0bVjMUTZgLXHf8oiMjg1XC3CDwCz+g==", + "dev": true + }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -1763,12 +1770,6 @@ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, - "node_modules/@types/parse-glob": { - "version": "3.0.29", - "resolved": "https://registry.npmjs.org/@types/parse-glob/-/parse-glob-3.0.29.tgz", - "integrity": "sha1-akDsfr0kGO5p7jl+SOQhaSaKEL8=", - "dev": true - }, "node_modules/@types/parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", @@ -1978,27 +1979,6 @@ } } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -3695,27 +3675,6 @@ "node": ">=10.13.0" } }, - "node_modules/eslint/node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint/node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/eslint/node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -3964,27 +3923,6 @@ "node": ">= 6" } }, - "node_modules/fast-glob/node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fast-glob/node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -4095,27 +4033,6 @@ "node": ">= 8" } }, - "node_modules/findup-sync/node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/findup-sync/node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/flat-cache": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", @@ -4277,6 +4194,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, "dependencies": { "glob-parent": "^2.0.0", "is-glob": "^2.0.0" @@ -4285,14 +4203,39 @@ "node": ">=0.10.0" } }, + "node_modules/glob-base/node_modules/is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "dependencies": { + "is-extglob": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/glob-parent": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, "dependencies": { "is-glob": "^2.0.0" } }, + "node_modules/glob-parent/node_modules/is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "dependencies": { + "is-extglob": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/global-dirs": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", @@ -4671,6 +4614,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4679,6 +4623,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -4702,16 +4647,24 @@ } }, "node_modules/is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dependencies": { - "is-extglob": "^1.0.0" + "is-extglob": "^2.1.1" }, "engines": { "node": ">=0.10.0" } }, + "node_modules/is-glob/node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", @@ -6710,6 +6663,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, "dependencies": { "glob-base": "^0.3.0", "is-dotfile": "^1.0.0", @@ -6720,6 +6674,18 @@ "node": ">=0.10.0" } }, + "node_modules/parse-glob/node_modules/is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "dependencies": { + "is-extglob": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", @@ -9715,6 +9681,12 @@ "@types/node": "*" } }, + "@types/is-glob": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/is-glob/-/is-glob-4.0.2.tgz", + "integrity": "sha512-4j5G9Y5jljDSICQ1R2f/Rcyoj6DZmYGneny+p/cDkjep0rkqNg0W73Ty0bVjMUTZgLXHf8oiMjg1XC3CDwCz+g==", + "dev": true + }, "@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -9779,12 +9751,6 @@ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, - "@types/parse-glob": { - "version": "3.0.29", - "resolved": "https://registry.npmjs.org/@types/parse-glob/-/parse-glob-3.0.29.tgz", - "integrity": "sha1-akDsfr0kGO5p7jl+SOQhaSaKEL8=", - "dev": true - }, "@types/parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", @@ -9918,21 +9884,6 @@ "tsutils": "^3.21.0" }, "dependencies": { - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -11160,21 +11111,6 @@ "is-glob": "^4.0.3" } }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, "js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -11412,21 +11348,6 @@ "requires": { "is-glob": "^4.0.1" } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } } } }, @@ -11523,23 +11444,6 @@ "is-glob": "^4.0.0", "micromatch": "^4.0.2", "resolve-dir": "^1.0.1" - }, - "dependencies": { - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - } } }, "flat-cache": { @@ -11658,17 +11562,41 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, "requires": { "glob-parent": "^2.0.0", "is-glob": "^2.0.0" + }, + "dependencies": { + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "^1.0.0" + } + } } }, "glob-parent": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, "requires": { "is-glob": "^2.0.0" + }, + "dependencies": { + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "^1.0.0" + } + } } }, "global-dirs": { @@ -11955,12 +11883,14 @@ "is-dotfile": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true }, "is-extglob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", @@ -11975,11 +11905,18 @@ "dev": true }, "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "^2.1.1" + }, + "dependencies": { + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + } } }, "is-module": { @@ -13496,11 +13433,23 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, "requires": { "glob-base": "^0.3.0", "is-dotfile": "^1.0.0", "is-extglob": "^1.0.0", "is-glob": "^2.0.0" + }, + "dependencies": { + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "^1.0.0" + } + } } }, "parse-json": { diff --git a/package.json b/package.json index cc937017c..5a3155593 100644 --- a/package.json +++ b/package.json @@ -61,8 +61,8 @@ "chalk": "^4.1.2", "commander": "^8.3.0", "glob": "^7.2.0", + "is-glob": "^4.0.3", "node-fetch": "^2.6.2", - "parse-glob": "3.0.4", "strip-json-comments": "3.1.0", "xml": "1.0.1" }, @@ -73,8 +73,8 @@ "@rollup/plugin-node-resolve": "^13.0.6", "@types/async": "^3.2.10", "@types/glob": "^7.2.0", + "@types/is-glob": "4.0.2", "@types/node-fetch": "^2.5.12", - "@types/parse-glob": "^3.0.29", "@types/xml": "^1.0.6", "@typescript-eslint/eslint-plugin": "^5.10.0", "@typescript-eslint/parser": "^5.10.0", @@ -85,6 +85,7 @@ "husky": "^7.0.4", "jest": "^27.4.3", "lint-staged": "^12.1.2", + "parse-glob": "3.0.4", "prettier": "^2.4.1", "rimraf": "^3.0.2", "rollup": "^2.60.1", diff --git a/src/cli/htmlhint.ts b/src/cli/htmlhint.ts index 91bfe400a..48039e654 100644 --- a/src/cli/htmlhint.ts +++ b/src/cli/htmlhint.ts @@ -6,7 +6,7 @@ import { Command } from 'commander' import { existsSync, readFileSync, statSync } from 'fs' import * as glob from 'glob' import { IGlob } from 'glob' -import * as parseGlob from 'parse-glob' +import { parseGlob } from './parse-glob' import { dirname, resolve, sep } from 'path' import fetch from 'node-fetch' import * as stripJsonComments from 'strip-json-comments' diff --git a/src/cli/parse-glob.ts b/src/cli/parse-glob.ts new file mode 100644 index 000000000..08a46f01e --- /dev/null +++ b/src/cli/parse-glob.ts @@ -0,0 +1,36 @@ +import * as isGlob from 'is-glob' + +export function parseGlob(target: string): { + base: string + glob: string + is: { + glob: boolean + } + path: { + basename: string + } +} { + const recursiveTokenIndex = Math.max( + target.indexOf('**/'), + target.indexOf('**\\') + ) + const lastSlashIndex = Math.max( + target.lastIndexOf('/'), + target.lastIndexOf('\\') + ) + const baseGlobSepIndex = + recursiveTokenIndex >= 0 ? recursiveTokenIndex : Math.max(lastSlashIndex, 0) + + return { + base: target.substring(0, baseGlobSepIndex).replace(/[/\\]$/, '') || '.', + glob: target.substring(baseGlobSepIndex).replace(/^[/\\]/, ''), + is: { + glob: isGlob(target), + }, + path: { + basename: target + .substring(Math.max(lastSlashIndex, 0)) + .replace(/^[/\\]/, ''), + }, + } +} diff --git a/test/cli/parse-glob.spec.js b/test/cli/parse-glob.spec.js new file mode 100644 index 000000000..01e5a4f5d --- /dev/null +++ b/test/cli/parse-glob.spec.js @@ -0,0 +1,29 @@ +const { parseGlob } = require('../../dist/cli/parse-glob.js') +const parseGlobPkg = require('parse-glob') + +const testGlobs = [ + '!foo.js', + '*.js', + '**/abc.js', + 'abc/*.js', + 'abc/(aaa|bbb).js', + 'abc/[a-z].js', + 'abc/{a,b}.js', + 'abc/def/**/(ghi|jkl)*.{js,html}', + 'abc/def/ghi.js', + 'abc.js', + '/abc/def.js', +] + +describe('parseGlob', () => { + it('should work the same way as parseGlob package', () => { + for (const glob of testGlobs) { + const result = parseGlob(glob) + const pkgResult = parseGlobPkg(glob) + expect(result.base).toEqual(pkgResult.base) + expect(result.glob).toEqual(pkgResult.glob) + expect(result.is.glob).toEqual(pkgResult.is.glob) + expect(result.path.basename).toEqual(pkgResult.path.basename) + } + }) +})