not-node 6.2.19 → 6.2.20

package/package.json

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

package/src/form/env_extractors/index.js

@@ -3,10 +3,10 @@
  */
 
 module.exports = {
-    _id: require("./_id.js"),
     ID: require("./ID.js"),
+    _id: require("./_id.js"),
     activeUser: require("./activeUser.js"),
     ip: require("./ip.js"),
-    query: require("./query.js"),
     modelNameID: require("./modelNameID.js"),
+    query: require("./query.js"),
 };

package/src/form/extractors/index.js

@@ -5,6 +5,6 @@ module.exports = {
     activeUserId: require("./activeUserId.js"),
     activeUserModelName: require("./activeUserModelName.js"),
     fromBody: require("./fromBody.js"),
-    fromQuery: require("./fromQuery.js"),
     fromParams: require("./fromParams.js"),
+    fromQuery: require("./fromQuery.js"),
 };

package/src/manifest/route.js

@@ -191,6 +191,14 @@ 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
+                );
+            }
             notManifestRouteResultFilter.filter(req.notRouteData, result);
             //run after with results, continue without waiting when it finished
             return this.executeFunction(modRoute, CONST_AFTER_ACTION, [

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

@@ -3,33 +3,33 @@ const { MODULE_NAME } = require("../const");
 const Form = require("not-node").Form;
 
 const FIELDS = [
-    <% if (fields && Array.isArray(fields)) { %>
+<% if (fields && Array.isArray(fields)) { %>
     <% for(let field of fields){ %>
-    <%- `"${field}",` -%>
-    <% } %>
-    <% } %>
-    ["owner", "not-node//owner"],
-    ["ownerModel", "not-node//ownerModel"],
-];
-
-const FORM_NAME = `${MODULE_NAME}:_<%- ModelName %>DataForm`;
-
-
-//const validateTitle = require("./validators/title.js");
-
-module.exports = class _DataForm extends Form {
-    constructor({ app }) {
-        super({ FIELDS, FORM_NAME, app });
-    }
-
-    extract(data) {
-        return data;
-    }
-
-    getFormValidationRules() {
-        return [
-            //add validators here
-            //validateTitle,
-        ];
-    }
-};
+        <%- `"${field}",` -%>
+            <% } %>
+                <% } %>
+                    ["owner", "not-node//owner"],
+                    ["ownerModel", "not-node//ownerModel"],
+                    ];
+
+                    const FORM_NAME = `${MODULE_NAME}:_<%- ModelName %>DataForm`;
+
+
+                        //const validateTitle = require("./validators/title.js");
+
+                        module.exports = class _DataForm extends Form {
+                        constructor({ app }) {
+                        super({ FIELDS, FORM_NAME, app });
+                        }
+
+                        extract(data) {
+                        return data;
+                        }
+
+                        getFormValidationRules() {
+                        return [
+                        //add validators here
+                        //validateTitle,
+                        ];
+                        }
+                        };

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

@@ -3,45 +3,45 @@ const { MODULE_NAME } = require("../const");
 //DB related validation tools
 const Form = require("not-node").Form;
 //form
-const FIELDS = [    
-    <% if (fields && Array.isArray(fields)) { %>
+const FIELDS = [
+<% if (fields && Array.isArray(fields)) { %>
     <% for(let field of fields){ %>
-    "<%- field %>",
-    <% } %>
-    <% } %>
-];
+        "<%- field %>",
+            <% } %>
+                <% } %>
+                    ];
 
-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+': "extractFromBody" ,' -%>
+                                        <% } %>
+                                            <% } %>
+                                                owner: "activeUserId",
+                                                ownerModel: "activeUserModelName",
+                                                };
+                                                const data = this.extractByInstructions(req, instructions);
+                                                return {
+                                                activeUser: req.user,
+                                                ip,
+                                                data,
+                                                };
+                                                }
+                                                };

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

@@ -2,7 +2,7 @@ const notNode = require("not-node");
 const { MODULE_NAME } = require("../const");
 
 module.exports = notNode.Generic.GenericListAndCountForm({
-    MODULE_NAME,
-    MODEL_NAME: "<%- ModelName %>",
+MODULE_NAME,
+MODEL_NAME: "<%- ModelName %>",
     actionName: "listAll",
-});
+    });

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

@@ -2,7 +2,7 @@ const notNode = require("not-node");
 const { MODULE_NAME } = require("../const");
 
 module.exports = notNode.Generic.GenericListAndCountForm({
-    MODULE_NAME,
-    MODEL_NAME: "<%- ModelName %>",
+MODULE_NAME,
+MODEL_NAME: "<%- ModelName %>",
     actionName: "listAndCount",
-});
+    });

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

@@ -3,38 +3,38 @@ const Form = require("not-node").Form;
 const getIP = require("not-node").Auth.getIP;
 
 const FIELDS = [
-    ["targetId", { required: true }, "not-node//objectId"],
-    ["activeUser", "not-node//requiredObject"],
-    ["data", `${ModuleName}//_${ModelName}_data`],  //sub forms validators should start with underscore
+["targetId", { required: true }, "not-node//objectId"],
+["activeUser", "not-node//requiredObject"],
+["data", `${MODULE_NAME}//_<%- ModelName %>_data`], //sub forms validators should start with underscore
     ["ip", "not-node//ip"],
-];
-const FORM_NAME = `${ModuleName}:<%- ModelName %>UpdateForm`;
+    ];
+    const FORM_NAME = `${MODULE_NAME}:<%- ModelName %>UpdateForm`;
 
-module.exports = class <%- ModelName %>UpdateForm extends Form {
-    constructor({ app }) {
-        super({ FIELDS, FORM_NAME, app });
-    }
+        module.exports = class <%- ModelName %>UpdateForm extends Form {
+            constructor({ app }) {
+            super({ FIELDS, FORM_NAME, app });
+            }
 
-    extract(req) {
-        const instructions = {
+            extract(req) {
+            const instructions = {
             <% if (fields && Array.isArray(fields)) { %>
-            <% for(let field of fields){ %>
-            <%- field+': "extractFromBody",' -%>
-            <% } %>
-            <% } %>
-            owner: "fromBody",
-            ownerModel: "fromBody",
-        };
-        const data = this.extractByInstructions(req, instructions);
-        if (!req.user.isRoot() && !req.user.isAdmin()) {
-            data.owner = req.user._id;
-            data.ownerModel = "User";
-        }
-        return {
-            targetId: req.params._id.toString(),
-            activeUser: req.user,
-            data,
-            ip: getIP(req),
-        };
-    }
-};
+                <% for(let field of fields){ %>
+                    <%- field+': "extractFromBody" ,' -%>
+                        <% } %>
+                            <% } %>
+                                owner: "fromBody",
+                                ownerModel: "fromBody",
+                                };
+                                const data = this.extractByInstructions(req, instructions);
+                                if (!req.user.isRoot() && !req.user.isAdmin()) {
+                                data.owner = req.user._id;
+                                data.ownerModel = "User";
+                                }
+                                return {
+                                targetId: req.params._id.toString(),
+                                activeUser: req.user,
+                                data,
+                                ip: getIP(req),
+                                };
+                                }
+                                };