refactor: gather

packages/core/package.json

@@ -22,6 +22,7 @@
     "test.js.map"
   ],
   "dependencies": {
+    "@latus/core": "^2.0.0",
     "debug": "4.3.1",
     "glob": "^7.1.6",
     "natsort": "^2.0.2",

packages/core/src/models/decorators/user.js

@@ -1,4 +1,4 @@
-export default (User) => class ProjectUser extends User {
+export default (latus, User) => class ProjectUser extends User {
 
   async projectsStructure() {
     return (await this.getProjects())

packages/core/src/models/project.js

@@ -6,7 +6,7 @@ import glob from 'glob';
 
 import {pathsToTree} from '../tree-utils';
 
-class Project extends Model {
+export default () => class Project extends Model {
 
   static get attributes() {
     return {
@@ -31,6 +31,4 @@ class Project extends Model {
     return pathsToTree(paths);
   }
 
-}
+};
-
-export default Project;

packages/core/src/server/index.js

@@ -1,14 +1,12 @@
-import Project from '../models/project';
+import {decorateWithLatus, gatherWithLatus} from '@latus/core';
-import ProjectUser from '../models/project-user';
 
 export default {
   hooks: {
-    '@latus/db/server/models': () => ({
+    '@latus/db/server/models': gatherWithLatus(
-      Project,
+      require.context('../models', false, /\.js$/),
-    }),
+    ),
-    '@latus/db/server/models.decorate': (Models) => ({
+    '@latus/db/server/models.decorate': decorateWithLatus(
-      ...Models,
+      require.context('../models/decorators', false, /\.js$/),
-      User: ProjectUser(Models.User),
+    ),
-    }),
   },
 };

packages/core/yarn.lock

@@ -901,7 +901,7 @@
     object-assign "^4.1.1"
     scheduler "^0.20.1"
 
-"@latus/core@2.0.0":
+"@latus/core@2.0.0", "@latus/core@^2.0.0":
   version "2.0.0"
   resolved "http://npm.cha0sdev/@latus%2fcore/-/core-2.0.0.tgz#2ca04903351edc14f29fcec2ad6ab5e19c72e072"
   integrity sha512-Sq4nPpQzRektLgsXRFQqhZWpUWY1bFTrVbm5X0vGTyTTlfQPmMbHyddmtdVTB8NbANvleuw4PvfuNVqKU4le6w==