not-node 6.3.86 → 6.3.87

package/package.json

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

package/src/auth/fields.js

@@ -34,7 +34,7 @@ function isOwner(
     ownerFieldName = CONST.DOCUMENT_OWNER_FIELD_NAME
 ) {
     const ownerId = getOwnerId(data, ownerFieldName);
-    console.log("ownerId", ownerId, typeof ownerId);
+
     if (typeof ownerId !== "undefined") {
         return COMMON.compareObjectIds(ownerId, user_id);
     } else {

package/src/cli/const.mjs

@@ -32,6 +32,7 @@ const DEFAULT_MODULE_LAYERS = [
 export { DEFAULT_MODULE_LAYERS };
 
 const DEFAULT_ENTITY_LAYERS = [
+    "fields",
     "forms",
     "models",
     "logics",

package/src/cli/lib/entity.mjs

@@ -39,13 +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("moduleConfig", moduleConfig);
+    // console.log("moduleConfig", moduleConfig);
     const entityData = await Readers.entityData(
         inquirer,
         moduleConfig,
         moduleConfig.moduleLayers
     );
-    console.log("entityData", entityData);
+    //console.log("entityData", entityData);
     await renderEntityFiles(
         resolve(moduleDir, "./src"),
         entityData,

package/src/cli/lib/fs.mjs

@@ -28,22 +28,30 @@ import Options from "./opts.mjs";
 const PATH_TMPL = Options.PATH_TMPL;
 
 async function renderFile(input, dest, data) {
-    Logger.log("render", dest);
-    const renderedFileContent = await ejs.renderFile(input, data, {
-        async: true,
-    });
-    await writeFile(dest, renderedFileContent);
+    try{
+        Logger.log("render", dest);
+        const renderedFileContent = await ejs.renderFile(input, data, {
+            async: true,
+        });
+        await writeFile(dest, renderedFileContent);
+    }catch(e){
+        console.error(e);
+    }
 }
 
 async function createFileContent(filePath, structure, config) {
-    if (typeof structure == "string") {
-        await copyTmplFile(resolve(PATH_TMPL, structure), filePath);
-        return;
-    }
-    if (Object.hasOwn(structure, "tmpl")) {
-        const tmplFilePath = resolve(PATH_TMPL, structure.tmpl);
-        const data = await readArgs(structure, config);
-        await renderFile(tmplFilePath, filePath, data);
+    try{
+        if (typeof structure == "string") {
+            await copyTmplFile(resolve(PATH_TMPL, structure), filePath);
+            return;
+        }
+        if (Object.hasOwn(structure, "tmpl")) {
+            const tmplFilePath = resolve(PATH_TMPL, structure.tmpl);
+            const data = await readArgs(structure, config);
+            await renderFile(tmplFilePath, filePath, data);
+        }
+    }catch(e){
+        console.error(e);
     }
 }
 
@@ -74,10 +82,10 @@ function getProjectSiteDir(dir, CWD) {
 
 async function createDir(dirPath) {
     try {
-        //console.log("mkdir", dirPath);
+        console.log("mkdir", dirPath);
         await mkdir(dirPath, { recursive: true });
     } catch {
-        // console.error("Can't create directory", dirPath);
+        console.error("Can't create directory", dirPath);
     }
 }
 
@@ -232,8 +240,7 @@ async function findAllFieldsInModules(modulesDirPath) {
         const modulesNames = await readdir(modulesDirPath);
         const result = [];
         for (const moduleName of modulesNames) {
-            if (moduleName && moduleName.indexOf("not-") === 0) {
-                console.log("searchin in ", moduleName);
+            if (moduleName && moduleName.indexOf("not-") === 0) {                
                 const listOfFieldsInModule = await findFieldsInModule(
                     join(modulesDirPath, moduleName)
                 );
@@ -246,8 +253,7 @@ async function findAllFieldsInModules(modulesDirPath) {
                                 fullName: `${moduleName}//${fieldName}`,
                             };
                         }
-                    );
-                    console.log(listOfFieldsDescriptions);
+                    );                    
                     result.push(...listOfFieldsDescriptions);
                 }
             }

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

@@ -1,5 +1,5 @@
 import { firstLetterToLower } from "../../../src/common.js";
-import { resolve } from "node:path";
+import { join } from "node:path";
 import inquirer from "inquirer";
 import inquirerPrompt from "inquirer-autocomplete-prompt";
 
@@ -26,10 +26,10 @@ function entitiesInLayers(layersList = []) {
 
 async function createLayersDirs(modules_dir, layersList, ModuleName) {
     if (layersList.length) {
-        await createDir(resolve(modules_dir, ModuleName, "./src"));
+        await createDir(join(modules_dir, ModuleName, "./src"));
     }
     for (let layer of layersList) {
-        await createDir(resolve(modules_dir, ModuleName, "./src", layer));
+        await createDir(join(modules_dir, ModuleName, "./src", layer));
     }
 }
 
@@ -38,7 +38,8 @@ async function renderServerControllersCommons(
     entitiesData,
     config
 ) {
-    const dirPath = resolve(module_src_dir, `./common`);
+    const dirPath = join(module_src_dir, `./common`);
+    //console.log('renderServerControllersCommons',dirPath);
     await createDir(dirPath);
     await createDirContent(
         dirPath,
@@ -62,7 +63,7 @@ async function renderServerContollersIndexes(
     const subDirList = [...config.roles];
     for (let dirName of subDirList) {
         await Renderers.controllersIndex(
-            resolve(module_src_dir, `./controllers/${dirName}`),
+            join(module_src_dir, `./controllers/${dirName}`),
             entitiesData,
             config,
             renderFile,
@@ -71,12 +72,12 @@ async function renderServerContollersIndexes(
     }
 }
 
-async function createServerModule(modules_dir, config) {
+async function createServerModule(modules_dir, config, availableFields) {
     //read module name
     const ModuleName = await Readers.ModuleName(inquirer);
     const moduleName = firstLetterToLower(ModuleName);
-    const moduleDir = resolve(modules_dir, ModuleName);
-    const moduleConfig = { ...config, moduleName, ModuleName };
+    const moduleDir = join(modules_dir, ModuleName);
+    const moduleConfig = { ...config, moduleName, ModuleName, availableFields };
     await createDir(moduleDir);
     //console.log(JSON.stringify(moduleConfig, null, 4));
     await createDirContent(
@@ -100,19 +101,19 @@ async function createServerModule(modules_dir, config) {
         }
         for (let entityData of entitiesList) {
             await renderEntityFiles(
-                resolve(moduleDir, "./src"),
+                join(moduleDir, "./src"),
                 entityData,
                 moduleConfig
             );
         }
         if (layersList.includes("controllers")) {
             await renderServerContollersIndexes(
-                resolve(moduleDir, "./src"),
+                join(moduleDir, "./src"),
                 entitiesList,
                 moduleConfig
             );
             await renderServerControllersCommons(
-                resolve(moduleDir, "./src/controllers"),
+                join(moduleDir, "./src/controllers"),
                 entitiesList,
                 moduleConfig
             );

package/src/cli/readers/entityData.mjs

@@ -37,19 +37,26 @@ 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.validators = await modelValidators(inquirer);
-                result.versioning = await modelVersioning(inquirer);
-                result.increment = await modelIncrement(inquirer, result);
+                result.versioning = await modelVersioning(inquirer);                
                 result.ownage = await modelOwnage(inquirer);
+                result.ownageFields = result.ownage?['not-node//owner','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});
             } else {
+                result.fields = [];
+                result.fieldsShortNames = [];
                 result.increment = false;
                 result.versioning = false;
                 result.validators = true;
                 result.ownage = false;
+                result.ownageFields = [];
                 result.dates = false;
-            }
-            console.log("Entity data", JSON.stringify(result));
+                result.datesFields = [];
+            }            
             return result;
         } catch (e) {
             console.error(e);

package/src/cli/renderers/controllersCommons.mjs

@@ -7,8 +7,8 @@ export default async (
     config,
     createFileContent,
     PATH_TMPL
-) => {
-    for (let entityData of entitiesList) {
+) => {    
+    for (let entityData of entitiesList) {        
         const TMPL_FILE_PATH = resolve(PATH_TMPL, TEMPLATES_DIR, `crud.ejs`);
         const DEST_FILE_PATH = resolve(
             module_layer_dir,

package/src/cli/renderers/controllersIndex.mjs

@@ -9,11 +9,17 @@ export default async (
     createFileContent,
     PATH_TMPL
 ) => {
-    const TMPL_FILE_PATH = resolve(PATH_TMPL, CONTROLLER_INDEX_TMPL);
-    const DEST_FILE_PATH = resolve(module_layer_dir, `index.js`);
-    console.log("creating", TMPL_FILE_PATH, DEST_FILE_PATH);
-    await createFileContent(TMPL_FILE_PATH, DEST_FILE_PATH, {
-        ...config,
-        entities: data,
-    });
+    try{
+        const TMPL_FILE_PATH = resolve(PATH_TMPL, CONTROLLER_INDEX_TMPL);
+        const DEST_FILE_PATH = resolve(module_layer_dir, `index.js`);
+        console.log("creating", TMPL_FILE_PATH, DEST_FILE_PATH);
+        await createFileContent(TMPL_FILE_PATH, DEST_FILE_PATH, {
+            ...config,
+            entities: data,
+        });
+    }catch(e){
+        
+        console.error(module_layer_dir,e);
+    }
+    
 };

package/src/cli/renderers/fields.mjs

@@ -19,7 +19,7 @@ export default async (
     );
     const DEST_FILE_PATH_DATA = resolve(
         module_layer_dir,
-        `_${data.modelName}_data.js`
+        `_${data.modelName}.js`
     );
     await renderEntityDataField(
         createFileContent,

package/src/cli/renderers/forms.mjs

@@ -56,7 +56,7 @@ export default async (
     const TMPL_FILE_PATH_DATA = resolve(PATH_TMPL, TEMPLATES_DIR, `_data.ejs`);
     const DEST_FILE_PATH_DATA = resolve(
         module_layer_dir,
-        `_${data.modelName}_data.js`
+        `_${data.modelName}.js`
     );
     await renderEntityActionForm(
         createFileContent,

package/src/cli/renderers/models.mjs

@@ -11,6 +11,6 @@ export default async (
     const TMPL_FILE_PATH = resolve(PATH_TMPL, TEMPLATE_FILE);
     const DEST_FILE_PATH = resolve(module_layer_dir, `${data.modelName}.js`);
     const args = { ...config, ...data };
-    console.log(JSON.stringify(args, null, 4));
+    //console.log(JSON.stringify(args, null, 4));
     await createFileContent(TMPL_FILE_PATH, DEST_FILE_PATH, args);
 };

package/src/manifest/result.filter.js

@@ -190,7 +190,7 @@ module.exports = class notManifestRouteResultFilter {
     }
 
     static filterStrict(target, filteringArray) {
-        console.log(target, filteringArray);
+        //console.log(target, filteringArray);
         //to form ['id', 'user', 'files']
         const filteringArrayDirectChildren = filteringArray.map(
             (propName) => propName.split(notPath.PATH_SPLIT)[0]

package/test/common.js

@@ -99,7 +99,7 @@ describe("Common", function () {
             let to = undefined;
             try {
                 Common.mapBind({ getModel() {} }, to, ["getModel"]);
-                console.log(to);
+                //console.log(to);
                 done(new Error("should throw"));
             } catch (e) {
                 expect(e).to.be.instanceof(Error);

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

@@ -3,11 +3,12 @@ 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 %>",
+	<% } %><% } %>
 	<% if (ownage){ %>["owner", "not-node//owner"],
 	["ownerModel", "not-node//ownerModel"],<% } %>
 <% if (dates){ %>	["createdAt", "not-node//createdAt"],
@@ -33,12 +34,12 @@ module.exports = {
 				{
 					auth: true,
 					role: "admin",
-					fields: [<%- fields.map((entry) => `"${entry}"`).join(',')  %>,<% if (ownage){ %>"owner",<% } %>],
+					fields: [<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,<% if (ownage){ %>"owner",<% } %>],
 				},
 				{
 					auth: true,
 					role: ["client", "confirmed"],
-					fields: [<% if (fields && Array.isArray(fields)) { %><% for(let field of fields){ %>"<%- field %>",<% } %><% } %>],
+					fields: [<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>],
 				},
 			],
 			data: ["data"],
@@ -58,7 +59,7 @@ module.exports = {
 					fields: [
 						"_id",
 						<% if (increment){ %>"<%- modelName %>ID",<% } %>
-						<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
+						<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,
 						<% if (ownage){ %>"owner","ownerModel",<% } %>
 						<% if (dates){ %>"createdAt","updatedAt",<% } %>
 					],
@@ -69,7 +70,7 @@ module.exports = {
 					fields: [
 						"_id",
 						<% if (increment){ %>"<%- modelName %>ID",<% } %>
-						<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
+						<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,
 						<% if (dates){ %>"createdAt","updatedAt",<% } %>
 					],
 				},
@@ -90,7 +91,7 @@ module.exports = {
 					fields: [
 						"_id",
 						<% if (increment){ %>"<%- modelName %>ID",<% } %>
-						<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
+						<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,
 						<% if (ownage){ %>"owner","ownerModel",<% } %>
 						<% if (dates){ %>"createdAt","updatedAt",<% } %>
 					],
@@ -100,7 +101,7 @@ module.exports = {
 					role: ["client", "confirmed"],
 					fields: [
 						<% if (increment){ %>"<%- modelName %>ID",<% } %>
-						<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
+						<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,
 						<% if (dates){ %>"createdAt","updatedAt",<% } %>
 					],
 				},
@@ -119,14 +120,14 @@ module.exports = {
 					auth: true,
 					role: ["admin"],
 					fields: [
-						<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
+						<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,
 						<% if (ownage){ %>"owner", "ownerModel",<% } %>
 					],
 				},
 				{
 					auth: true,
 					role: ["client", "confirmed"],
-					fields: [<%- fields.map((entry) => `"${entry}"`).join(',')  %>],
+					fields: [<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>],
 				},
 			],
 			data: ["data"],
@@ -180,7 +181,7 @@ module.exports = {
 			title: "not-node:crud_listAll_action_form_title",
 			description: "not-node:crud_listAll_action_form_description",
 			fields: [
-				<%- fields.map((entry) => `"${entry}"`).join(',')  %>,
+				<%- fieldsShortNames.map((entry) => `"${entry}"`).join(',')  %>,
 				<% if (dates){ %>"createdAt","updatedAt",<% } %>
 			],
 			postFix: actionNamePath,