@novice1/routing 1.0.11 → 1.1.3

package/lib/route.js

@@ -1,206 +1,206 @@
-var inherits = require('util').inherits
-var ExpressRoute = require("express/lib/router/route");
-var flatten = require('array-flatten');
-var methods = require("methods");
-
-var createMetadataMiddleware = require('./route/metadataMiddleware');
-var createLayers = require('./route/createLayers');
-
-/**
- * @classdesc Initialize `Route` with the given `path`,
- * @class
- * @augments ExpressRoute express/lib/router/route
- */
-function Route() {
-  return ExpressRoute.apply(this, Array.from(arguments));
-}
-
-inherits(Route, ExpressRoute);
-
-methods.concat('all').forEach(function(method){
-  /** @inheritdoc */
-  Route.prototype[method] = function(){
-    var handles = flatten(Array.prototype.slice.call(arguments));
-
-    // add middleware to serve route's metadata in 'req'
-    handles.unshift(createMetadataMiddleware(method, this.path, this.meta));
-
-    return ExpressRoute.prototype[method].apply(this, handles);
-  };
-});
-
-/**
- * @param {object} layerOptions
- * @param {Function[]} args
- */
-Route.prototype.setAuth = function (layerOptions) {
-  var handles = flatten(Array.prototype.slice.call(arguments, 1));
-
-  this.removeAuth();
-
-  // insert new layers for those functions
-  if (
-    Array.isArray(this.stack) && this.methods && this.path 
-    && this.meta && this.meta.auth
-    && handles.length){
-    Object.keys(this.methods).forEach(
-      method => {
-        createLayers('auth', method, layerOptions, handles, this.dispatch.bind(this)).forEach(
-          layer => {
-            this.stack.splice(1, 0, layer);
-          }
-        );
-      }
-    );
-  }
-}
-
-/**
- * @param {object} layerOptions
- * @param {Function[]} args
- */
-Route.prototype.setPreValidators = function (layerOptions) {
-  var handles = flatten(Array.prototype.slice.call(arguments, 1));
-
-  this.removePreValidators();
-
-  // insert new layers for those functions
-  if (
-    Array.isArray(this.stack) && this.methods && this.path
-    && handles.length){
-    Object.keys(this.methods).forEach(
-      method => {
-        createLayers('preValidator', method, layerOptions, handles, this.dispatch.bind(this)).forEach(
-          layer => {
-            // insert 'preValidator' layers after 'auth' layers
-
-            var pos = this.stack.length - 1;
-
-            for (pos; pos > 0; pos -= 1) {
-              if (this.stack[pos].type === 'auth') {
-                break;
-              }
-            }
-
-            pos += 1;
-
-            // insert before
-            this.stack.splice(pos, 0, layer);
-          }
-        );
-      }
-    );
-  }
-}
-/**
- * @alias setPreValidators
- */
-Route.prototype.setPreValidation = Route.prototype.setPreValidators;
-/**
- * @alias setPreValidators
- */
-Route.prototype.setPreValidators = Route.prototype.setPreValidators;
-/**
- * @alias setPreValidators
- */
-Route.prototype.setAfterAuth = Route.prototype.setPreValidators;
-
-
-/**
- * @param {object} layerOptions
- * @param {Function[]} args
- */
-Route.prototype.setValidators = function (layerOptions) {
-  var handles = flatten(Array.prototype.slice.call(arguments, 1));
-
-  this.removeValidators();
-
-  // insert new layers for those functions
-  if (
-    Array.isArray(this.stack) && this.methods && this.path
-    && handles.length){
-    Object.keys(this.methods).forEach(
-      method => {
-        createLayers('validator', method, layerOptions, handles, this.dispatch.bind(this)).forEach(
-          layer => {
-            // insert 'validator' layers after 'auth' layers
-
-            var pos = this.stack.length - 1;
-
-            for (pos; pos > 0; pos -= 1) {
-              if (this.stack[pos].type === 'auth' || this.stack[pos].type === 'preValidator') {
-                break;
-              }
-            }
-
-            pos += 1;
-
-            // insert before
-            this.stack.splice(pos, 0, layer);
-          }
-        );
-      }
-    );
-  }
-}
-
-/**
- *
- */
-Route.prototype.hasAuth = function () {
-  return this.hasLayerType('auth');
-}
-
-/**
- *
- */
-Route.prototype.hasValidators = function () {
-  return this.hasLayerType('validator');
-}
-
-/**
- *
- */
-Route.prototype.hasPreValidators = function () {
-  return this.hasLayerType('preValidator');
-}
-
-Route.prototype.hasLayerType = function (type) {
-  if (Array.isArray(this.stack)){
-    return this.stack.some(
-      layer => layer.type === type
-    );
-  }
-  return false;
-}
-
-/**
- *
- */
-Route.prototype.removeAuth = function () {
-  this.removeLayerType('auth');
-}
-
-/**
- *
- */
-Route.prototype.removeValidators = function () {
-  this.removeLayerType('validator');
-}
-
-/**
- *
- */
-Route.prototype.removePreValidators = function () {
-  this.removeLayerType('preValidator');
-}
-
-Route.prototype.removeLayerType = function (type) {
-  if (Array.isArray(this.stack)){
-    this.stack = this.stack.filter(
-      layer => layer.type !== type
-    );
-  }
-}
-
+var inherits = require('util').inherits
+var ExpressRoute = require("express/lib/router/route");
+var { flatten } = require('array-flatten');
+var methods = require("methods");
+
+var createMetadataMiddleware = require('./route/metadataMiddleware');
+var createLayers = require('./route/createLayers');
+
+/**
+ * @classdesc Initialize `Route` with the given `path`,
+ * @class
+ * @augments ExpressRoute express/lib/router/route
+ */
+function Route() {
+  return ExpressRoute.apply(this, Array.from(arguments));
+}
+
+inherits(Route, ExpressRoute);
+
+methods.concat('all').forEach(function(method){
+  /** @inheritdoc */
+  Route.prototype[method] = function(){
+    var handles = flatten(Array.prototype.slice.call(arguments));
+
+    // add middleware to serve route's metadata in 'req'
+    handles.unshift(createMetadataMiddleware(method, this.path, this.meta));
+
+    return ExpressRoute.prototype[method].apply(this, handles);
+  };
+});
+
+/**
+ * @param {object} layerOptions
+ * @param {Function[]} args
+ */
+Route.prototype.setAuth = function (layerOptions) {
+  var handles = flatten(Array.prototype.slice.call(arguments, 1));
+
+  this.removeAuth();
+
+  // insert new layers for those functions
+  if (
+    Array.isArray(this.stack) && this.methods && this.path 
+    && this.meta && this.meta.auth
+    && handles.length){
+    Object.keys(this.methods).forEach(
+      method => {
+        createLayers('auth', method, layerOptions, handles, this.dispatch.bind(this)).forEach(
+          layer => {
+            this.stack.splice(1, 0, layer);
+          }
+        );
+      }
+    );
+  }
+}
+
+/**
+ * @param {object} layerOptions
+ * @param {Function[]} args
+ */
+Route.prototype.setPreValidators = function (layerOptions) {
+  var handles = flatten(Array.prototype.slice.call(arguments, 1));
+
+  this.removePreValidators();
+
+  // insert new layers for those functions
+  if (
+    Array.isArray(this.stack) && this.methods && this.path
+    && handles.length){
+    Object.keys(this.methods).forEach(
+      method => {
+        createLayers('preValidator', method, layerOptions, handles, this.dispatch.bind(this)).forEach(
+          layer => {
+            // insert 'preValidator' layers after 'auth' layers
+
+            var pos = this.stack.length - 1;
+
+            for (pos; pos > 0; pos -= 1) {
+              if (this.stack[pos].type === 'auth') {
+                break;
+              }
+            }
+
+            pos += 1;
+
+            // insert before
+            this.stack.splice(pos, 0, layer);
+          }
+        );
+      }
+    );
+  }
+}
+/**
+ * @alias setPreValidators
+ */
+Route.prototype.setPreValidation = Route.prototype.setPreValidators;
+/**
+ * @alias setPreValidators
+ */
+Route.prototype.setPreValidators = Route.prototype.setPreValidators;
+/**
+ * @alias setPreValidators
+ */
+Route.prototype.setAfterAuth = Route.prototype.setPreValidators;
+
+
+/**
+ * @param {object} layerOptions
+ * @param {Function[]} args
+ */
+Route.prototype.setValidators = function (layerOptions) {
+  var handles = flatten(Array.prototype.slice.call(arguments, 1));
+
+  this.removeValidators();
+
+  // insert new layers for those functions
+  if (
+    Array.isArray(this.stack) && this.methods && this.path
+    && handles.length){
+    Object.keys(this.methods).forEach(
+      method => {
+        createLayers('validator', method, layerOptions, handles, this.dispatch.bind(this)).forEach(
+          layer => {
+            // insert 'validator' layers after 'auth' layers
+
+            var pos = this.stack.length - 1;
+
+            for (pos; pos > 0; pos -= 1) {
+              if (this.stack[pos].type === 'auth' || this.stack[pos].type === 'preValidator') {
+                break;
+              }
+            }
+
+            pos += 1;
+
+            // insert before
+            this.stack.splice(pos, 0, layer);
+          }
+        );
+      }
+    );
+  }
+}
+
+/**
+ *
+ */
+Route.prototype.hasAuth = function () {
+  return this.hasLayerType('auth');
+}
+
+/**
+ *
+ */
+Route.prototype.hasValidators = function () {
+  return this.hasLayerType('validator');
+}
+
+/**
+ *
+ */
+Route.prototype.hasPreValidators = function () {
+  return this.hasLayerType('preValidator');
+}
+
+Route.prototype.hasLayerType = function (type) {
+  if (Array.isArray(this.stack)){
+    return this.stack.some(
+      layer => layer.type === type
+    );
+  }
+  return false;
+}
+
+/**
+ *
+ */
+Route.prototype.removeAuth = function () {
+  this.removeLayerType('auth');
+}
+
+/**
+ *
+ */
+Route.prototype.removeValidators = function () {
+  this.removeLayerType('validator');
+}
+
+/**
+ *
+ */
+Route.prototype.removePreValidators = function () {
+  this.removeLayerType('preValidator');
+}
+
+Route.prototype.removeLayerType = function (type) {
+  if (Array.isArray(this.stack)){
+    this.stack = this.stack.filter(
+      layer => layer.type !== type
+    );
+  }
+}
+
 module.exports = Route;

package/lib/router/authMethods.js

@@ -1,33 +1,37 @@
-var flatten = require('array-flatten');
-
-/**
- * @param {Function[]} args
- */
-exports.setAuthHandlers = function(){
-  var handles = flatten(Array.prototype.slice.call(arguments));
-  this._auth = [].concat(handles);
-  this._ifNoAuth = false;
-  // add layer options
-  handles.unshift({
-    sensitive: this.caseSensitive,
-    strict: this.strict,
-    end: true
-  });
-  this.editLayers('set_auth', handles);
-}
-
-/**
- * @param {Function[]} args
- */
-exports.setAuthHandlersIfNone = function(){
-  var handles = flatten(Array.prototype.slice.call(arguments));
-  this._auth = [].concat(handles);
-  this._ifNoAuth = true;
-  // add layer options
-  handles.unshift({
-    sensitive: this.caseSensitive,
-    strict: this.strict,
-    end: true
-  });
-  this.editLayers('set_auth_if_none', handles);
+var { flatten } = require('array-flatten');
+
+/**
+ * @param {Function[]} args
+ */
+exports.setAuthHandlers = function(){
+  var handles = flatten(Array.prototype.slice.call(arguments));
+  this._auth = [].concat(handles);
+  this._ifNoAuth = false;
+  // add layer options
+  handles.unshift({
+    sensitive: this.caseSensitive,
+    strict: this.strict,
+    end: true
+  });
+  this.editLayers('set_auth', handles);
+
+  return this;
+}
+
+/**
+ * @param {Function[]} args
+ */
+exports.setAuthHandlersIfNone = function(){
+  var handles = flatten(Array.prototype.slice.call(arguments));
+  this._auth = [].concat(handles);
+  this._ifNoAuth = true;
+  // add layer options
+  handles.unshift({
+    sensitive: this.caseSensitive,
+    strict: this.strict,
+    end: true
+  });
+  this.editLayers('set_auth_if_none', handles);
+
+  return this;
 }

package/lib/router/editLayersMethods.js

@@ -1,12 +1,12 @@
-var flatten = require('array-flatten');
-
-exports.editLayers = function(method) {
-  var args = flatten(Array.prototype.slice.call(arguments, 1));
-  this.stack.forEach(
-    routerLayer => {
-      if (typeof routerLayer[method] === 'function') {
-        routerLayer[method].apply(routerLayer, args);
-      }
-    }
-  );
+var { flatten } = require('array-flatten');
+
+exports.editLayers = function(method) {
+  var args = flatten(Array.prototype.slice.call(arguments, 1));
+  this.stack.forEach(
+    routerLayer => {
+      if (typeof routerLayer[method] === 'function') {
+        routerLayer[method].apply(routerLayer, args);
+      }
+    }
+  );
 }

package/lib/router/metaMethods.js

@@ -1,14 +1,14 @@
-var flatten = require('array-flatten');
-
-exports.getMeta = function() {
-  var v = [];
-  this.stack.forEach(
-    routerLayer => {
-      // only layers with method 'get_meta'
-      if (typeof routerLayer.get_meta === 'function') {
-        v.push.apply(v, flatten(routerLayer.get_meta()));
-      }
-    }
-  );
-  return v;
+var { flatten } = require('array-flatten');
+
+exports.getMeta = function() {
+  var v = [];
+  this.stack.forEach(
+    routerLayer => {
+      // only layers with method 'get_meta'
+      if (typeof routerLayer.get_meta === 'function') {
+        v.push.apply(v, flatten(routerLayer.get_meta()));
+      }
+    }
+  );
+  return v;
 }

package/lib/router/validatorsMethods.js

@@ -1,33 +1,37 @@
-var flatten = require('array-flatten');
-
-/**
- * @param {Function[]} args
- */
-exports.setValidators = function(){
-  var handles = flatten(Array.prototype.slice.call(arguments));
-  this._validators = [].concat(handles);
-  this._ifNoValidators = false;
-  // add layer options
-  handles.unshift({
-    sensitive: this.caseSensitive,
-    strict: this.strict,
-    end: true
-  });
-  this.editLayers('set_validators', handles);
-}
-
-/**
- * @param {Function[]} args
- */
-exports.setValidatorsIfNone = function(){
-  var handles = flatten(Array.prototype.slice.call(arguments));
-  this._validatorsIfNone = [].concat(handles);
-  this._ifNoValidators = true;
-  // add layer options
-  handles.unshift({
-    sensitive: this.caseSensitive,
-    strict: this.strict,
-    end: true
-  });
-  this.editLayers('set_validators_if_none', handles);
+var { flatten } = require('array-flatten');
+
+/**
+ * @param {Function[]} args
+ */
+exports.setValidators = function(){
+  var handles = flatten(Array.prototype.slice.call(arguments));
+  this._validators = [].concat(handles);
+  this._ifNoValidators = false;
+  // add layer options
+  handles.unshift({
+    sensitive: this.caseSensitive,
+    strict: this.strict,
+    end: true
+  });
+  this.editLayers('set_validators', handles);
+
+  return this;
+}
+
+/**
+ * @param {Function[]} args
+ */
+exports.setValidatorsIfNone = function(){
+  var handles = flatten(Array.prototype.slice.call(arguments));
+  this._validatorsIfNone = [].concat(handles);
+  this._ifNoValidators = true;
+  // add layer options
+  handles.unshift({
+    sensitive: this.caseSensitive,
+    strict: this.strict,
+    end: true
+  });
+  this.editLayers('set_validators_if_none', handles);
+
+  return this;
 }