not-node 6.3.83 → 6.3.85

package/package.json

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

package/src/cli/lib/module.server.mjs

@@ -64,8 +64,7 @@ async function renderServerContollersIndexes(
             entitiesData,
             config,
             renderFile,
-            PATH_TMPL,
-            createDir
+            PATH_TMPL
         );
     }
 }

package/src/cli/renderers/forms.mjs

@@ -6,7 +6,7 @@ async function renderEntityActionForm(createFileContent, SRC, DEST, data) {
     await createFileContent(SRC, DEST, data);
 }
 
-const COMMON_FORMS = ["listAll", "listAndCount", "delete", "get", "getRaw"];
+//const COMMON_FORMS = ["listAll", "listAndCount", "delete", "get", "getRaw"];
 
 export default async (
     module_layer_dir,
@@ -17,7 +17,23 @@ export default async (
 ) => {
     for (let actionName in data.actions) {
         //if template is not depends on ModelName
-        if (COMMON_FORMS.includes(actionName)) {
+        if (data.modelName) {
+            const TMPL_FILE_PATH = resolve(
+                PATH_TMPL,
+                TEMPLATES_DIR,
+                `${actionName}.ejs`
+            );
+            const DEST_FILE_PATH = resolve(
+                module_layer_dir,
+                `${data.modelName}.${actionName}.js`
+            );
+            await renderEntityActionForm(
+                createFileContent,
+                TMPL_FILE_PATH,
+                DEST_FILE_PATH,
+                { ...config, ...data }
+            );
+        } else {
             const DEST_FILE_PATH = resolve(
                 module_layer_dir,
                 `${actionName}.js`
@@ -35,22 +51,6 @@ export default async (
                     { ...config, ...data }
                 );
             }
-        } else {
-            const TMPL_FILE_PATH = resolve(
-                PATH_TMPL,
-                TEMPLATES_DIR,
-                `${actionName}.ejs`
-            );
-            const DEST_FILE_PATH = resolve(
-                module_layer_dir,
-                `${data.modelName}.${actionName}.js`
-            );
-            await renderEntityActionForm(
-                createFileContent,
-                TMPL_FILE_PATH,
-                DEST_FILE_PATH,
-                { ...config, ...data }
-            );
         }
     }
     const TMPL_FILE_PATH_DATA = resolve(PATH_TMPL, TEMPLATES_DIR, `_data.ejs`);

package/src/const.js

@@ -4,7 +4,7 @@ const DEFAULT_PATH_MODULES = "./modules";
 const DEFAULT_PATH_WS = "./ws";
 const DEFAULT_PATH_DB_DUMPS = "../../db.dumps";
 
-const ACTION_DATA_TYPES = require("./manifest/const").ACTION_DATA_TYPES;
+const MANIFEST_CONSTS = require("./manifest/const");
 
 module.exports = {
     DEFAULT_PATH_WS,
@@ -12,5 +12,5 @@ module.exports = {
     DEFAULT_PATH_STATIC,
     DEFAULT_PATH_TMP,
     DEFAULT_PATH_DB_DUMPS,
-    ACTION_DATA_TYPES,
+    ...MANIFEST_CONSTS,
 };

package/src/manifest/const.js

@@ -15,3 +15,4 @@ const ACTION_DATA_TYPES = Object.freeze({
 });
 
 module.exports.ACTION_DATA_TYPES = ACTION_DATA_TYPES;
+module.exports.ACTION_DATA_TYPES_VALUES = Object.values(ACTION_DATA_TYPES);

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

@@ -41,7 +41,7 @@ module.exports = {
 					fields: [<% if (fields && Array.isArray(fields)) { %><% for(let field of fields){ %>"<%- field %>",<% } %><% } %>],
 				},
 			],
-			data: ["record"],
+			data: ["data"],
 			postFix: actionNamePath,
 		},
 		<% } %>
@@ -83,7 +83,7 @@ module.exports = {
 			actionSignature: ACTION_SIGNATURES.READ,
 			title: "not-node:crud_read_action_form_title",
 			description: "not-node:crud_read_action_form_description",
-			rules: [				
+			rules: [
 				{
 					auth: true,
 					role: "admin",
@@ -112,7 +112,7 @@ module.exports = {
 		update: {
 			title: "not-node:crud_update_action_form_title",
 			description: "not-node:crud_update_action_form_description",
-			actionSignature: ACTION_SIGNATURES.UPDATE,			
+			actionSignature: ACTION_SIGNATURES.UPDATE,
 			method: "post",
 			rules: [
 				{
@@ -129,9 +129,9 @@ module.exports = {
 					fields: [<%- fields.map((entry) => `"${entry}"`).join(',')  %>],
 				},
 			],
-			data: ["record"],
+			data: ["data"],
 			postFix: idActionPath,
-		}, 
+		},
 		<% } %>
 		<% if (Object.hasOwn(actions,'delete')){ %>
 		delete: {
@@ -149,7 +149,7 @@ module.exports = {
 					role: ["client", "confirmed"],
 				},
 			],
-			data: ["record"],
+			data: ["data"],
 			postFix: idActionPath,
 		},
 		<% } %>
@@ -160,13 +160,13 @@ module.exports = {
 			title: "not-node:crud_listAndCount_action_form_title",
 			description: "not-node:crud_listAndCount_action_form_description",
 			data: ["pager", "sorter", "filter", "search"],
-			rules: [				
+			rules: [
 				{
 					auth: true,
 					role: ["admin"],
 				},
 				{
-					auth: true					
+					auth: true
 				},
 			],
 			postFix: actionNamePath,
@@ -176,7 +176,7 @@ module.exports = {
 		listAll: {
 			method: "get",
 			actionSignature: ACTION_SIGNATURES.READ,
-			data: ["record", "sorter"],
+			data: ["data", "sorter"],
 			title: "not-node:crud_listAll_action_form_title",
 			description: "not-node:crud_listAll_action_form_description",
 			fields: [
@@ -184,7 +184,7 @@ module.exports = {
 				<% if (dates){ %>"createdAt","updatedAt",<% } %>
 			],
 			postFix: actionNamePath,
-			rules: [				
+			rules: [
 				{
 					auth: true,
 					role: ["manager"],