@nocobase/database 0.7.5-alpha.1 → 0.7.6-alpha.2

package/lib/database.js

@@ -285,6 +285,28 @@ class Database extends _events().EventEmitter {
         opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
       }
     });
+    this.on('afterCreate', /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* (instance) {
+        var _instance$toChangedWi;
+
+        instance === null || instance === void 0 ? void 0 : (_instance$toChangedWi = instance.toChangedWithAssociations) === null || _instance$toChangedWi === void 0 ? void 0 : _instance$toChangedWi.call(instance);
+      });
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+    this.on('afterUpdate', /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(function* (instance) {
+        var _instance$toChangedWi2;
+
+        instance === null || instance === void 0 ? void 0 : (_instance$toChangedWi2 = instance.toChangedWithAssociations) === null || _instance$toChangedWi2 === void 0 ? void 0 : _instance$toChangedWi2.call(instance);
+      });
+
+      return function (_x2) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
   }
 
   addMigration(item) {
@@ -552,7 +574,7 @@ class Database extends _events().EventEmitter {
       let count = 1;
 
       const authenticate = /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator(function* () {
+        var _ref3 = _asyncToGenerator(function* () {
           try {
             yield _this5.sequelize.authenticate(others);
             console.log('Connection has been established successfully.');
@@ -570,7 +592,7 @@ class Database extends _events().EventEmitter {
         });
 
         return function authenticate() {
-          return _ref.apply(this, arguments);
+          return _ref3.apply(this, arguments);
         };
       }();
 

package/lib/model.d.ts

@@ -7,6 +7,11 @@ interface IModel {
 export declare class Model<TModelAttributes extends {} = any, TCreationAttributes extends {} = TModelAttributes> extends SequelizeModel<TModelAttributes, TCreationAttributes> implements IModel {
     static database: Database;
     static collection: Collection;
+    protected _changedWithAssociations: Set<unknown>;
+    protected _previousDataValuesWithAssociations: {};
+    toChangedWithAssociations(): void;
+    changedWithAssociations(key?: string, value?: any): boolean | this | unknown[];
+    clearChangedWithAssociations(): void;
     toJSON<T extends TModelAttributes>(): T;
     private hiddenObjKey;
     private sortAssociations;

package/lib/model.js

@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Model = void 0;
 
-function _sequelize() {
-  const data = require("sequelize");
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
 
-  _sequelize = function _sequelize() {
+  _lodash = function _lodash() {
     return data;
   };
 
   return data;
 }
 
-function _lodash() {
-  const data = _interopRequireDefault(require("lodash"));
+function _sequelize() {
+  const data = require("sequelize");
 
-  _lodash = function _lodash() {
+  _sequelize = function _sequelize() {
     return data;
   };
 
@@ -28,6 +28,48 @@ function _lodash() {
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class Model extends _sequelize().Model {
+  constructor(...args) {
+    super(...args);
+    this._changedWithAssociations = new Set();
+    this._previousDataValuesWithAssociations = {};
+  }
+
+  // TODO
+  toChangedWithAssociations() {
+    // @ts-ignore
+    this._changedWithAssociations = new Set([...this._changedWithAssociations, ...this._changed]); // @ts-ignore
+
+    this._previousDataValuesWithAssociations = this._previousDataValues;
+  }
+
+  changedWithAssociations(key, value) {
+    if (key === undefined) {
+      if (this._changedWithAssociations.size > 0) {
+        return Array.from(this._changedWithAssociations);
+      }
+
+      return false;
+    }
+
+    if (value === true) {
+      this._changedWithAssociations.add(key);
+
+      return this;
+    }
+
+    if (value === false) {
+      this._changedWithAssociations.delete(key);
+
+      return this;
+    }
+
+    return this._changedWithAssociations.has(key);
+  }
+
+  clearChangedWithAssociations() {
+    this._changedWithAssociations = new Set();
+  }
+
   toJSON() {
     const handleObj = (obj, options) => {
       const handles = [data => {

package/lib/repository.d.ts

@@ -30,6 +30,7 @@ export declare type Values = any;
 export interface CountOptions extends Omit<SequelizeCreateOptions, 'distinct' | 'where' | 'include'>, Transactionable {
     fields?: Fields;
     filter?: Filter;
+    context?: any;
 }
 export interface FilterByTk {
     filterByTk?: TargetKey;

package/lib/repository.js

@@ -294,6 +294,7 @@ class Repository {
         yield _this5.database.emitAsync(`${_this5.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
           transaction
         }));
+        instance.clearChangedWithAssociations();
       }
 
       return instance;
@@ -390,6 +391,7 @@ class Repository {
             yield _this7.database.emitAsync(`${_this7.collection.name}.afterSaveWithAssociations`, instance, _objectSpread(_objectSpread({}, options), {}, {
               transaction
             }));
+            instance.clearChangedWithAssociations();
           }
         } catch (err) {
           _iterator3.e(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/database",
-  "version": "0.7.5-alpha.1",
+  "version": "0.7.6-alpha.2",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,7 +12,7 @@
     }
   ],
   "dependencies": {
-    "@nocobase/utils": "0.7.5-alpha.1",
+    "@nocobase/utils": "0.7.6-alpha.2",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "deepmerge": "^4.2.2",
@@ -32,5 +32,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "f6eb27b68185bb0c0b4c2cfca1df84205a9b9173"
+  "gitHead": "2cfccff9d3ff14c521bf317fa7ee4efa18444c92"
 }

package/src/__tests__/model.changedWithAssociations.test.ts

@@ -0,0 +1,46 @@
+import Database from '../database';
+import { mockDatabase } from '../mock-database';
+
+describe('changedWithAssociations', () => {
+  let db: Database;
+
+  beforeEach(async () => {
+    db = mockDatabase();
+    await db.clean({ drop: true });
+  });
+
+  afterEach(async () => {
+    await db.close();
+  });
+
+  test('changedWithAssociations', async () => {
+    db.collection({
+      name: 'test',
+      fields: [
+        {
+          type: 'string',
+          name: 'n1',
+        },
+        {
+          type: 'string',
+          name: 'n2',
+        },
+      ],
+    });
+    let changed = [];
+    db.on('test.afterCreateWithAssociations', (model, options) => {
+      changed = model.changedWithAssociations();
+    });
+    db.on('test.afterUpdateWithAssociations', (model, options) => {
+      changed = model.changedWithAssociations();
+    });
+    await db.sync();
+    const r = db.getRepository('test');
+    const m = await r.create({ values: { n1: 'a' } });
+    expect(changed.includes('n1')).toBeTruthy();
+    expect(m.changedWithAssociations()).toBeFalsy();
+    await r.update({ filterByTk: m.id, values: { n1: 'b', n2: 'c' } });
+    expect(changed).toEqual(['n1', 'n2']);
+    expect(m.changedWithAssociations()).toBeFalsy();
+  });
+});

package/src/database.ts

@@ -14,7 +14,7 @@ import {
   Sequelize,
   SyncOptions,
   Transactionable,
-  Utils,
+  Utils
 } from 'sequelize';
 import { SequelizeStorage, Umzug } from 'umzug';
 import { Collection, CollectionOptions, RepositoryType } from './collection';
@@ -205,6 +205,14 @@ export class Database extends EventEmitter implements AsyncEmitter {
         opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
       }
     });
+
+    this.on('afterCreate', async (instance) => {
+      instance?.toChangedWithAssociations?.();
+    });
+
+    this.on('afterUpdate', async (instance) => {
+      instance?.toChangedWithAssociations?.();
+    });
   }
 
   addMigration(item: MigrationItem) {

package/src/model.ts

@@ -1,7 +1,7 @@
+import lodash from 'lodash';
 import { Model as SequelizeModel, ModelCtor } from 'sequelize';
 import { Collection } from './collection';
 import { Database } from './database';
-import lodash from 'lodash';
 import { Field } from './fields';
 
 interface IModel {
@@ -23,6 +23,39 @@ export class Model<TModelAttributes extends {} = any, TCreationAttributes extend
   public static database: Database;
   public static collection: Collection;
 
+  protected _changedWithAssociations = new Set();
+  protected _previousDataValuesWithAssociations = {};
+
+  // TODO
+  public toChangedWithAssociations() {
+    // @ts-ignore
+    this._changedWithAssociations = new Set([...this._changedWithAssociations, ...this._changed]);
+    // @ts-ignore
+    this._previousDataValuesWithAssociations = this._previousDataValues;
+  }
+
+  public changedWithAssociations(key?: string, value?: any) {
+    if (key === undefined) {
+      if (this._changedWithAssociations.size > 0) {
+        return Array.from(this._changedWithAssociations);
+      }
+      return false;
+    }
+    if (value === true) {
+      this._changedWithAssociations.add(key);
+      return this;
+    }
+    if (value === false) {
+      this._changedWithAssociations.delete(key);
+      return this;
+    }
+    return this._changedWithAssociations.has(key);
+  }
+
+  public clearChangedWithAssociations() {
+    this._changedWithAssociations = new Set();
+  }
+
   public toJSON<T extends TModelAttributes>(): T {
     const handleObj = (obj, options: JSONTransformerOptions) => {
       const handles = [

package/src/repository.ts

@@ -60,6 +60,7 @@ export type Values = any;
 export interface CountOptions extends Omit<SequelizeCreateOptions, 'distinct' | 'where' | 'include'>, Transactionable {
   fields?: Fields;
   filter?: Filter;
+  context?: any;
 }
 
 export interface FilterByTk {
@@ -340,6 +341,7 @@ export class Repository<TModelAttributes extends {} = any, TCreationAttributes e
         ...options,
         transaction,
       });
+      instance.clearChangedWithAssociations();
     }
 
     return instance;
@@ -403,6 +405,7 @@ export class Repository<TModelAttributes extends {} = any, TCreationAttributes e
           ...options,
           transaction,
         });
+        instance.clearChangedWithAssociations();
       }
     }