oak-domain 2.6.4 → 2.6.6

package/lib/checkers/SyncCheckExecutor.d.ts

@@ -0,0 +1,9 @@
+import { EntityDict } from '../types/Entity';
+import { EntityDict as BaseEntityDict } from '../base-app-domain';
+import { Checker, CheckerType } from '../types';
+import { SyncContext } from '../store/SyncRowStore';
+export default class SyncCheckerExecutor<ED extends EntityDict & BaseEntityDict, Cxt extends SyncContext<ED>> {
+    private checkerMap;
+    registerChecker<T extends keyof ED>(checker: Checker<ED, T, Cxt>): void;
+    check<T extends keyof ED>(entity: T, operation: Omit<ED[T]['Operation'], 'id'>, context: Cxt, when?: 'before' | 'after', checkerTypes?: CheckerType[]): void;
+}

package/lib/checkers/SyncCheckExecutor.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+// 简化版的对checker的同步检查
+var assert_1 = tslib_1.__importDefault(require("assert"));
+var types_1 = require("../types");
+var checker_1 = require("../store/checker");
+var filter_1 = require("../store/filter");
+var SyncCheckerExecutor = /** @class */ (function () {
+    function SyncCheckerExecutor() {
+        this.checkerMap = {};
+    }
+    SyncCheckerExecutor.prototype.registerChecker = function (checker) {
+        var _this = this;
+        var entity = checker.entity, action = checker.action, priority = checker.priority, type = checker.type, conditionalFilter = checker.conditionalFilter;
+        var _a = (0, checker_1.translateCheckerInSyncContext)(checker), fn = _a.fn, when = _a.when;
+        if (priority === undefined) {
+            priority = type === 'data' ? types_1.DATA_CHECKER_DEFAULT_PRIORITY : types_1.CHECKER_DEFAULT_PRIORITY;
+        }
+        var addCheckerMap = function (action2) {
+            var _a, _b, _c;
+            if (_this.checkerMap[entity] && _this.checkerMap[entity][action2]) {
+                var iter = 0;
+                var checkers = _this.checkerMap[entity][action2];
+                for (; iter < checkers.length; iter++) {
+                    if (priority <= checkers[iter].priority) {
+                        break;
+                    }
+                }
+                checkers.splice(iter, 0, {
+                    type: type,
+                    priority: priority,
+                    fn: fn,
+                    when: when,
+                    filter: conditionalFilter,
+                });
+            }
+            else if (_this.checkerMap[entity]) {
+                Object.assign(_this.checkerMap[entity], (_a = {},
+                    _a[action2] = [{
+                            type: type,
+                            priority: priority,
+                            fn: fn,
+                            when: when,
+                            filter: conditionalFilter,
+                        }],
+                    _a));
+            }
+            else {
+                Object.assign(_this.checkerMap, (_b = {},
+                    _b[entity] = (_c = {},
+                        _c[action2] = [{
+                                type: type,
+                                priority: priority,
+                                fn: fn,
+                                when: when,
+                                filter: conditionalFilter,
+                            }],
+                        _c),
+                    _b));
+            }
+        };
+        if (action instanceof Array) {
+            action.forEach(function (a) { return addCheckerMap(a); });
+        }
+        else {
+            addCheckerMap(action);
+        }
+    };
+    SyncCheckerExecutor.prototype.check = function (entity, operation, context, when, checkerTypes) {
+        var e_1, _a;
+        var action = operation.action;
+        var checkers = this.checkerMap[entity] && this.checkerMap[entity][action];
+        if (checkers) {
+            var checkers2 = checkers.filter(function (ele) { return (!checkerTypes || checkerTypes.includes(ele.type)) && (!when || ele.when === when); });
+            try {
+                for (var checkers2_1 = tslib_1.__values(checkers2), checkers2_1_1 = checkers2_1.next(); !checkers2_1_1.done; checkers2_1_1 = checkers2_1.next()) {
+                    var checker = checkers2_1_1.value;
+                    var filter = checker.filter;
+                    if (filter) {
+                        var filterr = typeof filter === 'function' ? filter(operation, context, {}) : filter;
+                        (0, assert_1.default)(!(filter instanceof Promise), "\u5BF9".concat(entity, "\u7684\u52A8\u4F5C").concat(action, "\u4E0A\u5B9A\u4E49\u7684checker\uFF0C\u5176filter\u8FD4\u56DE\u4E86Promise\uFF0C\u8BF7\u6CE8\u610F\u5C06\u540C\u6B65\u548C\u5F02\u6B65\u7684\u8FD4\u56DE\u533A\u5206\u5BF9\u5F85"));
+                        var isRepel = (0, filter_1.checkFilterRepel)(entity, context, filterr, operation.filter, true);
+                        (0, assert_1.default)(typeof isRepel === 'boolean');
+                        if (isRepel) {
+                            continue;
+                        }
+                    }
+                    checker.fn(operation, context, {});
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (checkers2_1_1 && !checkers2_1_1.done && (_a = checkers2_1.return)) _a.call(checkers2_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        }
+    };
+    return SyncCheckerExecutor;
+}());
+exports.default = SyncCheckerExecutor;

package/lib/store/TriggerExecutor.js

@@ -33,7 +33,7 @@ var TriggerExecutor = /** @class */ (function () {
     TriggerExecutor.prototype.registerChecker = function (checker) {
         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 _a = (0, checker_1.translateCheckerInAsyncContext)(checker, true), 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,

package/lib/store/checker.d.ts

@@ -2,7 +2,13 @@ import { AuthDefDict, Checker, EntityDict, OperateOption, SelectOption, StorageS
 import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { AsyncContext } from "./AsyncRowStore";
 import { SyncContext } from './SyncRowStore';
-export declare function translateCheckerInAsyncContext<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>>(checker: Checker<ED, T, Cxt>): {
+/**
+ *
+ * @param checker 要翻译的checker
+ * @param silent 如果silent，则row和relation类型的checker只会把限制条件加到查询上，而不报错（除掉create动作）
+ * @returns
+ */
+export declare function translateCheckerInAsyncContext<ED extends EntityDict & BaseEntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>>(checker: Checker<ED, T, Cxt>, silent?: boolean): {
     fn: Trigger<ED, T, Cxt>['fn'];
     when: 'before' | 'after';
 };

package/lib/store/checker.js

@@ -11,7 +11,13 @@ var string_1 = require("../utils/string");
 var lodash_1 = require("../utils/lodash");
 var relation_1 = require("./relation");
 var uuid_1 = require("../utils/uuid");
-function translateCheckerInAsyncContext(checker) {
+/**
+ *
+ * @param checker 要翻译的checker
+ * @param silent 如果silent，则row和relation类型的checker只会把限制条件加到查询上，而不报错（除掉create动作）
+ * @returns
+ */
+function translateCheckerInAsyncContext(checker, silent) {
     var _this = this;
     var entity = checker.entity, type = checker.type;
     var when = 'before'; // 现在create的relation改成提前的expression检查了，原先是先插入再后检查，性能不行，而且select也需要实现前检查
@@ -59,7 +65,7 @@ function translateCheckerInAsyncContext(checker) {
                                 _c.label = 3;
                             case 3:
                                 filter2 = _b;
-                                if (!['select', 'count', 'stat'].includes(action)) return [3 /*break*/, 4];
+                                if (!silent) return [3 /*break*/, 4];
                                 operation.filter = (0, filter_1.addFilterSegment)(operationFilter || {}, filter2);
                                 return [2 /*return*/, 0];
                             case 4: return [4 /*yield*/, (0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter || {}, true)];
@@ -102,11 +108,11 @@ function translateCheckerInAsyncContext(checker) {
             };
         }
         case 'relation': {
-            var relationFilter_1 = checker.relationFilter, errMsg = checker.errMsg;
+            var relationFilter_1 = checker.relationFilter, errMsg_2 = checker.errMsg;
             var fn = (function (_a, context, option) {
                 var operation = _a.operation;
                 return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var result, _b;
+                    var result, _b, filter, action;
                     return tslib_1.__generator(this, function (_c) {
                         switch (_c.label) {
                             case 0:
@@ -123,15 +129,24 @@ function translateCheckerInAsyncContext(checker) {
                                 _c.label = 3;
                             case 3:
                                 result = _b;
-                                if (result) {
-                                    if (operation.action === 'create') {
-                                        console.warn("".concat(entity, "\u5BF9\u8C61\u7684create\u7C7B\u578B\u7684checker\u4E2D\uFF0C\u5B58\u5728\u65E0\u6CD5\u8F6C\u6362\u4E3A\u8868\u8FBE\u5F0F\u5F62\u5F0F\u7684\u60C5\u51B5\uFF0C\u8BF7\u5C3D\u91CF\u4F7F\u7528authDef\u683C\u5F0F\u5B9A\u4E49\u8FD9\u7C7Bchecker"));
-                                    }
-                                    else {
-                                        operation.filter = (0, filter_1.combineFilters)([operation.filter, result]);
-                                    }
+                                if (!result) return [3 /*break*/, 5];
+                                filter = operation.filter, action = operation.action;
+                                if (action === 'create') {
+                                    console.warn("".concat(entity, "\u5BF9\u8C61\u7684create\u7C7B\u578B\u7684checker\u4E2D\uFF0C\u5B58\u5728\u65E0\u6CD5\u8F6C\u6362\u4E3A\u8868\u8FBE\u5F0F\u5F62\u5F0F\u7684\u60C5\u51B5\uFF0C\u8BF7\u5C3D\u91CF\u4F7F\u7528authDef\u683C\u5F0F\u5B9A\u4E49\u8FD9\u7C7Bchecker"));
+                                    return [2 /*return*/, 0];
                                 }
-                                return [2 /*return*/, 0];
+                                if (silent) {
+                                    operation.filter = (0, filter_1.addFilterSegment)(filter || {}, result);
+                                    return [2 /*return*/, 0];
+                                }
+                                (0, assert_1.default)(filter);
+                                return [4 /*yield*/, (0, filter_1.checkFilterContains)(entity, context, result, filter, true)];
+                            case 4:
+                                if (_c.sent()) {
+                                    return [2 /*return*/];
+                                }
+                                throw new Exception_1.OakUserUnpermittedException(errMsg_2);
+                            case 5: return [2 /*return*/, 0];
                         }
                     });
                 });
@@ -185,23 +200,17 @@ function translateCheckerInSyncContext(checker) {
             };
         }
         case 'row': {
-            var filter_3 = checker.filter, errMsg_2 = checker.errMsg;
+            var filter_3 = checker.filter, errMsg_3 = checker.errMsg;
             var fn = function (operation, context, option) {
                 var operationFilter = operation.filter, action = operation.action;
                 var filter2 = typeof filter_3 === 'function' ? filter_3(operation, context, option) : filter_3;
                 (0, assert_1.default)(operationFilter);
-                if (['select', 'count', 'stat'].includes(action)) {
-                    operation.filter = (0, filter_1.addFilterSegment)(operationFilter, filter2);
-                    return 0;
-                }
-                else {
-                    (0, assert_1.default)(!(filter2 instanceof Promise));
-                    if ((0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter, true)) {
-                        return;
-                    }
-                    var e = new Exception_1.OakRowInconsistencyException(undefined, errMsg_2);
-                    throw e;
+                (0, assert_1.default)(!(filter2 instanceof Promise));
+                if ((0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter, true)) {
+                    return;
                 }
+                var e = new Exception_1.OakRowInconsistencyException(undefined, errMsg_3);
+                throw e;
             };
             return {
                 fn: fn,
@@ -209,7 +218,7 @@ function translateCheckerInSyncContext(checker) {
             };
         }
         case 'relation': {
-            var relationFilter_2 = checker.relationFilter, errMsg_3 = checker.errMsg;
+            var relationFilter_2 = checker.relationFilter, errMsg_4 = checker.errMsg;
             var fn = function (operation, context, option) {
                 if (context.isRoot()) {
                     return;
@@ -226,7 +235,7 @@ function translateCheckerInSyncContext(checker) {
                     if ((0, filter_1.checkFilterContains)(entity, context, result, filter, true)) {
                         return;
                     }
-                    throw new Exception_1.OakUserUnpermittedException(errMsg_3);
+                    throw new Exception_1.OakUserUnpermittedException(errMsg_4);
                 }
             };
             return {
@@ -362,7 +371,7 @@ function translateCascadeRelationFilterMaker(schema, lch, entity2, pathPrefix) {
         var counters = [];
         if (filter) {
             if (relation === 2) {
-                if (filter.entity === entity && filter.entityId) {
+                if (filter.entity === attr && filter.entityId) {
                     // 这里对entityId的限定的数据只要和userId有一条relation，就不能否定可能会有创建动作（外键在最终create时，data上一定会有判定）
                     counters.push({
                         $entity: attr,

package/lib/store/filter.d.ts

@@ -107,3 +107,4 @@ export declare function makeTreeDescendantFilter<ED extends EntityDict, T extend
  */
 export declare function checkFilterContains<ED extends EntityDict, T extends keyof ED, Cxt extends SyncContext<ED> | AsyncContext<ED>>(entity: T, context: Cxt, contained: ED[T]['Selection']['filter'], filter?: ED[T]['Selection']['filter'], dataCompare?: true): boolean | Promise<boolean>;
 export declare function checkFilterRepel<ED extends EntityDict, T extends keyof ED, Cxt extends SyncContext<ED> | AsyncContext<ED>>(entity: T, context: Cxt, filter1: ED[T]['Selection']['filter'], filter2: ED[T]['Selection']['filter'], dataCompare?: true): boolean | Promise<boolean>;
+export declare function getCascadeEntityFilter<ED extends EntityDict, T extends keyof ED>(filter: NonNullable<ED[T]['Selection']['filter']>, attr: keyof NonNullable<ED[T]['Selection']['filter']>): ED[keyof ED]['Selection']['filter'];

package/lib/store/filter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkFilterRepel = exports.checkFilterContains = exports.makeTreeDescendantFilter = exports.makeTreeAncestorFilter = exports.same = exports.getRelevantIds = exports.repel = exports.contains = exports.judgeValueRelation = exports.combineFilters = exports.unionFilterSegment = exports.addFilterSegment = void 0;
+exports.getCascadeEntityFilter = exports.checkFilterRepel = exports.checkFilterContains = exports.makeTreeDescendantFilter = exports.makeTreeAncestorFilter = exports.same = exports.getRelevantIds = exports.repel = exports.contains = exports.judgeValueRelation = exports.combineFilters = exports.unionFilterSegment = exports.addFilterSegment = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var types_1 = require("../types");
@@ -845,6 +845,7 @@ function checkFilterContains(entity, context, contained, filter, dataCompare) {
             }]);
         var count = context.count(entity, {
             filter: filter2,
+            count: 1,
         }, {
             dontCollect: true,
             blockTrigger: true,
@@ -883,3 +884,22 @@ function checkFilterRepel(entity, context, filter1, filter2, dataCompare) {
     return false;
 }
 exports.checkFilterRepel = checkFilterRepel;
+function getCascadeEntityFilter(filter, attr) {
+    var filters = [];
+    if (filter[attr]) {
+        (0, assert_1.default)(typeof filter[attr] === 'object');
+        filters.push(filter[attr]);
+    }
+    if (filter.$and) {
+        filter.$and.forEach(function (ele) {
+            var f2 = getCascadeEntityFilter(ele, attr);
+            if (f2) {
+                filters.push(f2);
+            }
+        });
+    }
+    if (filters.length > 0) {
+        return combineFilters(filters);
+    }
+}
+exports.getCascadeEntityFilter = getCascadeEntityFilter;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "2.6.4",
+    "version": "2.6.6",
     "author": {
         "name": "XuChang"
     },