not-node 5.1.20 → 5.1.23

package/package.json

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

package/src/core/locales/en.json

@@ -64,5 +64,6 @@
   "crud_delete_action_waiting": "Deleting record...",
   "add_label": "Add",
   "select_from_list_label": "Select from list...",
-  "field_actions_label": "Actions"
+  "field_actions_label": "Actions",
+  "form_exception_field_extractor_is_undefined": "Field extractor is undefined"
 }

package/src/core/locales/ru.json

@@ -63,7 +63,8 @@
   "crud_delete_action_waiting": "Удаление записи...",
   "add_label": "Добавить",
   "select_from_list_label": "Выберите из списка...",
-  "field_actions_label": "Действия"
+  "field_actions_label": "Действия",
+  "form_exception_field_extractor_is_undefined": "Экстрактор для поля входных данных отсутствует"
 
 
 }

package/src/exceptions/form.js

@@ -0,0 +1,11 @@
+const { notRequestError } = require("not-error");
+class FormExceptionExtractorForFieldIsUndefined extends notRequestError {
+    constructor(fieldName) {
+        super("not-node:form_exception_field_extractor_is_undefined", {
+            fieldName,
+        });
+    }
+}
+
+module.exports.FormExceptionExtractorForFieldIsUndefined =
+    FormExceptionExtractorForFieldIsUndefined;

package/src/form/extractors/activeUserId.js

@@ -0,0 +1,3 @@
+module.exports = (req) => {
+    return req.user ? req.user._id : undefined;
+};

package/src/form/extractors/activeUserModelName.js

@@ -0,0 +1 @@
+module.exports = () => "User";

package/src/form/extractors/index.js

@@ -0,0 +1,7 @@
+module.exports = {
+    activeUserId: require("./activeUserId.js"),
+    activeUserModelName: require("./activeUserModelName.js"),
+    fromBody: require("./fromBody.js"),
+    fromQuery: require("./fromQuery.js"),
+    fromParams: require("./fromParams.js"),
+};

package/src/form/form.js

@@ -2,16 +2,18 @@ const FormFabric = require("./fabric");
 
 const { createSchemaFromFields } = require("../fields");
 
-const { objHas } = require("../common");
+const { objHas, isFunc } = require("../common");
 
 const ValidationBuilder = require("not-validation").Builder;
 const ValidationSession = require("not-validation").Session;
 
 const { notValidationError, notError } = require("not-error");
 
-const fromBody = require("./extractors/fromBody.js");
-const fromQuery = require("./extractors/fromQuery.js");
-const fromParams = require("./extractors/fromParams.js");
+const {
+    FormExceptionExtractorForFieldIsUndefined,
+} = require("../exceptions/form.js");
+
+const DEFAULT_EXTRACTORS = require("./extractors");
 
 /**
  * Generic form validation class
@@ -31,12 +33,10 @@ class Form {
     #PROTO_FIELDS;
     #VALIDATOR;
     #EXTRACTORS = {
-        fromQuery,
-        fromBody,
-        fromParams,
+        ...DEFAULT_EXTRACTORS,
     };
 
-    constructor({ FIELDS, FORM_NAME, app, EXTRACTORS = [] }) {
+    constructor({ FIELDS, FORM_NAME, app, EXTRACTORS = {} }) {
         this.#FORM_NAME = FORM_NAME;
         this.#PROTO_FIELDS = FIELDS;
         this.#createValidationSchema(app);
@@ -218,15 +218,28 @@ class Form {
         return FormFabric;
     }
 
-    #addExtractors(extractors) {
-        this.#EXTRACTORS = { ...this.#EXTRACTORS, ...extractors };
+    #addExtractors(extractors = {}) {
+        if (extractors) {
+            this.#EXTRACTORS = { ...this.#EXTRACTORS, ...extractors };
+        }
     }
 
     extractByInstructions(req, instructions) {
         const results = {};
-        for (let fieldName of instructions) {
+        for (let fieldName in instructions) {
             const instruction = instructions[fieldName];
-            results[fieldName] = instruction(req, fieldName);
+            if (isFunc(instruction)) {
+                results[fieldName] = instruction(req, fieldName);
+            } else if (typeof instruction == "string") {
+                const extractor = this.#EXTRACTORS[instruction];
+                if (isFunc(extractor)) {
+                    results[fieldName] = extractor(req, fieldName);
+                } else {
+                    throw new FormExceptionExtractorForFieldIsUndefined(
+                        fieldName
+                    );
+                }
+            }
         }
         return results;
     }