spice-js 2.7.19 → 2.7.20

package/build/storage/Storage.js

@@ -9,15 +9,40 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 var views = require("koa-views");
 var path = require("path");
 var juice = require("juice");
+function resolveStorageDriver(driver) {
+  var resolvedDriver = driver;
+  while (resolvedDriver && typeof resolvedDriver === "object" && resolvedDriver.default) {
+    resolvedDriver = resolvedDriver.default;
+  }
+  return resolvedDriver;
+}
+function resolveDriverName(requestedDriverName, providers) {
+  if (providers === void 0) {
+    providers = {};
+  }
+  if (requestedDriverName && requestedDriverName !== "sharepoint" && resolveStorageDriver(providers[requestedDriverName])) {
+    return requestedDriverName;
+  }
+  var fallbackDriverName = ["firebase", "s3", "minio", "local"].find(driverName => resolveStorageDriver(providers[driverName]));
+  if (!fallbackDriverName) {
+    throw new TypeError("Storage driver '" + (requestedDriverName || "unknown") + "' is not supported and no fallback driver is configured");
+  }
+  if (requestedDriverName && requestedDriverName !== fallbackDriverName) {
+    console.warn("Storage driver '" + requestedDriverName + "' is unsupported. Falling back to '" + fallbackDriverName + "'.");
+  }
+  return fallbackDriverName;
+}
 class Storage {
   constructor(args) {
     if (args === void 0) {
       args = {};
     }
-    this.driver_name = args.driver_name || spice.config.storage.default_driver;
+    this.driver_name = resolveDriverName(args.driver_name || spice.config.storage.default_driver, spice.config.storage.providers);
     this.driver_options = _lodash.default.merge(spice.config.storage.drivers[this.driver_name], args.options);
-    //console.log(this.driver_name, spice.config.storage.providers)
-    this.Driver = spice.config.storage.providers[this.driver_name];
+    this.Driver = resolveStorageDriver(spice.config.storage.providers[this.driver_name]);
+    if (typeof this.Driver !== "function") {
+      throw new TypeError("Storage driver '" + this.driver_name + "' is not a constructor");
+    }
   }
   save(_ref) {
     var _this = this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.7.19",
+  "version": "2.7.20",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/storage/Storage.js

@@ -3,15 +3,64 @@ const path = require("path");
 const juice = require("juice");
 import _ from "lodash";
 
+function resolveStorageDriver(driver) {
+  let resolvedDriver = driver;
+  while (
+    resolvedDriver &&
+    typeof resolvedDriver === "object" &&
+    resolvedDriver.default
+  ) {
+    resolvedDriver = resolvedDriver.default;
+  }
+  return resolvedDriver;
+}
+
+function resolveDriverName(requestedDriverName, providers = {}) {
+  if (
+    requestedDriverName &&
+    requestedDriverName !== "sharepoint" &&
+    resolveStorageDriver(providers[requestedDriverName])
+  ) {
+    return requestedDriverName;
+  }
+
+  const fallbackDriverName = ["firebase", "s3", "minio", "local"].find(
+    (driverName) => resolveStorageDriver(providers[driverName])
+  );
+
+  if (!fallbackDriverName) {
+    throw new TypeError(
+      `Storage driver '${requestedDriverName || "unknown"}' is not supported and no fallback driver is configured`
+    );
+  }
+
+  if (requestedDriverName && requestedDriverName !== fallbackDriverName) {
+    console.warn(
+      `Storage driver '${requestedDriverName}' is unsupported. Falling back to '${fallbackDriverName}'.`
+    );
+  }
+
+  return fallbackDriverName;
+}
+
 export default class Storage {
   constructor(args = {}) {
-    this.driver_name = args.driver_name || spice.config.storage.default_driver;
+    this.driver_name = resolveDriverName(
+      args.driver_name || spice.config.storage.default_driver,
+      spice.config.storage.providers
+    );
     this.driver_options = _.merge(
       spice.config.storage.drivers[this.driver_name],
       args.options
     );
-    //console.log(this.driver_name, spice.config.storage.providers)
-    this.Driver = spice.config.storage.providers[this.driver_name];
+    this.Driver = resolveStorageDriver(
+      spice.config.storage.providers[this.driver_name]
+    );
+    if (typeof this.Driver !== "function") {
+      throw new TypeError(
+        `Storage driver '${this.driver_name}' is not a constructor`
+      );
+    }
   }
 
   async save({ files, path, options }) {