cspell-glob 7.3.9 → 8.1.0

package/dist/esm/GlobMatcher.js

@@ -2,6 +2,17 @@ import mm from 'micromatch';
 import * as Path from 'path';
 import { doesRootContainPath, normalizeGlobPatterns, normalizeGlobToRoot } from './globHelper.js';
 export class GlobMatcher {
+    /**
+     * @param filename full path of file to match against.
+     * @returns a GlobMatch - information about the match.
+     */
+    matchEx;
+    path;
+    patterns;
+    patternsNormalizedToRoot;
+    root;
+    dot;
+    options;
     constructor(patterns, rootOrOptions, _nodePath) {
         _nodePath = _nodePath ?? Path;
         const options = typeof rootOrOptions === 'string' ? { root: rootOrOptions } : rootOrOptions ?? {};
@@ -64,15 +75,31 @@ function buildMatcherFn(patterns, options) {
         const isNeg = (matchNeg && matchNeg[0].length & 1 && true) || false;
         const reg = mm.makeRe(glob, makeReOptions);
         const fn = (filename) => {
-            const match = filename.match(reg);
-            return !!match;
+            reg.lastIndex = 0;
+            return reg.test(filename);
         };
         return { pattern, index, isNeg, fn, reg };
     });
     const negRules = rules.filter((r) => r.isNeg);
     const posRules = rules.filter((r) => !r.isNeg);
+    // const negRegEx = negRules.map((r) => r.reg).map((r) => r.toString());
+    // const posRegEx = posRules.map((r) => r.reg).map((r) => r.toString());
+    // console.error('buildMatcherFn %o', { negRegEx, posRegEx, stack: new Error().stack });
+    // const negReg = joinRegExp(negRegEx);
+    // const posReg = joinRegExp(posRegEx);
     const fn = (filename) => {
         filename = path.resolve(path.normalize(filename));
+        const fNameNormalize = path.sep === '\\' ? filename.replace(/\\/g, '/') : filename;
+        let lastRoot = '!!!!!!';
+        let lastRel = '';
+        function relativeToRoot(root) {
+            if (root !== lastRoot) {
+                lastRoot = root;
+                const relName = path.relative(root, filename);
+                lastRel = path.sep === '\\' ? relName.replace(/\\/g, '/') : relName;
+            }
+            return lastRel;
+        }
         function testRules(rules, matched) {
             for (const rule of rules) {
                 const pattern = rule.pattern;
@@ -81,8 +108,7 @@ function buildMatcherFn(patterns, options) {
                 if (isRelPat && !doesRootContainPath(root, filename, path)) {
                     continue;
                 }
-                const relName = isRelPat ? path.relative(root, filename) : filename;
-                const fname = path.sep === '\\' ? relName.replace(/\\/g, '/') : relName;
+                const fname = isRelPat ? relativeToRoot(root) : fNameNormalize;
                 if (rule.fn(fname)) {
                     return {
                         matched,
@@ -99,4 +125,11 @@ function buildMatcherFn(patterns, options) {
     };
     return fn;
 }
+// function _joinRegExp(patterns: RegExp[]): RegExp | undefined {
+//     if (!patterns.length) {
+//         return undefined;
+//     }
+//     const joined = patterns.map((p) => `(?:${p.source})`).join('|');
+//     return new RegExp(joined);
+// }
 //# sourceMappingURL=GlobMatcher.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-glob",
-  "version": "7.3.9",
+  "version": "8.1.0",
   "description": "Glob matcher for cspell",
   "keywords": [
     "cspell",
@@ -45,13 +45,13 @@
     "url": "https://github.com/streetsidesoftware/cspell/labels/cspell-glob"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "dependencies": {
     "micromatch": "^4.0.5"
   },
   "devDependencies": {
-    "@types/micromatch": "^4.0.4"
+    "@types/micromatch": "^4.0.6"
   },
-  "gitHead": "77c7fb3ffd80a626ec07d704cefcaa21d62fd460"
+  "gitHead": "28568808deaf39b9ffa71fd0f722441ff1b8c794"
 }