not-node 6.3.62 → 6.3.64

package/package.json

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

package/src/form/env_extractors/query.js

@@ -10,25 +10,30 @@ const getApp = require("../../getApp");
 module.exports = (form, req) => {
     const MODULE_NAME = form.getModuleName();
     const MODEL_NAME = form.getModelName(req);
+    let thisSchema;
     if (MODEL_NAME && MODULE_NAME) {
-        const thisSchema = getApp().getModelSchema(
-            `${MODULE_NAME}//${MODEL_NAME}`
+        thisSchema = getApp().getModelSchema(`${MODULE_NAME}//${MODEL_NAME}`);
+    } else {
+        getApp().log(
+            `warning: Form '${form.FORM_NAME}' for model '${MODEL_NAME}' has no MODULE_NAME`
         );
-        if (thisSchema) {
-            let skip, size;
-            const pager = 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);
-            if (pager) {
-                skip = pager.skip;
-                size = pager.size;
-            }
-            return {
-                name: "query",
-                value: { skip, size, sorter, search, filter },
-            };
+        thisSchema = getApp().getModelSchema(`${MODEL_NAME}`);
+    }
+    if (thisSchema) {
+        let skip, size;
+        const pager = 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);
+        if (pager) {
+            skip = pager.skip;
+            size = pager.size;
         }
+        return {
+            name: "query",
+            value: { skip, size, sorter, search, filter },
+        };
     }
+
     return undefined;
 };

package/src/form/form.js

@@ -72,6 +72,8 @@ class Form {
         ...DEFAULT_AFTER_EXTRACT_TRANSFORMERS,
     };
 
+    #INSTRUCTIONS = null;
+
     #rateLimiter = null;
     #rateLimiterIdGetter = (data) => data.identity.sid;
     #rateLimiterException = FormExceptionTooManyRequests;
@@ -87,6 +89,7 @@ class Form {
      * @param {import('../app.js')} options.app
      * @param {Object.<string, Function>} options.EXTRACTORS
      * @param {Object.<string, Function>} options.TRANSFORMERS
+     * @param {import('../types.js').notAppFormProcessingPipe|null} options.INSTRUCTIONS
      * @param {Array<Function>} options.AFTER_EXTRACT_TRANSFORMERS
      * @param {Object.<string, import('../types.js').notAppFormEnvExtractor>} options.ENV_EXTRACTORS
      * @param   {import('../types.js').notAppFormRateLimiterOptions}    options.rate
@@ -100,6 +103,7 @@ class Form {
         EXTRACTORS = {},
         ENV_EXTRACTORS = {},
         TRANSFORMERS = {},
+        INSTRUCTIONS = null,
         AFTER_EXTRACT_TRANSFORMERS = [],
         rate,
     }) {
@@ -109,6 +113,7 @@ class Form {
         this.#PROTO_FIELDS = FIELDS;
         this.#createValidationSchema(app);
         this.#augmentValidationSchema();
+        this.#addInstructions(INSTRUCTIONS);
         this.#addExtractors(EXTRACTORS);
         this.#addEnvExtractors(ENV_EXTRACTORS);
         this.#addTransformers(TRANSFORMERS);
@@ -116,6 +121,10 @@ class Form {
         this.#createRateLimiter(rate);
     }
 
+    get FORM_NAME() {
+        return this.#FORM_NAME;
+    }
+
     /**
      * Creates model name string used in logging
      * @param {string} MODULE_NAME
@@ -219,10 +228,18 @@ class Form {
     async extract(req) {
         return {
             ...this.extractRequestEnvs(req),
-            data: this.extractByInstructionsFromRouteActionFields(req),
+            data: this.#extractByBestInstructions(req),
         };
     }
 
+    #extractByBestInstructions(req) {
+        if (this.#INSTRUCTIONS) {
+            return this.extractByInstructions(req, this.#INSTRUCTIONS);
+        } else {
+            return this.extractByInstructionsFromRouteActionFields(req);
+        }
+    }
+
     /**
      * Chance to edit prepared data
      *
@@ -413,6 +430,15 @@ class Form {
     static fabric() {
         return FormFabric;
     }
+    /**
+     *  Object with named extractor functions
+     * @param {import('../types.js').notAppFormProcessingPipe|null} instructions
+     */
+    #addInstructions(instructions = null) {
+        if (instructions) {
+            this.#INSTRUCTIONS = { ...instructions };
+        }
+    }
 
     /**
      *  Object with named extractor functions