feat: allow driver getKey to receive base key (#26)

unjs · Sep 29, 2021 · 9fd89b1 · 9fd89b1
1 parent fe941c2
commit 9fd89b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/storage.ts b/src/storage.ts
@@ -39,8 +39,9 @@ export function createStorage (opts: CreateStorageOptions = {}): Storage {
 
   const getMounts = (base: string) => {
     return ctx.mountpoints
-      .filter(mountpoint => base!.length < mountpoint.length || base!.startsWith(mountpoint))
+      .filter(mountpoint => mountpoint.startsWith(base) || base!.startsWith(mountpoint))
       .map(mountpoint => ({
+        relativeBase: base.length > mountpoint.length ? base!.substr(mountpoint.length) : undefined,
         mountpoint,
         driver: ctx.mounts[mountpoint]
       }))
@@ -131,7 +132,7 @@ export function createStorage (opts: CreateStorageOptions = {}): Storage {
     async getKeys (base) {
       base = normalizeBase(base)
       const keyGroups = await Promise.all(getMounts(base).map(async (mount) => {
-        const rawKeys = await asyncCall(mount.driver.getKeys)
+        const rawKeys = await asyncCall(mount.driver.getKeys, mount.relativeBase)
         return rawKeys.map(key => mount.mountpoint + normalizeKey(key))
       }))
       const keys = keyGroups.flat()

diff --git a/src/types.ts b/src/types.ts
@@ -14,7 +14,7 @@ export interface Driver {
   setItem?: (key: string, value: string) => void | Promise<void>
   removeItem?: (key: string) => void | Promise<void>
   getMeta?: (key: string) => StorageMeta | Promise<StorageMeta>
-  getKeys: () => string[] | Promise<string[]>
+  getKeys: (base?: string) => string[] | Promise<string[]>
   clear?: () => void | Promise<void>
   dispose?: () => void | Promise<void>
   watch?: (callback: WatchCallback) => void | Promise<void>