not-node 6.3.30 → 6.3.32

package/.prettierignore

@@ -0,0 +1 @@
+*.ejs

package/package.json

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

package/src/bootstrap/route.js

@@ -87,8 +87,8 @@ module.exports = ({
 
     const createDefaultForm = function ({ actionName, MODULE_NAME }) {
         const FIELDS = [
-            ["identity", "not-node//requiredObject"],
-            ["data", `${MODULE_NAME}//_data`],
+            ["identity", "not-node//identity"],
+            ["data", `${MODULE_NAME}//_${MODEL_NAME}`],
         ];
         const FORM_NAME = `${MODULE_NAME}:${firstLetterToUpper(
             actionName

package/src/cli/actions/entity.mjs

@@ -3,6 +3,7 @@ import { resolve } from "node:path";
 import { createEntity } from "../lib/entity.mjs";
 import Logger from "../lib/log.mjs";
 import { loadProjectConfig } from "../lib/project.mjs";
+import { getProjectSiteDir } from "../lib/fs.mjs";
 
 export default (program, { CWD }) => {
     program
@@ -10,14 +11,17 @@ export default (program, { CWD }) => {
         .addOption(
             new Option("-v, --verbose").default(false, "extensive output")
         )
+        .addOption(
+            new Option("-d, --dir <dir>").default("", "project site directory")
+        )
         .description("adds entity to existing module of project")
         .action(async (opts) => {
-            console.log(CWD);
-            const siteDir = resolve(CWD, "./site");
+            console.log(CWD, opts);
+            const siteDir = getProjectSiteDir(opts.dir, CWD);
+            console.log("project in", siteDir);
             if (opts.v) {
                 Logger.setSilent(false);
             }
-            console.log("project in", opts.dir);
             const infoFromManifest = await loadProjectConfig(siteDir);
             const modulesDir = resolve(
                 siteDir,

package/src/cli/lib/entity.mjs

@@ -22,6 +22,15 @@ async function renderEntityFiles(module_src_dir, data, config) {
             console.error("No renderer for layer: ", layerName);
         }
     }
+    if (data.layers.includes("controllers") && Renderers.controllersCommons) {
+        Renderers.controllersCommons(
+            resolve(module_src_dir, `./controllers/common`),
+            [data],
+            config,
+            renderFile,
+            Options.PATH_TMPL
+        );
+    }
 }
 
 async function createEntity(modules_dir, config) {
@@ -30,12 +39,13 @@ async function createEntity(modules_dir, config) {
     const moduleDir = resolve(modules_dir, ModuleName);
     const moduleLayers = await Readers.moduleLayers(inquirer);
     const moduleConfig = { ...config, moduleName, ModuleName, moduleLayers };
-    console.log();
+    console.log("moduleConfig", moduleConfig);
     const entityData = await Readers.entityData(
         inquirer,
         moduleConfig,
         moduleConfig.moduleLayers
     );
+    console.log("entityData", entityData);
     await renderEntityFiles(
         resolve(moduleDir, "./src"),
         entityData,

package/src/cli/lib/fs.mjs

@@ -54,6 +54,22 @@ async function copyTmplFile(from, to) {
     }
 }
 
+function getProjectSiteDir(dir, CWD) {
+    if (dir === "") {
+        return resolve(CWD, "./site");
+    } else {
+        if (
+            (dir.indexOf("/") > -1 || dir.indexOf("\\") > -1) &&
+            dir !== "./" &&
+            dir !== ".\\"
+        ) {
+            return dir;
+        } else {
+            return resolve(CWD, dir);
+        }
+    }
+}
+
 async function createDir(dirPath) {
     try {
         //console.log("mkdir", dirPath);
@@ -173,4 +189,5 @@ export {
     buildClientSideScripts,
     installPackages,
     readJSONFile,
+    getProjectSiteDir,
 };

package/src/cli/lib/opts.mjs

@@ -4,14 +4,25 @@ import * as url from "url";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
 class Options {
-    #DEFAULT_SERVER_MODULES_SUB_PATH = "./site/app/server/modules";
+    #DEFAULT_SITE_PATH = "./site";
+    get DEFAULT_SITE_PATH() {
+        return this.#DEFAULT_SITE_PATH;
+    }
+
+    #DEFAULT_SERVER_MODULES_SUB_PATH = "./app/server/modules";
     get DEFAULT_SERVER_MODULES_SUB_PATH() {
-        return this.#DEFAULT_SERVER_MODULES_SUB_PATH;
+        return resolve(
+            this.DEFAULT_SITE_PATH,
+            this.#DEFAULT_SERVER_MODULES_SUB_PATH
+        );
     }
 
-    #DEFAULT_FRONT_MODULES_SUB_PATH = "./site/app/front/src";
+    #DEFAULT_FRONT_MODULES_SUB_PATH = "./app/front/src";
     get DEFAULT_FRONT_MODULES_SUB_PATH() {
-        return this.#DEFAULT_FRONT_MODULES_SUB_PATH;
+        return resolve(
+            this.DEFAULT_SITE_PATH,
+            this.#DEFAULT_FRONT_MODULES_SUB_PATH
+        );
     }
 
     #PATH_TMPL = resolve(__dirname, "../../../tmpl/files");

package/src/cli/readers/entityData.mjs

@@ -37,6 +37,10 @@ export default (inquirer, config, layersList) => {
             result.validators = await modelValidators(inquirer);
             result.versioning = await modelVersioning(inquirer);
             result.increment = await modelIncrement(inquirer, result);
+        } else {
+            result.increment = false;
+            result.versioning = false;
+            result.validators = true;
         }
         console.log("Entity data", JSON.stringify(result));
         return result;

package/src/core/fields/identity.js

@@ -0,0 +1,12 @@
+const Schema = require("mongoose").Schema;
+
+module.exports = {
+    model: {
+        type: Schema.Types.Mixed,
+        required: true,
+        safe: {
+            update: ["@owner", "root", "admin"],
+            read: ["@owner", "root", "admin"],
+        },
+    },
+};

package/src/core/fields/validators/identity.js

@@ -0,0 +1,64 @@
+const { objHas } = require("../../../common");
+
+module.exports = [
+    {
+        validator(val) {
+            return objHas(val, "root") && typeof val.root == "boolean";
+        },
+        message: "not-node:identity_field_root_is_not_valid",
+    },
+    {
+        validator(val) {
+            return objHas(val, "admin") && typeof val.admin == "boolean";
+        },
+        message: "not-node:identity_field_admin_is_not_valid",
+    },
+    {
+        validator(val) {
+            return objHas(val, "auth") && typeof val.auth == "boolean";
+        },
+        message: "not-node:identity_field_auth_is_not_valid",
+    },
+    {
+        validator(val) {
+            return (
+                objHas(val, "role") &&
+                (typeof val.role === "string" || Array.isArray(val.role))
+            );
+        },
+        message: "not-node:identity_field_role_is_not_valid",
+    },
+    {
+        validator(val) {
+            return (
+                objHas(val, "primaryRole") &&
+                typeof val.primaryRole === "string"
+            );
+        },
+        message: "not-node:identity_field_primaryRole_is_not_valid",
+    },
+    {
+        validator(val) {
+            return objHas(val, "uid");
+        },
+        message: "not-node:identity_field_uid_is_undefined",
+    },
+    {
+        validator(val) {
+            return objHas(val, "sid");
+        },
+        message: "not-node:identity_field_sid_is_undefined",
+    },
+    {
+        validator(val) {
+            return objHas(val, "ip") && typeof val.ip === "string";
+        },
+        message: "not-node:identity_field_ip_is_not_valid",
+    },
+    {
+        validator(val) {
+            return objHas(val, "provider") && typeof val.provider === "string";
+        },
+        message: "not-node:identity_field_provider_is_not_valid",
+    },
+];

package/src/form/form.js

@@ -24,7 +24,8 @@ const DEFAULT_TRANSFORMERS = require("./transformers");
 
 /**
  * Generic form validation class
- **/
+ * @class Form
+ */
 class Form {
     /**
      * @prop {import('not-validation/src/builder').notValidationSchema} validation schema
@@ -38,10 +39,11 @@ class Form {
      * @prop {string} name of form
      **/
     #FORM_NAME;
+
     #MODEL_NAME;
     #MODULE_NAME;
     #PROTO_FIELDS;
-    #VALIDATOR;
+
     #EXTRACTORS = {
         ...DEFAULT_EXTRACTORS,
     };
@@ -186,7 +188,7 @@ class Form {
             );
             if (!validationResult.clean) {
                 throw new notValidationError(
-                    "not-core:form_validation_error",
+                    "not-node:form_validation_error",
                     validationResult.getReport(),
                     null,
                     data
@@ -197,7 +199,7 @@ class Form {
                 throw e;
             } else {
                 throw new notError(
-                    "not-core:form_validation_unknown_error",
+                    "not-node:form_validation_unknown_error",
                     {
                         FORM_NAME: this.#FORM_NAME,
                         PROTO_FIELDS: this.#PROTO_FIELDS,
@@ -305,7 +307,7 @@ class Form {
                 throw e;
             } else {
                 throw new notError(
-                    "core:form_validation_error",
+                    "not-node:form_validation_error",
                     {
                         FORM_NAME: this.#FORM_NAME,
                         PROTO_FIELDS: this.#PROTO_FIELDS,

package/src/model/default.js

@@ -394,7 +394,11 @@ function close(data = undefined) {
 }
 
 function saveNewVersion() {
-    return routine.update(this.constructor, { _id: this._id }, this.toObject());
+    return routine.update(
+        this.constructor,
+        { _id: this._id },
+        this.toObject({ minimize: false })
+    );
 }
 
 module.exports.thisMethods = {

package/src/model/versioning.js

@@ -12,7 +12,7 @@ const TECH_FIELDS = [
 ];
 
 function toObject(obj) {
-    return obj.toObject ? obj.toObject() : obj;
+    return obj.toObject ? obj.toObject({ minimize: false }) : obj;
 }
 
 const {

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

@@ -1,12 +1,11 @@
-const getIP = require("not-node").Auth.getIP;
 const { MODULE_NAME } = require("../const");
 //DB related validation tools
 const Form = require("not-node").Form;
 //form
+
 const FIELDS = [
-["activeUser", "not-node//requiredObject"],
+["identity", "not-node//identity"],
 ["data", `${MODULE_NAME}//_<%- ModelName %>_data`],
-    ["ip", "not-node//ip"],
     ];
 
     const FORM_NAME = `${MODULE_NAME}:<%- ModelName %>CreateForm`;
@@ -21,15 +20,14 @@ const FIELDS = [
 
             /**
             * Extracts data
-            * @param {ExpressRequest} req expressjs request object
+            * @param {import('not-node/src/types.js').notNodeExpressRequest} 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" ,' -%>
+                    <%- field+': "fromBody" ,' -%>
                         <% } %>
                             <% } %>
                                 owner: "activeUserId",

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

@@ -10,7 +10,7 @@ const FIELDS = [
     ];
     const FORM_NAME = `${MODULE_NAME}:<%- ModelName %>UpdateForm`;
 
-        module.exports = class <%- ModelName %>UpdateForm extends Form {
+        class <%- ModelName %>UpdateForm extends Form {
             constructor({ app }) {
             super({ FIELDS, FORM_NAME, app });
             }
@@ -37,4 +37,5 @@ const FIELDS = [
                                 ip: getIP(req),
                                 };
                                 }
-                                };
+                                }
+                                module.exports = <%- ModelName %>UpdateForm;

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

@@ -1,13 +1,10 @@
 const { MODULE_NAME } = require("../const");
 //DB related validation tools
 const Form = require("not-node").Form;
-//not-node
-const getIP = require("not-node").Auth.getIP;
 //form
 const FIELDS = [
-    ["activeUser", "not-node//requiredObject"],
-    ["data", `${MODULE_NAME}//_data`],
-    ["ip", "not-node//ip"],
+    ["identity", "not-node//identity"],
+    ["data", `${MODULE_NAME}//_data`],    
 ];
 
 const FORM_NAME = `${MODULE_NAME}:CreateForm`;

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

@@ -1,73 +1,69 @@
 const MODEL_NAME = "<%- ModelName %>";
-
 const { MODULE_NAME } = require("../const.js");
 const notNode = require("not-node");
-
 const {
-    Log,
-    LogAction,
-    say,
-    phrase,
-    config,
-    getModel,
-    getModelSchema,
-    getLogic,
-    getModelUser,
-} = notNode.Bootstrap.notBootstrapLogic({
-    target: module,
-    MODEL_NAME,
-    MODULE_NAME,
-});
+	Log,
+	LogAction,
+	say,
+	phrase,
+	config,
+	getModel,
+	getModelSchema,
+	getLogic,
+	getModelUser,
+	} = notNode.Bootstrap.notBootstrapLogic({
+		target: module,
+		MODEL_NAME,
+		MODULE_NAME,
+	});
 
 const populateBuilders = {};
 
 const <%- ModelName %>GenericLogic = notNode.Generic.GenericLogic({
-    MODEL_NAME,
-    MODULE_NAME,
-    Log,
-    LogAction,
-    say,
-    phrase,
-    config,
-    getModel,
-    getModelSchema,
-    getLogic,
-    getModelUser,
-    populateBuilders,
-});
-
+        	MODEL_NAME,
+        	MODULE_NAME,
+        	Log,
+	        LogAction,
+        	say,
+	        phrase,
+        	config,
+	        getModel,
+        	getModelSchema,
+	        getLogic,
+        	getModelUser,
+        	populateBuilders,
+	});
+	
 module.exports.thisLogicName = MODEL_NAME;
 
 class <%- ModelName %>Logic extends <%- ModelName %>GenericLogic {
-    <% if(Object.keys(actions).length){ %>
-    <% for(let actionName in actions) { %>
-        static async <%- actionName %>({ targetId, activeUser, ip, root, shouldOwn, data }) {
-            const action = "<%- actionName %>";
-            Log.debug(
-                `${MODULE_NAME}//Logic//${MODEL_NAME}//${action}`,
-                targetId,
-                ip,
-                root
-            );
-            
-            const results = await getModel().<%- actionName %>(
-                targetId,  
-                activeUser._id,              
-                data
-            );           
-
-            LogAction({
-                action,
-                by: activeUser._id,
-                role: activeUser.role,
-                ip,
-                root,
-                shouldOwn,
-            });
-            return results;
-        }
-    <% } %>
-    <% } %>
+	<% if(Object.keys(actions).length){ %>
+	<% for(let actionName in actions) { %>
+	static async <%- actionName %>({ identity, data, targetId, shouldOwn }) {
+		const action = "<%- actionName %>";
+		Log.debug(
+			`${MODULE_NAME}//Logic//${MODEL_NAME}//${action}`,
+			targetId,
+			ip: identity.ip,
+			root: identity.root,
+		);
+		const results = await getModel().<%- actionName %>(			
+			targetId,
+			data,
+			identity
+		);
+		LogAction({
+			action,
+			by: identity.uid,
+			role: identity.role,
+			ip: identity.ip,
+			root: identity.root,
+			shouldOwn,
+		});
+		return results;
+	}
+	<% } %>
+	<% } %>
 }
 
-module.exports[MODEL_NAME] = <%- ModelName %>Logic;
+module.exports[MODEL_NAME] = <%- ModelName %>Logic;

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

@@ -3,45 +3,45 @@ const MODEL_NAME = "<%- ModelName %>";
 const notNode = require("not-node");
 
 const {
-    //	say,
-    //	config,
-    //	Log,
-    before,
-    after,
-    getLogic,
-    //	getModel,
-    //	getModelSchema,
+	//	say,
+	//	config,
+	//	Log,
+	before,
+	after,
+	getLogic,
+	//	getModel,
+	//	getModelSchema,
 } = notNode.Bootstrap.notBootstrapRoute({
-    target: module,
-    MODEL_NAME,
-    MODULE_NAME,
-    defaultAccessRule: true,
+	target: module,
+	MODEL_NAME,
+	MODULE_NAME,
+	defaultAccessRule: true,
 });
 
 const <%- ModelName %>GenericRoute = notNode.Generic.GenericRoute({
-    before, //<-this prepares `prepared`
-    after,
-    getLogic,
+	before, //<-this prepares `prepared`
+	after,
+	getLogic,
 });
 
 class <%- ModelName %>Route extends <%- ModelName %>GenericRoute {
-    <% if(Object.keys(actions).length){ %>
-        <% for(let actionName in actions) { %>
-    static async <%- actionName %>(
-        req, res, next, //standart express routes objects
-        prepared //extracted by `before` if form class exists
-    ) {
-        <% if (layers.includes('forms') && layers.includes('logics')){ %>
-        return await getLogic().<%- actionName %>({ ...prepared });
-        <% } %>
+	<% if(Object.keys(actions).length){ %>
+	<% for(let actionName in actions) { %>
+	static async <%- actionName %>(
+		req, res, next, 	//standart express routes objects
+		prepared 		//extracted by `before` if form class exists
+	) {
+	<% if (layers.includes('forms') && layers.includes('logics')){ %>
+	return await getLogic().<%- actionName %>({ ...prepared });
+	<% } %>
         
-        <% if (layers.includes('forms') && !layers.includes('logics')){ %>
-        return {...prepared};
-        <% } %>
+	<% if (layers.includes('forms') && !layers.includes('logics')){ %>
+	return {...prepared};
+	<% } %>
 
-        <% if (!layers.includes('forms') && layers.includes('logics')){ %>
-        return await getLogic().<%- actionName %>();
-        <% } %>
+	<% if (!layers.includes('forms') && layers.includes('logics')){ %>
+	return await getLogic().<%- actionName %>();
+	<% } %>
     }
     <% } %>   
     <% } %>