feat: support base for drivers

unjs · Mar 11, 2021 · 6844cd1 · 6844cd1
1 parent a9178a3
commit 6844cd1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/src/drivers/fs.ts b/src/drivers/fs.ts
@@ -5,13 +5,13 @@ import type { DriverFactory } from '../types'
 import { readFile, writeFile, readdirRecursive, rmRecursive, unlink } from './utils/node-fs'
 
 export interface FSStorageOptions {
-  dir: string
+  base: string
   ingore: string[]
   watchOptions: WatchOptions
 }
 
 export default <DriverFactory> function (opts: FSStorageOptions) {
-  if (!opts.dir) {
+  if (!opts.base) {
     throw new Error('dir is required')
   }
 
@@ -21,8 +21,8 @@ export default <DriverFactory> function (opts: FSStorageOptions) {
     ]
   }
 
-  opts.dir = resolve(opts.dir)
-  const r = (key: string) => join(opts.dir, key.replace(/:/g, '/'))
+  opts.base = resolve(opts.base)
+  const r = (key: string) => join(opts.base, key.replace(/:/g, '/'))
 
   let _watcher: FSWatcher
 
@@ -55,15 +55,15 @@ export default <DriverFactory> function (opts: FSStorageOptions) {
         return
       }
       return new Promise((resolve, reject) => {
-        _watcher = watch(opts.dir, {
+        _watcher = watch(opts.base, {
           ignoreInitial: true,
           ignored: opts.ingore,
           ...opts.watchOptions
         })
           .on('ready', resolve)
           .on('error', reject)
           .on('all', (eventName, path) => {
-            path = relative(opts.dir, path)
+            path = relative(opts.base, path)
             if (eventName === 'change' || eventName === 'add') {
               callback('update', path)
             } else if (eventName === 'unlink') {

diff --git a/src/drivers/localstorage.ts b/src/drivers/localstorage.ts
@@ -1,6 +1,7 @@
 import type { DriverFactory } from '../types'
 
 export interface LocalStorageOptions {
+  base?: string
   window?: typeof window
   localStorage?: typeof window.localStorage
 }
@@ -16,26 +17,35 @@ export default <DriverFactory>function (opts: LocalStorageOptions = {}) {
     throw new Error('localStorage not available')
   }
 
+  const r = (key: string) => (opts.base ? opts.base + ':' : '') + key
+
+
   let _storageListener: (ev: StorageEvent) => void
 
   return {
     hasItem (key) {
-      return Object.prototype.hasOwnProperty.call(opts.localStorage!, key)
+      return Object.prototype.hasOwnProperty.call(opts.localStorage!, r(key))
     },
     getItem (key) {
-      return opts.localStorage!.getItem(key)
+      return opts.localStorage!.getItem(r(key))
     },
     setItem (key, value) {
-      return opts.localStorage!.setItem(key, value)
+      return opts.localStorage!.setItem(r(key), value)
     },
     removeItem (key) {
-      return opts.localStorage!.removeItem(key)
+      return opts.localStorage!.removeItem(r(key))
     },
     getKeys () {
       return Object.keys(opts.localStorage!)
     },
-    clear () {
-      opts.localStorage!.clear()
+    clear() {
+      if (!opts.base) {
+        opts.localStorage!.clear()
+      } else {
+        for (const key of Object.keys(opts.localStorage!)) {
+          opts.localStorage?.removeItem(key)
+        }
+      }
       if (opts.window && _storageListener) {
         opts.window.removeEventListener('storage', _storageListener)
       }

diff --git a/test/drivers/fs.test.ts b/test/drivers/fs.test.ts
@@ -7,7 +7,7 @@ describe('drivers: fs', () => {
   const dir = resolve(__dirname, 'tmp')
 
   testDriver({
-    driver: driver({ dir }),
+    driver: driver({ base: dir }),
     additionalTests(ctx) {
       it('check filesystem', async () => {
         expect(await readFile(resolve(dir, 's1/a'))).toBe('test_data')