cspell-glob 5.16.0 → 5.18.0

package/dist/GlobMatcher.d.ts

@@ -26,6 +26,11 @@ interface NormalizedGlobMatchOptions {
      * @default: process.cwd()
      */
     root: string;
+    /**
+     * The directory to use as the current working directory.
+     * @default: process.cwd();
+     */
+    cwd: string;
     /**
      * Allows matching against directories with a leading `.`.
      *

package/dist/GlobMatcher.js

@@ -31,9 +31,9 @@ class GlobMatcher {
         const { mode = 'exclude' } = options;
         const isExcludeMode = mode !== 'include';
         _nodePath = (_a = options.nodePath) !== null && _a !== void 0 ? _a : _nodePath;
-        const { root = _nodePath.resolve(), dot = isExcludeMode, nodePath = _nodePath, nested = isExcludeMode, nobrace, } = options;
+        const { root = _nodePath.resolve(), dot = isExcludeMode, nodePath = _nodePath, nested = isExcludeMode, cwd = process.cwd(), nobrace, } = clean(options);
         const normalizedRoot = nodePath.resolve(nodePath.normalize(root));
-        this.options = { root: normalizedRoot, dot, nodePath, nested, mode, nobrace };
+        this.options = { root: normalizedRoot, dot, nodePath, nested, mode, nobrace, cwd };
         patterns = Array.isArray(patterns)
             ? patterns
             : typeof patterns === 'string'
@@ -122,4 +122,15 @@ function buildMatcherFn(patterns, options) {
     };
     return fn;
 }
+function clean(obj) {
+    if (typeof obj !== 'object')
+        return obj;
+    const r = obj;
+    for (const key of Object.keys(r)) {
+        if (r[key] === undefined) {
+            delete r[key];
+        }
+    }
+    return obj;
+}
 //# sourceMappingURL=GlobMatcher.js.map

package/dist/globHelper.d.ts

@@ -16,9 +16,24 @@ export declare function isGlobPatternWithOptionalRoot(g: GlobPattern): g is Glob
 export declare function isGlobPatternWithRoot(g: GlobPatternWithRoot | GlobPatternWithOptionalRoot): g is GlobPatternWithRoot;
 export declare function isGlobPatternNormalized(g: GlobPattern | GlobPatternNormalized): g is GlobPatternNormalized;
 export interface NormalizeOptions {
+    /**
+     * Indicates that the glob should be modified to match nested patterns.
+     *
+     * Example: `node_modules` becomes `**​/node_modules/​**`, `**​/node_modules`, and `node_modules/​**`
+     */
     nested: boolean;
+    /**
+     * This is the root to use for the glob if the glob does not already contain one.
+     */
     root: string;
-    nodePath: PathInterface;
+    /**
+     * This is the replacement for `${cwd}` in either the root or in the glob.
+     */
+    cwd?: string;
+    /**
+     * Optional path interface for working with paths.
+     */
+    nodePath?: PathInterface;
 }
 /**
  *
@@ -26,6 +41,7 @@ export interface NormalizeOptions {
  * @param options - Normalization options.
  */
 export declare function normalizeGlobPatterns(patterns: GlobPattern[], options: NormalizeOptions): GlobPatternNormalized[];
+export declare function normalizeGlobPattern(g: GlobPattern, options: NormalizeOptions): GlobPatternNormalized[];
 /**
  * Try to adjust the root of a glob to match a new root. If it is not possible, the original glob is returned.
  * Note: this does NOT generate absolutely correct glob patterns. The results are intended to be used as a

package/dist/globHelper.js

@@ -19,7 +19,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__testing__ = exports.normalizeGlobToRoot = exports.normalizeGlobPatterns = exports.isGlobPatternNormalized = exports.isGlobPatternWithRoot = exports.isGlobPatternWithOptionalRoot = exports.doesRootContainPath = exports.fileOrGlobToGlob = void 0;
+exports.__testing__ = exports.normalizeGlobToRoot = exports.normalizeGlobPattern = exports.normalizeGlobPatterns = exports.isGlobPatternNormalized = exports.isGlobPatternWithRoot = exports.isGlobPatternWithOptionalRoot = exports.doesRootContainPath = exports.fileOrGlobToGlob = void 0;
+/* eslint-disable no-irregular-whitespace */
 const Path = __importStar(require("path"));
 const { posix } = Path;
 const relRegExp = /^\.[\\/]/;
@@ -78,6 +79,11 @@ function isGlobPatternNormalized(g) {
     return 'rawGlob' in gr && 'rawRoot' in gr && typeof gr.rawGlob === 'string';
 }
 exports.isGlobPatternNormalized = isGlobPatternNormalized;
+/**
+ * @param pattern glob pattern
+ * @param nested when true add `**​/<glob>/​**`
+ * @returns the set of matching globs.
+ */
 function normalizePattern(pattern, nested) {
     pattern = pattern.replace(/^(!!)+/, '');
     const isNeg = pattern.startsWith('!');
@@ -121,27 +127,32 @@ function normalizeGlobPatterns(patterns, options) {
                 yield glob;
                 continue;
             }
-            yield* normalizeGlobPatternWithRoot(glob, options);
+            yield* normalizeGlobPattern(glob, options);
         }
     }
     return [...normalize()];
 }
 exports.normalizeGlobPatterns = normalizeGlobPatterns;
-function normalizeGlobPatternWithRoot(g, options) {
+function normalizeGlobPattern(g, options) {
     var _a;
-    const { root, nodePath: path, nested } = options;
+    const { root, nodePath: path = Path, nested, cwd = Path.resolve() } = options;
     g = !isGlobPatternWithOptionalRoot(g) ? { glob: g } : g;
     const gr = { ...g, root: (_a = g.root) !== null && _a !== void 0 ? _a : root };
     const rawRoot = gr.root;
     const rawGlob = g.glob;
     gr.glob = gr.glob.trim(); // trimGlob(g.glob);
+    if (gr.glob.startsWith('${cwd}')) {
+        gr.glob = gr.glob.replace('${cwd}', '');
+        gr.root = '${cwd}';
+    }
     if (gr.root.startsWith('${cwd}')) {
-        gr.root = path.join(path.resolve(), gr.root.replace('${cwd}', ''));
+        gr.root = path.resolve(gr.root.replace('${cwd}', cwd));
     }
     gr.root = path.resolve(root, path.normalize(gr.root));
     const globs = normalizePattern(gr.glob, nested);
     return globs.map((glob) => ({ ...gr, glob, rawGlob, rawRoot }));
 }
+exports.normalizeGlobPattern = normalizeGlobPattern;
 /**
  * Try to adjust the root of a glob to match a new root. If it is not possible, the original glob is returned.
  * Note: this does NOT generate absolutely correct glob patterns. The results are intended to be used as a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-glob",
-  "version": "5.16.0",
+  "version": "5.18.0",
   "description": "Glob matcher for cspell",
   "keywords": [
     "cspell",
@@ -46,9 +46,9 @@
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.2",
-    "@types/node": "^17.0.10",
+    "@types/node": "^17.0.13",
     "jest": "^27.4.7",
     "rimraf": "^3.0.2"
   },
-  "gitHead": "c5d994f58bdb48c4d16f1708607b28c8a7b52a65"
+  "gitHead": "ef4c46dfb6f2938724afb5332ea2fdf9b67d99e4"
 }