miolo 0.0.48 → 0.0.49

package/lib/config/defaults.js

@@ -44,22 +44,31 @@ module.exports = {
       sameSite: process.env.NODE_ENV != 'development' ? null : 'strict'
     }
   },
-  database: {
-    dialect: 'postgres',
-    host: 'localhost',
-    port: 5432,
-    database: 'miolo',
-    user: 'postgres',
-    password: 'postgres',
-    max: 5,
-    // Maximum number of connection in pool
-    min: 0,
-    // Minimum number of connection in pool
-    idleTimeoutMillis: 10000 // The maximum time, in milliseconds, that a connection can be idle before being released. Use with combination of evict for proper working, for more details read https://github.com/coopernurse/node-pool/issues/178#issuecomment-327110870,
-  },
+  db: {
+    connection: {
+      database: {
+        dialect: 'postgres',
+        host: 'localhost',
+        port: 5432,
+        database: 'miolo',
+        user: 'postgres',
+        password: 'postgres',
+        max: 5,
+        // Maximum number of connection in pool
+        min: 0,
+        // Minimum number of connection in pool
+        idleTimeoutMillis: 10000 // The maximum time, in milliseconds, that a connection can be idle before being released. Use with combination of evict for proper working, for more details read https://github.com/coopernurse/node-pool/issues/178#issuecomment-327110870,
+      },
+
+      options: {
+        log: 'silly' //  will be updated on the fly with miolo logger
+      }
+    },
 
+    tables: []
+  },
   routes: {
-    body_field: undefined,
+    bodyField: undefined,
     getUserId: ctx => {
       try {
         var from_pport = ctx.state.user.id;

package/lib/index.js

@@ -27,12 +27,6 @@ Object.defineProperty(exports, "getLogger", {
     return _logger.init_logger;
   }
 });
-Object.defineProperty(exports, "getModel", {
-  enumerable: true,
-  get: function get() {
-    return _calustraRouter.getModel;
-  }
-});
 Object.defineProperty(exports, "miolo", {
   enumerable: true,
   get: function get() {

package/lib/server/index.js

@@ -29,13 +29,11 @@ function miolo(sconfig, render, callback) {
   var config = (0, _config.init_config)(sconfig);
   var emailer = (0, _emailer.init_emailer)(config.mail.options, config.mail.defaults);
   var logger = (0, _logger.init_logger)(config.log, emailer);
-  var db_options = {
-    log: logger
-  };
+  config.db.connection.options.log = logger;
   var app = new _koa.default();
 
   // attach to app calustra's db methods
-  (0, _calustraRouter.useCalustraDbContext)(app, config.database, db_options);
+  (0, _calustraRouter.useCalustraDbContext)(app, config.db);
 
   // attach to app some custom miolo methods
   app.context.miolo = {
@@ -91,7 +89,7 @@ function miolo(sconfig, render, callback) {
 
   // Routes to /crud
   if (config !== null && config !== void 0 && config.routes) {
-    (0, _calustraRouter.useCalustraRouter)(app, config.database, _objectSpread(_objectSpread({}, db_options), config.routes));
+    (0, _calustraRouter.useCalustraRouter)(app, config.db, config.routes);
   }
   // Socket.io
   // const io= init_socket(logger)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.48",
+  "version": "0.0.49",
   "description": "miolo",
   "main": "lib/index.js",
   "author": "Afialapis <info@afialapis.com>",
@@ -14,7 +14,7 @@
     "assign-deep": "^1.0.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "basic-auth": "^2.0.1",
-    "calustra-router": "0.1.5",
+    "calustra-router": "0.2.1",
     "cron": "^1.8.2",
     "diskspace": "^2.0.0",
     "eslint": "^8.9.0",

package/src/config/defaults.js

@@ -46,19 +46,27 @@ module.exports= {
       sameSite: process.env.NODE_ENV != 'development' ? null : 'strict', 
     }
   },
-  database: {
-    dialect:  'postgres',
-    host:     'localhost',
-    port:     5432,
-    database: 'miolo',
-    user:     'postgres',
-    password: 'postgres',
-    max:      5,          // Maximum number of connection in pool
-    min:      0,          // Minimum number of connection in pool
-    idleTimeoutMillis: 10000,  // The maximum time, in milliseconds, that a connection can be idle before being released. Use with combination of evict for proper working, for more details read https://github.com/coopernurse/node-pool/issues/178#issuecomment-327110870,
+  db: {
+    connection: {
+      database: {
+        dialect:  'postgres',
+        host:     'localhost',
+        port:     5432,
+        database: 'miolo',
+        user:     'postgres',
+        password: 'postgres',
+        max:      5,          // Maximum number of connection in pool
+        min:      0,          // Minimum number of connection in pool
+        idleTimeoutMillis: 10000,  // The maximum time, in milliseconds, that a connection can be idle before being released. Use with combination of evict for proper working, for more details read https://github.com/coopernurse/node-pool/issues/178#issuecomment-327110870,
+      },
+      options: {
+        log: 'silly' //  will be updated on the fly with miolo logger
+      }
+    },
+    tables: []
   },
   routes: {
-    body_field: undefined,
+    bodyField: undefined,
   
     getUserId: (ctx) => {
       try {

package/src/index.js

@@ -2,13 +2,12 @@ import {miolo} from './server'
 import { init_emailer as getEmailer} from './emailer'
 import { init_cacher as getCacher} from './cacher'
 import { init_logger as getLogger } from './logger'
-import { getConnection, getModel } from 'calustra-router'
+import { getConnection } from 'calustra-router'
 
 export {
   miolo,
   getEmailer,
   getCacher,
   getLogger,
-  getConnection,
-  getModel
+  getConnection
 }

package/src/server/index.js

@@ -20,19 +20,20 @@ import { init_route_catch_js_error} from './routes/catch_js_error'
 import { init_route_html_render} from './routes/html_render'
 
 function miolo(sconfig, render, callback) {
+
   
   // Init some pieces
   const config = init_config(sconfig)
   const emailer = init_emailer(config.mail.options, config.mail.defaults)
   const logger = init_logger(config.log, emailer)
 
-  const db_options= {log: logger}
-
+  config.db.connection.options.log= logger
+  
   const app = new Koa()
 
 
   // attach to app calustra's db methods
-  useCalustraDbContext(app, config.database, db_options)
+  useCalustraDbContext(app, config.db)
 
   // attach to app some custom miolo methods
   app.context.miolo = {
@@ -84,10 +85,7 @@ function miolo(sconfig, render, callback) {
 
   // Routes to /crud
   if (config?.routes) {
-    useCalustraRouter(app, config.database, {
-      ...db_options,
-      ...config.routes
-    })
+    useCalustraRouter(app, config.db, config.routes)
 
   }
   // Socket.io