Upgrade support to Sequelize v6 (#41)

Author: EyePulp

README.md

@@ -16,7 +16,7 @@ Thanks in advance ❤️
 
 ## Compatibility
 
-Compatible with hapi.js version `19.x` and sequelize `5.x`.
+Compatible with hapi.js version `19.x` and sequelize `6.x`.
 
 Check the [releases page](https://github.com/valtlfelipe/hapi-sequelizejs/releases) for the changelog.
 

lib/index.js

@@ -58,7 +58,7 @@ async function configure(options) {
     let db = null;
     if (options.models) {
         const files = await Models.getFiles(options.models, options.ignoredModels);
-        let models = await Models.load(files, options.sequelize.import.bind(options.sequelize));
+        let models = await Models.load(files, options.sequelize);
         models = await Models.applyRelations(models);
 
         if (options.sync) {

lib/models.js

@@ -28,7 +28,7 @@ async function getFiles(paths, ignored) {
     }, []);
 }
 
-async function load(files, fn) {
+async function load(files, sequelize) {
     if (!files) {
         return [];
     }
@@ -40,7 +40,7 @@ async function load(files, fn) {
     return files.reduce((acc, file) => {
         const models = {};
         const filepath = Path.isAbsolute(file) ? file : Path.join(process.cwd(), file);
-        const Model = fn(filepath);
+        const Model = require(filepath)(sequelize, sequelize.Sequelize.DataTypes);
         models[Model.name] = Model;
         return Object.assign({}, acc, models);
     }, {});

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "hapi-sequelizejs",
-    "version": "4.1.0",
+    "version": "4.1.1",
     "description": "hapi.js plugin for the Sequelize ORM",
     "main": "lib/index.js",
     "files": [
@@ -50,15 +50,15 @@
     "license": "MIT",
     "devDependencies": {
         "@hapi/code": "^8.0.1",
+        "@hapi/hapi": "^19.1.1",
+        "@hapi/lab": "^22.0.4",
         "coveralls": "^3.1.0",
         "eslint": "^7.1.0",
-        "@hapi/hapi": "^19.1.1",
         "husky": "^4.2.5",
-        "@hapi/lab": "^22.0.4",
         "lint-staged": "^10.2.8",
         "mysql2": "^2.1.0",
         "prettier": "^2.0.5",
-        "sequelize": "^5.21.5",
+        "sequelize": "^6.1.0",
         "sqlite3": "^4.2.0"
     },
     "peerDependencies": {
@@ -70,9 +70,9 @@
         "npm": ">=5.6.0"
     },
     "dependencies": {
-        "glob": "7.1.6",
         "@hapi/hoek": "9.0.4",
-        "@hapi/joi": "17.1.1"
+        "@hapi/joi": "17.1.1",
+        "glob": "7.1.6"
     },
     "funding": {
         "type": "individual",

package.json

@@ -1,4 +1,4 @@
-// return Category model as a function to sequelize.import()
+// return Category model as a function
 
 module.exports = function (sequelize, DataTypes) {
     const Category = sequelize.define('Category', {

test/models/shop/product/category.js

@@ -1,4 +1,4 @@
-// return Product model as a function to sequelize.import()
+// return Product model as a function
 
 module.exports = function (sequelize, DataTypes) {
     const Product = sequelize.define('Product', {

test/models/shop/product/product.js

@@ -1,4 +1,4 @@
-// return User model as a function to sequelize.import()
+// return User model as a function
 
 module.exports = function (sequelize, DataTypes) {
     return sequelize.define('User', {