oak-domain 2.6.9 → 3.0.0

package/lib/store/TriggerExecutor.d.ts

@@ -1,7 +1,7 @@
 import { EntityDict, OperateOption, SelectOption } from "../types/Entity";
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { Logger } from "../types/Logger";
-import { Checker, CheckerType } from '../types/Auth';
+import { Checker } from '../types/Auth';
 import { Trigger } from "../types/Trigger";
 import { AsyncContext } from './AsyncRowStore';
 /**
@@ -16,7 +16,6 @@ export declare class TriggerExecutor<ED extends EntityDict & BaseEntityDict> {
     private contextBuilder;
     constructor(contextBuilder: (cxtString: string) => Promise<AsyncContext<ED>>, logger?: Logger);
     registerChecker<T extends keyof ED, Cxt extends AsyncContext<ED>>(checker: Checker<ED, T, Cxt>): void;
-    getCheckers<T extends keyof ED>(entity: T, action: ED[T]['Action'], checkerTypes?: CheckerType[]): Trigger<ED, T, AsyncContext<ED>>[] | undefined;
     registerTrigger<T extends keyof ED, Cxt extends AsyncContext<ED>>(trigger: Trigger<ED, T, Cxt>): void;
     unregisterTrigger<T extends keyof ED, Cxt extends AsyncContext<ED>>(trigger: Trigger<ED, T, Cxt>): void;
     private preCommitTrigger;

package/lib/store/TriggerExecutor.js

@@ -34,11 +34,10 @@ var TriggerExecutor = /** @class */ (function () {
         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 _a = (0, checker_1.translateCheckerInAsyncContext)(checker), fn = _a.fn, when = _a.when;
-        var priority = type === 'data' ? Trigger_1.DATA_CHECKER_DEFAULT_PRIORITY : Trigger_1.CHECKER_DEFAULT_PRIORITY; // checker的默认优先级最低（前面的trigger可能会赋上一些相应的值）
         var trigger = {
             checkerType: type,
             name: triggerName,
-            priority: checker.priority || priority,
+            priority: checker.priority || Trigger_1.CHECKER_PRIORITY_MAP[type],
             entity: entity,
             action: action,
             fn: fn,
@@ -47,12 +46,13 @@ var TriggerExecutor = /** @class */ (function () {
         };
         this.registerTrigger(trigger);
     };
-    TriggerExecutor.prototype.getCheckers = function (entity, action, checkerTypes) {
-        var _a;
-        var triggers = this.triggerMap[entity] && ((_a = this.triggerMap[entity][action]) === null || _a === void 0 ? void 0 : _a.filter(function (trigger) { return (typeof trigger.action === 'string' && trigger.action === action || trigger.action instanceof Array && trigger.action.includes(action)
-            && (!checkerTypes || trigger.checkerType && checkerTypes.includes(trigger.checkerType))); }));
-        return triggers;
-    };
+    /*  getCheckers<T extends keyof ED>(entity: T, action: ED[T]['Action'], checkerTypes?: CheckerType[]) {
+         const triggers = this.triggerMap[entity] && this.triggerMap[entity]![action]?.filter(
+             trigger => (typeof trigger.action === 'string' && trigger.action === action || trigger.action instanceof Array && trigger.action.includes(action as any)
+                 && (!checkerTypes || trigger.checkerType && checkerTypes.includes(trigger.checkerType)))
+         );
+         return triggers;
+     } */
     TriggerExecutor.prototype.registerTrigger = function (trigger) {
         var _a;
         var _this = this;
@@ -64,7 +64,7 @@ var TriggerExecutor = /** @class */ (function () {
             trigger.priority = Trigger_1.TRIGGER_DEFAULT_PRIORITY; // 默认值
         }
         else {
-            (0, assert_1.default)(trigger.priority <= Trigger_1.TRIGGER_MAX_PRIORITY && trigger.priority >= Trigger_1.TRIGGER_MIN_PRIORITY, "trigger\u300C".concat(trigger.name, "\u300D\u7684\u4F18\u5148\u7EA7\u5B9A\u4E49\u8D8A\u754C\uFF0C\u5E94\u8BE5\u5728").concat(Trigger_1.TRIGGER_MIN_PRIORITY, "\u5230").concat(Trigger_1.TRIGGER_MAX_PRIORITY, "\u4E4B\u95F4"));
+            (0, assert_1.default)(trigger.priority <= Trigger_1.CHECKER_MAX_PRIORITY && trigger.priority >= Trigger_1.TRIGGER_MIN_PRIORITY, "trigger\u300C".concat(trigger.name, "\u300D\u7684\u4F18\u5148\u7EA7\u5B9A\u4E49\u8D8A\u754C\uFF0C\u5E94\u8BE5\u5728").concat(Trigger_1.TRIGGER_MIN_PRIORITY, "\u5230").concat(Trigger_1.CHECKER_MAX_PRIORITY, "\u4E4B\u95F4"));
         }
         if (trigger.filter) {
             (0, assert_1.default)(typeof trigger.action === 'string' && trigger.action !== 'create'
@@ -153,20 +153,20 @@ var TriggerExecutor = /** @class */ (function () {
                         _c.label = 2;
                     case 2:
                         filter = operation.filter;
-                        filter2 = (0, filter_1.addFilterSegment)({
-                            $or: [
-                                {
-                                    $$triggerData$$: {
-                                        $exists: true,
+                        filter2 = (0, filter_1.combineFilters)(entity, context.getSchema(), [{
+                                $or: [
+                                    {
+                                        $$triggerData$$: {
+                                            $exists: true,
+                                        },
                                     },
-                                },
-                                {
-                                    $$triggerTimestamp$$: {
-                                        $exists: true,
-                                    },
-                                }
-                            ],
-                        }, filter);
+                                    {
+                                        $$triggerTimestamp$$: {
+                                            $exists: true,
+                                        },
+                                    }
+                                ],
+                            }, filter]);
                         return [4 /*yield*/, context.count(entity, {
                                 filter: filter2
                             }, {})];

package/lib/store/actionAuth.d.ts

@@ -0,0 +1,4 @@
+import { EntityDict } from '../types/Entity';
+import { Trigger } from '../types';
+import { AsyncContext } from './AsyncRowStore';
+export declare const triggers: Trigger<EntityDict, 'actionAuth', AsyncContext<EntityDict>>[];

package/lib/store/actionAuth.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.triggers = void 0;
+var tslib_1 = require("tslib");
+var uuid_1 = require("../utils/uuid");
+exports.triggers = [
+    {
+        name: '当actionAuth的deActions被置空后，删除此条数据',
+        entity: 'actionAuth',
+        action: 'update',
+        fn: function (_a, context, option) {
+            var operation = _a.operation;
+            return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                var data, filter, _b, _c, _d;
+                var _e;
+                return tslib_1.__generator(this, function (_f) {
+                    switch (_f.label) {
+                        case 0:
+                            data = operation.data, filter = operation.filter;
+                            if (!(data.deActions && data.deActions.length === 0)) return [3 /*break*/, 3];
+                            _c = (_b = context).operate;
+                            _d = ['actionAuth'];
+                            _e = {};
+                            return [4 /*yield*/, (0, uuid_1.generateNewIdAsync)()];
+                        case 1: return [4 /*yield*/, _c.apply(_b, _d.concat([(_e.id = _f.sent(),
+                                    _e.action = 'remove',
+                                    _e.data = {},
+                                    _e.filter = filter,
+                                    _e), option]))];
+                        case 2:
+                            _f.sent();
+                            return [2 /*return*/, 1];
+                        case 3: return [2 /*return*/, 0];
+                    }
+                });
+            });
+        },
+        when: 'after',
+    }
+];

package/lib/store/actionDef.d.ts

@@ -1,9 +1,10 @@
 import { ActionDictOfEntityDict, BBWatcher, Checker, EntityDict, StorageSchema, Trigger } from "../types";
 import { SyncContext } from "./SyncRowStore";
 import { AsyncContext } from "./AsyncRowStore";
-export declare function getFullProjection<ED extends EntityDict, T extends keyof ED>(entity: T, schema: StorageSchema<ED>): ED[T]["Selection"]["data"];
-export declare function analyzeActionDefDict<ED extends EntityDict, Cxt extends SyncContext<ED> | AsyncContext<ED>>(schema: StorageSchema<ED>, actionDefDict: ActionDictOfEntityDict<ED>): {
+import { EntityDict as BaseEntityDict } from '../base-app-domain/EntityDict';
+export declare function getFullProjection<ED extends EntityDict & BaseEntityDict, T extends keyof ED>(entity: T, schema: StorageSchema<ED>): ED[T]["Selection"]["data"];
+export declare function makeIntrinsicCTWs<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>, FrontCxt extends SyncContext<ED>>(schema: StorageSchema<ED>, actionDefDict: ActionDictOfEntityDict<ED>): {
     triggers: Trigger<ED, keyof ED, Cxt>[];
-    checkers: Checker<ED, keyof ED, Cxt>[];
+    checkers: Checker<ED, keyof ED, Cxt | FrontCxt>[];
     watchers: BBWatcher<ED, keyof ED>[];
 };

package/lib/store/actionDef.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyzeActionDefDict = exports.getFullProjection = void 0;
+exports.makeIntrinsicCTWs = exports.getFullProjection = void 0;
 var tslib_1 = require("tslib");
 var types_1 = require("../types");
 var lodash_1 = require("../utils/lodash");
 var filter_1 = require("./filter");
+var checkers_1 = require("../checkers");
+var triggers_1 = require("../triggers");
+var actionAuth_1 = require("./actionAuth");
 function getFullProjection(entity, schema) {
     var attributes = schema[entity].attributes;
     var projection = {
@@ -50,34 +53,48 @@ function makeIntrinsicWatchers(schema) {
     return watchers;
 }
 function checkUniqueBetweenRows(rows, uniqAttrs) {
+    var e_1, _a, e_2, _b;
     // 先检查这些行本身之间有无unique冲突
-    var uniqRows = (0, lodash_1.uniqBy)(rows, function (d) {
-        var e_1, _a;
-        var s = '';
-        try {
-            for (var uniqAttrs_1 = tslib_1.__values(uniqAttrs), uniqAttrs_1_1 = uniqAttrs_1.next(); !uniqAttrs_1_1.done; uniqAttrs_1_1 = uniqAttrs_1.next()) {
-                var a = uniqAttrs_1_1.value;
-                if (d[a] === null || d[a] === undefined) {
-                    s + d.id;
+    var dict = {};
+    try {
+        for (var rows_1 = tslib_1.__values(rows), rows_1_1 = rows_1.next(); !rows_1_1.done; rows_1_1 = rows_1.next()) {
+            var row = rows_1_1.value;
+            var s = '';
+            try {
+                for (var uniqAttrs_1 = (e_2 = void 0, tslib_1.__values(uniqAttrs)), uniqAttrs_1_1 = uniqAttrs_1.next(); !uniqAttrs_1_1.done; uniqAttrs_1_1 = uniqAttrs_1.next()) {
+                    var a = uniqAttrs_1_1.value;
+                    if (row[a] === null || row[a] === undefined) {
+                        s + row.id;
+                    }
+                    else {
+                        s + "-".concat(row[a]);
+                    }
                 }
-                else {
-                    s + "-".concat(d[a]);
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (uniqAttrs_1_1 && !uniqAttrs_1_1.done && (_b = uniqAttrs_1.return)) _b.call(uniqAttrs_1);
                 }
+                finally { if (e_2) throw e_2.error; }
             }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (uniqAttrs_1_1 && !uniqAttrs_1_1.done && (_a = uniqAttrs_1.return)) _a.call(uniqAttrs_1);
+            if (dict[s]) {
+                throw new types_1.OakUniqueViolationException([{
+                        id: row.id,
+                        attrs: uniqAttrs,
+                    }]);
+            }
+            else {
+                dict[s] = 1;
             }
-            finally { if (e_1) throw e_1.error; }
         }
-        return s;
-    });
-    if (uniqRows.length < rows.length) {
-        throw new types_1.OakUniqueViolationException([{
-                attrs: uniqAttrs,
-            }]);
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (rows_1_1 && !rows_1_1.done && (_a = rows_1.return)) _a.call(rows_1);
+        }
+        finally { if (e_1) throw e_1.error; }
     }
 }
 function checkCountLessThan(count, uniqAttrs, than, id) {
@@ -110,14 +127,14 @@ function checkUnique(entity, row, context, uniqAttrs, extraFilter) {
         // 说明有null值，不需要检查约束
         return;
     }
-    var filter2 = extraFilter ? (0, filter_1.addFilterSegment)([filter, extraFilter]) : filter;
+    var filter2 = extraFilter ? (0, filter_1.combineFilters)(entity, context.getSchema(), [filter, extraFilter]) : filter;
     var count = context.count(entity, { filter: filter2 }, { dontCollect: true });
     return checkCountLessThan(count, uniqAttrs, 0, row.id);
 }
-function analyzeActionDefDict(schema, actionDefDict) {
+function makeIntrinsicCTWs(schema, actionDefDict) {
     var _a;
-    var checkers = [];
-    var triggers = [];
+    var checkers = (0, checkers_1.createDynamicCheckers)(schema);
+    var triggers = (0, triggers_1.createDynamicTriggers)(schema);
     // action状态转换矩阵相应的checker
     for (var entity in actionDefDict) {
         var _loop_1 = function (attr) {
@@ -140,11 +157,11 @@ function analyzeActionDefDict(schema, actionDefDict) {
                     filter: conditionalFilter,
                     errMsg: '',
                 });
+                // 这里用data类型的checker改数据了不太好，先这样
                 checkers.push({
                     action: action,
                     type: 'data',
                     entity: entity,
-                    priority: 10,
                     checker: function (data) {
                         var _a;
                         Object.assign(data, (_a = {},
@@ -190,7 +207,7 @@ function analyzeActionDefDict(schema, actionDefDict) {
         }
     }
     var _loop_2 = function (entity) {
-        var e_2, _e;
+        var e_3, _e;
         var indexes = schema[entity].indexes;
         if (indexes) {
             var _loop_4 = function (index) {
@@ -201,7 +218,7 @@ function analyzeActionDefDict(schema, actionDefDict) {
                         entity: entity,
                         action: 'create',
                         type: 'logical',
-                        priority: 20,
+                        priority: types_1.CHECKER_MAX_PRIORITY,
                         checker: function (operation, context) {
                             var data = operation.data;
                             if (data instanceof Array) {
@@ -219,9 +236,9 @@ function analyzeActionDefDict(schema, actionDefDict) {
                         entity: entity,
                         action: 'update',
                         type: 'logical',
-                        priority: 20,
+                        priority: types_1.CHECKER_MAX_PRIORITY,
                         checker: function (operation, context) {
-                            var e_3, _a, e_4, _b, _c;
+                            var e_4, _a, e_5, _b, _c;
                             var _d = operation, data = _d.data, operationFilter = _d.filter;
                             var attrs = Object.keys(data);
                             var refAttrs = (0, lodash_1.intersection)(attrs, uniqAttrs_2);
@@ -230,7 +247,7 @@ function analyzeActionDefDict(schema, actionDefDict) {
                                 return;
                             }
                             try {
-                                for (var refAttrs_1 = (e_3 = void 0, tslib_1.__values(refAttrs)), refAttrs_1_1 = refAttrs_1.next(); !refAttrs_1_1.done; refAttrs_1_1 = refAttrs_1.next()) {
+                                for (var refAttrs_1 = (e_4 = void 0, tslib_1.__values(refAttrs)), refAttrs_1_1 = refAttrs_1.next(); !refAttrs_1_1.done; refAttrs_1_1 = refAttrs_1.next()) {
                                     var attr = refAttrs_1_1.value;
                                     // 如果有更新为null值，不用再检查约束
                                     if (data[attr] === null || data[attr] === undefined) {
@@ -238,28 +255,28 @@ function analyzeActionDefDict(schema, actionDefDict) {
                                     }
                                 }
                             }
-                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                            catch (e_4_1) { e_4 = { error: e_4_1 }; }
                             finally {
                                 try {
                                     if (refAttrs_1_1 && !refAttrs_1_1.done && (_a = refAttrs_1.return)) _a.call(refAttrs_1);
                                 }
-                                finally { if (e_3) throw e_3.error; }
+                                finally { if (e_4) throw e_4.error; }
                             }
                             if (refAttrs.length === uniqAttrs_2.length) {
                                 // 如果更新了全部属性，直接检查
                                 var filter = (0, lodash_1.pick)(data, refAttrs);
                                 // 在这些行以外的行不和更新后的键值冲突
                                 var count = context.count(entity, {
-                                    filter: (0, filter_1.addFilterSegment)([filter, {
+                                    filter: (0, filter_1.combineFilters)(entity, context.getSchema(), [filter, {
                                             $not: operationFilter,
                                         }]),
                                 }, { dontCollect: true });
-                                var checkCount = checkCountLessThan(count, uniqAttrs_2);
+                                var checkCount = checkCountLessThan(count, uniqAttrs_2, 0, operationFilter === null || operationFilter === void 0 ? void 0 : operationFilter.id);
                                 // 更新的行只能有一行
                                 var rowCount = context.count(entity, {
                                     filter: operationFilter,
                                 }, { dontCollect: true });
-                                var checkRowCount = checkCountLessThan(rowCount, uniqAttrs_2, 1);
+                                var checkRowCount = checkCountLessThan(rowCount, uniqAttrs_2, 1, operationFilter === null || operationFilter === void 0 ? void 0 : operationFilter.id);
                                 // 如果更新的行数为零似乎也可以，但这应该不可能出现吧，by Xc 20230131
                                 if (checkRowCount instanceof Promise) {
                                     return Promise.all([checkCount, checkRowCount]).then(function () { return undefined; });
@@ -268,19 +285,19 @@ function analyzeActionDefDict(schema, actionDefDict) {
                             // 否则需要结合本行现有的属性来进行检查
                             var projection = { id: 1 };
                             try {
-                                for (var uniqAttrs_3 = (e_4 = void 0, tslib_1.__values(uniqAttrs_2)), uniqAttrs_3_1 = uniqAttrs_3.next(); !uniqAttrs_3_1.done; uniqAttrs_3_1 = uniqAttrs_3.next()) {
+                                for (var uniqAttrs_3 = (e_5 = void 0, tslib_1.__values(uniqAttrs_2)), uniqAttrs_3_1 = uniqAttrs_3.next(); !uniqAttrs_3_1.done; uniqAttrs_3_1 = uniqAttrs_3.next()) {
                                     var attr = uniqAttrs_3_1.value;
                                     Object.assign(projection, (_c = {},
                                         _c[attr] = 1,
                                         _c));
                                 }
                             }
-                            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                            catch (e_5_1) { e_5 = { error: e_5_1 }; }
                             finally {
                                 try {
                                     if (uniqAttrs_3_1 && !uniqAttrs_3_1.done && (_b = uniqAttrs_3.return)) _b.call(uniqAttrs_3);
                                 }
-                                finally { if (e_4) throw e_4.error; }
+                                finally { if (e_5) throw e_5.error; }
                             }
                             var checkWithRows = function (rows2) {
                                 var rows22 = rows2.map(function (ele) { return Object.assign(ele, data); });
@@ -306,17 +323,17 @@ function analyzeActionDefDict(schema, actionDefDict) {
                 }
             };
             try {
-                for (var indexes_1 = (e_2 = void 0, tslib_1.__values(indexes)), indexes_1_1 = indexes_1.next(); !indexes_1_1.done; indexes_1_1 = indexes_1.next()) {
+                for (var indexes_1 = (e_3 = void 0, tslib_1.__values(indexes)), indexes_1_1 = indexes_1.next(); !indexes_1_1.done; indexes_1_1 = indexes_1.next()) {
                     var index = indexes_1_1.value;
                     _loop_4(index);
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
                     if (indexes_1_1 && !indexes_1_1.done && (_e = indexes_1.return)) _e.call(indexes_1);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_3) throw e_3.error; }
             }
         }
     };
@@ -324,10 +341,11 @@ function analyzeActionDefDict(schema, actionDefDict) {
     for (var entity in schema) {
         _loop_2(entity);
     }
+    triggers.push.apply(triggers, tslib_1.__spreadArray([], tslib_1.__read(actionAuth_1.triggers), false));
     return {
         triggers: triggers,
         checkers: checkers,
         watchers: makeIntrinsicWatchers(schema),
     };
 }
-exports.analyzeActionDefDict = analyzeActionDefDict;
+exports.makeIntrinsicCTWs = makeIntrinsicCTWs;

package/lib/store/checker.d.ts

@@ -1,4 +1,4 @@
-import { AuthDefDict, Checker, EntityDict, OperateOption, SelectOption, StorageSchema, 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';
@@ -16,18 +16,11 @@ export declare function translateCheckerInSyncContext<ED extends EntityDict & Ba
     fn: (operation: ED[T]['Operation'], context: Cxt, option: OperateOption | SelectOption) => void;
     when: 'before' | 'after';
 };
-/**
- * 根据权限定义，创建出相应的checker
- * @param schema
- * @param authDict
- * @returns
- */
-export declare function createAuthCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>, authDict: AuthDefDict<ED>): Checker<ED, keyof ED, Cxt>[];
 /**
  * 对对象的删除，检查其是否会产生其他行上的空指针，不允许这种情况的出现
  * @param schema
  * @returns
  * 如果有的对象允许删除，需要使用trigger来处理其相关联的外键对象，这些trigger写作before，则会在checker之前执行，仍然可以删除成功
  */
-export declare function createRemoveCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>, authDict?: AuthDefDict<ED>): Checker<ED, keyof ED, Cxt>[];
+export declare function createRemoveCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>): Checker<ED, keyof ED, Cxt>[];
 export declare function createCreateCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>): Checker<ED, keyof ED, Cxt>[];