fix: update glob dependency and improve file search logic in FileSystem class

Author: Codeneos

packages/cli/package.json

@@ -65,22 +65,20 @@
         "chalk": "^4.1.1",
         "commander": "^11.1.0",
         "esbuild-loader": "^4.0.3",
-        "glob": "^7.1.7",
+        "glob": "^11",
         "jest": "^29.7.0",
         "js-yaml": "^4.1.0",
         "log-symbols": "^4.0.0",
         "shx": "^0.3.4",
         "source-map-support": "^0.5.21",
         "ts-jest": "^29.1.1",
-        "ts-loader": "^9.3.1",
-        "ts-node": "^10.4.0",
+        "ts-loader": "^9.5",
+        "ts-node": "^10.9.0",
         "tsconfig-paths-webpack-plugin": "^3.5.2",
         "typescript": "5.1.6",
-        "webpack": "^5.88.2",
-        "webpack-cli": "^5.1.4",
-        "webpack-glob-entry": "^2.1.1",
-        "webpack-merge": "^5.9.0",
-        "webpack-node-externals": "^3.0.0"
+        "webpack": "^5.97",
+        "webpack-cli": "^6.0",
+        "webpack-merge": "^6.0"
     },
     "publisher": "curlybracket",
     "gitHead": "f16fa9dcbf7ef17328047ecb07ab4a7e6a94140a"

packages/core/package.json

@@ -52,6 +52,7 @@
     "dependencies": {
         "@vlocode/util": "workspace:*",
         "chalk": "^4.1.1",
+        "glob": "^11",
         "globby": "^11.0.4",
         "luxon": "^3.4.4",
         "memfs": "^3.2.2",

packages/core/src/fs/fileSystem.ts

@@ -1,5 +1,6 @@
 import { spreadAsync } from '@vlocode/util';
 import { minimatch, MinimatchOptions } from 'minimatch'
+import { Glob } from 'glob'
 
 export interface StatsOptions {
     /**
@@ -33,7 +34,7 @@ export interface FindOptions extends WriteOptions {
     /**
      * Single or multiple Working directories to use when searching. If not specified the current working directory is used.
      */
-    cwd?: string  | string[];
+    cwd?: string | string[];
     /**
      * Glob patterns of natches to exclude from the search
      */
@@ -58,7 +59,7 @@ export interface FindOptions extends WriteOptions {
     noCase?: boolean;
 }
 
-type GlobPatterns = string | string[] | RegExp | RegExp[];
+type GlobPatterns = string | string[];
 
 export enum FindType {
     file = 1,
@@ -185,55 +186,33 @@ export abstract class FileSystem {
      * }
      * ```
      */
-    public async *find(globPatterns: GlobPatterns, options?: FindOptions): AsyncGenerator<string> {
-        const inputCwd = options?.cwd;
-        if (Array.isArray(inputCwd)) {
-            // When multiple cwd's are specified, search each of them
-            for (const cwd of inputCwd) {
-                yield* this.find(globPatterns, { ...options, cwd: this.normalizeSeparators(cwd) });
-            }
-            return;
-        }
+    public async *find(patterns: GlobPatterns, options?: FindOptions): AsyncGenerator<string> {
+        const globs = (Array.isArray(patterns) ? patterns : [ patterns ]).flatMap(
+            pattern => (options?.cwd && Array.isArray(options.cwd) ? options.cwd : [ options?.cwd ]).map(
+                (cwd: string | undefined) => new Glob(pattern, { 
+                    cwd,
+                    withFileTypes: true,
+                    windowsPathsNoEscape: true,
+                    dotRelative: true,
+                    ignore: options?.exclude,
+                    noext: true, 
+                    nodir: options?.findType === FindType.file,
+                    maxDepth: options?.depth,
+                    nocase: options?.noCase 
+                })
+            )
+        );
 
-        const cwd = this.normalizeSeparators(inputCwd ?? process.cwd());
-        const patterns = this.compilePatterns(globPatterns);
-        const excludePatterns = options?.exclude ? this.compilePatterns(options?.exclude) : undefined;
-        const findType = typeof options?.findType === 'string'
-            ? (options?.findType === 'directory' ? FindType.directory : FindType.file)
-            : (options?.findType ?? FindType.file | FindType.directory);
-        const depth = options?.depth;
         let limit = options?.limit;
 
-        for (const info of await this.readDirectory(cwd)) {
-            const path = `${cwd}/${info.name}`;
-
-            // Exclude according to exclude patterns
-            if (excludePatterns?.some(pattern => pattern.test(info.name) || pattern.test(path))) {
-                continue;
-            }
-
-            if (info.isDirectory()) {
-                // Match directory
-                if (findType & FindType.directory) {
-                    if (patterns.some(pattern => pattern.test(info.name) || pattern.test(path))) {
-                        yield path;
-                        if (limit && --limit <= 0) {
-                            return;
-                        }
-                    }
-                }
-
-                if (depth === undefined || depth > 0) {
-                    // Search sub directories when depth is not specified or when depth is not yet reached
-                    yield* this.find(patterns, { ...options, cwd: path, depth: depth && depth - 1, limit });
-                }
-            } else if (info.isFile() && findType & FindType.file) {
-                // Match files?
-                if (patterns.some(pattern => pattern.test(info.name) || pattern.test(path))) {
-                    yield path;
-                    if (limit && --limit <= 0) {
-                        return;
-                    }
+        for (const glob of globs) {
+            for await (const file of glob) {                
+                if (options?.findType === FindType.directory && !file.isDirectory()) {
+                    continue;
+                }                
+                yield this.normalizeSeparators(file.fullpath());
+                if (limit !== undefined && --limit === 0) {
+                    return;
                 }
             }
         }
@@ -242,7 +221,7 @@ export abstract class FileSystem {
     private compilePatterns(patterns: GlobPatterns, options?: MinimatchOptions): RegExp[] {
         return (Array.isArray(patterns) ? patterns : [ patterns ]).map(pattern => {
             if (typeof pattern === 'string') {
-                const compiled = minimatch.makeRe(pattern, options);
+                const compiled = minimatch.makeRe(this.normalizeSeparators(pattern), options);
                 if (!compiled) {
                     throw new Error(`Invalid glob pattern: ${pattern}`);
                 }

packages/vscode-extension/package.json

@@ -1516,8 +1516,6 @@
         "@types/luxon": "^3.3.0",
         "@types/node": "^20.4.2",
         "@types/vscode": "^1.70.0",
-        "@types/webpack": "^5.28.1",
-        "@types/webpack-merge": "^4.1.5",
         "@vlocode/core": "workspace:*",
         "@vlocode/omniscript": "workspace:*",
         "@vlocode/salesforce": "workspace:*",
@@ -1542,17 +1540,15 @@
         "shx": "^0.3.4",
         "source-map-support": "^0.5.21",
         "ts-jest": "^29.1.1",
-        "ts-loader": "^9.4.0",
-        "ts-node": "^10.4.0",
+        "ts-loader": "^9.5",
+        "ts-node": "^10.9.0",
         "tsconfig-paths-webpack-plugin": "^3.5.2",
         "type-fest": "^2.12.2",
         "typescript": "5.1.6",
         "vlocity": "1.14.18",
         "vscode-languageclient": "^8.1.0",
-        "webpack": "^5.88.2",
-        "webpack-cli": "^5.1.4",
-        "webpack-glob-entry": "^2.1.1",
-        "webpack-merge": "^5.9.0",
-        "webpack-node-externals": "^3.0.0"
+        "webpack": "^5.97",
+        "webpack-cli": "^6.0",
+        "webpack-merge": "^6.0"
     }
 }