not-node 6.5.44 → 6.5.46

package/package.json

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

package/src/auth/exceptions.js

@@ -1,5 +1,15 @@
 const { notError } = require("not-error");
 
+class UserIdentityExceptionUserIdIsNotString extends notError {
+    constructor(typeofUserId) {
+        super("not-node:auth_user_identity_user_id_is_not_string", {
+            typeofUserId,
+        });
+    }
+}
+module.exports.UserIdentityExceptionUserIdIsNotString =
+    UserIdentityExceptionUserIdIsNotString;
+
 class RolesExceptionRoleSetIsNotValid extends notError {
     constructor(name) {
         super("not-node:auth_roles_role_set_is_not_valid", { name });

package/src/cli/lib/args.mjs

@@ -29,6 +29,8 @@ async function readArgs(structure, config) {
 function isFilename(name, descr) {
     if (descr.type === "file") {
         return true;
+    } else if (descr.type === "dir") {
+        return false;
     }
     if (name.startsWith(VAR_PREFIX) && name.endsWith(VAR_PREFIX)) {
         return false;

package/src/cli/lib/fs.mjs

@@ -103,7 +103,7 @@ async function createDirContent(dest, structure = {}, config = {}) {
             entry = config[getVariableName(entry)];
         }
         if (isFilename(entry, subStructure)) {
-            //  console.log(dest, entry);
+            console.log(dest, entry);
             const filePath = join(dest, entry);
             await createFileContent(filePath, subStructure, config);
         } else {

package/src/identity/providers/session.js

@@ -1,11 +1,12 @@
 const CONST = require("../../auth/const");
 const ROLES = require("../../auth/roles");
+const EXCEPTIONS = require("../../auth/exceptions");
 
 module.exports = class IdentityProviderSession {
     static #options = {};
 
     static setOptions(options = {}) {
-        this.#options = {...this.#options, ...options};
+        this.#options = { ...this.#options, ...options };
     }
 
     static #getOptions() {
@@ -20,6 +21,15 @@ module.exports = class IdentityProviderSession {
         IdentityProviderSession.#getOptions().secondaryRoles = [...list];
     }
 
+    _idToString(_id) {
+        if (typeof _id === "string") {
+            return _id;
+        } else if (_id.toString && typeof _id.toString === "function") {
+            return _id.toString();
+        }
+        throw new EXCEPTIONS.UserIdentityExceptionUserIdIsNotString(typeof _id);
+    }
+
     constructor(req) {
         this.req = req;
         return this;
@@ -93,7 +103,8 @@ module.exports = class IdentityProviderSession {
     setUserId(_id) {
         const req = this.req;
         if (req && req.session) {
-            req.session.user = _id;
+            const stringId = this._idToString(_id);
+            req.session.user = stringId;
             req.session.save();
         }
     }

package/src/init/lib/static.js

@@ -30,7 +30,7 @@ module.exports = class InitStatic {
         return (req, res, next) => {
             try {
                 const frontApp = InitStatic.selectVersion(config, req, ext);
-                let pathTo = path.resolve(options.pathToApp, frontApp);
+                const pathTo = path.resolve(options.pathToApp, frontApp);
                 return InitStatic.serveStatic(pathTo)(req, res, next);
             } catch (e) {
                 next(e);
@@ -41,7 +41,7 @@ module.exports = class InitStatic {
     async run({ config, options, master, emit }) {
         await emit("static.pre", { config, options, master });
         master.getServer().use(
-            "/front/(:role).js",
+            '/front/:"role".js',
             InitStatic.createStaticFrontServer("js", {
                 config,
                 options,
@@ -49,7 +49,7 @@ module.exports = class InitStatic {
             })
         );
         master.getServer().use(
-            "/front/(:role).css",
+            '/front/:"role".css',
             InitStatic.createStaticFrontServer("css", {
                 config,
                 options,

package/test/identity/providers/session.js

@@ -110,7 +110,7 @@ module.exports = ({ expect }) => {
                 };
                 const id = new mongoose.Types.ObjectId();
                 new Provider(t).setUserId(id);
-                expect(t.session.user).to.eql(id);
+                expect(t.session.user).to.eql(id.toString());
             });
 
             it("session not exist, set _id", function () {

package/tmpl/dirs/front.mjs

@@ -3,11 +3,11 @@ export default {
     src: {},
     tmpl: {
         content: {
-            "index.!.js": {
+            "index.!.mjs": {
                 tmpl: "app/front/index.!.ejs",
                 args: ["not_node_reporter"],
             },
-            "rollup.!.js": {
+            "rollup.!.mjs": {
                 tmpl: "app/front/rollup.!.ejs",
                 args: [],
             },

package/tmpl/dirs/project.mjs

@@ -12,14 +12,17 @@ export default {
         ifArgs: ["pm2"],
     },
     ".envs": {
+        type: "dir",
         content: {
             development: {
+                type: "file",
                 tmpl: "project/env.ejs",
                 args: [
                     "init_root_user",
                     "not_node_monitor",
                     "not_node_reporter",
                     "db",
+                    "user",
                     "session",
                     "secret",
                     "modules",
@@ -27,12 +30,34 @@ export default {
                 ],
             },
             stage: {
+                type: "file",
                 tmpl: "project/env.ejs",
-                args: [],
+                args: [
+                    "init_root_user",
+                    "not_node_monitor",
+                    "not_node_reporter",
+                    "db",
+                    "user",
+                    "session",
+                    "secret",
+                    "modules",
+                    "ws",
+                ],
             },
             production: {
+                type: "file",
                 tmpl: "project/env.ejs",
-                args: [],
+                args: [
+                    "init_root_user",
+                    "not_node_monitor",
+                    "not_node_reporter",
+                    "db",
+                    "user",
+                    "session",
+                    "secret",
+                    "modules",
+                    "ws",
+                ],
             },
         },
     },

package/tmpl/files/app/config/common.ejs

@@ -14,8 +14,6 @@
       "mongoose": {
         "uri": "mongodb://<%- db.mongoose.hostname %>/<%- db.mongoose.db %>?authSource=<%- db.mongoose.authSource %>",
         "options": {
-          "useNewUrlParser": true,
-          "useUnifiedTopology": true,
           "db": "<%- db.mongoose.db %>",
           "host": "<%- db.mongoose.hostname %>",          
           "autoIndex": false

package/tmpl/files/app/front/index.!.ejs

@@ -1,66 +1,63 @@
 <% if (not_node_reporter) { %>
-    window.NOT_NODE_ERROR_URL_BROWSER = '<%- not_node_reporter.url_browser %>';
-    <% } %>
-    
-    import {
-      Frame
-    } from 'not-bulma';
-    
-    const {notCommon, notApp, COMPONENTS} = Frame;
-    
-    notCommon.register('backlog', true);
-    window.dumpBacklog = notCommon.dumpBacklog.bind(notCommon);
-    
-    let appDefaultOptions = {
-      manifestURL: '/api/manifest',
-      router: {
-        root: '/',
-        manifest: [],
-        index: ''
+window.NOT_NODE_ERROR_URL_BROWSER = '<%- not_node_reporter.url_browser %>';
+<% } %>
+    
+import { Frame } from 'not-bulma';
+    
+const {notCommon, notApp, COMPONENTS} = Frame;
+    
+notCommon.register('backlog', true);
+window.dumpBacklog = notCommon.dumpBacklog.bind(notCommon);
+    
+let appDefaultOptions = {
+  manifestURL: '/api/manifest',
+  router: {
+    root: '/',
+    manifest: [],
+    index: ''
+  },
+  language: 'ru',
+  crud: {
+    navigateBackAfter: ['create', 'update', 'delete']
+  },
+  modules: {
+    user: {
+      redirectTimout: 1000,
+      afterLoginURL: '/dashboard',
+      loginForm: {
+        modes: [
+          'login',
+          'requestLoginCodeOnEmail',
+          'loginByCode'
+        ]
       },
-      language: 'ru',
-      crud: {
-        navigateBackAfter: ['create', 'update', 'delete']
-      },
-      modules: {
-        user: {
-          redirectTimout: 1000,
-          afterLoginURL: '/dashboard',
-          loginForm: {
-            modes: [
-              'login',
-              'requestLoginCodeOnEmail',
-              'loginByCode'
-            ]
-          },
-          loginFormContainerSelector: '.main-container',
-          restoreFormContainerSelector: '.main-container',
-          registerFormContainerSelector: '.main-container'
-        }
-      }
-    };
-    
-    let services = {}, uis = {}, wsc = {}, fields = {};
-    
-    <%% for(var i = 0; i < mods.length; i++) { %%>
-    import * as mod_<%%= i %%>
-    from '<%%= mods[i] %%>';
-    appDefaultOptions = notCommon.absorbModule({
+      loginFormContainerSelector: '.main-container',
+      restoreFormContainerSelector: '.main-container',
+      registerFormContainerSelector: '.main-container'
+    }
+  }
+};
+    
+let services = {}, uis = {}, wsc = {}, fields = {};
+
+<%% for(var i = 0; i < mods.length; i++) { %%>
+import * as mod_<%%= i %%> from '<%%= mods[i] %%>';
+appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_<%%= i %%>,
       services, uis, wsc, fields
-    });
-    <%% } %%>    
+  });
+<%% } %%>    
     
-    COMPONENTS.import(uis);
+COMPONENTS.import(uis);
     
-    import 'bulma';
+import 'bulma';
     
-    <%% for(var i = 0; i < scss.length; i++) { %%>
-    import '<%%= scss[i] %%>';
-    <%% } %%>    
+<%% for(var i = 0; i < scss.length; i++) { %%>
+import '<%%= scss[i] %%>';
+<%% } %%>    
     
-    appDefaultOptions.services = services;
-    appDefaultOptions.wsc = wsc;
+appDefaultOptions.services = services;
+appDefaultOptions.wsc = wsc;
     
-    notCommon.startApp(() => new notApp(appDefaultOptions));
+notCommon.startApp(() => new notApp(appDefaultOptions));

package/tmpl/files/app/front/rollup.!.ejs

@@ -8,7 +8,7 @@ import sizes from "rollup-plugin-sizes";
 import postcss from "rollup-plugin-postcss";
 import json from "@rollup/plugin-json";
 
-import { babelOn } from "./build.env.js";
+import { babelOn } from "../build.env.js";
 
 export default {
     input: "<%%= inputPath %%>",
@@ -16,8 +16,7 @@ export default {
         file: "<%%= outputPath %%>",
         name: "<%%= appName %%>",
         format: "iife",
-        sourcemap:
-            false && (process.env.NODE_ENV === "production" ? false : "inline"),
+        sourcemap:(process.env.NODE_ENV === "production" ? false : "inline"),
     },
     plugins: [
         json(),

package/tmpl/files/project/env.ejs

@@ -1,34 +1,34 @@
-<% if (not_node_reporter) { %>
+<% if (locals.not_node_reporter) { %>
 NOT_NODE_ERROR_KEY=<%- not_node_reporter.key %>
 NOT_NODE_ERROR_URL_NODE=<%- not_node_reporter.url_node %>
 NOT_NODE_ERROR_URL_BROWSER=<%- not_node_reporter.url_browser %>
 <% } %>
-<% if (not_node_monitor) { %>
+<% if (locals.not_node_monitor) { %>
 NOT_NODE_MONITOR_INTERVAL=<%- not_node_monitor.interval %>
 NOT_NODE_MONITOR_REPORT_INTERVAL=<%- not_node_monitor.report_interval %>
 NOT_NODE_MONITOR_REPORT_KEY=<%- not_node_monitor.report_key %>
 NOT_NODE_MONITOR_REPORT_URL=<%- not_node_monitor.report_url %>
 <% } %>
-<% if (init_root_user) { %>
+<% if (locals.init_root_user) { %>
 INIT_ROOT_USERNAME=<%- init_root_user.name %>
 INIT_ROOT_EMAIL=<%- init_root_user.email %>
 INIT_ROOT_PASSWORD=<%- init_root_user.password %>
 <% } %>
 
-<% if (db && db.mongoose) { %>
-db__mongoose__uri=mongodb://<%- db.mongoose.host %>/<%- db.mongoose.db %>?authSource=<%- db.mongoose.authSource %>
-db__mongoose__options__host=<%- db.mongoose.host %>
+<% if (locals.db && db.mongoose) { %>
+db__mongoose__uri=mongodb://<%- db.mongoose.hostname %>/<%- db.mongoose.db %>?authSource=<%- db.mongoose.authSource %>
+db__mongoose__options__host=<%- db.mongoose.hostname %>
 db__mongoose__options__user=<%- db.mongoose.user %>
 db__mongoose__options__pass=<%- db.mongoose.pass %>
 db__mongoose__options__db=<%- db.mongoose.db %>
 <% } %>
 
-<% if (modules.includes('not-ws') && ws) { %>
+<% if (locals.modules && modules.includes('not-ws')) { %>
 modules__ws__servers__main__connection__secret=<%- secret %>
 <% } %>
-<% if (modules.includes('not-user') && user) { %>
+<% if (locals.modules && modules.includes('not-user')) { %>
 modules__user__secret=<%- secret %>
 <% } %>
-<% if (session) { %>
+<% if (locals.session && session) { %>
 session__secret=<%- session.secret %>
 <% } %>