nails-boilerplate 0.9.0 → 0.10.3

package/lib/mongoose_connector.js

@@ -1,13 +1,13 @@
 const mongoose = require('mongoose');
 const mongooseOptions = {useNewUrlParser: true};
 
-module.exports.connect = function(options) {
-  if (options.uri) mongoose.connect(options.uri, mongooseOptions);
+module.exports.connect = async function(options) {
+  if (options.uri) return mongoose.connect(options.uri, mongooseOptions);
   else {
     var url = options.url || 'mongodb://localhost';
     var port = options.port || '27017';
     var database = options.database || 'nails';
-    mongoose.connect(`${url}:${port}/${database}`, mongooseOptions);
+    return mongoose.connect(`${url}:${port}/${database}`, mongooseOptions);
   }
 }
 

package/lib/nails.js

@@ -24,7 +24,7 @@ module.exports = nails;
 
 function nails(app_config) {
   nails.config = app_config.config;
-  configure(app_config);
+  application._onceConfigured = configure(app_config);
   return {startServer: startServer};
 }
 
@@ -33,7 +33,7 @@ nails.Controller = Controller;
 nails.Model = ModelV2;
 nails.ModelDeprecated = Model;
 
-function configure( app_config ) {
+async function configure( app_config ) {
   express_app.set('nails_config', application);
   application.config = app_config.config;
   // TODO: may not need mimes any more.
@@ -66,8 +66,8 @@ function configure( app_config ) {
   }
   // TODO: make this Model style mandatory
   if (DBConnector.connect && DBConnector.generateModelSuperclass) {
-    DBConnector.connect(app_config.db);
-    ModelV2.setConnector(DBConnector);
+    await DBConnector.connect(app_config.db);
+    await ModelV2.setConnector(DBConnector);
   }
 
   // init Controllers
@@ -80,15 +80,16 @@ function configure( app_config ) {
 function startServer(config) {
     // Log the config.
     console.log(config);
-
-    // TODO: Use logging middleware.
-
-    // Use the router middleware.
-    express_app.use(application.router.express_router);
-    var ip = application.config.IP || 'localhost';
-    var port = application.config.PORT || 3000;
-    console.log("starting nails. listening to ", ip + ':' + port);
-    express_app.listen(port, ip);
+    application._onceConfigured.then(() => {
+      // TODO: Use logging middleware.
+
+      // Use the router middleware.
+      express_app.use(application.router.express_router);
+      var ip = application.config.IP || 'localhost';
+      var port = application.config.PORT || 3000;
+      console.log("starting nails. listening to ", ip + ':' + port);
+      express_app.listen(port, ip);
+    });
 }
 
 // TODO: create an initializer lib file.
@@ -98,12 +99,12 @@ function init_controllers(controller_lib) {
 function init_models(model_lib) {
     init_app_lib(Model, model_lib);
 }
-function init_app_lib(superclass, abs_path) {
+async function init_app_lib(superclass, abs_path) {
     console.log('attempting to import:', abs_path);
     if (!fs.existsSync(abs_path))
       return console.log('Cannot initialize. Path not found.', abs_path);
     if (fs.statSync(abs_path).isFile()) {
-      let subclass = require(abs_path);
+      let subclass = (await import(abs_path)).default;
       // Constructor function was provided
       if (!superclass.isPrototypeOf(subclass))
           return superclass.extend(subclass);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nails-boilerplate",
-  "version": "0.9.0",
+  "version": "0.10.3",
   "description": "A node.js webserver scaffold",
   "main": "index.js",
   "bin": {
@@ -30,8 +30,8 @@
     "express-react-views": "*",
     "express-ws": "*",
     "mime": "*",
-    "mongodb": "^3.5.7",
-    "mongoose": "*",
+    "mongodb": "^4.3.1",
+    "mongoose": "^6.1.8",
     "react": "*",
     "react-dom": "^16.13.1",
     "wrench": "*"

package/spec/services/integration/app/controllers/mjs_controller.mjs

@@ -0,0 +1,13 @@
+/*
+const Controller =
+    require("../../../../../index.js").Controller;
+    */
+import nails from "../../../../../index.js";
+export default class MjsController extends nails.Controller {
+  // DO NOT OVERRIDE CONSTRUCTOR
+  index(params, request, response) {
+    response.json({
+      classbased_index: true
+    });
+  }
+}