oak-domain 1.1.8 → 1.1.9

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

@@ -40,7 +40,7 @@ exports.desc = {
         iState: {
             type: "varchar",
             params: {
-                length: 16
+                length: 24
             }
         }
     },

package/lib/compiler/env.d.ts

@@ -5,7 +5,7 @@ export declare const ENTITY_PATH_IN_OAK_DOMAIN: () => string;
 export declare const TYPE_PATH_IN_OAK_DOMAIN: (level?: number) => string;
 export declare const ACTION_CONSTANT_IN_OAK_DOMAIN: (level?: number) => string;
 export declare const RESERVED_ENTITIES: string[];
-export declare const STRING_LITERAL_MAX_LENGTH = 16;
+export declare const STRING_LITERAL_MAX_LENGTH = 24;
 export declare const NUMERICAL_LITERL_DEFAULT_PRECISION = 8;
 export declare const NUMERICAL_LITERL_DEFAULT_SCALE = 2;
 export declare const INT_LITERL_DEFAULT_WIDTH = 4;

package/lib/compiler/env.js

@@ -33,7 +33,7 @@ exports.ACTION_CONSTANT_IN_OAK_DOMAIN = ACTION_CONSTANT_IN_OAK_DOMAIN;
 // export const OUTPUT_PATH = 'app-domain/entities';
 exports.RESERVED_ENTITIES = ['Schema', 'Filter', 'Query', 'SubQuery', 'Entity', 'Selection', 'Operation', 'File', 'Common',
     'Locale', 'Projection', 'Data'];
-exports.STRING_LITERAL_MAX_LENGTH = 16;
+exports.STRING_LITERAL_MAX_LENGTH = 24;
 exports.NUMERICAL_LITERL_DEFAULT_PRECISION = 8;
 exports.NUMERICAL_LITERL_DEFAULT_SCALE = 2;
 exports.INT_LITERL_DEFAULT_WIDTH = 4;

package/lib/compiler/schemalBuilder.d.ts

@@ -1,2 +1,2 @@
-export declare function analyzeEntities(inputDir: string): void;
+export declare function analyzeEntities(inputDir: string, relativePath?: string): void;
 export declare function buildSchema(outputDir: string): void;

package/lib/compiler/schemalBuilder.js

@@ -150,7 +150,7 @@ function addActionSource(moduleName, name, node) {
     var _a;
     var ast = ActionAsts[moduleName];
     var moduleSpecifier = node.moduleSpecifier;
-    // 目前应该只会引用oak-domain/src/actions/action里的公共action
+    // todo 目前应该只会引用oak-domain/src/actions/action里的公共action，未来如果有交叉引用这里代码要修正（如果domain中也有引用action_constants这里应该也会错）
     (0, assert_1.default)(ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text === (0, env_1.ACTION_CONSTANT_IN_OAK_DOMAIN)());
     (0, lodash_1.assign)(ast.importedFrom, (_a = {},
         _a[name.text] = node,
@@ -262,27 +262,26 @@ function dealWithActions(moduleName, filename, node, program, sourceFile, hasRel
     });
     pushStatementIntoActionAst(moduleName, factory.createVariableStatement([factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createVariableDeclarationList([factory.createVariableDeclaration(factory.createIdentifier("actions"), undefined, undefined, factory.createArrayLiteralExpression(actionTexts.map(function (ele) { return factory.createStringLiteral(ele); }), false))], ts.NodeFlags.Const)), sourceFile);
 }
-function getEntityImported(declaration, filename) {
+/**
+ * entity的引用一定要以 import { Schema as XXX } from '..../XXX'这种形式
+ * @param declaration
+ * @param filename
+ * @returns
+ */
+function getEntityImported(declaration) {
     var moduleSpecifier = declaration.moduleSpecifier, importClause = declaration.importClause;
     var entityImported;
     if (ts.isStringLiteral(moduleSpecifier)) {
-        if (moduleSpecifier.text.startsWith('./')) {
-            entityImported = moduleSpecifier.text.slice(2);
-        }
-        else if (moduleSpecifier.text.startsWith((0, env_1.ENTITY_PATH_IN_OAK_GENERAL_BUSINESS)())) {
-            entityImported = moduleSpecifier.text.slice((0, env_1.ENTITY_PATH_IN_OAK_GENERAL_BUSINESS)().length);
-        }
-        else if (moduleSpecifier.text.startsWith((0, env_1.ENTITY_PATH_IN_OAK_DOMAIN)())) {
-            entityImported = moduleSpecifier.text.slice((0, env_1.ENTITY_PATH_IN_OAK_DOMAIN)().length);
-        }
-    }
-    if (entityImported) {
+        var importedFileName_1 = path_1.default.parse(moduleSpecifier.text).name;
         var namedBindings = importClause.namedBindings;
-        (0, assert_1.default)(ts.isNamedImports(namedBindings));
-        var elements = namedBindings.elements;
-        (0, assert_1.default)(elements.find(function (ele) { return ts.isImportSpecifier(ele) && ele.name.text === entityImported && ele.propertyName.text === 'Schema'; }), "\u300C".concat(filename, "\u300D\u5BFC\u5165\u7684\u5BF9\u8C61\u540D\u79F0\u548C\u5BF9\u8C61\u6240\u5728\u7684\u6587\u4EF6\u540D\u79F0\u300C").concat(entityImported, "\u300D\u4E0D\u7B26"));
-        return entityImported;
+        if (namedBindings && ts.isNamedImports(namedBindings)) {
+            var elements = namedBindings.elements;
+            if (elements.find(function (ele) { var _a; return ts.isImportSpecifier(ele) && ele.name.text === importedFileName_1 && ((_a = ele.propertyName) === null || _a === void 0 ? void 0 : _a.text) === 'Schema'; })) {
+                entityImported = importedFileName_1;
+            }
+        }
     }
+    return entityImported;
 }
 function checkLocaleEnumAttrs(node, attrs, filename) {
     var members = node.members;
@@ -312,7 +311,7 @@ function checkLocaleExpressionPropertyExists(root, attr, exists, filename) {
         }
     });
 }
-function analyzeEntity(filename, path, program) {
+function analyzeEntity(filename, path, program, relativePath) {
     var _a;
     var fullPath = "".concat(path, "/").concat(filename);
     var sourceFile = program.getSourceFile(fullPath);
@@ -336,14 +335,30 @@ function analyzeEntity(filename, path, program) {
     var enumStringAttrs = [];
     var states = [];
     var localEnumStringTypes = [];
+    var additionalImports = [];
     var localeDef = undefined;
     ts.forEachChild(sourceFile, function (node) {
         var _a, _b, _c, _d;
         if (ts.isImportDeclaration(node)) {
-            var entityImported = getEntityImported(node, filename);
+            var entityImported = getEntityImported(node);
             if (entityImported) {
                 referencedSchemas.push(entityImported);
             }
+            else if (!process.env.COMPLING_IN_DOMAIN && !(relativePath === null || relativePath === void 0 ? void 0 : relativePath.startsWith(env_1.LIB_OAK_DOMAIN))) {
+                /**import了domain以外的其它定义类型，需要被复制到生成的Schema文件中
+                 * 这里必须注意，1、假设了domain当中定义的几个entity不会引用其它文件上的定义（除了type里的那些通用类型，默认都会被输出到文件中）
+                 * 2、假设了其它项目文件不会引用domain当中除了type通用类型之外的其它内容，否则不会被输出到文件中
+                 * 这里主要是对import的处理比较粗略，日后有需要的时候再精修
+                */
+                var moduleSpecifier = node.moduleSpecifier, importClause = node.importClause;
+                if (ts.isStringLiteral(moduleSpecifier) && !moduleSpecifier.text.startsWith(env_1.LIB_OAK_DOMAIN)) {
+                    // 编译后的路径默认要深一层
+                    var moduleSpecifier2Text = relativePath
+                        ? path_1.default.join(relativePath, moduleSpecifier.text).replace(/\\/g, '/')
+                        : path_1.default.join('..', moduleSpecifier.text).replace(/\\/g, '/');
+                    additionalImports.push(factory.updateImportDeclaration(node, undefined, undefined, importClause, factory.createStringLiteral(moduleSpecifier2Text), undefined));
+                }
+            }
         }
         if (ts.isInterfaceDeclaration(node)) {
             // schema 定义
@@ -417,6 +432,10 @@ function analyzeEntity(filename, path, program) {
                             var types = type.types;
                             if (ts.isLiteralTypeNode(types[0]) && ts.isStringLiteral(types[0].literal)) {
                                 enumStringAttrs.push(name.text);
+                                types.forEach(function (ele) {
+                                    (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "\u300C".concat(filename, "\u300D\u4E0D\u652F\u6301\u6DF7\u5408\u578B\u7684\u679A\u4E3E\u5C5E\u6027\u5B9A\u4E49\u300C").concat(attrName, "\u300D"));
+                                    (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "\u300C".concat(filename, "\u300D\u4E2D\u5B9A\u4E49\u7684\u5C5E\u6027\u679A\u4E3E\u300C").concat(attrName, "\u300D\u7684\u5B57\u7B26\u4E32\u957F\u5EA6\u5E94\u5C0F\u4E8E").concat(env_1.STRING_LITERAL_MAX_LENGTH));
+                                });
                             }
                         }
                     }
@@ -552,6 +571,10 @@ function analyzeEntity(filename, path, program) {
                 if (ts.isUnionTypeNode(node.type) && ts.isLiteralTypeNode(node.type.types[0]) && ts.isStringLiteral(node.type.types[0].literal)) {
                     // 本文件内定义的枚举类型
                     localEnumStringTypes.push(node.name.text);
+                    node.type.types.forEach(function (ele) {
+                        (0, assert_1.default)(ts.isLiteralTypeNode(ele) && ts.isStringLiteral(ele.literal), "\u300C".concat(filename, "\u300D\u4E0D\u652F\u6301\u6DF7\u5408\u578B\u7684\u5E38\u91CF\u5B9A\u4E49\u300C").concat(node.name.text, "\u300D"));
+                        (0, assert_1.default)(ele.literal.text.length < env_1.STRING_LITERAL_MAX_LENGTH, "\u300C".concat(filename, "\u300D\u4E2D\u5B9A\u4E49\u7684\u5E38\u91CF\u679A\u4E3E\u300C").concat(node.name.text, "\u300D\u7684\u5B57\u7B26\u4E32\u957F\u5EA6\u5E94\u5C0F\u4E8E").concat(env_1.STRING_LITERAL_MAX_LENGTH));
+                    });
                 }
             }
         }
@@ -793,6 +816,8 @@ function analyzeEntity(filename, path, program) {
         actionType: actionType,
         static: _static,
         hasRelationDef: hasRelationDef,
+        enumStringAttrs: enumStringAttrs.concat(states),
+        additionalImports: additionalImports,
     };
     if (hasFulltextIndex) {
         (0, lodash_1.assign)(schema, {
@@ -2628,6 +2653,10 @@ function outputSchema(outputDir, printer) {
                 factory.createImportSpecifier(false, undefined, factory.createIdentifier("RelationAction")),
             ])), factory.createStringLiteral((0, env_1.ACTION_CONSTANT_IN_OAK_DOMAIN)()), undefined));
         }
+        var additionalImports = Schema[entity].additionalImports;
+        if ((additionalImports === null || additionalImports === void 0 ? void 0 : additionalImports.length) > 0) {
+            statements.push.apply(statements, tslib_1.__spreadArray([], tslib_1.__read(additionalImports), false));
+        }
         constructSchema(statements, entity);
         constructFilter(statements, entity);
         constructProjection(statements, entity);
@@ -2709,8 +2738,8 @@ function outputAction(outputDir, printer) {
     (0, fs_1.writeFileSync)(fileName, result, { flag: 'w' });
 }
 function constructAttributes(entity) {
-    var schemaAttrs = Schema[entity].schemaAttrs;
-    var _a = ManyToOne, _b = entity, manyToOneSet = _a[_b];
+    var _a = Schema[entity], schemaAttrs = _a.schemaAttrs, enumStringAttrs = _a.enumStringAttrs;
+    var _b = ManyToOne, _c = entity, manyToOneSet = _b[_c];
     var result = [];
     schemaAttrs.forEach(function (attr) {
         var attrAssignments = [];
@@ -2786,11 +2815,11 @@ function constructAttributes(entity) {
                             attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("ref")), factory.createPropertyAssignment(factory.createIdentifier("ref"), factory.createStringLiteral((0, string_1.firstLetterLowerCase)(text2_6))));
                         }
                         else {
-                            if (text.endsWith('State')) {
+                            if (enumStringAttrs.includes(name.text)) {
                                 attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("varchar")), factory.createPropertyAssignment(factory.createIdentifier("params"), factory.createObjectLiteralExpression([factory.createPropertyAssignment(factory.createIdentifier("length"), factory.createNumericLiteral(env_1.STRING_LITERAL_MAX_LENGTH))], true)));
                             }
                             else {
-                                // 引用的shape                                    
+                                // todo 引用的非string定义，目前没有处理int类型的引用，等遇到了再处理
                                 attrAssignments.push(factory.createPropertyAssignment(factory.createIdentifier("type"), factory.createStringLiteral("object")));
                             }
                         }
@@ -3065,7 +3094,6 @@ function analyzeInModi() {
         if (schema.toModi || schema.inModi || schema.actionType === 'readOnly' || schema.static) {
             return;
         }
-        console.log('setInModi', entity);
         schema.inModi = true;
         var related = getRelateEntities(entity);
         related.forEach(function (ele) { return setInModi(ele); });
@@ -3077,7 +3105,7 @@ function analyzeInModi() {
         }
     }
 }
-function analyzeEntities(inputDir) {
+function analyzeEntities(inputDir, relativePath) {
     var files = (0, fs_1.readdirSync)(inputDir);
     var fullFilenames = files.map(function (ele) {
         var entity = ele.slice(0, ele.indexOf('.'));
@@ -3088,7 +3116,7 @@ function analyzeEntities(inputDir) {
     });
     var program = ts.createProgram(fullFilenames, { allowJs: true });
     files.forEach(function (filename) {
-        analyzeEntity(filename, inputDir, program);
+        analyzeEntity(filename, inputDir, program, relativePath);
     });
     analyzeInModi();
 }

package/lib/store/CascadeStore.js

@@ -280,7 +280,7 @@ var CascadeStore = /** @class */ (function (_super) {
             }
             else {
                 (0, assert_1.default)(relation instanceof Array);
-                var _g = projection2[attr], subProjection_1 = _g.data, subFilter_1 = _g.filter, indexFrom_1 = _g.indexFrom, count_1 = _g.count, subSorter = _g.sorter;
+                var _g = projection2[attr], subProjection_1 = _g.data, subFilter_1 = _g.filter, indexFrom_1 = _g.indexFrom, count_1 = _g.count, subSorter_1 = _g.sorter;
                 var _h = tslib_1.__read(relation, 2), entity2_1 = _h[0], foreignKey_1 = _h[1];
                 if (foreignKey_1) {
                     // 基于属性的一对多
@@ -298,6 +298,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                                         $in: ids,
                                                     },
                                                     _a), subFilter_1]),
+                                            sorter: subSorter_1,
                                             indexFrom: indexFrom_1,
                                             count: count_1
                                         }, context, option)];
@@ -332,6 +333,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                                         $in: ids,
                                                     }
                                                 }, subFilter_1]),
+                                            sorter: subSorter_1,
                                             indexFrom: indexFrom_1,
                                             count: count_1
                                         }, context, option)];
@@ -1005,36 +1007,34 @@ var CascadeStore = /** @class */ (function (_super) {
      */
     CascadeStore.prototype.cascadeUpdate = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var action, data, filter, id, opData, result, multipleCreate, data_1, data_1_1, d, od, e_3_1, data_2, data_2_1, dataEle, result2, e_4_1, operation2, count;
-            var e_3, _a, e_4, _b, _c, _d;
-            return tslib_1.__generator(this, function (_e) {
-                switch (_e.label) {
+            var action, data, filter, id, opData, result, data_1, data_1_1, d, od, e_3_1, operation2, count;
+            var e_3, _a, _b, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         action = operation.action, data = operation.data, filter = operation.filter, id = operation.id;
                         result = {};
-                        if (!(['create', 'create-l'].includes(action) && data instanceof Array)) return [3 /*break*/, 18];
-                        multipleCreate = this.supportMultipleCreate();
-                        if (!multipleCreate) return [3 /*break*/, 9];
+                        if (!(['create', 'create-l'].includes(action) && data instanceof Array)) return [3 /*break*/, 9];
                         opData = [];
-                        _e.label = 1;
+                        _d.label = 1;
                     case 1:
-                        _e.trys.push([1, 6, 7, 8]);
+                        _d.trys.push([1, 6, 7, 8]);
                         data_1 = tslib_1.__values(data), data_1_1 = data_1.next();
-                        _e.label = 2;
+                        _d.label = 2;
                     case 2:
                         if (!!data_1_1.done) return [3 /*break*/, 5];
                         d = data_1_1.value;
                         return [4 /*yield*/, this.destructCascadeUpdate(entity, action, d, context, option, result)];
                     case 3:
-                        od = _e.sent();
+                        od = _d.sent();
                         opData.push(od);
-                        _e.label = 4;
+                        _d.label = 4;
                     case 4:
                         data_1_1 = data_1.next();
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_3_1 = _e.sent();
+                        e_3_1 = _d.sent();
                         e_3 = { error: e_3_1 };
                         return [3 /*break*/, 8];
                     case 7:
@@ -1043,55 +1043,23 @@ var CascadeStore = /** @class */ (function (_super) {
                         }
                         finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [3 /*break*/, 17];
-                    case 9:
-                        _e.trys.push([9, 14, 15, 16]);
-                        data_2 = tslib_1.__values(data), data_2_1 = data_2.next();
-                        _e.label = 10;
+                    case 8: return [3 /*break*/, 11];
+                    case 9: return [4 /*yield*/, this.destructCascadeUpdate(entity, action, data, context, option, result, filter)];
                     case 10:
-                        if (!!data_2_1.done) return [3 /*break*/, 13];
-                        dataEle = data_2_1.value;
-                        return [4 /*yield*/, this.cascadeUpdate(entity, {
-                                id: id,
-                                action: action,
-                                data: dataEle,
-                            }, context, option)];
+                        opData = _d.sent();
+                        _d.label = 11;
                     case 11:
-                        result2 = _e.sent();
-                        this.mergeOperationResult(result, result2);
-                        _e.label = 12;
-                    case 12:
-                        data_2_1 = data_2.next();
-                        return [3 /*break*/, 10];
-                    case 13: return [3 /*break*/, 16];
-                    case 14:
-                        e_4_1 = _e.sent();
-                        e_4 = { error: e_4_1 };
-                        return [3 /*break*/, 16];
-                    case 15:
-                        try {
-                            if (data_2_1 && !data_2_1.done && (_b = data_2.return)) _b.call(data_2);
-                        }
-                        finally { if (e_4) throw e_4.error; }
-                        return [7 /*endfinally*/];
-                    case 16: return [2 /*return*/, result];
-                    case 17: return [3 /*break*/, 20];
-                    case 18: return [4 /*yield*/, this.destructCascadeUpdate(entity, action, data, context, option, result, filter)];
-                    case 19:
-                        opData = _e.sent();
-                        _e.label = 20;
-                    case 20:
                         operation2 = Object.assign({}, operation, {
                             data: opData,
                         });
                         return [4 /*yield*/, this.doUpdateSingleRow(entity, operation2, context, option)];
-                    case 21:
-                        count = _e.sent();
-                        this.mergeOperationResult(result, (_c = {},
-                            _c[entity] = (_d = {},
-                                _d[operation2.action] = count,
-                                _d),
-                            _c));
+                    case 12:
+                        count = _d.sent();
+                        this.mergeOperationResult(result, (_b = {},
+                            _b[entity] = (_c = {},
+                                _c[operation2.action] = count,
+                                _c),
+                            _b));
                         return [2 /*return*/, result];
                 }
             });
@@ -1106,11 +1074,11 @@ var CascadeStore = /** @class */ (function (_super) {
      */
     CascadeStore.prototype.doUpdateSingleRow = function (entity, operation, context, option) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var data, action, operId, filter, now, _a, modiCreate, addTimestamp_1, result_1, e_5, congruentRow_1, rest, result2, row, updateData, result3, _b, _c, updateData, result2, _d, _e, createOper, _f, ids_1, selection, rows, modiUpsert, upsertModis, _g, originData, originId, createOper, updateAttrCount, result_2;
-            var _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+            var data, action, operId, filter, now, _a, modiCreate, addTimestamp_1, result_1, createInner, multipleCreate, data_2, data_2_1, d, createSingleOper, e_4_1, createOper, _b, ids_1, selection, rows, modiUpsert, upsertModis, _c, originData, originId, createOper, updateAttrCount, result_2;
+            var e_4, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             var _this = this;
-            return tslib_1.__generator(this, function (_t) {
-                switch (_t.label) {
+            return tslib_1.__generator(this, function (_o) {
+                switch (_o.label) {
                     case 0:
                         data = operation.data, action = operation.action, operId = operation.id, filter = operation.filter;
                         now = Date.now();
@@ -1141,7 +1109,7 @@ var CascadeStore = /** @class */ (function (_super) {
                         };
                         return [4 /*yield*/, this.cascadeUpdate('modi', modiCreate, context, option)];
                     case 2:
-                        _t.sent();
+                        _o.sent();
                         return [2 /*return*/, 1];
                     case 3:
                         addTimestamp_1 = function (data2) {
@@ -1156,67 +1124,128 @@ var CascadeStore = /** @class */ (function (_super) {
                         else {
                             addTimestamp_1(data);
                         }
-                        _t.label = 4;
+                        createInner = function (operation2) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var e_5;
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, , 3]);
+                                        return [4 /*yield*/, this.updateAbjointRow(entity, operation2, context, option)];
+                                    case 1:
+                                        result_1 = _a.sent();
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        e_5 = _a.sent();
+                                        /* 这段代码是处理插入时有重复的行，现在看有问题，等实际需求出现再写
+                                        if (e instanceof OakCongruentRowExists) {
+                                            if (option.allowExists) {
+                                                // 如果允许存在，对已存在行进行update，剩下的行继续insert
+                                                const congruentRow = e.getData() as ED[T]['OpSchema'];
+                                                if (data instanceof Array) {
+                                                    const rest = data.filter(
+                                                        ele => ele.id !== congruentRow.id
+                                                    );
+                                                    if (rest.length === data.length) {
+                                                        throw e;
+                                                    }
+                                                    const result2 = await this.updateAbjointRow(
+                                                        entity,
+                                                        Object.assign({}, operation, {
+                                                            data: rest,
+                                                        }),
+                                                        context,
+                                                        option
+                                                    );
+            
+                                                    const row = data.find(
+                                                        ele => ele.id === congruentRow.id
+                                                    );
+                                                    const updateData = omit(row, ['id', '$$createAt$$']);
+                                                    const result3 = await this.updateAbjointRow(
+                                                        entity,
+                                                        {
+                                                            id: await generateNewId(),
+                                                            action: 'update',
+                                                            data: updateData,
+                                                            filter: {
+                                                                id: congruentRow.id,
+                                                            } as any,
+                                                        },
+                                                        context,
+                                                        option
+                                                    );
+            
+                                                    return result2 + result3;
+                                                }
+                                                else {
+                                                    if (data.id !== congruentRow.id) {
+                                                        throw e;
+                                                    }
+                                                    const updateData = omit(data, ['id', '$$createAt$$']);
+                                                    const result2 = await this.updateAbjointRow(
+                                                        entity,
+                                                        {
+                                                            id: await generateNewId(),
+                                                            action: 'update',
+                                                            data: updateData,
+                                                            filter: {
+                                                                id: congruentRow.id,
+                                                            } as any,
+                                                        },
+                                                        context,
+                                                        option
+                                                    );
+                                                    return result2;
+                                                }
+                                            }
+                                        } */
+                                        throw e_5;
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); };
+                        if (!(data instanceof Array)) return [3 /*break*/, 13];
+                        multipleCreate = this.supportMultipleCreate();
+                        if (!multipleCreate) return [3 /*break*/, 5];
+                        return [4 /*yield*/, createInner(operation)];
                     case 4:
-                        _t.trys.push([4, 6, , 15]);
-                        return [4 /*yield*/, this.updateAbjointRow(entity, operation, context, option)];
+                        _o.sent();
+                        return [3 /*break*/, 12];
                     case 5:
-                        result_1 = _t.sent();
-                        return [3 /*break*/, 15];
+                        _o.trys.push([5, 10, 11, 12]);
+                        data_2 = tslib_1.__values(data), data_2_1 = data_2.next();
+                        _o.label = 6;
                     case 6:
-                        e_5 = _t.sent();
-                        if (!(e_5 instanceof types_1.OakCongruentRowExists)) return [3 /*break*/, 14];
-                        if (!option.allowExists) return [3 /*break*/, 13];
-                        congruentRow_1 = e_5.getData();
-                        if (!(data instanceof Array)) return [3 /*break*/, 10];
-                        rest = data.filter(function (ele) { return ele.id !== congruentRow_1.id; });
-                        if (rest.length === data.length) {
-                            throw e_5;
-                        }
-                        return [4 /*yield*/, this.updateAbjointRow(entity, Object.assign({}, operation, {
-                                data: rest,
-                            }), context, option)];
+                        if (!!data_2_1.done) return [3 /*break*/, 9];
+                        d = data_2_1.value;
+                        createSingleOper = {
+                            id: 'any',
+                            action: 'create',
+                            data: d,
+                        };
+                        return [4 /*yield*/, createInner(createSingleOper)];
                     case 7:
-                        result2 = _t.sent();
-                        row = data.find(function (ele) { return ele.id === congruentRow_1.id; });
-                        updateData = (0, lodash_1.omit)(row, ['id', '$$createAt$$']);
-                        _b = this.updateAbjointRow;
-                        _c = [entity];
-                        _h = {};
-                        return [4 /*yield*/, generateNewId()];
-                    case 8: return [4 /*yield*/, _b.apply(this, _c.concat([(_h.id = _t.sent(),
-                                _h.action = 'update',
-                                _h.data = updateData,
-                                _h.filter = {
-                                    id: congruentRow_1.id,
-                                },
-                                _h), context,
-                            option]))];
-                    case 9:
-                        result3 = _t.sent();
-                        return [2 /*return*/, result2 + result3];
+                        _o.sent();
+                        _o.label = 8;
+                    case 8:
+                        data_2_1 = data_2.next();
+                        return [3 /*break*/, 6];
+                    case 9: return [3 /*break*/, 12];
                     case 10:
-                        if (data.id !== congruentRow_1.id) {
-                            throw e_5;
+                        e_4_1 = _o.sent();
+                        e_4 = { error: e_4_1 };
+                        return [3 /*break*/, 12];
+                    case 11:
+                        try {
+                            if (data_2_1 && !data_2_1.done && (_d = data_2.return)) _d.call(data_2);
                         }
-                        updateData = (0, lodash_1.omit)(data, ['id', '$$createAt$$']);
-                        _d = this.updateAbjointRow;
-                        _e = [entity];
-                        _j = {};
-                        return [4 /*yield*/, generateNewId()];
-                    case 11: return [4 /*yield*/, _d.apply(this, _e.concat([(_j.id = _t.sent(),
-                                _j.action = 'update',
-                                _j.data = updateData,
-                                _j.filter = {
-                                    id: congruentRow_1.id,
-                                },
-                                _j), context,
-                            option]))];
-                    case 12:
-                        result2 = _t.sent();
-                        return [2 /*return*/, result2];
-                    case 13: throw e_5;
-                    case 14: return [3 /*break*/, 15];
+                        finally { if (e_4) throw e_4.error; }
+                        return [7 /*endfinally*/];
+                    case 12: return [3 /*break*/, 15];
+                    case 13: return [4 /*yield*/, createInner(operation)];
+                    case 14:
+                        _o.sent();
+                        _o.label = 15;
                     case 15:
                         if (!option.dontCollect) {
                             context.opRecords.push({
@@ -1228,20 +1257,20 @@ var CascadeStore = /** @class */ (function (_super) {
                         if (!(!option.dontCreateOper && !['oper', 'operEntity', 'modiEntity', 'modi'].includes(entity))) return [3 /*break*/, 22];
                         // 按照框架要求生成Oper和OperEntity这两个内置的对象
                         (0, assert_1.default)(operId);
-                        _k = {
+                        _e = {
                             id: 'dummy',
                             action: 'create'
                         };
-                        _l = {
+                        _f = {
                             id: operId,
                             action: action,
                             data: data
                         };
                         return [4 /*yield*/, context.getCurrentUserId()];
                     case 16:
-                        _l.operatorId = _t.sent();
+                        _f.operatorId = _o.sent();
                         if (!(data instanceof Array)) return [3 /*break*/, 18];
-                        _m = {
+                        _g = {
                             id: 'dummy',
                             action: 'create'
                         };
@@ -1260,34 +1289,34 @@ var CascadeStore = /** @class */ (function (_super) {
                                 });
                             }); }))];
                     case 17:
-                        _f = (_m.data = _t.sent(),
-                            _m);
+                        _b = (_g.data = _o.sent(),
+                            _g);
                         return [3 /*break*/, 20];
                     case 18:
-                        _o = {
+                        _h = {
                             id: 'dummy',
                             action: 'create'
                         };
-                        _p = {};
+                        _j = {};
                         return [4 /*yield*/, generateNewId()];
                     case 19:
-                        _f = [(_o.data = (_p.id = _t.sent(),
-                                _p.entity = entity,
-                                _p.entityId = data.id,
-                                _p),
-                                _o)];
-                        _t.label = 20;
+                        _b = [(_h.data = (_j.id = _o.sent(),
+                                _j.entity = entity,
+                                _j.entityId = data.id,
+                                _j),
+                                _h)];
+                        _o.label = 20;
                     case 20:
-                        createOper = (_k.data = (_l.operEntity$oper = _f,
-                            _l),
-                            _k);
+                        createOper = (_e.data = (_f.operEntity$oper = _b,
+                            _f),
+                            _e);
                         return [4 /*yield*/, this.cascadeUpdate('oper', createOper, context, {
                                 dontCollect: true,
                                 dontCreateOper: true,
                             })];
                     case 21:
-                        _t.sent();
-                        _t.label = 22;
+                        _o.sent();
+                        _o.label = 22;
                     case 22: return [2 /*return*/, result_1];
                     case 23:
                         ids_1 = (0, filter_1.getRelevantIds)(filter);
@@ -1304,9 +1333,9 @@ var CascadeStore = /** @class */ (function (_super) {
                                 dontCollect: true,
                             })];
                     case 24:
-                        rows = _t.sent();
+                        rows = _o.sent();
                         ids_1.push.apply(ids_1, tslib_1.__spreadArray([], tslib_1.__read((rows.map(function (ele) { return ele.id; }))), false));
-                        _t.label = 25;
+                        _o.label = 25;
                     case 25:
                         if (!(option.modiParentEntity && !['modi', 'modiEntity'].includes(entity))) return [3 /*break*/, 31];
                         modiUpsert = void 0;
@@ -1340,9 +1369,9 @@ var CascadeStore = /** @class */ (function (_super) {
                                 count: 1,
                             }, context, option)];
                     case 26:
-                        upsertModis = _t.sent();
+                        upsertModis = _o.sent();
                         if (upsertModis.length > 0) {
-                            _g = upsertModis[0], originData = _g.data, originId = _g.id;
+                            _c = upsertModis[0], originData = _c.data, originId = _c.id;
                             modiUpsert = {
                                 id: 'dummy',
                                 action: 'update',
@@ -1354,14 +1383,14 @@ var CascadeStore = /** @class */ (function (_super) {
                                 }
                             };
                         }
-                        _t.label = 27;
+                        _o.label = 27;
                     case 27:
                         if (!!modiUpsert) return [3 /*break*/, 29];
-                        _q = {
+                        _k = {
                             id: 'dummy',
                             action: 'create'
                         };
-                        _r = {
+                        _l = {
                             id: operId,
                             targetEntity: entity,
                             entity: option.modiParentEntity,
@@ -1375,7 +1404,7 @@ var CascadeStore = /** @class */ (function (_super) {
                                 },
                             }
                         };
-                        _s = {
+                        _m = {
                             id: 'dummy',
                             action: 'create'
                         };
@@ -1394,14 +1423,14 @@ var CascadeStore = /** @class */ (function (_super) {
                                 });
                             }); }))];
                     case 28:
-                        modiUpsert = (_q.data = (_r.modiEntity$modi = (_s.data = _t.sent(),
-                            _s),
-                            _r),
-                            _q);
-                        _t.label = 29;
+                        modiUpsert = (_k.data = (_l.modiEntity$modi = (_m.data = _o.sent(),
+                            _m),
+                            _l),
+                            _k);
+                        _o.label = 29;
                     case 29: return [4 /*yield*/, this.cascadeUpdate('modi', modiUpsert, context, option)];
                     case 30:
-                        _t.sent();
+                        _o.sent();
                         return [2 /*return*/, 1];
                     case 31:
                         createOper = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -1496,15 +1525,15 @@ var CascadeStore = /** @class */ (function (_super) {
                         return [4 /*yield*/, createOper()];
                     case 34:
                         // 如果不是update动作而是用户自定义的动作，这里还是要记录oper
-                        _t.sent();
+                        _o.sent();
                         return [2 /*return*/, 0];
                     case 35: return [2 /*return*/, 0];
                     case 36: return [4 /*yield*/, this.updateAbjointRow(entity, operation, context, option)];
                     case 37:
-                        result_2 = _t.sent();
+                        result_2 = _o.sent();
                         return [4 /*yield*/, createOper()];
                     case 38:
-                        _t.sent();
+                        _o.sent();
                         return [2 /*return*/, result_2];
                 }
             });

package/lib/store/TriggerExecutor.d.ts

@@ -3,7 +3,7 @@ import { EntityDict as BaseEntityDict } from '../base-app-domain';
 import { Logger } from "../types/Logger";
 import { Checker } from '../types/Auth';
 import { Context } from '../types/Context';
-import { Trigger, Executor } from "../types/Trigger";
+import { Trigger, Executor, CheckerType } from "../types/Trigger";
 /**
  * update可能会传入多种不同的action，此时都需要检查update trigger
  */
@@ -16,6 +16,7 @@ export declare class TriggerExecutor<ED extends EntityDict & BaseEntityDict, Cxt
     private contextBuilder;
     constructor(contextBuilder: (cxtString: string) => Promise<Cxt>, logger?: Logger);
     registerChecker<T extends keyof ED>(checker: Checker<ED, T, Cxt>): void;
+    getCheckers<T extends keyof ED>(entity: T, action: ED[T]['Action'], checkerTypes?: CheckerType[]): Trigger<ED, T, Cxt>[] | undefined;
     registerTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>): void;
     unregisterTrigger<T extends keyof ED>(trigger: Trigger<ED, T, Cxt>): void;
     private preCommitTrigger;

package/lib/store/TriggerExecutor.js

@@ -43,6 +43,12 @@ var TriggerExecutor = /** @class */ (function (_super) {
         };
         this.registerTrigger(trigger);
     };
+    TriggerExecutor.prototype.getCheckers = function (entity, action, checkerTypes) {
+        var _a;
+        var triggers = this.triggerMap[entity] && ((_a = this.triggerMap[entity][action]) === null || _a === void 0 ? void 0 : _a.filter(function (trigger) { return (typeof trigger.action === 'string' && trigger.action === action || (trigger.action).includes(action))
+            && (!checkerTypes || trigger.checkerType && checkerTypes.includes(trigger.checkerType)); }));
+        return triggers;
+    };
     TriggerExecutor.prototype.registerTrigger = function (trigger) {
         var _a;
         var _this = this;

package/lib/store/UniversalContext.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { IncomingHttpHeaders } from 'http';
 import { EntityDict, OpRecord, RowStore, TxnOption, Context } from "../types";
 export declare abstract class UniversalContext<ED extends EntityDict> implements Context<ED> {
     rowStore: RowStore<ED, this>;
@@ -5,11 +7,14 @@ export declare abstract class UniversalContext<ED extends EntityDict> implements
     opRecords: OpRecord<ED>[];
     private scene?;
     private rwLock;
+    private headers?;
     events: {
         commit: Array<() => Promise<void>>;
         rollback: Array<() => Promise<void>>;
     };
-    constructor(store: RowStore<ED, UniversalContext<ED>>);
+    constructor(store: RowStore<ED, UniversalContext<ED>>, headers?: IncomingHttpHeaders);
+    setHeaders(headers: IncomingHttpHeaders): void;
+    getHeader(key: string): string | string[] | undefined;
     getScene(): string | undefined;
     setScene(scene?: string): void;
     private resetEvents;

package/lib/store/UniversalContext.js

@@ -5,7 +5,7 @@ var tslib_1 = require("tslib");
 var assert_1 = tslib_1.__importDefault(require("assert"));
 var concurrent_1 = require("../utils/concurrent");
 var UniversalContext = /** @class */ (function () {
-    function UniversalContext(store) {
+    function UniversalContext(store, headers) {
         this.rowStore = store;
         this.opRecords = [];
         this.rwLock = new concurrent_1.RWLock();
@@ -13,7 +13,18 @@ var UniversalContext = /** @class */ (function () {
             commit: [],
             rollback: [],
         };
+        if (headers) {
+            this.headers = headers;
+        }
     }
+    UniversalContext.prototype.setHeaders = function (headers) {
+        this.headers = headers;
+    };
+    UniversalContext.prototype.getHeader = function (key) {
+        if (this.headers) {
+            return this.headers[key];
+        }
+    };
     UniversalContext.prototype.getScene = function () {
         return this.scene;
     };

package/lib/store/filter.d.ts

@@ -1,7 +1,8 @@
 import { StorageSchema } from '../types';
 import { EntityDict } from "../types/Entity";
 export declare function addFilterSegment<ED extends EntityDict, T extends keyof ED>(...filters: ED[T]['Selection']['filter'][]): ED[T]["Selection"]["filter"];
-export declare function combineFilters<ED extends EntityDict, T extends keyof ED>(filters: Array<ED[T]['Selection']['filter']>): ED[T]["Selection"]["filter"];
+export declare function unionFilterSegment<ED extends EntityDict, T extends keyof ED>(...filters: ED[T]['Selection']['filter'][]): ED[T]["Selection"]["filter"];
+export declare function combineFilters<ED extends EntityDict, T extends keyof ED>(filters: Array<ED[T]['Selection']['filter']>, union?: true): ED[T]["Selection"]["filter"];
 /**
  * 判断filter是否包含conditionalFilter中的查询条件，即filter查询的结果一定满足conditionalFilter的约束
  * filter = {
@@ -40,3 +41,29 @@ export declare function repel<ED extends EntityDict, T extends keyof ED>(entity:
  * @returns
  */
 export declare function getRelevantIds<ED extends EntityDict, T extends keyof ED>(filter: ED[T]['Selection']['filter']): string[];
+/**
+ * 判断两个过滤条件是否完全一致
+ * @param entity
+ * @param schema
+ * @param filter1
+ * @param filter2
+ */
+export declare function same<ED extends EntityDict, T extends keyof ED>(entity: T, schema: StorageSchema<ED>, filter1: ED[T]['Selection']['filter'], filter2: ED[T]['Selection']['filter']): boolean;
+/**
+ * 寻找在树形结构中满足条件的数据行的上层数据
+ * 例如在area表中，如果“杭州市”满足这一条件，则希望查到更高层的“浙江省”和“中国”，即可构造出满足条件的filter
+ * @param entity
+ * @param parentKey parentId属性名
+ * @param filter 查询当前行的条件
+ * @param level
+ */
+export declare function makeTreeAncestorFilter<ED extends EntityDict, T extends keyof ED>(entity: T, parentKey: string, filter: ED[T]['Selection']['filter'], level?: number, includeAll?: boolean, includeSelf?: boolean): ED[T]['Selection']['filter'];
+/**
+ * 寻找在树形结构中满足条件的数据行的下层数据
+ * 例如在area表中，如果“杭州市”满足这一条件，则希望查到更低层的“西湖区”，即可构造出满足条件的filter
+ * @param entity
+ * @param parentKey parentId属性名
+ * @param filter 查询当前行的条件
+ * @param level
+ */
+export declare function makeTreeDescendantFilter<ED extends EntityDict, T extends keyof ED>(entity: T, parentKey: string, filter: ED[T]['Selection']['filter'], level?: number, includeAll?: boolean, includeSelf?: boolean): ED[T]['Selection']['filter'];

package/lib/store/filter.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRelevantIds = exports.repel = exports.contains = exports.combineFilters = exports.addFilterSegment = void 0;
+exports.makeTreeDescendantFilter = exports.makeTreeAncestorFilter = exports.same = exports.getRelevantIds = exports.repel = exports.contains = exports.combineFilters = exports.unionFilterSegment = exports.addFilterSegment = void 0;
 var tslib_1 = require("tslib");
+var assert_1 = tslib_1.__importDefault(require("assert"));
 var lodash_1 = require("../utils/lodash");
 function addFilterSegment() {
     var filters = [];
@@ -52,7 +53,45 @@ function addFilterSegment() {
     return filter;
 }
 exports.addFilterSegment = addFilterSegment;
-function combineFilters(filters) {
+function unionFilterSegment() {
+    var e_1, _a;
+    var filters = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        filters[_i] = arguments[_i];
+    }
+    var allOnlyOneOr = true;
+    try {
+        for (var filters_1 = tslib_1.__values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
+            var f = filters_1_1.value;
+            if (Object.keys(f).length > 1 || !f.$or) {
+                allOnlyOneOr = false;
+                break;
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    if (allOnlyOneOr) {
+        // 优化特殊情况，全部都是$or，直接合并
+        var ors = filters.map(function (ele) { return ele.$or; });
+        return {
+            $or: ors.reduce(function (prev, next) { return prev.concat(next); }, [])
+        };
+    }
+    return {
+        $or: filters,
+    };
+}
+exports.unionFilterSegment = unionFilterSegment;
+function combineFilters(filters, union) {
+    if (union) {
+        return unionFilterSegment.apply(void 0, tslib_1.__spreadArray([], tslib_1.__read(filters), false));
+    }
     return addFilterSegment.apply(void 0, tslib_1.__spreadArray([], tslib_1.__read(filters), false));
 }
 exports.combineFilters = combineFilters;
@@ -150,3 +189,98 @@ function getRelevantIds(filter) {
     return result;
 }
 exports.getRelevantIds = getRelevantIds;
+/**
+ * 判断两个过滤条件是否完全一致
+ * @param entity
+ * @param schema
+ * @param filter1
+ * @param filter2
+ */
+function same(entity, schema, filter1, filter2) {
+    // 当前只需要判断是不是id相等就行了，在runningTree的operation合并的时间使用
+    if (!filter1 || !filter1.id || Object.keys(filter1).length > 1 || !filter2 || !filter2.id || Object.keys(filter2).length > 1) {
+        return false;
+    }
+    return filter1.id === filter2.id;
+}
+exports.same = same;
+/**
+ * 寻找在树形结构中满足条件的数据行的上层数据
+ * 例如在area表中，如果“杭州市”满足这一条件，则希望查到更高层的“浙江省”和“中国”，即可构造出满足条件的filter
+ * @param entity
+ * @param parentKey parentId属性名
+ * @param filter 查询当前行的条件
+ * @param level
+ */
+function makeTreeAncestorFilter(entity, parentKey, filter, level, includeAll, includeSelf) {
+    var _a;
+    if (level === void 0) { level = 1; }
+    (0, assert_1.default)(level >= 0);
+    var idInFilters = [];
+    if (includeSelf) {
+        idInFilters.push(filter);
+    }
+    var currentLevelInFilter = filter;
+    while (level > 0) {
+        currentLevelInFilter = {
+            id: {
+                $in: {
+                    entity: entity,
+                    data: (_a = {},
+                        _a[parentKey] = 1,
+                        _a),
+                    filter: currentLevelInFilter,
+                }
+            },
+        };
+        if (includeAll) {
+            idInFilters.push(currentLevelInFilter);
+        }
+        level--;
+    }
+    ;
+    if (includeAll) {
+        return {
+            $or: idInFilters,
+        };
+    }
+    return currentLevelInFilter;
+}
+exports.makeTreeAncestorFilter = makeTreeAncestorFilter;
+/**
+ * 寻找在树形结构中满足条件的数据行的下层数据
+ * 例如在area表中，如果“杭州市”满足这一条件，则希望查到更低层的“西湖区”，即可构造出满足条件的filter
+ * @param entity
+ * @param parentKey parentId属性名
+ * @param filter 查询当前行的条件
+ * @param level
+ */
+function makeTreeDescendantFilter(entity, parentKey, filter, level, includeAll, includeSelf) {
+    var _a;
+    if (level === void 0) { level = 1; }
+    (0, assert_1.default)(level >= 0);
+    (0, assert_1.default)(parentKey.endsWith('Id'));
+    var parentKeyRef = parentKey.slice(0, parentKey.length - 2);
+    var idInFilters = [];
+    if (includeSelf) {
+        idInFilters.push(filter);
+    }
+    var currentLevelInFilter = filter;
+    while (level > 0) {
+        currentLevelInFilter = (_a = {},
+            _a[parentKeyRef] = currentLevelInFilter,
+            _a);
+        if (includeAll) {
+            idInFilters.push(currentLevelInFilter);
+        }
+        level--;
+    }
+    ;
+    if (includeAll) {
+        return {
+            $or: idInFilters,
+        };
+    }
+    return currentLevelInFilter;
+}
+exports.makeTreeDescendantFilter = makeTreeDescendantFilter;

package/lib/types/Context.d.ts

@@ -12,4 +12,5 @@ export interface Context<ED extends EntityDict> {
     getScene(): string | undefined;
     setScene(scene?: string): void;
     getCurrentUserId(): Promise<string | undefined>;
+    getHeader(key: string): string | string[] | undefined;
 }

package/lib/types/Exception.d.ts

@@ -65,8 +65,10 @@ export declare class OakRowLockedException extends OakUserException {
  */
 export declare class OakCongruentRowExists<ED extends EntityDict, T extends keyof ED> extends OakUserException {
     private data;
-    constructor(data: ED[T]['OpSchema'], message?: string);
+    private entity;
+    constructor(entity: T, data: ED[T]['OpSchema'], message?: string);
     getData(): ED[T]["OpSchema"];
+    getEntity(): T;
     toString(): string;
 }
 export declare function makeException(data: {

package/lib/types/Exception.js

@@ -172,19 +172,24 @@ exports.OakRowLockedException = OakRowLockedException;
  */
 var OakCongruentRowExists = /** @class */ (function (_super) {
     tslib_1.__extends(OakCongruentRowExists, _super);
-    function OakCongruentRowExists(data, message) {
+    function OakCongruentRowExists(entity, data, message) {
         var _this = _super.call(this, message) || this;
         _this.data = data;
+        _this.entity = entity;
         return _this;
     }
     OakCongruentRowExists.prototype.getData = function () {
         return this.data;
     };
+    OakCongruentRowExists.prototype.getEntity = function () {
+        return this.entity;
+    };
     OakCongruentRowExists.prototype.toString = function () {
         return JSON.stringify({
             name: this.constructor.name,
             message: this.message,
             data: this.data,
+            entity: this.entity,
         });
     };
     return OakCongruentRowExists;
@@ -215,7 +220,7 @@ function makeException(data) {
             return new OakUnloggedInException(data.message);
         }
         case OakCongruentRowExists.name: {
-            return new OakCongruentRowExists(data.data, data.message);
+            return new OakCongruentRowExists(data.entity, data.data, data.message);
         }
         case OakRowLockedException.name: {
             return new OakRowLockedException(data.message);

package/lib/types/RowStore.d.ts

@@ -19,4 +19,5 @@ export declare abstract class RowStore<ED extends EntityDict, Cxt extends Contex
     abstract rollback(txnId: string): Promise<void>;
     getSchema(): StorageSchema<ED>;
     mergeOperationResult(result: OperationResult<ED>, toBeMerged: OperationResult<ED>): void;
+    mergeMultipleResults(toBeMerged: OperationResult<ED>[]): OperationResult<ED>;
 }

package/lib/types/RowStore.js

@@ -22,6 +22,12 @@ var RowStore = /** @class */ (function () {
             }
         }
     };
+    RowStore.prototype.mergeMultipleResults = function (toBeMerged) {
+        var _this = this;
+        var result = {};
+        toBeMerged.forEach(function (ele) { return _this.mergeOperationResult(result, ele); });
+        return result;
+    };
     RowStore.$$LEVEL = 'store';
     RowStore.$$CODES = {
         primaryKeyConfilict: [1, '主键重复'],

package/lib/types/Watcher.d.ts

@@ -1,5 +1,6 @@
+import { SelectRowShape } from ".";
 import { Context } from "./Context";
-import { EntityDict, OperationResult, SelectionResult } from "./Entity";
+import { EntityDict, OperationResult } from "./Entity";
 declare type ActionData<ED extends EntityDict, T extends keyof ED> = ED[T]['Update']['data'] | ED[T]['Remove']['data'];
 export interface BBWatcher<ED extends EntityDict, T extends keyof ED> {
     name: string;
@@ -8,12 +9,12 @@ export interface BBWatcher<ED extends EntityDict, T extends keyof ED> {
     action: ED[T]['Operation']['action'];
     actionData: ActionData<ED, T> | (() => Promise<ActionData<ED, T>>);
 }
-export interface WBWatcher<ED extends EntityDict, T extends keyof ED, Cxt extends Context<ED>> {
+export interface WBWatcher<ED extends EntityDict, T extends keyof ED, Cxt extends Context<ED>, Proj extends ED[T]['Selection']['data'] = ED[T]['Selection']['data']> {
     name: string;
     entity: T;
     filter: ED[T]['Selection']['filter'] | (() => Promise<ED[T]['Selection']['filter']>);
-    projection: ED[T]['Selection']['data'] | (() => Promise<ED[T]['Selection']['data']>);
-    fn: (context: Cxt, data: SelectionResult<ED[T]['Schema'], Required<this['projection']>>['result']) => Promise<OperationResult<ED>>;
+    projection: Proj | (() => Promise<Proj>);
+    fn: (context: Cxt, data: SelectRowShape<ED[T]['Schema'], Proj>[]) => Promise<OperationResult<ED>>;
 }
 export declare type Watcher<ED extends EntityDict, T extends keyof ED, Cxt extends Context<ED>> = BBWatcher<ED, T> | WBWatcher<ED, T, Cxt>;
 export {};

package/lib/utils/SimpleConnector.js

@@ -72,6 +72,7 @@ var SimpleConnector = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.contextBuilder(oakCxtStr)(store)];
                     case 1:
                         context = _a.sent();
+                        context.setHeaders(headers);
                         return [2 /*return*/, {
                                 name: aspectName,
                                 params: body,

package/lib/utils/lodash.d.ts

@@ -3,6 +3,7 @@
  * 像assign, keys尽量使用Object的函数
  */
 import unset from 'lodash/unset';
+import uniqBy from 'lodash/uniqBy';
 import pull from 'lodash/pull';
 import uniq from 'lodash/uniq';
 import get from 'lodash/get';
@@ -16,4 +17,4 @@ import isEqual from 'lodash/isEqual';
 import union from 'lodash/union';
 import difference from 'lodash/difference';
 import groupBy from 'lodash/groupBy';
-export { unset, pull, uniq, get, set, intersection, omit, merge, cloneDeep, pick, isEqual, union, difference, groupBy, };
+export { unset, pull, uniq, uniqBy, get, set, intersection, omit, merge, cloneDeep, pick, isEqual, union, difference, groupBy, };

package/lib/utils/lodash.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.groupBy = exports.difference = exports.union = exports.isEqual = exports.pick = exports.cloneDeep = exports.merge = exports.omit = exports.intersection = exports.set = exports.get = exports.uniq = exports.pull = exports.unset = void 0;
+exports.groupBy = exports.difference = exports.union = exports.isEqual = exports.pick = exports.cloneDeep = exports.merge = exports.omit = exports.intersection = exports.set = exports.get = exports.uniqBy = exports.uniq = exports.pull = exports.unset = void 0;
 var tslib_1 = require("tslib");
 /**
  * 避免lodash打包体积过大
@@ -8,6 +8,8 @@ var tslib_1 = require("tslib");
  */
 var unset_1 = tslib_1.__importDefault(require("lodash/unset"));
 exports.unset = unset_1.default;
+var uniqBy_1 = tslib_1.__importDefault(require("lodash/uniqBy"));
+exports.uniqBy = uniqBy_1.default;
 var pull_1 = tslib_1.__importDefault(require("lodash/pull"));
 exports.pull = pull_1.default;
 var uniq_1 = tslib_1.__importDefault(require("lodash/uniq"));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "1.1.8",
+    "version": "1.1.9",
     "author": {
         "name": "XuChang"
     },
@@ -30,6 +30,7 @@
         "@types/uuid": "^8.3.0",
         "assert": "^2.0.0",
         "cross-env": "^7.0.2",
+        "cross-spawn": "^7.0.3",
         "fs-extra": "^10.0.0",
         "mocha": "^8.2.1",
         "ts-node": "~10.9.1",