oak-domain 1.1.12 → 1.1.14

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

@@ -1,16 +1,12 @@
-import { String, Datetime, PrimaryKey } from "../../types/DataType";
+import { String } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
 import { Action, ParticularAction, IState } from "./Action";
 import * as ModiEntity from "../ModiEntity/Schema";
 import * as OperEntity from "../OperEntity/Schema";
-export declare type OpSchema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type OpSchema = EntityShape & {
     targetEntity: String<32>;
     entity: String<32>;
     entityId: String<64>;
@@ -21,11 +17,7 @@ export declare type OpSchema = {
     iState?: IState | null;
 };
 export declare type OpAttr = keyof OpSchema;
-export declare type Schema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type Schema = EntityShape & {
     targetEntity: String<32>;
     entity: String<32>;
     entityId: String<64>;
@@ -42,6 +34,7 @@ export declare type Schema = {
 declare type AttrFilter = {
     id: Q_StringValue | SubQuery.ModiIdSubQuery;
     $$createAt$$: Q_DateValue;
+    $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
     targetEntity: Q_StringValue;
     entity: Q_StringValue;
@@ -59,6 +52,7 @@ export declare type Projection = {
     id: 1;
     $$createAt$$?: 1;
     $$updateAt$$?: 1;
+    $$seq$$?: 1;
     targetEntity?: 1;
     entity?: 1;
     entityId?: 1;
@@ -80,6 +74,7 @@ export declare type ExportProjection = {
     id?: string;
     $$createAt$$?: string;
     $$updateAt$$?: string;
+    $$seq$$?: string;
     targetEntity?: string;
     entity?: string;
     entityId?: string;
@@ -102,6 +97,8 @@ export declare type SortAttr = {
     id: 1;
 } | {
     $$createAt$$: 1;
+} | {
+    $$seq$$: 1;
 } | {
     $$updateAt$$: 1;
 } | {

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

@@ -1,26 +1,18 @@
-import { String, Datetime, PrimaryKey, ForeignKey } from "../../types/DataType";
+import { String, ForeignKey } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
 import { AppendOnlyAction } from "../../actions/action";
 import * as Modi from "../Modi/Schema";
 import * as User from "../User/Schema";
-export declare type OpSchema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type OpSchema = EntityShape & {
     modiId: ForeignKey<"modi">;
     entity: "user" | string;
     entityId: String<64>;
 };
 export declare type OpAttr = keyof OpSchema;
-export declare type Schema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type Schema = EntityShape & {
     modiId: ForeignKey<"modi">;
     entity: "user" | string;
     entityId: String<64>;
@@ -32,6 +24,7 @@ export declare type Schema = {
 declare type AttrFilter<E> = {
     id: Q_StringValue | SubQuery.ModiEntityIdSubQuery;
     $$createAt$$: Q_DateValue;
+    $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
     modiId: Q_StringValue | SubQuery.ModiIdSubQuery;
     modi: Modi.Filter;
@@ -46,6 +39,7 @@ export declare type Projection = {
     id: 1;
     $$createAt$$?: 1;
     $$updateAt$$?: 1;
+    $$seq$$?: 1;
     modiId?: 1;
     modi?: Modi.Projection;
     entity?: 1;
@@ -58,6 +52,7 @@ export declare type ExportProjection = {
     id?: string;
     $$createAt$$?: string;
     $$updateAt$$?: string;
+    $$seq$$?: string;
     modiId?: string;
     modi?: Modi.ExportProjection;
     entity?: string;
@@ -77,6 +72,8 @@ export declare type SortAttr = {
     id: 1;
 } | {
     $$createAt$$: 1;
+} | {
+    $$seq$$: 1;
 } | {
     $$updateAt$$: 1;
 } | {

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

@@ -1,16 +1,12 @@
-import { String, Datetime, PrimaryKey, ForeignKey } from "../../types/DataType";
+import { String, ForeignKey } 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, Operation as OakOperation, MakeAction as OakMakeAction } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
 import { AppendOnlyAction } from "../../actions/action";
 import * as User from "../User/Schema";
 import * as OperEntity from "../OperEntity/Schema";
-export declare type OpSchema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type OpSchema = EntityShape & {
     action: String<16>;
     data: Object;
     filter?: Object | null;
@@ -18,11 +14,7 @@ export declare type OpSchema = {
     operatorId?: ForeignKey<"user"> | null;
 };
 export declare type OpAttr = keyof OpSchema;
-export declare type Schema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type Schema = EntityShape & {
     action: String<16>;
     data: Object;
     filter?: Object | null;
@@ -36,6 +28,7 @@ export declare type Schema = {
 declare type AttrFilter = {
     id: Q_StringValue | SubQuery.OperIdSubQuery;
     $$createAt$$: Q_DateValue;
+    $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
     action: Q_StringValue;
     data: Object;
@@ -51,6 +44,7 @@ export declare type Projection = {
     id: 1;
     $$createAt$$?: 1;
     $$updateAt$$?: 1;
+    $$seq$$?: 1;
     action?: 1;
     data?: 1;
     filter?: 1;
@@ -67,6 +61,7 @@ export declare type ExportProjection = {
     id?: string;
     $$createAt$$?: string;
     $$updateAt$$?: string;
+    $$seq$$?: string;
     action?: string;
     data?: string;
     filter?: string;
@@ -87,6 +82,8 @@ export declare type SortAttr = {
     id: 1;
 } | {
     $$createAt$$: 1;
+} | {
+    $$seq$$: 1;
 } | {
     $$updateAt$$: 1;
 } | {

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

@@ -1,27 +1,19 @@
-import { String, Datetime, PrimaryKey, ForeignKey } from "../../types/DataType";
+import { String, ForeignKey } from "../../types/DataType";
 import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "../../types/Demand";
 import { OneOf } from "../../types/Polyfill";
 import * as SubQuery from "../_SubQuery";
-import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } from "../../types/Entity";
 import { AppendOnlyAction } from "../../actions/action";
 import * as Oper from "../Oper/Schema";
 import * as Modi from "../Modi/Schema";
 import * as User from "../User/Schema";
-export declare type OpSchema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type OpSchema = EntityShape & {
     operId: ForeignKey<"oper">;
     entity: "modi" | "user" | string;
     entityId: String<64>;
 };
 export declare type OpAttr = keyof OpSchema;
-export declare type Schema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type Schema = EntityShape & {
     operId: ForeignKey<"oper">;
     entity: "modi" | "user" | string;
     entityId: String<64>;
@@ -34,6 +26,7 @@ export declare type Schema = {
 declare type AttrFilter<E> = {
     id: Q_StringValue | SubQuery.OperEntityIdSubQuery;
     $$createAt$$: Q_DateValue;
+    $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
     operId: Q_StringValue | SubQuery.OperIdSubQuery;
     oper: Oper.Filter;
@@ -49,6 +42,7 @@ export declare type Projection = {
     id: 1;
     $$createAt$$?: 1;
     $$updateAt$$?: 1;
+    $$seq$$?: 1;
     operId?: 1;
     oper?: Oper.Projection;
     entity?: 1;
@@ -62,6 +56,7 @@ export declare type ExportProjection = {
     id?: string;
     $$createAt$$?: string;
     $$updateAt$$?: string;
+    $$seq$$?: string;
     operId?: string;
     oper?: Oper.ExportProjection;
     entity?: string;
@@ -85,6 +80,8 @@ export declare type SortAttr = {
     id: 1;
 } | {
     $$createAt$$: 1;
+} | {
+    $$seq$$: 1;
 } | {
     $$updateAt$$: 1;
 } | {

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

@@ -1,27 +1,19 @@
-import { String, Text, Datetime, PrimaryKey } from "../../types/DataType";
+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, Operation as OakOperation, MakeAction as OakMakeAction } from "../../types/Entity";
+import { FormCreateData, FormUpdateData, Operation as OakOperation, MakeAction as OakMakeAction, EntityShape } 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 declare type OpSchema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type OpSchema = EntityShape & {
     name?: String<16> | null;
     nickname?: String<64> | null;
     password?: Text | null;
 };
 export declare type OpAttr = keyof OpSchema;
-export declare type Schema = {
-    id: PrimaryKey;
-    $$createAt$$: Datetime;
-    $$updateAt$$: Datetime;
-    $$deleteAt$$?: Datetime | null;
+export declare type Schema = EntityShape & {
     name?: String<16> | null;
     nickname?: String<64> | null;
     password?: Text | null;
@@ -34,6 +26,7 @@ export declare type Schema = {
 declare type AttrFilter = {
     id: Q_StringValue | SubQuery.UserIdSubQuery;
     $$createAt$$: Q_DateValue;
+    $$seq$$: Q_StringValue;
     $$updateAt$$: Q_DateValue;
     name: Q_StringValue;
     nickname: Q_StringValue;
@@ -46,6 +39,7 @@ export declare type Projection = {
     id: 1;
     $$createAt$$?: 1;
     $$updateAt$$?: 1;
+    $$seq$$?: 1;
     name?: 1;
     nickname?: 1;
     password?: 1;
@@ -65,6 +59,7 @@ export declare type ExportProjection = {
     id?: string;
     $$createAt$$?: string;
     $$updateAt$$?: string;
+    $$seq$$?: string;
     name?: string;
     nickname?: string;
     password?: string;
@@ -85,6 +80,8 @@ export declare type SortAttr = {
     id: 1;
 } | {
     $$createAt$$: 1;
+} | {
+    $$seq$$: 1;
 } | {
     $$updateAt$$: 1;
 } | {

package/lib/compiler/schemalBuilder.js

@@ -850,19 +850,7 @@ function analyzeEntity(filename, path, program, relativePath) {
 function constructSchema(statements, entity) {
     var e_1, _a, e_2, _b;
     var schemaAttrs = Schema[entity].schemaAttrs;
-    var members = [
-        // id: String<64>
-        factory.createPropertySignature(undefined, factory.createIdentifier('id'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('PrimaryKey'))),
-        // $$createAt$$: Datetime
-        factory.createPropertySignature(undefined, factory.createIdentifier('$$createAt$$'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Datetime'))),
-        // $$updateAt$$: Datetime
-        factory.createPropertySignature(undefined, factory.createIdentifier('$$updateAt$$'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Datetime'))),
-        // $$updateAt$$: Datetime
-        factory.createPropertySignature(undefined, factory.createIdentifier('$$deleteAt$$'), factory.createToken(ts.SyntaxKind.QuestionToken), factory.createUnionTypeNode([
-            factory.createTypeReferenceNode(factory.createIdentifier('Datetime')),
-            factory.createLiteralTypeNode(factory.createNull())
-        ]))
-    ];
+    var members = [];
     var members2 = [];
     var _c = ManyToOne, _d = entity, manyToOneSet = _c[_d];
     var _e = OneToMany, _f = entity, oneToManySet = _e[_f];
@@ -997,10 +985,14 @@ function constructSchema(statements, entity) {
     }
     statements.push(factory.createTypeAliasDeclaration(undefined, [
         factory.createModifier(ts.SyntaxKind.ExportKeyword)
-    ], factory.createIdentifier('OpSchema'), undefined, factory.createTypeLiteralNode(members)), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("OpAttr"), undefined, factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined))));
+    ], factory.createIdentifier('OpSchema'), undefined, factory.createIntersectionTypeNode([
+        factory.createTypeReferenceNode('EntityShape'),
+        factory.createTypeLiteralNode(members)
+    ])), factory.createTypeAliasDeclaration(undefined, [factory.createModifier(ts.SyntaxKind.ExportKeyword)], factory.createIdentifier("OpAttr"), undefined, factory.createTypeOperatorNode(ts.SyntaxKind.KeyOfKeyword, factory.createTypeReferenceNode(factory.createIdentifier("OpSchema"), undefined))));
     statements.push(factory.createTypeAliasDeclaration(undefined, [
         factory.createModifier(ts.SyntaxKind.ExportKeyword)
     ], factory.createIdentifier('Schema'), undefined, factory.createIntersectionTypeNode([
+        factory.createTypeReferenceNode('EntityShape'),
         factory.createTypeLiteralNode(members.concat(members2)),
         factory.createMappedTypeNode(undefined, factory.createTypeParameterDeclaration(undefined, factory.createIdentifier("A"), factory.createTypeReferenceNode(factory.createIdentifier("ExpressionKey"), undefined), undefined), undefined, factory.createToken(ts.SyntaxKind.QuestionToken), factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword), undefined)
     ])));
@@ -1022,6 +1014,8 @@ function constructFilter(statements, entity) {
         ])),
         // $$createAt$$: Q_DateValue
         factory.createPropertySignature(undefined, factory.createIdentifier('$$createAt$$'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_DateValue'))),
+        // $$seq$$: Q_StringValue
+        factory.createPropertySignature(undefined, factory.createIdentifier('$$seq$$'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_StringValue'))),
         // $$updateAt$$: Q_DateValue
         factory.createPropertySignature(undefined, factory.createIdentifier('$$updateAt$$'), undefined, factory.createTypeReferenceNode(factory.createIdentifier('Q_DateValue')))
     ];
@@ -1176,6 +1170,7 @@ function constructProjection(statements, entity) {
         ['id', true],
         ['$$createAt$$', false],
         ['$$updateAt$$', false],
+        ['$$seq$$', false],
     ];
     var foreignKeyProperties = (_a = {},
         _a[entity] = [''],
@@ -1501,6 +1496,8 @@ function constructSorter(statements, entity) {
         factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("id"), undefined, factory.createLiteralTypeNode(factory.createNumericLiteral("1")))]),
         // $$createAt$$: 1
         factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("$$createAt$$"), undefined, factory.createLiteralTypeNode(factory.createNumericLiteral("1")))]),
+        // $$seq$$: 1
+        factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("$$seq$$"), undefined, factory.createLiteralTypeNode(factory.createNumericLiteral("1")))]),
         // $$updateAt$$: 1
         factory.createTypeLiteralNode([factory.createPropertySignature(undefined, factory.createIdentifier("$$updateAt$$"), undefined, factory.createLiteralTypeNode(factory.createNumericLiteral("1")))]),
     ];
@@ -2549,7 +2546,8 @@ var initialStatements = function () { return [
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("FormCreateData")),
         factory.createImportSpecifier(false, undefined, factory.createIdentifier("FormUpdateData")),
         factory.createImportSpecifier(false, factory.createIdentifier("Operation"), factory.createIdentifier("OakOperation")),
-        factory.createImportSpecifier(false, factory.createIdentifier("MakeAction"), factory.createIdentifier("OakMakeAction"))
+        factory.createImportSpecifier(false, factory.createIdentifier("MakeAction"), factory.createIdentifier("OakMakeAction")),
+        factory.createImportSpecifier(false, undefined, factory.createIdentifier("EntityShape")),
     ])), factory.createStringLiteral("".concat((0, env_1.TYPE_PATH_IN_OAK_DOMAIN)(), "Entity")), undefined)
 ]; };
 function outputSubQuery(outputDir, printer) {

package/lib/store/CascadeStore.js

@@ -35,6 +35,9 @@ var CascadeStore = /** @class */ (function (_super) {
                             _a[id] = (0, lodash_1.cloneDeep)(row),
                             _a));
                     }
+                    else {
+                        Object.assign(entityBranch_1[id], row);
+                    }
                 });
                 return;
             }
@@ -128,7 +131,7 @@ var CascadeStore = /** @class */ (function (_super) {
                     subCascadeSelectionFns.forEach(function (ele) { return cascadeSelectionFns.push(function (result) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, ele(result.map(function (ele2) { return ele2[attr]; }))];
+                                case 0: return [4 /*yield*/, ele(result.map(function (ele2) { return ele2[attr]; }).filter(function (ele2) { return !!ele2; }))];
                                 case 1:
                                     _a.sent();
                                     return [2 /*return*/];
@@ -222,7 +225,7 @@ var CascadeStore = /** @class */ (function (_super) {
                     subCascadeSelectionFns.forEach(function (ele) { return cascadeSelectionFns.push(function (result) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0: return [4 /*yield*/, ele(result.map(function (ele2) { return ele2[attr]; }))];
+                                case 0: return [4 /*yield*/, ele(result.map(function (ele2) { return ele2[attr]; }).filter(function (ele2) { return !!ele2; }))];
                                 case 1:
                                     _a.sent();
                                     return [2 /*return*/];
@@ -667,7 +670,7 @@ var CascadeStore = /** @class */ (function (_super) {
                         modiAttr = this.getSchema()[entity].toModi;
                         option2 = Object.assign({}, option);
                         opData = {};
-                        if (modiAttr && action !== 'remove') {
+                        if (modiAttr && action !== 'remove' && !option.dontCreateModi) {
                             // create/update具有modi对象的对象，对其子对象的update行为全部是create modi对象（缓存动作）
                             // delete此对象，所有的modi子对象应该通过触发器作废，这个通过系统的trigger来搞
                             (0, assert_1.default)(!option2.modiParentId && !option2.modiParentEntity);
@@ -1074,7 +1077,7 @@ 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, 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 data, action, operId, filter, now, _a, modiCreate, addTimestamp_1, result_1, createInner, multipleCreate, data_2, data_2_1, d, createSingleOper, e_4_1, operatorId, 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 (_o) {
@@ -1257,6 +1260,10 @@ 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);
+                        return [4 /*yield*/, context.getCurrentUserId(true)];
+                    case 16:
+                        operatorId = _o.sent();
+                        if (!operatorId) return [3 /*break*/, 22];
                         _e = {
                             id: 'dummy',
                             action: 'create'
@@ -1264,11 +1271,9 @@ var CascadeStore = /** @class */ (function (_super) {
                         _f = {
                             id: operId,
                             action: action,
-                            data: data
+                            data: data,
+                            operatorId: operatorId
                         };
-                        return [4 /*yield*/, context.getCurrentUserId()];
-                    case 16:
-                        _f.operatorId = _o.sent();
                         if (!(data instanceof Array)) return [3 /*break*/, 18];
                         _g = {
                             id: 'dummy',

package/lib/store/UniversalContext.d.ts

@@ -28,5 +28,5 @@ export declare abstract class UniversalContext<ED extends EntityDict> implements
     rollback(): Promise<void>;
     getCurrentTxnId(): string | undefined;
     abstract toString(): Promise<string>;
-    abstract getCurrentUserId(): Promise<string | undefined>;
+    abstract getCurrentUserId(allowUnloggedIn?: boolean): Promise<string | undefined>;
 }

package/lib/store/actionDef.js

@@ -23,7 +23,7 @@ function getFullProjection(entity, schema) {
 exports.getFullProjection = getFullProjection;
 function checkFilterContains(entity, schema, contained, context, filter) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var rowStore, filter2, result, data_1;
+        var rowStore, filter2, projection, result, data_1;
         var _a;
         return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
@@ -39,8 +39,9 @@ function checkFilterContains(entity, schema, contained, context, filter) {
                     filter2 = (0, filter_1.combineFilters)([filter, {
                             $not: contained,
                         }]);
+                    projection = process.env.OAK_PLATFORM === 'server' ? getFullProjection(entity, schema) : { id: 1 };
                     return [4 /*yield*/, rowStore.select(entity, {
-                            data: getFullProjection(entity, schema),
+                            data: projection,
                             filter: filter2,
                             indexFrom: 0,
                             count: 10,

package/lib/store/filter.js

@@ -150,7 +150,7 @@ function getRelevantIds(filter) {
     }
     // 因为要准确判定id，如果有其它的过滤条件，可能会使实际处理的行数少于id指向的行数，只能返回空数组
     var attrs = Object.keys(filter);
-    if ((0, lodash_1.union)(attrs, ['id', '$and', '$or']).length > 3) {
+    if ((0, lodash_1.intersection)(attrs, ['id', '$and', '$or']).length > 3) {
         return [];
     }
     if (filter === null || filter === void 0 ? void 0 : filter.$and) {

package/lib/store/modi.js

@@ -21,48 +21,19 @@ function createOperationsFromModies(modies) {
 exports.createOperationsFromModies = createOperationsFromModies;
 function applyModis(filter, context, option) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var modis, _a, _b, _c;
+        var _a, _b, _c;
         var _d;
         return tslib_1.__generator(this, function (_e) {
             switch (_e.label) {
-                case 0: return [4 /*yield*/, context.rowStore.select('modi', {
-                        data: {
-                            id: 1,
-                        },
-                        filter: filter,
-                        sorter: [
-                            {
-                                $attr: {
-                                    $$createAt$$: 1,
-                                },
-                                $direction: 'asc',
-                            }
-                        ]
-                    }, context, Object.assign({}, option, {
-                        blockTrigger: false,
-                    }))];
-                case 1:
-                    modis = (_e.sent()).result;
+                case 0:
                     _b = (_a = context.rowStore).operate;
                     _c = ['modi'];
                     _d = {};
                     return [4 /*yield*/, generateNewId()];
-                case 2: return [2 /*return*/, _b.apply(_a, _c.concat([(_d.id = _e.sent(),
+                case 1: return [2 /*return*/, _b.apply(_a, _c.concat([(_d.id = _e.sent(),
                             _d.action = 'apply',
                             _d.data = {},
-                            _d.filter = {
-                                id: {
-                                    $in: modis.map(function (ele) { return ele.id; }),
-                                }
-                            },
-                            _d.sorter = [
-                                {
-                                    $attr: {
-                                        $$createAt$$: 1,
-                                    },
-                                    $direction: 'asc',
-                                }
-                            ],
+                            _d.filter = filter,
                             _d), context, Object.assign({}, option, {
                             blockTrigger: false,
                         })]))];

package/lib/store/selection.js

@@ -199,6 +199,7 @@ function reinforceSelection(schema, entity, selection) {
                         entity: 1,
                         entityId: 1,
                         action: 1,
+                        iState: 1,
                         data: 1,
                         filter: 1,
                     },

package/lib/triggers/modi.js

@@ -10,7 +10,7 @@ var triggers = [
         fn: function (_a, context, option) {
             var operation = _a.operation;
             return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-                var filter, modies, modies_1, modies_1_1, modi, targetEntity, id, action, data, filter_1, targets, e_1_1;
+                var filter, modies, modies_1, modies_1_1, modi, targetEntity, id, action, data, filter_1, e_1_1;
                 var e_1, _b;
                 return tslib_1.__generator(this, function (_c) {
                     switch (_c.label) {
@@ -30,49 +30,39 @@ var triggers = [
                             modies = (_c.sent()).result;
                             _c.label = 2;
                         case 2:
-                            _c.trys.push([2, 8, 9, 10]);
+                            _c.trys.push([2, 7, 8, 9]);
                             modies_1 = tslib_1.__values(modies), modies_1_1 = modies_1.next();
                             _c.label = 3;
                         case 3:
-                            if (!!modies_1_1.done) return [3 /*break*/, 7];
+                            if (!!modies_1_1.done) return [3 /*break*/, 6];
                             modi = modies_1_1.value;
                             targetEntity = modi.targetEntity, id = modi.id, action = modi.action, data = modi.data, filter_1 = modi.filter;
-                            return [4 /*yield*/, context.rowStore.select(targetEntity, {
-                                    data: {
-                                        id: 1,
-                                    },
-                                    filter: filter_1,
-                                }, context, Object.assign({}, option, {
-                                    blockTrigger: true,
-                                }))];
-                        case 4:
-                            targets = _c.sent();
                             return [4 /*yield*/, context.rowStore.operate(targetEntity, {
                                     id: id,
                                     action: action,
                                     data: data,
-                                    filter: targets.result.map(function (ele) { return ele.id; }),
+                                    filter: filter_1,
                                 }, context, Object.assign({}, option, {
                                     blockTrigger: true,
                                 }))];
-                        case 5:
+                        case 4:
                             _c.sent();
-                            _c.label = 6;
-                        case 6:
+                            _c.label = 5;
+                        case 5:
                             modies_1_1 = modies_1.next();
                             return [3 /*break*/, 3];
-                        case 7: return [3 /*break*/, 10];
-                        case 8:
+                        case 6: return [3 /*break*/, 9];
+                        case 7:
                             e_1_1 = _c.sent();
                             e_1 = { error: e_1_1 };
-                            return [3 /*break*/, 10];
-                        case 9:
+                            return [3 /*break*/, 9];
+                        case 8:
                             try {
                                 if (modies_1_1 && !modies_1_1.done && (_b = modies_1.return)) _b.call(modies_1);
                             }
                             finally { if (e_1) throw e_1.error; }
                             return [7 /*endfinally*/];
-                        case 10: return [2 /*return*/, modies.length];
+                        case 9: return [2 /*return*/, modies.length];
                     }
                 });
             });

package/lib/types/Context.d.ts

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

package/lib/types/DataType.d.ts

@@ -11,6 +11,7 @@ export declare type Datetime = number | Date;
 export declare type Boolean = boolean;
 export declare type PrimaryKey = string;
 export declare type ForeignKey<E extends string> = string;
+export declare type Sequence = string;
 export { Geo, SingleGeo } from './Geo';
 export declare type DataTypes = number | string | Datetime | Geo | Object | SingleGeo;
 export declare const types: string[];

package/lib/types/Entity.d.ts

@@ -1,10 +1,11 @@
 import { GenericAction } from '../actions/action';
 import { ExpressionKey, ExprOp, MakeFilter, NodeId } from './Demand';
 import { OneOf, OptionalKeys } from './Polyfill';
+import { PrimaryKey, Sequence } from './DataType';
 export declare type TriggerDataAttribute = '$$triggerData$$';
 export declare type TriggerTimestampAttribute = '$$triggerTimestamp$$';
 declare type PrimaryKeyAttribute = 'id';
-export declare type InstinctiveAttributes = PrimaryKeyAttribute | '$$createAt$$' | '$$updateAt$$' | '$$deleteAt$$' | TriggerDataAttribute | TriggerTimestampAttribute;
+export declare type InstinctiveAttributes = PrimaryKeyAttribute | '$$createAt$$' | '$$updateAt$$' | '$$deleteAt$$' | TriggerDataAttribute | TriggerTimestampAttribute | '$$seq$$';
 export declare const initinctiveAttributes: string[];
 export declare type Filter<A extends string, F extends Object | undefined = undefined> = {
     filter?: A extends 'create' ? undefined : F;
@@ -23,6 +24,7 @@ export declare type OperateOption = {
     blockTrigger?: true;
     dontCollect?: boolean;
     dontCreateOper?: boolean;
+    dontCreateModi?: boolean;
     allowExists?: boolean;
     modiParentId?: string;
     modiParentEntity?: string;
@@ -35,14 +37,15 @@ export declare type FormCreateData<SH extends GeneralEntityShape> = Omit<SH, Ins
     id: string;
 };
 export declare type Operation<A extends GenericAction | string, DATA extends Object, FILTER extends Object | undefined = undefined, SORTER extends Object | undefined = undefined> = {
-    id: string;
+    id?: string;
     action: A;
     data: DATA;
     sorter?: SORTER;
 } & Filter<A, FILTER>;
-export declare type Selection<DATA extends Object, FILTER extends Object | undefined = undefined, SORT extends Object | undefined = undefined> = Omit<Operation<'select', DATA, FILTER, SORT>, 'id'>;
+export declare type Selection<DATA extends Object, FILTER extends Object | undefined = undefined, SORT extends Object | undefined = undefined> = Operation<'select', DATA, FILTER, SORT>;
 export interface EntityShape {
-    id: string;
+    id: PrimaryKey;
+    $$seq$$: Sequence;
     $$createAt$$: number | Date;
     $$updateAt$$: number | Date;
     $$deleteAt$$?: number | Date | null;

package/lib/types/Entity.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initinctiveAttributes = void 0;
-exports.initinctiveAttributes = ['id', '$$createAt$$', '$$updateAt$$', '$$deleteAt$$', '$$triggerData$$', '$$triggerTimestamp$$'];
+exports.initinctiveAttributes = ['id', '$$createAt$$', '$$updateAt$$', '$$deleteAt$$', '$$triggerData$$', '$$triggerTimestamp$$', '$$seq$$'];
 ;
 ;
 ;

package/lib/types/Exception.d.ts

@@ -38,7 +38,9 @@ export declare class OakRowInconsistencyException<ED extends EntityDict> extends
  */
 export declare class OakInputIllegalException extends OakUserException {
     private attributes;
-    constructor(attributes: string[], message?: string);
+    private entity;
+    constructor(entity: string, attributes: string[], message?: string);
+    getEntity(): string;
     getAttributes(): string[];
     addAttributesPrefix(prefix: string): void;
     toString(): string;
@@ -71,6 +73,9 @@ export declare class OakCongruentRowExists<ED extends EntityDict, T extends keyo
     getEntity(): T;
     toString(): string;
 }
+export declare class OakDeadlock extends OakUserException {
+    constructor(message?: string | undefined);
+}
 export declare function makeException(data: {
     name: string;
     message?: string;

package/lib/types/Exception.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeException = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserUnpermittedException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakUserException = exports.OakExternalException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakDataException = exports.OakException = void 0;
+exports.makeException = exports.OakDeadlock = exports.OakCongruentRowExists = exports.OakRowLockedException = exports.OakUnloggedInException = exports.OakUserUnpermittedException = exports.OakInputIllegalException = exports.OakRowInconsistencyException = exports.OakUserException = exports.OakExternalException = exports.OakRowUnexistedException = exports.OakOperExistedException = exports.OakDataException = exports.OakException = void 0;
 var tslib_1 = require("tslib");
 var OakException = /** @class */ (function (_super) {
     tslib_1.__extends(OakException, _super);
@@ -109,11 +109,15 @@ exports.OakRowInconsistencyException = OakRowInconsistencyException;
  */
 var OakInputIllegalException = /** @class */ (function (_super) {
     tslib_1.__extends(OakInputIllegalException, _super);
-    function OakInputIllegalException(attributes, message) {
+    function OakInputIllegalException(entity, attributes, message) {
         var _this = _super.call(this, message) || this;
+        _this.entity = entity;
         _this.attributes = attributes;
         return _this;
     }
+    OakInputIllegalException.prototype.getEntity = function () {
+        return this.entity;
+    };
     OakInputIllegalException.prototype.getAttributes = function () {
         return this.attributes;
     };
@@ -122,6 +126,7 @@ var OakInputIllegalException = /** @class */ (function (_super) {
     };
     OakInputIllegalException.prototype.toString = function () {
         return JSON.stringify({
+            entity: this.entity,
             name: this.constructor.name,
             message: this.message,
             attributes: this.attributes,
@@ -195,6 +200,15 @@ var OakCongruentRowExists = /** @class */ (function (_super) {
     return OakCongruentRowExists;
 }(OakUserException));
 exports.OakCongruentRowExists = OakCongruentRowExists;
+var OakDeadlock = /** @class */ (function (_super) {
+    tslib_1.__extends(OakDeadlock, _super);
+    function OakDeadlock(message) {
+        return _super.call(this, message || '发现死锁') || this;
+    }
+    return OakDeadlock;
+}(OakUserException));
+exports.OakDeadlock = OakDeadlock;
+;
 function makeException(data) {
     var name = data.name;
     switch (name) {
@@ -211,7 +225,7 @@ function makeException(data) {
             return new OakRowInconsistencyException(data.data, data.message);
         }
         case OakInputIllegalException.name: {
-            return new OakInputIllegalException(data.attributes, data.message);
+            return new OakInputIllegalException(data.entity, data.attributes, data.message);
         }
         case OakUserUnpermittedException.name: {
             return new OakUserUnpermittedException(data.message);
@@ -228,6 +242,9 @@ function makeException(data) {
         case OakRowUnexistedException.name: {
             return new OakRowUnexistedException(data.rows);
         }
+        case OakDeadlock.name: {
+            return new OakDeadlock(data.message);
+        }
         default:
             return;
     }

package/lib/types/Storage.d.ts

@@ -25,6 +25,7 @@ export interface Attribute {
     default?: string | number | boolean;
     notNull?: boolean;
     unique?: boolean;
+    sequenceStart?: number;
 }
 export declare type Attributes<SH extends EntityShape> = Omit<{
     [attrName in keyof SH]: Attribute;

package/lib/types/schema/DataTypes.d.ts

@@ -18,7 +18,7 @@ export declare type WithWidthColumnType = "tinyint" | "smallint" | "mediumint" |
 /**
  * All other regular column types.
  */
-export declare type SimpleColumnType = "simple-array" | "simple-json" | "simple-enum" | "int2" | "integer" | "int4" | "int8" | "int64" | "unsigned big int" | "float" | "float4" | "float8" | "smallmoney" | "money" | "boolean" | "bool" | "tinyblob" | "tinytext" | "mediumblob" | "mediumtext" | "blob" | "text" | "ntext" | "citext" | "hstore" | "longblob" | "longtext" | "alphanum" | "shorttext" | "bytes" | "bytea" | "long" | "raw" | "long raw" | "bfile" | "clob" | "nclob" | "image" | "timetz" | "timestamptz" | "timestamp with local time zone" | "smalldatetime" | "date" | "interval year to month" | "interval day to second" | "interval" | "year" | "seconddate" | "point" | "line" | "lseg" | "box" | "circle" | "path" | "polygon" | "geography" | "geometry" | "linestring" | "multipoint" | "multilinestring" | "multipolygon" | "geometrycollection" | "st_geometry" | "st_point" | "int4range" | "int8range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "enum" | "set" | "cidr" | "inet" | "macaddr" | "bit" | "bit varying" | "varbit" | "tsvector" | "tsquery" | "uuid" | "xml" | "json" | "jsonb" | "varbinary" | "hierarchyid" | "sql_variant" | "rowid" | "urowid" | "uniqueidentifier" | "rowversion" | "array" | "cube" | "ltree" | "object" | "array" | "function";
+export declare type SimpleColumnType = "simple-array" | "simple-json" | "simple-enum" | "int2" | "integer" | "int4" | "int8" | "int64" | "unsigned big int" | "float" | "float4" | "float8" | "smallmoney" | "money" | "boolean" | "bool" | "tinyblob" | "tinytext" | "mediumblob" | "mediumtext" | "blob" | "text" | "ntext" | "citext" | "hstore" | "longblob" | "longtext" | "alphanum" | "shorttext" | "bytes" | "bytea" | "long" | "raw" | "long raw" | "bfile" | "clob" | "nclob" | "image" | "timetz" | "timestamptz" | "timestamp with local time zone" | "smalldatetime" | "date" | "interval year to month" | "interval day to second" | "interval" | "year" | "seconddate" | "point" | "line" | "lseg" | "box" | "circle" | "path" | "polygon" | "geography" | "geometry" | "linestring" | "multipoint" | "multilinestring" | "multipolygon" | "geometrycollection" | "st_geometry" | "st_point" | "int4range" | "int8range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "enum" | "set" | "cidr" | "inet" | "macaddr" | "bit" | "bit varying" | "varbit" | "tsvector" | "tsquery" | "uuid" | "xml" | "json" | "jsonb" | "varbinary" | "hierarchyid" | "sql_variant" | "rowid" | "urowid" | "uniqueidentifier" | "rowversion" | "array" | "cube" | "ltree" | "object" | "array" | "function" | "sequence";
 /**
  * Any column type column can be.
  */

package/lib/utils/lodash.d.ts

@@ -2,19 +2,4 @@
  * 避免lodash打包体积过大
  * 像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';
-import set from 'lodash/set';
-import intersection from 'lodash/intersection';
-import omit from 'lodash/omit';
-import merge from 'lodash/merge';
-import cloneDeep from 'lodash/cloneDeep';
-import pick from 'lodash/pick';
-import isEqual from 'lodash/isEqual';
-import union from 'lodash/union';
-import difference from 'lodash/difference';
-import groupBy from 'lodash/groupBy';
-export { unset, pull, uniq, uniqBy, 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, } from 'lodash';

package/lib/utils/lodash.js

@@ -1,38 +1,38 @@
 "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.uniqBy = exports.uniq = exports.pull = exports.unset = void 0;
-var tslib_1 = require("tslib");
 /**
  * 避免lodash打包体积过大
  * 像assign, keys尽量使用Object的函数
  */
-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"));
-exports.uniq = uniq_1.default;
-var get_1 = tslib_1.__importDefault(require("lodash/get"));
-exports.get = get_1.default;
-var set_1 = tslib_1.__importDefault(require("lodash/set"));
-exports.set = set_1.default;
-var intersection_1 = tslib_1.__importDefault(require("lodash/intersection"));
-exports.intersection = intersection_1.default;
-var omit_1 = tslib_1.__importDefault(require("lodash/omit"));
-exports.omit = omit_1.default;
-var merge_1 = tslib_1.__importDefault(require("lodash/merge"));
-exports.merge = merge_1.default;
-var cloneDeep_1 = tslib_1.__importDefault(require("lodash/cloneDeep"));
-exports.cloneDeep = cloneDeep_1.default;
-var pick_1 = tslib_1.__importDefault(require("lodash/pick"));
-exports.pick = pick_1.default;
-var isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
-exports.isEqual = isEqual_1.default;
-var union_1 = tslib_1.__importDefault(require("lodash/union"));
-exports.union = union_1.default;
-var difference_1 = tslib_1.__importDefault(require("lodash/difference"));
-exports.difference = difference_1.default;
-var groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
-exports.groupBy = groupBy_1.default;
+/* 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';
+import set from 'lodash/set';
+import intersection from 'lodash/intersection';
+import omit from 'lodash/omit';
+import merge from 'lodash/merge';
+import cloneDeep from 'lodash/cloneDeep';
+import pick from 'lodash/pick';
+import isEqual from 'lodash/isEqual';
+import union from 'lodash/union';
+import difference from 'lodash/difference';
+import groupBy from 'lodash/groupBy'; */
+var lodash_1 = require("lodash");
+Object.defineProperty(exports, "unset", { enumerable: true, get: function () { return lodash_1.unset; } });
+Object.defineProperty(exports, "pull", { enumerable: true, get: function () { return lodash_1.pull; } });
+Object.defineProperty(exports, "uniq", { enumerable: true, get: function () { return lodash_1.uniq; } });
+Object.defineProperty(exports, "uniqBy", { enumerable: true, get: function () { return lodash_1.uniqBy; } });
+Object.defineProperty(exports, "get", { enumerable: true, get: function () { return lodash_1.get; } });
+Object.defineProperty(exports, "set", { enumerable: true, get: function () { return lodash_1.set; } });
+Object.defineProperty(exports, "intersection", { enumerable: true, get: function () { return lodash_1.intersection; } });
+Object.defineProperty(exports, "omit", { enumerable: true, get: function () { return lodash_1.omit; } });
+Object.defineProperty(exports, "merge", { enumerable: true, get: function () { return lodash_1.merge; } });
+Object.defineProperty(exports, "cloneDeep", { enumerable: true, get: function () { return lodash_1.cloneDeep; } });
+Object.defineProperty(exports, "pick", { enumerable: true, get: function () { return lodash_1.pick; } });
+Object.defineProperty(exports, "isEqual", { enumerable: true, get: function () { return lodash_1.isEqual; } });
+Object.defineProperty(exports, "union", { enumerable: true, get: function () { return lodash_1.union; } });
+Object.defineProperty(exports, "difference", { enumerable: true, get: function () { return lodash_1.difference; } });
+Object.defineProperty(exports, "groupBy", { enumerable: true, get: function () { return lodash_1.groupBy; } });

package/lib/utils/validator.d.ts

@@ -18,6 +18,6 @@ export declare const isPhone: ValidatorFunction;
 export declare const isNumber: ValidatorFunction;
 export declare const isMoney: ValidatorMoneyFunction;
 export declare const isVehicleNumber: ValidatorFunction;
-export declare function checkAttributesNotNull<T extends Record<string, any>>(data: T, attributes: Array<keyof T>, allowEmpty?: true): void;
-export declare function checkAttributesScope<T extends Record<string, any>>(data: T, attributes: Array<keyof T>): void;
+export declare function checkAttributesNotNull<T extends Record<string, any>>(entity: string, data: T, attributes: Array<keyof T>, allowEmpty?: true): void;
+export declare function checkAttributesScope<T extends Record<string, any>>(entity: string, data: T, attributes: Array<keyof T>): void;
 export {};

package/lib/utils/validator.js

@@ -99,7 +99,7 @@ var isVehicleNumber = function (str) {
     return reg.test(str);
 };
 exports.isVehicleNumber = isVehicleNumber;
-function checkAttributesNotNull(data, attributes, allowEmpty) {
+function checkAttributesNotNull(entity, data, attributes, allowEmpty) {
     var attrs = attributes.filter(function (attr) {
         if (data[attr] === null || data[attr] === '') {
             return true;
@@ -109,15 +109,15 @@ function checkAttributesNotNull(data, attributes, allowEmpty) {
         }
     });
     if (attrs.length > 0) {
-        throw new types_1.OakInputIllegalException(attrs, '属性不能为空');
+        throw new types_1.OakInputIllegalException(entity, attrs, '属性不能为空');
     }
 }
 exports.checkAttributesNotNull = checkAttributesNotNull;
 ;
-function checkAttributesScope(data, attributes) {
+function checkAttributesScope(entity, data, attributes) {
     var attrs = attributes.filter(function (attr) { return !data.hasOwnProperty(attr); });
     if (attrs.length > 0) {
-        throw new types_1.OakInputIllegalException(attrs, '多余的属性');
+        throw new types_1.OakInputIllegalException(entity, attrs, '多余的属性');
     }
 }
 exports.checkAttributesScope = checkAttributesScope;

package/package.json

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