not-node 6.4.13 → 6.4.14

package/package.json

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

package/src/generic/field._data.js

@@ -1,8 +1,57 @@
 const Schema = require("mongoose").Schema;
 const getApp = require("../getApp");
 const { firstLetterToLower } = require("../common");
+const genericDataForm = require("./form._data");
+const Form = require("../form/form");
 
-module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "data" }) => {
+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,
@@ -10,9 +59,7 @@ module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "data" }) => {
             validate: [
                 {
                     validator(val) {
-                        return getApp()
-                            .getForm(`${MODULE_NAME}//_${actionName}`)
-                            .run(val);
+                        return getApp().getForm(FORM_PATH).run(val);
                     },
                     message: `${MODULE_NAME}:${firstLetterToLower(
                         MODEL_NAME

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.create.js

@@ -1,16 +1,45 @@
 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", `${MODULE_NAME}//_${dataFieldName}`],
+        ["data", dataFieldDefinition],
     ];
     return class extends Form {
         constructor({ app }) {

package/src/generic/form.update.js

@@ -1,17 +1,46 @@
 const Form = require("../form/form");
-
-module.exports = ({
+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",
+    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", `${MODULE_NAME}//_${dataFieldName}`],
+        ["data", dataFieldDefinition],
     ];
 
     return class extends Form {
@@ -28,4 +57,6 @@ module.exports = ({
             return validators;
         }
     };
-};
+}
+
+module.exports = genericUpdateForm;