not-node 6.3.49 → 6.3.51

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.3.49",
+	"version": "6.3.51",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {
@@ -56,8 +56,6 @@
 		"jsonwebtoken": "^9.0.0",
 		"lower-case": "*",
 		"method-override": "^3.0.0",
-		"mock-require": "^3.0.3",
-		"mongoose": "*",
 		"mongoose-validator": "*",
 		"nconf": "*",
 		"not-config": "*",
@@ -91,7 +89,9 @@
 		"jsdoc": "^4.0.0",
 		"mocha": "*",
 		"mocha-suppress-logs": "^0.3.1",
-		"mongodb-memory-server": "^8.11.0",
+		"mock-require": "^3.0.3",
+		"mongodb-memory-server": "^9.1.6",
+		"mongoose": "^8.1.1",
 		"not-error": "^0.2.9",
 		"not-validation": "^0.0.9",
 		"npm-run-all": "^4.1.5",

package/src/common.js

@@ -381,23 +381,26 @@ module.exports.getValueFromEnv = getValueFromEnv;
  * @param {object} sign                 signature object {fieldName: someValueOfTargetType}
  * @param {boolean} [strict=true]       if  you need exact properties as in signature, when false - properties not described in signature are ok
  * @param {boolean} [typeStrict=true]   compares types of properties in obj and signature
+ * @param {boolean} [valueStrict=false] compares values of properties in obj and signature
  * @return {boolean}                    true if object structured as signature
  */
 const compareObjectSignatures = (
     obj,
     sign,
     strict = true,
-    typeStrict = true
+    typeStrict = true,
+    valueStrict = false
 ) => {
     const objKeys = Object.keys(obj);
     const signKeys = Object.keys(sign);
     const checkKey = (key) => {
         if (objKeys.includes(key)) {
-            if (typeStrict) {
-                return typeof obj[key] === typeof sign[key];
-            } else {
-                return true;
+            const isTypeStrict = typeof obj[key] === typeof sign[key];
+            const isValueStrict = obj[key] === sign[key];
+            if (typeStrict && !isTypeStrict) {
+                return false;
             }
+            return valueStrict ? isValueStrict : true;
         } else {
             return false;
         }

package/src/form/form.js

@@ -1,3 +1,4 @@
+const Schema = require("mongoose").Schema;
 const validator = require("validator");
 const notPath = require("not-path");
 const FormFabric = require("./fabric");
@@ -588,6 +589,23 @@ class Form {
         };
     }
 
+    /**
+     *
+     * @param {Object} schemaField
+     */
+    extractDefaultTransformers(schemaField) {
+        if (typeof schemaField === "undefined" || schemaField === null) {
+            return [];
+        }
+        switch (schemaField.type) {
+            case String:
+            case Schema.Types.String:
+                return ["xss"];
+            default:
+                return [];
+        }
+    }
+
     /**
      *
      * @param {import('../types.js').notNodeExpressRequest} req
@@ -597,7 +615,7 @@ class Form {
      */
     createInstructionFromRouteActionFields(
         req,
-        mainInstruction = ["fromBody", "xss"],
+        mainInstruction = ["fromBody"],
         exceptions = {}
     ) {
         const result = {};
@@ -614,7 +632,17 @@ class Form {
             if (objHas(exceptions, fieldName)) {
                 result[fieldName] = exceptions[fieldName];
             } else {
-                result[fieldName] = mainInstruction;
+                const fieldTransformers = this.extractDefaultTransformers(
+                    schema[fieldName]
+                );
+                if (Array.isArray(fieldTransformers)) {
+                    result[fieldName] = [
+                        ...mainInstruction,
+                        ...fieldTransformers,
+                    ];
+                } else {
+                    result[fieldName] = [...mainInstruction];
+                }
             }
         });
         // @ts-ignore
@@ -631,7 +659,7 @@ class Form {
      */
     extractByInstructionsFromRouteActionFields(
         req,
-        mainInstruction = ["fromBody", "xss"],
+        mainInstruction = ["fromBody"],
         exceptions = {},
         additional = {}
     ) {

package/src/generic/logic.js

@@ -1,6 +1,6 @@
 const { objHas, isFunc, executeFunctionAsAsync } = require("../common");
 const ModelRoutine = require("../model/routine");
-const { deleteResponseSuccess } = require("../model/utils.js");
+
 const {
     DBExceptionDocumentIsNotFound,
     DBExceptionDeleteWasNotSuccessful,
@@ -360,7 +360,7 @@ module.exports = ({
                 let query = { _id: targetId };
                 checkShouldOwn(query, shouldOwn, identity);
                 const result = await model.findOneAndDelete(query).exec();
-                if (!deleteResponseSuccess(result)) {
+                if (!result) {
                     throw new DBExceptionDeleteWasNotSuccessful({
                         params: {
                             result,

package/src/model/increment.js

@@ -1,6 +1,6 @@
 /** @module Model/Increment */
 
-const { updateResponseSuccess, insertResponseSuccess } = require("./utils.js");
+const { updateResponseSuccess } = require("./utils.js");
 const {
     IncrementExceptionIDGeneratorRebaseFailed,
     IncrementExceptionIDGenerationFailed,
@@ -105,7 +105,8 @@ function newGetNext() {
                 upsert: true,
             };
         const res = await secureUpdate(thisModel, which, cmd, opts);
-        if (updateResponseSuccess(res) || insertResponseSuccess(res, 1)) {
+
+        if (updateResponseSuccess(res, 1)) {
             const doc = await thisModel.findOne({ id });
             return doc.seq;
         } else {

package/src/model/utils.js

@@ -1,25 +1,50 @@
-const { findSignature } = require("../common");
-
-const INSERT_SIGNATURE = {
-    acknowledged: true,
-    modifiedCount: 0,
-    upsertedId: {},
-    upsertedCount: 1,
-    matchedCount: 0,
-};
-
-const SIGNATURES = {
-    INSERT: [INSERT_SIGNATURE],
-    UPDATE: [],
-    DELETE: [],
-};
+const { compareObjectSignatures } = require("../common");
+
+function getBaseResult() {
+    return {
+        acknowledged: true,
+    };
+}
+
+function createInsertManySuccessSignature(count) {
+    return Object.assign(
+        {
+            insertedCount: count,
+        },
+        getBaseResult()
+    );
+}
+
+function createInsertOneSuccessSignature() {
+    return Object.assign({}, getBaseResult());
+}
+
+function createUpdateManySuccessSignature(count) {
+    return Object.assign(
+        {
+            matchedCount: count,
+            upsertedCount: 0,
+            modifiedCount: 0,
+        },
+        getBaseResult()
+    );
+}
+
+function createDeleteManySuccessSignature(count) {
+    return Object.assign(
+        {
+            deletedCount: count,
+        },
+        getBaseResult()
+    );
+}
 
 function insertResponseSuccess(res, count = 1) {
-    const ind = findSignature(res, SIGNATURES.INSERT);
-    if (ind === -1) {
-        return false;
-    }
-    return SIGNATURES.INSERT[ind].upsertedCount === count;
+    const targetSignature =
+        count === 1
+            ? createInsertOneSuccessSignature()
+            : createInsertManySuccessSignature(count);
+    return compareObjectSignatures(res, targetSignature, false, true, true);
 }
 
 module.exports.insertResponseSuccess = insertResponseSuccess;
@@ -28,32 +53,25 @@ module.exports.insertResponseSuccess = insertResponseSuccess;
  * checking result of modification queries to ensure that changes were made
  */
 function updateResponseSuccess(res, count = 1) {
-    if (res) {
-        const responseList = Object.keys(res);
-        if (responseList.includes("ok")) {
-            return res.ok === 1 && res.n === count;
-        } else {
-            return res.matchedCount === count && res.acknowledged;
-        }
+    const targetSignature = createUpdateManySuccessSignature(count);
+    if (compareObjectSignatures(res, targetSignature, false, true)) {
+        return res.upsertedCount + res.modifiedCount === count;
     } else {
         return false;
     }
 }
 module.exports.updateResponseSuccess = updateResponseSuccess;
 
+function deleteManyResponseSuccess(res, count) {
+    const targetSignature = createDeleteManySuccessSignature(count);
+    return compareObjectSignatures(res, targetSignature, true, true, true);
+}
+
+module.exports.deleteManyResponseSuccess = deleteManyResponseSuccess;
 /**
  * checking result of modification queries to ensure that changes were made
  */
 function deleteResponseSuccess(res, count = 1) {
-    if (res) {
-        const responseList = Object.keys(res);
-        if (responseList.includes("ok")) {
-            return res.ok === 1 && res.n === count;
-        } else {
-            return res.deletedCount === count;
-        }
-    } else {
-        return false;
-    }
+    return deleteManyResponseSuccess(res, count);
 }
 module.exports.deleteResponseSuccess = deleteResponseSuccess;

package/test/auth/fields.js

@@ -4,7 +4,7 @@ module.exports = ({ Auth, expect }) => {
     describe("Fields", () => {
         describe("getOwnerId", () => {
             it("data has ownerId as String", () => {
-                const val = mongoose.Types.ObjectId().toString();
+                const val = new mongoose.Types.ObjectId().toString();
                 const data = {
                     owner: val,
                 };
@@ -13,7 +13,7 @@ module.exports = ({ Auth, expect }) => {
             });
 
             it("data has ownerId as ObjectId", () => {
-                const val = mongoose.Types.ObjectId();
+                const val = new mongoose.Types.ObjectId();
                 const data = {
                     owner: val,
                 };
@@ -35,7 +35,7 @@ module.exports = ({ Auth, expect }) => {
 
         describe("isOwner", () => {
             it("data.ownerId:ObjectId, user_id not empty:string, equal", () => {
-                const owner = mongoose.Types.ObjectId();
+                const owner = new mongoose.Types.ObjectId();
                 const data = {
                     owner: owner,
                 };
@@ -45,15 +45,15 @@ module.exports = ({ Auth, expect }) => {
 
             it("data.ownerId:ObjectId, user_id:ObjectId, not equal", () => {
                 const data = {
-                    owner: mongoose.Types.ObjectId(),
+                    owner: new mongoose.Types.ObjectId(),
                 };
-                let result = Auth.isOwner(data, mongoose.Types.ObjectId());
+                let result = Auth.isOwner(data, new mongoose.Types.ObjectId());
                 expect(result).to.deep.equal(false);
             });
 
             it("data.ownerId not defined, user_id:ObjectId, not equal", () => {
                 const data = {};
-                let result = Auth.isOwner(data, mongoose.Types.ObjectId());
+                let result = Auth.isOwner(data, new mongoose.Types.ObjectId());
                 expect(result).to.deep.equal(false);
             });
 

package/test/common.js

@@ -22,9 +22,9 @@ describe("Common", function () {
     });
 
     let testie = "Иероним Босх";
-    describe(`validateObjectId, build in validator failed on ${testie}`, function () {
+    describe(`validateObjectId, build in validator not failed on ${testie}`, function () {
         it(`Mongoose.Types.ObjectId.isValid('${testie}') -> true`, function () {
-            expect(ObjectId.isValid(testie)).to.be.ok;
+            expect(ObjectId.isValid(testie)).to.be.not.ok;
         });
 
         it(`validateObjectId(${testie}) -> false`, function () {

package/test/identity/providers/session.js

@@ -37,7 +37,7 @@ module.exports = ({ expect }) => {
             it("check if user root - true", function () {
                 var t = {
                     session: {
-                        user: mongoose.Types.ObjectId(),
+                        user: new mongoose.Types.ObjectId(),
                         role: ["root"],
                     },
                 };
@@ -47,7 +47,7 @@ module.exports = ({ expect }) => {
             it("check if user root - false", function () {
                 var t = {
                     session: {
-                        user: mongoose.Types.ObjectId(),
+                        user: new mongoose.Types.ObjectId(),
                         save() {},
                     },
                 };
@@ -60,7 +60,7 @@ module.exports = ({ expect }) => {
             it("get role - root", function () {
                 var t = {
                     session: {
-                        user: mongoose.Types.ObjectId(),
+                        user: new mongoose.Types.ObjectId(),
                         role: ["root"],
                         save() {},
                     },
@@ -71,7 +71,7 @@ module.exports = ({ expect }) => {
             it("get role - undefined", function () {
                 var t = {
                     session: {
-                        user: mongoose.Types.ObjectId(),
+                        user: new mongoose.Types.ObjectId(),
                         save() {},
                     },
                 };
@@ -84,7 +84,7 @@ module.exports = ({ expect }) => {
             it("session exist, set role - root", function () {
                 var t = {
                     session: {
-                        user: mongoose.Types.ObjectId(),
+                        user: new mongoose.Types.ObjectId(),
                         role: ["user"],
                         save() {},
                     },
@@ -108,14 +108,14 @@ module.exports = ({ expect }) => {
                         save() {},
                     },
                 };
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 new Provider(t).setUserId(id);
                 expect(t.session.user).to.eql(id);
             });
 
             it("session not exist, set _id", function () {
                 const t = {};
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 new Provider(t).setUserId(id);
                 expect(t).to.be.deep.eql({});
             });
@@ -125,7 +125,7 @@ module.exports = ({ expect }) => {
             it("session exist, user id exist", function () {
                 const t = {
                     session: {
-                        user: mongoose.Types.ObjectId(),
+                        user: new mongoose.Types.ObjectId(),
                         role: ["user"],
                         save() {},
                     },
@@ -145,7 +145,7 @@ module.exports = ({ expect }) => {
             it("session exist, session id exist", function () {
                 const t = {
                     session: {
-                        id: mongoose.Types.ObjectId(),
+                        id: new mongoose.Types.ObjectId(),
                         role: ["user"],
                         save() {},
                     },
@@ -166,7 +166,7 @@ module.exports = ({ expect }) => {
                 const t = {
                     session: { save() {} },
                 };
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 new Provider(t).setAuth(id, "root");
                 expect(t.session.user.toString()).to.eql(id.toString());
                 expect(t.session.role).to.eql("root");
@@ -174,7 +174,7 @@ module.exports = ({ expect }) => {
 
             it(SESSION_NOT_EXISTS, function () {
                 const t = {};
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 new Provider(t).setAuth(id, "user");
                 expect(t).to.be.deep.eql({});
             });
@@ -182,7 +182,7 @@ module.exports = ({ expect }) => {
 
         describe("setGuest", function () {
             it("session exist", function () {
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 const t = {
                     session: { user: id, role: "admin", save() {} },
                     user: { _id: id },
@@ -202,7 +202,7 @@ module.exports = ({ expect }) => {
 
         describe("cleanse", function () {
             it("session exist, destroy method exists", function () {
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 let destroyed = false;
                 const t = {
                     session: {
@@ -221,7 +221,7 @@ module.exports = ({ expect }) => {
             });
 
             it("session exist, destroy method exists", function () {
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 const t = {
                     session: {
                         user: id,

package/test/model/default.js

@@ -317,7 +317,7 @@ module.exports = ({
 
         describe("getOne", () => {
             it("versioning, populate not specified", async () => {
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 const ctx = {
                     schema: {
                         statics: {
@@ -350,7 +350,7 @@ module.exports = ({
             });
 
             it("!versioning, populate not specified", async () => {
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 const ctx = {
                     schema: {
                         statics: {},
@@ -379,7 +379,7 @@ module.exports = ({
             });
 
             it("versioning, populate === null", async () => {
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 const ctx = {
                     schema: {
                         statics: {
@@ -517,7 +517,7 @@ module.exports = ({
 
         describe("getOneRaw", () => {
             it("simple run", async () => {
-                const id = mongoose.Types.ObjectId();
+                const id = new mongoose.Types.ObjectId();
                 const ctx = {
                     schema: {
                         statics: {

package/test/model/utils.js

@@ -0,0 +1,50 @@
+const expect = require("chai").expect,
+    utils = require("../../src/model/utils");
+
+module.exports = ({ mongod, mongoose }) => {
+    let TestModel;
+    before(() => {
+        TestModel = mongoose.model(
+            "TestModel",
+            new mongoose.Schema({ name: { type: String, required: true } })
+        );
+    });
+
+    describe("Utils", function () {
+        describe("insertManyResponseSuccess", () => {
+            it("ok", async () => {
+                const res = await TestModel.insertMany(
+                    [
+                        {
+                            name: "FirstInsertOne",
+                        },
+                        {
+                            name: "FirstInsertTwo",
+                        },
+                    ],
+                    { rawResult: true }
+                );
+
+                expect(utils.insertResponseSuccess(res, 2)).to.be.true;
+            });
+
+            it("errors", async () => {
+                try {
+                    const res = await TestModel.insertMany(
+                        [
+                            {
+                                name: Date.now(),
+                            },
+                            { name: "SecondInsertTwo" },
+                        ],
+                        { rawResult: true }
+                    );
+
+                    expect(utils.insertResponseSuccess(res, 1)).to.be.false;
+                } catch (e) {
+                    console.error(e);
+                }
+            });
+        });
+    });
+};

package/test/model/versioning.js

@@ -255,7 +255,7 @@ module.exports = ({ mongoose }) => {
                     ...secondHistoryVersion,
                     username: "username3",
                     __versions: [
-                        mongoose.Types.ObjectId(),
+                        new mongoose.Types.ObjectId(),
                         second._id,
                         first._id,
                     ],

package/test/notModel.js

@@ -41,6 +41,12 @@ describe("notModel", function () {
         mongoose,
     });
 
+    require("./model/utils")({
+        expect,
+        mongod,
+        mongoose,
+    });
+
     after(async () => {
         await mongoose.disconnect();
         await mongod.stop();