sliftutils 1.1.43 → 1.1.44

package/index.d.ts

@@ -1217,6 +1217,14 @@ declare module "sliftutils/storage/FileFolderAPI" {
         getAllKeys(): string[];
         get(key: string): Promise<FileStorage> | undefined;
     };
+    export declare const getFileStorageNested2: {
+        (key: string): Promise<FileStorage>;
+        clear(key: string): void;
+        clearAll(): void;
+        forceSet(key: string, value: Promise<FileStorage>): void;
+        getAllKeys(): string[];
+        get(key: string): Promise<FileStorage> | undefined;
+    };
     export declare const getFileStorage: {
         (): Promise<FileStorage>;
         reset(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "1.1.43",
+    "version": "1.1.44",
     "main": "index.js",
     "license": "MIT",
     "files": [

package/storage/BulkDatabase2/BulkDatabase2.ts

@@ -1,4 +1,4 @@
-import { getFileStorageNested } from "../FileFolderAPI";
+import { getFileStorageNested, getFileStorageNested2 } from "../FileFolderAPI";
 import { sort } from "socket-function/src/misc";
 import { getTimeUnique } from "socket-function/src/bits";
 import { BaseBulkDatabaseReader, buildFileBuffer, EMPTY_BUFFER, loadBulkDatabase } from "./BulkDatabaseFormat";
@@ -75,7 +75,7 @@ export class BulkDatabase2<T extends { key: string }> {
         blockCache.clear();
     }
 
-    private storage = lazy(async () => getFileStorageNested(`${BULK_ROOT_FOLDER}/${this.name}`));
+    private storage = lazy(async () => getFileStorageNested2(`${BULK_ROOT_FOLDER}/${this.name}`));
 
     // In-memory overlay of pending writes/deletes, observable so reads re-render when it changes. It
     // takes priority over the loaded readers, so writes are reflected in reads without reloading.

package/storage/FileFolderAPI.d.ts

@@ -129,6 +129,14 @@ export declare const getFileStorageNested: {
     getAllKeys(): string[];
     get(key: string): Promise<FileStorage> | undefined;
 };
+export declare const getFileStorageNested2: {
+    (key: string): Promise<FileStorage>;
+    clear(key: string): void;
+    clearAll(): void;
+    forceSet(key: string, value: Promise<FileStorage>): void;
+    getAllKeys(): string[];
+    get(key: string): Promise<FileStorage> | undefined;
+};
 export declare const getFileStorage: {
     (): Promise<FileStorage>;
     reset(): void;

package/storage/FileFolderAPI.tsx

@@ -379,6 +379,33 @@ export const getFileStorageNested = cache(async function getFileStorage(path: st
     }
     return wrapHandle(base);
 });
+// Supports if the user selects the folder that contains the data folder or the data folder directly. If pathStr is an absolute path (and we're in nodejs) we use it directly.
+export const getFileStorageNested2 = cache(async function getFileStorage(pathStr: string): Promise<FileStorage> {
+    let base: DirectoryWrapper;
+    pathStr = pathStr.replaceAll("\\", "/");
+    if (isNode()) {
+        if (path.isAbsolute(pathStr)) {
+            return wrapHandle(new NodeJSDirectoryHandleWrapper(pathStr));
+        }
+        base = new NodeJSDirectoryHandleWrapper(path.resolve("./data/"));
+    } else {
+        base = await getDirectoryHandle();
+        let dirs: string[] = [];
+        for await (const [name, entry] of base) {
+            if (entry.kind === "directory") {
+                dirs.push(name);
+            }
+        }
+        if (dirs.includes(".git") || dirs.includes("data")) {
+            base = await base.getDirectoryHandle("data", { create: true });
+        }
+    }
+    for (let part of pathStr.split("/")) {
+        if (!part) continue;
+        base = await base.getDirectoryHandle(part, { create: true });
+    }
+    return wrapHandle(base);
+});
 export const getFileStorage = lazy(async function getFileStorage(): Promise<FileStorage> {
     if (USE_INDEXED_DB) {
         return await getFileStorageIndexDB();