cspell-glob 10.4.0-alpha.1 → 10.4.0

package/dist/index.d.ts

@@ -69,10 +69,10 @@ interface GlobPatternNormalized extends GlobPatternWithRoot {
  * @param root - absolute path to the directory that will be considered the root when testing the glob pattern.
  * @param path - optional node path methods - used for testing
  */
-declare function fileOrGlobToGlob(fileOrGlob: string | GlobPattern, root: string, path?: PathInterface): GlobPatternWithRoot;
-declare function isGlobPatternWithOptionalRoot(g: GlobPattern): g is GlobPatternWithOptionalRoot;
-declare function isGlobPatternWithRoot(g: GlobPattern): g is GlobPatternWithRoot;
-declare function isGlobPatternNormalized(g: GlobPattern | GlobPatternNormalized): g is GlobPatternNormalized;
+export declare function fileOrGlobToGlob(fileOrGlob: string | GlobPattern, root: string, path?: PathInterface): GlobPatternWithRoot;
+export declare function isGlobPatternWithOptionalRoot(g: GlobPattern): g is GlobPatternWithOptionalRoot;
+export declare function isGlobPatternWithRoot(g: GlobPattern): g is GlobPatternWithRoot;
+export declare function isGlobPatternNormalized(g: GlobPattern | GlobPatternNormalized): g is GlobPatternNormalized;
 interface NormalizeOptions {
   /**
    * Indicates that the glob should be modified to match nested patterns.
@@ -98,8 +98,8 @@ interface NormalizeOptions {
  * @param patterns - glob patterns to normalize.
  * @param options - Normalization options.
  */
-declare function normalizeGlobPatterns(patterns: GlobPattern[], options: NormalizeOptions): GlobPatternNormalized[];
-declare function workaroundPicomatchBug(glob: string): string;
+export declare function normalizeGlobPatterns(patterns: GlobPattern[], options: NormalizeOptions): GlobPatternNormalized[];
+export declare function workaroundPicomatchBug(glob: string): string;
 //#endregion
 //#region src/GlobMatcher.d.ts
 type Optional<T> = { [P in keyof T]?: T[P] | undefined; };
@@ -157,7 +157,7 @@ interface NormalizedGlobMatchOptions {
    */
   nobrace?: boolean | undefined;
 }
-declare class GlobMatcher {
+export declare class GlobMatcher {
   /**
    * @param filename full path of file to match against.
    * @returns a GlobMatch - information about the match.
@@ -199,5 +199,5 @@ declare class GlobMatcher {
   match(filename: string): boolean;
 }
 //#endregion
-export { type GlobMatch, type GlobMatchNoRule, type GlobMatchOptions, type GlobMatchRule, GlobMatcher, type GlobPattern, type GlobPatternNormalized, type GlobPatternWithOptionalRoot, type GlobPatternWithRoot, type NormalizeOptions, type PathInterface, type SimpleGlobPattern, fileOrGlobToGlob, isGlobPatternNormalized, isGlobPatternWithOptionalRoot, isGlobPatternWithRoot, normalizeGlobPatterns, workaroundPicomatchBug };
+export type { GlobMatch, GlobMatchNoRule, GlobMatchOptions, GlobMatchRule, GlobPattern, GlobPatternNormalized, GlobPatternWithOptionalRoot, GlobPatternWithRoot, NormalizeOptions, PathInterface, SimpleGlobPattern };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -449,7 +449,7 @@ var GlobMatcher = class {
 		this.patterns = globPatterns;
 		this.root = normalizedRoot;
 		this.dot = dot;
-		this.matchEx = buildMatcherFn(this.id, this.patterns, this.options);
+		this.matchEx = buildMatcherFn(this.id, globPatterns, this.options);
 	}
 	/**
 	* Check to see if a filename matches any of the globs.
@@ -503,8 +503,6 @@ function buildMatcherFn(_id, patterns, options) {
 			reg
 		};
 	});
-	const negRules = rules.filter((r) => r.isNeg);
-	const posRules = rules.filter((r) => !r.isNeg);
 	const mapRoots = /* @__PURE__ */ new Map();
 	const fn = (filename) => {
 		const fileUrl = builder.toFileURL(filename);
@@ -525,7 +523,9 @@ function buildMatcherFn(_id, patterns, options) {
 			}
 			return lastRel;
 		}
-		function testRules(rules, matched) {
+		function testRules() {
+			let result;
+			let lastMatchedPattern;
 			for (const rule of rules) {
 				const pattern = rule.pattern;
 				const root = pattern.root;
@@ -542,17 +542,21 @@ function buildMatcherFn(_id, patterns, options) {
 					const relPathToFile = relativeToRoot(rootURL);
 					isMatch = isRelativeValueNested(relPathToFile) && rule.fn(relPathToFile);
 				}
-				if (isMatch) return {
-					matched,
-					glob: pattern.glob,
-					root,
-					pattern,
-					index: rule.index,
-					isNeg: rule.isNeg
-				};
+				if (isMatch && (pattern.rawRoot !== lastMatchedPattern?.rawRoot || pattern.rawGlob !== lastMatchedPattern?.rawGlob)) {
+					result = {
+						matched: !rule.isNeg,
+						glob: pattern.glob,
+						root,
+						pattern,
+						index: rule.index,
+						isNeg: rule.isNeg
+					};
+					lastMatchedPattern = pattern;
+				}
 			}
+			return result;
 		}
-		return testRules(negRules, false) || testRules(posRules, true) || { matched: false };
+		return testRules() || { matched: false };
 	};
 	return fn;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-glob",
-  "version": "10.4.0-alpha.1",
+  "version": "10.4.0",
   "description": "Glob matcher for cspell",
   "publishConfig": {
     "access": "public",
@@ -55,7 +55,7 @@
     "watch": "tsdown -w"
   },
   "dependencies": {
-    "@cspell/url": "10.4.0-alpha.1",
+    "@cspell/url": "10.4.0",
     "picomatch": "^4.0.7"
   },
   "devDependencies": {
@@ -66,5 +66,5 @@
   "engines": {
     "node": ">=22.18.0"
   },
-  "gitHead": "628768a6e62b792e628189b41e63e12e5d3d8fe3"
+  "gitHead": "7e2bbb5e866c827ac5d2cf6b84bf3e1a016d0823"
 }