@ostro/filesystem 0.0.0-alpha.3 → 0.0.0-alpha.4

package/filesystemAdapter.js

@@ -1,98 +1,98 @@
-const path = require('path')
-const FileNotFoundException = require('./fileNotFoundException')
-const FileDeleteException = require('./fileDeleteException')
-const FileUploadException = require('./fileUploadException')
-const DirectoryCreateException = require('./directoryCreateException')
-const kAdapter = Symbol('adapter')
-const kHandler = Symbol('handler')
-class FilesystemAdapter {
-    constructor($adapter, $handler) {
-        this[kAdapter] = $adapter;
-        this[kHandler] = $handler;
-    }
-
-    exists($path, options) {
-
-        return new Promise((resolve, reject) => {
-            this[kAdapter].has($path, options, (err, data, basePath) => {
-                this[kHandler].exists(null, (err ? false : true), resolve, $path, options, basePath)
-            })
-        })
-    }
-
-    path($path) {
-        return this[kAdapter].getAdapter().getPathPrefix().$path;
-    }
-
-    get($path, options) {
-
-        return new Promise((resolve, reject) => {
-            this[kAdapter].read($path, options, (err, data, basePath) => {
-                if (err) {
-                    this[kHandler].get(new FileNotFoundException(err), null, reject, $path, options, basePath)
-                } else {
-                    this[kHandler].get(null, (typeof data == 'function' ? data() : data), resolve, $path, options, basePath)
-                }
-            })
-        })
-    }
-
-    delete($path, ...rest) {
-        let callback = Array.from(rest).find(arg => typeof arg == 'function')
-        let options = Array.from(rest).find(arg => typeof arg == 'object') || {}
-        if (callback)
-            return this[kAdapter].delete($path, options, callback)
-        else {
-            return new Promise((resolve, reject) => {
-                this[kAdapter].delete($path, options, (err, data, basePath) => {
-                    if (err) {
-                        this[kHandler].delete(new FileDeleteException(err), null, reject, $path, options, basePath)
-                    } else {
-                        this[kHandler].delete(null, (typeof data == 'function' ? data() : data), resolve, $path, options, basePath)
-                    }
-                })
-            })
-        }
-    }
-
-    makeDirectory($path, options) {
-        return new Promise((resolve, reject) => {
-            this[kAdapter].createDir($path, options, (err, data, basePath) => {
-                if (err) {
-                    this[kHandler].createDir(new DirectoryCreateException(err), null, reject, $path, options, basePath)
-                } else {
-                    this[kHandler].createDir(null, (typeof data == 'function' ? data() : data), resolve, $path, options, basePath)
-                }
-            })
-        })
-    }
-
-    put($path, content, options = {}) {
-     
-        return new Promise((resolve, reject) => {
-            this[kAdapter].write($path, content, options, (err, data, basePath) => {
-                if (err) {
-                    this[kHandler].delete(new FileUploadException(err), null, reject, $path, options, basePath, content)
-                } else {
-                    this[kHandler].put(null, (typeof data == 'function' ? data() : data), resolve, $path, options, basePath)
-                }
-            })
-        })
-    }
-
-    putFile($path, $file, $options = {}) {
-        $options.filename = $file.getHashname()
-        return this.putFileAs($path, $file, $options);
-    }
-
-    putFileAs($path, $file, $name, $options = {}) {
-        $path = path.join($path,$name)
-        return this.put($path, $file.getBufferData(), $options);
-    }
-
-    getAdapter() {
-        return this[kAdapter];
-    }
-
-}
+const path = require('path')
+const FileNotFoundException = require('./fileNotFoundException')
+const FileDeleteException = require('./fileDeleteException')
+const FileUploadException = require('./fileUploadException')
+const DirectoryCreateException = require('./directoryCreateException')
+const kAdapter = Symbol('adapter')
+const kHandler = Symbol('handler')
+class FilesystemAdapter {
+    constructor($adapter, $handler) {
+        this[kAdapter] = $adapter;
+        this[kHandler] = $handler;
+    }
+
+    exists($path, options) {
+
+        return new Promise((resolve, reject) => {
+            this[kAdapter].has($path, options, (err, data, basePath) => {
+                this[kHandler].exists(null, (err ? false : true), resolve, $path, options, basePath)
+            })
+        })
+    }
+
+    path($path) {
+        return this[kAdapter].getAdapter().getPathPrefix().$path;
+    }
+
+    get($path, options) {
+
+        return new Promise((resolve, reject) => {
+            this[kAdapter].read($path, options, (err, data, basePath) => {
+                if (err) {
+                    this[kHandler].get(new FileNotFoundException(err), null, reject, $path, options, basePath)
+                } else {
+                    this[kHandler].get(null, (typeof data == 'function' ? data() : data), resolve, $path, options, basePath)
+                }
+            })
+        })
+    }
+
+    delete($path, ...rest) {
+        let callback = Array.from(rest).find(arg => typeof arg == 'function')
+        let options = Array.from(rest).find(arg => typeof arg == 'object') || {}
+        if (callback)
+            return this[kAdapter].delete($path, options, callback)
+        else {
+            return new Promise((resolve, reject) => {
+                this[kAdapter].delete($path, options, (err, data, basePath) => {
+                    if (err) {
+                        this[kHandler].delete(new FileDeleteException(err), null, reject, $path, options, basePath)
+                    } else {
+                        this[kHandler].delete(null, (typeof data == 'function' ? data() : data), resolve, $path, options, basePath)
+                    }
+                })
+            })
+        }
+    }
+
+    makeDirectory($path, options) {
+        return new Promise((resolve, reject) => {
+            this[kAdapter].createDir($path, options, (err, data, basePath) => {
+                if (err) {
+                    this[kHandler].createDir(new DirectoryCreateException(err), null, reject, $path, options, basePath)
+                } else {
+                    this[kHandler].createDir(null, (typeof data == 'function' ? data() : data), resolve, $path, options, basePath)
+                }
+            })
+        })
+    }
+
+    put($path, content, options = {}) {
+     
+        return new Promise((resolve, reject) => {
+            this[kAdapter].write($path, content, options, (err, data, basePath) => {
+                if (err) {
+                    this[kHandler].delete(new FileUploadException(err), null, reject, $path, options, basePath, content)
+                } else {
+                    this[kHandler].put(null, (typeof data == 'function' ? data() : data), resolve, $path, options, basePath)
+                }
+            })
+        })
+    }
+
+    putFile($path, $file, $options = {}) {
+        $options.filename = $file.getHashname()
+        return this.putFileAs($path, $file, $options);
+    }
+
+    putFileAs($path, $file, $name, $options = {}) {
+        $path = path.join($path,$name)
+        return this.put($path, $file.getBufferData(), $options);
+    }
+
+    getAdapter() {
+        return this[kAdapter];
+    }
+
+}
 module.exports = FilesystemAdapter

package/filesystemManager.js

@@ -1,135 +1,88 @@
-require('@ostro/support/helpers')
-const { Macroable } = require('@ostro/support/macro')
-const ObjectGet = require('lodash.get')
-const InvalidArgumentException = require('./invalidArgumentException')
-const FilesystemAdapter = require('./filesystemAdapter')
-const callbackHandler = require('./callbackHandler')
-const util = require('util')
-const kApp = Symbol('app')
-const kDisks = Symbol('disks')
-const kHandler = Symbol('handler')
-const kCustomCreators = Symbol('customCreators')
-class FileSystemManager extends Macroable {
-    constructor($app) {
-        super()
-        Object.defineProperties(this, {
-            [kApp]: {
-                value: $app,
-            },
-            [kDisks]: {
-                value: Object.create(null),
-                writable: true,
-            },
-            [kCustomCreators]: {
-                value: Object.create(null),
-                writable: true,
-            },
-
-        })
-        this[kHandler] = this.getConfig('handler')
-        if (typeof this[kHandler] != 'function' || typeof this[kHandler] != 'object') {
-            this[kHandler] = callbackHandler
-        } else if (typeof this[kHandler] != 'object') {
-            this[kHandler] = this[kHandler].constructor
-            util.inherits(this[kHandler], callbackHandler)
-        } else {
-            util.inherits(this[kHandler], callbackHandler)
-        }
-        this[kHandler] = new this[kHandler]
-    }
-
-    drive($name = null) {
-        return this.disk($name);
-    }
-
-    driver($name = null) {
-        return this.disk($name);
-    }
-
-    disk(name = null) {
-        name = name ? name : this.getDefaultDriver();
-        return this[kDisks][name] = this.getDriver(name);
-    }
-    cloud() {
-        var name = this.getDefaultCloudDriver();
-        return this[kDisks][name] = this.getDriver(name);
-    }
-
-    getDriver(name) {
-        return this[kDisks][name] || this.resolve(name);
-    }
-
-    resolve($name) {
-        var config = this.getConfig($name);
-        if (!config) {
-            throw new InvalidArgumentException("Disk [{" + $name + "}] was not available.");
-        }
-        var driverMethod = 'create' + (config['driver']).ucfirst() + 'Driver';
-        if ((this[kCustomCreators][config['driver']])) {
-            return this.callCustomCreator(config);
-        } else if (this[driverMethod]) {
-            return this[driverMethod](config);
-        } else {
-            throw new InvalidArgumentException("Driver [{" + config['driver'] + "}] is not supported.");
-        }
-    }
-
-    callCustomCreator($config) {
-        return this[kCustomCreators][$config['driver']];
-    }
-
-    createLocalDriver($config) {
-        return this.adapt(new(require('./adapter/local'))($config['root'], $config), $config);
-    }
-
-    createAzureDriver($config) {
-        return this.adapt(new(require('./adapter/azure'))(new(require('./clients/azure'))($config), $config), $config);
-    }
-
-    createS3Driver($config) {
-        return this.adapt(new(require('./adapter/s3'))(new(require('./clients/s3'))($config), $config), $config);
-    }
-
-    adapt(adapter, config) {
-        return new FilesystemAdapter(adapter, this[kHandler]);
-    }
-
-    getConfig(name) {
-        return ObjectGet(this[kApp]['config']['filesystem']['disks'], name);
-    }
-
-    getDefaultDriver() {
-        return this[kApp]['config']['filesystem']['default'];
-    }
-
-    getDefaultCloudDriver() {
-        return this[kApp]['config']['filesystem']['cloud'];
-    }
-    registerToRequest(FileRequest) {
-        let self = this
-        FileRequest.prototype.store = function(dir = '', disk = '', options = {}) {
-            options = typeof disk == 'object' ? disk : options
-            disk = typeof disk == 'object' ? '' : disk
-            return self.disk((disk || self.getDefaultDriver())).putFile(dir, this, options)
-        }
-        FileRequest.prototype.storeAs = function(dir = '', filename, disk = '', options = {}) {
-            options = typeof disk == 'object' ? disk : options
-            disk = typeof disk == 'object' ? '' : disk
-            return self.disk((disk || self.getDefaultDriver())).putFileAs(dir, this, filename, options)
-        }
-
-    }
-    extends($driver, $callback) {
-        const config = this.getConfig($driver)
-        if (!config) {
-            throw new InvalidArgumentException(`Config not found for  [{${$driver}}] driver.`);
-        }
-        this[kCustomCreators][config['driver']] = $callback.call(this, this);
-        return this;
-    }
-    __get(target, method) {
-        return this.make(target.disk(), method)
-    }
-}
-
+require('@ostro/support/helpers')
+const Manager = require('@ostro/support/manager')
+const InvalidArgumentException = require('./invalidArgumentException')
+const FilesystemAdapter = require('./filesystemAdapter')
+const callbackHandler = require('./callbackHandler')
+const kHandler = Symbol('handler')
+class FileSystemManager extends Manager {
+
+    $type = 'filesystem';
+
+    constructor($app){
+        super($app)
+        this[kHandler] = this.getConfig('handler')
+        if (typeof this[kHandler] != 'function' || typeof this[kHandler] != 'object') {
+            this[kHandler] = callbackHandler
+        } else if (typeof this[kHandler] != 'object') {
+            this[kHandler] = this[kHandler].constructor
+            util.inherits(this[kHandler], callbackHandler)
+        } else {
+            util.inherits(this[kHandler], callbackHandler)
+        }
+        this[kHandler] = new this[kHandler]
+    }
+
+    drive($name = null) {
+        return this.driver($name);
+    }
+
+    disk(name = null) {
+        return this.driver(name)
+    }
+
+    cloud() {
+        var name = this.getDefaultCloudDriver();
+        return this.disk(name)
+    }
+
+    resolve($name) {
+        var $config = this.getConfig($name);
+        if (!$config) {
+            throw new InvalidArgumentException("Disk [{" + $name + "}] was not available.");
+        }
+        return super.resolve($name, $config)
+    }
+
+  
+    createLocalDriver($config) {
+        return this.adapt(new(require('./adapter/local'))($config['root'], $config), $config);
+    }
+
+    createAzureDriver($config) {
+        return this.adapt(new(require('./adapter/azure'))(new(require('./clients/azure'))($config), $config), $config);
+    }
+
+    createS3Driver($config) {
+        return this.adapt(new(require('./adapter/s3'))(new(require('./clients/s3'))($config), $config), $config);
+    }
+
+    adapt(adapter, config) {
+        return new FilesystemAdapter(adapter,this[kHandler]);
+    }
+
+    getConfig(name) {
+        return super.getConfig(`disks.${name}`);
+    }
+
+    getDefaultCloudDriver() {
+        return this.getConfig('cloud');
+    }
+
+    registerToRequest(FileRequest) {
+        let self = this
+        FileRequest.prototype.store = function(dir = '', disk = '', options = {}) {
+            options = typeof disk == 'object' ? disk : options
+            disk = typeof disk == 'object' ? '' : disk
+            return self.disk((disk || self.getDefaultDriver())).putFile(dir, this, options)
+        }
+        FileRequest.prototype.storeAs = function(dir = '', filename, disk = '', options = {}) {
+            options = typeof disk == 'object' ? disk : options
+            disk = typeof disk == 'object' ? '' : disk
+            return self.disk((disk || self.getDefaultDriver())).putFileAs(dir, this, filename, options)
+        }
+
+    }
+    
+}
+
 module.exports = FileSystemManager

package/filesystemServiceProvider.js

@@ -1,48 +1,48 @@
-const ServiceProvider = require('@ostro/support/serviceProvider');
-const FilesystemManager = require('./filesystemManager');
-const Filesystem = require('./filesystem');
-class filesystemServiceProvider extends ServiceProvider {
-
-    register() {
-        this.registerNativeFilesystem();
-
-        this.registerFlysystem();
-    }
-
-    registerNativeFilesystem() {
-        this.$app.singleton('files', function() {
-            return new Filesystem;
-        });
-    }
-
-    registerFlysystem() {
-        this.registerManager();
-
-        this.$app.singleton('filesystem.disk', ($app) => {
-            return $app['filesystem'].disk(this.getDefaultDriver());
-        });
-
-        this.$app.singleton('filesystem.cloud', ($app) => {
-            return $app['filesystem'].disk(this.getCloudDriver());
-        });
-    }
-
-    registerManager() {
-        this.$app.singleton('filesystem', function($app) {
-            return new FilesystemManager($app);
-        });
-    }
-
-    getDefaultDriver() {
-        return this.$app['config']['filesystems.default'];
-    }
-
-    getCloudDriver() {
-        return this.$app['config']['filesystems.cloud'];
-    }
-    boot() {
-
-    }
-
-}
+const ServiceProvider = require('@ostro/support/serviceProvider');
+const FilesystemManager = require('./filesystemManager');
+const Filesystem = require('./filesystem');
+class filesystemServiceProvider extends ServiceProvider {
+
+    register() {
+        this.registerNativeFilesystem();
+
+        this.registerFlysystem();
+    }
+
+    registerNativeFilesystem() {
+        this.$app.singleton('files', function() {
+            return new Filesystem;
+        });
+    }
+
+    registerFlysystem() {
+        this.registerManager();
+
+        this.$app.singleton('filesystem.disk', ($app) => {
+            return $app['filesystem'].disk(this.getDefaultDriver());
+        });
+
+        this.$app.singleton('filesystem.cloud', ($app) => {
+            return $app['filesystem'].disk(this.getCloudDriver());
+        });
+    }
+
+    registerManager() {
+        this.$app.singleton('filesystem', function($app) {
+            return new FilesystemManager($app);
+        });
+    }
+
+    getDefaultDriver() {
+        return this.$app['config']['filesystems.default'];
+    }
+
+    getCloudDriver() {
+        return this.$app['config']['filesystems.cloud'];
+    }
+    boot() {
+
+    }
+
+}
 module.exports = filesystemServiceProvider

package/invalidArgumentException.js

@@ -1,12 +1,12 @@
-const InvalidArgumentExceptionContract = require('@ostro/contracts/exception/invalidArgumentException')
-class InvalidArgumentException extends InvalidArgumentExceptionContract {
-    constructor(error) {
-        super();
-        this.name = this.constructor.name;
-        this.message = error;
-        this.statusCode = 500;
-        Error.captureStackTrace(this, this.constructor);
-
-    }
-}
+const InvalidArgumentExceptionContract = require('@ostro/contracts/exception/invalidArgumentException')
+class InvalidArgumentException extends InvalidArgumentExceptionContract {
+    constructor(error) {
+        super();
+        this.name = this.constructor.name;
+        this.message = error;
+        this.statusCode = 500;
+        Error.captureStackTrace(this, this.constructor);
+
+    }
+}
 module.exports = InvalidArgumentException

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ostro/filesystem",
-  "version": "0.0.0-alpha.3",
+  "version": "0.0.0-alpha.4",
   "description": "filesystem module for OstroJS",
   "main": "filesystemManager.js",
   "scripts": {