not-node 5.1.32 → 5.1.35

package/package.json

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

package/src/form/env_extractors/ID.js

@@ -0,0 +1,6 @@
+module.exports = (form, req) => {
+    return {
+        name: "targetID",
+        value: req.params.ID,
+    };
+};

package/src/form/env_extractors/_id.js

@@ -0,0 +1,6 @@
+module.exports = (form, req) => {
+    return {
+        name: "targetId",
+        value: req.params._id,
+    };
+};

package/src/form/env_extractors/activeUser.js

@@ -0,0 +1,6 @@
+module.exports = (form, req) => {
+    return {
+        name: "activeUser",
+        value: req.user,
+    };
+};

package/src/form/env_extractors/index.js

@@ -0,0 +1,8 @@
+module.exports = {
+    _id: require("./_id.js"),
+    ID: require("./ID.js"),
+    activeUser: require("./activeUser.js"),
+    ip: require("./ip.js"),
+    query: require("./query.js"),
+    modelNameID: require("./modelNameID.js"),
+};

package/src/form/env_extractors/ip.js

@@ -0,0 +1,8 @@
+const getIP = require("../../auth").getIP;
+
+module.exports = (form, req) => {
+    return {
+        name: "ip",
+        value: getIP(req),
+    };
+};

package/src/form/env_extractors/modelNameID.js

@@ -0,0 +1,13 @@
+const { firstLetterToLower } = require("../../common");
+
+module.exports = (form, req) => {
+    const modelName = form.getModelName(req);
+    if (typeof modelName === "string") {
+        const idFieldName = `${firstLetterToLower(modelName)}ID`;
+        return {
+            name: idFieldName,
+            value: req.params[idFieldName],
+        };
+    }
+    return undefined;
+};

package/src/form/env_extractors/query.js

@@ -0,0 +1,24 @@
+const notFilter = require("not-filter");
+const getApp = require("../../getApp");
+
+module.exports = (form, req) => {
+    const MODULE_NAME = form.getModuleName();
+    const MODEL_NAME = form.getModelName(req);
+    if (MODEL_NAME && MODULE_NAME) {
+        const thisSchema = getApp().getModelSchema(
+            `${MODULE_NAME}//${MODEL_NAME}`
+        );
+        if (thisSchema) {
+            const { skip, size } = notFilter.pager.process(req), //skip,size
+                sorter = notFilter.sorter.process(req, thisSchema),
+                search = notFilter.search.process(req, thisSchema);
+            let filter = notFilter.filter.process(req, thisSchema);
+
+            return {
+                name: "query",
+                value: { skip, size, sorter, search, filter },
+            };
+        }
+    }
+    return undefined;
+};

package/src/form/form.js

@@ -2,7 +2,7 @@ const FormFabric = require("./fabric");
 
 const { createSchemaFromFields } = require("../fields");
 
-const { objHas, isFunc } = require("../common");
+const { objHas, isFunc, firstLetterToUpper } = require("../common");
 
 const ValidationBuilder = require("not-validation").Builder;
 const ValidationSession = require("not-validation").Session;
@@ -14,6 +14,7 @@ const {
 } = require("../exceptions/form.js");
 
 const DEFAULT_EXTRACTORS = require("./extractors");
+const DEFAULT_ID_EXTRACTORS = require("./env_extractors");
 
 /**
  * Generic form validation class
@@ -30,18 +31,41 @@ class Form {
      * @prop {string} name of form
      **/
     #FORM_NAME;
+    #MODEL_NAME;
     #PROTO_FIELDS;
     #VALIDATOR;
     #EXTRACTORS = {
         ...DEFAULT_EXTRACTORS,
     };
 
-    constructor({ FIELDS, FORM_NAME, app, EXTRACTORS = {} }) {
+    #ENV_EXTRACTORS = {
+        ...DEFAULT_ID_EXTRACTORS,
+    };
+
+    constructor({
+        FIELDS,
+        FORM_NAME,
+        MODEL_NAME,
+        app,
+        EXTRACTORS = {},
+        ENV_EXTRACTORS = {},
+    }) {
         this.#FORM_NAME = FORM_NAME;
+        this.#MODEL_NAME = MODEL_NAME;
         this.#PROTO_FIELDS = FIELDS;
         this.#createValidationSchema(app);
         this.#augmentValidationSchema();
         this.#addExtractors(EXTRACTORS);
+        this.#addEnvExtractors(ENV_EXTRACTORS);
+    }
+
+    getModelName(req) {
+        if (this.#MODEL_NAME) {
+            return this.#MODEL_NAME;
+        } else if (req) {
+            return firstLetterToUpper(req.notRouteData.modelName);
+        }
+        return undefined;
     }
 
     /**
@@ -62,8 +86,32 @@ class Form {
      * @param {ExpressRequest} req expressjs request object
      * @return {Object}        forma data
      **/
-    async extract(/*req*/) {
-        return {};
+    async extract(req) {
+        return {
+            ...this.extractRequestEnvs(req),
+            data: this.extractByInstructionsFromRouteActionFields(req),
+        };
+    }
+
+    #addEnvExtractors(extractors = {}) {
+        if (extractors) {
+            this.#ENV_EXTRACTORS = { ...this.#ENV_EXTRACTORS, ...extractors };
+        }
+    }
+
+    extractRequestEnvs(req) {
+        const result = {};
+        Array.values(this.#ENV_EXTRACTORS).forEach((extractor) => {
+            const extracted = extractor(this, req);
+            if (
+                extracted &&
+                typeof extracted.value !== "undefined" &&
+                extracted.name
+            ) {
+                result[extracted.name] = extracted.value;
+            }
+        });
+        return result;
     }
 
     /**
@@ -243,6 +291,41 @@ class Form {
         }
         return results;
     }
+
+    createInstructionFromRouteActionFields(
+        req,
+        mainInstruction = "fromBody",
+        exceptions = {}
+    ) {
+        const result = {};
+        if (
+            req?.notRouteData?.actionData?.fields &&
+            Array.isArray(req.notRouteData.actionData.fields)
+        ) {
+            const fields = req.notRouteData.actionData.fields.flat(2);
+            fields.forEach((fieldName) => {
+                if (objHas(exceptions, fieldName)) {
+                    result[fieldName] = exceptions[fieldName];
+                } else {
+                    result[fieldName] = mainInstruction;
+                }
+            });
+        }
+        return result;
+    }
+
+    extractByInstructionsFromRouteActionFields(
+        req,
+        mainInstruction = "fromBody",
+        exceptions = {}
+    ) {
+        const instructions = this.createInstructionFromRouteActionFields(
+            req,
+            mainInstruction,
+            exceptions
+        );
+        return this.extractByInstructions(req, instructions);
+    }
 }
 
 module.exports = Form;

package/src/manifest/route.js

@@ -77,6 +77,7 @@ class notRoute {
     setRequestRouteData(req, actionName, rule) {
         req.notRouteData = {
             actionName,
+            modelName: this.routeName,
             rule: copyObj(rule),
             actionData: copyObj(this.actionData),
         };