@nocobase/database 0.7.0-alpha.56 → 0.7.0-alpha.59

package/lib/operators/boolean.d.ts

@@ -0,0 +1,13 @@
+import { Op } from 'sequelize';
+declare const _default: {
+    $isFalsy(): {
+        [Op.or]: {
+            [Op.is]: any;
+            [Op.eq]: boolean;
+        };
+    };
+    $isTruly(): {
+        [Op.eq]: boolean;
+    };
+};
+export default _default;

package/lib/operators/boolean.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _sequelize() {
+  const data = require("sequelize");
+
+  _sequelize = function _sequelize() {
+    return data;
+  };
+
+  return data;
+}
+
+var _default = {
+  $isFalsy() {
+    return {
+      [_sequelize().Op.or]: {
+        [_sequelize().Op.is]: null,
+        [_sequelize().Op.eq]: false
+      }
+    };
+  },
+
+  $isTruly() {
+    return {
+      [_sequelize().Op.eq]: true
+    };
+  }
+
+};
+exports.default = _default;

package/lib/operators/index.js

@@ -11,6 +11,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var _default = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, require('./association').default), require('./date').default), require('./array').default), require('./empty').default), require('./string').default), require('./ne').default), require('./notIn').default);
+var _default = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, require('./association').default), require('./date').default), require('./array').default), require('./empty').default), require('./string').default), require('./ne').default), require('./notIn').default), require('./boolean').default);
 
 exports.default = _default;

package/lib/relation-repository/multiple-relation-repository.d.ts

@@ -1,11 +1,11 @@
-import { MultiAssociationAccessors, Transaction } from 'sequelize';
-import { CommonFindOptions, CountOptions, DestroyOptions, Filter, FilterByTk, FindOptions, TargetKey, TK, TransactionAble, UpdateOptions } from '../repository';
+import { MultiAssociationAccessors, Transaction, Transactionable } from 'sequelize';
+import { CommonFindOptions, CountOptions, DestroyOptions, Filter, FilterByTk, FindOptions, TargetKey, TK, UpdateOptions } from '../repository';
 import { RelationRepository } from './relation-repository';
 export interface FindAndCountOptions extends CommonFindOptions {
 }
 export interface FindOneOptions extends CommonFindOptions, FilterByTk {
 }
-export interface AssociatedOptions extends TransactionAble {
+export interface AssociatedOptions extends Transactionable {
     tk?: TK;
 }
 export declare abstract class MultipleRelationRepository extends RelationRepository {

package/lib/relation-repository/single-relation-repository.d.ts

@@ -1,22 +1,22 @@
-import { SingleAssociationAccessors } from 'sequelize';
+import { SingleAssociationAccessors, Transactionable } from 'sequelize';
 import { Model } from '../model';
-import { Appends, Except, Fields, Filter, TargetKey, TransactionAble, UpdateOptions } from '../repository';
+import { Appends, Except, Fields, Filter, TargetKey, UpdateOptions } from '../repository';
 import { RelationRepository } from './relation-repository';
-export interface SingleRelationFindOption extends TransactionAble {
+export interface SingleRelationFindOption extends Transactionable {
     fields?: Fields;
     except?: Except;
     appends?: Appends;
     filter?: Filter;
 }
-interface SetOption extends TransactionAble {
+interface SetOption extends Transactionable {
     tk?: TargetKey;
 }
 export declare abstract class SingleRelationRepository extends RelationRepository {
-    remove(options?: TransactionAble): Promise<void>;
+    remove(options?: Transactionable): Promise<void>;
     set(options: TargetKey | SetOption): Promise<void>;
     find(options?: SingleRelationFindOption): Promise<Model<any>>;
     findOne(options?: SingleRelationFindOption): Promise<Model<any>>;
-    destroy(options?: TransactionAble): Promise<Boolean>;
+    destroy(options?: Transactionable): Promise<Boolean>;
     update(options: UpdateOptions): Promise<any>;
     accessors(): SingleAssociationAccessors;
 }

package/lib/repository.d.ts

@@ -1,4 +1,4 @@
-import { Association, BulkCreateOptions, CreateOptions as SequelizeCreateOptions, DestroyOptions as SequelizeDestroyOptions, FindAndCountOptions as SequelizeAndCountOptions, FindOptions as SequelizeFindOptions, ModelCtor, Transaction, UpdateOptions as SequelizeUpdateOptions } from 'sequelize';
+import { Association, BulkCreateOptions, CreateOptions as SequelizeCreateOptions, DestroyOptions as SequelizeDestroyOptions, FindAndCountOptions as SequelizeAndCountOptions, FindOptions as SequelizeFindOptions, ModelCtor, Transactionable, UpdateOptions as SequelizeUpdateOptions } from 'sequelize';
 import { Collection } from './collection';
 import { Database } from './database';
 import { Model } from './model';
@@ -12,9 +12,7 @@ export interface IRepository {
 interface CreateManyOptions extends BulkCreateOptions {
     records: Values[];
 }
-export interface TransactionAble {
-    transaction?: Transaction;
-}
+export { Transactionable } from 'sequelize';
 export interface FilterAble {
     filter: Filter;
 }
@@ -29,7 +27,7 @@ export declare type WhiteList = string[];
 export declare type BlackList = string[];
 export declare type AssociationKeysToBeUpdate = string[];
 export declare type Values = any;
-export interface CountOptions extends Omit<SequelizeCreateOptions, 'distinct' | 'where' | 'include'>, TransactionAble {
+export interface CountOptions extends Omit<SequelizeCreateOptions, 'distinct' | 'where' | 'include'>, Transactionable {
     fields?: Fields;
     filter?: Filter;
 }
@@ -38,7 +36,7 @@ export interface FilterByTk {
 }
 export interface FindOptions extends SequelizeFindOptions, CommonFindOptions, FilterByTk {
 }
-export interface CommonFindOptions extends TransactionAble {
+export interface CommonFindOptions extends Transactionable {
     filter?: Filter;
     fields?: Fields;
     appends?: Appends;
@@ -162,4 +160,3 @@ export declare class Repository<TModelAttributes extends {} = any, TCreationAttr
     };
     protected getTransaction(options: any, autoGen?: boolean): Promise<any>;
 }
-export {};

package/lib/update-associations.d.ts

@@ -1,6 +1,5 @@
 import { Association, BelongsToMany, Hookable, Transactionable } from 'sequelize';
 import { Model } from './model';
-import { TransactionAble } from './repository';
 export declare function modelAssociations(instance: Model): {
     [key: string]: Association<import("sequelize").Model<any, any>, import("sequelize").Model<any, any>>;
 };
@@ -9,7 +8,7 @@ export declare function modelAssociationByKey(instance: Model, key: string): Ass
 declare type UpdateValue = {
     [key: string]: any;
 };
-interface UpdateOptions extends TransactionAble {
+interface UpdateOptions extends Transactionable {
     filter?: any;
     filterByTk?: number | string;
     whitelist?: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/database",
-  "version": "0.7.0-alpha.56",
+  "version": "0.7.0-alpha.59",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,7 +12,7 @@
     }
   ],
   "dependencies": {
-    "@nocobase/utils": "0.7.0-alpha.56",
+    "@nocobase/utils": "0.7.0-alpha.59",
     "async-mutex": "^0.3.2",
     "deepmerge": "^4.2.2",
     "flat": "^5.0.2",
@@ -24,5 +24,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "9a8c05e8fb26029f1d1ba68408a8bddac0e67a76"
+  "gitHead": "c90e5aee4c8257a3ab7ff492e69cb568cccff8b5"
 }

package/src/operators/boolean.ts

@@ -0,0 +1,18 @@
+import { Op } from 'sequelize';
+
+export default {
+  $isFalsy() {
+    return {
+      [Op.or]: {
+        [Op.is]: null,
+        [Op.eq]: false,
+      },
+    };
+  },
+
+  $isTruly() {
+    return {
+      [Op.eq]: true,
+    };
+  },
+};

package/src/operators/index.ts

@@ -6,4 +6,5 @@ export default {
   ...require('./string').default,
   ...require('./ne').default,
   ...require('./notIn').default,
+  ...require('./boolean').default,
 };

package/src/relation-repository/multiple-relation-repository.ts

@@ -1,5 +1,5 @@
 import { omit } from 'lodash';
-import { MultiAssociationAccessors, Op, Sequelize, Transaction } from 'sequelize';
+import { MultiAssociationAccessors, Op, Sequelize, Transaction, Transactionable } from 'sequelize';
 import {
   CommonFindOptions,
   CountOptions,
@@ -9,7 +9,6 @@ import {
   FindOptions,
   TargetKey,
   TK,
-  TransactionAble,
   UpdateOptions
 } from '../repository';
 import { updateModelByValues } from '../update-associations';
@@ -20,7 +19,7 @@ export interface FindAndCountOptions extends CommonFindOptions {}
 
 export interface FindOneOptions extends CommonFindOptions, FilterByTk {}
 
-export interface AssociatedOptions extends TransactionAble {
+export interface AssociatedOptions extends Transactionable {
   tk?: TK;
 }
 

package/src/relation-repository/single-relation-repository.ts

@@ -1,24 +1,24 @@
 import lodash from 'lodash';
-import { SingleAssociationAccessors } from 'sequelize';
+import { SingleAssociationAccessors, Transactionable } from 'sequelize';
 import { Model } from '../model';
-import { Appends, Except, Fields, Filter, TargetKey, TransactionAble, UpdateOptions } from '../repository';
+import { Appends, Except, Fields, Filter, TargetKey, UpdateOptions } from '../repository';
 import { updateModelByValues } from '../update-associations';
 import { RelationRepository, transaction } from './relation-repository';
 
-export interface SingleRelationFindOption extends TransactionAble {
+export interface SingleRelationFindOption extends Transactionable {
   fields?: Fields;
   except?: Except;
   appends?: Appends;
   filter?: Filter;
 }
 
-interface SetOption extends TransactionAble {
+interface SetOption extends Transactionable {
   tk?: TargetKey;
 }
 
 export abstract class SingleRelationRepository extends RelationRepository {
   @transaction()
-  async remove(options?: TransactionAble): Promise<void> {
+  async remove(options?: Transactionable): Promise<void> {
     const transaction = await this.getTransaction(options);
     const sourceModel = await this.getSourceModel(transaction);
     return await sourceModel[this.accessors().set](null, {
@@ -63,7 +63,7 @@ export abstract class SingleRelationRepository extends RelationRepository {
   }
 
   @transaction()
-  async destroy(options?: TransactionAble): Promise<Boolean> {
+  async destroy(options?: Transactionable): Promise<Boolean> {
     const transaction = await this.getTransaction(options);
 
     const target = await this.find({

package/src/repository.ts

@@ -8,7 +8,7 @@ import {
   FindOptions as SequelizeFindOptions,
   ModelCtor,
   Op,
-  Transaction,
+  Transactionable,
   UpdateOptions as SequelizeUpdateOptions
 } from 'sequelize';
 import { Collection } from './collection';
@@ -34,9 +34,7 @@ interface CreateManyOptions extends BulkCreateOptions {
   records: Values[];
 }
 
-export interface TransactionAble {
-  transaction?: Transaction;
-}
+export { Transactionable } from 'sequelize';
 
 export interface FilterAble {
   filter: Filter;
@@ -57,7 +55,7 @@ export type AssociationKeysToBeUpdate = string[];
 
 export type Values = any;
 
-export interface CountOptions extends Omit<SequelizeCreateOptions, 'distinct' | 'where' | 'include'>, TransactionAble {
+export interface CountOptions extends Omit<SequelizeCreateOptions, 'distinct' | 'where' | 'include'>, Transactionable {
   fields?: Fields;
   filter?: Filter;
 }
@@ -68,7 +66,7 @@ export interface FilterByTk {
 
 export interface FindOptions extends SequelizeFindOptions, CommonFindOptions, FilterByTk {}
 
-export interface CommonFindOptions extends TransactionAble {
+export interface CommonFindOptions extends Transactionable {
   filter?: Filter;
   fields?: Fields;
   appends?: Appends;

package/src/update-associations.ts

@@ -9,7 +9,6 @@ import {
   Transactionable,
 } from 'sequelize';
 import { Model } from './model';
-import { TransactionAble } from './repository';
 import { UpdateGuard } from './update-guard';
 
 function isUndefinedOrNull(value: any) {
@@ -46,7 +45,7 @@ export function modelAssociationByKey(instance: Model, key: string): Association
 
 type UpdateValue = { [key: string]: any };
 
-interface UpdateOptions extends TransactionAble {
+interface UpdateOptions extends Transactionable {
   filter?: any;
   filterByTk?: number | string;
   // 字段白名单