nodefony 7.0.0-beta.2 → 7.0.0-beta.21

package/kernel/annotations/annotations.es6

@@ -1,4 +1,4 @@
-//const regSpace = new RegExp("^[\\s]*(@.*)[\\s]*$");
+// const regSpace = new RegExp("^[\\s]*(@.*)[\\s]*$");
 const regKeyValue = new RegExp("^[\\s]*([^=]*)[\\s]*=[\\s]*(([{]?).*[}]?)[\\s]*$");
 const regRouteBlock = new RegExp("^.*@Route[\\s]*\\(([^()]*)\\).*");
 const regMethodBlock = new RegExp("^.*@Method[\\s]*\\(([^()]*)\\).*");
@@ -10,9 +10,9 @@ const parseKeyValue = function (tab, obj) {
     if (!tab[i]) {
       continue;
     }
-    let str = tab[i].replace(/(.*)\*$/, "$1");
-    let res = regKeyValue.exec(str);
-    let key = res[1].replace(/["' ]/g, "");
+    const str = tab[i].replace(/(.*)\*$/, "$1");
+    const res = regKeyValue.exec(str);
+    const key = res[1].replace(/["' ]/g, "");
     let value = res[2].replace(/["']/g, "");
     let tmp = null;
     tmp = parseInt(value, 10);
@@ -22,7 +22,7 @@ const parseKeyValue = function (tab, obj) {
     if (res) {
       if (res[3] === "{") {
         value = value.replace(/^[{]/, "").replace(/[}]$/, "");
-        let mytab = value.split(",");
+        const mytab = value.split(",");
         parseKeyValue(mytab, obj[key] = {});
         continue;
       }
@@ -33,8 +33,7 @@ const parseKeyValue = function (tab, obj) {
 };
 
 class annotationRouting {
-
-  constructor(annotation, bundle, pathFile) {
+  constructor (annotation, bundle, pathFile) {
     this.annotation = annotation;
     this.router = this.annotation.router;
     this.path = pathFile;
@@ -47,25 +46,25 @@ class annotationRouting {
     this.prefix = null;
   }
 
-  setPatternController(name) {
-    return this.bundleName + ":" + name + ":";
+  setPatternController (name) {
+    return `${this.bundleName}:${name}:`;
   }
 
-  parse(comments) {
+  parse (comments) {
     if (comments.program && comments.program.class && comments.program.class.length) {
       try {
         if (comments.program.class && comments.program.class.length) {
-          //console.log(comments.program.class);
-          for (let myClass in comments.program.class) {
-            let pattern = this.setPatternController(comments.program.class[myClass].name);
-            let defaultNameController = comments.program.class[myClass].name;
-            let eleClass = {
+          // console.log(comments.program.class);
+          for (const myClass in comments.program.class) {
+            const pattern = this.setPatternController(comments.program.class[myClass].name);
+            const defaultNameController = comments.program.class[myClass].name;
+            const eleClass = {
               type: "Class",
               comment: "",
               bundle: this.bundleName,
               defaultNameAction: null,
               patternController: pattern,
-              defaultNameController: defaultNameController
+              defaultNameController
             };
             if (comments.program.class[myClass].comments && comments.program.class[myClass].comments.length) {
               comments.program.class[myClass].comments.map((ele) => {
@@ -79,7 +78,7 @@ class annotationRouting {
             }
             this.routings.push(eleClass);
             if (comments.program.class[myClass].actions && comments.program.class[myClass].actions.length) {
-              for (let action in comments.program.class[myClass].actions) {
+              for (const action in comments.program.class[myClass].actions) {
                 let defaultNameAction = null;
                 let patternController = `${pattern}`;
                 if (comments.program.class[myClass].actions[action].name) {
@@ -88,13 +87,13 @@ class annotationRouting {
                 } else {
                   continue;
                 }
-                let eleAction = {
+                const eleAction = {
                   type: "Action",
                   comment: "",
                   bundle: this.bundleName,
-                  defaultNameAction: defaultNameAction,
-                  patternController: patternController,
-                  defaultNameController: defaultNameController
+                  defaultNameAction,
+                  patternController,
+                  defaultNameController
                 };
                 if (comments.program.class[myClass].actions[action].comments && comments.program.class[myClass].actions[action].comments.length) {
                   comments.program.class[myClass].actions[action].comments.map((ele) => {
@@ -121,12 +120,12 @@ class annotationRouting {
    *    @Method ({"GET", "POST"})
    *
    */
-  parseRouting() {
+  parseRouting () {
     for (let i = 0; i < this.routings.length; i++) {
-      let obj = {};
+      const obj = {};
       switch (this.routings[i].type) {
       case "Class":
-        let myobj = {};
+        const myobj = {};
         this.parseBlock(this.routings[i], myobj);
         this.prefix = myobj.pattern;
         this.host = myobj.host;
@@ -163,15 +162,15 @@ class annotationRouting {
         break;
       }
     }
-    //console.log(this.obj)
+    // console.log(this.obj)
     return this.obj;
   }
 
-  parseBlock(annotation, obj) {
+  parseBlock (annotation, obj) {
     if (annotation && annotation.comment) {
       try {
         let res = null;
-        let cleanBlock = annotation.comment.replace(/\r?\n?/g, "");
+        const cleanBlock = annotation.comment.replace(/\r?\n?/g, "");
         switch (true) {
         case regRouteBlock.test(cleanBlock):
           res = regRouteBlock.exec(cleanBlock);
@@ -202,16 +201,16 @@ class annotationRouting {
     }
   }
 
-  parseRoute(route, obj) {
-    //let tab = route.replace(/[ ]|[\s]?\*[\s]?/g, "").split(",");
+  parseRoute (route, obj) {
+    // let tab = route.replace(/[ ]|[\s]?\*[\s]?/g, "").split(",");
     route = route.replace(/[ ]|[\s]?/g, "");
-    let tab = route.split(",");
+    const tab = route.split(",");
     tab.map((ele, index) => {
-      let res = ele.replace(/^\*([\s]?)/g, "$1");
+      const res = ele.replace(/^\*([\s]?)/g, "$1");
       tab[index] = res;
       return res;
     });
-    let parser = Array.prototype.shift.call(tab).replace(/["' ]/g, "");
+    const parser = Array.prototype.shift.call(tab).replace(/["' ]/g, "");
     if (regKeyValue.test(parser)) {
       obj.pattern = "";
       tab.unshift(parser);
@@ -221,19 +220,19 @@ class annotationRouting {
     }
   }
 
-  parseMethod(method, obj) {
+  parseMethod (method, obj) {
     obj.method = method.replace(/["'{} ]|[\s]?\*[\s]?/g, "").split(",");
   }
 
-  parseHost(host, obj) {
+  parseHost (host, obj) {
     obj.host = host.replace(/["'{} ]|[\s]?\*[\s]?/g, "");
   }
 
-  parseFirewall(firewall, obj) {
-    let fw = {};
-    let rep = firewall.replace(/["'{} ]|[\s]?\*[\s]?/g, "").split(",");
+  parseFirewall (firewall, obj) {
+    const fw = {};
+    const rep = firewall.replace(/["'{} ]|[\s]?\*[\s]?/g, "").split(",");
     for (let i = 0; i < rep.length; i++) {
-      let spl = rep[i].split(":");
+      const spl = rep[i].split(":");
       if (spl.length) {
         let value = spl[1];
         if (spl[1] === "true") {
@@ -248,30 +247,29 @@ class annotationRouting {
     obj.firewalls = fw;
   }
 
-  toString() {
+  toString () {
     return JSON.stringify(this.obj);
   }
 }
 
 class Annotation extends nodefony.Service {
-
-  constructor(container) {
+  constructor (container) {
     super("Annotations", container);
-    this.kernel.once("onBoot", async () =>{
+    this.kernel.once("onBoot", async () => {
       this.router = this.get("router");
     });
-    //this.router = this.get("router");
+    // this.router = this.get("router");
     this.engine = nodefony.babylon;
   }
 
-  parseController(fileContent, bundle, file) {
+  parseController (fileContent, bundle, file) {
     return this.engine.parseController(fileContent)
       .then((comments) => {
         try {
-          let annotations = new annotationRouting(this, this.kernel.getBundle(bundle), file);
+          const annotations = new annotationRouting(this, this.kernel.getBundle(bundle), file);
           annotations.parse(comments);
           if (Object.keys(annotations.obj).length) {
-            this.log("Bundle " + bundle + " Parse Controller Annotation : " + file, "DEBUG");
+            this.log(`Bundle ${bundle} Parse Controller Annotation : ${file}`, "DEBUG");
           }
           return annotations.obj;
         } catch (e) {

package/kernel/api/api.es6

@@ -1,6 +1,5 @@
 class Api extends nodefony.Service {
-
-  constructor(config, context = null) {
+  constructor (config, context = null) {
     const container = context ? context.container : kernel.container;
     super(config.name, container, false, config);
     this.name = null;
@@ -16,27 +15,27 @@ class Api extends nodefony.Service {
     }
   }
 
-  parseArgs(config, context) {
+  parseArgs (config, context) {
     this.name = config.name;
     this.version = config.version;
     this.description = config.description;
     this.context = context;
     this.basePath = config.basePath;
-    //throw new Error(`Constructor Api bad arguments  : ${arguments}`);
+    // throw new Error(`Constructor Api bad arguments  : ${arguments}`);
   }
 
   /**
    *  @method logger
    */
-  logger(pci, severity, msgid, msg) {
+  logger (pci, severity, msgid, msg) {
     if (!msgid) {
       msgid = clc.magenta(`API ${this.name} `);
     }
     return super.logger(pci, severity, msgid, msg);
   }
 
-  getNodefonyInfo(service) {
-    let obj = {
+  getNodefonyInfo (service) {
+    const obj = {
       debug: this.debug
     };
     switch (true) {
@@ -56,7 +55,6 @@ class Api extends nodefony.Service {
     }
     return obj;
   }
-
 }
 
 nodefony.Api = Api;

package/kernel/api/graphqlApi.es6

@@ -1,12 +1,11 @@
 const JsonApi = require(path.resolve(__dirname, "jsonApi.es6"));
-nodefony.graphql = require('graphql');
+nodefony.graphql = require("graphql");
 nodefony["graphql-tools"] = {};
 nodefony["graphql-tools"].schema = require("@graphql-tools/schema");
-nodefony["graphql-tools"].merge = require('@graphql-tools/merge');
+nodefony["graphql-tools"].merge = require("@graphql-tools/merge");
 
 class graphqlApi extends JsonApi {
-
-  constructor(config = {}, context = null) {
+  constructor (config = {}, context = null) {
     let schema = null;
     let rootValue = null;
     let contextValue = null;
@@ -36,23 +35,23 @@ class graphqlApi extends JsonApi {
     }
   }
 
-  static mergeSchemas(options) {
+  static mergeSchemas (options) {
     return nodefony["graphql-tools"].schema.mergeSchemas(options);
   }
 
-  static mergeTypeDefs(options) {
+  static mergeTypeDefs (options) {
     return nodefony["graphql-tools"].merge.mergeTypeDefs(options);
   }
 
-  static mergeResolvers(tab) {
+  static mergeResolvers (tab) {
     return nodefony["graphql-tools"].merge.mergeResolvers(tab);
   }
 
-  static makeExecutableSchema(options) {
+  static makeExecutableSchema (options) {
     return nodefony["graphql-tools"].schema.makeExecutableSchema(options);
   }
 
-  async query(query, variables = null, operationName = null, fieldResolver = null, typeResolver = null) {
+  async query (query, variables = null, operationName = null, fieldResolver = null, typeResolver = null) {
     const controller = this.get("controller");
     this.json.operationName = operationName;
     try {
@@ -62,11 +61,11 @@ class graphqlApi extends JsonApi {
         rootValue: this.rootValue || controller,
         contextValue: this.contextValue || controller,
         variableValues: variables,
-        operationName: operationName,
-        fieldResolver: fieldResolver,
-        typeResolver: typeResolver
+        operationName,
+        fieldResolver,
+        typeResolver
       };
-      let res = await nodefony.graphql.graphql(conf);
+      const res = await nodefony.graphql.graphql(conf);
       if (res.errors && res.errors.length) {
         throw res.errors;
       }
@@ -76,31 +75,32 @@ class graphqlApi extends JsonApi {
     }
   }
 
-  buildSchema(schema) {
+  buildSchema (schema) {
     this.schema = nodefony.graphql.buildSchema(schema);
     return this.schema;
   }
 
-  printSchema() {
+  printSchema () {
     if (this.schema) {
-      return nodefony.graphql.printSchema(this.schema)
+      return nodefony.graphql.printSchema(this.schema);
     }
-    return ''
+    return "";
   }
 
-  setSchema(schema) {
+  setSchema (schema) {
     this.schema = schema;
     return this.schema;
   }
-  setRootValue(rootValue) {
+
+  setRootValue (rootValue) {
     this.rootValue = rootValue;
     return this.rootValue;
   }
-  setContextValue(contextValue) {
+
+  setContextValue (contextValue) {
     this.contextValue = contextValue;
     return this.contextValue;
   }
-
 }
 
 nodefony.api.Graphql = graphqlApi;

package/kernel/api/jsonApi.es6

@@ -1,18 +1,17 @@
 const Api = require(path.resolve(__dirname, "api.es6"));
 class JsonApi extends Api {
-
-  constructor(config, context = null) {
+  constructor (config, context = null) {
     super(config, context);
     this.json = {
       api: this.name,
       version: this.version,
-      //result: null,
+      // result: null,
       message: "",
       messageId: null
-      //error: null,
-      //errorCode: null,
-      //errorType: null,
-      //debug: this.debug
+      // error: null,
+      // errorCode: null,
+      // errorType: null,
+      // debug: this.debug
     };
 
     this.setResultName(this.options.resultName);
@@ -23,18 +22,16 @@ class JsonApi extends Api {
       this.json.url = this.context.url || "";
       this.json.method = this.context.method;
       this.json.scheme = this.context.scheme;
-      this.context.once("onError", (e) => {
-        return this.renderError(e);
-      });
+      this.context.once("onError", (e) => this.renderError(e));
     }
   }
 
-  setResultName(name = "result", value = null) {
+  setResultName (name = "result", value = null) {
     this.resultName = name;
     this.json[this.resultName] = value;
   }
 
-  isError(e, json = {}) {
+  isError (e, json = {}) {
     if (nodefony.isArray(e)) {
       const errorType = nodefony.Error.isError(e[0]);
       if (errorType) {
@@ -71,44 +68,43 @@ class JsonApi extends Api {
     return json;
   }
 
-  sanitize(payload, json) {
+  sanitize (payload, json) {
     this.isError(payload, json);
     if (json.error) {
       return json[this.resultName] = null;
-    } else {
-      if (!json.severity) {
-        json.severity = "INFO";
-      }
-      if (!json.code) {
-        if (this.context && this.context.response) {
-          json.code = this.context.response.getStatusCode();
-        } else {
-          json.code = 200;
-        }
-      }
-      if (!json.message && this.context && this.context.response) {
-        json.message = this.context.response.getStatusMessage(json.code);
+    }
+    if (!json.severity) {
+      json.severity = "INFO";
+    }
+    if (!json.code) {
+      if (this.context && this.context.response) {
+        json.code = this.context.response.getStatusCode();
+      } else {
+        json.code = 200;
       }
-      return json[this.resultName] = payload;
     }
+    if (!json.message && this.context && this.context.response) {
+      json.message = this.context.response.getStatusMessage(json.code);
+    }
+    return json[this.resultName] = payload;
   }
 
-  render(payload, code, message = "", severity = null, messageID = null) {
+  render (payload, code, message = "", severity = null, messageID = null) {
     try {
-      let json = nodefony.extend(this.json, {
-        severity: severity,
-        code: code,
-        message: message,
+      const json = nodefony.extend(this.json, {
+        severity,
+        code,
+        message,
         messageId: messageID
       });
       this.sanitize(payload, json);
       if (this.context) {
         const controller = this.context.get("controller");
-        if(!controller){
+        if (!controller) {
           return json;
-          //this.log(payload,"ERROR")
-          //this.log(`Controller not found`,"ERROR")
-          //throw new Error(`Controller not found`);
+          // this.log(payload,"ERROR")
+          // this.log(`Controller not found`,"ERROR")
+          // throw new Error(`Controller not found`);
         }
         if (this.debug) {
           json.pdu = new nodefony.PDU({
@@ -127,12 +123,12 @@ class JsonApi extends Api {
     }
   }
 
-  renderAsync(payload, code, message = "", severity = null, messageID = null) {
+  renderAsync (payload, code, message = "", severity = null, messageID = null) {
     try {
-      let json = nodefony.extend(this.json, {
-        severity: severity,
-        code: code,
-        message: message,
+      const json = nodefony.extend(this.json, {
+        severity,
+        code,
+        message,
         messageId: messageID
       });
       this.sanitize(payload, json);
@@ -156,8 +152,8 @@ class JsonApi extends Api {
   }
 
 
-  renderPdu(payload, code, message = "", severity = "INFO", messageID = null, api = this.name) {
-    let json = nodefony.extend({
+  renderPdu (payload, code, message = "", severity = "INFO", messageID = null, api = this.name) {
+    const json = nodefony.extend({
 
     }, this.json);
     this.sanitize(payload, json, severity);
@@ -172,10 +168,9 @@ class JsonApi extends Api {
     return new nodefony.PDU(json, severity, api, messageID, message);
   }
 
-  renderError(error, code, message = "", severity = "ERROR", messageID = null) {
+  renderError (error, code, message = "", severity = "ERROR", messageID = null) {
     return this.render(error, code, message, severity, messageID);
   }
-
 }
 
 nodefony.api.Json = JsonApi;

package/kernel/api/openApi.es6

@@ -1,12 +1,11 @@
 const JsonApi = require(path.resolve(__dirname, "jsonApi.es6"));
 class openApi extends JsonApi {
-
-  constructor(config, context = null) {
+  constructor (config, context = null) {
     super(config, context);
   }
 
   // schema api management
-  setSchema(config = {}, entity = null) {
+  setSchema (config = {}, entity = null) {
     if (config.openapi) {
       this.schema = new nodefony.openApiSchema(this, config, entity);
       return this.schema;
@@ -14,13 +13,13 @@ class openApi extends JsonApi {
     throw new nodefony.Error("schema api not supported ");
   }
 
-  getSchema(config = {}, entity = null) {
+  getSchema (config = {}, entity = null) {
     try {
       if (config) {
         this.setSchema(config, entity);
       }
       if (this.schema) {
-        let conf = this.schema.getConfig();
+        const conf = this.schema.getConfig();
         if (conf.components && conf.components.schemas) {
           conf.components.schemas[this.name] = this.getOpenApiSchema();
         }
@@ -32,9 +31,9 @@ class openApi extends JsonApi {
     }
   }
 
-  renderSchema(config = {}, entity = null, code = 200) {
+  renderSchema (config = {}, entity = null, code = 200) {
     try {
-      let conf = this.getSchema(config, entity);
+      const conf = this.getSchema(config, entity);
       if (this.context) {
         const controller = this.context.get("controller");
         return controller.renderJson(conf, code);
@@ -45,7 +44,7 @@ class openApi extends JsonApi {
     }
   }
 
-  getOpenApiSchema() {
+  getOpenApiSchema () {
     return {
       type: "object",
       properties: {
@@ -111,7 +110,7 @@ class openApi extends JsonApi {
         },
         code: {
           type: "integer",
-          format: "int32",
+          format: "int32"
         }
       },
       example: `
@@ -134,8 +133,7 @@ class openApi extends JsonApi {
       `
     };
   }
-
 }
 
 nodefony.api.OpenApi = openApi;
-module.exports = openApi;
+module.exports = openApi;