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

feat(models): Select Store by model config

lib/SequelizeSpool.ts

@@ -1,6 +1,6 @@
 import { DatastoreSpool } from '@fabrix/fabrix/dist/common/spools/datastore'
 
-import * as Sequelize from 'sequelize'
+import Sequelize from 'sequelize'
 
 import { Validator } from './validator'
 import { Transformer } from './transformer'

lib/api/services/SequelizeService.ts

@@ -1,6 +1,6 @@
 import { FabrixService as Service } from '@fabrix/fabrix/dist/common'
 import { defaults, omitBy, isArray, isObject, isString, isNil } from 'lodash'
-import * as merge from 'merge-options'
+import merge from 'merge-options'
 
 export class SequelizeService extends Service {
   /**

lib/transformer.ts

@@ -1,5 +1,3 @@
-import * as _ from 'lodash'
-// import * as Sequelize from 'sequelize'
 import { FabrixApp } from '@fabrix/fabrix'
 import { FabrixModel } from '@fabrix/fabrix/dist/common'
 import { pickBy, isString, startsWith } from 'lodash'
@@ -179,9 +177,16 @@ export const Transformer = {
   defineModel: (app: FabrixApp, sequelize, model: FabrixModel, connections) => {
     const modelName = model.constructor.name
     const modelConfig = model.config
-    const store = modelConfig.store || app.config.get('models.defaultStore')
+    const store = modelConfig.store
+      || app.config.get(`models.${modelName}.store`)
+      || app.config.get('models.defaultStore')
+
     const connection = connections[store]
-    const migrate = modelConfig.migrate || app.config.get('models.migrate') || connection.migrate
+    const migrate = modelConfig.migrate
+      || app.config.get(`models.${modelName}.migrate`)
+      || app.config.get('models.migrate')
+      || connection.migrate
+
     const options =  Transformer.getModelOptions(app, sequelize, model)
     const schema = Transformer.getModelSchema(app, sequelize, model)
 

lib/tsconfig.json

@@ -10,6 +10,8 @@
     "declaration": true,
     "strict": false,
     "noImplicitAny": false,
+    "esModuleInterop": true,
+    "sourceMap": true,
     "typeRoots": [
       "node_modules/@types"
     ],

lib/validator.ts

@@ -1,4 +1,4 @@
-import * as joi from 'joi'
+import joi from 'joi'
 import { Schemas } from './schemas'
 
 export const Validator = {