@kipicore/dbcore 1.1.33 → 1.1.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -27,21 +27,19 @@ const sequelize = new sequelize_1.Sequelize(database, username, password, {
27
27
  dialectOptions,
28
28
  });
29
29
  exports.sequelize = sequelize;
30
- // add all models
31
30
  // Load models
32
31
  fs_1.default.readdirSync(__dirname)
33
32
  .filter(file => file.indexOf('.') !== 0 && (file !== 'index') && file.slice(-3) === '.js')
34
33
  .forEach(file => {
35
- const modelDefiner = require(path_1.default.join(__dirname, file));
36
- const model = modelDefiner.default ? modelDefiner.default(sequelize) : modelDefiner(sequelize);
37
- db[model.name] = model;
34
+ const modelDefiner = require(path_1.default.join(__dirname, file)).default;
35
+ db[modelDefiner.name] = modelDefiner;
38
36
  });
39
- // Run associate
37
+ // Run associate and hooks
40
38
  Object.keys(db).forEach(modelName => {
41
- if (db[modelName].associate && typeof db[modelName].associate === 'function') {
39
+ if (typeof db[modelName].associate === 'function') {
42
40
  db[modelName].associate(db);
43
41
  }
44
- if (db[modelName].addHooks && typeof db[modelName].addHooks === 'function') {
42
+ if (typeof db[modelName].addHooks === 'function') {
45
43
  db[modelName].addHooks(db);
46
44
  }
47
45
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kipicore/dbcore",
3
- "version": "1.1.33",
3
+ "version": "1.1.35",
4
4
  "description": "Reusable DB core package with Postgres, MongoDB, models, services, interfaces, and types",
5
5
  "types": "dist/index.d.ts",
6
6
  "main": "dist/index.js",