not-node 6.2.16 → 6.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.2.16",
+	"version": "6.2.17",
 	"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);
             }
         }
     }

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