not-node 6.2.15 → 6.2.17

package/package.json

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

package/src/common.js

@@ -156,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);
             }
         }
     }
@@ -205,6 +205,22 @@ module.exports.tryFile = (filePath) => {
     }
 };
 
+/**
+ *  Asynchronously check file existence and if it's really a file
+ * @param {string}     filePath  full path to file
+ * @return {Promise<boolean>}            true if path exists and it's a file
+ **/
+module.exports.tryFileAsync = (filePath) => {
+    return new Promise((resolve, reject) => {
+        try {
+            const stat = fs.lstatSync(filePath);
+            resolve(stat && stat.isFile());
+        } catch (e) {
+            reject(false);
+        }
+    });
+};
+
 /**
  *  Trying to parse input to JSON or returns def
  * @param {string}     input  string to be parsed
@@ -219,6 +235,30 @@ module.exports.tryParse = (input, def = undefined) => {
     }
 };
 
+/**
+ *  Trying to asynchronously parse input to JSON or returns def
+ * @param {string}     input  string to be parsed
+ * @param {any}     def  what to return if parse failed, default undefined
+ * @return {Promise<Object>}            JSON
+ **/
+module.exports.tryParseAsync = (
+    input,
+    def = undefined,
+    throwOnException = false
+) => {
+    return new Promise((resolve, reject) => {
+        try {
+            resolve(JSON.parse(input));
+        } catch (e) {
+            if (throwOnException && !def) {
+                reject(e);
+            } else {
+                resolve(def);
+            }
+        }
+    });
+};
+
 /**
  * Generates paths object for module/index.js files based on content and relative
  * path

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 },