not-node 6.3.38 → 6.3.39

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.3.38",
+	"version": "6.3.39",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

package/src/bootstrap/route.js

@@ -3,12 +3,7 @@ const getApp = require("../getApp.js"),
     HttpExceptions = require("../exceptions/http"),
     configInit = require("not-config"),
     { sayForModule } = require("not-locale"),
-    {
-        objHas,
-        isFunc,
-        executeFunctionAsAsync,
-        firstLetterToUpper,
-    } = require("../common"),
+    { objHas, isFunc, executeFunctionAsAsync } = require("../common"),
     LogInit = require("not-log");
 
 module.exports = ({
@@ -39,6 +34,7 @@ module.exports = ({
     accessRulesBuilders = {}, //per action builders, {actionName: (preapared: any, req: ExpressRequest)=>{/** pass or throw an exception **/ */}}
     accessRuleBuilder = false, //universal will be used if no dedicated action builder was found
     defaultAccessRule = false, //if builder is not found, safe by default
+    createForm = Form.createDefaultInstance,
 }) => {
     const Log = LogInit(target, `${MODEL_NAME}/Routes'`);
     const say = sayForModule(MODULE_NAME);
@@ -85,34 +81,25 @@ module.exports = ({
         }
     };
 
-    const createDefaultForm = function ({ actionName, MODULE_NAME }) {
-        const FIELDS = [
-            ["identity", "not-node//identity"],
-            ["data", `${MODULE_NAME}//_${MODEL_NAME}`],
-        ];
-        const FORM_NAME = `${MODULE_NAME}:${firstLetterToUpper(
-            actionName
-        )}Form`;
-        const cls = class extends Form {
-            constructor({ app }) {
-                super({ FIELDS, FORM_NAME, app, MODULE_NAME });
-            }
-        };
-        return new cls({ app: getApp() });
-    };
-
     const getForm = (actionName) => {
         const form = getApp().getForm(
-            [MODULE_NAME, `${MODEL_NAME}.${actionName}`].join("//")
+            Form.createPath(MODULE_NAME, MODEL_NAME, actionName)
         );
         if (form) {
             return form;
         }
-        const form2 = getApp().getForm([MODULE_NAME, actionName].join("//"));
+        const form2 = getApp().getForm(
+            Form.createPath(MODULE_NAME, undefined, actionName)
+        );
         if (form2) {
             return form2;
         }
-        return createDefaultForm({ actionName, MODULE_NAME });
+        return createForm({
+            app: getApp(),
+            MODULE_NAME,
+            MODEL_NAME,
+            actionName,
+        });
     };
 
     const beforeDecorator = async (req, res, next) => {

package/src/form/form.js

@@ -3,7 +3,12 @@ const notPath = require("not-path");
 const FormFabric = require("./fabric");
 const { createSchemaFromFields } = require("../fields");
 
-const { objHas, isFunc, firstLetterToUpper } = require("../common");
+const {
+    objHas,
+    isFunc,
+    firstLetterToUpper,
+    firstLetterToLower,
+} = require("../common");
 
 const ValidationBuilder = require("not-validation").Builder;
 const ValidationSession = require("not-validation").Session;
@@ -98,6 +103,40 @@ class Form {
         this.#createRateLimiter(rate);
     }
 
+    static createName(MODULE_NAME, MODEL_NAME, actionName) {
+        return `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
+            actionName
+        )}Form`;
+    }
+
+    static createPath(MODULE_NAME, MODEL_NAME, actionName) {
+        if (MODEL_NAME) {
+            return `${MODULE_NAME}//${firstLetterToLower(
+                MODEL_NAME
+            )}.${actionName}`;
+        } else {
+            return `${MODULE_NAME}//${actionName}`;
+        }
+    }
+
+    /**
+     *
+     * @param   {object} options
+     * @param   {import('../app.js')}   options.app
+     * @param   {string}   options.MODULE_NAME
+     * @param   {string}   options.MODEL_NAME
+     * @param   {string}   options.actionName
+     * @returns {object}    instance of Form
+     */
+    static createDefaultInstance({ app, MODULE_NAME, MODEL_NAME, actionName }) {
+        const FIELDS = [
+            ["identity", "not-node//identity"],
+            ["data", `${MODULE_NAME}//_${MODEL_NAME}`],
+        ];
+        const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
+        return new Form({ FIELDS, FORM_NAME, app, MODULE_NAME });
+    }
+
     /**
      *
      *

package/src/generic/form.authorizedAction.js

@@ -1,13 +1,11 @@
 //DB related validation tools
 const Form = require("../form/form");
-const { firstLetterToUpper } = require("../common");
+
 //form
 const FIELDS = [["identity", "not-node//requiredObject"]];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName }) => {
-    const FORM_NAME = `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
-        actionName
-    )}Form`;
+    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
     return class extends Form {
         constructor(params) {
             super({ ...params, MODULE_NAME, MODEL_NAME, FIELDS, FORM_NAME });

package/src/generic/form.getByID.js

@@ -1,6 +1,6 @@
 //DB related validation tools
 const Form = require("../form/form");
-const { firstLetterToUpper } = require("../common");
+
 //form
 const FIELDS = [
     ["targetID", { required: true }, "not-node//ID"],
@@ -9,9 +9,7 @@ const FIELDS = [
 ];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "getByID" }) => {
-    const FORM_NAME = `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
-        actionName
-    )}Form`;
+    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
     return class extends Form {
         constructor(params) {
             super({ ...params, MODULE_NAME, MODEL_NAME, FIELDS, FORM_NAME });

package/src/generic/form.getById.js

@@ -1,6 +1,5 @@
 //DB related validation tools
 const Form = require("../form/form");
-const { firstLetterToUpper } = require("../common");
 
 //form
 const FIELDS = [
@@ -9,9 +8,7 @@ const FIELDS = [
 ];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "getById" }) => {
-    const FORM_NAME = `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
-        actionName
-    )}Form`;
+    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
     return class extends Form {
         constructor(params) {
             super({ ...params, MODULE_NAME, MODEL_NAME, FIELDS, FORM_NAME });

package/src/generic/form.list.js

@@ -1,5 +1,5 @@
 const Form = require("../form/form");
-const { firstLetterToUpper } = require("../common");
+
 const notFilter = require("not-filter");
 const notAppIdentity = require("../identity");
 
@@ -18,9 +18,7 @@ const FIELDS = [
  * @return {Form}   form class definition
  */
 const FactoryFormList = ({ MODULE_NAME, MODEL_NAME, actionName = "list" }) => {
-    const FORM_NAME = `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
-        actionName
-    )}Form`;
+    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
 
     return class extends Form {
         constructor(params) {

package/src/generic/form.listAndCount.js

@@ -1,5 +1,5 @@
 const Form = require("../form/form");
-const { firstLetterToUpper } = require("../common");
+
 const notFilter = require("not-filter");
 const notAppIdentity = require("../identity");
 
@@ -22,9 +22,7 @@ const FactoryFormListAndCount = ({
     MODEL_NAME,
     actionName = "listAndCount",
 }) => {
-    const FORM_NAME = `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
-        actionName
-    )}Form`;
+    const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
 
     return class extends Form {
         constructor(params) {