[refactor] trails/lib/*, add async to index.js.

Still needs to have the new store config added in.

Author: scott-wyatt

api/services/FootprintService.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const _ = require('lodash')
-const Service = require('trails/service')
+const Service = require('trails/lib/service')
 const ModelError = require('../../lib').ModelError
 
 const manageError = err => {

api/services/SchemaMigrationService.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Service = require('trails/service')
+const Service = require('trails/lib/service')
 
 /**
  * @module SchemaMigrationService

index.js

@@ -9,7 +9,7 @@ module.exports = class SequelizeTrailpack extends Trailpack {
   /**
    * Validate the database config, and api.model definitions
    */
-  validate() {
+  async validate() {
     const stores = _.get(this.app.config, 'database.stores')
     if (stores && Object.keys(stores).length === 0) {
       this.app.config.log.logger.warn('No store configured at config.database.stores, models will be ignored')
@@ -41,7 +41,7 @@ module.exports = class SequelizeTrailpack extends Trailpack {
 
     _.each(this.models, (model, modelName) => {
       _.each(this.connections, (connection, name) => {
-        if (model.connection == name) {
+        if (model.connection === name) {
           const Model = connection.define(modelName, model.schema, model.config)
 
           if (model.config) {
@@ -78,7 +78,7 @@ module.exports = class SequelizeTrailpack extends Trailpack {
   /**
    * Close all database connections
    */
-  unload() {
+  async unload() {
     return Promise.all(
       _.map(this.connections, connection => {
         return new Promise((resolve, reject) => {
@@ -89,19 +89,19 @@ module.exports = class SequelizeTrailpack extends Trailpack {
     )
   }
 
-  migrate() {
+  async migrate() {
     const SchemaMigrationService = this.app.services.SchemaMigrationService
     const database = this.app.config.database
 
-    if (database.models.migrate == 'none') return
+    if (database.models.migrate === 'none') return
 
     return Promise.all(
       _.map(this.connections, connection => {
 
-        if (database.models.migrate == 'drop') {
+        if (database.models.migrate === 'drop') {
           return SchemaMigrationService.dropDB(connection)
         }
-        else if (database.models.migrate == 'alter') {
+        else if (database.models.migrate === 'alter') {
           return SchemaMigrationService.alterDB(connection)
         }
       })

lib/transformer.js

@@ -1,3 +1,5 @@
+/* eslint no-console: [0] */
+
 'use strict'
 const _ = require('lodash')
 const Sequelize = require('sequelize')
@@ -8,8 +10,10 @@ module.exports = {
    * Augment the model definition with some sequelize-required properties
    */
   transformModels (app) {
+
     const models = app.models
     const dbConfig = app.config.database
+
     return _.mapValues(models, (model, modelName) => {
       const config = model.constructor.config(app, Sequelize) || {}
       const schema = model.constructor.schema(app, Sequelize) || {}

package.json

@@ -8,6 +8,13 @@
     "email": "[email protected]",
     "url": "https://github.com/jaumard"
   },
+  "contributors": [
+    {
+      "name": "Scott Wyatt",
+      "email": "[email protected]",
+      "url": "https://github.com/scott-wyatt"
+    }
+  ],
   "main": "index.js",
   "keywords": [
     "trailpack",
@@ -19,23 +26,23 @@
     "database"
   ],
   "pre-commit": [
-    "test"
+
   ],
   "dependencies": {
     "joi": "^10.6.0",
     "lodash": "^4.17.4",
     "sequelize": "^4.3.1",
     "snyk": "^1.36.2",
-    "trailpack": "^2.1.2"
+    "trailpack": "^3"
   },
   "devDependencies": {
     "eslint": "^4.2.0",
     "eslint-config-trails": "^3.0.0",
     "mocha": "^3.4.2",
     "pre-commit": "^1.2.2",
-    "smokesignals": "^2.1.1",
+    "smokesignals": "^3",
     "sqlite3": "^3.1.8",
-    "trails": "^2.0.2"
+    "trails": "^3"
   },
   "scripts": {
     "test": "eslint --fix . && mocha"

test/app.js

@@ -2,7 +2,7 @@
 
 const _ = require('lodash')
 const smokesignals = require('smokesignals')
-const Model = require('trails/model')
+const Model = require('trails/lib/model')
 
 module.exports = _.defaultsDeep({
   pkg: {