cspell-glob 6.1.3 → 6.2.2

package/dist/GlobMatcher.d.ts

@@ -1,4 +1,4 @@
-import { PathInterface, GlobMatch, GlobPattern, GlobPatternWithRoot } from './GlobMatcherTypes';
+import { PathInterface, GlobMatch, GlobPattern, GlobPatternWithRoot, GlobPatternNormalized } from './GlobMatcherTypes';
 declare type Optional<T> = {
     [P in keyof T]?: T[P] | undefined;
 };
@@ -64,7 +64,7 @@ export declare class GlobMatcher {
     readonly matchEx: (filename: string) => GlobMatch;
     readonly path: PathInterface;
     readonly patterns: GlobPatternWithRoot[];
-    readonly patternsNormalizedToRoot: GlobPatternWithRoot[];
+    readonly patternsNormalizedToRoot: GlobPatternNormalized[];
     readonly root: string;
     readonly dot: boolean;
     readonly options: NormalizedGlobMatchOptions;

package/dist/GlobMatcher.js

@@ -34,7 +34,7 @@ class GlobMatcher {
         const { mode = 'exclude' } = options;
         const isExcludeMode = mode !== 'include';
         _nodePath = options.nodePath ?? _nodePath;
-        const { root = _nodePath.resolve(), dot = isExcludeMode, nodePath = _nodePath, nested = isExcludeMode, cwd = process.cwd(), nobrace, } = clean(options);
+        const { root = _nodePath.resolve(), dot = isExcludeMode, nodePath = _nodePath, nested = isExcludeMode, cwd = process.cwd(), nobrace, } = options;
         const normalizedRoot = nodePath.resolve(nodePath.normalize(root));
         this.options = { root: normalizedRoot, dot, nodePath, nested, mode, nobrace, cwd };
         patterns = Array.isArray(patterns)
@@ -104,10 +104,11 @@ function buildMatcherFn(patterns, options) {
             for (const rule of rules) {
                 const pattern = rule.pattern;
                 const root = pattern.root;
-                if (!(0, globHelper_1.doesRootContainPath)(root, filename, path)) {
+                const isRelPat = !pattern.isGlobalPattern;
+                if (isRelPat && !(0, globHelper_1.doesRootContainPath)(root, filename, path)) {
                     continue;
                 }
-                const relName = path.relative(root, filename);
+                const relName = isRelPat ? path.relative(root, filename) : filename;
                 const fname = path.sep === '\\' ? relName.replace(/\\/g, '/') : relName;
                 if (rule.fn(fname)) {
                     return {
@@ -125,15 +126,4 @@ 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/GlobMatcherTypes.d.ts

@@ -41,6 +41,10 @@ export interface GlobPatternWithOptionalRoot {
 }
 export interface GlobPatternWithRoot extends GlobPatternWithOptionalRoot {
     root: string;
+    /**
+     * Global patterns do not need to be relative to the root.
+     */
+    isGlobalPattern: boolean;
 }
 export interface GlobPatternNormalized extends GlobPatternWithRoot {
     /** the original glob pattern before it was normalized */

package/dist/globHelper.d.ts

@@ -63,9 +63,11 @@ declare function rebaseGlob(glob: string, rebaseTo: string): string | undefined;
  * @returns trimmed glob
  */
 declare function trimGlob(glob: string): string;
+declare function isGlobalGlob(glob: string): boolean;
 export declare const __testing__: {
     rebaseGlob: typeof rebaseGlob;
     trimGlob: typeof trimGlob;
+    isGlobalGlob: typeof isGlobalGlob;
 };
 export {};
 //# sourceMappingURL=globHelper.d.ts.map

package/dist/globHelper.js

@@ -28,6 +28,8 @@ exports.__testing__ = exports.normalizeGlobToRoot = exports.normalizeGlobPattern
 const Path = __importStar(require("path"));
 const { posix } = Path;
 const relRegExp = /^\.[\\/]/;
+/** test for glob patterns starting with `**` */
+const isGlobalPatternRegExp = /^!*[*]{2}/;
 /**
  * This function tries its best to determine if `fileOrGlob` is a path to a file or a glob pattern.
  * @param fileOrGlob - file (with absolute path) or glob.
@@ -36,21 +38,19 @@ const relRegExp = /^\.[\\/]/;
  */
 function fileOrGlobToGlob(fileOrGlob, root, path = Path) {
     const pathToGlob = path.sep === '\\' ? (p) => p.replace(/\\/g, '/') : (p) => p;
-    if (typeof fileOrGlob !== 'string') {
+    const isGlobalPattern = false;
+    if (isGlobPatternWithOptionalRoot(fileOrGlob)) {
         const useRoot = fileOrGlob.root ?? root;
-        return { ...fileOrGlob, root: useRoot };
+        const isGlobalPattern = isGlobPatternWithRoot(fileOrGlob)
+            ? fileOrGlob.isGlobalPattern
+            : isGlobalGlob(fileOrGlob.glob);
+        return { ...fileOrGlob, root: useRoot, isGlobalPattern };
     }
     if (doesRootContainPath(root, fileOrGlob, path) || relRegExp.test(fileOrGlob)) {
         const rel = path.relative(root, path.resolve(root, fileOrGlob));
-        return {
-            glob: pathToGlob(rel),
-            root,
-        };
+        return { glob: pathToGlob(rel), root, isGlobalPattern };
     }
-    return {
-        glob: pathToGlob(fileOrGlob),
-        root,
-    };
+    return { glob: pathToGlob(fileOrGlob), root, isGlobalPattern };
 }
 exports.fileOrGlobToGlob = fileOrGlobToGlob;
 /**
@@ -70,7 +70,7 @@ function isGlobPatternWithOptionalRoot(g) {
 }
 exports.isGlobPatternWithOptionalRoot = isGlobPatternWithOptionalRoot;
 function isGlobPatternWithRoot(g) {
-    return !!g.root;
+    return typeof g.root === 'string' && 'isGlobalPattern' in g;
 }
 exports.isGlobPatternWithRoot = isGlobPatternWithRoot;
 function isGlobPatternNormalized(g) {
@@ -150,9 +150,10 @@ function normalizeGlobPattern(g, options) {
     if (gr.root.startsWith('${cwd}')) {
         gr.root = path.resolve(gr.root.replace('${cwd}', cwd));
     }
+    const isGlobalPattern = isGlobalGlob(gr.glob);
     gr.root = path.resolve(root, path.normalize(gr.root));
     const globs = normalizePattern(gr.glob, nested);
-    return globs.map((glob) => ({ ...gr, glob, rawGlob, rawRoot }));
+    return globs.map((glob) => ({ ...gr, glob, rawGlob, rawRoot, isGlobalPattern }));
 }
 exports.normalizeGlobPattern = normalizeGlobPattern;
 /**
@@ -174,6 +175,9 @@ function normalizeGlobToRoot(glob, root, path) {
     if (!relFromRootToGlob) {
         return glob;
     }
+    if (glob.isGlobalPattern) {
+        return { ...glob, root };
+    }
     const relFromGlobToRoot = path.relative(glob.root, root);
     const globIsUnderRoot = relFromRootToGlob[0] !== '.' && !path.isAbsolute(relFromRootToGlob);
     const rootIsUnderGlob = relFromGlobToRoot[0] !== '.' && !path.isAbsolute(relFromGlobToRoot);
@@ -277,8 +281,12 @@ function trimGlobLeft(glob) {
     }
     return glob.slice(i);
 }
+function isGlobalGlob(glob) {
+    return isGlobalPatternRegExp.test(glob);
+}
 exports.__testing__ = {
     rebaseGlob,
     trimGlob,
+    isGlobalGlob,
 };
 //# sourceMappingURL=globHelper.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-glob",
-  "version": "6.1.3",
+  "version": "6.2.2",
   "description": "Glob matcher for cspell",
   "keywords": [
     "cspell",
@@ -47,8 +47,8 @@
   "devDependencies": {
     "@types/micromatch": "^4.0.2",
     "@types/node": "^18.0.0",
-    "jest": "^28.1.1",
+    "jest": "^28.1.2",
     "rimraf": "^3.0.2"
   },
-  "gitHead": "e96b313542f2ec0a38ac04d1422d97e724ded3a6"
+  "gitHead": "b7716e80c39a780f98cde747ad66c55247636621"
 }