not-node 6.2.24 → 6.2.26

package/package.json

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

package/src/common.js

@@ -25,12 +25,12 @@ module.exports.firstLetterToUpper = function (string) {
 
 /**
  *  Validates if string is a ObjectId
- *  @param  {string}  id   ObjectId string to validate
- *  @return {booelean}  true if check is not failed
+ *  @param  {string|import('mongoose').Schema.Types.ObjectId}  id   ObjectId string to validate
+ *  @return {boolean}  true if check is not failed
  */
 module.exports.validateObjectId = (id) => {
     try {
-        return id.match(/^[0-9a-fA-F]{24}$/) ? true : false;
+        return id.toString().match(/^[0-9a-fA-F]{24}$/) ? true : false;
     } catch (e) {
         return false;
     }
@@ -38,9 +38,9 @@ module.exports.validateObjectId = (id) => {
 
 /**
  *  Validates and compares ObjectIds in string or Object form
- *  @param  {string|ObjectId}  firstId   first id
- *  @param  {string|ObjectId}  secondId   second id
- *  @return {booelean}        true if equal
+ *  @param  {string|import('mongoose').Schema.Types.ObjectId}  firstId   first id
+ *  @param  {string|import('mongoose').Schema.Types.ObjectId}  secondId   second id
+ *  @return {boolean}        true if equal
  */
 module.exports.compareObjectIds = (firstId, secondId) => {
     try {
@@ -160,7 +160,9 @@ module.exports.executeObjectFunction = async (obj, name, params) => {
     }
     if (name.indexOf(".") > -1) {
         const proc =
-            typeof obj == "object" ? notPath.get(":" + name, obj) : obj[name];
+            typeof obj == "object"
+                ? notPath.get(":" + name, obj, {})
+                : obj[name];
         if (!proc) {
             return;
         }
@@ -179,9 +181,8 @@ module.exports.executeObjectFunction = async (obj, name, params) => {
 /**
  *  Executes method of object in apropriate way inside Promise
  * @param {Object}   from     original object
- * @param {Object}   name    method name to execute
- * @param {Array}     list  array of params
- * @return {Promise}          results of method execution
+ * @param {Object}   to    method name to execute
+ * @param {Array}    list  array of params
  **/
 module.exports.mapBind = (from, to, list) => {
     list.forEach((item) => {
@@ -262,7 +263,7 @@ module.exports.tryParseAsync = (
  * path
  * @param {Array<string>}  content  list of module components ['models', 'logics', 'routes',...]
  * @param {string}         relative  path to parent folder of components
- * @param {Object}         paths object for module/index.js
+ * @returns {Object}         paths object for module/index.js
  **/
 module.exports.generatePaths = (content = [], relative = "src") => {
     const toPath = (name) => path.join(relative, name);
@@ -291,31 +292,40 @@ module.exports.getIP = (req) => {
     }
 };
 
+/**
+ *
+ *
+ * @param {string} prefix
+ * @return {function}
+ */
 const createIsStringPrefixedTester = (prefix) => {
     if (!prefix || prefix.length === 0) throw Error("No prefix provided");
     return (str) => {
-        return str && str.length > prefix.length && str.indexOf(prefix) === 0;
+        return str && str.length > prefix.length && str.indexOf(prefix) === 0
+            ? prefix.length
+            : 0;
     };
 };
 module.exports.createIsStringPrefixedTester = createIsStringPrefixedTester;
 
+/**
+ *
+ *
+ * @param {string} val
+ * @param {Object} options
+ * @return {number} prefix length
+ */
 const stringIsPrefixed = (val, options) => {
     if (typeof val === "string" && options) {
         if (options.tester && typeof options.tester === "function") {
-            const res = options.tester(val);
-            if (Object.hasOwn(process.env, val)) {
-                return res;
-            }
+            return options.tester(val);
         }
         if (
             options.prefix &&
             typeof options.prefix === "string" &&
             options.prefix.length > 0
         ) {
-            const res = createIsStringPrefixedTester(options.prefix)(val);
-            if (Object.hasOwn(process.env, val)) {
-                return res;
-            }
+            return createIsStringPrefixedTester(options.prefix)(val);
         }
     }
     return 0;
@@ -339,11 +349,14 @@ const getValueFromEnv = (
     name,
     options = { prefix: "ENV$", drop: true }
 ) => {
-    if (source && Object.hasOwn(source, name)) {
+    if (source && objHas(source, name)) {
         const val = source[name];
         const len = stringIsPrefixed(val, options);
-        if (len) {
-            return process.env[options.drop ? val.slice(0, len) : val];
+        if (len > 0) {
+            const envName = options.drop ? val.slice(len) : val;
+            if (typeof process.env[envName] !== "undefined") {
+                return process.env[envName];
+            }
         }
         return val;
     }

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/module/routes.js

@@ -54,7 +54,7 @@ module.exports = ({ expect }) => {
         });
 
         describe("tryRouteFile", function () {
-            it("route file doesnt exists", function () {
+            it("route file doesnt exists,", function () {
                 const res = notModuleRegistratorRoutes.tryRouteFile({
                     srcDir: routesPath,
                     routeBasename: "jingle",

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 знаков",
+        },
+    ],
+};