not-node 6.3.42 → 6.3.43

package/package.json

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

package/src/cli/renderers/fields.mjs

@@ -1 +1,30 @@
-export default async () => {};
+import { resolve } from "node:path";
+const TEMPLATES_DIR = "./module.server/layers";
+
+async function renderEntityDataField(createFileContent, SRC, DEST, data) {
+    await createFileContent(SRC, DEST, data);
+}
+
+export default async (
+    module_layer_dir,
+    data,
+    config,
+    createFileContent,
+    PATH_TMPL
+) => {
+    const TMPL_FILE_PATH_DATA = resolve(
+        PATH_TMPL,
+        TEMPLATES_DIR,
+        `fields.data.ejs`
+    );
+    const DEST_FILE_PATH_DATA = resolve(
+        module_layer_dir,
+        `_${data.modelName}_data.js`
+    );
+    await renderEntityDataField(
+        createFileContent,
+        TMPL_FILE_PATH_DATA,
+        DEST_FILE_PATH_DATA,
+        { ...config, ...data }
+    );
+};

package/src/cli/renderers/forms.mjs

@@ -1,10 +1,13 @@
 import { resolve } from "node:path";
+import { tryFileAsync } from "../../common.js";
 const TEMPLATES_DIR = "./module.server/layers/forms";
 
 async function renderEntityActionForm(createFileContent, SRC, DEST, data) {
     await createFileContent(SRC, DEST, data);
 }
 
+const COMMON_FORMS = ["listAll", "listAndCount", "delete", "get", "getRaw"];
+
 export default async (
     module_layer_dir,
     data,
@@ -13,21 +16,42 @@ export default async (
     PATH_TMPL
 ) => {
     for (let actionName in data.actions) {
-        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 }
-        );
+        //if template is not depends on ModelName
+        if (COMMON_FORMS.includes(actionName)) {
+            const DEST_FILE_PATH = resolve(
+                module_layer_dir,
+                `${actionName}.js`
+            );
+            if (!(await tryFileAsync(DEST_FILE_PATH))) {
+                const TMPL_FILE_PATH = resolve(
+                    PATH_TMPL,
+                    TEMPLATES_DIR,
+                    `${actionName}.ejs`
+                );
+                await renderEntityActionForm(
+                    createFileContent,
+                    TMPL_FILE_PATH,
+                    DEST_FILE_PATH,
+                    { ...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`);
     const DEST_FILE_PATH_DATA = resolve(

package/src/form/form.js

@@ -103,12 +103,32 @@ class Form {
         this.#createRateLimiter(rate);
     }
 
+    /**
+     * Creates model name string used in logging
+     * @param {string} MODULE_NAME
+     * @param {string|undefined} MODEL_NAME
+     * @param {string} actionName
+     * @returns {string}
+     */
     static createName(MODULE_NAME, MODEL_NAME, actionName) {
-        return `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
-            actionName
-        )}Form`;
+        if (MODEL_NAME) {
+            return `${MODULE_NAME}:${MODEL_NAME}:${firstLetterToUpper(
+                actionName
+            )}Form`;
+        } else {
+            return `${MODULE_NAME}:Common:${firstLetterToUpper(
+                actionName
+            )}Form`;
+        }
     }
 
+    /**
+     * Create path to form in notDomain resources manager. Could be used to find form via notApplication.getForm(formPath)
+     * @param {string} MODULE_NAME
+     * @param {string|undefined} MODEL_NAME
+     * @param {string} actionName
+     * @returns {string}
+     */
     static createPath(MODULE_NAME, MODEL_NAME, actionName) {
         if (MODEL_NAME) {
             return `${MODULE_NAME}//${firstLetterToLower(
@@ -141,7 +161,7 @@ class Form {
      *
      *
      * @param {import('../types').notNodeExpressRequest} req
-     * @return {*}
+     * @return {string|undefined}
      * @memberof Form
      */
     getModelName(req) {

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

@@ -83,9 +83,8 @@ class nc<%- ModelName %>Common extends notCRUD {
     }
 
     createDefault() {        
-        let newRecord = this.make[this.getModelName()]({
-            _id: null,
-            <% for (let fieldName of fields){ %><%- fieldName %>: null,
+        let newRecord = this.getModel({            
+            <% for (let fieldName of fields){ %><%- fieldName %>: undefined,
             <% } %>
         });
         return newRecord;

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

@@ -0,0 +1,24 @@
+const notNode = require("not-node");
+const { firstLetterToLower } = notNode.Common;
+const Schema = require("mongoose").Schema;
+const { MODULE_NAME } = require("../const");
+const MODEL_NAME = "<%- ModelName %>";
+
+module.exports = {
+    model: {
+        type: Schema.Types.Mixed,
+        required: true,
+        validate: [
+            {
+                validator(val) {
+                    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/create.ejs

@@ -1,7 +1,8 @@
-const { MODULE_NAME } = require("../const");
 //DB related validation tools
 const Form = require("not-node").Form;
-//
+
+const { MODULE_NAME } = require("../const");
+const MODEL_NAME = '<%- ModelName %>';
 const actionName = 'create';
 const FORM_NAME = Form.createName(MODULE_NAME, MODEL_NAME, actionName);
 //form

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

@@ -1,6 +1,7 @@
-const { MODULE_NAME } = require("../const");
 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);