not-node 5.1.34 → 5.1.35

package/package.json

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

package/src/form/env_extractors/activeUser.js

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

package/src/form/{id_extractors → env_extractors}/index.js

@@ -1,5 +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/{id_extractors → env_extractors}/modelNameID.js

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

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

@@ -1,8 +1,8 @@
 const FormFabric = require("./fabric");
-const getIP = require("../auth").getIP;
+
 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,7 +14,7 @@ const {
 } = require("../exceptions/form.js");
 
 const DEFAULT_EXTRACTORS = require("./extractors");
-const DEFAULT_ID_EXTRACTORS = require("./id_extractors");
+const DEFAULT_ID_EXTRACTORS = require("./env_extractors");
 
 /**
  * Generic form validation class
@@ -38,7 +38,7 @@ class Form {
         ...DEFAULT_EXTRACTORS,
     };
 
-    #ID_EXTRACTORS = {
+    #ENV_EXTRACTORS = {
         ...DEFAULT_ID_EXTRACTORS,
     };
 
@@ -48,7 +48,7 @@ class Form {
         MODEL_NAME,
         app,
         EXTRACTORS = {},
-        ID_EXTRACTORS = {},
+        ENV_EXTRACTORS = {},
     }) {
         this.#FORM_NAME = FORM_NAME;
         this.#MODEL_NAME = MODEL_NAME;
@@ -56,11 +56,16 @@ class Form {
         this.#createValidationSchema(app);
         this.#augmentValidationSchema();
         this.#addExtractors(EXTRACTORS);
-        this.#addIdExtractors(ID_EXTRACTORS);
+        this.#addEnvExtractors(ENV_EXTRACTORS);
     }
 
-    getModelName() {
-        return this.#MODEL_NAME;
+    getModelName(req) {
+        if (this.#MODEL_NAME) {
+            return this.#MODEL_NAME;
+        } else if (req) {
+            return firstLetterToUpper(req.notRouteData.modelName);
+        }
+        return undefined;
     }
 
     /**
@@ -83,22 +88,20 @@ class Form {
      **/
     async extract(req) {
         return {
-            ...this.extractRequestIds(req),
-            activeUser: req.user,
-            ip: getIP(req),
+            ...this.extractRequestEnvs(req),
             data: this.extractByInstructionsFromRouteActionFields(req),
         };
     }
 
-    #addIdExtractors(extractors = {}) {
+    #addEnvExtractors(extractors = {}) {
         if (extractors) {
-            this.#ID_EXTRACTORS = { ...this.#ID_EXTRACTORS, ...extractors };
+            this.#ENV_EXTRACTORS = { ...this.#ENV_EXTRACTORS, ...extractors };
         }
     }
 
-    extractRequestIds(req) {
+    extractRequestEnvs(req) {
         const result = {};
-        Array.values(this.#ID_EXTRACTORS).forEach((extractor) => {
+        Array.values(this.#ENV_EXTRACTORS).forEach((extractor) => {
             const extracted = extractor(this, req);
             if (
                 extracted &&

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),
         };