not-node 6.2.25 → 6.2.27

package/package.json

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

package/src/common.js

@@ -76,13 +76,17 @@ module.exports.getTodayDate = () => {
 /**
  *  Returns true if object has field of name
  *   @param   {object}    obj    some object
- *  @param  {string}    name  field name
+ *  @param  {string|Array<string>}    name  field name
  *  @return {boolean}          if object contains field with name
  **/
 const objHas = (obj, name) => {
     if (typeof obj === "undefined") return false;
     if (obj === null) return false;
-    return Object.prototype.hasOwnProperty.call(obj, name);
+    if (Array.isArray(name)) {
+        return name.every((itm) => typeof itm === "string" && objHas(obj, itm));
+    } else {
+        return Object.prototype.hasOwnProperty.call(obj, name);
+    }
 };
 module.exports.objHas = objHas;
 

package/src/model/default.js

@@ -2,6 +2,7 @@
 const routine = require("./routine");
 const notQuery = require("not-filter");
 const { objHas } = require("../common");
+const notPath = require("not-path");
 
 const defaultFilter = (obj) => {
     if (obj.schema.statics.__versioning) {
@@ -106,10 +107,10 @@ function getOne(id, population = [], condition = {}) {
 }
 
 /**
- *	Retrieves one record by unique numeric ID
+ *	Retrieves one record by unique number ID
  *	If versioning ON, it retrieves __latest and not __closed
  *	@static
- *	@param 	{number}	ID		some unique numeric identificator
+ *	@param 	{number}	ID		some unique number identificator
  *	@param 	{Object}	condition 	optional if needed additional condition
  *	@param 	{Array}		population 	optional if needed population of some fields
  *	@return {Promise}	      Promise of document, if increment is OFF - then Promise.resolve(null)
@@ -367,7 +368,7 @@ module.exports.thisStatics = {
 
 /**
  *	Returns incremental ID for this doc
- *	@return {numeric}	ID
+ *	@return {number}	ID
  */
 function getID() {
     return this.schema.statics.__incField
@@ -378,9 +379,16 @@ function getID() {
 /**
  *	Closes document and saves it
  *	This is replaces remove when Versioning is ON
- *	@return {numeric}	ID
+ *	@param {object}     [data=undefined] if we want update some fields
+ *	@return {number}	ID
  */
-function close() {
+function close(data = undefined) {
+    if (data && Object.keys(data)) {
+        Object.keys(data).forEach((fieldName) => {
+            notPath.setValueByPath(this, fieldName, data[fieldName]);
+            this.markModified(fieldName);
+        });
+    }
     this.__closed = true;
     return this.save();
 }

package/test/common.js

@@ -1,151 +1,193 @@
-const expect = require('chai').expect,
-	mongoose = require('mongoose'),
-	path = require('path'),
-	ObjectId = mongoose.Types.ObjectId,
-	Common = require('../src/common');
-
-describe('Common', function() {
-	describe('firstLetterToLower', function() {
-		it('`Some error` -> `some error`', function() {
-			expect(Common.firstLetterToLower('Some error')).to.be.equal('some error');
-		});
-	});
-
-	describe('firstLetterToUpper', function() {
-		it('`some error` -> `Some error`', function() {
-			expect(Common.firstLetterToUpper('some error')).to.be.equal('Some error');
-		});
-	});
-
-	let testie = 'Иероним Босх';
-	describe(`validateObjectId, build in validator failed on ${testie}`, function() {
-
-		it(`Mongoose.Types.ObjectId.isValid('${testie}') -> true`, function(){
-			expect(ObjectId.isValid(testie)).to.be.ok;
-		});
-
-		it(`validateObjectId(${testie}) -> false`, function() {
-			expect(Common.validateObjectId(testie)).to.be.not.ok;
-		});
-
-		it('validateObjectId(`5af96abbce4adb46c5202ed3`) -> true', function() {
-			expect(Common.validateObjectId('5af96abbce4adb46c5202ed3')).to.be.ok;
-		});
-
-		it('validateObjectId(undefined) -> false', function() {
-			expect(Common.validateObjectId(undefined)).to.be.false;
-		});
-	});
-
-	describe('compareObjectIds', function() {
-		it('null and null -> false', function() {
-			expect(Common.compareObjectIds(null, null)).to.be.false;
-		});
-		it('1 and 1 -> false', function() {
-			expect(Common.compareObjectIds(1, 1)).to.be.false;
-		});
-		it('"1" and 1 -> false', function() {
-			expect(Common.compareObjectIds("1", 1)).to.be.false;
-		});
-	});
-
-
-	describe('getTodayDate', ()=>{
-		it('today', ()=>{
-			const res = Common.getTodayDate();
-			expect(typeof res).to.be.equal('number');
-		});
-	});
-	//
-	describe('executeObjectFunction', ()=>{
-		it('promise', async ()=>{
-			const obj = {
-				async method(...params){
-					return 'apple '+params.join('.');
-				}
-			}, name = 'method', params = [1,2,3,true];
-			const res = await Common.executeObjectFunction(obj, name, params);
-			expect(res).to.be.equal('apple 1.2.3.true');
-		});
-
-		it('function', async ()=>{
-			const obj = {
-				method(...params){
-					return 'apple '+params.join('.');
-				}
-			}, name = 'method', params = [1,2,3,true];
-			const res = await Common.executeObjectFunction(obj, name, params);
-			expect(res).to.be.equal('apple 1.2.3.true');
-		});
-
-		it('!obj', async ()=>{
-			const obj = null, name = 'method', params = [1,2,3,true];
-			const res = await Common.executeObjectFunction(obj, name, params);
-			expect(res).to.be.undefined;
-		});
-	});
-
-
-	describe('mapBind', function() {
-    it('to is undefined, exception throwned', function(done) {
-      let to = undefined;
-      try {
-        Common.mapBind({getModel(){}}, to, ['getModel']);
-				console.log(to);
-				done(new Error('should throw'))
-      } catch (e) {
-        expect(e).to.be.instanceof(Error);
-        done()
-      }
+const expect = require("chai").expect,
+    mongoose = require("mongoose"),
+    path = require("path"),
+    ObjectId = mongoose.Types.ObjectId,
+    Common = require("../src/common");
+
+describe("Common", function () {
+    describe("firstLetterToLower", function () {
+        it("`Some error` -> `some error`", function () {
+            expect(Common.firstLetterToLower("Some error")).to.be.equal(
+                "some error"
+            );
+        });
     });
 
-    it('list is empty', function() {
-      const to = {};
-      Common.mapBind({}, to, []);
-      expect(to).to.be.deep.equal({});
+    describe("firstLetterToUpper", function () {
+        it("`some error` -> `Some error`", function () {
+            expect(Common.firstLetterToUpper("some error")).to.be.equal(
+                "Some error"
+            );
+        });
     });
 
-    it('list item is not pointing to function', function() {
-      const to = {};
-      Common.mapBind({}, to, ['vasqa de gamma']);
-      expect(to).to.be.deep.equal({});
+    let testie = "Иероним Босх";
+    describe(`validateObjectId, build in validator failed on ${testie}`, function () {
+        it(`Mongoose.Types.ObjectId.isValid('${testie}') -> true`, function () {
+            expect(ObjectId.isValid(testie)).to.be.ok;
+        });
+
+        it(`validateObjectId(${testie}) -> false`, function () {
+            expect(Common.validateObjectId(testie)).to.be.not.ok;
+        });
+
+        it("validateObjectId(`5af96abbce4adb46c5202ed3`) -> true", function () {
+            expect(Common.validateObjectId("5af96abbce4adb46c5202ed3")).to.be
+                .ok;
+        });
+
+        it("validateObjectId(undefined) -> false", function () {
+            expect(Common.validateObjectId(undefined)).to.be.false;
+        });
+    });
+
+    describe("compareObjectIds", function () {
+        it("null and null -> false", function () {
+            expect(Common.compareObjectIds(null, null)).to.be.false;
+        });
+        it("1 and 1 -> false", function () {
+            expect(Common.compareObjectIds(1, 1)).to.be.false;
+        });
+        it('"1" and 1 -> false', function () {
+            expect(Common.compareObjectIds("1", 1)).to.be.false;
+        });
+    });
+
+    describe("getTodayDate", () => {
+        it("today", () => {
+            const res = Common.getTodayDate();
+            expect(typeof res).to.be.equal("number");
+        });
+    });
+    //
+    describe("executeObjectFunction", () => {
+        it("promise", async () => {
+            const obj = {
+                    async method(...params) {
+                        return "apple " + params.join(".");
+                    },
+                },
+                name = "method",
+                params = [1, 2, 3, true];
+            const res = await Common.executeObjectFunction(obj, name, params);
+            expect(res).to.be.equal("apple 1.2.3.true");
+        });
+
+        it("function", async () => {
+            const obj = {
+                    method(...params) {
+                        return "apple " + params.join(".");
+                    },
+                },
+                name = "method",
+                params = [1, 2, 3, true];
+            const res = await Common.executeObjectFunction(obj, name, params);
+            expect(res).to.be.equal("apple 1.2.3.true");
+        });
+
+        it("!obj", async () => {
+            const obj = null,
+                name = "method",
+                params = [1, 2, 3, true];
+            const res = await Common.executeObjectFunction(obj, name, params);
+            expect(res).to.be.undefined;
+        });
     });
-  });
-
-
-	describe('tryFile', function() {
-		const pathToExistingFile = path.join(__dirname, 'testies/module/fields/collection.js');
-		const pathToAbsentFile = path.join(__dirname, 'testies/module/fields/collection.ejs');
-		const pathToDirectory = path.join(__dirname, 'testies/module/fields/empty');
-
-		it('file exists, type file', function() {
-			const res = Common.tryFile(pathToExistingFile);
-			expect(res).to.be.equal(true);
-		});
-
-		it('file doesnt exist', function() {
-			const res = Common.tryFile(pathToAbsentFile);
-			expect(res).to.be.equal(false);
-		});
-
-		it('directory', function() {
-			const res = Common.tryFile(pathToDirectory);
-			expect(res).to.be.equal(false);
-		});
-	});
-
-	describe('copyObj', function () {
-		it('empty', function () {
-			let rule = {};
-			expect(Common.copyObj(rule)).to.be.deep.equal({});
-		});
-
-		it('not empty, then modification of new rule is not changes original', function () {
-			let rule = {some: ['data']};
-			let copyOfRule = Common.copyObj(rule);
-			delete copyOfRule.some;
-			expect(rule).to.be.deep.equal({some: ['data']});
-		});
-	});
 
+    describe("mapBind", function () {
+        it("to is undefined, exception throwned", function (done) {
+            let to = undefined;
+            try {
+                Common.mapBind({ getModel() {} }, to, ["getModel"]);
+                console.log(to);
+                done(new Error("should throw"));
+            } catch (e) {
+                expect(e).to.be.instanceof(Error);
+                done();
+            }
+        });
+
+        it("list is empty", function () {
+            const to = {};
+            Common.mapBind({}, to, []);
+            expect(to).to.be.deep.equal({});
+        });
+
+        it("list item is not pointing to function", function () {
+            const to = {};
+            Common.mapBind({}, to, ["vasqa de gamma"]);
+            expect(to).to.be.deep.equal({});
+        });
+    });
+
+    describe("tryFile", function () {
+        const pathToExistingFile = path.join(
+            __dirname,
+            "testies/module/fields/collection.js"
+        );
+        const pathToAbsentFile = path.join(
+            __dirname,
+            "testies/module/fields/collection.ejs"
+        );
+        const pathToDirectory = path.join(
+            __dirname,
+            "testies/module/fields/empty"
+        );
+
+        it("file exists, type file", function () {
+            const res = Common.tryFile(pathToExistingFile);
+            expect(res).to.be.equal(true);
+        });
+
+        it("file doesnt exist", function () {
+            const res = Common.tryFile(pathToAbsentFile);
+            expect(res).to.be.equal(false);
+        });
+
+        it("directory", function () {
+            const res = Common.tryFile(pathToDirectory);
+            expect(res).to.be.equal(false);
+        });
+    });
+
+    describe("copyObj", function () {
+        it("empty", function () {
+            let rule = {};
+            expect(Common.copyObj(rule)).to.be.deep.equal({});
+        });
+
+        it("not empty, then modification of new rule is not changes original", function () {
+            let rule = { some: ["data"] };
+            let copyOfRule = Common.copyObj(rule);
+            delete copyOfRule.some;
+            expect(rule).to.be.deep.equal({ some: ["data"] });
+        });
+    });
+
+    describe("objHas", () => {
+        it("one field, exists", () => {
+            const obj = { field: 1 };
+            expect(Common.objHas(obj, "field")).to.be.true;
+        });
+
+        it("one field, dont exists", () => {
+            const obj = { field: 1 };
+            expect(Common.objHas(obj, "field2")).to.be.false;
+        });
+
+        it("few fields, one dont exists", () => {
+            const obj = { field: 1, goo: true, joe: "foo" };
+            expect(Common.objHas(obj, ["field", "goo", "laste"])).to.be.false;
+        });
+
+        it("few fields, all exists", () => {
+            const obj = { field: 1, goo: true, joe: "foo" };
+            expect(Common.objHas(obj, ["field", "goo", "joe"])).to.be.true;
+        });
+
+        it("few fields, some names is not string", () => {
+            const obj = { field: 1, goo: true, joe: "foo" };
+            expect(Common.objHas(obj, [1, "goo", undefined])).to.be.false;
+        });
+    });
 });

package/test/validators.js

@@ -1,21 +1,29 @@
 module.exports = {
-	    title: [{
-	        validator: 'isLength',
-	        arguments: [3, 500],
-	        message: 'Название компании должно быть от 3 до 500 символов'
-	    }],
-	    tripleID: [{
-	        validator: 'isNumeric',
-	        message: 'ID number  must be specified'
-	    }],
-	    objectId: [{
-	        validator: 'isLength',
-	        arguments: [10, 55],
-	        message: 'Owner should be specified'
-	    }],
-	    text: [{
-	        validator: 'isLength',
-	        arguments: [1, 500],
-	        message: 'от 1 до 500 знаков'
-	    }],
-	};
+    title: [
+        {
+            validator: "isLength",
+            arguments: [3, 500],
+            message: "Название компании должно быть от 3 до 500 символов",
+        },
+    ],
+    tripleID: [
+        {
+            validator: "isnumber",
+            message: "ID number  must be specified",
+        },
+    ],
+    objectId: [
+        {
+            validator: "isLength",
+            arguments: [10, 55],
+            message: "Owner should be specified",
+        },
+    ],
+    text: [
+        {
+            validator: "isLength",
+            arguments: [1, 500],
+            message: "от 1 до 500 знаков",
+        },
+    ],
+};