feat: improve database.sync()

packages/database/src/__tests__/tables.test.ts

@@ -2,6 +2,7 @@ import { getDatabase } from './';
 import Database from '../database';
 import Table from '../table';
 import Model from '../model';
+import path from 'path';
 
 let db: Database;
 
@@ -243,6 +244,24 @@ describe('tables', () => {
     });
   });
 
+  describe.only('#import()', () => {
+    it('import tables', () => {
+      const tables = db.import({
+        directory: path.resolve(__dirname, './tables'),
+      });
+      expect([...tables.keys()]).toEqual(['demos', 'examples', 'tests']);
+      expect(db.getTable('demos').getOptions()).toEqual({
+        name: 'demos', actions: [ { name: 'create' }, { name: 'list' } ]
+      });
+      expect(db.getTable('examples').getOptions()).toEqual({
+        name: 'examples', actions: [ { name: 'create' } ]
+      });
+      expect(db.getTable('tests').getOptions()).toEqual({
+        name: 'tests', actions: [ { name: 'list' } ]
+      });
+    });
+  });
+
   describe('associations', () => {
     beforeAll(() => {
     });

packages/database/src/__tests__/tables/demos.ts

@@ -0,0 +1,8 @@
+export default {
+  name: 'demos',
+  actions: [
+    {
+      name: 'create',
+    },
+  ],
+};

packages/database/src/__tests__/tables/examples.json

@@ -0,0 +1,8 @@
+{
+  "name": "examples",
+  "actions": [
+    {
+      "name": "create"
+    }
+  ]
+}

packages/database/src/__tests__/tables/extends.ts

@@ -0,0 +1,12 @@
+import { extend } from "../../database";
+
+export default extend({
+  name: 'demos',
+  actions: [
+    {
+      name: 'list',
+    },
+  ],
+}, {
+  arrayMerge: (t, s) => t.concat(s),
+});

packages/database/src/__tests__/tables/tests.js

@@ -0,0 +1,8 @@
+module.exports = {
+  name: 'tests',
+  actions: [
+    {
+      name: 'create',
+    },
+  ],
+};

packages/database/src/__tests__/tables/tests2.ts

@@ -0,0 +1,8 @@
+export default {
+  name: 'tests',
+  actions: [
+    {
+      name: 'list',
+    },
+  ],
+};

packages/database/src/database.ts

@@ -35,6 +35,19 @@ export interface DatabaseOptions extends Options {
 
 export type HookType = 'beforeTableInit' | 'afterTableInit' | 'beforeAddField' | 'afterAddField';
 
+export class Extend {
+  tableOptions: TableOptions;
+  mergeOptions: MergeOptions
+  constructor(tableOptions: TableOptions, mergeOptions?: MergeOptions) {
+    this.tableOptions = tableOptions;
+    this.mergeOptions = mergeOptions;
+  }
+}
+
+export function extend(tableOptions: TableOptions, mergeOptions: MergeOptions = {}) {
+  return new Extend(tableOptions, mergeOptions);
+}
+
 export default class Database {
 
   public readonly sequelize: Sequelize;
@@ -80,7 +93,13 @@ export default class Database {
     const tables = new Map<string, Table>();
     files.forEach((file: string) => {
       const result = requireModule(file);
-      this.extend(typeof result === 'function' ? result(this) : result);
+      if (result instanceof Extend) {
+        const table = this.extend(result.tableOptions, result.mergeOptions);
+        tables.set(table.getName(), table);
+      } else {
+        const table = this.extend(typeof result === 'function' ? result(this) : result);
+        tables.set(table.getName(), table);
+      }
     });
     return tables;
   }