Merge pull request #8 from BoolJS/develop

Version bump

Author: pandres95

index.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const Sequelize = require('sequelize');
-const EmptyModel = require('./model');
+const MySQLModel = require('./model');
+const { Schema } = MySQLModel;
 
 const { DatabaseLoader } = require('@booljs/api');
 const { readFileSync } = require('fs');
@@ -54,16 +55,42 @@ module.exports = class BoolJSMySQL extends DatabaseLoader {
         const args = [ null, app, { connection, Sequelize, models } ];
 
         const SchemaClass = Function.prototype.bind.apply(Component, args);
-        const schemaInstance = new SchemaClass();
-        const schema = schemaInstance.__schema;
 
+        const {
+            [Schema]: schema,
+            ...instanceProps
+        } = new SchemaClass();
+
+        Object.assign(schema.prototype, instanceProps);
         models[name] = schema;
 
         if (Component.associations !== undefined &&
             typeof Component.associations === 'function') {
             this.__associations.push(Component.associations);
         }
 
+        const readOnly = [ 'constructor', 'name', 'length', 'prototype' ];
+
+        const staticsKeys = Object
+            .getOwnPropertyNames(Component)
+            .filter(key => Component[key] !== Component.associations &&
+                !readOnly.includes(key));
+
+        for (let key of staticsKeys) {
+            schema[key] = Component[key].apply(schema);
+        }
+
+        const methodsKeys = Object
+            .getOwnPropertyNames(Component.prototype)
+            .filter(key => typeof Component.prototype[key] === 'function' &&
+                !readOnly.includes(key));
+
+        for (let key of methodsKeys) {
+            schema.prototype[key] = function (...args) {
+                return Component.prototype[key].apply(this, args);
+            };
+        }
+
         return schema;
     }
 
@@ -74,7 +101,7 @@ module.exports = class BoolJSMySQL extends DatabaseLoader {
     }
 
     modelClass () {
-        return EmptyModel;
+        return MySQLModel;
     }
 
     modelTemplate () {

model.js

@@ -2,9 +2,15 @@
 
 const { DatabaseModel } = require('@booljs/api');
 
+const Schema = Symbol('schema');
+
 module.exports = class SequelizeModel extends DatabaseModel {
+    static get Schema () {
+        return Schema;
+    }
+
     constructor (schema) {
         super();
-        this.__schema = schema;
+        this[Schema] = schema;
     }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@booljs/sequelize",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Sequelize driver for BoolJS",
   "main": "index.js",
   "license": "GPL-3.0",