feat!: simplify mount usage

README.md

@@ -245,7 +245,7 @@ Maps data to real filesystem using directory structure for nested keys. Supports
 ```js
 import fsDriver from 'unstorage/drivers/memory'
 
-await storage.mount('/tmp', fsDriver({ base: './tmp' }))
+storage.mount('/tmp', fsDriver({ base: './tmp' }))
 ```
 
 **Options:**
@@ -261,7 +261,7 @@ Store data in [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Wi
 ```js
 import lsDriver from 'unstorage/drivers/memory'
 
-await storage.mount('local', lsDriver({ base: 'myapp' }))
+storage.mount('local', lsDriver({ base: 'myapp' }))
 ```
 
 **Options:**
@@ -289,7 +289,7 @@ Use a remote HTTP/HTTPS endpoint as data storage. Supports built-in [http server
 ```js
 import httpDriver from 'unstorage/drivers/http'
 
-await storage.mount('local', lsDriver({ base: 'http://myapp.com' }))
+storage.mount('local', lsDriver({ base: 'http://myapp.com' }))
 ```
 
 **Options:**
@@ -337,7 +337,7 @@ const myStorageDriver = defineDriver((_opts) => {
   }
 })
 
-await storage.mount('/custom', myStorageDriver())
+storage.mount('/custom', myStorageDriver())
 ```
 
 ## Contribution

demo/main.js

@@ -3,11 +3,9 @@ import { createStorage } from '../src'
 import httpDriver from '../src/drivers/http'
 import App from './App.vue'
 
-async function main () {
+function main () {
   const storage = createStorage()
-  await storage.mount('/', httpDriver({
-    base: location.origin + '/storage'
-  }))
+    .mount('/', httpDriver({ base: location.origin + '/storage' }))
   const app = createApp(App)
   app.provide('storage', storage)
   app.mount('#app')

demo/vite.config.ts

@@ -16,10 +16,10 @@ export default defineConfig({
     vue(),
     {
       name: 'app',
-      async configureServer (server) {
+      configureServer (server) {
         const storage = createStorage()
         const storageServer = createStorageServer(storage)
-        await storage.mount('/src', fsdriver({ base: resolve(__dirname, '..') }))
+        storage.mount('/src', fsdriver({ base: resolve(__dirname, '..') }))
         server.middlewares.use('/storage', storageServer.handle)
       }
     }

src/cli.ts

@@ -18,7 +18,7 @@ async function main () {
   const storageServer = createStorageServer(storage)
 
   const rootDir = resolve(args._[0] || '.')
-  await storage.mount('/', fsDriver({ base: rootDir }))
+  storage.mount('/', fsDriver({ base: rootDir }))
 
   await listen(storageServer.handle, {
     name: 'Storage server',

src/storage.ts

@@ -108,20 +108,20 @@ export function createStorage (): Storage {
     async dispose () {
       await Promise.all(Object.values(ctx.mounts).map(driver => dispose(driver)))
     },
-    async mount (base, driver, initialState) {
+    mount (base, driver) {
       base = normalizeBase(base)
-      if (!ctx.mountpoints.includes(base)) {
+      if (base && ctx.mounts[base]) {
+        throw new Error(`already mounted at ${base}`)
+      }
+      if (base) {
         ctx.mountpoints.push(base)
         ctx.mountpoints.sort((a, b) => b.length - a.length)
       }
-      await storage.unmount(base)
       ctx.mounts[base] = driver
       if (ctx.watching) {
-        await watch(driver, onChange, base)
-      }
-      if (initialState) {
-        await storage.setItems(base, initialState)
+        Promise.resolve(watch(driver, onChange, base)).catch(console.error)
       }
+      return storage
     },
     async unmount (base: string, _dispose = true) {
       base = normalizeBase(base)

src/types.ts

@@ -22,7 +22,7 @@ export interface Storage {
   removeItem: (key: string) => Promise<void>
   getKeys: (base?: string) => Promise<string[]>
   clear: (base?: string) => Promise<void>
-  mount: (base: string, driver: Driver, initialState?: Record<string, StorageValue>) => Promise<void>
+  mount: (base: string, driver: Driver) => Storage
   unmount: (base: string, dispose?: boolean) => Promise<void>
   dispose: () => Promise<void>
   watch: (callback: WatchCallback) => Promise<void>

test/drivers/http.test.ts

@@ -9,7 +9,7 @@ describe('drivers: http', () => {
     const server = createStorageServer(storage)
 
     const { url, close } = await listen(server.handle)
-    await storage.mount('/http', driver({ base: url }))
+    storage.mount('/http', driver({ base: url }))
 
     expect(await storage.hasItem('/http/foo')).toBe(false)
 

test/drivers/utils.ts

@@ -17,7 +17,8 @@ export function testDriver (opts: TestOptions) {
   }
 
   it('init', async () => {
-    await ctx.storage.mount('/', ctx.driver, { initial: 'works' })
+    await ctx.storage.mount('/', ctx.driver)
+    await ctx.storage.setItems('', { initial: 'works' })
     expect(await ctx.storage.getItem('initial')).toBe('works')
     await ctx.storage.clear()
   })

test/storage.test.ts

@@ -8,8 +8,8 @@ const data = {
 
 describe('storage', () => {
   it('mount/unmount', async () => {
-    const storage = createStorage()
-    await storage.mount('/mnt', memory(), data)
+    const storage = createStorage().mount('/mnt', memory())
+    await storage.setItems('/mnt', data)
     expect(await snapshot(storage, '/mnt')).toMatchObject(data)
   })
 
@@ -21,8 +21,7 @@ describe('storage', () => {
 
   it('watch', async () => {
     const onChange = jest.fn()
-    const storage = createStorage()
-    await storage.mount('/mnt', memory(), data)
+    const storage = createStorage().mount('/mnt', memory())
     await storage.watch(onChange)
     await storage.setItems('/mnt', data)
     expect(onChange).toHaveBeenCalledWith('update', 'mnt:data:foo')