not-node 6.2.20 → 6.2.21

package/package.json

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

package/src/manifest/route.js

@@ -191,15 +191,17 @@ class notRoute {
                 prepared,
             ]);
             //filter result IF actionData.return specified
-            if (typeof result.toObject === "function") {
-                result = result.toObject();
-            }
-            if (Array.isArray(result)) {
-                result = result.map((itm) =>
-                    itm.toObject ? itm.toObject() : itm
-                );
+            if (typeof result !== "undefined" && result) {
+                if (typeof result.toObject === "function") {
+                    result = result.toObject();
+                }
+                if (Array.isArray(result)) {
+                    result = result.map((itm) =>
+                        itm.toObject ? itm.toObject() : itm
+                    );
+                }
+                notManifestRouteResultFilter.filter(req.notRouteData, result);
             }
-            notManifestRouteResultFilter.filter(req.notRouteData, result);
             //run after with results, continue without waiting when it finished
             return this.executeFunction(modRoute, CONST_AFTER_ACTION, [
                 req,

package/tmpl/files/module.server/layers/forms/create.ejs

@@ -4,44 +4,42 @@ const { MODULE_NAME } = require("../const");
 const Form = require("not-node").Form;
 //form
 const FIELDS = [
-<% if (fields && Array.isArray(fields)) { %>
-    <% for(let field of fields){ %>
-        "<%- field %>",
-            <% } %>
-                <% } %>
-                    ];
+["activeUser", "not-node//requiredObject"],
+["data", `${MODULE_NAME}//_<%- ModelName %>_data`],
+    ["ip", "not-node//ip"],
+    ];
 
-                    const FORM_NAME = `${MODULE_NAME}:<%- ModelName %>CreateForm`;
+    const FORM_NAME = `${MODULE_NAME}:<%- ModelName %>CreateForm`;
 
-                        /**
-                        *
-                        **/
-                        module.exports = class <%- ModelName %>CreateForm extends Form {
-                            constructor({ app }) {
-                            super({ FIELDS, FORM_NAME, app });
-                            }
+        /**
+        *
+        **/
+        module.exports = class <%- ModelName %>CreateForm extends Form {
+            constructor({ app }) {
+            super({ FIELDS, FORM_NAME, app });
+            }
 
-                            /**
-                            * Extracts data
-                            * @param {ExpressRequest} req expressjs request object
-                            * @return {Object} forma data
-                            **/
-                            extract(req) {
-                            const ip = getIP(req);
-                            const instructions = {
-                            <% if (fields && Array.isArray(fields)) { %>
-                                <% for(let field of fields){ %>
-                                    <%- field+': "extractFromBody" ,' -%>
-                                        <% } %>
-                                            <% } %>
-                                                owner: "activeUserId",
-                                                ownerModel: "activeUserModelName",
-                                                };
-                                                const data = this.extractByInstructions(req, instructions);
-                                                return {
-                                                activeUser: req.user,
-                                                ip,
-                                                data,
-                                                };
-                                                }
-                                                };
+            /**
+            * Extracts data
+            * @param {ExpressRequest} req expressjs request object
+            * @return {Object} forma data
+            **/
+            extract(req) {
+            const ip = getIP(req);
+            const instructions = {
+            <% if (fields && Array.isArray(fields)) { %>
+                <% for(let field of fields){ %>
+                    <%- field+': fromBody" ,' -%>
+                        <% } %>
+                            <% } %>
+                                owner: "activeUserId",
+                                ownerModel: "activeUserModelName",
+                                };
+                                const data = this.extractByInstructions(req, instructions);
+                                return {
+                                activeUser: req.user,
+                                ip,
+                                data,
+                                };
+                                }
+                                };

package/tmpl/files/module.server/layers/forms/update.ejs

@@ -19,7 +19,7 @@ const FIELDS = [
             const instructions = {
             <% if (fields && Array.isArray(fields)) { %>
                 <% for(let field of fields){ %>
-                    <%- field+': "extractFromBody" ,' -%>
+                    <%- field+': "fromBody" ,' -%>
                         <% } %>
                             <% } %>
                                 owner: "fromBody",

package/tmpl/files/module.server/layers/forms/validator.ejs

@@ -2,31 +2,31 @@ const notNode = require("not-node");
 const { notValidationError } = require("not-error");
 
 module.exports = async (
-    /**
-    *   Values to validate in form
-    */
-    {owner, ownerModel, vals, to , validate }, 
-    /**
-    * special container to pass around global validation libs, CONSTs and inject other entities
-    */
-    validationEnvs
-    ) => {
-    //some preparations
-    if (
-        //vals checks
-    ) {
-        throw new notValidationError(
-            "<%- ModuleName %>:validation_error",
-            {
-                //vals: ["%- ModuleName %>:vals_should_be_valid"],
-            },
-            undefined, //no source error, its custom exception
-            {
-                //information
-                //vals,
-                //owner,
-                //ownerModel
-            }
-        );
+/**
+* Values to validate in form
+*/
+{owner, ownerModel, vals, to , validate },
+/**
+* special container to pass around global validation libs, CONSTs and inject other entities
+*/
+validationEnvs
+) => {
+//some preparations
+if (
+//vals checks
+) {
+throw new notValidationError(
+"<%- ModuleName %>:validation_error",
+    {
+    //vals: ["%- ModuleName %>:vals_should_be_valid"],
+    },
+    undefined, //no source error, its custom exception
+    {
+    //information
+    //vals,
+    //owner,
+    //ownerModel
     }
-};
+    );
+    }
+    };