not-node 6.2.16 → 6.2.18

package/package.json

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

package/src/common.js

@@ -1,7 +1,6 @@
 const fs = require("fs");
 const path = require("path");
 const notPath = require("not-path");
-const { rejects } = require("assert");
 
 /** @module Common */
 /**
@@ -157,21 +156,21 @@ module.exports.executeFunctionAsAsync = executeFunctionAsAsync;
  **/
 module.exports.executeObjectFunction = async (obj, name, params) => {
     if (obj) {
-        if (name.indexOf(".") > -1) {
-            const proc =
-                typeof obj == "object"
-                    ? notPath.get(":" + name, obj)
-                    : obj[name];
-            if (proc) {
-                return await executeFunctionAsAsync(proc.bind(obj), params);
-            }
-        } else {
-            if (obj[name] && isFunc(obj[name])) {
-                if (isAsync(obj[name])) {
-                    return await obj[name](...params);
-                } else {
-                    return obj[name](...params);
-                }
+        return;
+    }
+    if (name.indexOf(".") > -1) {
+        const proc =
+            typeof obj == "object" ? notPath.get(":" + name, obj) : obj[name];
+        if (!proc) {
+            return;
+        }
+        return await executeFunctionAsAsync(proc.bind(obj), params);
+    } else {
+        if (obj[name] && isFunc(obj[name])) {
+            if (isAsync(obj[name])) {
+                return await obj[name](...params);
+            } else {
+                return obj[name](...params);
             }
         }
     }
@@ -293,3 +292,62 @@ module.exports.getIP = (req) => {
         return undefined;
     }
 };
+
+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;
+    };
+};
+module.exports.createIsStringPrefixedTester = createIsStringPrefixedTester;
+
+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;
+            }
+        }
+        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 0;
+};
+module.exports.stringIsPrefixed = stringIsPrefixed;
+
+/**
+ * It will get value of name from object property and then test,
+ * if value corresponds to a property process.ENV object. If it does -
+ * value from process.ENV.* will be returned, if not - just value of source[name]
+ * @param {object}      source          source object
+ * @param {string}      name            option name
+ * @param {object}      [options]         options
+ * @param {function}    [options.tester]  (str)=>integer, checks value of source[name], if returns not 0 than value is name of property in process.ENV to be returned, if number more than 0 returned and drop is set to true, returned number of chars will be droped
+ * @param {string}      [options.prefix = 'ENV$']  prefix that indicates that source[name] value corresponds to process.ENV property
+ * @param {boolean}     [options.drop = true]  should we drop prefix from value before reach for real value in process.ENV, ENV$VALUE - process.ENV.VALUE
+ * @returns  {*}    any
+ */
+const getValueFromEnv = (
+    source,
+    name,
+    options = { prefix: "ENV$", drop: true }
+) => {
+    if (source && Object.hasOwn(source, name)) {
+        const val = source[name];
+        const len = stringIsPrefixed(val, options);
+        if (len) {
+            return process.env[options.drop ? val.slice(0, len) : val];
+        }
+        return val;
+    }
+};
+module.exports.getValueFromEnv = getValueFromEnv;

package/src/form/env_extractors/query.js

@@ -9,11 +9,15 @@ module.exports = (form, req) => {
             `${MODULE_NAME}//${MODEL_NAME}`
         );
         if (thisSchema) {
-            const { skip, size } = notFilter.pager.process(req), //skip,size
+            let skip, size;
+            const pager = notFilter.pager.process(req), //skip,size
                 sorter = notFilter.sorter.process(req, thisSchema),
                 search = notFilter.search.process(req, thisSchema);
             let filter = notFilter.filter.process(req, thisSchema);
-
+            if (pager) {
+                skip = pager.skip;
+                size = pager.size;
+            }
             return {
                 name: "query",
                 value: { skip, size, sorter, search, filter },