not-node 6.3.93 → 6.3.94

package/package.json

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

package/src/cli/actions/entity.mjs

@@ -3,7 +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";
+import { getProjectSiteDir, findAllFields } from "../lib/fs.mjs";
 
 export default (program, { CWD }) => {
     program
@@ -27,11 +27,12 @@ export default (program, { CWD }) => {
                 siteDir,
                 infoFromManifest.serverModulesDir
             );
+            const allFields = await findAllFields(siteDir, modulesDir);
             console.log("creating server module in", modulesDir);
             const ProjectConfig = {
                 path: opts.dir,
                 ...infoFromManifest,
             };
-            await createEntity(modulesDir, ProjectConfig);
+            await createEntity(modulesDir, ProjectConfig, allFields);
         });
 };

package/src/cli/lib/entity.mjs

@@ -1,6 +1,9 @@
 import { firstLetterToLower } from "../../../src/common.js";
 import { resolve } from "node:path";
 import inquirer from "inquirer";
+import inquirerPrompt from "inquirer-autocomplete-prompt";
+
+inquirer.registerPrompt("autocomplete", inquirerPrompt);
 import * as Readers from "../readers/index.mjs";
 import * as Renderers from "../renderers/index.mjs";
 import { renderFile, createDir } from "./fs.mjs";
@@ -33,12 +36,18 @@ async function renderEntityFiles(module_src_dir, data, config) {
     }
 }
 
-async function createEntity(modules_dir, config) {
+async function createEntity(modules_dir, config, availableFields) {
     const ModuleName = await Readers.ModuleName(inquirer);
     const moduleName = firstLetterToLower(ModuleName);
     const moduleDir = resolve(modules_dir, ModuleName);
     const moduleLayers = await Readers.moduleLayers(inquirer);
-    const moduleConfig = { ...config, moduleName, ModuleName, moduleLayers };
+    const moduleConfig = {
+        ...config,
+        moduleName,
+        ModuleName,
+        moduleLayers,
+        availableFields,
+    };
     // console.log("moduleConfig", moduleConfig);
     const entityData = await Readers.entityData(
         inquirer,

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

@@ -1,4 +1,7 @@
-import { firstLetterToLower } from "../../../src/common.js";
+import {
+    firstLetterToLower,
+    moduleNameTransformer,
+} from "../../../src/common.js";
 import { join } from "node:path";
 import inquirer from "inquirer";
 import inquirerPrompt from "inquirer-autocomplete-prompt";
@@ -75,9 +78,16 @@ async function renderServerContollersIndexes(
 async function createServerModule(modules_dir, config, availableFields) {
     //read module name
     const ModuleName = await Readers.ModuleName(inquirer);
+    const ModuleNameHumanReadable = moduleNameTransformer(ModuleName);
     const moduleName = firstLetterToLower(ModuleName);
     const moduleDir = join(modules_dir, ModuleName);
-    const moduleConfig = { ...config, moduleName, ModuleName, availableFields };
+    const moduleConfig = {
+        ...config,
+        moduleName,
+        ModuleName,
+        ModuleNameHumanReadable,
+        availableFields,
+    };
     await createDir(moduleDir);
     //console.log(JSON.stringify(moduleConfig, null, 4));
     await createDirContent(

package/src/cli/readers/fields.mjs

@@ -57,12 +57,15 @@ export default async (inquirer, config) => {
                     fieldname = answer.fieldname.trim();
                 });
             result.push([fieldname, fieldtype]);
+            const selectedFields = result.map(
+                (itm) => `${itm[1]} as ${itm[0]}`
+            );
             finished = await inquirer
                 .prompt([
                     {
                         type: "confirm",
                         name: "oneMore",
-                        message: `Add another one field to [${result.join(
+                        message: `Add another one field to [${selectedFields.join(
                             ","
                         )}] (default: true)?`,
                         default: true,

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,
@@ -21,6 +21,7 @@ export default async (
     }
 
     if (entitiesList.length) {
+        //common validators
         const TMPL_FILE_PATH_VALIDATORS = resolve(
             PATH_TMPL,
             TEMPLATES_DIR,
@@ -38,5 +39,23 @@ export default async (
                 ...entitiesList[0],
             }
         );
+        //common service
+        const TMPL_FILE_PATH_COMMON_SERVICE = resolve(
+            PATH_TMPL,
+            TEMPLATES_DIR,
+            `service.ejs`
+        );
+        const DEST_FILE_PATH_COMMON_SERVICE = resolve(
+            module_layer_dir,
+            `ns${config.ModuleNameHumanReadable}Common.js`
+        );
+        await createFileContent(
+            TMPL_FILE_PATH_COMMON_SERVICE,
+            DEST_FILE_PATH_COMMON_SERVICE,
+            {
+                ...config,
+                ...entitiesList[0],
+            }
+        );
     }
 };

package/src/common.js

@@ -23,6 +23,27 @@ module.exports.firstLetterToUpper = function (string) {
     return string.charAt(0).toUpperCase() + string.slice(1);
 };
 
+/**
+ * transforms not-module-name -> ModuleName
+ * @param {string} moduleName
+ * @return {string}
+ */
+function moduleNameTransformer(moduleName) {
+    //not-module-name -> [not,module,name]
+    const ModuleNameParts = moduleName.split("-");
+    //[not,module,name] -> [module,name]
+    const moduleNameSelectedParts =
+        ModuleNameParts[0] === "not"
+            ? ModuleNameParts.splice(1)
+            : ModuleNameParts;
+    //[module,name] -> ModuleName
+    return moduleNameSelectedParts
+        .map(module.exports.firstLetterToUpper)
+        .join("");
+}
+
+module.exports.moduleNameTransformer = moduleNameTransformer;
+
 /**
  *  Validates if string is a ObjectId
  *  @param  {string|import('mongoose').Schema.Types.ObjectId}  id   ObjectId string to validate

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

@@ -1,95 +1,94 @@
 import { MODULE_NAME } from "../../const.js";
 import Validators from "../common/validators.js";
-import { Frame } from "not-bulma";
+import { Frame, notCommon } from "not-bulma";
 import CRUDActionList from "not-bulma/src/frame/crud/actions/list";
 
 const { notCRUD } = Frame;
 
 const MODEL_NAME = "<%- ModelName %>";
+    const modelName = notCommon.lowerFirstLetter(MODEL_NAME);
 
-const LABELS = {
-    plural: `${MODULE_NAME}:${MODEL_NAME}_label_plural`,
-    single: `${MODULE_NAME}:${MODEL_NAME}_label_single`,
-};
+    const LABELS = {
+    plural: `${MODULE_NAME}:${modelName}_label_plural`,
+    single: `${MODULE_NAME}:${modelName}_label_single`,
+    };
 
-Object.freeze(LABELS);
+    Object.freeze(LABELS);
 
-class nc<%- ModelName %>Common extends notCRUD {
-    static get MODULE_NAME(){
+    class nc<%- ModelName %>Common extends notCRUD {
+        static get MODULE_NAME(){
         return MODULE_NAME;
-    }
+        }
 
-    static get MODEL_NAME(){
+        static get MODEL_NAME(){
         return MODEL_NAME;
-    }
+        }
 
-    static get LABELS(){
+        static get LABELS(){
         return LABELS;
-    }
+        }
 
-    constructor(app, params) {
+        constructor(app, params) {
         super(app, `${MODULE_NAME}.${MODEL_NAME}`);
         this.setModuleName(MODULE_NAME);
         this.setModelName(MODEL_NAME);
         this.setOptions("names", LABELS);
-        this.setOptions("Validators", Validators);
+        this.setValidators(Validators);
         this.setOptions("params", params);
         this.setOptions("list", {
-            interface: {
-                combined: true,
-                factory: this.make.<%- modelName %>,
+        interface: {
+        combined: true,
+        factory: this.make.<%- modelName %>,
             },
             endless: false,
             preload: {},
             sorter: {
-                id: -1,
+            id: -1,
             },
             showSearch: true,
             idField: "_id",
             fields: [
-                <% if (increment) { %>
+            <% if (increment) { %>
                 {
-                    path: ":<%- modelName %>ID",
+                path: ":<%- modelName %>ID",
                     title: "ID",
                     searchable: true,
                     sortable: true,
-                },
-                <% } %>
-                <% for (let fieldName of fields){ %>
-                {
-                    path: ":<%- fieldName[0] %>",
-                    title: `${MODULE_NAME}:<%- `${modelName}_field_${fieldName[0]}_label` %>`,
-                    searchable: true,
-                    sortable: true,
-                },
-                <% } %>
-                {
-                    path: ":_id",
-                    title: "Действия",
-                    type: "button",
-                    preprocessor: (value) => CRUDActionList.createActionsButtons(this, value),
-                },
-            ],
-        });
-
-        this.start();
-        return this;
-    }
-
-    createDefault() {
-        let newRecord = this.getModel({
-            <% for (let fieldName of fields){ %><%- fieldName[0] %>: undefined,
-            <% } %>
-        });
-        return newRecord;
-    }
+                    },
+                    <% } %>
+                        <% for (let fieldName of fields){ %>
+                            {
+                            path: ":<%- fieldName[0] %>",
+                                title: `${MODULE_NAME}:<%- `${modelName}_field_${fieldName[0]}_label` %>`,
+                                    searchable: true,
+                                    sortable: true,
+                                    },
+                                    <% } %>
+                                        {
+                                        path: ":_id",
+                                        title: "Действия",
+                                        type: "button",
+                                        preprocessor: (value) => CRUDActionList.createActionsButtons(this, value),
+                                        },
+                                        ],
+                                        });
 
-    static getMenu(){
-        return notCRUD.getCommonMenu(nc<%- ModelName %>Common);
-    }
+                                        this.start();
+                                        return this;
+                                        }
 
-}
+                                        createDefault() {
+                                        let newRecord = this.getModel({
+                                        <% for (let fieldName of fields){ %><%- fieldName[0] %>: undefined,
+                                                <% } %>
+                                                    });
+                                                    return newRecord;
+                                                    }
 
-export default nc<%- ModelName %>Common;
+                                                    static getMenu(){
+                                                    return notCRUD.getCommonMenu(nc<%- ModelName %>Common);
+                                                        }
 
+                                                        }
 
+                                                        export default nc<%- ModelName %>Common;

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

@@ -1,4 +1,5 @@
 import main from "../common/ws.client.main.js";
+import ns<%- ModuleNameHumanReadable %>Common from "./ns<%- ModuleNameHumanReadable %>Common.js";
 
 <% for (let {ModelName} of entities){ %>
 import nc<%- {ModelName} %> from "./nc<%- {ModelName} %>.js";
@@ -10,7 +11,7 @@ const wsc = {
 
 const uis = {};
 
-const services = {};
+const services = {ns<%- ModuleNameHumanReadable %>Common};
 
 let manifest = {
     router: {

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

@@ -0,0 +1,23 @@
+import { Builder } from "not-validation";
+import Validator from "validator";
+
+export default class ns<%- ModuleNameHumanReadable %>Common {
+    constructor(app) {
+        this.app = app;
+    }
+
+    destroy() {
+        delete this.app;
+    }
+
+    augmentValidators(validators) {
+        return Builder(validators, () => this.getValidatorEnv());
+    }
+
+    getValidatorEnv() {
+        return {
+            config: this.app.getConfigReaderForModule("<%- moduleName %>"),
+            validator: Validator,
+        };
+    }
+}

package/tmpl/files/module.server/layers/controllers/role/index.ejs

@@ -1,10 +1,13 @@
+import ns<%- ModuleNameHumanReadable %>Common from "../common/ns<%- ModuleNameHumanReadable %>Common.js";
 <% for (let {ModelName} of entities){ %>
 import nc<%- ModelName %> from "./nc<%- ModelName %>.js";
 <% } %>
 
 const wsc = {};
 const uis = {};
-const services = {};
+const services = {
+    ns<%- ModuleNameHumanReadable %>Common
+};
 
 let manifest = {
     router: {

package/tmpl/files/notComponent.ejs

@@ -1,57 +0,0 @@
-import UI<%- ComponentName %> from "./<%- componentName %>.svelte";
-
-class not<%- ComponentName %> extends notBase{
-
-    static UIConstructor = UI<%- ComponentName %>;
- 
-    constructor({
-      target = null,
-      name = "Default",
-      options = {},
-      working = {},
-      data = {},
-    }){
-      super({
-        working: {
-            name: `${name}<%- ComponentName %>`,
-            ...working,
-        },
-        options,
-        data,
-      });
-      if (target) {
-        this.setOptions("target", target);
-      }
-      this.render();
-    }
-  
-    render(){
-      this.remove();
-      if(this.UIConstructor){
-        this.ui = new this.UIConstructor({
-          target: this.getOptions('target'),
-          props:{
-            /* props */
-          }
-        });
-      }
-    }    
-  
-    update(){
-      if(this.ui){
-        this.ui.$set({ /* update props */ });
-      }
-    }
-  
-    remove(){
-      if (this.ui) {
-        this.ui.$destroy();
-        this.ui = null;
-      }
-      return this;
-    }
-  
-  }
-  
-  export default not<%- ComponentName %>;
-  

package/tmpl/files/notService.ejs

@@ -1,39 +0,0 @@
-  const INTERVAL = 360;
-  const INIT_UPDATE_DELAY = 5;
-  
-  class ns<%- ServiceName %> {
-    #INTERVAL = INTERVAL;
-    #INIT_UPDATE_DELAY = INIT_UPDATE_DELAY;
-  
-    constructor(app) {
-      this.app = app;      
-      <% if(modelName){ %>
-      this.interface = this.app.getInterface("<%- modelName %>"");
-      if(this.interface){
-        this.init();
-      }else{
-        app.error('no network interface');
-      }
-      <% }else{ %>
-      this.init();
-      <% } %>
-    };
-  
-    init() {
-      setTimeout(this.update.bind(this), this.#INIT_UPDATE_DELAY * 100);
-      this.int = setInterval(this.update.bind(this), this.#INTERVAL * 1000);
-      window.addEventListener('unload', () => {
-        clearInterval(this.int);
-        delete this.app;
-        <% if(modelName){ %>
-        delete this.interface;
-        <% } %>
-      });
-    }
-  
-    update() {
-      //serve
-    }}
-
-
-export default ns<%- ServiceName %>;