not-node 6.4.11 → 6.4.13

package/package.json

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

package/src/bootstrap/route.js

@@ -5,7 +5,6 @@ const getApp = require("../getApp.js"),
     { sayForModule } = require("not-locale"),
     { objHas, isFunc, executeFunctionAsAsync } = require("../common"),
     LogInit = require("not-log");
-
 module.exports = ({
     target,
     MODULE_NAME,
@@ -94,6 +93,7 @@ module.exports = ({
         if (form2) {
             return form2;
         }
+
         return createForm({
             app: getApp(),
             MODULE_NAME,
@@ -109,6 +109,7 @@ module.exports = ({
             JSON.stringify(req.notRouteData, null, 4)
         );
         const actionName = req.notRouteData.actionName;
+
         const trimmedActionName = actionName.replace("_", "");
         const FormValidator = getForm(trimmedActionName);
         const prepared = FormValidator

package/src/core/fields/__closed.js

@@ -2,4 +2,7 @@ module.exports = {
     ui: {
         component: "UIHidden",
     },
+    model: {
+        safe: require("../safety.protocols").systemManageable,
+    },
 };

package/src/core/fields/__latest.js

@@ -2,4 +2,7 @@ module.exports = {
     ui: {
         component: "UIHidden",
     },
+    model: {
+        safe: require("../safety.protocols").systemManageable,
+    },
 };

package/src/core/fields/__version.js

@@ -2,4 +2,7 @@ module.exports = {
     ui: {
         component: "UIHidden",
     },
+    model: {
+        safe: require("../safety.protocols").systemManageable,
+    },
 };

package/src/core/fields/__versions.js

@@ -2,4 +2,7 @@ module.exports = {
     ui: {
         component: "UIHidden",
     },
+    model: {
+        safe: require("../safety.protocols").systemManageable,
+    },
 };

package/src/core/fields/session.js

@@ -10,6 +10,6 @@ module.exports = {
         searchable: true,
         required: true,
         transformers: ["xss"],
-        safe: require("../safety.protocols").ownerRootAdmin,
+        safe: require("../safety.protocols").systemManageable,
     },
 };

package/src/core/fields/updatedAt.js

@@ -11,6 +11,7 @@ module.exports = {
         type: Date,
         required: true,
         default: Date.now,
-        safe: require("../safety.protocols").ownerRootAdmin,
+
+        safe: require("../safety.protocols").systemManageable,
     },
 };

package/src/form/form.js

@@ -11,6 +11,7 @@ const {
     isFunc,
     firstLetterToUpper,
     firstLetterToLower,
+    copyObj,
 } = require("../common");
 
 const ValidationBuilder = require("not-validation").Builder;
@@ -97,7 +98,7 @@ class Form {
      * @param   {import('../types.js').notAppFormRateLimiterOptions}    options.rate
      */
     constructor({
-        FIELDS,
+        FIELDS = [],
         FORM_NAME,
         MODEL_NAME,
         MODULE_NAME,
@@ -114,7 +115,7 @@ class Form {
             FORM_NAME ?? Form.createName(MODULE_NAME, MODEL_NAME, actionName);
         this.#MODEL_NAME = MODEL_NAME;
         this.#MODULE_NAME = MODULE_NAME;
-        this.#PROTO_FIELDS = FIELDS;
+        this.#setFields(app, FIELDS);
         this.#createValidationSchema(app);
         this.#augmentValidationSchema();
         this.#addInstructions(INSTRUCTIONS);
@@ -125,6 +126,42 @@ class Form {
         this.#createRateLimiter(rate);
     }
 
+    #setFields(app, FIELDS = []) {
+        try {
+            const warning = () =>
+                app.logger.warn(`No PROTO_FIELDS for ${this.#FORM_NAME} form`);
+            if (FIELDS && Array.isArray(FIELDS) && FIELDS.length) {
+                this.#PROTO_FIELDS = FIELDS;
+            } else if (this.#MODEL_NAME) {
+                let modelPath = `${this.#MODEL_NAME}`;
+                if (this.#MODULE_NAME) {
+                    modelPath = `${this.#MODULE_NAME}//${this.#MODEL_NAME}`;
+                }
+                //no path to model - returning after warning
+                if (!modelPath) {
+                    warning();
+                    return;
+                }
+                const mod = app.getModelFile(modelPath);
+                //no module or fields in module exports - returning after warning
+                if (
+                    !(
+                        mod &&
+                        mod.FIELDS &&
+                        Array.isArray(mod.FIELDS) &&
+                        mod.FIELDS.length
+                    )
+                ) {
+                    warning();
+                    return;
+                }
+                this.#PROTO_FIELDS = copyObj(mod.FIELDS);
+            }
+        } catch (e) {
+            app.logger.error(e);
+        }
+    }
+
     get FORM_NAME() {
         return this.#FORM_NAME;
     }

package/src/generic/field._data.js

@@ -0,0 +1,24 @@
+const Schema = require("mongoose").Schema;
+const getApp = require("../getApp");
+const { firstLetterToLower } = require("../common");
+
+module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "data" }) => {
+    return {
+        model: {
+            type: Schema.Types.Mixed,
+            required: true,
+            validate: [
+                {
+                    validator(val) {
+                        return getApp()
+                            .getForm(`${MODULE_NAME}//_${actionName}`)
+                            .run(val);
+                    },
+                    message: `${MODULE_NAME}:${firstLetterToLower(
+                        MODEL_NAME
+                    )}_data_is_not_valid`,
+                },
+            ],
+        },
+    };
+};

package/src/generic/form._data.js

@@ -0,0 +1,28 @@
+const Form = require("../form/form");
+
+module.exports = ({
+    MODULE_NAME,
+    MODEL_NAME,
+    actionName = "_data",
+    validators = [],
+    afterExtract = async (input /*, req = null*/) => input,
+}) => {
+    return class extends Form {
+        constructor({ app }) {
+            super({ app, MODULE_NAME, MODEL_NAME, actionName });
+        }
+
+        extract(data) {
+            return data;
+        }
+
+        async afterExtract(input, req) {
+            input = await super.afterExtract(input, req);
+            return await afterExtract(input, req);
+        }
+
+        getFormValidationRules() {
+            return validators;
+        }
+    };
+};

package/src/generic/form.create.js

@@ -0,0 +1,29 @@
+const Form = require("../form/form");
+
+module.exports = ({
+    MODULE_NAME,
+    MODEL_NAME,
+    actionName = "create",
+    dataFieldName = "data",
+    validators = [],
+    afterExtract = async (input /*, req*/) => input,
+}) => {
+    const FIELDS = [
+        ["identity", "not-node//identity"],
+        ["data", `${MODULE_NAME}//_${dataFieldName}`],
+    ];
+    return class extends Form {
+        constructor({ app }) {
+            super({ FIELDS, app, MODULE_NAME, MODEL_NAME, actionName });
+        }
+
+        async afterExtract(input, req) {
+            input = await super.afterExtract(input, req);
+            return await afterExtract(input, req);
+        }
+
+        getFormValidationRules() {
+            return validators;
+        }
+    };
+};

package/src/generic/form.update.js

@@ -0,0 +1,31 @@
+const Form = require("../form/form");
+
+module.exports = ({
+    MODULE_NAME,
+    MODEL_NAME,
+    actionName = "update",
+    dataFieldName = "data",
+    validators = [],
+    afterExtract = async (input /*, req*/) => input,
+}) => {
+    const FIELDS = [
+        ["targetId", { required: true }, "not-node//objectId"],
+        ["identity", "not-node//identity"],
+        ["data", `${MODULE_NAME}//_${dataFieldName}`],
+    ];
+
+    return class extends Form {
+        constructor({ app }) {
+            super({ FIELDS, app, MODULE_NAME, MODEL_NAME, actionName });
+        }
+
+        async afterExtract(input, req) {
+            input = await super.afterExtract(input, req);
+            return await afterExtract(input, req);
+        }
+
+        getFormValidationRules() {
+            return validators;
+        }
+    };
+};

package/src/generic/index.js

@@ -2,6 +2,10 @@ module.exports.GenericLogic = require("./logic.js");
 module.exports.GenericRoute = require("./route.js");
 module.exports.GenericGetByIdForm = require("./form.getById.js");
 module.exports.GenericGetByIDForm = require("./form.getByID.js");
+module.exports.GenericDataField = require("./field._data.js");
+module.exports.GenericDataForm = require("./form._data.js");
+module.exports.GenericCreateForm = require("./form.create.js");
+module.exports.GenericUpdateForm = require("./form.update.js");
 module.exports.GenericAuthorizedActionForm = require("./form.authorizedAction.js");
 module.exports.GenericListAndCountForm = require("./form.listAndCount.js");
 module.exports.GenericListForm = require("./form.list.js");