This commit is contained in:
Xu Chang 2022-08-29 18:27:53 +08:00
parent dab81b851d
commit d929a5f395
25 changed files with 101 additions and 105 deletions

View File

@ -16,8 +16,9 @@ export declare function createWechatQrCode<ED extends EntityDict, T extends keyo
application?: import("../general-app-domain/Application/Schema").UpdateOperation | undefined;
} & {
[K: string]: any;
entity?: string | undefined;
entityId?: string | undefined;
} & {
[k: string]: any;
operEntity$entity?: import("oak-domain/lib/types").Operation<string, Omit<import("../general-app-domain/OperEntity/Schema").UpdateOperationData, "entity" | "entityId">, import("../general-app-domain/OperEntity/Schema").Filter<import("oak-domain/lib/types").Q_EnumValue<string>>, undefined> | (import("oak-domain/lib/types").Operation<string, Omit<import("../general-app-domain/OperEntity/Schema").UpdateOperationData, "entity" | "entityId">, import("../general-app-domain/OperEntity/Schema").Filter<import("oak-domain/lib/types").Q_EnumValue<string>>, undefined> | import("oak-domain/lib/types").Operation<"create", Omit<import("../general-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId"> | Omit<import("../general-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">[], undefined, undefined>)[] | undefined;
modiEntity$entity?: import("oak-domain/lib/types").Operation<string, Omit<import("../general-app-domain/ModiEntity/Schema").UpdateOperationData, "entity" | "entityId">, import("../general-app-domain/ModiEntity/Schema").Filter<import("oak-domain/lib/types").Q_EnumValue<string>>, undefined> | (import("oak-domain/lib/types").Operation<string, Omit<import("../general-app-domain/ModiEntity/Schema").UpdateOperationData, "entity" | "entityId">, import("../general-app-domain/ModiEntity/Schema").Filter<import("oak-domain/lib/types").Q_EnumValue<string>>, undefined> | import("oak-domain/lib/types").Operation<"create", Omit<import("../general-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId"> | Omit<import("../general-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">[], undefined, undefined>)[] | undefined;
}>;

View File

@ -117,9 +117,7 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "areaId"
} | {
areaId: String<64>;
area?: Area.UpdateOperation;
})) & {
[k: string]: any;
};
}));
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;

View File

@ -149,7 +149,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "systemI
systemId: String<64>;
system?: System.UpdateOperation;
})) & {
[k: string]: any;
token$application?: OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "application" | "applicationId">, Token.Filter> | Array<OakOperation<"create", Omit<Token.CreateOperationData, "application" | "applicationId"> | Omit<Token.CreateOperationData, "application" | "applicationId">[]> | OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "application" | "applicationId">, Token.Filter>>;
wechatQrCode$application?: OakOperation<WechatQrCode.UpdateOperation["action"], Omit<WechatQrCode.UpdateOperationData, "application" | "applicationId">, WechatQrCode.Filter> | Array<OakOperation<"create", Omit<WechatQrCode.CreateOperationData, "application" | "applicationId"> | Omit<WechatQrCode.CreateOperationData, "application" | "applicationId">[]> | OakOperation<WechatQrCode.UpdateOperation["action"], Omit<WechatQrCode.UpdateOperationData, "application" | "applicationId">, WechatQrCode.Filter>>;
wechatUser$application?: OakOperation<WechatUser.UpdateOperation["action"], Omit<WechatUser.UpdateOperationData, "application" | "applicationId">, WechatUser.Filter> | Array<OakOperation<"create", Omit<WechatUser.CreateOperationData, "application" | "applicationId"> | Omit<WechatUser.CreateOperationData, "application" | "applicationId">[]> | OakOperation<WechatUser.UpdateOperation["action"], Omit<WechatUser.UpdateOperationData, "application" | "applicationId">, WechatUser.Filter>>;

View File

@ -129,7 +129,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "parentI
parentId?: String<64>;
parent?: UpdateOperation;
})) & {
[k: string]: any;
address$area?: OakOperation<Address.UpdateOperation["action"], Omit<Address.UpdateOperationData, "area" | "areaId">, Address.Filter> | Array<OakOperation<"create", Omit<Address.CreateOperationData, "area" | "areaId"> | Omit<Address.CreateOperationData, "area" | "areaId">[]> | OakOperation<Address.UpdateOperation["action"], Omit<Address.UpdateOperationData, "area" | "areaId">, Address.Filter>>;
area$parent?: OakOperation<UpdateOperation["action"], Omit<UpdateOperationData, "parent" | "parentId">, Filter> | Array<OakOperation<"create", Omit<CreateOperationData, "parent" | "parentId"> | Omit<CreateOperationData, "parent" | "parentId">[]> | OakOperation<UpdateOperation["action"], Omit<UpdateOperationData, "parent" | "parentId">, Filter>>;
};

View File

@ -112,9 +112,7 @@ export declare type Sorter = SortNode[];
export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<OpSchema> & {
[k: string]: any;
};
export declare type CreateOperationData = FormCreateData<OpSchema>;
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;

View File

@ -110,9 +110,7 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "systemI
} | {
systemId: String<64>;
system?: System.UpdateOperation;
})) & {
[k: string]: any;
};
}));
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;

View File

@ -106,7 +106,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "userId"
userId: String<64>;
user?: User.UpdateOperation;
})) & {
[k: string]: any;
token$entity?: OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "entity" | "entityId">, Token.Filter> | Array<OakOperation<"create", Omit<Token.CreateOperationData, "entity" | "entityId"> | Omit<Token.CreateOperationData, "entity" | "entityId">[]> | OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "entity" | "entityId">, Token.Filter>>;
};
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;

View File

@ -64,6 +64,7 @@ declare type AttrFilter<E> = {
extra1: Q_StringValue;
extension: Q_StringValue;
size: Q_NumberValue;
user: User.Filter;
};
export declare type Filter<E = Q_EnumValue<"user" | string>> = MakeFilter<AttrFilter<E> & ExprOp<OpAttr | string>>;
export declare type Projection = {
@ -159,7 +160,7 @@ export declare type Sorter = SortNode[];
export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entityId" | "entity">> & ({
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
entity?: never;
entityId?: never;
user: User.CreateSingleOperation;
@ -168,14 +169,14 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entityI
entityId: String<64>;
user?: User.UpdateOperation;
} | {
entity?: string;
entityId?: string;
[K: string]: any;
}) & {
[k: string]: any;
};
});
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entityId" | "entity">> & ({
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId">> & ({
user?: User.CreateSingleOperation | User.UpdateOperation | User.RemoveOperation;
entityId?: undefined;
entity?: undefined;

View File

@ -106,7 +106,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "userId"
userId: String<64>;
user?: User.UpdateOperation;
})) & {
[k: string]: any;
token$entity?: OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "entity" | "entityId">, Token.Filter> | Array<OakOperation<"create", Omit<Token.CreateOperationData, "entity" | "entityId"> | Omit<Token.CreateOperationData, "entity" | "entityId">[]> | OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "entity" | "entityId">, Token.Filter>>;
};
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;

View File

@ -1,4 +1,4 @@
import { String, Datetime, PrimaryKey, ForeignKey } from "oak-domain/lib/types/DataType";
import { String, Datetime, PrimaryKey } from "oak-domain/lib/types/DataType";
import { Q_DateValue, Q_StringValue, Q_EnumValue, NodeId, MakeFilter, ExprOp, ExpressionKey } from "oak-domain/lib/types/Demand";
import { OneOf } from "oak-domain/lib/types/Polyfill";
import * as SubQuery from "../_SubQuery";
@ -10,11 +10,13 @@ export declare type OpSchema = {
$$createAt$$: Datetime;
$$updateAt$$: Datetime;
$$deleteAt$$?: Datetime | null;
targetEntity: String<32>;
entity: String<32>;
entityId: String<64>;
action: String<16>;
data: Object;
filter?: Object | null;
extra?: Object | null;
parentId?: ForeignKey<"modi"> | null;
iState?: IState | null;
};
export declare type OpAttr = keyof OpSchema;
@ -23,14 +25,14 @@ export declare type Schema = {
$$createAt$$: Datetime;
$$updateAt$$: Datetime;
$$deleteAt$$?: Datetime | null;
targetEntity: String<32>;
entity: String<32>;
entityId: String<64>;
action: String<16>;
data: Object;
filter?: Object | null;
extra?: Object | null;
parentId?: ForeignKey<"modi"> | null;
iState?: IState | null;
parent?: Schema | null;
modi$parent?: Array<Schema>;
modiEntity$modi?: Array<ModiEntity.Schema>;
} & {
[A in ExpressionKey]?: any;
@ -39,9 +41,10 @@ declare type AttrFilter = {
id: Q_StringValue | SubQuery.ModiIdSubQuery;
$$createAt$$: Q_DateValue;
$$updateAt$$: Q_DateValue;
targetEntity: Q_StringValue;
entity: Q_StringValue;
entityId: Q_StringValue;
action: Q_StringValue;
parentId: Q_StringValue | SubQuery.ModiIdSubQuery;
parent: Filter;
iState: Q_EnumValue<IState>;
};
export declare type Filter = MakeFilter<AttrFilter & ExprOp<OpAttr | string>>;
@ -51,16 +54,14 @@ export declare type Projection = {
id: 1;
$$createAt$$?: 1;
$$updateAt$$?: 1;
targetEntity?: 1;
entity?: 1;
entityId?: 1;
action?: 1;
data?: 1;
filter?: 1;
extra?: 1;
parentId?: 1;
parent?: Projection;
iState?: 1;
modi$parent?: Selection & {
$entity: "modi";
};
modiEntity$modi?: ModiEntity.Selection & {
$entity: "modiEntity";
};
@ -71,23 +72,20 @@ export declare type ExportProjection = {
id?: string;
$$createAt$$?: string;
$$updateAt$$?: string;
targetEntity?: string;
entity?: string;
entityId?: string;
action?: string;
data?: string;
filter?: string;
extra?: string;
parentId?: string;
parent?: ExportProjection;
iState?: string;
modi$parent?: Exportation & {
$entity: "modi";
};
modiEntity$modi?: ModiEntity.Exportation & {
$entity: "modiEntity";
};
} & Partial<ExprOp<OpAttr | string>>;
declare type ModiIdProjection = OneOf<{
id: 1;
parentId: 1;
}>;
export declare type SortAttr = {
id: 1;
@ -95,12 +93,14 @@ export declare type SortAttr = {
$$createAt$$: 1;
} | {
$$updateAt$$: 1;
} | {
targetEntity: 1;
} | {
entity: 1;
} | {
entityId: 1;
} | {
action: 1;
} | {
parentId: 1;
} | {
parent: SortAttr;
} | {
iState: 1;
} | {
@ -114,42 +114,27 @@ export declare type Sorter = SortNode[];
export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "parentId">> & (({
parentId?: never | null;
parent?: CreateSingleOperation;
} | {
parentId?: String<64>;
parent?: UpdateOperation;
})) & {
[k: string]: any;
modi$parent?: OakOperation<UpdateOperation["action"], Omit<UpdateOperationData, "parent" | "parentId">, Filter> | Array<OakOperation<"create", Omit<CreateOperationData, "parent" | "parentId"> | Omit<CreateOperationData, "parent" | "parentId">[]> | OakOperation<UpdateOperation["action"], Omit<UpdateOperationData, "parent" | "parentId">, Filter>>;
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId">> & ({
entity?: string;
entityId?: string;
[K: string]: any;
}) & {
modiEntity$modi?: OakOperation<ModiEntity.UpdateOperation["action"], Omit<ModiEntity.UpdateOperationData, "modi" | "modiId">, ModiEntity.Filter> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId"> | Omit<ModiEntity.CreateOperationData, "modi" | "modiId">[]> | OakOperation<ModiEntity.UpdateOperation["action"], Omit<ModiEntity.UpdateOperationData, "modi" | "modiId">, ModiEntity.Filter>>;
};
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "parentId">> & (({
parent?: CreateSingleOperation | UpdateOperation | RemoveOperation;
parentId?: undefined;
} | {
parent?: undefined;
parentId?: String<64> | null;
})) & {
export declare type UpdateOperationData = FormUpdateData<OpSchema> & {
[k: string]: any;
modis$parent?: UpdateOperation | RemoveOperation | Array<OakOperation<"create", Omit<CreateOperationData, "parent" | "parentId"> | Omit<CreateOperationData, "parent" | "parentId">[]> | UpdateOperation | RemoveOperation>;
modiEntitys$modi?: ModiEntity.UpdateOperation | ModiEntity.RemoveOperation | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "modi" | "modiId"> | Omit<ModiEntity.CreateOperationData, "modi" | "modiId">[]> | ModiEntity.UpdateOperation | ModiEntity.RemoveOperation>;
};
export declare type UpdateOperation = OakOperation<ParticularAction | "update" | string, UpdateOperationData, Filter, Sorter>;
export declare type RemoveOperationData = {} & (({
parent?: UpdateOperation;
} | {
parent?: RemoveOperation;
}));
export declare type RemoveOperationData = {};
export declare type RemoveOperation = OakOperation<"remove", RemoveOperationData, Filter, Sorter>;
export declare type Operation = CreateOperation | UpdateOperation | RemoveOperation | SelectOperation;
export declare type ModiIdSubQuery = Selection<ModiIdProjection>;
export declare type NativeAttr = OpAttr | `parent.${OpAttr}` | `parent.parent.${OpAttr}` | `parent.parent.parent.${OpAttr}`;
export declare type FullAttr = NativeAttr | `modis$${number}.${NativeAttr}` | `modiEntitys$${number}.${ModiEntity.NativeAttr}`;
export declare type NativeAttr = OpAttr;
export declare type FullAttr = NativeAttr | `modiEntitys$${number}.${ModiEntity.NativeAttr}`;
export declare type EntityDef = {
Schema: Schema;
OpSchema: OpSchema;

View File

@ -4,6 +4,24 @@ exports.desc = void 0;
var Action_1 = require("./Action");
exports.desc = {
attributes: {
targetEntity: {
type: "varchar",
params: {
length: 32
}
},
entity: {
type: "varchar",
params: {
length: 32
}
},
entityId: {
type: "varchar",
params: {
length: 64
}
},
action: {
type: "varchar",
params: {
@ -19,10 +37,6 @@ exports.desc = {
extra: {
type: "object"
},
parentId: {
type: "ref",
ref: "modi"
},
iState: {
type: "varchar",
params: {

View File

@ -1 +1 @@
{ "attr": { "action": "动作", "data": "数据", "filter": "条件", "extra": "其它", "iState": "状态", "parent": "关联父更新" }, "action": { "abandon": "放弃", "apply": "应用" }, "v": { "iState": { "active": "活跃的", "abandoned": "放弃的", "applied": "应用的" } } }
{ "attr": { "targetEntity": "目标对象", "entity": "关联对象", "entityId": "关联对象Id", "action": "动作", "data": "数据", "filter": "条件", "extra": "其它", "iState": "状态" }, "action": { "abandon": "放弃", "apply": "应用" }, "v": { "iState": { "active": "活跃的", "abandoned": "放弃的", "applied": "应用的" } } }

View File

@ -43,6 +43,10 @@ declare type AttrFilter<E> = {
modi: Modi.Filter;
entity: E;
entityId: Q_StringValue;
user: User.Filter;
userEntityGrant: UserEntityGrant.Filter;
wechatQrCode: WechatQrCode.Filter;
wechatUser: WechatUser.Filter;
};
export declare type Filter<E = Q_EnumValue<"user" | "userEntityGrant" | "wechatQrCode" | "wechatUser" | string>> = MakeFilter<AttrFilter<E> & ExprOp<OpAttr | string>>;
export declare type Projection = {
@ -126,7 +130,7 @@ export declare type Sorter = SortNode[];
export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "modiId" | "entityId" | "entity">> & (({
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "modiId">> & (({
modiId?: never | null;
modi: Modi.CreateSingleOperation;
} | {
@ -165,14 +169,14 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "modiId"
entityId: String<64>;
wechatUser?: WechatUser.UpdateOperation;
} | {
entity?: string;
entityId?: string;
[K: string]: any;
}) & {
[k: string]: any;
};
});
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "modiId" | "entityId" | "entity">> & (({
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId" | "modiId">> & (({
modi?: Modi.CreateSingleOperation | Modi.UpdateOperation | Modi.RemoveOperation;
modiId?: undefined;
} | {

View File

@ -110,7 +110,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "operato
operatorId?: String<64>;
operator?: User.UpdateOperation;
})) & {
[k: string]: any;
operEntity$oper?: OakOperation<OperEntity.UpdateOperation["action"], Omit<OperEntity.UpdateOperationData, "oper" | "operId">, OperEntity.Filter> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "oper" | "operId"> | Omit<OperEntity.CreateOperationData, "oper" | "operId">[]> | OakOperation<OperEntity.UpdateOperation["action"], Omit<OperEntity.UpdateOperationData, "oper" | "operId">, OperEntity.Filter>>;
};
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;

View File

@ -43,6 +43,10 @@ declare type AttrFilter<E> = {
oper: Oper.Filter;
entity: E;
entityId: Q_StringValue;
user: User.Filter;
userEntityGrant: UserEntityGrant.Filter;
wechatQrCode: WechatQrCode.Filter;
wechatUser: WechatUser.Filter;
};
export declare type Filter<E = Q_EnumValue<"user" | "userEntityGrant" | "wechatQrCode" | "wechatUser" | string>> = MakeFilter<AttrFilter<E> & ExprOp<OpAttr | string>>;
export declare type Projection = {
@ -126,7 +130,7 @@ export declare type Sorter = SortNode[];
export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "operId" | "entityId" | "entity">> & (({
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "operId">> & (({
operId?: never | null;
oper: Oper.CreateSingleOperation;
} | {
@ -165,14 +169,14 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "operId"
entityId: String<64>;
wechatUser?: WechatUser.UpdateOperation;
} | {
entity?: string;
entityId?: string;
[K: string]: any;
}) & {
[k: string]: any;
};
});
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "operId" | "entityId" | "entity">> & (({
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId" | "operId">> & (({
oper?: Oper.CreateSingleOperation | Oper.UpdateOperation | Oper.RemoveOperation;
operId?: undefined;
} | {

View File

@ -75,7 +75,6 @@ export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select"
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<OpSchema> & {
[k: string]: any;
userRole$role?: OakOperation<UserRole.UpdateOperation["action"], Omit<UserRole.UpdateOperationData, "role" | "roleId">, UserRole.Filter> | Array<OakOperation<"create", Omit<UserRole.CreateOperationData, "role" | "roleId"> | Omit<UserRole.CreateOperationData, "role" | "roleId">[]> | OakOperation<UserRole.UpdateOperation["action"], Omit<UserRole.UpdateOperationData, "role" | "roleId">, UserRole.Filter>>;
};
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;

View File

@ -133,7 +133,6 @@ export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select"
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<OpSchema> & {
[k: string]: any;
application$system?: OakOperation<Application.UpdateOperation["action"], Omit<Application.UpdateOperationData, "system" | "systemId">, Application.Filter> | Array<OakOperation<"create", Omit<Application.CreateOperationData, "system" | "systemId"> | Omit<Application.CreateOperationData, "system" | "systemId">[]> | OakOperation<Application.UpdateOperation["action"], Omit<Application.UpdateOperationData, "system" | "systemId">, Application.Filter>>;
domain$system?: OakOperation<Domain.UpdateOperation["action"], Omit<Domain.UpdateOperationData, "system" | "systemId">, Domain.Filter> | Array<OakOperation<"create", Omit<Domain.CreateOperationData, "system" | "systemId"> | Omit<Domain.CreateOperationData, "system" | "systemId">[]> | OakOperation<Domain.UpdateOperation["action"], Omit<Domain.UpdateOperationData, "system" | "systemId">, Domain.Filter>>;
userSystem$system?: OakOperation<UserSystem.UpdateOperation["action"], Omit<UserSystem.UpdateOperationData, "system" | "systemId">, UserSystem.Filter> | Array<OakOperation<"create", Omit<UserSystem.CreateOperationData, "system" | "systemId"> | Omit<UserSystem.CreateOperationData, "system" | "systemId">[]> | OakOperation<UserSystem.UpdateOperation["action"], Omit<UserSystem.UpdateOperationData, "system" | "systemId">, UserSystem.Filter>>;

View File

@ -96,6 +96,9 @@ declare type AttrFilter<E> = {
player: User.Filter;
env: Q_EnumValue<Environment>;
ableState: Q_EnumValue<AbleState>;
email: Email.Filter;
mobile: Mobile.Filter;
wechatUser: WechatUser.Filter;
};
export declare type Filter<E = Q_EnumValue<"email" | "mobile" | "wechatUser" | string>> = MakeFilter<AttrFilter<E> & ExprOp<OpAttr | string>>;
export declare type Projection = {
@ -200,7 +203,7 @@ export declare type Sorter = SortNode[];
export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "applicationId" | "userId" | "playerId" | "entityId" | "entity">> & (({
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "applicationId" | "userId" | "playerId">> & (({
applicationId?: never | null;
application?: Application.CreateSingleOperation;
} | {
@ -243,14 +246,14 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "applica
entityId: String<64>;
wechatUser?: WechatUser.UpdateOperation;
} | {
entity?: string;
entityId?: string;
[K: string]: any;
}) & {
[k: string]: any;
};
});
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "applicationId" | "userId" | "playerId" | "entityId" | "entity">> & (({
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId" | "applicationId" | "userId" | "playerId">> & (({
application?: Application.CreateSingleOperation | Application.UpdateOperation | Application.RemoveOperation;
applicationId?: undefined;
} | {

View File

@ -289,7 +289,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "refId"
systemId: String<64>;
system?: System.UpdateOperation;
})) & {
[k: string]: any;
oper$operator?: OakOperation<Oper.UpdateOperation["action"], Omit<Oper.UpdateOperationData, "operator" | "operatorId">, Oper.Filter> | Array<OakOperation<"create", Omit<Oper.CreateOperationData, "operator" | "operatorId"> | Omit<Oper.CreateOperationData, "operator" | "operatorId">[]> | OakOperation<Oper.UpdateOperation["action"], Omit<Oper.UpdateOperationData, "operator" | "operatorId">, Oper.Filter>>;
email$user?: OakOperation<Email.UpdateOperation["action"], Omit<Email.UpdateOperationData, "user" | "userId">, Email.Filter> | Array<OakOperation<"create", Omit<Email.CreateOperationData, "user" | "userId"> | Omit<Email.CreateOperationData, "user" | "userId">[]> | OakOperation<Email.UpdateOperation["action"], Omit<Email.UpdateOperationData, "user" | "userId">, Email.Filter>>;
mobile$user?: OakOperation<Mobile.UpdateOperation["action"], Omit<Mobile.UpdateOperationData, "user" | "userId">, Mobile.Filter> | Array<OakOperation<"create", Omit<Mobile.CreateOperationData, "user" | "userId"> | Omit<Mobile.CreateOperationData, "user" | "userId">[]> | OakOperation<Mobile.UpdateOperation["action"], Omit<Mobile.UpdateOperationData, "user" | "userId">, Mobile.Filter>>;

View File

@ -177,7 +177,7 @@ export declare type Sorter = SortNode[];
export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "granterId" | "granteeId" | "entity" | "entityId">> & (({
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "granterId" | "granteeId">> & (({
granterId?: never | null;
granter: User.CreateSingleOperation;
} | {
@ -189,8 +189,11 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "granter
} | {
granteeId?: String<64>;
grantee?: User.UpdateOperation;
})) & {
[k: string]: any;
})) & ({
entity?: string;
entityId?: string;
[K: string]: any;
}) & {
operEntity$entity?: OakOperation<OperEntity.UpdateOperation["action"], Omit<OperEntity.UpdateOperationData, "entity" | "entityId">, OperEntity.Filter> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId"> | Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | OakOperation<OperEntity.UpdateOperation["action"], Omit<OperEntity.UpdateOperationData, "entity" | "entityId">, OperEntity.Filter>>;
modiEntity$entity?: OakOperation<ModiEntity.UpdateOperation["action"], Omit<ModiEntity.UpdateOperationData, "entity" | "entityId">, ModiEntity.Filter> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId"> | Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | OakOperation<ModiEntity.UpdateOperation["action"], Omit<ModiEntity.UpdateOperationData, "entity" | "entityId">, ModiEntity.Filter>>;
wechatQrCode$entity?: OakOperation<WechatQrCode.UpdateOperation["action"], Omit<WechatQrCode.UpdateOperationData, "entity" | "entityId">, WechatQrCode.Filter> | Array<OakOperation<"create", Omit<WechatQrCode.CreateOperationData, "entity" | "entityId"> | Omit<WechatQrCode.CreateOperationData, "entity" | "entityId">[]> | OakOperation<WechatQrCode.UpdateOperation["action"], Omit<WechatQrCode.UpdateOperationData, "entity" | "entityId">, WechatQrCode.Filter>>;

View File

@ -112,9 +112,7 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "userId"
} | {
roleId?: String<64>;
role?: Role.UpdateOperation;
})) & {
[k: string]: any;
};
}));
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;

View File

@ -112,9 +112,7 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "userId"
} | {
systemId?: String<64>;
system?: System.UpdateOperation;
})) & {
[k: string]: any;
};
}));
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;

View File

@ -76,6 +76,7 @@ declare type AttrFilter<E> = {
applicationId: Q_StringValue | SubQuery.ApplicationIdSubQuery;
application: Application.Filter;
props: Q_EnumValue<WechatQrCodeProps>;
userEntityGrant: UserEntityGrant.Filter;
};
export declare type Filter<E = Q_EnumValue<"userEntityGrant" | string>> = MakeFilter<AttrFilter<E> & ExprOp<OpAttr | string>>;
export declare type Projection = {
@ -190,7 +191,7 @@ export declare type Sorter = SortNode[];
export declare type SelectOperation<P = Projection> = Omit<OakOperation<"select", P, Filter, Sorter>, "id">;
export declare type Selection<P = Projection> = Omit<SelectOperation<P>, "action">;
export declare type Exportation = OakOperation<"export", ExportProjection, Filter, Sorter>;
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "applicationId" | "entityId" | "entity">> & (({
export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "entity" | "entityId" | "applicationId">> & (({
applicationId?: never | null;
application: Application.CreateSingleOperation;
} | {
@ -205,16 +206,17 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "applica
entityId: String<64>;
userEntityGrant?: UserEntityGrant.UpdateOperation;
} | {
entity?: string;
entityId?: string;
[K: string]: any;
}) & {
[k: string]: any;
operEntity$entity?: OakOperation<OperEntity.UpdateOperation["action"], Omit<OperEntity.UpdateOperationData, "entity" | "entityId">, OperEntity.Filter> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId"> | Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | OakOperation<OperEntity.UpdateOperation["action"], Omit<OperEntity.UpdateOperationData, "entity" | "entityId">, OperEntity.Filter>>;
modiEntity$entity?: OakOperation<ModiEntity.UpdateOperation["action"], Omit<ModiEntity.UpdateOperationData, "entity" | "entityId">, ModiEntity.Filter> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId"> | Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | OakOperation<ModiEntity.UpdateOperation["action"], Omit<ModiEntity.UpdateOperationData, "entity" | "entityId">, ModiEntity.Filter>>;
};
export declare type CreateSingleOperation = OakOperation<"create", CreateOperationData>;
export declare type CreateMultipleOperation = OakOperation<"create", Array<CreateOperationData>>;
export declare type CreateOperation = CreateSingleOperation | CreateMultipleOperation;
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "applicationId" | "entityId" | "entity">> & (({
export declare type UpdateOperationData = FormUpdateData<Omit<OpSchema, "entity" | "entityId" | "applicationId">> & (({
application?: Application.CreateSingleOperation | Application.UpdateOperation | Application.RemoveOperation;
applicationId?: undefined;
} | {

View File

@ -200,7 +200,6 @@ export declare type CreateOperationData = FormCreateData<Omit<OpSchema, "userId"
applicationId: String<64>;
application?: Application.UpdateOperation;
})) & {
[k: string]: any;
operEntity$entity?: OakOperation<OperEntity.UpdateOperation["action"], Omit<OperEntity.UpdateOperationData, "entity" | "entityId">, OperEntity.Filter> | Array<OakOperation<"create", Omit<OperEntity.CreateOperationData, "entity" | "entityId"> | Omit<OperEntity.CreateOperationData, "entity" | "entityId">[]> | OakOperation<OperEntity.UpdateOperation["action"], Omit<OperEntity.UpdateOperationData, "entity" | "entityId">, OperEntity.Filter>>;
modiEntity$entity?: OakOperation<ModiEntity.UpdateOperation["action"], Omit<ModiEntity.UpdateOperationData, "entity" | "entityId">, ModiEntity.Filter> | Array<OakOperation<"create", Omit<ModiEntity.CreateOperationData, "entity" | "entityId"> | Omit<ModiEntity.CreateOperationData, "entity" | "entityId">[]> | OakOperation<ModiEntity.UpdateOperation["action"], Omit<ModiEntity.UpdateOperationData, "entity" | "entityId">, ModiEntity.Filter>>;
token$entity?: OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "entity" | "entityId">, Token.Filter> | Array<OakOperation<"create", Omit<Token.CreateOperationData, "entity" | "entityId"> | Omit<Token.CreateOperationData, "entity" | "entityId">[]> | OakOperation<Token.UpdateOperation["action"], Omit<Token.UpdateOperationData, "entity" | "entityId">, Token.Filter>>;

View File

@ -20,9 +20,7 @@ import * as UserEntityGrant from "./UserEntityGrant/Schema";
import * as WechatQrCode from "./WechatQrCode/Schema";
import * as WechatUser from "./WechatUser/Schema";
export declare type ModiIdSubQuery = {
[K in "$in" | "$nin"]?: (Modi.ModiIdSubQuery & {
entity: "modi";
}) | (ModiEntity.ModiIdSubQuery & {
[K in "$in" | "$nin"]?: (ModiEntity.ModiIdSubQuery & {
entity: "modiEntity";
}) | (Modi.ModiIdSubQuery & {
entity: "modi";