oak-domain 2.4.1 → 2.4.2

package/lib/base-app-domain/User/Schema.d.ts

@@ -2,18 +2,18 @@ import { String, Text } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape, AggregationResult } from "../../types/Entity";
 import { GenericAction, RelationAction } from "../../actions/action";
 import * as Oper from "../Oper/Schema";
 import * as OperEntity from "../OperEntity/Schema";
 import * as ModiEntity from "../ModiEntity/Schema";
-export type OpSchema = EntityShape & {
+export declare type OpSchema = EntityShape & {
     name?: String<16> | null;
     nickname?: String<64> | null;
     password?: Text | null;
 };
-export type OpAttr = keyof OpSchema;
-export type Schema = EntityShape & {
+export declare type OpAttr = keyof OpSchema;
+export declare type Schema = EntityShape & {
     name?: String<16> | null;
     nickname?: String<64> | null;
     password?: Text | null;
@@ -26,7 +26,7 @@ export type Schema = EntityShape & {
 } & {
     [A in ExpressionKey]?: any;
 };
-type AttrFilter = {
+declare type AttrFilter = {
     id: Q_StringValue | SubQuery.UserIdSubQuery;
     $$createAt$$: Q_DateValue;
     $$seq$$: Q_StringValue;
@@ -35,8 +35,8 @@ type AttrFilter = {
     nickname: Q_StringValue;
     password: Q_StringValue;
 };
-export type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
-export type Projection = {
+export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
+export declare type Projection = {
     "#id"?: NodeId;
     [k: string]: any;
     id?: number;
@@ -65,10 +65,10 @@ export type Projection = {
         $entity: "modiEntity";
     };
 } & Partial<ExprOp<OpAttr | string>>;
-type UserIdProjection = OneOf<{
+declare type UserIdProjection = OneOf<{
     id: number;
 }>;
-export type SortAttr = {
+export declare type SortAttr = {
     id: number;
 } | {
     $$createAt$$: number;
@@ -85,34 +85,34 @@ export type SortAttr = {
 } | {
     [k: string]: any;
 } | OneOf<ExprOp<OpAttr | string>>;
-export type SortNode = {
+export declare type SortNode = {
     $attr: SortAttr;
     $direction?: "asc" | "desc";
 };
-export type Sorter = SortNode[];
-export type SelectOperation<P extends Object = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
-export type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
-export type Aggregation = Omit<DeduceAggregation<Projection, Filter, Sorter>, "id">;
-export type CreateOperationData = FormCreateData<OpSchema> & {
+export declare type Sorter = SortNode[];
+export declare type SelectOperation<P extends Object = Projection> = OakSelection<"select", P, Filter, Sorter>;
+export declare type Selection<P extends Object = Projection> = Omit<SelectOperation<P>, "action">;
+export declare type Aggregation = DeduceAggregation<Projection, Filter, Sorter>;
+export declare type CreateOperationData = FormCreateData<OpSchema> & {
     oper$operator?: OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">>>;
     operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
     modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
 };
-export type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
-export type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
-export type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
-export type UpdateOperationData = FormUpdateData<OpSchema> & {
+export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
+export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
+export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
+export declare type UpdateOperationData = FormUpdateData<OpSchema> & {
     [k: string]: any;
-    opers$operator?: OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">>>;
-    operEntitys$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
-    modiEntitys$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
+    oper$operator?: OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId">>>;
+    operEntity$entity?: OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId">>>;
+    modiEntity$entity?: OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId">>>;
 };
-export type UpdateOperation = OakOperation<"update" | RelationAction | string, UpdateOperationData, Filter, Sorter>;
-export type RemoveOperationData = {};
-export type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
-export type Operation = CreateOperation | UpdateOperation | RemoveOperation;
-export type UserIdSubQuery = Selection<UserIdProjection>;
-export type EntityDef = {
+export declare type UpdateOperation = OakOperation<"update" | RelationAction | string, UpdateOperationData, Filter, Sorter>;
+export declare type RemoveOperationData = {};
+export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
+export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation;
+export declare type UserIdSubQuery = Selection<UserIdProjection>;
+export declare type EntityDef = {
     Schema: Schema;
     OpSchema: OpSchema;
     Action: OakMakeAction<GenericAction | RelationAction> | string;

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

@@ -3,31 +3,31 @@ import * as ModiEntity from "./ModiEntity/Schema";
 import * as Oper from "./Oper/Schema";
 import * as OperEntity from "./OperEntity/Schema";
 import * as User from "./User/Schema";
-export type ModiIdSubQuery = {
+export declare type ModiIdSubQuery = {
     [K in "$in" | "$nin"]?: (ModiEntity.ModiIdSubQuery & {
         entity: "modiEntity";
     }) | (Modi.ModiIdSubQuery & {
         entity: "modi";
     }) | any;
 };
-export type ModiEntityIdSubQuery = {
+export declare type ModiEntityIdSubQuery = {
     [K in "$in" | "$nin"]?: (ModiEntity.ModiEntityIdSubQuery & {
         entity: "modiEntity";
     }) | any;
 };
-export type OperIdSubQuery = {
+export declare type OperIdSubQuery = {
     [K in "$in" | "$nin"]?: (OperEntity.OperIdSubQuery & {
         entity: "operEntity";
     }) | (Oper.OperIdSubQuery & {
         entity: "oper";
     }) | any;
 };
-export type OperEntityIdSubQuery = {
+export declare type OperEntityIdSubQuery = {
     [K in "$in" | "$nin"]?: (OperEntity.OperEntityIdSubQuery & {
         entity: "operEntity";
     }) | any;
 };
-export type UserIdSubQuery = {
+export declare type UserIdSubQuery = {
     [K in "$in" | "$nin"]?: (Oper.UserIdSubQuery & {
         entity: "oper";
     }) | (User.UserIdSubQuery & {

package/lib/compiler/schemalBuilder.js

@@ -652,12 +652,12 @@ function analyzeEntity(filename, path, program, relativePath) {
                             return ele2.name.getText() === 'name';
                         });
                         (0, assert_1.default)(ts.isStringLiteral(nameProperty.initializer));
-                        var indexName = nameProperty.initializer.text;
-                        if (indexNameDict_1[indexName]) {
-                            throw new Error("\u300C".concat(filename, "\u300D\u7D22\u5F15\u5B9A\u4E49\u91CD\u540D\u300C").concat(indexName, "\u300D"));
+                        var nameText = nameProperty.initializer.text;
+                        if (indexNameDict_1[nameText]) {
+                            throw new Error("\u300C".concat(filename, "\u300D\u7D22\u5F15\u5B9A\u4E49\u91CD\u540D\u300C").concat(nameText, "\u300D"));
                         }
                         (0, lodash_1.assign)(indexNameDict_1, (_a = {},
-                            _a[indexName] = true,
+                            _a[nameText] = true,
                             _a));
                         var configProperty = properties.find(function (ele2) {
                             (0, assert_1.default)(ts.isPropertyAssignment(ele2));
@@ -695,10 +695,10 @@ function analyzeEntity(filename, path, program, relativePath) {
                                     return ele3.name.text === indexAttrName;
                                 });
                                 if (!schemaNode) {
-                                    throw new Error("\u300C".concat(filename, "\u300D\u4E2D\u7D22\u5F15\u300C").concat(indexName, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u5B9A\u4E49\u975E\u6CD5"));
+                                    throw new Error("\u300C".concat(filename, "\u300D\u4E2D\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u5B9A\u4E49\u975E\u6CD5"));
                                 }
                                 var type = schemaNode.type, name_1 = schemaNode.name;
-                                var entity = (0, string_1.firstLetterLowerCase)(moduleName);
+                                var entity = moduleName;
                                 var _a = ManyToOne, _b = entity, manyToOneSet = _a[_b];
                                 if (ts.isTypeReferenceNode(type)) {
                                     var typeName = type.typeName;
@@ -712,14 +712,19 @@ function analyzeEntity(filename, path, program, relativePath) {
                                         if (!manyToOneItem) {
                                             // 如果不是外键，则不能是Text, File 
                                             if (isFulltextIndex) {
-                                                (0, assert_1.default)(['Text', 'String'].includes(text2_1), "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(indexName, "\u300D\u5B9A\u4E49\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u975E\u6CD5\uFF0C\u53EA\u80FD\u662FText/String"));
+                                                (0, assert_1.default)(['Text', 'String'].includes(text2_1), "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(nameText, "\u300D\u5B9A\u4E49\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u975E\u6CD5\uFF0C\u53EA\u80FD\u662FText/String"));
                                             }
                                             else {
-                                                (0, assert_1.default)(!DataType_1.unIndexedTypes.includes(text2_1), "\u300C".concat(filename, "\u300D\u4E2D\u7D22\u5F15\u300C").concat(indexName, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7684\u7C7B\u578B\u4E3A\u300C").concat(text2_1, "\u300D\uFF0C\u4E0D\u53EF\u7D22\u5F15"));
+                                                (0, assert_1.default)(!DataType_1.unIndexedTypes.includes(text2_1), "\u300C".concat(filename, "\u300D\u4E2D\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7684\u7C7B\u578B\u4E3A\u300C").concat(text2_1, "\u300D\uFF0C\u4E0D\u53EF\u7D22\u5F15"));
                                             }
                                         }
                                         else {
-                                            (0, assert_1.default)(!isFulltextIndex, "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(indexName, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u975E\u6CD5\uFF0C\u53EA\u80FD\u4E3AText/String"));
+                                            (0, assert_1.default)(!isFulltextIndex, "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u975E\u6CD5\uFF0C\u53EA\u80FD\u4E3AText/String"));
+                                            // 在这里把外键加上Id，这样storageSchema才能正常通过
+                                            // 这里的写法不太好，未来TS版本高了可能会有问题。by Xc 20230131
+                                            Object.assign(nameProperty, {
+                                                initializer: factory.createStringLiteral("".concat(indexAttrName, "Id")),
+                                            });
                                         }
                                     }
                                     else {
@@ -727,8 +732,8 @@ function analyzeEntity(filename, path, program, relativePath) {
                                     }
                                 }
                                 else {
-                                    (0, assert_1.default)(!isFulltextIndex, "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(indexName, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u53EA\u80FD\u4E3AText/String"));
-                                    (0, assert_1.default)(ts.isUnionTypeNode(type) || ts.isLiteralTypeNode(type), "".concat(entity, "\u4E2D\u7D22\u5F15\u300C").concat(indexName, "\u300D\u7684\u5C5E\u6027").concat(name_1.text, "\u6709\u5B9A\u4E49\u975E\u6CD5"));
+                                    (0, assert_1.default)(!isFulltextIndex, "\u300C".concat(filename, "\u300D\u4E2D\u5168\u6587\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027\u300C").concat(indexAttrName, "\u300D\u7C7B\u578B\u53EA\u80FD\u4E3AText/String"));
+                                    (0, assert_1.default)(ts.isUnionTypeNode(type) || ts.isLiteralTypeNode(type), "".concat(entity, "\u4E2D\u7D22\u5F15\u300C").concat(nameText, "\u300D\u7684\u5C5E\u6027").concat(name_1.text, "\u6709\u5B9A\u4E49\u975E\u6CD5"));
                                 }
                             }
                         });
@@ -1077,6 +1082,7 @@ function constructFilter(statements, entity) {
                         break;
                     }
                     case 'Int':
+                    case 'Uint':
                     case 'Float':
                     case 'Double': {
                         type2 = factory.createTypeReferenceNode(factory.createIdentifier('Q_NumberValue'));
@@ -1784,14 +1790,11 @@ function constructActions(statements, entity) {
     // Selection
     statements.push(factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("SelectOperation"), [
         factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("P"), factory.createTypeReferenceNode(factory.createIdentifier("Object"), undefined), factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
-    ], factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
-        factory.createTypeReferenceNode(factory.createIdentifier("OakOperation"), [
-            factory.createLiteralTypeNode(factory.createStringLiteral("select")),
-            factory.createTypeReferenceNode(factory.createIdentifier("P"), undefined),
-            factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
-            factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
-        ]),
-        factory.createLiteralTypeNode(factory.createStringLiteral("id"))
+    ], factory.createTypeReferenceNode(factory.createIdentifier("OakSelection"), [
+        factory.createLiteralTypeNode(factory.createStringLiteral("select")),
+        factory.createTypeReferenceNode(factory.createIdentifier("P"), undefined),
+        factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
+        factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
     ])), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Selection"), [
         factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("P"), factory.createTypeReferenceNode(factory.createIdentifier("Object"), undefined), factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined))
     ], factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
@@ -1799,13 +1802,10 @@ function constructActions(statements, entity) {
             factory.createTypeReferenceNode(factory.createIdentifier("P"), undefined)
         ]),
         factory.createLiteralTypeNode(factory.createStringLiteral("action"))
-    ])), factory.createTypeAliasDeclaration(undefined, [factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Aggregation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
-        factory.createTypeReferenceNode(factory.createIdentifier("DeduceAggregation"), [
-            factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined),
-            factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
-            factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
-        ]),
-        factory.createLiteralTypeNode(factory.createStringLiteral("id"))
+    ])), factory.createTypeAliasDeclaration(undefined, [factory.createToken(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("Aggregation"), undefined, factory.createTypeReferenceNode(factory.createIdentifier("DeduceAggregation"), [
+        factory.createTypeReferenceNode(factory.createIdentifier("Projection"), undefined),
+        factory.createTypeReferenceNode(factory.createIdentifier("Filter"), undefined),
+        factory.createTypeReferenceNode(factory.createIdentifier("Sorter"), undefined)
     ])));
     // Exportation
     // 已经废弃，by Xc 2023.01.08
@@ -2297,7 +2297,7 @@ function constructActions(statements, entity) {
         var _loop_9 = function (entityName) {
             var entityNameLc = (0, string_1.firstLetterLowerCase)(entityName);
             foreignKeySet[entityName].forEach(function (foreignKey) {
-                var identifier = "".concat(entityNameLc, "s$").concat(foreignKey);
+                var identifier = "".concat(entityNameLc, "$").concat(foreignKey);
                 var otmCreateOperationDataNode = factory.createTypeReferenceNode(factory.createIdentifier("Omit"), [
                     factory.createTypeReferenceNode(createForeignRef(entity, entityName, 'CreateOperationData'), undefined),
                     factory.createUnionTypeNode(foreignKey === 'entity' ? [
@@ -2612,6 +2612,7 @@ var initialStatements = function () { return [
     factory.createImportDeclaration(undefined, undefined, factory.createImportClause(false, undefined, factory.createNamedImports([
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('String')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('Int')),
+        factory.createImportSpecifier(false, undefined, factory.createIdentifier('Uint')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('Float')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('Double')),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier('Boolean')),
@@ -2653,6 +2654,7 @@ var initialStatements = function () { return [
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("FormUpdateData")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("DeduceAggregation")),
         factory.createImportSpecifier(false, factory.createIdentifier("Operation"), factory.createIdentifier("OakOperation")),
+        factory.createImportSpecifier(false, factory.createIdentifier("Selection"), factory.createIdentifier("OakSelection")),
         factory.createImportSpecifier(false, factory.createIdentifier("MakeAction"), factory.createIdentifier("OakMakeAction")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityShape")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("AggregationResult")),

package/lib/store/CascadeStore.js

@@ -529,7 +529,7 @@ var CascadeStore = /** @class */ (function (_super) {
                 var _g = tslib_1.__read(relation, 2), entityOtm_1 = _g[0], foreignKey_2 = _g[1];
                 var otmOperations = data[attr];
                 var dealWithOneToMany = function (otm) {
-                    var _a, _b, _c, _d;
+                    var _a, _b, _c, _d, _e;
                     var actionOtm = otm.action, dataOtm = otm.data, filterOtm = otm.filter;
                     if (!foreignKey_2) {
                         // 基于entity/entityId的one-to-many
@@ -550,7 +550,7 @@ var CascadeStore = /** @class */ (function (_super) {
                         }
                         else if (actionOtm === 'create') {
                             // 这里先假设A（必是update）的filter上一定有id，否则用户界面上应该设计不出来这样的操作
-                            // todo 这个假设成立吗？等遇到create/create一对多的case再完善
+                            // todo 这个假设对watcher等后台行为可能不成立，等遇到create/create一对多的case再完善
                             var id_2 = filter.id;
                             (0, assert_1.default)(typeof id_2 === 'string');
                             if (dataOtm instanceof Array) {
@@ -569,12 +569,10 @@ var CascadeStore = /** @class */ (function (_super) {
                         else {
                             // 这里先假设A（必是update）的filter上一定有id，否则用户界面上应该设计不出来这样的操作
                             // 这个倒是好像不可能出现create/update的一对多，如果遇到了再完善
-                            var id = filter.id;
                             Object.assign(otm, {
-                                filter: (0, filter_1.addFilterSegment)({
-                                    entity: entity,
-                                    entityId: id,
-                                }, filterOtm),
+                                filter: (0, filter_1.addFilterSegment)((_a = {},
+                                    _a[entity] = filter,
+                                    _a), filterOtm),
                             });
                             if (action === 'remove' && actionOtm === 'update') {
                                 Object.assign(dataOtm, {
@@ -597,14 +595,14 @@ var CascadeStore = /** @class */ (function (_super) {
                                 });
                             }
                             else {
-                                Object.assign(dataOtm, (_a = {},
-                                    _a[foreignKey_2] = id_3,
-                                    _a));
+                                Object.assign(dataOtm, (_b = {},
+                                    _b[foreignKey_2] = id_3,
+                                    _b));
                             }
                         }
                         else if (actionOtm === 'create') {
                             // 这里先假设A（必是update）的filter上一定有id，否则用户界面上应该设计不出来这样的操作
-                            // todo 这个假设成立吗？等遇到create/create一对多的case再完善
+                            // todo 这个假设在后台可能不成立，等遇到了再说
                             var id_4 = filter.id;
                             (0, assert_1.default)(typeof id_4 === 'string');
                             if (dataOtm instanceof Array) {
@@ -616,28 +614,26 @@ var CascadeStore = /** @class */ (function (_super) {
                                 });
                             }
                             else {
-                                Object.assign(dataOtm, (_b = {},
-                                    _b[foreignKey_2] = id_4,
-                                    _b));
+                                Object.assign(dataOtm, (_c = {},
+                                    _c[foreignKey_2] = id_4,
+                                    _c));
                             }
                         }
                         else {
-                            // 这里先假设A（必是update）的filter上一定有id，否则用户界面上应该设计不出来这样的操作
-                            // 这个倒是好像不可能出现create/update的一对多，如果遇到了再完善
-                            var id = filter.id;
+                            // update可能出现上层filter不是根据id的（userEntityGrant的过期触发的wechatQrCode的过期，见general中的userEntityGrant的trigger）
                             Object.assign(otm, {
-                                filter: (0, filter_1.addFilterSegment)((_c = {},
-                                    _c[foreignKey_2] = id,
-                                    _c), filterOtm),
+                                filter: (0, filter_1.addFilterSegment)((_d = {},
+                                    _d[foreignKey_2.slice(0, foreignKey_2.length - 2)] = filter,
+                                    _d), filterOtm),
                             });
                             if (action === 'remove' && actionOtm === 'update') {
-                                Object.assign(dataOtm, (_d = {},
-                                    _d[foreignKey_2] = null,
-                                    _d));
+                                Object.assign(dataOtm, (_e = {},
+                                    _e[foreignKey_2] = null,
+                                    _e));
                             }
                         }
                     }
-                    afterFns.push(function () { return cascadeUpdate.call(_this, entityOtm_1, otm, context, option2); });
+                    beforeFns.push(function () { return cascadeUpdate.call(_this, entityOtm_1, otm, context, option2); });
                 };
                 if (otmOperations instanceof Array) {
                     try {

package/lib/store/TriggerExecutor.d.ts

@@ -16,7 +16,7 @@ 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>>[];
+    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;