not-node 6.3.84 → 6.3.86

package/eslint.config.cjs

@@ -0,0 +1,70 @@
+const globals = require("globals");
+const js = require("@eslint/js");
+
+const { FlatCompat } = require("@eslint/eslintrc");
+
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all,
+});
+
+module.exports = [
+    {
+        ignores: [
+            "node_modules/**/*",
+            "src/rollup.js",
+            "src/repos.js",
+            "src/lib.js",
+        ],
+    },
+    ...compat.extends(
+        "eslint:recommended",
+        //"plugin:node/recommended",
+        "plugin:sonarjs/recommended-legacy"
+    ),
+    {
+        languageOptions: {
+            globals: {
+                ...globals.node,
+                ...globals.mongo,
+                ...globals.mocha,
+            },
+
+            ecmaVersion: "latest",
+            sourceType: "module",
+
+            parserOptions: {
+                requireConfigFile: false,
+                allowImportExportEverywhere: false,
+
+                ecmaFeatures: {
+                    globalReturn: false,
+                },
+            },
+        },
+
+        rules: {
+            //    "node/exports-style": ["error", "module.exports"],
+            /*"node/file-extension-in-import": ["error", "always"],
+            "node/prefer-global/buffer": ["error", "always"],
+            "node/prefer-global/console": ["error", "always"],
+            "node/prefer-global/process": ["error", "always"],
+            "node/prefer-global/url-search-params": ["error", "always"],
+            "node/prefer-global/url": ["error", "always"],
+            "node/no-unpublished-require": "warn",*/
+
+            indent: [
+                "error",
+                4,
+                {
+                    SwitchCase: 1,
+                },
+            ],
+
+            "linebreak-style": ["error", "unix"],
+            semi: ["error", "always"],
+            "no-useless-escape": [0],
+        },
+    },
+];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.3.84",
+	"version": "6.3.86",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {
@@ -47,12 +47,13 @@
 		"ejs": "^3.1.10",
 		"escape-string-regexp": "*",
 		"express": "^4.19.2",
-		"express-fileupload": "^1.5.0",
+		"express-fileupload": "^1.5.1",
 		"express-session": "^1.18.0",
 		"fs-extra": "*",
 		"generate-password": "^1.7.1",
 		"helmet": "^7.1.0",
-		"inquirer": "^9.3.4",
+		"inquirer": "^10.1.8",
+		"inquirer-autocomplete-prompt": "^3.0.1",
 		"jsonwebtoken": "^9.0.2",
 		"lower-case": "*",
 		"method-override": "^3.0.0",
@@ -66,10 +67,10 @@
 		"not-monitor": "*",
 		"not-path": "*",
 		"rate-limiter-flexible": "^5.0.3",
-		"redis": "^4.6.15",
+		"redis": "^4.7.0",
 		"redlock": "^5.0.0-beta.2",
 		"rfdc": "^1.4.1",
-		"rimraf": "^5.0.8",
+		"rimraf": "^6.0.1",
 		"serve-static": "*",
 		"simple-git": "*",
 		"validator": "*",
@@ -80,23 +81,23 @@
 		"babel-eslint": "^10.1.0",
 		"chai": "*",
 		"chai-as-promised": "*",
-		"eslint": "^9.6.0",
+		"eslint": "^9.9.0",
 		"eslint-plugin-node": "^11.1.0",
-		"eslint-plugin-sonarjs": "^1.0.3",
-		"husky": "^9.0.11",
+		"eslint-plugin-sonarjs": "^1.0.4",
+		"husky": "^9.1.4",
 		"ink-docstrap": "^1.3.2",
 		"ioredis": "^5.4.1",
 		"jsdoc": "^4.0.3",
 		"mocha": "*",
 		"mocha-suppress-logs": "^0.5.1",
 		"mock-require": "^3.0.3",
-		"mongodb-memory-server": "^9.4.0",
-		"mongoose": "^8.4.5",
+		"mongodb-memory-server": "^10.0.0",
+		"mongoose": "^8.5.3",
 		"not-error": "^0.2.9",
 		"not-validation": "^0.0.9",
 		"npm-run-all": "^4.1.5",
 		"nyc": "^17.0.0",
-		"retire": "^5.1.1"
+		"retire": "^5.1.3"
 	},
 	"homepage": "https://github.com/interrupter/not-node#readme",
 	"nyc": {

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

@@ -3,7 +3,7 @@ import { resolve } from "node:path";
 import Logger from "../lib/log.mjs";
 import { createServerModule } from "../lib/module.server.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 createServerModule(modulesDir, ProjectConfig);
+            await createServerModule(modulesDir, ProjectConfig, allFields);
         });
 };

package/src/cli/lib/fs.mjs

@@ -11,13 +11,15 @@ import {
 import { ProjectSubStructures } from "./structures.mjs";
 
 import { spawn } from "node:child_process";
-import { resolve, join } from "node:path";
+import { resolve, join, parse } from "node:path";
 import {
     copyFile,
     constants,
     mkdir,
     writeFile,
     readFile,
+    readdir,
+    lstat,
 } from "node:fs/promises";
 
 import ejs from "ejs";
@@ -176,7 +178,103 @@ function buildClientSideScripts(siteDir) {
 
 async function readJSONFile(fname) {
     const rawdata = await readFile(fname);
-    return JSON.parse(rawdata);
+    return JSON.parse(rawdata.toString());
+}
+
+async function tryDirAsync(dirPath) {
+    try {
+        const stat = await lstat(dirPath);
+        return stat && stat.isDirectory();
+    } catch {
+        return false;
+    }
+}
+
+function isJSFilename(fname) {
+    return new RegExp(".+.(js|cjs|mjs)+$").test(fname);
+}
+
+function removeExtension(fname) {
+    return parse(fname).name;
+}
+
+async function findFieldsInDir(pathToDir) {
+    const fields = await readdir(pathToDir);
+    return fields.filter(isJSFilename).map(removeExtension);
+}
+
+async function findFieldsInModule(pathToModule) {
+    const variants = [
+        join(pathToModule, "src/core/fields"),
+        join(pathToModule, "src/fields"),
+        join(pathToModule, "fields"),
+    ];
+    try {
+        for (const nameVariants of variants) {
+            if (await tryDirAsync(nameVariants)) {
+                return await findFieldsInDir(nameVariants);
+            }
+        }
+        return [];
+    } catch (e) {
+        console.error(e);
+        return [];
+    }
+}
+
+/**
+ *
+ * @param {*} modulesDirPath
+ * @returns {Promise<Array>}
+ */
+async function findAllFieldsInModules(modulesDirPath) {
+    try {
+        const modulesNames = await readdir(modulesDirPath);
+        const result = [];
+        for (const moduleName of modulesNames) {
+            if (moduleName && moduleName.indexOf("not-") === 0) {
+                console.log("searchin in ", moduleName);
+                const listOfFieldsInModule = await findFieldsInModule(
+                    join(modulesDirPath, moduleName)
+                );
+                if (listOfFieldsInModule && listOfFieldsInModule.length) {
+                    const listOfFieldsDescriptions = listOfFieldsInModule.map(
+                        (fieldName) => {
+                            return {
+                                fieldName,
+                                moduleName,
+                                fullName: `${moduleName}//${fieldName}`,
+                            };
+                        }
+                    );
+                    console.log(listOfFieldsDescriptions);
+                    result.push(...listOfFieldsDescriptions);
+                }
+            }
+        }
+        return result;
+    } catch (err) {
+        console.error(err);
+        return [];
+    }
+}
+
+async function findAllFieldsInNodeModules(siteDirPath) {
+    const dirname = join(siteDirPath, "node_modules");
+    return await findAllFieldsInModules(dirname);
+}
+
+async function findAllFields(siteDirPath, modulesDir) {
+    try {
+        const fieldsInNodeModules = await findAllFieldsInNodeModules(
+            siteDirPath
+        );
+        const fieldsInProjectModules = await findAllFieldsInModules(modulesDir);
+        return [...fieldsInNodeModules, ...fieldsInProjectModules];
+    } catch (err) {
+        console.error(err);
+        return [];
+    }
 }
 
 export {
@@ -190,4 +288,6 @@ export {
     installPackages,
     readJSONFile,
     getProjectSiteDir,
+    findAllFields,
+    findFieldsInModule,
 };

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

@@ -1,7 +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 Options from "../lib/opts.mjs";
@@ -64,8 +66,7 @@ async function renderServerContollersIndexes(
             entitiesData,
             config,
             renderFile,
-            PATH_TMPL,
-            createDir
+            PATH_TMPL
         );
     }
 }
@@ -92,7 +93,7 @@ async function createServerModule(modules_dir, config) {
         while (await Readers.isUserNeedCreateEntity(inquirer)) {
             const entityData = await Readers.entityData(
                 inquirer,
-                config,
+                moduleConfig,
                 layersList
             );
             entitiesList.push(entityData);

package/src/cli/readers/entityData.mjs

@@ -28,27 +28,31 @@ function collectData(inquirer) {
 
 export default (inquirer, config, layersList) => {
     return collectData(inquirer).then(async (answer) => {
-        const result = {
-            ...answer,
-            modelName: firstLetterToLower(answer.ModelName),
-            actions: await actions(inquirer),
-            fields: await fields(inquirer),
-            layers: await entityLayers(inquirer, config, layersList),
-        };
-        if (result.layers.includes("models")) {
-            result.validators = await modelValidators(inquirer);
-            result.versioning = await modelVersioning(inquirer);
-            result.increment = await modelIncrement(inquirer, result);
-            result.ownage = await modelOwnage(inquirer);
-            result.dates = await modelDates(inquirer);
-        } else {
-            result.increment = false;
-            result.versioning = false;
-            result.validators = true;
-            result.ownage = false;
-            result.dates = false;
+        try {
+            const result = {
+                ...answer,
+                modelName: firstLetterToLower(answer.ModelName),
+                actions: await actions(inquirer),
+                fields: await fields(inquirer, config),
+                layers: await entityLayers(inquirer, config, layersList),
+            };
+            if (result.layers.includes("models")) {
+                result.validators = await modelValidators(inquirer);
+                result.versioning = await modelVersioning(inquirer);
+                result.increment = await modelIncrement(inquirer, result);
+                result.ownage = await modelOwnage(inquirer);
+                result.dates = await modelDates(inquirer);
+            } else {
+                result.increment = false;
+                result.versioning = false;
+                result.validators = true;
+                result.ownage = false;
+                result.dates = false;
+            }
+            console.log("Entity data", JSON.stringify(result));
+            return result;
+        } catch (e) {
+            console.error(e);
         }
-        console.log("Entity data", JSON.stringify(result));
-        return result;
     });
 };

package/src/cli/readers/fields.mjs

@@ -1,13 +1,53 @@
-export default (inquirer) => {
-    return inquirer
-        .prompt([
-            {
-                type: "input",
-                message: "Enter comma separated fields names",
-                name: "fields",
-            },
-        ])
-        .then((answer) =>
-            answer.fields.split(",").map((entry) => entry.trim())
-        );
+export default async (inquirer, config) => {
+    const result = [];
+    let finished = false;
+    while (!finished) {
+        try {
+            await inquirer
+                .prompt([
+                    {
+                        type: "autocomplete",
+                        message: "Enter field name you want to be in model",
+                        name: "fieldname",
+                        source: async (answers, input = "") => {
+                            let searchResults = [];
+                            try {
+                                if (typeof input == "string") {
+                                    searchResults = config.availableFields
+                                        .filter((s) =>
+                                            s.fullName
+                                                .toLowerCase()
+                                                .includes(input.toLowerCase())
+                                        )
+                                        .map((r) => r.fullName);
+                                }
+                            } catch (e) {
+                                console.error(e);
+                            }
+                            return searchResults;
+                        },
+                    },
+                ])
+                .then((answer) => {
+                    result.push(answer.fieldname.trim());
+                });
+
+            finished = await inquirer
+                .prompt([
+                    {
+                        type: "confirm",
+                        name: "oneMore",
+                        message: `Add another one field to [${result.join(
+                            ","
+                        )}] (default: true)?`,
+                        default: true,
+                    },
+                ])
+                .then((answer) => !answer.oneMore);
+        } catch (e) {
+            console.error(e);
+            return result;
+        }
+    }
+    return result;
 };

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/common.js

@@ -31,7 +31,7 @@ module.exports.firstLetterToUpper = function (string) {
 module.exports.validateObjectId = (id) => {
     try {
         return id.toString().match(/^[0-9a-fA-F]{24}$/) ? true : false;
-    } catch (e) {
+    } catch {
         return false;
     }
 };
@@ -62,7 +62,7 @@ module.exports.compareObjectIds = (firstId, secondId) => {
             return false;
         }
         return a === b;
-    } catch (e) {
+    } catch {
         return false;
     }
 };
@@ -229,7 +229,7 @@ module.exports.tryFile = (filePath) => {
     try {
         const stat = fs.lstatSync(filePath);
         return stat && stat.isFile();
-    } catch (e) {
+    } catch {
         return false;
     }
 };
@@ -243,7 +243,7 @@ module.exports.tryFileAsync = async (filePath) => {
     try {
         const stat = await fs.promises.lstat(filePath);
         return stat && stat.isFile();
-    } catch (e) {
+    } catch {
         return false;
     }
 };
@@ -257,7 +257,7 @@ module.exports.tryDirAsync = async (dirPath) => {
     try {
         const stat = await fs.promises.lstat(dirPath);
         return stat && stat.isDirectory();
-    } catch (e) {
+    } catch {
         return false;
     }
 };
@@ -271,7 +271,7 @@ module.exports.tryDirAsync = async (dirPath) => {
 module.exports.tryParse = (input, def = undefined) => {
     try {
         return JSON.parse(input);
-    } catch (e) {
+    } catch {
         return def;
     }
 };

package/src/fields/filter.js

@@ -62,6 +62,7 @@ class notFieldsFilter {
     static #USER_DEFINED_SETS = {};
 
     static get userSets() {
+        //eslint-disable-next-line no-undef
         return structuredClone(this.#USER_DEFINED_SETS);
     }
 

package/src/form/form.js

@@ -47,7 +47,7 @@ class Form {
         form: [],
         forms: {},
     };
-    #MODEL_SCHEMA;
+    //#MODEL_SCHEMA;
     /**
      * @prop {string} name of form
      **/
@@ -272,7 +272,6 @@ class Form {
      * @param {import('../types').notNodeExpressRequest}    [req]
      * @return {Promise<import('../types').PreparedData>}
      */
-    //eslint-disable-next-line no-unused-vars
     async afterExtract(value, req) {
         if (this.#AFTER_EXTRACT_TRANSFORMERS) {
             this.#AFTER_EXTRACT_TRANSFORMERS.forEach((aeTransformer) => {
@@ -778,7 +777,7 @@ class Form {
                 (await this.#rateLimiter.consume(
                     this.#rateLimiterIdGetter(envs)
                 ));
-        } catch (_) {
+        } catch {
             throw new this.#rateLimiterException(envs);
         }
     }

package/src/identity/identity.js

@@ -21,12 +21,13 @@ class Identity {
         session: IdentityProviderSession,
         token: IdentityProviderToken,
     };
-
+    //eslint-disable-next-line no-unused-private-class-members
     static #primaryRoles = [
         DEFAULT_USER_ROLE_FOR_ROOT,
         DEFAULT_USER_ROLE_FOR_ADMIN,
         DEFAULT_USER_ROLE_FOR_GUEST,
     ];
+    //eslint-disable-next-line no-unused-private-class-members
     static #secondaryRoles = [];
 
     static setPrimaryRoles(list = []) {

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"],