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

package/kernel/api/schemas/openApiSchema.js

@@ -1,7 +1,7 @@
-const spdx = require('spdx');
+const spdx = require("spdx");
 
 class openApiSchema extends nodefony.Service {
-  constructor(api, config, entity) {
+  constructor (api, config, entity) {
     const container = api ? api.container : kernel.container;
     super("openApiSchema", container, false);
     this.api = api;
@@ -15,7 +15,7 @@ class openApiSchema extends nodefony.Service {
       components: {
         schemas: {
           NodefonyError: this.getErrorSchema(),
-          Pdu: this.getPduSchema(),
+          Pdu: this.getPduSchema()
         },
         responses: this.getResponseSchema()
       },
@@ -27,16 +27,16 @@ class openApiSchema extends nodefony.Service {
     }
   }
 
-  loadConfig(config, entity) {
+  loadConfig (config, entity) {
     this.setConfig(entity);
     return nodefony.extend(true, this.obj, config);
   }
 
-  getConfig() {
+  getConfig () {
     return this.obj;
   }
 
-  setConfig(entity = this.entity) {
+  setConfig (entity = this.entity) {
     this.obj.info = this.getInfo();
     this.obj.servers = this.getServers();
     if (entity) {
@@ -51,7 +51,7 @@ class openApiSchema extends nodefony.Service {
     return this.obj;
   }
 
-  getInfo() {
+  getInfo () {
     return {
       title: this.api.name,
       version: this.api.version,
@@ -66,9 +66,9 @@ class openApiSchema extends nodefony.Service {
     };
   }
 
-  getServers() {
-    return [{
-      "url": `https://${this.kernel.domain}:{port}`,
+  getServers () {
+    const tab = [];
+    const base = {
       "description": this.kernel.description,
       "variables": {
         "port": {
@@ -82,11 +82,22 @@ class openApiSchema extends nodefony.Service {
           "default": this.api.basePath || ""
         }
       }
-    }];
+    };
+    if (this.kernel.domain === "0.0.0.0") {
+      tab.push({
+        "url": "https://localhost:{port}",
+        ...base
+      });
+    }
+    tab.push({
+      "url": `https://${this.kernel.domain}:{port}`,
+      ...base
+    });
+    return tab;
   }
 
-  getLicence(licence = "", url = "") {
-    const bundle = this.api.bundle;
+  getLicence (licence = "", url = "") {
+    const {bundle} = this.api;
     if (bundle) {
       if (bundle.package && bundle.package.license) {
         try {
@@ -103,7 +114,7 @@ class openApiSchema extends nodefony.Service {
           this.log(e, "WARNING");
           spdx.licenses.every((element) => {
             this.log(element, "WARNING");
-            return typeof element === 'string';
+            return typeof element === "string";
           });
           this.log("licence not valid  ", "WARNING");
           this.log("Show licence param in package.json and use spdx to valid : https://github.com/kemitchell/spdx.js ");
@@ -114,7 +125,7 @@ class openApiSchema extends nodefony.Service {
     if (licence) {
       return {
         name: licence,
-        url: url
+        url
       };
     }
     return {
@@ -122,13 +133,31 @@ class openApiSchema extends nodefony.Service {
     };
   }
 
-  setSchema(name, entity = this.entity) {
+  setSchema (name, entity = this.entity) {
     try {
       if (name) {
         this.obj.components.schemas[name] = {};
       }
       if (entity) {
         this.obj.components.schemas[name] = this.orm.getOpenApiSchema(entity);
+        for (let ele in this.obj.components.schemas[name].properties) {
+          if (this.obj.components.schemas[ele]) {
+            continue;
+          }
+          const attr = this.obj.components.schemas[name].properties[ele];
+          if (attr.items && attr.items.$ref) {
+            let entityRef = this.orm.getEntity(ele);
+            if (entityRef) {
+              this.obj.components.schemas[ele] = this.orm.getOpenApiSchema(entityRef);
+            } else if (ele.endsWith("s")) {
+              ele = ele.slice(0, -1);
+              entityRef = this.orm.getEntity(ele);
+              if (entityRef) {
+                this.obj.components.schemas[ele] = this.orm.getOpenApiSchema(entityRef);
+              }
+            }
+          }
+        }
       }
     } catch (e) {
       this.log(e, "WARNING");
@@ -137,9 +166,9 @@ class openApiSchema extends nodefony.Service {
   }
 
 
-  getResponseSchema() {
+  getResponseSchema () {
     return {
-      '400': {
+      "400": {
         description: "Bad Request",
         content: {
           "application/json": {
@@ -149,7 +178,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '401': {
+      "401": {
         description: "Unauthorized",
         content: {
           "application/json": {
@@ -159,7 +188,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '403': {
+      "403": {
         description: "Forbidden",
         content: {
           "application/json": {
@@ -169,7 +198,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '404': {
+      "404": {
         description: "Not Found",
         content: {
           "application/json": {
@@ -179,7 +208,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '405': {
+      "405": {
         description: "Method Not Allowed",
         content: {
           "application/json": {
@@ -189,7 +218,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '406': {
+      "406": {
         description: "Not Acceptable",
         content: {
           "application/json": {
@@ -199,7 +228,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '412': {
+      "412": {
         description: "Precondition Failed",
         content: {
           "application/json": {
@@ -209,7 +238,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '415': {
+      "415": {
         description: "Unsupported Media Type",
         content: {
           "application/json": {
@@ -219,7 +248,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '500': {
+      "500": {
         description: "Internal Server Error",
         content: {
           "application/json": {
@@ -229,7 +258,7 @@ class openApiSchema extends nodefony.Service {
           }
         }
       },
-      '501': {
+      "501": {
         description: "Not Implemented",
         content: {
           "application/json": {
@@ -252,7 +281,7 @@ class openApiSchema extends nodefony.Service {
     };
   }
 
-  getErrorSchema() {
+  getErrorSchema () {
     return {
       type: "object",
       properties: {
@@ -261,7 +290,7 @@ class openApiSchema extends nodefony.Service {
         },
         code: {
           type: "integer",
-          format: "int32",
+          format: "int32"
         },
         url: {
           type: "string"
@@ -271,7 +300,7 @@ class openApiSchema extends nodefony.Service {
         },
         pdu: {
           "$ref": "#/components/schemas/Pdu"
-        },
+        }
       },
       example: `
 {
@@ -303,7 +332,7 @@ class openApiSchema extends nodefony.Service {
     };
   }
 
-  getPduSchema() {
+  getPduSchema () {
     return {
       type: "object",
       properties: {
@@ -362,4 +391,4 @@ class openApiSchema extends nodefony.Service {
 }
 
 nodefony.openApiSchema = openApiSchema;
-module.exports = openApiSchema;
+module.exports = openApiSchema;

package/kernel/babylon.es6

@@ -1,8 +1,8 @@
-const babylon = require('@babel/parser');
+const babylon = require("@babel/parser");
 const defaultSettings = {
   sourceType: "module",
-  //strictMode: false,
-  //tokens: true,
+  // strictMode: false,
+  // tokens: true,
   plugins: [
     "espree"
   ]
@@ -12,36 +12,30 @@ const regAction = new RegExp("^(.*)Action$");
 
 
 class Babylon {
-  constructor() {
+  constructor () {
     this.engine = babylon;
     this.settings = nodefony.extend({}, defaultSettings);
   }
 
-  parse(file, options) {
+  parse (file, options) {
     return new Promise((resolve, reject) => {
       try {
         if (file) {
-          let opt = nodefony.extend({}, this.settings, options);
+          const opt = nodefony.extend({}, this.settings, options);
           switch (true) {
-          case (file instanceof nodefony.fileClass):
+          case file instanceof nodefony.fileClass:
             opt.sourceFilename = file.path;
             file.readAsync()
-              .then((str) => {
-                return resolve(this.engine.parse(str, opt));
-              }).catch(e => {
-                return reject(e);
-              });
+              .then((str) => resolve(this.engine.parse(str, opt)))
+              .catch((e) => reject(e));
             break;
-          case (typeof file === "string"):
+          case typeof file === "string":
             try {
-              let myfile = new nodefony.fileClass(file);
+              const myfile = new nodefony.fileClass(file);
               opt.sourceFilename = myfile.path;
               myfile.readAsync()
-                .then((str) => {
-                  return resolve(this.engine.parse(str, opt));
-                }).catch(e => {
-                  return reject(e);
-                });
+                .then((str) => resolve(this.engine.parse(str, opt)))
+                .catch((e) => reject(e));
             } catch (e) {
               return resolve(this.engine.parse(file, opt));
             }
@@ -55,11 +49,10 @@ class Babylon {
       } catch (e) {
         return reject(e);
       }
-
     });
   }
 
-  logger(res, deep) {
+  logger (res, deep) {
     if (deep) {
       console.log(util.inspect(res, {
         depth: 10
@@ -69,7 +62,7 @@ class Babylon {
     console.log(res);
   }
 
-  parseClassNode(node, obj) {
+  parseClassNode (node, obj) {
     if (nodefony.typeOf(node) === "array") {
       for (let i = 0; i < node.length; i++) {
         this.parseClassNode(node[i], obj);
@@ -104,30 +97,30 @@ class Babylon {
     case "ClassDeclaration":
     case "ClassExpression":
       let name = this.parseClassNode(node.id);
-      let res = regClass.exec(name);
+      const res = regClass.exec(name);
       if (res) {
         name = res[1];
       }
-      let superClass = this.parseClassNode(node.superClass);
-      let myclass = {
-        name: name,
+      const superClass = this.parseClassNode(node.superClass);
+      const myclass = {
+        name,
         extends: superClass,
         actions: [],
         comments: node.leadingComments || []
       };
       obj.class.push(myclass);
       return this.parseClassNode(node.body, myclass);
-    case 'MemberExpression':
-      let object = this.parseClassNode(node.object);
-      let property = this.parseClassNode(node.property);
+    case "MemberExpression":
+      const object = this.parseClassNode(node.object);
+      const property = this.parseClassNode(node.property);
       return `${object}.${property}`;
     case "ClassBody":
       return this.parseClassNode(node.body, obj);
-    case 'ClassMethod':
-      let methodName = this.parseClassNode(node.key);
-      let ret = regAction.exec(methodName);
+    case "ClassMethod":
+      const methodName = this.parseClassNode(node.key);
+      const ret = regAction.exec(methodName);
       if (ret) {
-        let action = {
+        const action = {
           name: ret[1],
           comments: []
         };
@@ -135,13 +128,13 @@ class Babylon {
           this.parseClassNode(node.leadingComments, action);
         }
         obj.actions.push(action);
-        //return this.parseClassNode(node.body, action);
+        // return this.parseClassNode(node.body, action);
       }
       break;
     case "CommentBlock":
       obj.comments.push(node.value);
       return node.value;
-    case 'Identifier':
+    case "Identifier":
       return node.name;
     case "Program":
       obj.program = {
@@ -153,10 +146,10 @@ class Babylon {
     return obj;
   }
 
-  parseController(file) {
+  parseController (file) {
     return this.parse(file)
       .then((ast) => {
-        let obj = {
+        const obj = {
           raw: ast
         };
         this.parseClassNode(ast, obj);
@@ -166,4 +159,4 @@ class Babylon {
 }
 
 nodefony.babylon = new Babylon();
-module.exports = nodefony.babylon;
+module.exports = nodefony.babylon;