not-node 5.1.31 → 5.1.34

package/package.json

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

package/src/form/form.js

@@ -1,5 +1,5 @@
 const FormFabric = require("./fabric");
-
+const getIP = require("../auth").getIP;
 const { createSchemaFromFields } = require("../fields");
 
 const { objHas, isFunc } = require("../common");
@@ -14,6 +14,7 @@ const {
 } = require("../exceptions/form.js");
 
 const DEFAULT_EXTRACTORS = require("./extractors");
+const DEFAULT_ID_EXTRACTORS = require("./id_extractors");
 
 /**
  * Generic form validation class
@@ -30,18 +31,36 @@ class Form {
      * @prop {string} name of form
      **/
     #FORM_NAME;
+    #MODEL_NAME;
     #PROTO_FIELDS;
     #VALIDATOR;
     #EXTRACTORS = {
         ...DEFAULT_EXTRACTORS,
     };
 
-    constructor({ FIELDS, FORM_NAME, app, EXTRACTORS = {} }) {
+    #ID_EXTRACTORS = {
+        ...DEFAULT_ID_EXTRACTORS,
+    };
+
+    constructor({
+        FIELDS,
+        FORM_NAME,
+        MODEL_NAME,
+        app,
+        EXTRACTORS = {},
+        ID_EXTRACTORS = {},
+    }) {
         this.#FORM_NAME = FORM_NAME;
+        this.#MODEL_NAME = MODEL_NAME;
         this.#PROTO_FIELDS = FIELDS;
         this.#createValidationSchema(app);
         this.#augmentValidationSchema();
         this.#addExtractors(EXTRACTORS);
+        this.#addIdExtractors(ID_EXTRACTORS);
+    }
+
+    getModelName() {
+        return this.#MODEL_NAME;
     }
 
     /**
@@ -62,8 +81,34 @@ class Form {
      * @param {ExpressRequest} req expressjs request object
      * @return {Object}        forma data
      **/
-    async extract(/*req*/) {
-        return {};
+    async extract(req) {
+        return {
+            ...this.extractRequestIds(req),
+            activeUser: req.user,
+            ip: getIP(req),
+            data: this.extractByInstructionsFromRouteActionFields(req),
+        };
+    }
+
+    #addIdExtractors(extractors = {}) {
+        if (extractors) {
+            this.#ID_EXTRACTORS = { ...this.#ID_EXTRACTORS, ...extractors };
+        }
+    }
+
+    extractRequestIds(req) {
+        const result = {};
+        Array.values(this.#ID_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 +288,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/form/id_extractors/ID.js

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

package/src/form/id_extractors/_id.js

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

package/src/form/id_extractors/index.js

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

package/src/form/id_extractors/modelNameID.js

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

package/src/generic/index.js

@@ -1,6 +1,7 @@
 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.GenericListAndCountForm = require("./form.listAndCount.js");
 
 const FORMS = {};