fix(filesystem): resolve disk driver resolution bug that prevented regestering disks whose names didn't match driver names.

Author: exronnin

packages/filesystem/src/Driver.ts

@@ -1,4 +1,4 @@
-import { CustomDiskConfig, CustomDiskDriverRegistry, DriverConfig, FtpDriverConfig, LocalDriverConfig, S3DriverConfig } from './types'
+import { CustomDiskConfig, CustomDiskDriverRegistry, DiskConfig, FtpDriverConfig, LocalDriverConfig, S3DriverConfig } from './types'
 import { DriverContract, SignedURLOptions } from 'flydrive/types'
 
 import { FSDriver } from 'flydrive/drivers/fs'
@@ -18,17 +18,18 @@ export class Driver {
         DriverContract | (new (config?: CustomDiskConfig) => DriverContract)
     >()
 
-    constructor(private config: DriverConfig) { }
+    constructor(private config: DiskConfig) { }
 
     static make<K extends 'local' | 'ftp' | 's3' | (string & {})> (
-        name: K,
-        config: DriverConfig<K>
+        config: DiskConfig
     ): DriverFor<K> {
+        const name = config.driver
+
         if (!['local', 'ftp', 's3'].includes(name) && !this.customDrivers.has(name)) {
             throw new Error(`Unsupported driver: ${name}`)
         }
 
-        const driver = new Driver(config as never)
+        const driver = new Driver(config)
 
         if (this.customDrivers.has(name)) {
             return driver.custom(name) as DriverFor<K>

packages/filesystem/src/Storage.ts

@@ -23,8 +23,8 @@ export class Storage implements DriverContract {
             Driver.registerDriver(name, driver)
         }
 
-        for (const [disk, conf] of disks) {
-            this.services[disk] = () => Driver.make(disk, conf)
+        for (const [disk, config] of disks) {
+            this.services[disk] = () => Driver.make(config)
         }
 
         this.diskName = config('filesystem.default')

packages/filesystem/src/types.ts

@@ -46,7 +46,7 @@ export type CustomDiskConfig = keyof CustomDiskDriverRegistry extends never
     : { [K in keyof CustomDiskDriverRegistry]: CustomDiskDriverRegistry[K] & { driver: K } }[keyof CustomDiskDriverRegistry]
 
 export type DiskConfig =
-    | LocalDriverConfig & { driver: 'local' }
+    | LocalDriverConfig & { driver: 'local' | 'public' }
     | FtpDriverConfig & { driver: 'ftp' }
     | S3DriverConfig & { driver: 's3' }
     | CustomDiskConfig

packages/filesystem/tests/storage.test.ts

@@ -29,7 +29,7 @@ describe('Filesystem Storage', () => {
 
             Driver.registerDriver('memory', driver)
 
-            expect(Driver.make('memory', { driver: 'memory' } as never)).toBe(driver)
+            expect(Driver.make({ driver: 'memory' } as never)).toBe(driver)
 
             Driver.removeDriver('memory')
         })