oak-domain 2.4.4 → 2.5.2

package/lib/base-app-domain/UserEntityGrant/Storage.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.desc = void 0;
+var action_1 = require("../../actions/action");
+exports.desc = {
+    attributes: {
+        entity: {
+            type: "varchar",
+            params: {
+                length: 32
+            }
+        },
+        entityId: {
+            type: "varchar",
+            params: {
+                length: 64
+            }
+        },
+        relation: {
+            type: "varchar",
+            params: {
+                length: 32
+            }
+        }
+    },
+    actionType: "crud",
+    actions: action_1.genericActions
+};

package/lib/base-app-domain/_SubQuery.d.ts

@@ -3,6 +3,7 @@ import * as ModiEntity from "./ModiEntity/Schema";
 import * as Oper from "./Oper/Schema";
 import * as OperEntity from "./OperEntity/Schema";
 import * as User from "./User/Schema";
+import * as UserEntityGrant from "./UserEntityGrant/Schema";
 export declare type ModiIdSubQuery = {
     [K in "$in" | "$nin"]?: (ModiEntity.ModiIdSubQuery & {
         entity: "modiEntity";
@@ -32,5 +33,12 @@ export declare type UserIdSubQuery = {
         entity: "oper";
     }) | (User.UserIdSubQuery & {
         entity: "user";
+    }) | (User.UserIdSubQuery & {
+        entity: "user";
+    }) | any;
+};
+export declare type UserEntityGrantIdSubQuery = {
+    [K in "$in" | "$nin"]?: (UserEntityGrant.UserEntityGrantIdSubQuery & {
+        entity: "userEntityGrant";
     }) | any;
 };

package/lib/checkers/index.js

@@ -7,7 +7,7 @@ var modi_1 = require("../store/modi");
 function createDynamicCheckers(schema, authDict) {
     var checkers = [];
     checkers.push.apply(checkers, tslib_1.__spreadArray([], tslib_1.__read((0, modi_1.createModiRelatedCheckers)(schema)), false));
-    // checkers.push(...createRemoveCheckers<ED, Cxt>(schema));
+    checkers.push.apply(checkers, tslib_1.__spreadArray([], tslib_1.__read((0, checker_1.createRemoveCheckers)(schema, authDict)), false));
     if (authDict) {
         checkers.push.apply(checkers, tslib_1.__spreadArray([], tslib_1.__read((0, checker_1.createAuthCheckers)(schema, authDict)), false));
     }

package/lib/compiler/schemalBuilder.js

@@ -51,6 +51,20 @@ function addRelationship(many, one, key, notNull) {
             _b));
     }
 }
+/**
+ * 对relationship去重。一旦发生对象重定义这里就有可能重复
+ */
+function uniqRelationships() {
+    for (var entity in ManyToOne) {
+        ManyToOne[entity] = (0, lodash_1.uniqBy)(ManyToOne[entity], function (ele) { return "".concat(ele[0], "-").concat(ele[1]); });
+    }
+    for (var entity in OneToMany) {
+        OneToMany[entity] = (0, lodash_1.uniqBy)(OneToMany[entity], function (ele) { return "".concat(ele[0], "-").concat(ele[1]); });
+    }
+    for (var entity in ReversePointerRelations) {
+        OneToMany[entity] = (0, lodash_1.uniq)(OneToMany[entity]);
+    }
+}
 function createForeignRef(entity, foreignKey, ref) {
     if (entity === foreignKey) {
         return factory.createIdentifier(ref);
@@ -317,9 +331,10 @@ function analyzeEntity(filename, path, program, relativePath) {
     var sourceFile = program.getSourceFile(fullPath);
     var moduleName = filename.split('.')[0];
     if (Schema.hasOwnProperty(moduleName)) {
-        if (!path.includes('oak-general-business')) {
-            console.log("\u51FA\u73B0\u4E86\u540C\u540D\u7684Entity\u5B9A\u4E49\u300C".concat(moduleName, "\u300D\uFF0C\u5C06\u4F7F\u7528\u60A8\u6240\u5B9A\u4E49\u7684\u5BF9\u8C61\u7ED3\u6784\u53D6\u4EE3\u6389\u9ED8\u8BA4\u5BF9\u8C61\uFF0C\u8BF7\u786E\u8BA4"));
-        }
+        delete ActionAsts[moduleName];
+        delete SchemaAsts[moduleName];
+        // removeFromRelationShip(moduleName);
+        console.warn("\u51FA\u73B0\u4E86\u540C\u540D\u7684Entity\u5B9A\u4E49\u300C".concat(moduleName, "\u300D\uFF0C\u5C06\u4F7F\u7528").concat(fullPath, "\u53D6\u4EE3\u6389\u9ED8\u8BA4\u5BF9\u8C61\uFF0C\u8BF7\u68C0\u67E5\u65B0\u7684\u5BF9\u8C61\u7ED3\u6784\u53CA\u76F8\u5173\u5E38\u91CF\u5B9A\u4E49\u4E0E\u539F\u6709\u7684\u517C\u5BB9\uFF0C\u5426\u5219\u539F\u6709\u5BF9\u8C61\u7684\u76F8\u5173\u903B\u8F91\u4F1A\u51FA\u73B0\u4E0D\u53EF\u77E5\u5F02\u5E38"));
     }
     var referencedSchemas = [];
     var schemaAttrs = [];
@@ -340,7 +355,7 @@ function analyzeEntity(filename, path, program, relativePath) {
     // let relationHierarchy: ts.ObjectLiteralExpression | undefined = undefined;
     // let reverseCascadeRelationHierarchy: ts.ObjectLiteralExpression | undefined = undefined;
     ts.forEachChild(sourceFile, function (node) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (ts.isImportDeclaration(node)) {
             var entityImported = getEntityImported(node);
             if (entityImported) {
@@ -389,7 +404,9 @@ function analyzeEntity(filename, path, program, relativePath) {
                                 && referencedSchemas.includes(typeArguments[0].typeName.text), "\u300C".concat(filename, "\u300D\u975E\u6CD5\u7684\u5C5E\u6027\u5B9A\u4E49\u300C").concat(attrName, "\u300D"));
                             var reverseEntity = typeArguments[0].typeName.text;
                             if (ReversePointerRelations[reverseEntity]) {
-                                ReversePointerRelations[reverseEntity].push(moduleName);
+                                if (!ReversePointerRelations[reverseEntity].includes(moduleName)) {
+                                    ReversePointerRelations[reverseEntity].push(moduleName);
+                                }
                             }
                             else {
                                 (0, lodash_1.assign)(ReversePointerRelations, (_a = {},
@@ -520,6 +537,9 @@ function analyzeEntity(filename, path, program, relativePath) {
                 if (hasRelationDef || moduleName === 'User') {
                     actionDefNodes.push(factory.createTypeReferenceNode('RelationAction', undefined));
                 }
+                if (process.env.COMPLING_AS_LIB) {
+                    actionDefNodes.push(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword));
+                }
                 pushStatementIntoActionAst(moduleName, factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Action"), undefined, factory.createUnionTypeNode(actionDefNodes)), sourceFile);
                 dealWithActions(moduleName, filename, node.type, program, sourceFile, !!hasRelationDef || moduleName === 'User');
             }
@@ -558,12 +578,35 @@ function analyzeEntity(filename, path, program, relativePath) {
                     _d));
                 addRelationship(relationEntityName, 'User', 'user', true);
                 addRelationship(relationEntityName, moduleName, entityLc, true);
+                // 对UserEntityGrant对象，建立相应的反指关系
+                if (ReversePointerRelations['UserEntityGrant']) {
+                    if (!ReversePointerRelations['UserEntityGrant'].includes(moduleName)) {
+                        ReversePointerRelations['UserEntityGrant'].push(moduleName);
+                    }
+                }
+                else {
+                    (0, lodash_1.assign)(ReversePointerRelations, (_e = {},
+                        _e['UserEntityGrant'] = [moduleName],
+                        _e));
+                }
                 hasRelationDef = node;
             }
             else if (node.name.text.endsWith('Action') || node.name.text.endsWith('State')) {
                 (0, assert_1.default)(!localeDef, "\u3010".concat(filename, "\u3011locale\u5B9A\u4E49\u987B\u5728Action/State\u4E4B\u540E"));
                 hasActionOrStateDef = true;
-                pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, node.decorators, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], node.name, node.typeParameters, node.type), sourceFile);
+                var type = node.type;
+                if (ts.isUnionTypeNode(type)) {
+                    pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, node.decorators, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], node.name, node.typeParameters, process.env.COMPLING_AS_LIB ? factory.createUnionTypeNode(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(type.types), false), [
+                        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+                    ], false)) : type), sourceFile);
+                }
+                else {
+                    (0, assert_1.default)(ts.isLiteralTypeNode(type) || ts.isTypeReferenceNode(type), "".concat(moduleName, " - ").concat(node.name));
+                    pushStatementIntoActionAst(moduleName, factory.updateTypeAliasDeclaration(node, node.decorators, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], node.name, node.typeParameters, process.env.COMPLING_AS_LIB ? factory.createUnionTypeNode([
+                        type,
+                        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+                    ]) : type), sourceFile);
+                }
             }
             else if (beforeSchema) {
                 // 本地规定的一些形状定义，直接使用
@@ -3291,6 +3334,7 @@ function analyzeEntities(inputDir, relativePath) {
         analyzeEntity(filename, inputDir, program, relativePath);
     });
     analyzeInModi();
+    uniqRelationships();
 }
 exports.analyzeEntities = analyzeEntities;
 function buildSchema(outputDir) {

package/lib/entities/User.d.ts

@@ -4,4 +4,5 @@ export interface Schema extends EntityShape {
     name?: String<16>;
     nickname?: String<64>;
     password?: Text;
+    ref?: Schema;
 }

package/lib/entities/User.js

@@ -1,12 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 ;
+var UserActionDef = {
+    stm: {
+        mergeTo: ['normal', 'merged'],
+    },
+};
 var locale = {
     zh_CN: {
         attr: {
             name: '姓名',
             nickname: '昵称',
             password: '密码',
+            ref: '指向用户',
+            userState: '状态',
+        },
+        action: {
+            mergeTo: '合并',
         },
+        v: {
+            userState: {
+                normal: '正常',
+                merged: '已被合并',
+            },
+        }
     },
 };

package/lib/entities/UserEntityGrant.d.ts

@@ -0,0 +1,7 @@
+import { String } from '../types/DataType';
+import { EntityShape } from '../types/Entity';
+export interface Schema extends EntityShape {
+    entity: String<32>;
+    entityId: String<64>;
+    relation: String<32>;
+}

package/lib/entities/UserEntityGrant.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+;
+var locale = {
+    zh_CN: {
+        attr: {
+            relation: '关系',
+            entity: '关联对象',
+            entityId: '关联对象id',
+        },
+    },
+};

package/lib/store/CascadeStore.js

@@ -100,20 +100,27 @@ 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 = cascadeSelectFn.call(_this, attr, {
-                            data: projection2[attr],
-                            filter: {
-                                id: {
-                                    $in: entityIds
+                        var entityIds = (0, lodash_1.uniq)(result.filter(function (ele) { return ele.entity === attr; }).map(function (ele) {
+                            (0, assert_1.default)(ele.entityId !== null);
+                            return ele.entityId;
+                        }));
+                        if (entityIds.length > 0) {
+                            var subRows = cascadeSelectFn.call(_this, attr, {
+                                data: projection2[attr],
+                                filter: {
+                                    id: {
+                                        $in: entityIds
+                                    },
                                 },
-                            },
-                        }, context, option);
-                        if (subRows instanceof Promise) {
-                            return subRows.then(function (subRowss) { return dealWithSubRows(subRowss); });
+                            }, context, option);
+                            if (subRows instanceof Promise) {
+                                return subRows.then(function (subRowss) { return dealWithSubRows(subRowss); });
+                            }
+                            else {
+                                dealWithSubRows(subRows);
+                            }
                         }
                         else {
-                            dealWithSubRows(subRows);
                         }
                     });
                 }
@@ -191,18 +198,20 @@ 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 = cascadeSelectFn.call(_this, relation, {
-                            data: projection2[attr],
-                            filter: {
-                                id: {
-                                    $in: ids
+                        if (ids.length > 0) {
+                            var subRows = cascadeSelectFn.call(_this, relation, {
+                                data: projection2[attr],
+                                filter: {
+                                    id: {
+                                        $in: ids
+                                    },
                                 },
-                            },
-                        }, context, option);
-                        if (subRows instanceof Promise) {
-                            return subRows.then(function (subRowss) { return dealWithSubRows(subRowss); });
+                            }, context, option);
+                            if (subRows instanceof Promise) {
+                                return subRows.then(function (subRowss) { return dealWithSubRows(subRowss); });
+                            }
+                            dealWithSubRows(subRows);
                         }
-                        dealWithSubRows(subRows);
                     });
                 }
             }
@@ -261,21 +270,23 @@ var CascadeStore = /** @class */ (function (_super) {
                                         _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); });
+                            if (ids.length > 0) {
+                                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);
                             }
-                            dealWithSubRows(subRows);
                         });
                     }
                 }
@@ -329,22 +340,24 @@ var CascadeStore = /** @class */ (function (_super) {
                                         _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); });
+                            if (ids.length > 0) {
+                                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);
                             }
-                            dealWithSubRows(subRows);
                         });
                     }
                 }
@@ -708,11 +721,11 @@ var CascadeStore = /** @class */ (function (_super) {
      */
     CascadeStore.prototype.doUpdateSingleRowAsync = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var data, action, operId, filter, now, _a, modiCreate, result_1, createInner, multipleCreate, data_1, data_1_1, d, createSingleOper, e_2_1, operatorId, createOper, _b, ids_1, selection, rows, modiUpsert, upsertModis, _c, originData, originId, createOper, updateAttrCount, result;
-            var e_2, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var data, action, operId, filter, now, _a, modiCreate, result_1, createInner, multipleCreate, data_1, data_1_1, d, createSingleOper, e_2_1, operatorId, createOper, _b, ids_1, selection, rows, modiUpsert, upsertModis, _c, originData, originId, _d, createOper, updateAttrCount, result;
+            var e_2, _e, _f, _g, _h, _j, _k, _l;
             var _this = this;
-            return tslib_1.__generator(this, function (_o) {
-                switch (_o.label) {
+            return tslib_1.__generator(this, function (_m) {
+                switch (_m.label) {
                     case 0:
                         data = operation.data, action = operation.action, operId = operation.id, filter = operation.filter;
                         now = Date.now();
@@ -746,7 +759,7 @@ var CascadeStore = /** @class */ (function (_super) {
                         };
                         return [4 /*yield*/, this.cascadeUpdateAsync('modi', modiCreate, context, option)];
                     case 2:
-                        _o.sent();
+                        _m.sent();
                         return [2 /*return*/, 1];
                     case 3:
                         result_1 = 0;
@@ -836,12 +849,12 @@ var CascadeStore = /** @class */ (function (_super) {
                         if (!multipleCreate) return [3 /*break*/, 5];
                         return [4 /*yield*/, createInner(operation)];
                     case 4:
-                        _o.sent();
+                        _m.sent();
                         return [3 /*break*/, 12];
                     case 5:
-                        _o.trys.push([5, 10, 11, 12]);
+                        _m.trys.push([5, 10, 11, 12]);
                         data_1 = tslib_1.__values(data), data_1_1 = data_1.next();
-                        _o.label = 6;
+                        _m.label = 6;
                     case 6:
                         if (!!data_1_1.done) return [3 /*break*/, 9];
                         d = data_1_1.value;
@@ -852,27 +865,27 @@ var CascadeStore = /** @class */ (function (_super) {
                         };
                         return [4 /*yield*/, createInner(createSingleOper)];
                     case 7:
-                        _o.sent();
-                        _o.label = 8;
+                        _m.sent();
+                        _m.label = 8;
                     case 8:
                         data_1_1 = data_1.next();
                         return [3 /*break*/, 6];
                     case 9: return [3 /*break*/, 12];
                     case 10:
-                        e_2_1 = _o.sent();
+                        e_2_1 = _m.sent();
                         e_2 = { error: e_2_1 };
                         return [3 /*break*/, 12];
                     case 11:
                         try {
-                            if (data_1_1 && !data_1_1.done && (_d = data_1.return)) _d.call(data_1);
+                            if (data_1_1 && !data_1_1.done && (_e = data_1.return)) _e.call(data_1);
                         }
                         finally { if (e_2) throw e_2.error; }
                         return [7 /*endfinally*/];
                     case 12: return [3 /*break*/, 15];
                     case 13: return [4 /*yield*/, createInner(operation)];
                     case 14:
-                        _o.sent();
-                        _o.label = 15;
+                        _m.sent();
+                        _m.label = 15;
                     case 15:
                         if (!option.dontCollect) {
                             context.opRecords.push({
@@ -886,20 +899,20 @@ var CascadeStore = /** @class */ (function (_super) {
                         (0, assert_1.default)(operId);
                         return [4 /*yield*/, context.getCurrentUserId(true)];
                     case 16:
-                        operatorId = _o.sent();
+                        operatorId = _m.sent();
                         if (!operatorId) return [3 /*break*/, 22];
-                        _e = {
+                        _f = {
                             id: 'dummy',
                             action: 'create'
                         };
-                        _f = {
+                        _g = {
                             id: operId,
                             action: action,
                             data: data,
                             operatorId: operatorId
                         };
                         if (!(data instanceof Array)) return [3 /*break*/, 18];
-                        _g = {
+                        _h = {
                             id: 'dummy',
                             action: 'create'
                         };
@@ -918,34 +931,34 @@ var CascadeStore = /** @class */ (function (_super) {
                                 });
                             }); }))];
                     case 17:
-                        _b = (_g.data = _o.sent(),
-                            _g);
+                        _b = (_h.data = _m.sent(),
+                            _h);
                         return [3 /*break*/, 20];
                     case 18:
-                        _h = {
+                        _j = {
                             id: 'dummy',
                             action: 'create'
                         };
-                        _j = {};
+                        _k = {};
                         return [4 /*yield*/, (0, uuid_1.generateNewIdAsync)()];
                     case 19:
-                        _b = [(_h.data = (_j.id = _o.sent(),
-                                _j.entity = entity,
-                                _j.entityId = data.id,
-                                _j),
-                                _h)];
-                        _o.label = 20;
+                        _b = [(_j.data = (_k.id = _m.sent(),
+                                _k.entity = entity,
+                                _k.entityId = data.id,
+                                _k),
+                                _j)];
+                        _m.label = 20;
                     case 20:
-                        createOper = (_e.data = (_f.operEntity$oper = _b,
-                            _f),
-                            _e);
+                        createOper = (_f.data = (_g.operEntity$oper = _b,
+                            _g),
+                            _f);
                         return [4 /*yield*/, this.cascadeUpdateAsync('oper', createOper, context, {
                                 dontCollect: true,
                                 dontCreateOper: true,
                             })];
                     case 21:
-                        _o.sent();
-                        _o.label = 22;
+                        _m.sent();
+                        _m.label = 22;
                     case 22: return [2 /*return*/, result_1];
                     case 23:
                         ids_1 = (0, filter_2.getRelevantIds)(filter);
@@ -962,9 +975,9 @@ var CascadeStore = /** @class */ (function (_super) {
                                 dontCollect: true,
                             })];
                     case 24:
-                        rows = _o.sent();
+                        rows = _m.sent();
                         ids_1.push.apply(ids_1, tslib_1.__spreadArray([], tslib_1.__read((rows.map(function (ele) { return ele.id; }))), false));
-                        _o.label = 25;
+                        _m.label = 25;
                     case 25:
                         if (data) {
                             this.preProcessDataUpdated(data);
@@ -1003,7 +1016,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                 count: 1,
                             }, context, option)];
                     case 26:
-                        upsertModis = _o.sent();
+                        upsertModis = _m.sent();
                         if (upsertModis.length > 0) {
                             _c = upsertModis[0], originData = _c.data, originId = _c.id;
                             modiUpsert = {
@@ -1017,24 +1030,26 @@ var CascadeStore = /** @class */ (function (_super) {
                                 }
                             };
                         }
-                        _o.label = 27;
+                        _m.label = 27;
                     case 27:
                         if (!!modiUpsert) return [3 /*break*/, 29];
-                        _k = {
+                        modiUpsert = {
                             id: 'dummy',
-                            action: 'create'
+                            action: 'create',
+                            data: {
+                                id: operId,
+                                targetEntity: entity,
+                                entity: option.modiParentEntity,
+                                entityId: option.modiParentId,
+                                action: action,
+                                data: data,
+                                iState: 'active',
+                                filter: filter,
+                            },
                         };
+                        if (!(ids_1.length > 0)) return [3 /*break*/, 29];
+                        _d = modiUpsert.data;
                         _l = {
-                            id: operId,
-                            targetEntity: entity,
-                            entity: option.modiParentEntity,
-                            entityId: option.modiParentId,
-                            action: action,
-                            data: data,
-                            iState: 'active',
-                            filter: filter
-                        };
-                        _m = {
                             id: 'dummy',
                             action: 'create'
                         };
@@ -1053,14 +1068,12 @@ var CascadeStore = /** @class */ (function (_super) {
                                 });
                             }); }))];
                     case 28:
-                        modiUpsert = (_k.data = (_l.modiEntity$modi = (_m.data = _o.sent(),
-                            _m),
-                            _l),
-                            _k);
-                        _o.label = 29;
+                        _d.modiEntity$modi = (_l.data = _m.sent(),
+                            _l);
+                        _m.label = 29;
                     case 29: return [4 /*yield*/, this.cascadeUpdateAsync('modi', modiUpsert, context, option)];
                     case 30:
-                        _o.sent();
+                        _m.sent();
                         return [2 /*return*/, 1];
                     case 31:
                         createOper = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -1155,15 +1168,15 @@ var CascadeStore = /** @class */ (function (_super) {
                         return [4 /*yield*/, createOper()];
                     case 34:
                         // 如果不是update动作而是用户自定义的动作，这里还是要记录oper
-                        _o.sent();
+                        _m.sent();
                         return [2 /*return*/, 0];
                     case 35: return [2 /*return*/, 0];
                     case 36: return [4 /*yield*/, this.updateAbjointRowAsync(entity, operation, context, option)];
                     case 37:
-                        result = _o.sent();
+                        result = _m.sent();
                         return [4 /*yield*/, createOper()];
                     case 38:
-                        _o.sent();
+                        _m.sent();
                         return [2 /*return*/, result];
                 }
             });

package/lib/store/checker.d.ts

@@ -23,4 +23,4 @@ export declare function createAuthCheckers<ED extends EntityDict & BaseEntityDic
  * @returns
  * 如果有的对象允许删除，需要使用trigger来处理其相关联的外键对象，这些trigger写作before，则会在checker之前执行，仍然可以删除成功
  */
-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 createRemoveCheckers<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED> | SyncContext<ED>>(schema: StorageSchema<ED>, authDict?: AuthDefDict<ED>): Checker<ED, keyof ED, Cxt>[];