not-node 6.3.87 → 6.3.88

package/package.json

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

package/src/cli/readers/entityData.mjs

@@ -37,15 +37,15 @@ export default (inquirer, config, layersList) => {
                 layers: await entityLayers(inquirer, config, layersList),
             };
             if (result.layers.includes("models")) {
-                result.fieldsShortNames = result.fields.map((itm) => itm.indexOf('//') > 0?itm.split('//')[1]:itm);
+                result.fieldsShortNames = result.fields.map((itm) => itm[0]);
                 result.validators = await modelValidators(inquirer);
-                result.versioning = await modelVersioning(inquirer);                
+                result.versioning = await modelVersioning(inquirer);
                 result.ownage = await modelOwnage(inquirer);
-                result.ownageFields = result.ownage?['not-node//owner','not-node//ownerModel']:[];                
+                result.ownageFields = result.ownage?[['owner','not-node//owner'],['ownerModel','not-node//ownerModel']]:[];
                 result.dates = await modelDates(inquirer);
-                result.datesFields = result.dates?['not-node//createdAt','not-node//updatedAt']:[];
-                const fieldsCompleteList = [...result.fields, ...result.ownageFields, ...result.datesFields];
-                result.increment = await modelIncrement(inquirer, {fields:fieldsCompleteList});
+                result.datesFields = result.dates?[['createdAt','not-node//createdAt'],['updatedAt','not-node//updatedAt']]:[];
+                const fieldsCompleteList = [...result.fields, ...result.ownageFields, ...result.datesFields].map(itm=>itm[0]);
+                result.increment = await modelIncrement(inquirer, { fields: fieldsCompleteList });
             } else {
                 result.fields = [];
                 result.fieldsShortNames = [];
@@ -56,7 +56,7 @@ export default (inquirer, config, layersList) => {
                 result.ownageFields = [];
                 result.dates = false;
                 result.datesFields = [];
-            }            
+            }
             return result;
         } catch (e) {
             console.error(e);

package/src/cli/readers/fields.mjs

@@ -3,12 +3,14 @@ export default async (inquirer, config) => {
     let finished = false;
     while (!finished) {
         try {
+            let fieldtype = "";
+            let fieldname = "";
             await inquirer
                 .prompt([
                     {
                         type: "autocomplete",
-                        message: "Enter field name you want to be in model",
-                        name: "fieldname",
+                        message: "Enter model field type",
+                        name: "fieldtype",
                         source: async (answers, input = "") => {
                             let searchResults = [];
                             try {
@@ -29,9 +31,32 @@ export default async (inquirer, config) => {
                     },
                 ])
                 .then((answer) => {
-                    result.push(answer.fieldname.trim());
+                    fieldtype = answer.fieldtype.trim();
+                });
+            await inquirer
+                .prompt([
+                    {
+                        message: "Enter model field name",
+                        name: "fieldname",
+                        default:
+                            fieldtype.indexOf("//") > 0
+                                ? fieldtype.split("//")[1]
+                                : fieldtype,
+                        validate: (str) => {
+                            if (str.indexOf("//") > -1) {
+                                return "Should not have // in it";
+                            }
+                            if (!/[_A-z0-9]+/.test(str)) {
+                                return "Should comply to [_A-z0-9]+";
+                            }
+                            return true;
+                        },
+                    },
+                ])
+                .then((answer) => {
+                    fieldname = answer.fieldname.trim();
                 });
-
+            result.push([fieldname, fieldtype]);
             finished = await inquirer
                 .prompt([
                     {

package/src/form/form.js

@@ -174,7 +174,7 @@ class Form {
     static createDefaultInstance({ app, MODULE_NAME, MODEL_NAME, actionName }) {
         const FIELDS = [
             ["identity", "not-node//identity"],
-            ["data", `${MODULE_NAME}//_${MODEL_NAME}`],
+            ["data", `${MODULE_NAME}//_${firstLetterToLower(MODEL_NAME)}`],
         ];
         const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
         return new Form({ FIELDS, FORM_NAME, app, MODULE_NAME });

package/tmpl/files/module.server/layers/controllers/common/crud.ejs

@@ -45,8 +45,8 @@ class nc<%- ModelName %>Common extends notCRUD {
                 <% } %>
                 <% for (let fieldName of fields){ %>
                 {
-                    path: ":<%- fieldName %>",
-                    title: `${MODULE_NAME}:<%- `${modelName}_field_${fieldName}_label` %>`,
+                    path: ":<%- fieldName[0] %>",
+                    title: `${MODULE_NAME}:<%- `${modelName}_field_${fieldName[0]}_label` %>`,
                     searchable: true,
                     sortable: true,
                 },
@@ -66,7 +66,7 @@ class nc<%- ModelName %>Common extends notCRUD {
 
     createDefault() {
         let newRecord = this.getModel({
-            <% for (let fieldName of fields){ %><%- fieldName %>: undefined,
+            <% for (let fieldName of fields){ %><%- fieldName[0] %>: undefined,
             <% } %>
         });
         return newRecord;

package/tmpl/files/module.server/layers/controllers/common/validators.ejs

@@ -1,4 +1,4 @@
-import notValidationError from 'not-error/src/validation.error.browser.js';
+import notValidationError from 'not-error/src/validation.error.browser.mjs';
 /*
 import vVariableLength from '../../fields/validators/variableLength.js';
 const ERR_MSG_FORM_IS_DIRTY = '<%- ModuleName %>:form_is_dirty';

package/tmpl/files/module.server/layers/fields.data.ejs

@@ -14,7 +14,7 @@ module.exports = {
                     return notNode.Application.getForm(
                         `${MODULE_NAME}//_${firstLetterToLower(
                             MODEL_NAME
-                        )}_data`
+                        )}`
                     ).run(val);
                 },
                 message: `${MODULE_NAME}:${firstLetterToLower(MODEL_NAME)}`,

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

@@ -2,22 +2,13 @@ const { MODULE_NAME } = require("../const");
 
 const Form = require("not-node").Form;
 
-const FIELDS = [
-<% if (fields && Array.isArray(fields)) { %>
-<% for(let field of fields){ %>
-	<%- `"${field}",` -%>
-<% } %>
-<% } %>
-<% if (ownage) { %>
-	["owner", "not-node//owner"],
-	["ownerModel", "not-node//ownerModel"],
-<% } %>
-];
+const FIELDS = [<% if (fields && Array.isArray(fields)) { %><% for(let field of fields){ %>["<%- field[0] %>", "<%- field[1] %>"],
+	<% } %><% } %>];
 
-const FORM_NAME = `${MODULE_NAME}:_<%- ModelName %>DataForm`;
+const FORM_NAME = Form.createName();
 
 //const validateTitle = require("./validators/title.js");
-class _<%- ModelName %>_DataForm extends Form {
+class _<%- ModelName %>Form extends Form {
 	constructor({ app }) {
 		super({ FIELDS, FORM_NAME, app });
 	}
@@ -36,4 +27,4 @@ class _<%- ModelName %>_DataForm extends Form {
 	}
 }
 
-module.exports = _<%- ModelName %>_DataForm;
+module.exports = _<%- ModelName %>Form;

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

@@ -8,7 +8,7 @@ const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
 //form
 const FIELDS = [
 	["identity", "not-node//identity"],
-	["data", `${MODULE_NAME}//_<%- modelName %>_data`],
+	["data", `${MODULE_NAME}//_<%- modelName %>`],
 ];
 
 /**
@@ -16,33 +16,7 @@ const FIELDS = [
 **/
 class <%- ModelName %>CreateForm extends Form {
 	constructor({ app }) {
-		super({ FIELDS, FORM_NAME, app });
-	}
-
-	/**
-	* Extracts data
-	* @param {import('not-node/src/types.js').notNodeExpressRequest} req expressjs request object
-	* @return {Promise<Object>} form data
-	**/
-	async extract(req) {		
-		const data = this.extractByInstructionsFromRouteActionFields(
-			req,			//request object 
-			["fromBody", "xss"], 	//extraction common pipe [extractor, ...transformers]
-			{}			//exceptions {fieldName: [extractor, ...transformers],...}
-		);
-		//contains targetId, identity and some more. look full list in not-node/src/form/env_extractors/index.js
-		const envs = this.extractRequestEnvs(req);
-		<% if ( ownage ) { %>
-		//admin could change ownage for others hardwired
-		if (!identity.admin) {
-			data.owner = identity.uid;
-			data.ownerModel = 'User';
-		}
-		<% } %>
-		return	{
-			...envs,
-			data
-		};	
+		super({MODULE_NAME, MODEL_NAME,actionName, FIELDS, FORM_NAME, app });
 	}
 }
 

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

@@ -1,8 +1,10 @@
 const { MODULE_NAME } = require("../const");
+const MODEL_NAME = '<%- ModelName %>';
 //DB related validation tools
 const notNode = require("not-node");
 
 module.exports = notNode.Generic.GenericGetByIdForm({
     MODULE_NAME,
+    MODEL_NAME,
     actionName: "delete",
 });

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

@@ -1,8 +1,9 @@
 const { MODULE_NAME } = require("../const");
+const MODEL_NAME = '<%- ModelName %>';
 //DB related validation tools
 const notNode = require("not-node");
 
 module.exports = notNode.Generic.GenericGetByIdForm({
-    MODULE_NAME,
+    MODULE_NAME,MODEL_NAME,
     actionName: "get",
 });

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

@@ -1,8 +1,9 @@
 const { MODULE_NAME } = require("../const");
+const MODEL_NAME = '<%- ModelName %>';
 //DB related validation tools
 const notNode = require("not-node");
 
 module.exports = notNode.Generic.GenericGetByIdForm({
-    MODULE_NAME,
+    MODULE_NAME,MODEL_NAME,
     actionName: "getRaw",
 });

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

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

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

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

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

@@ -2,35 +2,20 @@ const Form = require("not-node").Form;
 
 const { MODULE_NAME } = require("../const");
 const MODEL_NAME = '<%- ModelName %>';
+
 const actionName = 'update';
 const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
 
 const FIELDS = [
 	["targetId", { required: true }, "not-node//objectId"],
 	["identity", "not-node//identity"],
-	["data", `${MODULE_NAME}//_<%- modelName %>_data`], //sub forms validators should start with underscore
+	["data", `${MODULE_NAME}//_<%- modelName %>`], //sub forms validators should start with underscore
 ];
 
 class <%- ModelName %>UpdateForm extends Form {
 	constructor({ app }) {
 		super({ FIELDS, FORM_NAME, app });
 	}
-
-	async extract(req) {
-		const data = this.extractByInstructionsFromRouteActionFields(req, ["fromBody", "xss"], {});
-		const envs = this.extractRequestEnvs(req);
-		<% if ( ownage ) { %>
-		//admin could change ownage for others hardwired
-		if (!identity.admin) {
-			data.owner && delete data.owner;
-			data.ownerModel && delete data.ownerModel;
-		}
-		<% } %>	
-		return {
-			...envs, //contains targetId, identity and some more. look list in not-node/src/form/env_extractors/index.js
-			data,
-		};
-	}
 }
 
 module.exports = <%- ModelName %>UpdateForm;

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

@@ -1,46 +1,20 @@
 const { MODULE_NAME } = require("../const");
+const MODEL_NAME = '<%- ModelName %>';
 //DB related validation tools
 const Form = require("not-node").Form;
 //form
 const FIELDS = [
     ["identity", "not-node//identity"],
-    ["data", `${MODULE_NAME}//_data`],    
+    ["data", `${MODULE_NAME}//_<%- modelName %>`],
 ];
 
-const FORM_NAME = `${MODULE_NAME}:CreateForm`;
+const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
 const USER_MODEL_NAME = "User";
 /**
  *
  **/
-module.exports = class CreateForm extends Form {
+module.exports = class 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 = {
-            title: "fromBody",
-            keys: "fromBody",
-            owner: "fromBody", //req.body.owner || req.user._id.toString(),
-            ownerModel: "fromBody", //req.body.ownerModel || USER_MODEL_NAME,
-        };
-        const data = this.extractByInstructions(req, instructions);
-
-        if (!req.user.isRoot() && !req.user.isAdmin()) {
-            data.owner = req.user._id.toString();
-            data.ownerModel = USER_MODEL_NAME;
-        }
-
-        return {
-            data,
-            activeUser: req.user,
-            ip,
-        };
+        super({MODULE_NAME, MODEL_NAME, FIELDS, FORM_NAME, app });
     }
 };

package/tmpl/files/module.server/layers/models.ejs

@@ -17,19 +17,13 @@ module.exports.enrich = {
 };
 
 const FIELDS = [
-    <% if (fields && Array.isArray(fields)) { %>
-    <% for(let field of fields){ %>
-    "<%- field %>",
-    <% } %>
-    <% } %>
-    <% if (ownage){ %>
-    ["owner", "not-node//owner"],
-    ["ownerModel", "not-node//ownerModel"],
-    <% } %>
-    <% if (dates){ %>
-    ["createdAt", "not-node//createdAt"],
-    ["updatedAt", "not-node//updatedAt"],
-    <% } %>
+   <% if (increment){ %>["<%- modelName %>ID", "not-node//ID"],<% } %>
+	<% if (fields && Array.isArray(fields)) { %><% for(let field of fields){ %>["<%- field[0] %>", "<%- field[1] %>"],
+	<% } %><% } %>
+	<% if (ownage && ownageFields && Array.isArray(ownageFields)){ %><% for(let field of ownageFields){ %>["<%- field[0] %>", "<%- field[1] %>"],
+	<% } %><% } %>
+	<% if (dates && datesFields && Array.isArray(datesFields)){ %><% for(let field of datesFields){ %>["<%- field[0] %>", "<%- field[1] %>"],
+	<% } %><% } %>
 ];
 
 module.exports.FIELDS = FIELDS;

package/tmpl/files/module.server/layers/routes.manifest.ejs

@@ -3,16 +3,16 @@ const { firstLetterToLower } = require("not-node").Common;
 const ACTION_SIGNATURES = require('not-node/src/auth/const').ACTION_SIGNATURES;
 const MODEL_NAME = "<%- ModelName %>";
 const modelName = firstLetterToLower(MODEL_NAME);
-<% const fieldsShortNames = (fields | []).map((entry) => entry.indexOf('//')>-1?entry.split('//')[0]:entry); %>
+
 const FIELDS = [
 	["_id", "not-node//_id"],
 	<% if (increment){ %>["<%- modelName %>ID", "not-node//ID"],<% } %>
-	<% if (fields && Array.isArray(fields)) { %><% for(let field of fields){ %>"<%- field %>",
+	<% if (fields && Array.isArray(fields)) { %><% for(let field of fields){ %>["<%- field[0] %>", "<%- field[1] %>"],
+	<% } %><% } %>
+	<% if (ownage && ownageFields && Array.isArray(ownageFields)){ %><% for(let field of ownageFields){ %>["<%- field[0] %>", "<%- field[1] %>"],
+	<% } %><% } %>
+	<% if (dates && datesFields && Array.isArray(datesFields)){ %><% for(let field of datesFields){ %>["<%- field[0] %>", "<%- field[1] %>"],
 	<% } %><% } %>
-	<% if (ownage){ %>["owner", "not-node//owner"],
-	["ownerModel", "not-node//ownerModel"],<% } %>
-<% if (dates){ %>	["createdAt", "not-node//createdAt"],
-	["updatedAt", "not-node//updatedAt"],<% } %>
 ];
 
 const actionNamePath = "/:actionName";

package/tmpl/files/module.server/layers/routes.ws.ejs

@@ -6,12 +6,14 @@ const getLogic = () =>
     notNode.Application.getLogic(`${MODULE_NAME}//${MODEL_NAME}`);
 
 
-async function someAction({ data, client }) {
+async function someAction({
+        data,       //client request data
+        client,     //wsclient object
+        identity    //notAppIdentityData
+    }) {
     return await getLogic().getData({
         data,
-        activeUser: client.identity,
-        ip: client.getIP(),
-        root: false,
+        identity
     });
 }