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

[feat] parent proto extension

lib/SequelizeResolver.ts

@@ -180,6 +180,15 @@ export class SequelizeResolver extends FabrixResolver {
     }
   }
 
+  /**
+   *
+   */
+  bulkUpdate(values: any, records: any, options = {}) {
+    if (this._sequelizeModel) {
+      return this._sequelizeModel.bulkUpdate(values, records, options)
+    }
+  }
+
   /**
    *
    */

lib/transformer.ts

@@ -158,10 +158,12 @@ export const Transformer = {
   },
 
   /**
-   * Get the prototypes of a model
+   * Get the prototypes of a model and it's parent
    */
   getModelPrototypes: (model) => {
-    return Object.getPrototypeOf(model)
+    const sup = model.__proto__ ? Object.getPrototypeOf(model.__proto__) : {}
+    const props = Object.getPrototypeOf(model)
+    return {...sup, ...props}
   },
 
   /**

package.json

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

test/fixtures/app.js

@@ -5,6 +5,8 @@ const smokesignals = require('smokesignals')
 const testModel = require('./testmodel')
 const testModel2 = require('./testmodel2')
 const testModel3 = require('./testmodel3')
+const testModelExtend = require('./testmodelExtend')
+const testModelExtend2 = require('./testmodelExtend2')
 
 const SequelizeResolver = require('../../dist/index').SequelizeResolver
 
@@ -200,7 +202,9 @@ const App = {
       },
       testModel,
       testModel2,
-      testModel3
+      testModel3,
+      testModelExtend,
+      testModelExtend2
     }
   },
   config: {

test/fixtures/testmodelExtend.js

@@ -0,0 +1,35 @@
+const Model = require('@fabrix/fabrix/dist/common').FabrixModel
+const SequelizeResolver = require('../../dist/index').SequelizeResolver
+
+const TestResolver = class TestResolver extends SequelizeResolver {
+
+}
+
+module.exports = TestExtend = class TestExtend extends Model {
+  static config(app, Sequelize) {
+    return {
+      options: {}
+    }
+  }
+
+  static schema(app, Sequelize) {
+    return {
+      name: {type: Sequelize.STRING, allowNull: false}
+    }
+  }
+
+  static get resolver () {
+    return TestResolver
+  }
+
+  classLevelMethod() {
+    return 'foo'
+  }
+}
+
+TestExtend.prototype.instanceLevelMethod = function() {
+  return 'bar'
+}
+TestExtend.prototype.superLevelMethod = function() {
+  return 'baf'
+}

test/fixtures/testmodelExtend2.js

@@ -0,0 +1,32 @@
+const TestExtend = require('./testmodelExtend')
+const SequelizeResolver = require('../../dist/index').SequelizeResolver
+
+const TestResolver = class TestResolver extends SequelizeResolver {
+
+}
+
+module.exports = TestExtend2 = class TestExtend2 extends TestExtend {
+  static config(app, Sequelize) {
+    return {
+      options: {}
+    }
+  }
+
+  static schema(app, Sequelize) {
+    return {
+      name: {type: Sequelize.STRING, allowNull: false}
+    }
+  }
+
+  static get resolver () {
+    return TestResolver
+  }
+
+  classLevelMethod() {
+    return 'foo'
+  }
+}
+TestExtend2.prototype.instanceLevelMethod = TestExtend.prototype.instanceLevelMethod
+TestExtend2.prototype.nextInstanceLevelMethod = function() {
+  return 'baz'
+}

test/integrations/spool.test.js

@@ -46,6 +46,17 @@ describe('Spool', () => {
     done()
   })
 
+
+  it('should access an inherited instanceLevelMethod', (done) => {
+    const instance = global.app.models.testModelExtend2.build({name: 'test'})
+    assert.equal(instance.nextInstanceLevelMethod(), 'baz')
+    assert.equal(instance.instanceLevelMethod(), 'bar')
+    assert.equal(instance.superLevelMethod(), 'baf')
+    assert.ok(instance.app)
+    assert.ok(instance.app.config.get('main'))
+    done()
+  })
+
   it('should save an instance', (done) => {
     const instance = global.app.models.testModel.build({name: 'test'})
     instance.save().then(i => {
@@ -133,6 +144,16 @@ describe('Spool', () => {
         done(err)
       })
   })
+  // TODO ENABLE IN Sequelize 5.0
+  it.skip('should bulk create instances', (done) => {
+    const instance = global.app.models.testModel.bulkUpdate({name: 'test'}, { name: 'test' })
+      .then(i => {
+        done()
+      })
+      .catch(err => {
+        done(err)
+      })
+  })
 
   it('should count instances', (done) => {
     const instance = global.app.models.testModel.count({where: {name: 'test'}})