Merge pull request #35 from fabrix-app/v1.6

[feat] better plugs, model options and schema accessors

lib/SequelizeResolver.ts

@@ -4,6 +4,8 @@ import { Transformer } from './transformer'
 
 export class SequelizeResolver extends FabrixResolver {
   private _connection
+  private _options
+  private _schema
   private _sequelize
   private _sequelizeModel
 
@@ -35,6 +37,20 @@ export class SequelizeResolver extends FabrixResolver {
     return this._sequelize
   }
 
+  /**
+   * Get options provided to the model when connected
+   */
+  get options() {
+    return this._options
+  }
+
+  /**
+   * Get schema provided to the model when connected
+   */
+  get schame() {
+    return this._schema
+  }
+
   get datastore() {
     return this._sequelize
   }
@@ -44,6 +60,8 @@ export class SequelizeResolver extends FabrixResolver {
   }
 
   public connect(modelName, schema, options) {
+    this._options = options
+
     // Define the Sequelize Connection on the provided connection
     this._sequelizeModel = this._connection.define(modelName, schema, options)
 
@@ -248,7 +266,17 @@ export class SequelizeResolver extends FabrixResolver {
    */
   findById(id, options = { }) {
     if (this._sequelizeModel) {
-      return this._sequelizeModel.findById(id, options)
+      this.app.log.info('findById is deprecated, use findByPk instead')
+      return this._sequelizeModel.findByPk(id, options)
+    }
+  }
+
+  /**
+   *
+   */
+  findByPk(id, options = { }) {
+    if (this._sequelizeModel) {
+      return this._sequelizeModel.findByPk(id, options)
     }
   }
 

lib/schemas.ts

@@ -2,9 +2,15 @@
 const joi = require('joi')
 
 export const Schemas = {
-  storesConfig: joi.object(),
-  modelsConfig: joi.object(),
-  pluginsConfig: joi.object(),
+  storesConfig: joi.object().keys({
+
+  }).unknown(),
+  modelsConfig: joi.object().keys({
+
+  }).unknown(),
+  pluginsConfig: joi.object().keys({
+
+  }).unknown(),
 
   models: joi.object().keys({
     autoPK: joi.boolean(),

lib/transformer.ts

@@ -233,9 +233,17 @@ export const Transformer = {
     const Seq = Sequelize
 
     // Add plugins
-    plugs.forEach(plug => {
+    plugs.forEach((plug: any) => {
       try {
-        plug(Seq)
+        if (typeof plug === 'function') {
+          plug(Seq)
+        }
+        else if (typeof plug === 'object' && plug.func && plug.config) {
+          plug.func(Seq, plug.config)
+        }
+        else {
+          app.log.debug(`Transformer: ${plug} was not a function or Fabrix sequelize object`)
+        }
       }
       catch (err) {
         app.log.error(err)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/spool-sequelize",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "Spool - Datastore Spool for Sequelize.js http://sequelizejs.com",
   "scripts": {
     "build": "tsc -p ./lib/tsconfig.release.json",

test/fixtures/app.js

@@ -224,7 +224,11 @@ const App = {
         host: '127.0.0.1',
         dialect: 'postgres',
         plugins: {
-          test_local: require('./testPlugin')
+          test_local: require('./testPlugin'),
+          test_local_config: {
+            func: require('./testPlugin2'),
+            config: {}
+          }
         }
       },
       storeoverride: {

test/fixtures/testPlugin2.js

@@ -0,0 +1,8 @@
+module.exports = function(Sequelize, config) {
+  if (!Sequelize) {
+    Sequelize = require('sequelize')
+  }
+
+  // return Sequelize
+  return Sequelize
+}