not-node 6.3.80 → 6.3.82

package/package.json

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

package/src/const.js

@@ -4,10 +4,13 @@ const DEFAULT_PATH_MODULES = "./modules";
 const DEFAULT_PATH_WS = "./ws";
 const DEFAULT_PATH_DB_DUMPS = "../../db.dumps";
 
+const ACTION_DATA_TYPES = require("./manifest/const").ACTION_DATA_TYPES;
+
 module.exports = {
     DEFAULT_PATH_WS,
     DEFAULT_PATH_MODULES,
     DEFAULT_PATH_STATIC,
     DEFAULT_PATH_TMP,
     DEFAULT_PATH_DB_DUMPS,
+    ACTION_DATA_TYPES,
 };

package/src/form/env_extractors/query.js

@@ -1,5 +1,28 @@
 const notFilter = require("not-filter");
 const getApp = require("../../getApp");
+const ACTION_DATA_TYPES = require("../../manifest/const").ACTION_DATA_TYPES;
+
+const extractors = Object.freeze({
+    [ACTION_DATA_TYPES.PAGER]: (result, req) => {
+        const pager = notFilter.pager.process(req);
+        if (pager) {
+            result.skip = pager.skip;
+            result.size = pager.size;
+        }
+    },
+    [ACTION_DATA_TYPES.SORTER]: (result, req, thisSchema) => {
+        result.sorter = notFilter.sorter.process(req, thisSchema);
+    },
+    [ACTION_DATA_TYPES.SEARCH]: (result, req, thisSchema) => {
+        result.search = notFilter.search.process(req, thisSchema);
+    },
+    [ACTION_DATA_TYPES.FILTER]: (result, req, thisSchema) => {
+        result.filter = notFilter.filter.process(req, thisSchema);
+    },
+    [ACTION_DATA_TYPES.RETURN]: (result, req, thisSchema) => {
+        result.return = notFilter.return.process(req, thisSchema);
+    },
+});
 
 /**
  *
@@ -20,18 +43,20 @@ module.exports = (form, req) => {
         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;
-        }
+        let result = {};
+        const routeActionDataTypes = form.getActionDataDataTypes(req);
+        Object.values(ACTION_DATA_TYPES).forEach((dataType) => {
+            if (
+                routeActionDataTypes.includes(dataType) &&
+                Object.hasOwn(extractors, dataType)
+            ) {
+                extractors[dataType](result, req, thisSchema);
+            }
+        });
+
         return {
             name: "query",
-            value: { skip, size, sorter, search, filter },
+            value: result, //{ skip, size, sorter, search, filter, return }
         };
     }
 

package/src/form/form.js

@@ -32,6 +32,7 @@ const DEFAULT_ID_EXTRACTORS = require("./env_extractors");
 const DEFAULT_TRANSFORMERS = require("./transformers");
 const DEFAULT_AFTER_EXTRACT_TRANSFORMERS = [];
 const notAppIdentity = require("../identity/index.js");
+const { ACTION_DATA_TYPES } = require("../const.js");
 
 /**
  * Generic form validation class
@@ -195,6 +196,26 @@ class Form {
         return undefined;
     }
 
+    /**
+     *  Returns array of types of data in action. Is subset of values of ACTION_DATA_TYPES object.
+     *
+     * @param {import('../types').notNodeExpressRequest} req
+     * @return {Array<string>}
+     * @memberof Form
+     */
+    getActionDataDataTypes(req) {
+        if (
+            req &&
+            req.notRouteData &&
+            req.notRouteData.actionData &&
+            req.notRouteData.actionData.data &&
+            Array.isArray(req.notRouteData.actionData.data)
+        ) {
+            return req.notRouteData.actionData.data;
+        }
+        return [];
+    }
+
     /**
      *
      *
@@ -221,15 +242,19 @@ class Form {
     }
 
     /**
-     * Extracts data, should be overriden
+     * Extracts data, may be be overriden
      * @param {import('../types').notNodeExpressRequest} req expressjs request object
      * @return {Promise<import('../types').PreparedData>}        forma data
      **/
     async extract(req) {
-        return {
+        /** @type {import('../types').PreparedData} */
+        let result = {
             ...this.extractRequestEnvs(req),
-            data: this.#extractByBestInstructions(req),
         };
+        if (this.getActionDataDataTypes(req).includes(ACTION_DATA_TYPES.DATA)) {
+            result.data = this.#extractByBestInstructions(req);
+        }
+        return result;
     }
 
     #extractByBestInstructions(req) {

package/src/manifest/const.js

@@ -0,0 +1,17 @@
+const ACTION_DATA_TYPE_DATA = "data";
+const ACTION_DATA_TYPE_PAGER = "pager";
+const ACTION_DATA_TYPE_SORTER = "sorter";
+const ACTION_DATA_TYPE_FILTER = "filter";
+const ACTION_DATA_TYPE_SEARCH = "search";
+const ACTION_DATA_TYPE_RETURN = "return";
+
+const ACTION_DATA_TYPES = Object.freeze({
+    DATA: ACTION_DATA_TYPE_DATA,
+    PAGER: ACTION_DATA_TYPE_PAGER,
+    SORTER: ACTION_DATA_TYPE_SORTER,
+    FILTER: ACTION_DATA_TYPE_FILTER,
+    SEARCH: ACTION_DATA_TYPE_SEARCH,
+    RETURN: ACTION_DATA_TYPE_RETURN,
+});
+
+module.exports.ACTION_DATA_TYPES = ACTION_DATA_TYPES;