not-node 5.0.22 → 5.1.2

package/src/manifest/registrator/routes.js

@@ -1,33 +1,32 @@
-const fs = require('fs');
-const path = require('path');
-const logger = require('not-log');
-const log = logger(module, 'registrator');
+const fs = require("fs");
+const path = require("path");
+const logger = require("not-log");
+const log = logger(module, "registrator");
 
-const {tryFile, mapBind} = require('../../common');
+const { tryFile, mapBind } = require("../../common");
 
-const notModuleRegistratorRoutesWS = require('./routes.ws');
+const notModuleRegistratorRoutesWS = require("./routes.ws");
 
 /**
  * Manifest files ending
  * @constant
  * @type {string}
  */
-const DEFAULT_MANIFEST_FILE_ENDING = '.manifest.js';
+const DEFAULT_MANIFEST_FILE_ENDING = ".manifest.js";
 
 /**
  * Routes collection files ending
  * @constant
  * @type {string}
  */
-const DEFAULT_ROUTES_FILE_ENDING = '.js';
-
+const DEFAULT_ROUTES_FILE_ENDING = ".js";
 
 /**
  * WS End-points collection files ending
  * @constant
  * @type {string}
  */
-const DEFAULT_WS_ROUTES_FILE_ENDING = '.ws.js';
+const DEFAULT_WS_ROUTES_FILE_ENDING = ".ws.js";
 
 /**
  * List of methods to be binded from notApp to routes and WS end-points
@@ -35,139 +34,179 @@ const DEFAULT_WS_ROUTES_FILE_ENDING = '.ws.js';
  * @type {string}
  */
 const ROUTE_BINDINGS_LIST = [
-  'getLogic', 'getLogicFile',
-  'getModel', 'getModelFile', 'getModelSchema',
-  'getModule'
+    "getLogic",
+    "getLogicFile",
+    "getModel",
+    "getModelFile",
+    "getModelSchema",
+    "getModule",
 ];
 
+module.exports = class notModuleRegistratorRoutes {
+    static openFile = require;
 
-module.exports = class notModuleRegistratorRoutes{
-  static openFile = require;
+    constructor({ nModule }) {
+        this.run({ nModule });
+    }
 
-  constructor({nModule}){
-    this.run({nModule});
-  }
+    run({ nModule }) {
+        const srcDir = notModuleRegistratorRoutes.getPath(nModule);
+        if (!srcDir) {
+            return false;
+        }
+        this.findAll({
+            nModule,
+            srcDir,
+        });
+        return true;
+    }
 
-  run({nModule}){
-    const srcDir = notModuleRegistratorRoutes.getPath(nModule);
-    if (!srcDir) { return false; }
-    this.findAll(
-      {
-        nModule,
-        srcDir
-      }
-    );
-    return true;
-  }
-
-  static getPath(nModule){
-    return nModule.module.paths.routes;
-  }
-
-  /**
-  * Searching fields in directory
-  * @static
-  * @param {Object}     input
-  * @param {notModule}  input.notModule
-  * @param {string}     input.srcDir
-  **/
-  findAll({nModule,srcDir}){
-    fs.readdirSync(srcDir).forEach(file => this.findOne({nModule, file, srcDir}));
-  }
-
-  findOne({nModule, srcDir, file}){
-    try {
-      //если имя похоже на название манифеста
-      if (file.indexOf(DEFAULT_MANIFEST_FILE_ENDING) === -1) { return false; }
-      const routeManifest = notModuleRegistratorRoutes.tryRouteManifestFile({srcDir, file});
-      //без манифеста ничего выставить наружу не выйдет
-      if(!routeManifest){ return false; }
-      const routeBasename = file.substr(0, file.indexOf(DEFAULT_MANIFEST_FILE_ENDING));
-      //ищем end-points
-      const route = notModuleRegistratorRoutes.tryRouteFile({srcDir, routeBasename});
-      const wsRoute = notModuleRegistratorRoutes.tryWSRouteFile({srcDir, routeBasename});
-      if(!route && !wsRoute){ return false; }
-      this.registerManifestAndRoutes({
-        nModule,
-        routeManifest,
-        routeName: route?route.thisRouteName:routeBasename,
-        route, wsRoute
-      });
-      return true;
-    } catch (e) {
-      log.error(e);
-      return false;
+    static getPath(nModule) {
+        return nModule.module.paths.routes;
     }
-  }
-
-  static tryRouteFile({srcDir, routeBasename}){
-    const routePath = path.join(srcDir, routeBasename + DEFAULT_ROUTES_FILE_ENDING);
-    if (tryFile(routePath)) {
-      const route = notModuleRegistratorRoutes.openFile(routePath);
-      route.filename = routePath;
-      if (!route.thisRouteName) {
-        route.thisRouteName = routeBasename;
-      }
-      return route;
-    }else{
-      return false;
+
+    /**
+     * Searching fields in directory
+     * @static
+     * @param {Object}     input
+     * @param {notModule}  input.notModule
+     * @param {string}     input.srcDir
+     **/
+    findAll({ nModule, srcDir }) {
+        fs.readdirSync(srcDir).forEach((file) =>
+            this.findOne({ nModule, file, srcDir })
+        );
     }
-  }
-
-  static tryRouteManifestFile({srcDir, file}){
-    const routeManifestPath = path.join(srcDir, file);
-    if (tryFile(routeManifestPath)) {
-      return notModuleRegistratorRoutes.openFile(routeManifestPath);
-    }else{
-      return false;
+
+    findOne({ nModule, srcDir, file }) {
+        try {
+            //если имя похоже на название манифеста
+            if (file.indexOf(DEFAULT_MANIFEST_FILE_ENDING) === -1) {
+                return false;
+            }
+            const routeManifest =
+                notModuleRegistratorRoutes.tryRouteManifestFile({
+                    srcDir,
+                    file,
+                });
+            //без манифеста ничего выставить наружу не выйдет
+            if (!routeManifest) {
+                return false;
+            }
+            const routeBasename = file.substr(
+                0,
+                file.indexOf(DEFAULT_MANIFEST_FILE_ENDING)
+            );
+            //ищем end-points
+            const route = notModuleRegistratorRoutes.tryRouteFile({
+                srcDir,
+                routeBasename,
+            });
+            const wsRoute = notModuleRegistratorRoutes.tryWSRouteFile({
+                srcDir,
+                routeBasename,
+            });
+            if (!route && !wsRoute) {
+                return false;
+            }
+            this.registerManifestAndRoutes({
+                nModule,
+                routeManifest,
+                routeName: route ? route.thisRouteName : routeBasename,
+                route,
+                wsRoute,
+            });
+            return true;
+        } catch (e) {
+            log.error(e);
+            return false;
+        }
     }
-  }
-
-
-  static tryWSRouteFile({srcDir, routeBasename}){
-    const routeWSPath = path.join(srcDir, routeBasename + DEFAULT_WS_ROUTES_FILE_ENDING);
-    if (tryFile(routeWSPath)) {
-      const wsRoute = notModuleRegistratorRoutes.openFile(routeWSPath);
-      if (!wsRoute.thisRouteName) {
-        wsRoute.thisRouteName = routeBasename;
-      }
-      return wsRoute;
-    }else{
-      return false;
+
+    static tryRouteFile({ srcDir, routeBasename }) {
+        const routePath = path.join(
+            srcDir,
+            routeBasename + DEFAULT_ROUTES_FILE_ENDING
+        );
+        if (tryFile(routePath)) {
+            const route = notModuleRegistratorRoutes.openFile(routePath);
+            route.filename = routePath;
+            if (!route.thisRouteName) {
+                route.thisRouteName = routeBasename;
+            }
+            return route;
+        } else {
+            return false;
+        }
     }
-  }
-
-  registerManifestAndRoutes({nModule, routeName, routeManifest, route, wsRoute}){
-    notModuleRegistratorRoutes.registerManifest({nModule, routeManifest, routeName});
-    if (route) {
-      this.registerRoute({
-        nModule, route, routeName: route.thisRouteName
-      });
+
+    static tryRouteManifestFile({ srcDir, file }) {
+        const routeManifestPath = path.join(srcDir, file);
+        if (tryFile(routeManifestPath)) {
+            return notModuleRegistratorRoutes.openFile(routeManifestPath);
+        } else {
+            return false;
+        }
     }
-    if (wsRoute) {
-      this.registerWSRoute({nModule, wsRoute});
+
+    static tryWSRouteFile({ srcDir, routeBasename }) {
+        const routeWSPath = path.join(
+            srcDir,
+            routeBasename + DEFAULT_WS_ROUTES_FILE_ENDING
+        );
+        if (tryFile(routeWSPath)) {
+            const wsRoute = notModuleRegistratorRoutes.openFile(routeWSPath);
+            if (!wsRoute.thisRouteName) {
+                wsRoute.thisRouteName = routeBasename;
+            }
+            return wsRoute;
+        } else {
+            return false;
+        }
+    }
+
+    registerManifestAndRoutes({
+        nModule,
+        routeName,
+        routeManifest,
+        route,
+        wsRoute,
+    }) {
+        notModuleRegistratorRoutes.registerManifest({
+            nModule,
+            routeManifest,
+            routeName,
+        });
+        if (route) {
+            this.registerRoute({
+                nModule,
+                route,
+                routeName: route.thisRouteName,
+            });
+        }
+        if (wsRoute) {
+            this.registerWSRoute({ nModule, wsRoute });
+        }
+    }
+
+    registerRoute({ nModule, route, routeName }) {
+        nModule.setRoute(route.thisRouteName, route);
+        if (nModule.appIsSet()) {
+            mapBind(nModule.getApp(), route, ROUTE_BINDINGS_LIST);
+        }
+        route.log = logger(route, `Route#${routeName}`);
+        route.getThisModule = () => nModule;
+    }
+
+    registerWSRoute({ nModule, wsRoute }) {
+        new notModuleRegistratorRoutesWS({
+            nModule,
+            wsRoute: wsRoute,
+            wsRouteName: wsRoute.thisRouteName,
+        });
     }
-  }
 
-  registerRoute({nModule, route, routeName}) {
-    nModule.setRoute(route.thisRouteName, route);
-    if (nModule.appIsSet()) {
-      mapBind(nModule.getApp(), route, ROUTE_BINDINGS_LIST);
+    static registerManifest({ nModule, routeManifest, routeName }) {
+        nModule.setManifest(routeName, routeManifest);
     }
-    route.log = logger(route, `Route#${routeName}`);
-    route.getThisModule = () => nModule;
-  }
-
-
-  registerWSRoute({nModule, wsRoute}){
-    new notModuleRegistratorRoutesWS({
-      nModule,
-      wsRoute:      wsRoute,
-      wsRouteName:  wsRoute.thisRouteName
-    });
-  }
-
-  static registerManifest({nModule, routeManifest, routeName}) {
-    nModule.setManifest(routeName, routeManifest);
-  }
 };

package/src/manifest/registrator/routes.ws.js

@@ -1,4 +1,4 @@
-const {mapBind, objHas} = require('../../common');
+const { mapBind, objHas } = require("../../common");
 
 /**
  * List of methods to be binded from notApp to routes and WS end-points
@@ -6,122 +6,128 @@ const {mapBind, objHas} = require('../../common');
  * @type {string}
  */
 const WS_ROUTE_BINDINGS_LIST = [
-  'getLogic', 'getLogicFile',
-  'getModel', 'getModelFile', 'getModelSchema',
-  'getModule'
+    "getLogic",
+    "getLogicFile",
+    "getModel",
+    "getModelFile",
+    "getModelSchema",
+    "getModule",
 ];
 
-module.exports = class notModuleRegistratorRoutesWS{
-  constructor({
-    nModule,
-    wsRoute,
-    wsRouteName
-  }){
-    this.run({
-      nModule,
-      wsRoute,
-      wsRouteName
-    });
-  }
+module.exports = class notModuleRegistratorRoutesWS {
+    constructor({ nModule, wsRoute, wsRouteName }) {
+        this.run({
+            nModule,
+            wsRoute,
+            wsRouteName,
+        });
+    }
 
-  run({
-    nModule,
-    wsRoute,
-    wsRouteName
-  }) {
-    if (nModule.appIsSet()) {
-      const input = {
-        nModule,
-        wsRoute,
-        wsRouteName
-      };
-      this.registerServers(input);
-      this.registerClients(input);
+    run({ nModule, wsRoute, wsRouteName }) {
+        if (nModule.appIsSet()) {
+            const input = {
+                nModule,
+                wsRoute,
+                wsRouteName,
+            };
+            this.registerServers(input);
+            this.registerClients(input);
+        }
     }
-  }
 
-  registerServers(input){
-    this.registerCollectionType({
-      ...input,
-      collectionType: 'servers'
-    });
-  }
+    registerServers(input) {
+        this.registerCollectionType({
+            ...input,
+            collectionType: "servers",
+        });
+    }
 
-  registerClients(input){
-    this.registerCollectionType({
-      ...input,
-      collectionType: 'clients'
-    });
-  }
+    registerClients(input) {
+        this.registerCollectionType({
+            ...input,
+            collectionType: "clients",
+        });
+    }
 
-  registerCollectionType({
-    nModule,
-    wsRoute, wsRouteName,
-    collectionType
-  }) {
-    if (!objHas(wsRoute, collectionType)) { return false; }
-    Object.keys(wsRoute[collectionType]).forEach(
-      (collectionName) => this.registerCollectionItem({
-        nModule,
-        wsRoute, wsRouteName,
-        collectionType, collectionName,
-      })
-    );
-    return true;
-  }
+    registerCollectionType({ nModule, wsRoute, wsRouteName, collectionType }) {
+        if (!objHas(wsRoute, collectionType)) {
+            return false;
+        }
+        Object.keys(wsRoute[collectionType]).forEach((collectionName) =>
+            this.registerCollectionItem({
+                nModule,
+                wsRoute,
+                wsRouteName,
+                collectionType,
+                collectionName,
+            })
+        );
+        return true;
+    }
 
-  registerCollectionItem({
-    nModule,
-    wsRoute, wsRouteName,
-    collectionType, collectionName,
-  }){
-    const collection = wsRoute[collectionType][collectionName];
-    mapBind(nModule.getApp(), collection, WS_ROUTE_BINDINGS_LIST);
-    this.registerEndPoints({
-      nModule,
-      wsRoute, wsRouteName,
-      collectionType, collectionName, collection
-    });
-  }
+    registerCollectionItem({
+        nModule,
+        wsRoute,
+        wsRouteName,
+        collectionType,
+        collectionName,
+    }) {
+        const collection = wsRoute[collectionType][collectionName];
+        mapBind(nModule.getApp(), collection, WS_ROUTE_BINDINGS_LIST);
+        this.registerEndPoints({
+            nModule,
+            wsRoute,
+            wsRouteName,
+            collectionType,
+            collectionName,
+            collection,
+        });
+    }
 
+    registerEndPoints({
+        nModule,
+        wsRouteName,
+        collectionType,
+        collectionName,
+        collection,
+    }) {
+        Object.keys(collection).forEach((endPointType) => {
+            const endPoints = collection[endPointType];
+            //creating deep object structure if not exists
+            nModule.createEmptyIfNotExistsRouteWSType({
+                collectionType,
+                collectionName,
+                endPointType,
+            });
+            //
+            notModuleRegistratorRoutesWS.addEntityEndPointsOfType({
+                nModule,
+                endPoints,
+                collectionType,
+                collectionName,
+                endPointType,
+                wsRouteName,
+            });
+        });
+    }
 
-  registerEndPoints({
-    nModule,
-    wsRouteName,
-    collectionType, collectionName, collection
-  }){
-    Object.keys(collection).forEach((endPointType) => {
-      const endPoints = collection[endPointType];
-      //creating deep object structure if not exists
-      nModule.createEmptyIfNotExistsRouteWSType({
-        collectionType, collectionName, endPointType
-      });
-      //
-      notModuleRegistratorRoutesWS.addEntityEndPointsOfType({
+    static addEntityEndPointsOfType({
         nModule,
         endPoints,
-        collectionType, collectionName,
-        endPointType, wsRouteName
-      });
-    });
-  }
-
-  static addEntityEndPointsOfType({
-    nModule,
-    endPoints,
-    collectionType, collectionName,
-    endPointType, wsRouteName
-  }){
-    Object.keys(endPoints).forEach((endPointName) => {
-      nModule.setRouteWS({
         collectionType,
         collectionName,
         endPointType,
         wsRouteName,
-        action: endPointName,
-        func:   endPoints[endPointName]
-      });
-    });
-  }
-
+    }) {
+        Object.keys(endPoints).forEach((endPointName) => {
+            nModule.setRouteWS({
+                collectionType,
+                collectionName,
+                endPointType,
+                wsRouteName,
+                action: endPointName,
+                func: endPoints[endPointName],
+            });
+        });
+    }
 };