not-node 6.5.40 → 6.5.42

package/bin/not-builder.js

@@ -690,23 +690,34 @@ async function build_Server(pathToRoot, roles, targetName, targetManifest) {
 console.log("config path", configName);
 config = lib.getConfReader(configName);
 
-//searchig for targets
-if (config.get("targets") && Object.keys(config.get("targets")).length > 0) {
-    //cycling through targets
-    for (let target in config.get("targets")) {
-        let targetConfig = config.get("targets")[target];
-        if (targetConfig && targetConfig.builder) {
-            //if target type is server
-            switch (targetConfig.builder) {
-                case "server":
-                    build_Server(
-                        path.dirname(configName),
-                        targetConfig.roles,
-                        target,
-                        targetConfig
-                    );
-                    break;
+async function render() {
+    //searchig for targets
+    if (
+        config.get("targets") &&
+        Object.keys(config.get("targets")).length > 0
+    ) {
+        //cycling through targets
+        for (let target in config.get("targets")) {
+            let targetConfig = config.get("targets")[target];
+            if (targetConfig && targetConfig.builder) {
+                //if target type is server
+                switch (targetConfig.builder) {
+                    case "server":
+                        await build_Server(
+                            path.dirname(configName),
+                            targetConfig.roles,
+                            target,
+                            targetConfig
+                        );
+                        break;
+                }
             }
         }
     }
 }
+
+render()
+    .then(() => {
+        process.exit(0);
+    })
+    .catch(console.error);

package/package.json

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

package/src/cli/actions/project.mjs

@@ -1,4 +1,4 @@
-import { isAbsolute, resolve } from "node:path";
+import { isAbsolute, resolve, join } from "node:path";
 
 import { Option } from "commander";
 import inquirer from "inquirer";
@@ -10,6 +10,7 @@ import {
     makeScriptExecutable,
     installPackages,
     buildClientSideScripts,
+    findAllFields,
 } from "../lib/fs.mjs";
 
 import { postStartupInstructions } from "../lib/messages.mjs";
@@ -77,6 +78,7 @@ export default (program, { CWD }) => {
             console.log("creating site in", siteDir);
             const ProjectConfig = {
                 path: dir,
+                sitePath: siteDir,
             };
             //
             ProjectConfig.AppName = await Readers.AppName(
@@ -122,16 +124,25 @@ export default (program, { CWD }) => {
             await createDir(dir);
             await createDirContent(dir, ProjectStructure, ProjectConfig);
             await createProjectToolsAndConfigs(dir, ProjectConfig);
-            const PATH_MODULES_SERVER = resolve(
-                dir,
+            const PATH_MODULES_SERVER = join(
+                ProjectConfig.sitePath,
                 Options.DEFAULT_SERVER_MODULES_SUB_PATH
             );
-            const PATH_MODULES_FRONT = resolve(
-                dir,
+            const PATH_MODULES_FRONT = join(
+                ProjectConfig.sitePath,
                 Options.DEFAULT_FRONT_MODULES_SUB_PATH
             );
+            const modulesDir = join(
+                siteDir,
+                Options.DEFAULT_SERVER_MODULES_SUB_PATH
+            );
+            const allFields = await findAllFields(dir, modulesDir);
             while (await Readers.isUserNeedCreateServerModule(inquirer)) {
-                await createServerModule(PATH_MODULES_SERVER, ProjectConfig);
+                await createServerModule(
+                    PATH_MODULES_SERVER,
+                    ProjectConfig,
+                    allFields
+                );
             }
             if (await Readers.isUserNeedFrontModuleBootstrap(inquirer)) {
                 await createBootstrapFrontModule(

package/src/cli/lib/fs.mjs

@@ -28,19 +28,19 @@ import Options from "./opts.mjs";
 const PATH_TMPL = Options.PATH_TMPL;
 
 async function renderFile(input, dest, data) {
-    try{
+    try {
         Logger.log("render", dest);
         const renderedFileContent = await ejs.renderFile(input, data, {
             async: true,
         });
         await writeFile(dest, renderedFileContent);
-    }catch(e){
+    } catch (e) {
         console.error(e);
     }
 }
 
 async function createFileContent(filePath, structure, config) {
-    try{
+    try {
         if (typeof structure == "string") {
             await copyTmplFile(resolve(PATH_TMPL, structure), filePath);
             return;
@@ -50,7 +50,7 @@ async function createFileContent(filePath, structure, config) {
             const data = await readArgs(structure, config);
             await renderFile(tmplFilePath, filePath, data);
         }
-    }catch(e){
+    } catch (e) {
         console.error(e);
     }
 }
@@ -136,7 +136,7 @@ function makeScriptExecutable(pathToTargetScript) {
         });
         npmInstall.on("exit", (code) => {
             if (code == 0) {
-                resolve();
+                resolve(true);
             } else {
                 reject(`chmod +x ${pathToTargetScript}  ${code}`);
             }
@@ -156,7 +156,7 @@ function installPackages(siteDir) {
         });
         npmInstall.on("exit", (code) => {
             if (code == 0) {
-                resolve();
+                resolve(true);
             } else {
                 reject(`NPM install exited with code ${code}`);
             }
@@ -171,12 +171,16 @@ function buildClientSideScripts(siteDir) {
             cwd: siteDir,
         });
 
+        npmInstall.stdout.on("data", (data) => {
+            Logger.log(data.toString());
+        });
+
         npmInstall.stderr.on("data", (data) => {
             Logger.error(data.toString());
         });
         npmInstall.on("exit", (code) => {
             if (code == 0) {
-                resolve();
+                resolve(true);
             } else {
                 reject(`npm run build job exited with code ${code}`);
             }
@@ -240,7 +244,7 @@ async function findAllFieldsInModules(modulesDirPath) {
         const modulesNames = await readdir(modulesDirPath);
         const result = [];
         for (const moduleName of modulesNames) {
-            if (moduleName && moduleName.indexOf("not-") === 0) {                
+            if (moduleName && moduleName.indexOf("not-") === 0) {
                 const listOfFieldsInModule = await findFieldsInModule(
                     join(modulesDirPath, moduleName)
                 );
@@ -253,7 +257,7 @@ async function findAllFieldsInModules(modulesDirPath) {
                                 fullName: `${moduleName}//${fieldName}`,
                             };
                         }
-                    );                    
+                    );
                     result.push(...listOfFieldsDescriptions);
                 }
             }
@@ -265,18 +269,36 @@ async function findAllFieldsInModules(modulesDirPath) {
     }
 }
 
-async function findAllFieldsInNodeModules(siteDirPath) {
+async function findAllFieldsInGlobalNodeModules() {
+    const result = [];
+    for (let globalLib of Options.DEFAULT_GLOBAL_NPM_LIB) {
+        const dirname = join(globalLib, "node_modules");
+        try {
+            result.push(...(await findAllFieldsInModules(dirname)));
+        } catch {
+            Logger.log("No fields in ", dirname);
+        }
+    }
+    return result;
+}
+
+async function findAllFieldsInLocalNodeModules(siteDirPath) {
     const dirname = join(siteDirPath, "node_modules");
     return await findAllFieldsInModules(dirname);
 }
 
 async function findAllFields(siteDirPath, modulesDir) {
     try {
-        const fieldsInNodeModules = await findAllFieldsInNodeModules(
+        const fieldsInGlobalNodeModules =
+            await findAllFieldsInGlobalNodeModules();
+        const fieldsInLocalNodeModules = await findAllFieldsInLocalNodeModules(
             siteDirPath
         );
         const fieldsInProjectModules = await findAllFieldsInModules(modulesDir);
-        return [...fieldsInNodeModules, ...fieldsInProjectModules];
+        const fromNPM = fieldsInLocalNodeModules.length
+            ? fieldsInLocalNodeModules
+            : fieldsInGlobalNodeModules;
+        return [...fromNPM, ...fieldsInProjectModules];
     } catch (err) {
         console.error(err);
         return [];

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

@@ -75,7 +75,7 @@ async function renderServerContollersIndexes(
     }
 }
 
-async function createServerModule(modules_dir, config, availableFields) {
+async function createServerModule(modules_dir, config, availableFields = []) {
     //read module name
     const ModuleName = await Readers.ModuleName(inquirer);
     const ModuleNameHumanReadable = moduleNameTransformer(ModuleName);
@@ -89,7 +89,7 @@ async function createServerModule(modules_dir, config, availableFields) {
         availableFields,
     };
     await createDir(moduleDir);
-    //console.log(JSON.stringify(moduleConfig, null, 4));
+    console.log(JSON.stringify(moduleConfig, null, 4));
     await createDirContent(
         moduleDir,
         ProjectSubStructures["module.server"],

package/src/cli/lib/opts.mjs

@@ -4,6 +4,11 @@ import * as url from "url";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
 class Options {
+    #DEFAULT_GLOBAL_NPM_LIB = ["/usr/local/lib", "/usr/lib"];
+    get DEFAULT_GLOBAL_NPM_LIB() {
+        return this.#DEFAULT_GLOBAL_NPM_LIB;
+    }
+
     #DEFAULT_SITE_PATH = "./site";
     get DEFAULT_SITE_PATH() {
         return this.#DEFAULT_SITE_PATH;
@@ -11,18 +16,12 @@ class Options {
 
     #DEFAULT_SERVER_MODULES_SUB_PATH = "./app/server/modules";
     get DEFAULT_SERVER_MODULES_SUB_PATH() {
-        return resolve(
-            this.DEFAULT_SITE_PATH,
-            this.#DEFAULT_SERVER_MODULES_SUB_PATH
-        );
+        return this.#DEFAULT_SERVER_MODULES_SUB_PATH;
     }
 
     #DEFAULT_FRONT_MODULES_SUB_PATH = "./app/front/src";
     get DEFAULT_FRONT_MODULES_SUB_PATH() {
-        return resolve(
-            this.DEFAULT_SITE_PATH,
-            this.#DEFAULT_FRONT_MODULES_SUB_PATH
-        );
+        return this.#DEFAULT_FRONT_MODULES_SUB_PATH;
     }
 
     #PATH_TMPL = resolve(__dirname, "../../../tmpl/files");

package/src/init/lib/sessions/redis.js

@@ -4,7 +4,7 @@ const DEFAULT_CLIENT = "ioredis";
 
 module.exports = class InitSessionsRedis {
     async run({ config, options, master, emit }) {
-        log.info("Setting up user sessions handler(redis)...");
+        log?.info("Setting up user sessions handler(redis)...");
         await emit("sessions.pre", { config, options, master });
         const expressSession = require("express-session");
         const storeClient = config.get("session.client", DEFAULT_CLIENT);

package/tmpl/dirs/front.mjs

@@ -1,13 +1,17 @@
 export default {
     build: {},
     src: {},
-    "index.!.js": {
-        tmpl: "app/front/index.!.ejs",
-        args: ["not_node_reporter"],
-    },
-    "rollup.!.js": {
-        tmpl: "app/front/rollup.!.ejs",
-        args: [],
+    tmpl: {
+        content: {
+            "index.!.js": {
+                tmpl: "app/front/index.!.ejs",
+                args: ["not_node_reporter"],
+            },
+            "rollup.!.js": {
+                tmpl: "app/front/rollup.!.ejs",
+                args: [],
+            },
+        },
     },
     "build.env.js": {
         tmpl: "app/front/build.env.ejs",

package/tmpl/files/app/package.ejs

@@ -31,7 +31,7 @@
 	"dependencies": {
         "redis": "*",
 		"pug":"*",
-		"not-node": "*",		
+		"not-node": "*",
 		<% for(let moduleName of modules){ %>"<%- moduleName %>":"*",
 		<% } %>
 		"dotenv": "*"
@@ -45,6 +45,8 @@
 		"@rollup/plugin-commonjs": "^22.0.1",
 		"@rollup/plugin-node-resolve": "^13.3.0",
         "@rollup/plugin-json": "^4.1.0",
+		"@babel/plugin-proposal-class-properties": "*",
+		"@babel/plugin-proposal-private-methods" : "*",
 		"babel-core": "*",
 		"babel-polyfill": "*",
 		"babel-preset-es2015-rollup": "*",
@@ -54,7 +56,7 @@
 		"ink-docstrap": "^1.3.2",
 		"jsdoc": "^3.6.11",
 		"mocha": "^10.0.0",
-		"ndb": "^1.1.5",		
+		"ndb": "^1.1.5",
 		"nyc": "^15.1.0",
 		"rollup": "^2.77.2",
         "rollup-plugin-postcss": "^4.0.2",
@@ -68,4 +70,4 @@
 		"svelte": "*",
 		"yargs": "^17.5.1"
 	}
-}
+}

package/tmpl/files/app/project.manifest.ejs

@@ -5,17 +5,17 @@
 			"name": "<%- AppName %>",
 			"roles": [<% roles.forEach(function(role, index){ %>"<%- role %>"<%- (roles.length - 1 > index)?',':'' %><% }); %>],
 			"builder": "server",
-			"root": "app/front/",
-			"src": "app/front/",
+			"root": "app/front/tmpl",
+			"src": "app/front/tmpl",
 			"build": "app/front/build/",
-			"index": "app/front/index.!.js",
-			"rollup": "app/front/rollup.!.js",
+			"index": "app/front/tmpl/index.!.mjs",
+			"rollup": "app/front/tmpl/rollup.!.mjs",
 			"modules": {
 				"serverModulesDir": "app/server/modules",
 				"frontModulesDir": "app/front/src",
 				"npm": {
                     <% modules.forEach(function(module, index){ %>"<%- module %>": {}<%- (modules.length - 1 > index)?',':'' %>
-                    <% }); %>					
+                    <% }); %>
 				}
 			}
 		}