not-node 6.3.60 → 6.3.62

package/package.json

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

package/src/form/after_extract_transformers/addOwnerFieldToFilterIfNotRootOrAdmin.js

@@ -0,0 +1,17 @@
+const notFilter = require("not-filter");
+const notError = require("not-error/src/error.node.cjs");
+
+module.exports = (prepared /*, req*/) => {
+    if (!prepared?.identity?.root && !prepared?.identity?.admin) {
+        if (prepared.identity?.uid) {
+            prepared.filter = notFilter.filter.modifyRules(prepared.filter, {
+                owner: prepared.identity.uid,
+            });
+        } else {
+            throw new notError("User identity has no uid in it", {
+                sid: prepared.identity?.sid,
+            });
+        }
+    }
+    return prepared;
+};

package/src/form/after_extract_transformers/addOwnerFieldsToDataIfNotRootOrAdmin.js

@@ -0,0 +1,16 @@
+const USER_MODEL_NAME = "User";
+const notError = require("not-error/src/error.node.cjs");
+
+module.exports = (prepared /*, req*/) => {
+    if (!prepared?.identity?.root && !prepared?.identity?.admin) {
+        if (prepared.identity?.uid) {
+            prepared.data.owner = prepared.identity?.uid;
+            prepared.data.ownerModel = USER_MODEL_NAME;
+        } else {
+            throw new notError("User identity has no uid in it", {
+                sid: prepared.identity?.sid,
+            });
+        }
+    }
+    return prepared;
+};

package/src/form/after_extract_transformers/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+    addOwnerFieldsToDataIfNotRootOrAdmin: require("./addOwnerFieldsToDataIfNotRootOrAdmin.js"),
+    addOwnerFieldToFilterIfNotRootOrAdmin: require("./addOwnerFieldToFilterIfNotRootOrAdmin.js"),
+};

package/src/form/form.js

@@ -30,6 +30,7 @@ const {
 const DEFAULT_EXTRACTORS = require("./extractors");
 const DEFAULT_ID_EXTRACTORS = require("./env_extractors");
 const DEFAULT_TRANSFORMERS = require("./transformers");
+const DEFAULT_AFTER_EXTRACT_TRANSFORMERS = [];
 const notAppIdentity = require("../identity/index.js");
 
 /**
@@ -67,6 +68,10 @@ class Form {
         ...DEFAULT_TRANSFORMERS,
     };
 
+    #AFTER_EXTRACT_TRANSFORMERS = {
+        ...DEFAULT_AFTER_EXTRACT_TRANSFORMERS,
+    };
+
     #rateLimiter = null;
     #rateLimiterIdGetter = (data) => data.identity.sid;
     #rateLimiterException = FormExceptionTooManyRequests;
@@ -82,6 +87,7 @@ class Form {
      * @param {import('../app.js')} options.app
      * @param {Object.<string, Function>} options.EXTRACTORS
      * @param {Object.<string, Function>} options.TRANSFORMERS
+     * @param {Array<Function>} options.AFTER_EXTRACT_TRANSFORMERS
      * @param {Object.<string, import('../types.js').notAppFormEnvExtractor>} options.ENV_EXTRACTORS
      * @param   {import('../types.js').notAppFormRateLimiterOptions}    options.rate
      */
@@ -94,6 +100,7 @@ class Form {
         EXTRACTORS = {},
         ENV_EXTRACTORS = {},
         TRANSFORMERS = {},
+        AFTER_EXTRACT_TRANSFORMERS = [],
         rate,
     }) {
         this.#FORM_NAME = FORM_NAME;
@@ -105,6 +112,7 @@ class Form {
         this.#addExtractors(EXTRACTORS);
         this.#addEnvExtractors(ENV_EXTRACTORS);
         this.#addTransformers(TRANSFORMERS);
+        this.#addAfterExtractTransformers(AFTER_EXTRACT_TRANSFORMERS);
         this.#createRateLimiter(rate);
     }
 
@@ -224,6 +232,11 @@ class Form {
      */
     //eslint-disable-next-line no-unused-vars
     async afterExtract(value, req) {
+        if (this.#AFTER_EXTRACT_TRANSFORMERS) {
+            this.#AFTER_EXTRACT_TRANSFORMERS.forEach((aeTransformer) => {
+                aeTransformer(value, req);
+            });
+        }
         return value;
     }
 
@@ -684,6 +697,12 @@ class Form {
         }
     }
 
+    #addAfterExtractTransformers(transformers = []) {
+        if (transformers && Array.isArray(transformers)) {
+            this.#AFTER_EXTRACT_TRANSFORMERS = [...transformers];
+        }
+    }
+
     #createRateLimiter(rate) {
         if (rate && rate.options && typeof rate.options == "object") {
             if (typeof rate.idGetter === "function") {

package/src/generic/form.getByID.js

@@ -4,7 +4,7 @@ const Form = require("../form/form");
 //form
 const FIELDS = [
     ["targetID", { required: true }, "not-node//ID"],
-    ["identity", "not-node//requiredObject"],
+    ["identity", "not-node//identity"],
 ];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "getByID" }) => {

package/src/generic/form.getById.js

@@ -4,7 +4,7 @@ const Form = require("../form/form");
 //form
 const FIELDS = [
     ["targetId", { required: true }, "not-node//objectId"],
-    ["identity", "not-node//requiredObject"],
+    ["identity", "not-node//identity"],
 ];
 
 module.exports = ({ MODULE_NAME, MODEL_NAME, actionName = "getById" }) => {

package/src/generic/form.list.js

@@ -5,7 +5,7 @@ const notAppIdentity = require("../identity");
 
 const FIELDS = [
     ["query", `not-filter//_filterQuery`],
-    ["identity", "not-node//requiredObject"],
+    ["identity", "not-node//identity"],
 ];
 
 /**

package/src/generic/form.listAndCount.js

@@ -5,7 +5,7 @@ const notAppIdentity = require("../identity");
 
 const FIELDS = [
     ["query", `not-filter//_filterQuery`],
-    ["identity", "not-node//requiredObject"],
+    ["identity", "not-node//identity"],
 ];
 
 /**