nails-boilerplate 2.0.3 → 2.0.5

package/lib/nails.js

@@ -1,19 +1,11 @@
 // The file which configures the nails application
-import http from 'node:http';
+// import http from 'node:http';
 import https from 'node:https';
-import URL from 'node:url';
+// import URL from 'node:url';
 import path from 'node:path';
 import fs from 'node:fs';
 import { EventEmitter } from 'node:events';
 
-// const http = require('http');
-// const https = require('https');
-// const URL = require('url');
-// const path = require('path');
-// const fs = require('fs');
-// const EventEmitter = require('events').EventEmitter;
-
-
 import Controller from './controller.js';
 import ModelV2 from './model_v2.js';
 import Router from './router.js';
@@ -40,6 +32,7 @@ nails.Controller = Controller;
 nails.Model = ModelV2;
 nails.events = new EventEmitter();
 nails._dbConnector = null;
+nails.MODELS = {};
 
 async function configure( app_config ) {
   express_app.set('nails_config', application);
@@ -67,6 +60,18 @@ async function configure( app_config ) {
   application.router = new Router( [] );
   console.log("Application Router initialized");
 
+  // init models
+  await initializeModels(app_config);
+
+  // init Controllers
+  Controller.setRouter(application.router);
+  application.controller = Controller.extend(ApplicationController);
+  console.log('initializing controllers: ', app_config.config.CONTROLLERS_ROOT);
+  await init_controllers(app_config.config.CONTROLLERS_ROOT);
+  application.router.addRoutes(app_config.routes);
+};
+
+export async function initializeModels( app_config ) {
   // init models
   console.log("Initializing DB connection...");
   var DBConnector = await get_dbconnector(app_config.db.connector);
@@ -79,17 +84,10 @@ async function configure( app_config ) {
   console.log("Generating model superclass...");
   ModelV2.setConnector(dbConnector);
   await init_models_v2(app_config.config.MODELS_ROOT);
-  console.log("Done importing models")
+  console.log("Done importing models");
   await dbConnector.afterInitialization();
   console.log("DB Connection complete");
-
-  // init Controllers
-  Controller.setRouter(application.router);
-  application.controller = Controller.extend(ApplicationController);
-  console.log('initializing controllers: ', app_config.config.CONTROLLERS_ROOT);
-  await init_controllers(app_config.config.CONTROLLERS_ROOT);
-  application.router.addRoutes(app_config.routes);
-};
+}
 
 function startServer(config) {
     // Log the config.
@@ -137,9 +135,7 @@ function startServer(config) {
 async function init_controllers(controller_lib) {
   await init_app_lib(Controller, controller_lib);
 }
-// async function init_models(model_lib) {
-//   await init_app_lib(Model, model_lib);
-// }
+
 async function init_app_lib(superclass, abs_path) {
     console.log('attempting to import:', abs_path);
     if (!fs.existsSync(abs_path))
@@ -169,12 +165,11 @@ async function init_models_v2(abs_path) {
     // We just need to import each model once so the generateSuperclass
     // method is called at least once for each model.
     let modelClass = (await import(abs_path)).default;
-    if (modelClass && modelClass.name) console.log('imported model:', modelClass.name);
+    if (modelClass && modelClass.name) {
+      console.log('imported model:', modelClass.name);
+      nails.MODELS[modelClass.name] = modelClass;
+    }
     else console.warn("No model found at:", abs_path);
-    // // Constructor function was provided
-    // if (!superclass.isPrototypeOf(subclass))
-    //     return superclass.extend(subclass);
-    // ES6 Class was provided
     return;
   }
   const directory_contents = fs.readdirSync(abs_path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nails-boilerplate",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "A node.js webserver scaffold",
   "type": "module",
   "main": "index.js",

package/spec/sequelize_connector.spec.js

@@ -34,5 +34,6 @@ describe('ModelV2 using SequelizeConnector', function() {
     const models = await TestSequelizeModel.findAll();
     assert(models.length == 1, "Should have one model");
     assert(models[0].name == MODEL_NAME, "Name should be consistent");
+    assert(models[0] instanceof TestSequelizeModel);
   });
 });

package/spec/services/integration_sequelize/config/service.js

@@ -25,7 +25,7 @@ var config = {
 
   ENABLE_HTTP: true,
   //IP: "0.0.0.0",
-  PORT: 3333,
+  PORT: 4444,
 
   ASYNC: false,
 

package/spec/services.integration.spec.js

@@ -15,7 +15,7 @@ let mongod = null;
 chai.use(chaiHttp);
 chai.should();
 
-describe("Integration", function () {
+describe("Integration: Sequelize", function () {
   before(async function () {
     // this.timeout(30000);
     try {
@@ -26,17 +26,6 @@ describe("Integration", function () {
     }
     console.log("got here");
     express_app = nails.application;
-    return new Promise((resolve, reject) => {
-      nails.events.on("ready", () => {
-        console.log("ready was emitted!");
-        resolve();
-      });
-    });
-    // })
-    // MongoMemoryServer.create({instance: service_config.db}).then((mongodb) => {
-    //   mongod = mongodb;
-
-    // });
   });
   describe("GET /", function () {
     it('should return the expected JSON from index', function (done) {

package/spec/services.integration_sequelize.spec.js

@@ -7,8 +7,6 @@ import WebSocket from 'ws';
 // const WebSocket = require('ws');
 
 var express_app;
-// const {MongoMemoryServer} = require('mongodb-memory-server');
-let mongod = null;
 
 // Configure chai
 chai.use(chaiHttp);
@@ -24,18 +22,13 @@ describe("Integration", function () {
     }
     console.log("got here");
     express_app = nails.application;
-    return new Promise((resolve, reject) => {
-      nails.events.on("ready", () => {
-        console.log("ready was emitted!");
-        resolve();
-      });
-    });
   });
   describe("GET /", function () {
     it('should return the expected JSON from index', function (done) {
       request.execute(express_app)
         .get('/')
         .end((err, res) => {
+          if (err) console.error(err);
           res.should.have.status(200);
           assert(res.text == JSON.stringify({ home_index: true }));
           done();