oak-domain 2.3.2 → 2.4.0

package/lib/store/checker.js

@@ -1,58 +1,79 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRelationHierarchyCheckers = exports.translateCheckerInSyncContext = exports.translateCheckerInAsyncContext = void 0;
+exports.createAuthCheckers = exports.translateCheckerInSyncContext = exports.translateCheckerInAsyncContext = void 0;
 var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var filter_1 = require("../store/filter");
 var Exception_1 = require("../types/Exception");
 var actionDef_1 = require("./actionDef");
 var string_1 = require("../utils/string");
+var lodash_1 = require("../utils/lodash");
+var relation_1 = require("./relation");
 function translateCheckerInAsyncContext(checker) {
     var _this = this;
-    var entity = checker.entity, type = checker.type;
+    var entity = checker.entity, type = checker.type, action = checker.action;
+    var when = ((action === 'create' || action instanceof Array && action.includes('create')) && ['relation'].includes(type)) ? 'after' : 'before';
     switch (type) {
         case 'data': {
             var checkerFn_1 = checker.checker;
-            return (function (_a, context) {
+            var fn = (function (_a, context) {
                 var operation = _a.operation;
                 return tslib_1.__awaiter(_this, void 0, void 0, function () {
                     var data;
                     return tslib_1.__generator(this, function (_b) {
-                        data = operation.data;
-                        checkerFn_1(data, context);
-                        return [2 /*return*/, 0];
+                        switch (_b.label) {
+                            case 0:
+                                data = operation.data;
+                                return [4 /*yield*/, checkerFn_1(data, context)];
+                            case 1:
+                                _b.sent();
+                                return [2 /*return*/, 0];
+                        }
                     });
                 });
             });
+            return {
+                fn: fn,
+                when: when,
+            };
         }
         case 'row': {
             var filter_2 = checker.filter, errMsg_1 = checker.errMsg, inconsistentRows_1 = checker.inconsistentRows;
-            return (function (_a, context, option) {
+            var fn = (function (_a, context, option) {
                 var operation = _a.operation;
                 return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var operationFilter, action, filter2, entity2, selection2, rows2, data_1, rows2, data_2;
-                    var _b, _c;
-                    return tslib_1.__generator(this, function (_d) {
-                        switch (_d.label) {
+                    var operationFilter, action, filter2, _b, entity2, selection2, rows2, data_1, rows2, data_2;
+                    var _c, _d;
+                    return tslib_1.__generator(this, function (_e) {
+                        switch (_e.label) {
                             case 0:
                                 operationFilter = operation.filter, action = operation.action;
-                                filter2 = typeof filter_2 === 'function' ? filter_2(operation, context, option) : filter_2;
-                                if (!['select', 'count', 'stat'].includes(action)) return [3 /*break*/, 1];
+                                if (!(typeof filter_2 === 'function')) return [3 /*break*/, 2];
+                                return [4 /*yield*/, filter_2(operation, context, option)];
+                            case 1:
+                                _b = _e.sent();
+                                return [3 /*break*/, 3];
+                            case 2:
+                                _b = filter_2;
+                                _e.label = 3;
+                            case 3:
+                                filter2 = _b;
+                                if (!['select', 'count', 'stat'].includes(action)) return [3 /*break*/, 4];
                                 operation.filter = (0, filter_1.addFilterSegment)(operationFilter || {}, filter2);
                                 return [2 /*return*/, 0];
-                            case 1: return [4 /*yield*/, (0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter || {})];
-                            case 2:
-                                if (_d.sent()) {
+                            case 4: return [4 /*yield*/, (0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter || {}, true)];
+                            case 5:
+                                if (_e.sent()) {
                                     return [2 /*return*/, 0];
                                 }
-                                if (!inconsistentRows_1) return [3 /*break*/, 4];
+                                if (!inconsistentRows_1) return [3 /*break*/, 7];
                                 entity2 = inconsistentRows_1.entity, selection2 = inconsistentRows_1.selection;
                                 return [4 /*yield*/, context.select(entity2, selection2(operationFilter), {
                                         dontCollect: true,
                                         blockTrigger: true,
                                     })];
-                            case 3:
-                                rows2 = _d.sent();
+                            case 6:
+                                rows2 = _e.sent();
                                 data_1 = {};
                                 rows2.forEach(function (ele) {
                                     var _a;
@@ -62,11 +83,11 @@ function translateCheckerInAsyncContext(checker) {
                                 });
                                 throw new Exception_1.OakRowInconsistencyException({
                                     a: 's',
-                                    d: (_b = {},
-                                        _b[entity2] = data_1,
-                                        _b)
+                                    d: (_c = {},
+                                        _c[entity2] = data_1,
+                                        _c)
                                 }, errMsg_1);
-                            case 4: return [4 /*yield*/, context.select(entity, {
+                            case 7: return [4 /*yield*/, context.select(entity, {
                                     data: (0, actionDef_1.getFullProjection)(entity, context.getSchema()),
                                     filter: Object.assign({}, operationFilter, {
                                         $not: filter2,
@@ -75,8 +96,8 @@ function translateCheckerInAsyncContext(checker) {
                                     dontCollect: true,
                                     blockTrigger: true,
                                 })];
-                            case 5:
-                                rows2 = _d.sent();
+                            case 8:
+                                rows2 = _e.sent();
                                 data_2 = {};
                                 rows2.forEach(function (ele) {
                                     var _a;
@@ -86,70 +107,91 @@ function translateCheckerInAsyncContext(checker) {
                                 });
                                 throw new Exception_1.OakRowInconsistencyException({
                                     a: 's',
-                                    d: (_c = {},
-                                        _c[entity] = data_2,
-                                        _c)
+                                    d: (_d = {},
+                                        _d[entity] = data_2,
+                                        _d)
                                 }, errMsg_1);
                         }
                     });
                 });
             });
+            return {
+                fn: fn,
+                when: when,
+            };
         }
         case 'relation': {
-            var relationFilter_1 = checker.relationFilter;
-            return (function (_a, context, option) {
+            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 () {
-                    return tslib_1.__generator(this, function (_b) {
-                        if (context.isRoot()) {
-                            return [2 /*return*/, 0];
+                    var filter2, data, filter, _b, _c, _d;
+                    return tslib_1.__generator(this, function (_e) {
+                        switch (_e.label) {
+                            case 0:
+                                if (context.isRoot()) {
+                                    return [2 /*return*/, 0];
+                                }
+                                if (!(operation.action === 'create')) return [3 /*break*/, 3];
+                                return [4 /*yield*/, relationFilter_1(operation, context, option)];
+                            case 1:
+                                filter2 = _e.sent();
+                                data = operation.data;
+                                filter = data instanceof Array ? {
+                                    id: {
+                                        $in: data.map(function (ele) { return ele.id; }),
+                                    },
+                                } : {
+                                    id: data.id,
+                                };
+                                return [4 /*yield*/, (0, filter_1.checkFilterContains)(entity, context, filter2, filter, true)];
+                            case 2:
+                                if (_e.sent()) {
+                                    return [2 /*return*/, 0];
+                                }
+                                throw new Exception_1.OakUserUnpermittedException(errMsg_2);
+                            case 3:
+                                _b = operation;
+                                _c = filter_1.combineFilters;
+                                _d = [operation.filter];
+                                return [4 /*yield*/, relationFilter_1(operation, context, option)];
+                            case 4:
+                                _b.filter = _c.apply(void 0, [_d.concat([_e.sent()])]);
+                                _e.label = 5;
+                            case 5: return [2 /*return*/, 0];
                         }
-                        // 对后台而言，将生成的relationFilter加到filter之上(select可以在此加以权限的过滤)
-                        operation.filter = (0, filter_1.combineFilters)([operation.filter, relationFilter_1(operation, context, option)]);
-                        return [2 /*return*/, 0];
                     });
                 });
             });
+            return {
+                fn: fn,
+                when: when,
+            };
         }
-        case 'expression':
-        case 'expressionRelation': {
-            var expression_1 = checker.expression, errMsg_2 = checker.errMsg;
-            return (function (_a, context, option) {
+        case 'logical':
+        case 'logicalRelation': {
+            var checkerFn_2 = checker.checker;
+            var fn = (function (_a, context, option) {
                 var operation = _a.operation;
                 return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var exprResult, expressionEntity, expr, expressionFilter, _b, result;
-                    return tslib_1.__generator(this, function (_c) {
-                        switch (_c.label) {
+                    return tslib_1.__generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
-                                if (context.isRoot() && type === 'expressionRelation') {
+                                if (context.isRoot() && type === 'logicalRelation') {
                                     return [2 /*return*/, 0];
                                 }
-                                exprResult = expression_1(operation, context, option);
-                                if (!(typeof exprResult === 'string')) return [3 /*break*/, 1];
-                                throw new Exception_1.OakUserUnpermittedException(exprResult || errMsg_2);
+                                return [4 /*yield*/, checkerFn_2(operation, context, option)];
                             case 1:
-                                if (!(exprResult === undefined)) return [3 /*break*/, 2];
+                                _b.sent();
                                 return [2 /*return*/, 0];
-                            case 2:
-                                expressionEntity = exprResult.entity, expr = exprResult.expr, expressionFilter = exprResult.filter;
-                                return [4 /*yield*/, context.select(expressionEntity, {
-                                        data: {
-                                            $expr: expr,
-                                        },
-                                        filter: expressionFilter,
-                                    }, Object.assign({}, option, { dontCollect: true }))];
-                            case 3:
-                                _b = tslib_1.__read.apply(void 0, [_c.sent(), 1]), result = _b[0];
-                                if (!result) {
-                                    // 条件判定为假，抛异常
-                                    throw new Exception_1.OakUserUnpermittedException(errMsg_2);
-                                }
-                                _c.label = 4;
-                            case 4: return [2 /*return*/, 0];
                         }
                     });
                 });
             });
+            return {
+                fn: fn,
+                when: when,
+            };
         }
         default: {
             (0, assert_1.default)(false);
@@ -158,15 +200,20 @@ function translateCheckerInAsyncContext(checker) {
 }
 exports.translateCheckerInAsyncContext = translateCheckerInAsyncContext;
 function translateCheckerInSyncContext(checker) {
-    var entity = checker.entity, type = checker.type;
+    var entity = checker.entity, type = checker.type, action = checker.action;
+    var when = ((action === 'create' || action instanceof Array && action.includes('create')) && ['relation'].includes(type)) ? 'after' : 'before';
     switch (type) {
         case 'data': {
-            var checkerFn_2 = checker.checker;
-            return function (operation, context) { return checkerFn_2(operation.data, context); };
+            var checkerFn_3 = checker.checker;
+            var fn = function (operation, context) { return checkerFn_3(operation.data, context); };
+            return {
+                fn: fn,
+                when: when,
+            };
         }
         case 'row': {
             var filter_3 = checker.filter, errMsg_3 = checker.errMsg;
-            return function (operation, context, option) {
+            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);
@@ -175,56 +222,59 @@ function translateCheckerInSyncContext(checker) {
                     return 0;
                 }
                 else {
-                    if ((0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter)) {
+                    (0, assert_1.default)(!(filter2 instanceof Promise));
+                    if ((0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter, true)) {
                         return;
                     }
                     throw new Exception_1.OakRowInconsistencyException(undefined, errMsg_3);
                 }
             };
+            return {
+                fn: fn,
+                when: when,
+            };
         }
         case 'relation': {
-            var filter_4 = checker.relationFilter, errMsg_4 = checker.errMsg;
-            return function (operation, context, option) {
+            var relationFilter_2 = checker.relationFilter, errMsg_4 = checker.errMsg;
+            var fn = function (operation, context, option) {
                 if (context.isRoot()) {
                     return;
                 }
-                var filter2 = typeof filter_4 === 'function' ? filter_4(operation, context, option) : filter_4;
-                var operationFilter = operation.filter;
-                (0, assert_1.default)(operationFilter);
-                if ((0, filter_1.checkFilterContains)(entity, context, filter2, operationFilter)) {
+                var filter2 = typeof relationFilter_2 === 'function' ? relationFilter_2(operation, context, option) : relationFilter_2;
+                var filter = operation.filter, action = operation.action;
+                var filter3 = filter;
+                if (action === 'create') {
+                    var data = operation.data;
+                    filter3 = data instanceof Array ? {
+                        id: {
+                            $in: data.map(function (ele) { return ele.id; }),
+                        },
+                    } : { id: data.id };
+                }
+                (0, assert_1.default)(filter3);
+                (0, assert_1.default)(!(filter2 instanceof Promise));
+                if ((0, filter_1.checkFilterContains)(entity, context, filter2, filter3, true)) {
                     return;
                 }
                 throw new Exception_1.OakUserUnpermittedException(errMsg_4);
             };
+            return {
+                fn: fn,
+                when: when,
+            };
         }
-        case 'expression':
-        case 'expressionRelation': {
-            var expression_2 = checker.expression, errMsg_5 = checker.errMsg;
-            return function (operation, context, option) {
-                if (context.isRoot() && type === 'expressionRelation') {
-                    return;
-                }
-                var exprResult = expression_2(operation, context, option);
-                if (typeof exprResult === 'string') {
-                    throw new Exception_1.OakUserUnpermittedException(exprResult || errMsg_5);
-                }
-                else if (exprResult === undefined) {
-                    return 0;
-                }
-                else {
-                    var expressionEntity = exprResult.entity, expr = exprResult.expr, expressionFilter = exprResult.filter;
-                    var _a = tslib_1.__read(context.select(expressionEntity, {
-                        data: {
-                            $expr: expr,
-                        },
-                        filter: expressionFilter,
-                    }, Object.assign({}, option, { dontCollect: true })), 1), result = _a[0];
-                    if (!result.$expr) {
-                        // 条件判定为假，抛异常
-                        throw new Exception_1.OakRowInconsistencyException(undefined, errMsg_5);
-                    }
+        case 'logical':
+        case 'logicalRelation': {
+            var checkerFn_4 = checker.checker;
+            var fn = function (operation, context, option) {
+                if (context.isRoot() && type === 'logicalRelation') {
                     return;
                 }
+                checkerFn_4(operation, context, option);
+            };
+            return {
+                fn: fn,
+                when: when,
             };
         }
         default: {
@@ -233,154 +283,211 @@ function translateCheckerInSyncContext(checker) {
     }
 }
 exports.translateCheckerInSyncContext = translateCheckerInSyncContext;
-function createRelationHierarchyCheckers(schema) {
-    var checkers = [];
-    var _loop_1 = function (entity) {
-        var e_1, _a;
-        var relationHierarchy = schema[entity].relationHierarchy;
-        if (relationHierarchy) {
-            // 先build反向hierarchy的map
-            var reverseHierarchy_1 = {};
-            for (var r in relationHierarchy) {
-                try {
-                    for (var _b = (e_1 = void 0, tslib_1.__values(relationHierarchy[r])), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var r2 = _c.value;
-                        if (!reverseHierarchy_1[r2]) {
-                            reverseHierarchy_1[r2] = [r];
-                        }
-                        else {
-                            reverseHierarchy_1[r2].push(r);
-                        }
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+function translateCascadeRelationFilterMaker(schema, lch, entity2) {
+    var cascadePath = lch.cascadePath, relations = lch.relations;
+    var paths = cascadePath.split('.');
+    var translateRelationFilter = function (entity) {
+        // 有两种情况，此entity和user有Relation定义，或是此entity上有userId
+        if (schema[entity].relation) {
+            var relationEntityName_1 = "user".concat((0, string_1.firstLetterUpperCase)(entity));
+            return function (userId) {
+                var _a;
+                var filter = relations ? {
+                    userId: userId,
+                    relation: {
+                        $in: relations,
+                    },
+                } : {
+                    userId: userId,
+                };
+                return {
+                    id: {
+                        $in: {
+                            entity: relationEntityName_1,
+                            data: (_a = {},
+                                _a["".concat(entity, "Id")] = 1,
+                                _a),
+                            filter: filter,
+                        },
+                    },
+                };
+            };
+        }
+        var attributes = schema[entity].attributes;
+        (0, assert_1.default)(attributes.hasOwnProperty('userId') && attributes.userId.type === 'ref' && attributes.userId.ref === 'user', "\u5728".concat(entity, "\u4E0A\u65E2\u627E\u4E0D\u5230userId\uFF0C\u4E5F\u6CA1\u6709relation\u5B9A\u4E49"));
+        return function (userId) { return ({
+            userId: userId,
+        }); };
+    };
+    var translateFilterMakerIter = function (entity, iter) {
+        var relation = (0, relation_1.judgeRelation)(schema, entity, paths[iter]);
+        if (iter === paths.length - 1) {
+            if (relation === 2) {
+                var filterMaker_1 = translateRelationFilter(paths[iter]);
+                return function (userId) {
+                    var _a;
+                    var filter = filterMaker_1(userId);
+                    if (filter.$in) {
+                        return {
+                            entity: paths[iter],
+                            entityId: filter,
+                        };
                     }
-                    finally { if (e_1) throw e_1.error; }
-                }
+                    return _a = {},
+                        _a[paths[iter]] = filter,
+                        _a;
+                };
             }
-            // 对userEntity对象的授权和回收建立checker
-            var userEntityName_1 = "user".concat((0, string_1.firstLetterUpperCase)(entity));
-            var entityIdAttr_1 = "".concat(entity, "Id");
-            checkers.push({
-                entity: userEntityName_1,
-                action: 'create',
-                type: 'expressionRelation',
-                expression: function (operation, context) {
+            (0, assert_1.default)(typeof relation === 'string');
+            var filterMaker_2 = translateRelationFilter(relation);
+            return function (userId) {
+                var _a, _b;
+                var filter = filterMaker_2(userId);
+                if (filter.$in) {
+                    return _a = {},
+                        _a["".concat(paths[iter], "Id")] = filter,
+                        _a;
+                }
+                return _b = {},
+                    _b[paths[iter]] = filter,
+                    _b;
+            };
+        }
+        else {
+            var subFilterMaker_1 = translateFilterMakerIter(paths[iter], iter + 1);
+            if (iter === 0) {
+                return function (userId) {
                     var _a;
-                    var data = operation.data;
-                    var _b = data, relation = _b.relation, _c = entityIdAttr_1, entityId = _b[_c];
-                    var legalRelations = reverseHierarchy_1[relation];
-                    if (!legalRelations) {
-                        return undefined;
-                    }
-                    if (legalRelations.length === 0) {
-                        return '这是不应该跑出来的情况，请杀程序员祭天';
-                    }
-                    var userId = context.getCurrentUserId();
-                    return {
-                        entity: userEntityName_1,
-                        expr: {
-                            $gt: [{
-                                    '#attr': '$$createAt$$',
-                                }, 0]
-                        },
-                        filter: (_a = {
-                                userId: userId
-                            },
-                            _a[entityIdAttr_1] = entityId,
-                            _a.relation = {
-                                $in: legalRelations,
-                            },
-                            _a)
-                    };
-                },
-                errMsg: '越权操作',
-            });
-            var _loop_2 = function (r) {
+                    var subFilter = subFilterMaker_1(userId);
+                    return _a = {},
+                        _a[paths[iter]] = subFilter,
+                        _a;
+                };
+            }
+            return function (userId) {
+                var _a;
+                return (_a = {},
+                    _a[paths[iter]] = subFilterMaker_1(userId),
+                    _a);
+            };
+        }
+    };
+    var filter = cascadePath ? translateFilterMakerIter(entity2, 0) : translateRelationFilter(entity2);
+    return filter;
+}
+function translateActionAuthFilterMaker(schema, relationItem, entity) {
+    if (relationItem instanceof Array) {
+        var maker_1 = relationItem.map(function (ele) {
+            if (ele instanceof Array) {
+                return ele.map(function (ele2) { return translateCascadeRelationFilterMaker(schema, ele2, entity); });
+            }
+            return [translateCascadeRelationFilterMaker(schema, ele, entity)];
+        });
+        return function (userId) { return ({
+            $or: maker_1.map(function (ele) { return ({
+                $and: ele.map(function (ele2) { return ele2(userId); })
+            }); })
+        }); };
+    }
+    var filterMaker = translateCascadeRelationFilterMaker(schema, relationItem, entity);
+    return function (userId) { return filterMaker(userId); };
+}
+function createAuthCheckers(schema, authDict) {
+    var checkers = [];
+    var _loop_1 = function (entity) {
+        var _a;
+        if (authDict[entity]) {
+            var _b = authDict[entity], relationAuth = _b.relationAuth, actionAuth = _b.actionAuth;
+            if (relationAuth) {
+                var raFilterMakerDict_1 = {};
+                for (var r in relationAuth) {
+                    Object.assign(raFilterMakerDict_1, (_a = {},
+                        _a[r] = translateActionAuthFilterMaker(schema, relationAuth[r], entity),
+                        _a));
+                }
+                var userEntityName_1 = "user".concat((0, string_1.firstLetterUpperCase)(entity));
+                var entityIdAttr_1 = "".concat(entity, "Id");
                 checkers.push({
                     entity: userEntityName_1,
-                    action: 'remove',
-                    type: 'expressionRelation',
-                    conditionalFilter: {
-                        relation: r,
+                    action: 'create',
+                    type: 'relation',
+                    relationFilter: function (operation, context) {
+                        var _a;
+                        var data = operation.data;
+                        (0, assert_1.default)(!(data instanceof Array));
+                        var _b = data, relation = _b.relation, _c = entityIdAttr_1, entityId = _b[_c];
+                        var userId = context.getCurrentUserId();
+                        if (!raFilterMakerDict_1[relation]) {
+                            return;
+                        }
+                        var filter = raFilterMakerDict_1[relation](userId);
+                        return _a = {},
+                            _a[entity] = filter,
+                            _a;
                     },
-                    expression: function (operation, context) {
-                        var _a, _b;
+                    errMsg: '越权操作',
+                });
+                checkers.push({
+                    entity: userEntityName_1,
+                    action: 'remove',
+                    type: 'relation',
+                    relationFilter: function (operation, context) {
+                        var _a;
                         var userId = context.getCurrentUserId();
                         var filter = operation.filter;
-                        var legalRelations = reverseHierarchy_1[r];
-                        if (legalRelations.length === 0) {
-                            return '这是不应该跑出来的情况，请杀程序员祭天';
-                        }
-                        return {
-                            entity: userEntityName_1,
-                            expr: {
-                                $gt: [{
-                                        '#attr': '$$createAt$$',
-                                    }, 0]
-                            },
-                            filter: (_a = {
-                                    userId: userId
-                                },
-                                _a[entityIdAttr_1] = {
-                                    $in: {
-                                        entity: userEntityName_1,
-                                        data: (_b = {},
-                                            _b[entityIdAttr_1] = 1,
-                                            _b),
-                                        filter: filter,
-                                    }
-                                },
-                                _a.relation = {
-                                    $in: legalRelations,
+                        var makeFilterFromRows = function (rows) {
+                            var relations = (0, lodash_1.uniq)(rows.map(function (ele) { return ele.relation; }));
+                            var entityIds = (0, lodash_1.uniq)(rows.map(function (ele) { return ele[entityIdAttr_1]; }));
+                            (0, assert_1.default)(entityIds.length === 1, "\u5728\u56DE\u6536".concat(userEntityName_1, "\u4E0A\u6743\u9650\u65F6\uFF0C\u5355\u6B21\u56DE\u6536\u6D89\u53CA\u5230\u4E86\u4E0D\u540C\u7684\u5BF9\u8C61\uFF0C\u6B64\u64CD\u4F5C\u4E0D\u88AB\u5141\u8BB8"));
+                            // const entityId = entityIds[0]!;
+                            // 所有的relation条件要同时满足and关系（注意这里的filter翻译出来是在entity对象上，不是在userEntity对象上）
+                            return {
+                                $and: relations.map(function (relation) { return raFilterMakerDict_1[relation]; }).filter(function (ele) { return !!ele; }).map(function (ele) {
+                                    var _a;
+                                    return (_a = {},
+                                        _a[entity] = ele(userId),
+                                        _a);
+                                })
+                            };
+                        };
+                        var toBeRemoved = context.select(userEntityName_1, {
+                            data: (_a = {
+                                    id: 1,
+                                    relation: 1
                                 },
+                                _a[entityIdAttr_1] = 1,
                                 _a),
-                        };
+                            filter: filter,
+                        }, { dontCollect: true });
+                        if (toBeRemoved instanceof Promise) {
+                            return toBeRemoved.then(function (rows) { return makeFilterFromRows(rows); });
+                        }
+                        return makeFilterFromRows(toBeRemoved);
                     },
                     errMsg: '越权操作',
                 });
-            };
-            for (var r in reverseHierarchy_1) {
-                _loop_2(r);
+                // 转让权限现在用update动作，只允许update userId给其它人
+                // todo 等实现的时候再写
             }
-            /* // 一个人不能授权给自己，也不能删除自己的授权
-            checkers.push({
-                entity: userEntityName as keyof ED,
-                action: 'create' as ED[keyof ED]['Action'],
-                type: 'data',
-                checker: (data, context) => {
-                    assert(!(data instanceof Array));
-                    const { userId } = data as ED[keyof ED]['CreateSingle']['data'];
-                    const userId2 = context.getCurrentUserId(true);
-                    if (userId === userId2) {
-                        throw new OakDataException('不允许授权给自己');
-                    }
+            if (actionAuth) {
+                var _loop_2 = function (a) {
+                    var filterMaker = translateActionAuthFilterMaker(schema, actionAuth[a], entity);
+                    checkers.push({
+                        entity: entity,
+                        action: a,
+                        type: 'relation',
+                        relationFilter: function (operation, context) {
+                            // const { filter } = operation;
+                            var filter = filterMaker(context.getCurrentUserId());
+                            return filter;
+                        },
+                        errMsg: '定义的actionAuth中检查出来越权操作',
+                    });
+                };
+                for (var a in actionAuth) {
+                    _loop_2(a);
                 }
-            });
-
-            checkers.push({
-                entity: userEntityName as keyof ED,
-                action: 'remove' as ED[keyof ED]['Action'],
-                type: 'row',
-                filter: (operation, context) => {
-                    const userId = context.getCurrentUserId(true);
-                    if (userId) {
-                        return {
-                            userId: {
-                                $ne: userId,
-                            },
-                        };
-                    }
-                    console.warn(`没有当前用户但在删除权限，请检查。对象是${entity}`);
-                    return {};
-                },
-                errMsg: '不允许回收自己的授权',
-            }); */
-            // 转让权限现在用update动作，只允许update userId给其它人
-            // todo 等实现的时候再写
+            }
         }
     };
     for (var entity in schema) {
@@ -388,4 +495,4 @@ function createRelationHierarchyCheckers(schema) {
     }
     return checkers;
 }
-exports.createRelationHierarchyCheckers = createRelationHierarchyCheckers;
+exports.createAuthCheckers = createAuthCheckers;