oak-domain 2.2.0 → 2.3.1

package/lib/store/CascadeStore.js

@@ -17,7 +17,7 @@ var CascadeStore = /** @class */ (function (_super) {
     function CascadeStore(storageSchema) {
         return _super.call(this, storageSchema) || this;
     }
-    CascadeStore.prototype.destructCascadeSelect = function (entity, projection2, context, cascadeSelect, option) {
+    CascadeStore.prototype.destructCascadeSelect = function (entity, projection2, context, cascadeSelectFn, aggregateFn, option) {
         var _this = this;
         var projection = {};
         var cascadeSelectionFns = [];
@@ -58,7 +58,7 @@ var CascadeStore = /** @class */ (function (_super) {
                             });
                         }
                     });
-                    var _e = this_1.destructCascadeSelect(attr, projection2[attr], context, cascadeSelect, option), subProjection = _e.projection, subCascadeSelectionFns = _e.cascadeSelectionFns;
+                    var _e = this_1.destructCascadeSelect(attr, projection2[attr], context, cascadeSelectFn, aggregateFn, option), subProjection = _e.projection, subCascadeSelectionFns = _e.cascadeSelectionFns;
                     Object.assign(projection, (_b = {},
                         _b[attr] = subProjection,
                         _b));
@@ -101,7 +101,7 @@ var CascadeStore = /** @class */ (function (_super) {
                             });
                         };
                         var entityIds = (0, lodash_1.uniq)(result.filter(function (ele) { return ele.entity === attr; }).map(function (ele) { return ele.entityId; }));
-                        var subRows = cascadeSelect.call(_this, attr, {
+                        var subRows = cascadeSelectFn.call(_this, attr, {
                             data: projection2[attr],
                             filter: {
                                 id: {
@@ -143,7 +143,7 @@ var CascadeStore = /** @class */ (function (_super) {
                             }
                         });
                     }
-                    var _f = this_1.destructCascadeSelect(relation, projection2[attr], context, cascadeSelect, option), subProjection = _f.projection, subCascadeSelectionFns = _f.cascadeSelectionFns;
+                    var _f = this_1.destructCascadeSelect(relation, projection2[attr], context, cascadeSelectFn, aggregateFn, option), subProjection = _f.projection, subCascadeSelectionFns = _f.cascadeSelectionFns;
                     Object.assign(projection, (_d = {},
                         _d[attr] = subProjection,
                         _d));
@@ -191,7 +191,7 @@ var CascadeStore = /** @class */ (function (_super) {
                             });
                         };
                         var ids = (0, lodash_1.uniq)(result.filter(function (ele) { return !!(ele["".concat(attr, "Id")]); }).map(function (ele) { return ele["".concat(attr, "Id")]; }));
-                        var subRows = cascadeSelect.call(_this, relation, {
+                        var subRows = cascadeSelectFn.call(_this, relation, {
                             data: projection2[attr],
                             filter: {
                                 id: {
@@ -210,69 +210,143 @@ var CascadeStore = /** @class */ (function (_super) {
                 (0, assert_1.default)(relation instanceof Array);
                 var _g = projection2[attr], subProjection_1 = _g.data, subFilter_1 = _g.filter, indexFrom_1 = _g.indexFrom, count_1 = _g.count, subSorter_1 = _g.sorter;
                 var _h = tslib_1.__read(relation, 2), entity2_1 = _h[0], foreignKey_1 = _h[1];
+                var isAggr = attr.endsWith('$$aggr');
                 if (foreignKey_1) {
                     // 基于属性的一对多
-                    cascadeSelectionFns.push(function (result) {
-                        var _a;
-                        var ids = result.map(function (ele) { return ele.id; });
-                        var dealWithSubRows = function (subRows) {
-                            result.forEach(function (ele) {
-                                var _a;
-                                var subRowss = subRows.filter(function (ele2) { return ele2[foreignKey_1] === ele.id; });
-                                (0, assert_1.default)(subRowss);
-                                Object.assign(ele, (_a = {},
-                                    _a[attr] = subRowss,
-                                    _a));
+                    if (isAggr) {
+                        // 是聚合运算
+                        cascadeSelectionFns.push(function (result) {
+                            var aggrResults = result.map(function (row) {
+                                var _a, _b;
+                                var aggrResult = aggregateFn.call(_this, entity2_1, {
+                                    data: subProjection_1,
+                                    filter: (0, filter_1.combineFilters)([(_a = {},
+                                            _a[foreignKey_1] = row.id,
+                                            _a), subFilter_1]),
+                                    sorter: subSorter_1,
+                                    indexFrom: indexFrom_1,
+                                    count: count_1
+                                }, context, option);
+                                if (aggrResult instanceof Promise) {
+                                    return aggrResult.then(function (aggrResultResult) {
+                                        var _a;
+                                        return Object.assign(row, (_a = {},
+                                            _a[attr] = aggrResultResult,
+                                            _a));
+                                    });
+                                }
+                                else {
+                                    Object.assign(row, (_b = {},
+                                        _b[attr] = aggrResult,
+                                        _b));
+                                }
                             });
-                        };
-                        var subRows = cascadeSelect.call(_this, entity2_1, {
-                            data: subProjection_1,
-                            filter: (0, filter_1.combineFilters)([(_a = {},
-                                    _a[foreignKey_1] = {
-                                        $in: ids,
-                                    },
-                                    _a), subFilter_1]),
-                            sorter: subSorter_1,
-                            indexFrom: indexFrom_1,
-                            count: count_1
-                        }, context, option);
-                        if (subRows instanceof Promise) {
-                            return subRows.then(function (subRowss) { return dealWithSubRows(subRowss); });
-                        }
-                        dealWithSubRows(subRows);
-                    });
+                            if (aggrResults.length > 0 && aggrResults[0] instanceof Promise) {
+                                return Promise.all(aggrResults).then(function () { return undefined; });
+                            }
+                        });
+                    }
+                    else {
+                        // 是一对多查询
+                        cascadeSelectionFns.push(function (result) {
+                            var _a;
+                            var ids = result.map(function (ele) { return ele.id; });
+                            var dealWithSubRows = function (subRows) {
+                                result.forEach(function (ele) {
+                                    var _a;
+                                    var subRowss = subRows.filter(function (ele2) { return ele2[foreignKey_1] === ele.id; });
+                                    (0, assert_1.default)(subRowss);
+                                    Object.assign(ele, (_a = {},
+                                        _a[attr] = subRowss,
+                                        _a));
+                                });
+                            };
+                            var subRows = cascadeSelectFn.call(_this, entity2_1, {
+                                data: subProjection_1,
+                                filter: (0, filter_1.combineFilters)([(_a = {},
+                                        _a[foreignKey_1] = {
+                                            $in: ids,
+                                        },
+                                        _a), subFilter_1]),
+                                sorter: subSorter_1,
+                                indexFrom: indexFrom_1,
+                                count: count_1
+                            }, context, option);
+                            if (subRows instanceof Promise) {
+                                return subRows.then(function (subRowss) { return dealWithSubRows(subRowss); });
+                            }
+                            dealWithSubRows(subRows);
+                        });
+                    }
                 }
                 else {
                     // 基于entity的多对一
-                    cascadeSelectionFns.push(function (result) {
-                        var ids = result.map(function (ele) { return ele.id; });
-                        var dealWithSubRows = function (subRows) {
-                            result.forEach(function (ele) {
+                    if (isAggr) {
+                        // 是聚合运算
+                        cascadeSelectionFns.push(function (result) {
+                            var aggrResults = result.map(function (row) {
                                 var _a;
-                                var subRowss = subRows.filter(function (ele2) { return ele2.entityId === ele.id; });
-                                (0, assert_1.default)(subRowss);
-                                Object.assign(ele, (_a = {},
-                                    _a[attr] = subRowss,
-                                    _a));
+                                var aggrResult = aggregateFn.call(_this, entity2_1, {
+                                    data: subProjection_1,
+                                    filter: (0, filter_1.combineFilters)([{
+                                            entity: entity,
+                                            entityId: row.id,
+                                        }, subFilter_1]),
+                                    sorter: subSorter_1,
+                                    indexFrom: indexFrom_1,
+                                    count: count_1
+                                }, context, option);
+                                if (aggrResult instanceof Promise) {
+                                    return aggrResult.then(function (aggrResultResult) {
+                                        var _a;
+                                        return Object.assign(row, (_a = {},
+                                            _a[attr] = aggrResultResult,
+                                            _a));
+                                    });
+                                }
+                                else {
+                                    Object.assign(row, (_a = {},
+                                        _a[attr] = aggrResult,
+                                        _a));
+                                }
                             });
-                        };
-                        var subRows = cascadeSelect.call(_this, entity2_1, {
-                            data: subProjection_1,
-                            filter: (0, filter_1.combineFilters)([{
-                                    entity: entity,
-                                    entityId: {
-                                        $in: ids,
-                                    }
-                                }, subFilter_1]),
-                            sorter: subSorter_1,
-                            indexFrom: indexFrom_1,
-                            count: count_1
-                        }, context, option);
-                        if (subRows instanceof Promise) {
-                            return subRows.then(function (subRowss) { return dealWithSubRows(subRowss); });
-                        }
-                        dealWithSubRows(subRows);
-                    });
+                            if (aggrResults.length > 0 && aggrResults[0] instanceof Promise) {
+                                return Promise.all(aggrResults).then(function () { return undefined; });
+                            }
+                        });
+                    }
+                    else {
+                        // 是一对多查询
+                        cascadeSelectionFns.push(function (result) {
+                            var ids = result.map(function (ele) { return ele.id; });
+                            var dealWithSubRows = function (subRows) {
+                                result.forEach(function (ele) {
+                                    var _a;
+                                    var subRowss = subRows.filter(function (ele2) { return ele2.entityId === ele.id; });
+                                    (0, assert_1.default)(subRowss);
+                                    Object.assign(ele, (_a = {},
+                                        _a[attr] = subRowss,
+                                        _a));
+                                });
+                            };
+                            var subRows = cascadeSelectFn.call(_this, entity2_1, {
+                                data: subProjection_1,
+                                filter: (0, filter_1.combineFilters)([{
+                                        entity: entity,
+                                        entityId: {
+                                            $in: ids,
+                                        }
+                                    }, subFilter_1]),
+                                sorter: subSorter_1,
+                                indexFrom: indexFrom_1,
+                                count: count_1
+                            }, context, option);
+                            if (subRows instanceof Promise) {
+                                return subRows.then(function (subRowss) { return dealWithSubRows(subRowss); });
+                            }
+                            dealWithSubRows(subRows);
+                        });
+                    }
                 }
             }
         };
@@ -611,6 +685,7 @@ var CascadeStore = /** @class */ (function (_super) {
             Object.assign(data2, (_b = {},
                 _b[Entity_1.CreateAtAttribute] = now,
                 _b[Entity_1.UpdateAtAttribute] = now,
+                _b[Entity_1.DeleteAtAttribute] = null,
                 _b));
         };
         if (data instanceof Array) {
@@ -653,6 +728,8 @@ var CascadeStore = /** @class */ (function (_super) {
                     case 1:
                         this.preProcessDataCreated(entity, data);
                         if (!(option.modiParentEntity && !['modi', 'modiEntity', 'oper', 'operEntity'].includes(entity))) return [3 /*break*/, 3];
+                        // 变成对modi的插入
+                        (0, assert_1.default)(option.modiParentId);
                         modiCreate = {
                             id: 'dummy',
                             action: 'create',
@@ -909,6 +986,8 @@ var CascadeStore = /** @class */ (function (_super) {
                                     action: {
                                         $in: ['create', 'update'],
                                     },
+                                    entity: option.modiParentEntity,
+                                    entityId: option.modiParentId,
                                     iState: 'active',
                                     filter: ids_1.length > 0 ? {
                                         id: {
@@ -1339,7 +1418,7 @@ var CascadeStore = /** @class */ (function (_super) {
     };
     CascadeStore.prototype.cascadeSelect = function (entity, selection, context, option) {
         var data = selection.data, filter = selection.filter, indexFrom = selection.indexFrom, count = selection.count, sorter = selection.sorter;
-        var _a = this.destructCascadeSelect(entity, data, context, this.cascadeSelect, option), projection = _a.projection, cascadeSelectionFns = _a.cascadeSelectionFns;
+        var _a = this.destructCascadeSelect(entity, data, context, this.cascadeSelect, this.aggregateSync, option), projection = _a.projection, cascadeSelectionFns = _a.cascadeSelectionFns;
         var rows = this.selectAbjointRow(entity, {
             data: projection,
             filter: filter,
@@ -1460,7 +1539,7 @@ var CascadeStore = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         data = selection.data, filter = selection.filter, indexFrom = selection.indexFrom, count = selection.count, sorter = selection.sorter;
-                        _a = this.destructCascadeSelect(entity, data, context, this.cascadeSelectAsync, option), projection = _a.projection, cascadeSelectionFns = _a.cascadeSelectionFns;
+                        _a = this.destructCascadeSelect(entity, data, context, this.cascadeSelectAsync, this.aggregateAsync, option), projection = _a.projection, cascadeSelectionFns = _a.cascadeSelectionFns;
                         return [4 /*yield*/, this.selectAbjointRowAsync(entity, {
                                 data: projection,
                                 filter: filter,

package/lib/store/SyncRowStore.d.ts

@@ -1,4 +1,4 @@
-import { EntityDict, RowStore, OperateOption, OperationResult, SelectOption, TxnOption, Context } from "../types";
+import { EntityDict, RowStore, OperateOption, OperationResult, SelectOption, TxnOption, Context, AggregationResult } from "../types";
 export declare abstract class SyncContext<ED extends EntityDict> implements Context {
     private rowStore;
     private uuid?;
@@ -13,6 +13,7 @@ export declare abstract class SyncContext<ED extends EntityDict> implements Cont
     getSchema(): import("../types").StorageSchema<ED>;
     operate<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], option: OP): OperationResult<ED>;
     select<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], option: OP): Partial<ED[T]["Schema"]>[];
+    aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], option: OP): AggregationResult<ED[T]["Schema"]>;
     count<T extends keyof ED, OP extends SelectOption>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, option: OP): number;
     mergeMultipleResults(toBeMerged: OperationResult<ED>[]): OperationResult<ED>;
     abstract allowUserUpdate(): boolean;
@@ -21,6 +22,7 @@ export interface SyncRowStore<ED extends EntityDict, Cxt extends Context> extend
     operate<T extends keyof ED, OP extends OperateOption>(entity: T, operation: ED[T]['Operation'], context: Cxt, option: OP): OperationResult<ED>;
     select<T extends keyof ED, OP extends SelectOption>(entity: T, selection: ED[T]['Selection'], context: Cxt, option: OP): Partial<ED[T]['Schema']>[];
     count<T extends keyof ED, OP extends SelectOption>(entity: T, selection: Pick<ED[T]['Selection'], 'filter' | 'count'>, context: Cxt, option: OP): number;
+    aggregate<T extends keyof ED, OP extends SelectOption>(entity: T, aggregation: ED[T]['Aggregation'], context: Cxt, option: OP): AggregationResult<ED[T]['Schema']>;
     begin(option?: TxnOption): string;
     commit(txnId: string): void;
     rollback(txnId: string): void;

package/lib/store/SyncRowStore.js

@@ -32,6 +32,9 @@ var SyncContext = /** @class */ (function () {
     SyncContext.prototype.select = function (entity, selection, option) {
         return this.rowStore.select(entity, selection, this, option);
     };
+    SyncContext.prototype.aggregate = function (entity, aggregation, option) {
+        return this.rowStore.aggregate(entity, aggregation, this, option);
+    };
     SyncContext.prototype.count = function (entity, selection, option) {
         return this.rowStore.count(entity, selection, this, option);
     };

package/lib/store/TriggerExecutor.js

@@ -30,7 +30,7 @@ var TriggerExecutor = /** @class */ (function () {
         this.counter = 0;
     }
     TriggerExecutor.prototype.registerChecker = function (checker) {
-        var entity = checker.entity, action = checker.action, type = checker.type;
+        var entity = checker.entity, action = checker.action, type = checker.type, conditionalFilter = checker.conditionalFilter;
         var triggerName = "".concat(String(entity)).concat(action, "\u6743\u9650\u68C0\u67E5-").concat(this.counter++);
         var fn = (0, checker_1.translateCheckerInAsyncContext)(checker);
         var trigger = {
@@ -41,6 +41,7 @@ var TriggerExecutor = /** @class */ (function () {
             action: action,
             fn: fn,
             when: 'before',
+            filter: conditionalFilter,
         };
         this.registerTrigger(trigger);
     };
@@ -60,6 +61,11 @@ var TriggerExecutor = /** @class */ (function () {
         if (typeof trigger.priority !== 'number') {
             trigger.priority = 1; // 默认最低
         }
+        if (trigger.filter) {
+            (0, assert_1.default)(typeof trigger.action === 'string' && trigger.action !== 'create'
+                || trigger.action instanceof Array && !trigger.action.includes('create'), "trigger\u3010".concat(trigger.name, "\u3011\u662Fcreate\u7C7B\u578B\u4F46\u5374\u5E26\u6709filter"));
+            (0, assert_1.default)(trigger.when === 'before' || trigger.when === 'commit', "\u5B9A\u4E49\u4E86filter\u7684trigger\u3010".concat(trigger.name, "\u3011\u7684when\u53EA\u80FD\u662Fbefore\u6216\u8005commit"));
+        }
         Object.assign(this.triggerNameMap, (_a = {},
             _a[trigger.name] = trigger,
             _a));
@@ -194,6 +200,16 @@ var TriggerExecutor = /** @class */ (function () {
                 try {
                     for (var preTriggers_1 = tslib_1.__values(preTriggers_2), preTriggers_1_1 = preTriggers_1.next(); !preTriggers_1_1.done; preTriggers_1_1 = preTriggers_1.next()) {
                         var trigger = preTriggers_1_1.value;
+                        if (trigger.filter) {
+                            // trigger只对满足条件的前项进行判断，如果确定不满足可以pass
+                            (0, assert_1.default)(operation.action !== 'create');
+                            var filter = trigger.filter;
+                            var filterr = typeof filter === 'function' ? filter(operation, context, option) : filter;
+                            var filterRepelled = (0, filter_1.checkFilterRepel)(entity, context, filterr, operation.filter);
+                            if (filterRepelled) {
+                                continue;
+                            }
+                        }
                         var number = trigger.fn({ operation: operation }, context, option);
                         if (number > 0) {
                             this.logger.info("\u89E6\u53D1\u5668\u300C".concat(trigger.name, "\u300D\u6210\u529F\u89E6\u53D1\u4E86\u300C").concat(number, "\u300D\u884C\u6570\u636E\u66F4\u6539"));
@@ -212,7 +228,7 @@ var TriggerExecutor = /** @class */ (function () {
             else {
                 // 异步context
                 var execPreTrigger_1 = function (idx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var trigger, number;
+                    var trigger, filter, filterr, filterRepelled, number;
                     return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -220,8 +236,19 @@ var TriggerExecutor = /** @class */ (function () {
                                     return [2 /*return*/];
                                 }
                                 trigger = preTriggers_2[idx];
-                                return [4 /*yield*/, trigger.fn({ operation: operation }, context, option)];
+                                if (!trigger.filter) return [3 /*break*/, 2];
+                                (0, assert_1.default)(operation.action !== 'create');
+                                filter = trigger.filter;
+                                filterr = typeof filter === 'function' ? filter(operation, context, option) : filter;
+                                return [4 /*yield*/, (0, filter_1.checkFilterRepel)(entity, context, filterr, operation.filter)];
                             case 1:
+                                filterRepelled = _a.sent();
+                                if (filterRepelled) {
+                                    return [2 /*return*/, execPreTrigger_1(idx + 1)];
+                                }
+                                _a.label = 2;
+                            case 2: return [4 /*yield*/, trigger.fn({ operation: operation }, context, option)];
+                            case 3:
                                 number = _a.sent();
                                 if (number > 0) {
                                     this.logger.info("\u89E6\u53D1\u5668\u300C".concat(trigger.name, "\u300D\u6210\u529F\u89E6\u53D1\u4E86\u300C").concat(number, "\u300D\u884C\u6570\u636E\u66F4\u6539"));
@@ -231,7 +258,7 @@ var TriggerExecutor = /** @class */ (function () {
                     });
                 }); };
                 var execCommitTrigger_1 = function (idx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var trigger;
+                    var trigger, filter, filterr, filterRepelled;
                     return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
@@ -239,8 +266,19 @@ var TriggerExecutor = /** @class */ (function () {
                                     return [2 /*return*/];
                                 }
                                 trigger = commitTriggers_1[idx];
-                                return [4 /*yield*/, this.preCommitTrigger(entity, operation, trigger, context, option)];
+                                if (!trigger.filter) return [3 /*break*/, 2];
+                                (0, assert_1.default)(operation.action !== 'create');
+                                filter = trigger.filter;
+                                filterr = typeof filter === 'function' ? filter(operation, context, option) : filter;
+                                return [4 /*yield*/, (0, filter_1.checkFilterRepel)(entity, context, filterr, operation.filter)];
                             case 1:
+                                filterRepelled = _a.sent();
+                                if (filterRepelled) {
+                                    return [2 /*return*/, execCommitTrigger_1(idx + 1)];
+                                }
+                                _a.label = 2;
+                            case 2: return [4 /*yield*/, this.preCommitTrigger(entity, operation, trigger, context, option)];
+                            case 3:
                                 _a.sent();
                                 return [2 /*return*/, execCommitTrigger_1(idx + 1)];
                         }

package/lib/store/checker.d.ts

@@ -1,6 +1,7 @@
-import { Checker, EntityDict, OperateOption, SelectOption, Trigger } from "../types";
+import { Checker, EntityDict, OperateOption, SelectOption, StorageSchema, Trigger } from "../types";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { AsyncContext } from "./AsyncRowStore";
 import { SyncContext } from './SyncRowStore';
 export declare function translateCheckerInAsyncContext<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>>(checker: Checker<ED, keyof ED, Cxt>): Trigger<ED, keyof ED, Cxt>['fn'];
 export declare function translateCheckerInSyncContext<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends SyncContext<ED>>(checker: Checker<ED, T, Cxt>): (operation: ED[T]['Operation'], context: Cxt, option: OperateOption | SelectOption) => void;
+export declare function createRelationHierarchyCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>): Checker<ED, keyof ED, Cxt>[];