not-node 6.3.59 → 6.3.61

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.3.59",
+	"version": "6.3.61",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {
@@ -36,24 +36,24 @@
 		"url": "https://github.com/interrupter/not-node/issues"
 	},
 	"dependencies": {
-		"body-parser": "^1.20.1",
-		"commander": "^9.5.0",
+		"body-parser": "^1.20.2",
+		"commander": "^12.0.0",
 		"compression": "^1.7.4",
-		"connect-mongodb-session": "^3.1.1",
-		"connect-redis": "^6.1.3",
+		"connect-mongodb-session": "^5.0.0",
+		"connect-redis": "^7.1.1",
 		"cors": "^2.8.5",
 		"deep-diff": "*",
-		"deepmerge": "^4.2.2",
-		"ejs": "^3.1.8",
+		"deepmerge": "^4.3.1",
+		"ejs": "^3.1.9",
 		"escape-string-regexp": "*",
-		"express": "^4.18.2",
-		"express-fileupload": "^1.4.0",
-		"express-session": "^1.17.3",
+		"express": "^4.19.1",
+		"express-fileupload": "^1.5.0",
+		"express-session": "^1.18.0",
 		"fs-extra": "*",
-		"generate-password": "^1.7.0",
-		"helmet": "^6.0.1",
-		"inquirer": "^9.1.4",
-		"jsonwebtoken": "^9.0.0",
+		"generate-password": "^1.7.1",
+		"helmet": "^7.1.0",
+		"inquirer": "^9.2.16",
+		"jsonwebtoken": "^9.0.2",
 		"lower-case": "*",
 		"method-override": "^3.0.0",
 		"mongoose-validator": "*",
@@ -65,10 +65,10 @@
 		"not-log": "*",
 		"not-monitor": "*",
 		"not-path": "*",
-		"rate-limiter-flexible": "^2.4.1",
-		"redis": "^4.5.1",
+		"rate-limiter-flexible": "^5.0.0",
+		"redis": "^4.6.13",
 		"redlock": "^5.0.0-beta.2",
-		"rfdc": "^1.3.0",
+		"rfdc": "^1.3.1",
 		"rimraf": "^5.0.5",
 		"serve-static": "*",
 		"simple-git": "*",
@@ -80,23 +80,23 @@
 		"babel-eslint": "^10.1.0",
 		"chai": "*",
 		"chai-as-promised": "*",
-		"eslint": "^8.31.0",
+		"eslint": "^8.57.0",
 		"eslint-plugin-node": "^11.1.0",
-		"eslint-plugin-sonarjs": "^0.17.0",
-		"husky": "^8.0.3",
+		"eslint-plugin-sonarjs": "^0.24.0",
+		"husky": "^9.0.11",
 		"ink-docstrap": "^1.3.2",
-		"ioredis": "^5.2.4",
-		"jsdoc": "^4.0.0",
+		"ioredis": "^5.3.2",
+		"jsdoc": "^4.0.2",
 		"mocha": "*",
-		"mocha-suppress-logs": "^0.3.1",
+		"mocha-suppress-logs": "^0.5.1",
 		"mock-require": "^3.0.3",
-		"mongodb-memory-server": "^9.1.6",
-		"mongoose": "^8.1.1",
+		"mongodb-memory-server": "^9.1.7",
+		"mongoose": "^8.2.3",
 		"not-error": "^0.2.9",
 		"not-validation": "^0.0.9",
 		"npm-run-all": "^4.1.5",
 		"nyc": "^15.1.0",
-		"retire": "^3.2.1"
+		"retire": "^4.4.2"
 	},
 	"homepage": "https://github.com/interrupter/not-node#readme",
 	"nyc": {

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,3 @@
+module.exports = {
+    addOwnerFieldsToDataIfNotRootOrAdmin: require("./addOwnerFieldsToDataIfNotRootOrAdmin.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"],
 ];
 
 /**

package/src/init/lib/sessions/redis.js

@@ -9,7 +9,7 @@ module.exports = class InitSessionsRedis {
         const expressSession = require("express-session");
         const storeClient = config.get("session.client", DEFAULT_CLIENT);
         const redisClient = master.getEnv(`db.${storeClient}`);
-        const redisStore = require("connect-redis")(expressSession);
+        const redisStore = require("connect-redis").default;
         master.getServer().use(
             expressSession({
                 secret: config.get("session.secret"),

package/test/init/sessions/redis.js

@@ -29,10 +29,7 @@ module.exports = ({ expect }) => {
                     ]);
                     return () => {};
                 });
-                mock("connect-redis", (inpt) => {
-                    expect(typeof inpt).to.be.equal("function");
-                    return class FakeRedis {};
-                });
+                mock("connect-redis", { default: class FakeRedis {} });
 
                 const config = {
                     get(str) {