@spyglassmc/core 0.4.13 → 0.4.14

package/lib/common/externals/BrowserExternals.js

@@ -80,9 +80,6 @@ class BrowserFileSystem {
     async chmod(_location, _mode) {
         return;
     }
-    async getAllFiles(_location) {
-        return [];
-    }
     async mkdir(location, _options) {
         location = fileUtil.ensureEndingSlash(location.toString());
         if (this.states[location]) {
@@ -91,6 +88,10 @@ class BrowserFileSystem {
         this.states[location] = { type: 'directory' };
         this.saveStates();
     }
+    async readdir(_location) {
+        // Not implemented
+        return [];
+    }
     async readFile(location) {
         location = location.toString();
         const entry = this.states[location];

package/lib/common/externals/NodeJsExternals.js

@@ -2,7 +2,6 @@
 import chokidar from 'chokidar';
 import decompress from 'decompress';
 import followRedirects from 'follow-redirects';
-import globby from 'globby';
 import { Buffer } from 'node:buffer';
 import cp from 'node:child_process';
 import crypto from 'node:crypto';
@@ -72,14 +71,12 @@ export const NodeJsExternals = {
         chmod(location, mode) {
             return fsp.chmod(toFsPathLike(location), mode);
         },
-        async getAllFiles(location, depth) {
-            const path = toPath(location).replaceAll('\\', '/') + '**/*';
-            const files = await globby(path, { absolute: true, dot: true, deep: depth });
-            return files.map(uriFromPath);
-        },
         async mkdir(location, options) {
             return void (await fsp.mkdir(toFsPathLike(location), options));
         },
+        readdir(location) {
+            return fsp.readdir(toFsPathLike(location), { encoding: 'utf-8', withFileTypes: true });
+        },
         readFile(location) {
             return fsp.readFile(toFsPathLike(location));
         },
@@ -106,7 +103,10 @@ export const NodeJsExternals = {
             return fsp.unlink(toFsPathLike(location));
         },
         watch(locations, { usePolling = false } = {}) {
-            return new ChokidarWatcherWrapper(chokidar.watch(locations.map(toPath), { usePolling }));
+            return new ChokidarWatcherWrapper(chokidar.watch(locations.map(toPath), {
+                usePolling,
+                disableGlobbing: true,
+            }));
         },
         writeFile(location, data, options) {
             return fsp.writeFile(toFsPathLike(location), data, options);

package/lib/common/externals/index.d.ts

@@ -49,10 +49,6 @@ export interface ExternalFileSystem {
      * @param mode File mode bit mask (e.g. `0o775`).
      */
     chmod(location: FsLocation, mode: number): Promise<void>;
-    /**
-     * @returns an array of file URIs under the given `location`.
-     */
-    getAllFiles(location: FsLocation, depth?: number): Promise<string[]>;
     /**
      * @param options `mode` - File mode bit mask (e.g. `0o775`).
      */
@@ -60,6 +56,12 @@ export interface ExternalFileSystem {
         mode?: number;
         recursive?: boolean;
     }): Promise<void>;
+    readdir(location: FsLocation): Promise<{
+        name: string;
+        isDirectory(): boolean;
+        isFile(): boolean;
+        isSymbolicLink(): boolean;
+    }[]>;
     readFile(location: FsLocation): Promise<Uint8Array>;
     /**
      * Show the file/directory in the platform-specific explorer program.

package/lib/service/FileService.js

@@ -142,7 +142,7 @@ export class FileUriSupporter {
                 if (fileUtil.isFileUri(uri) && (await externals.fs.stat(uri)).isDirectory()) {
                     uri = fileUtil.ensureEndingSlash(uri);
                     roots.push(uri);
-                    files.set(uri, await externals.fs.getAllFiles(uri));
+                    files.set(uri, await fileUtil.getAllFiles(externals, uri));
                 }
             }
             catch (e) {

package/lib/service/fileUtil.d.ts

@@ -34,9 +34,6 @@ export declare namespace fileUtil {
     function isRootUri(uri: string): uri is RootUriString;
     function ensureEndingSlash(uri: string): RootUriString;
     function join(fromUri: string, toUri: string): string;
-    /**
-     * @throws If `uri` is not a valid URI.
-     */
     function isFileUri(uri: string): boolean;
     /**
      * @returns The part from the last `.` to the end of the URI, or `undefined` if no dots exist. No special treatment for leading dots.
@@ -63,6 +60,10 @@ export declare namespace fileUtil {
     function ensureParentOfFile(externals: Externals, path: FsLocation, mode?: number): Promise<void>;
     function chmod(externals: Externals, path: FsLocation, mode: number): Promise<void>;
     function ensureWritable(externals: Externals, path: FsLocation): Promise<void>;
+    /**
+     * @returns An array of file URI strings.
+     */
+    function getAllFiles(externals: Externals, root: FsLocation, depth?: number): Promise<string[]>;
     function markReadOnly(externals: Externals, path: FsLocation): Promise<void>;
     function unlink(externals: Externals, path: FsLocation): Promise<void>;
     function readFile(externals: Externals, path: FsLocation): Promise<Uint8Array>;

package/lib/service/fileUtil.js

@@ -72,9 +72,6 @@ export var fileUtil;
         return (ensureEndingSlash(fromUri) + (toUri.startsWith('/') ? toUri.slice(1) : toUri));
     }
     fileUtil.join = join;
-    /**
-     * @throws If `uri` is not a valid URI.
-     */
     function isFileUri(uri) {
         return uri.startsWith('file:');
     }
@@ -144,6 +141,31 @@ export var fileUtil;
         }
     }
     fileUtil.ensureWritable = ensureWritable;
+    /**
+     * @returns An array of file URI strings.
+     */
+    async function getAllFiles(externals, root, depth = Number.POSITIVE_INFINITY) {
+        async function walk(path, level) {
+            if (level > depth) {
+                return [];
+            }
+            const entries = await externals.fs.readdir(path);
+            return (await Promise.all(entries.map(async (e) => {
+                const entryPath = fileUtil.join(path.toString(), e.name);
+                if (e.isDirectory()) {
+                    return await walk(entryPath, level + 1);
+                }
+                else if (e.isFile()) {
+                    return entryPath;
+                }
+                else {
+                    return [];
+                }
+            }))).flat();
+        }
+        return walk(root, 0);
+    }
+    fileUtil.getAllFiles = getAllFiles;
     async function markReadOnly(externals, path) {
         return chmod(externals, path, 0o444);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/core",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -19,7 +19,6 @@
     "chokidar": "^3.5.2",
     "decompress": "^4.2.1",
     "follow-redirects": "^1.14.8",
-    "globby": "^11.0.4",
     "ignore": "^5.3.1",
     "pako": "^2.0.4",
     "rfdc": "^1.3.0",