backend-manager 4.0.31 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "4.0.31",
+  "version": "4.1.0",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/manager/helpers/assistant.js

@@ -113,6 +113,7 @@ BackendAssistant.prototype.init = function (ref, options) {
   self.analytics = null;
   self.usage = null;
   self.settings = null;
+  self.schema = null;
 
   // Set meta
   self.meta = {};
@@ -251,12 +252,6 @@ BackendAssistant.prototype.init = function (ref, options) {
   self.constant.pastTime.timestamp = '1999-01-01T00:00:00Z';
   self.constant.pastTime.timestampUNIX = 915148800;
 
-  // Schema
-  // self.schema = {
-  //   dir: '',
-  //   name: '',
-  // }
-
   // Log options
   if (
     (self.isDevelopment())
@@ -568,9 +563,10 @@ function _attachHeaderProperties(self, options, error) {
     code: options.code,
     tag: self.tag,
     usage: {
-      current: self?.usage?.getUsage() || {},
-      limits: self?.usage?.getLimit() || {},
+      current: self.usage ? self.usage.getUsage() : {},
+      limits: self.usage ? self.usage.getLimit() : {},
     },
+    schema: self.schema || {},
     additional: options.additional || {},
   }
   const req = self.ref.req;
@@ -582,9 +578,10 @@ function _attachHeaderProperties(self, options, error) {
 
     // Add bm-properties to Access-Control-Expose-Headers
     const existingExposed = res.get('Access-Control-Expose-Headers') || '';
-    const newExposed = `${existingExposed}, bm-properties`.replace(/^, /, '');
 
+    // If it does not exist, add it
     if (!existingExposed.match(/bm-properties/i)) {
+      const newExposed = `${existingExposed}, bm-properties`.replace(/^, /, '');
       res.header('Access-Control-Expose-Headers', newExposed);
     }
   }
@@ -722,15 +719,21 @@ BackendAssistant.prototype.resolveAccount = function (user) {
 
 BackendAssistant.prototype.parseRepo = function (repo) {
   let repoSplit = repo.split('/');
+
+  // Remove .git from the end
   for (var i = 0; i < repoSplit.length; i++) {
     repoSplit[i] = repoSplit[i].replace('.git', '');
   }
+
+  // Remove unnecessary parts
   repoSplit = repoSplit.filter(function(value, index, arr){
-      return value !== 'http:' &&
-             value !== 'https:' &&
-             value !== '' &&
-             value !== 'github.com';
+    return value !== 'http:'
+      && value !== 'https:'
+      && value !== ''
+      && value !== 'github.com';
   });
+
+  // Return
   return {
     user: repoSplit[0],
     name: repoSplit[1],

package/src/manager/helpers/middleware.js

@@ -28,6 +28,7 @@ Middleware.prototype.run = function (libPath, options) {
     const assistant = Manager.Assistant({req: req, res: res});
 
     const data = assistant.request.data;
+    const headers = assistant.request.headers;
     const geolocation = assistant.request.geolocation;
     const client = assistant.request.client;
 
@@ -47,6 +48,7 @@ Middleware.prototype.run = function (libPath, options) {
 
     // Log
     assistant.log(`Middleware.process(): Request (${geolocation.ip} @ ${geolocation.country}, ${geolocation.region}, ${geolocation.city})`, JSON.stringify(data));
+    assistant.log(`Middleware.process(): Headers`, JSON.stringify(headers));
 
     // Set paths
     const routesDir = path.resolve(options.routesDir, libPath.replace('.js', ''));
@@ -118,7 +120,7 @@ Middleware.prototype.run = function (libPath, options) {
       }
 
       // Log
-      assistant.log(`Middleware.process(): Resolved settings with schema ${options.schema}`, JSON.stringify(assistant.settings));
+      assistant.log(`Middleware.process(): Resolved settings with schema=${options.schema}`, JSON.stringify(assistant.settings));
     } else {
       assistant.settings = data;
     }

package/src/manager/helpers/settings.js

@@ -47,13 +47,16 @@ Settings.prototype.resolve = function (assistant, schema, settings, options) {
     schema = loadSchema(assistant, schemaPath, settings, options);
   }
 
-  // Resolve settings
-  self.settings = powertools.defaults(settings, schema);
-
   // If schema is not an object, throw an error
   if (!schema || typeof schema !== 'object') {
     throw assistant.errorify(`Invalid schema provided`, {code: 400});
   }
+
+  // Resolve settings
+  self.settings = powertools.defaults(settings, schema);
+  // self.schema = _.merge({}, schema);
+  const resolvedSchema = {};
+
   // console.log('---schema', schema);
   // console.log('---options', options);
   // console.log('---self.settings', self.settings);
@@ -99,8 +102,27 @@ Settings.prototype.resolve = function (assistant, schema, settings, options) {
       assistant.warn(`Replacing ${path}: originalValue=${originalValue}, resolvedValue=${resolvedValue}, replaceValue=${replaceValue}`);
       _.set(self.settings, path, replaceValue);
     }
+
+    // Set defaults
+    // @@@TODO: FINISH THIS
+    // !!! NOT SURE WHAT TO DO FOR DEFAULT SINCE IT CAN BE A FN SOMETIMES ???
+    const resolvedNode = {
+      types: schemaNode.types || [],
+      // value: typeof replaceValue === 'undefined' ? undefined : replaceValue,
+      // default: ???,
+      required: isRequired,
+      available: typeof schemaNode.available === 'undefined' ? true : schemaNode.available,
+      min: typeof schemaNode.min === 'undefined' ? undefined : schemaNode.min,
+      max: typeof schemaNode.max === 'undefined' ? undefined : schemaNode.max,
+    }
+
+    // Update schema
+    _.set(resolvedSchema, path, resolvedNode);
   });
 
+  // Set schema
+  self.schema = resolvedSchema;
+
   // Resolve
   return self.settings;
 };

package/src/manager/helpers/utilities.js

@@ -54,8 +54,10 @@ Utilities.prototype.iterateCollection = function (callback, options) {
       });
 
       // Insert orderBy
-      if (options.orderBy) {
+      if (typeof options.orderBy === 'string') {
         query = query.orderBy(options.orderBy);
+      } else if (options.orderBy && typeof options.orderBy === 'object') {
+        query = query.orderBy(options.orderBy.field, options.orderBy.direction);
       }
 
       // Process the first batch differently