not-node 6.4.12 → 6.4.14

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.4.12",
+	"version": "6.4.14",
 	"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/generic/field._data.js

@@ -0,0 +1,71 @@
+const Schema = require("mongoose").Schema;
+const getApp = require("../getApp");
+const { firstLetterToLower } = require("../common");
+const genericDataForm = require("./form._data");
+const Form = require("../form/form");
+
+const initGenericDataForm = ({
+    MODULE_NAME,
+    MODEL_NAME,
+    actionName,
+    formName,
+    validators = [],
+    afterExtract = async (input /*, req = null*/) => input,
+}) => {
+    try {
+        const cls = genericDataForm({
+            MODULE_NAME,
+            MODEL_NAME,
+            actionName,
+            validators,
+            afterExtract,
+        });
+        const App = getApp();
+        App.getModule(MODULE_NAME).setFormConstructor(formName, cls);
+        App.getModule(MODULE_NAME).setForm(formName, new cls(App));
+        return true;
+    } catch (e) {
+        getApp().logger.error(e);
+        return false;
+    }
+};
+
+module.exports = ({
+    MODULE_NAME,
+    MODEL_NAME,
+    actionName = "_data",
+    FORM_PATH,
+    validators = [],
+    afterExtract = async (input /*, req = null*/) => input,
+}) => {
+    if (!FORM_PATH) {
+        FORM_PATH = Form.createPath(MODULE_NAME, MODEL_NAME, actionName);
+    }
+    const formName = FORM_PATH.split("//")[1];
+    if (!getApp().getModule(MODULE_NAME).getFormConstructor(formName)) {
+        initGenericDataForm({
+            MODULE_NAME,
+            MODEL_NAME,
+            actionName,
+            formName,
+            validators,
+            afterExtract,
+        });
+    }
+    return {
+        model: {
+            type: Schema.Types.Mixed,
+            required: true,
+            validate: [
+                {
+                    validator(val) {
+                        return getApp().getForm(FORM_PATH).run(val);
+                    },
+                    message: `${MODULE_NAME}:${firstLetterToLower(
+                        MODEL_NAME
+                    )}_data_is_not_valid`,
+                },
+            ],
+        },
+    };
+};

package/src/generic/field.js

@@ -0,0 +1,54 @@
+const getApp = require("../getApp");
+const genericDataField = require("./field._data");
+const Form = require("../form/form");
+
+const initGenericDataField = (
+    MODULE_NAME,
+    MODEL_NAME,
+    actionName = "_data",
+    validators = [],
+    afterExtract = async (input /*, req = null*/) => input
+) => {
+    //not-module//modelName._data
+    const fieldGenericPath = Form.createPath(
+        MODULE_NAME,
+        MODEL_NAME,
+        actionName
+    );
+    //modelName._data
+    const fieldGenericName = fieldGenericPath.split("//")[1];
+    const App = getApp();
+    //if already exists - returning full path to it
+    if (App.getModule(MODULE_NAME).getField(fieldGenericName)) {
+        return fieldGenericPath;
+    }
+    //create new definition, register, return
+    return genericDataField({
+        MODULE_NAME,
+        MODEL_NAME,
+        FORM_PATH: fieldGenericPath,
+        validators,
+        afterExtract,
+    });
+};
+
+const getGenericDataField = ({
+    fieldPath,
+    MODULE_NAME,
+    MODEL_NAME,
+    validators,
+    afterExtract,
+}) => {
+    if (getApp().getField(fieldPath)) {
+        return fieldPath;
+    } else {
+        return initGenericDataField({
+            MODULE_NAME,
+            MODEL_NAME,
+            validators,
+            afterExtract,
+        });
+    }
+};
+
+module.exports = { getGenericDataField, initGenericDataField };

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,58 @@
+const Form = require("../form/form");
+const { getGenericDataField } = require("./field");
+/**
+ * Creates generic Crud form, if data field is not defined in fields/ it creates and registers field in module and sub _data form
+ *
+ * @param {Object}              param
+ * @param {string}              param.MODULE_NAME
+ * @param {string}              param.MODEL_NAME
+ * @param {string}              [param.actionName="create"]
+ * @param {string}              [param.dataFieldName = "_data"]
+ * @param {Array<function>}     [param.validators = []]
+ * @param {Array<function>}     [param.dataValidators = []],
+ * @param {function}            [param.afterExtract = async (input , req) => input]
+ * @param {function}            [param.afterDataExtract = async (input,  req) => input]
+ */
+module.exports = ({
+    MODULE_NAME,
+    MODEL_NAME,
+    actionName = "create",
+    dataFieldName = "data",
+    validators = [],
+    dataValidators = [],
+    afterExtract = async (input /*, req*/) => input,
+    afterDataExtract = async (input /*, req*/) => input,
+}) => {
+    const defaultDataFieldPath = Form.createPath(
+        MODULE_NAME,
+        MODEL_NAME,
+        dataFieldName
+    );
+
+    const dataFieldDefinition = getGenericDataField({
+        fieldPath: defaultDataFieldPath,
+        MODULE_NAME,
+        MODEL_NAME,
+        validators: dataValidators,
+        afterExtract: afterDataExtract,
+    });
+
+    const FIELDS = [
+        ["identity", "not-node//identity"],
+        ["data", dataFieldDefinition],
+    ];
+    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,62 @@
+const Form = require("../form/form");
+const { getGenericDataField } = require("./field");
+/**
+ * Creates generic crUd form, if data field is not defined in fields/ it creates and registers field in module and sub _data form
+ *
+ * @param {Object}              param
+ * @param {string}              param.MODULE_NAME
+ * @param {string}              param.MODEL_NAME
+ * @param {string}              [param.actionName="update"]
+ * @param {string}              [param.dataFieldName = "_data"]
+ * @param {Array<function>}     [param.validators = []]
+ * @param {Array<function>}     [param.dataValidators = []],
+ * @param {function}            [param.afterExtract = async (input , req) => input]
+ * @param {function}            [param.afterDataExtract = async (input,  req) => input]
+ */
+function genericUpdateForm({
+    MODULE_NAME,
+    MODEL_NAME,
+    actionName = "update",
+    dataFieldName = "_data",
+    validators = [],
+    dataValidators = [],
+    afterExtract = async (input /*, req*/) => input,
+    afterDataExtract = async (input /*, req*/) => input,
+}) {
+    const defaultDataFieldPath = Form.createPath(
+        MODULE_NAME,
+        MODEL_NAME,
+        dataFieldName
+    );
+
+    const dataFieldDefinition = getGenericDataField({
+        fieldPath: defaultDataFieldPath,
+        MODULE_NAME,
+        MODEL_NAME,
+        validators: dataValidators,
+        afterExtract: afterDataExtract,
+    });
+
+    const FIELDS = [
+        ["targetId", { required: true }, "not-node//objectId"],
+        ["identity", "not-node//identity"],
+        ["data", dataFieldDefinition],
+    ];
+
+    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;
+        }
+    };
+}
+
+module.exports = genericUpdateForm;

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");