add global async

Author: basemkhirat

config/globals.js

@@ -1,38 +1,26 @@
 module.exports = {
 
-
- /****************************************************************************
- * *
- * Expose the async installed in Sails core as a global variable. If this is *
- * disabled, like any other node module you can always run npm install async *
- * --save, then var async = require('async') at the top of any file. *
- * *
- ****************************************************************************/
-
- async: false,
-
  /****************************************************************************
  * *
- * Expose each of your app's services as global variables (using their *
- * "globalId"). E.g. a service defined in app/services/Auth.js  *
- * would have a globalId of Auth by default. If this is disabled,  *
- * you can still access your services via app.services.*.  *
+ * Expose each of your app's models as global variables (using their  *
+ * "globalId"). E.g. a model defined in app/controllers/HomeController.js *
+ * would have a globalId of HomeController by default. If this is disabled, *
+ * you can still access your models via app.controllers.*. *
  * *
  ****************************************************************************/
 
- services: true,
+ controllers: true,
 
  /****************************************************************************
  * *
  * Expose each of your app's models as global variables (using their *
- * "globalId"). E.g. a model defined in app/controllers/HomeController.js *
- * would have a globalId of HomeController by default. If this is disabled, *
- * you can still access your models via app.controllers.*. *
+ * "globalId"). E.g. a model defined in app/models/User.js would have a  *
+ * globalId of User by default. If this is disabled, you can still access  *
+ * your models via app.models.*.  *
  * *
  ****************************************************************************/
 
- controllers: true,
-
+ models: true,
 
  /****************************************************************************
  * *
@@ -47,12 +35,12 @@ module.exports = {
 
  /****************************************************************************
  * *
- * Expose each of your app's models as global variables (using their  *
- * "globalId"). E.g. a model defined in app/models/User.js would have a *
- * globalId of User by default. If this is disabled, you can still access *
- * your models via app.models.*.  *
+ * Expose each of your app's services as global variables (using their *
+ * "globalId"). E.g. a service defined in app/services/Auth.js   *
+ * would have a globalId of Auth by default. If this is disabled,   *
+ * you can still access your services via app.services.*. *
  * *
  ****************************************************************************/
 
-  models: true
+ services: true
 };

libs/merge.js

@@ -7,7 +7,7 @@
  * https://raw.github.com/yeikos/js.merge/master/LICENSE
  */
 
-(function(isNode) {
+(function (isNode) {
 
  /**
  * Merge one or more objects
@@ -16,10 +16,8 @@
  * @return object
  */
 
- var Public = function(clone) {
-
+ var Public = function (clone) {
  return merge(clone === true, false, arguments);
-
  }, publicName = 'merge';
 
  /**
@@ -29,10 +27,8 @@
  * @return object
  */
 
- Public.recursive = function(clone) {
-
+ Public.recursive = function (clone) {
  return merge(clone === true, true, arguments);
-
  };
 
  /**
@@ -41,33 +37,21 @@
  * @return mixed
  */
 
- Public.clone = function(input) {
-
+ Public.clone = function (input) {
  var output = input,
  type = typeOf(input),
  index, size;
-
  if (type === 'array') {
-
  output = [];
  size = input.length;
-
- for (index=0;index<size;++index)
-
+ for (index = 0; index < size; ++index)
  output[index] = Public.clone(input[index]);
-
  } else if (type === 'object') {
-
  output = {};
-
  for (index in input)
-
  output[index] = Public.clone(input[index]);
-
  }
-
  return output;
-
  };
 
  /**
@@ -78,27 +62,16 @@
  */
 
  function merge_recursive(base, extend) {
-
  if (typeOf(base) !== 'object')
-
  return extend;
-
  for (var key in extend) {
-
  if (typeOf(base[key]) === 'object' && typeOf(extend[key]) === 'object') {
-
  base[key] = merge_recursive(base[key], extend[key]);
-
  } else {
-
  base[key] = extend[key];
-
  }
-
  }
-
  return base;
-
  }
 
  /**
@@ -110,42 +83,24 @@
  */
 
  function merge(clone, recursive, argv) {
-
  var result = argv[0],
  size = argv.length;
-
  if (clone || typeOf(result) !== 'object')
-
  result = {};
-
- for (var index=0;index<size;++index) {
-
+ for (var index = 0; index < size; ++index) {
  var item = argv[index],
-
  type = typeOf(item);
-
  if (type !== 'object') continue;
-
  for (var key in item) {
-
  var sitem = clone ? Public.clone(item[key]) : item[key];
-
  if (recursive) {
-
  result[key] = merge_recursive(result[key], sitem);
-
  } else {
-
  result[key] = sitem;
-
  }
-
  }
-
  }
-
  return result;
-
  }
 
  /**
@@ -157,19 +112,13 @@
  */
 
  function typeOf(input) {
-
  return ({}).toString.call(input).slice(8, -1).toLowerCase();
-
  }
 
  if (isNode) {
-
  module.exports = Public;
-
  } else {
-
  window[publicName] = Public;
-
  }
 
 })(typeof module === 'object' && module && typeof module.exports === 'object' && module.exports);

package-lock.json

@@ -21,7 +21,7 @@
  "express-back": "0.0.2",
  "express-flash": "0.0.2",
  "express-session": "^1.15.6",
- "express-validator": "^4.2.1",
+ "express-validator": "^4.3.0",
  "i18n": "^0.8.3",
  "jsonwebtoken": "^8.1.0",
  "mongoose": "^4.12.4",

package.json

@@ -4,6 +4,8 @@ global.__basepath = process.cwd();
 
 global.app = new require("express")();
 
+global.async = new require("async");
+
 require("./app");
 
 require("./app/kernel");