From 8b72f2ef21353791a0c579a28a1d9bcc26861658 Mon Sep 17 00:00:00 2001 From: Xc Date: Mon, 21 Oct 2024 20:03:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=9A=84=E7=BC=96=E8=AF=91domain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/aspects/withdraw.d.ts | 8 +- es/aspects/withdraw.js | 6 +- es/checkers/accountOper.js | 6 +- es/components/AbstractComponents.d.ts | 24 +- es/components/AbstractComponents.js | 4 + es/context/BackendRuntimeContext.d.ts | 952 ++++++++++++++++-- es/oak-app-domain/AbstractAccount/Schema.d.ts | 8 +- es/oak-app-domain/Account/Schema.d.ts | 51 +- es/oak-app-domain/AccountOper/Schema.d.ts | 12 +- es/oak-app-domain/ActionAuth/Schema.d.ts | 5 +- es/oak-app-domain/Address/Schema.d.ts | 10 +- es/oak-app-domain/Application/Schema.d.ts | 161 +-- .../ApplicationPassport/Schema.d.ts | 5 +- es/oak-app-domain/Area/Schema.d.ts | 50 +- es/oak-app-domain/Article/Schema.d.ts | 14 +- es/oak-app-domain/ArticleMenu/Schema.d.ts | 39 +- es/oak-app-domain/Captcha/Schema.d.ts | 13 +- .../ChangePasswordTemp/Schema.d.ts | 6 +- es/oak-app-domain/Deposit/Schema.d.ts | 27 +- es/oak-app-domain/Domain/Schema.d.ts | 16 +- es/oak-app-domain/Email/Schema.d.ts | 14 +- es/oak-app-domain/ExtraFile/Schema.d.ts | 22 +- es/oak-app-domain/I18n/Schema.d.ts | 8 +- es/oak-app-domain/Livestream/Schema.d.ts | 14 +- es/oak-app-domain/Log/Schema.d.ts | 14 +- es/oak-app-domain/LoginName/Schema.d.ts | 14 +- es/oak-app-domain/Message/Schema.d.ts | 36 +- es/oak-app-domain/MessageSystem/Schema.d.ts | 13 +- es/oak-app-domain/MessageType/Schema.d.ts | 4 +- .../MessageTypeSmsTemplate/Schema.d.ts | 4 +- .../MessageTypeTemplate/Schema.d.ts | 4 +- es/oak-app-domain/Mobile/Schema.d.ts | 14 +- es/oak-app-domain/Modi/Schema.d.ts | 19 +- es/oak-app-domain/ModiEntity/Schema.d.ts | 5 +- es/oak-app-domain/Notification/Schema.d.ts | 10 +- es/oak-app-domain/OfflineAccount/Schema.d.ts | 47 +- es/oak-app-domain/Oper/Schema.d.ts | 21 +- es/oak-app-domain/OperEntity/Schema.d.ts | 5 +- es/oak-app-domain/Order/Schema.d.ts | 35 +- es/oak-app-domain/Parasite/Schema.d.ts | 20 +- es/oak-app-domain/Passport/Schema.d.ts | 15 +- es/oak-app-domain/Path/Schema.d.ts | 27 +- es/oak-app-domain/Pay/Schema.d.ts | 53 +- es/oak-app-domain/Platform/Schema.d.ts | 28 +- es/oak-app-domain/ReadRemark/Schema.d.ts | 4 +- es/oak-app-domain/Refund/Schema.d.ts | 33 +- es/oak-app-domain/Relation/Schema.d.ts | 59 +- es/oak-app-domain/RelationAuth/Schema.d.ts | 5 +- es/oak-app-domain/Session/Schema.d.ts | 49 +- es/oak-app-domain/SessionMessage/Schema.d.ts | 21 +- es/oak-app-domain/SmsTemplate/Schema.d.ts | 17 +- es/oak-app-domain/Station/Schema.d.ts | 13 +- es/oak-app-domain/Subscription/Schema.d.ts | 9 +- es/oak-app-domain/Subway/Schema.d.ts | 13 +- es/oak-app-domain/SubwayStation/Schema.d.ts | 4 +- es/oak-app-domain/SysAccountMove/Schema.d.ts | 16 +- es/oak-app-domain/SysAccountOper/Schema.d.ts | 10 +- es/oak-app-domain/System/Schema.d.ts | 186 ++-- es/oak-app-domain/ToDo/Schema.d.ts | 31 +- es/oak-app-domain/Token/Schema.d.ts | 13 +- es/oak-app-domain/User/Schema.d.ts | 387 ++++--- es/oak-app-domain/UserEntityClaim/Schema.d.ts | 7 +- es/oak-app-domain/UserEntityGrant/Schema.d.ts | 38 +- es/oak-app-domain/UserRelation/Schema.d.ts | 15 +- es/oak-app-domain/UserSystem/Schema.d.ts | 4 +- .../UserWechatPublicTag/Schema.d.ts | 7 +- es/oak-app-domain/WechatLogin/Schema.d.ts | 30 +- es/oak-app-domain/WechatMenu/Schema.d.ts | 7 +- es/oak-app-domain/WechatMpJump/Schema.d.ts | 9 +- es/oak-app-domain/WechatPay/Schema.d.ts | 36 +- .../WechatPublicAutoReply/Schema.d.ts | 6 +- es/oak-app-domain/WechatPublicTag/Schema.d.ts | 28 +- es/oak-app-domain/WechatQrCode/Schema.d.ts | 16 +- es/oak-app-domain/WechatTemplate/Schema.d.ts | 22 +- es/oak-app-domain/WechatUser/Schema.d.ts | 60 +- es/oak-app-domain/Withdraw/Schema.d.ts | 64 +- es/oak-app-domain/WithdrawAccount/Schema.d.ts | 43 +- es/oak-app-domain/WithdrawChannel/Schema.d.ts | 37 +- .../WithdrawTransfer/Schema.d.ts | 54 +- es/oak-app-domain/WpAccount/Schema.d.ts | 68 +- es/oak-app-domain/WpProduct/Schema.d.ts | 38 +- es/triggers/account.js | 2 +- es/triggers/accountOper.js | 17 +- es/utils/application.d.ts | 952 ++++++++++++++++-- es/utils/payClazz/Account.js | 50 +- es/utils/payClazz/WechatPay/index.d.ts | 2 +- lib/aspects/withdraw.d.ts | 8 +- lib/context/BackendRuntimeContext.d.ts | 952 ++++++++++++++++-- .../AbstractAccount/Schema.d.ts | 8 +- lib/oak-app-domain/Account/Schema.d.ts | 51 +- lib/oak-app-domain/AccountOper/Schema.d.ts | 12 +- lib/oak-app-domain/ActionAuth/Schema.d.ts | 5 +- lib/oak-app-domain/Address/Schema.d.ts | 10 +- lib/oak-app-domain/Application/Schema.d.ts | 161 +-- .../ApplicationPassport/Schema.d.ts | 5 +- lib/oak-app-domain/Area/Schema.d.ts | 50 +- lib/oak-app-domain/Article/Schema.d.ts | 14 +- lib/oak-app-domain/ArticleMenu/Schema.d.ts | 39 +- lib/oak-app-domain/Captcha/Schema.d.ts | 13 +- .../ChangePasswordTemp/Schema.d.ts | 6 +- lib/oak-app-domain/Deposit/Schema.d.ts | 27 +- lib/oak-app-domain/Domain/Schema.d.ts | 16 +- lib/oak-app-domain/Email/Schema.d.ts | 14 +- lib/oak-app-domain/ExtraFile/Schema.d.ts | 22 +- lib/oak-app-domain/I18n/Schema.d.ts | 8 +- lib/oak-app-domain/Livestream/Schema.d.ts | 14 +- lib/oak-app-domain/Log/Schema.d.ts | 14 +- lib/oak-app-domain/LoginName/Schema.d.ts | 14 +- lib/oak-app-domain/Message/Schema.d.ts | 36 +- lib/oak-app-domain/MessageSystem/Schema.d.ts | 13 +- lib/oak-app-domain/MessageType/Schema.d.ts | 4 +- .../MessageTypeSmsTemplate/Schema.d.ts | 4 +- .../MessageTypeTemplate/Schema.d.ts | 4 +- lib/oak-app-domain/Mobile/Schema.d.ts | 14 +- lib/oak-app-domain/Modi/Schema.d.ts | 19 +- lib/oak-app-domain/ModiEntity/Schema.d.ts | 5 +- lib/oak-app-domain/Notification/Schema.d.ts | 10 +- lib/oak-app-domain/OfflineAccount/Schema.d.ts | 47 +- lib/oak-app-domain/Oper/Schema.d.ts | 21 +- lib/oak-app-domain/OperEntity/Schema.d.ts | 5 +- lib/oak-app-domain/Order/Schema.d.ts | 35 +- lib/oak-app-domain/Parasite/Schema.d.ts | 20 +- lib/oak-app-domain/Passport/Schema.d.ts | 15 +- lib/oak-app-domain/Path/Schema.d.ts | 27 +- lib/oak-app-domain/Pay/Schema.d.ts | 53 +- lib/oak-app-domain/Platform/Schema.d.ts | 28 +- lib/oak-app-domain/ReadRemark/Schema.d.ts | 4 +- lib/oak-app-domain/Refund/Schema.d.ts | 33 +- lib/oak-app-domain/Relation/Schema.d.ts | 59 +- lib/oak-app-domain/RelationAuth/Schema.d.ts | 5 +- lib/oak-app-domain/Session/Schema.d.ts | 49 +- lib/oak-app-domain/SessionMessage/Schema.d.ts | 21 +- lib/oak-app-domain/SmsTemplate/Schema.d.ts | 17 +- lib/oak-app-domain/Station/Schema.d.ts | 13 +- lib/oak-app-domain/Subscription/Schema.d.ts | 9 +- lib/oak-app-domain/Subway/Schema.d.ts | 13 +- lib/oak-app-domain/SubwayStation/Schema.d.ts | 4 +- lib/oak-app-domain/SysAccountMove/Schema.d.ts | 16 +- lib/oak-app-domain/SysAccountOper/Schema.d.ts | 10 +- lib/oak-app-domain/System/Schema.d.ts | 186 ++-- lib/oak-app-domain/ToDo/Schema.d.ts | 31 +- lib/oak-app-domain/Token/Schema.d.ts | 13 +- lib/oak-app-domain/User/Schema.d.ts | 387 ++++--- .../UserEntityClaim/Schema.d.ts | 7 +- .../UserEntityGrant/Schema.d.ts | 38 +- lib/oak-app-domain/UserRelation/Schema.d.ts | 15 +- lib/oak-app-domain/UserSystem/Schema.d.ts | 4 +- .../UserWechatPublicTag/Schema.d.ts | 7 +- lib/oak-app-domain/WechatLogin/Schema.d.ts | 30 +- lib/oak-app-domain/WechatMenu/Schema.d.ts | 7 +- lib/oak-app-domain/WechatMpJump/Schema.d.ts | 9 +- lib/oak-app-domain/WechatPay/Schema.d.ts | 36 +- .../WechatPublicAutoReply/Schema.d.ts | 6 +- .../WechatPublicTag/Schema.d.ts | 28 +- lib/oak-app-domain/WechatQrCode/Schema.d.ts | 16 +- lib/oak-app-domain/WechatTemplate/Schema.d.ts | 22 +- lib/oak-app-domain/WechatUser/Schema.d.ts | 60 +- lib/oak-app-domain/Withdraw/Schema.d.ts | 64 +- .../WithdrawAccount/Schema.d.ts | 43 +- .../WithdrawChannel/Schema.d.ts | 37 +- .../WithdrawTransfer/Schema.d.ts | 54 +- lib/oak-app-domain/WpAccount/Schema.d.ts | 68 +- lib/oak-app-domain/WpProduct/Schema.d.ts | 38 +- lib/utils/application.d.ts | 952 ++++++++++++++++-- lib/utils/payClazz/WechatPay/index.d.ts | 2 +- package.json | 6 +- src/components/AbstractComponents.ts | 1 + 167 files changed, 5859 insertions(+), 2729 deletions(-) diff --git a/es/aspects/withdraw.d.ts b/es/aspects/withdraw.d.ts index 2ea225ee..5d27ce2e 100644 --- a/es/aspects/withdraw.d.ts +++ b/es/aspects/withdraw.d.ts @@ -3,7 +3,7 @@ export declare function getWithdrawCreateData(params: { accountId: string; price: number; withdrawAccountId?: string; -}, context: BRC): Promise<(Partial> & { +}, context: BRC): Promise<(Partial> & { id: string; } & { accountId: string; @@ -17,7 +17,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { accountId: string; @@ -31,7 +31,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -45,7 +45,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; diff --git a/es/aspects/withdraw.js b/es/aspects/withdraw.js index 5211027f..ce57f18f 100644 --- a/es/aspects/withdraw.js +++ b/es/aspects/withdraw.js @@ -42,9 +42,9 @@ export async function getWithdrawCreateData(params, context) { }, }, { dontCollect: true, forUpdate: true }); const { avail, refundable } = account; - if (totalPrice > avail) { - throw new OakInputIllegalException('withdraw', ['price'], 'error::withdraw.overflow'); - } + // if (totalPrice > avail!) { + // throw new OakInputIllegalException('withdraw', ['price'], 'error::withdraw.overflow'); + // } if (totalPrice > refundable && !withdrawAccountId) { throw new OakInputIllegalException('withdraw', ['price'], 'error::withdraw.needWithdrawAccountId'); } diff --git a/es/checkers/accountOper.js b/es/checkers/accountOper.js index 23c53d0b..4f9e0d7a 100644 --- a/es/checkers/accountOper.js +++ b/es/checkers/accountOper.js @@ -54,15 +54,15 @@ const checkers = [ case 'refund': case 'withdraw': { if (totalPlus >= 0 || availPlus >= 0 || totalPlus !== availPlus) { - throw new OakInputIllegalException('accountOper', ['availPlus'], `accountOper为${type}时，其totalPlus和availPlus必须为不相等的负数`); + throw new OakInputIllegalException('accountOper', ['availPlus'], `accountOper为${type}时，其totalPlus和availPlus必须为相等的负数`); } break; } case 'refundFailure': case 'withdrawBack': case 'consumeBack': { - if (totalPlus <= 0 || availPlus <= 0 || totalPlus !== availPlus) { - throw new OakInputIllegalException('accountOper', ['availPlus'], `accountOper为${type}时，其totalPlus和availPlus必须为不相等的正数`); + if (totalPlus < 0 || availPlus < 0 || totalPlus !== availPlus) { + throw new OakInputIllegalException('accountOper', ['availPlus'], `accountOper为${type}时，其totalPlus和availPlus必须为相等的非负数数`); } break; } diff --git a/es/components/AbstractComponents.d.ts b/es/components/AbstractComponents.d.ts index 852d9e50..9251d752 100644 --- a/es/components/AbstractComponents.d.ts +++ b/es/components/AbstractComponents.d.ts @@ -18,16 +18,11 @@ declare const List: (props: ReactComponentProps[]; loading: boolean; tablePagination?: React.ReactNode; - rowSelection?: import("antd/es/table/interface").TableRowSelection> | undefined; + rowSelection?: any; hideHeader?: boolean | undefined; disableSerialNumber?: boolean | undefined; - size?: "small" | "middle" | "large" | undefined; - scroll?: ({ - x?: string | number | true | undefined; - y?: string | number | undefined; - } & { - scrollToFirstRowOnChange?: boolean | undefined; - }) | undefined; + size?: "large" | "middle" | "small" | undefined; + scroll?: any; empty?: React.ReactNode; opWidth?: number | undefined; ellipsis?: boolean | undefined; @@ -46,21 +41,16 @@ declare const ListPro: (props: { data: RowWithActions[]; loading?: boolean | undefined; tablePagination?: any; - rowSelection?: import("antd/es/table/interface").TableRowSelection> | undefined; + rowSelection?: any; disableSerialNumber?: boolean | undefined; - size?: "small" | "middle" | "large" | undefined; - scroll?: ({ - x?: string | number | true | undefined; - y?: string | number | undefined; - } & { - scrollToFirstRowOnChange?: boolean | undefined; - }) | undefined; + size?: "large" | "middle" | "small" | undefined; + scroll?: any; empty?: any; opWidth?: number | undefined; oakPath?: string | undefined; }) => React.ReactElement; declare const Detail: (props: ReactComponentProps | undefined; + column?: number | Record | undefined; entity: T; attributes: OakAbsAttrDef[]; data: Partial; diff --git a/es/components/AbstractComponents.js b/es/components/AbstractComponents.js index 38db9750..45f55231 100644 --- a/es/components/AbstractComponents.js +++ b/es/components/AbstractComponents.js @@ -1,3 +1,7 @@ +/** + * 抽象组件在业务层根据EntityDict的重新声明 + * by Xc 20230807 + */ import AbsFilterPanel from 'oak-frontend-base/es/components/filterPanel'; import AbsList from 'oak-frontend-base/es/components/list'; import AbsListPro from 'oak-frontend-base/es/components/listPro'; diff --git a/es/context/BackendRuntimeContext.d.ts b/es/context/BackendRuntimeContext.d.ts index aefe6ccb..8a936226 100644 --- a/es/context/BackendRuntimeContext.d.ts +++ b/es/context/BackendRuntimeContext.d.ts @@ -35,9 +35,6 @@ export declare class BackendRuntimeContext> & { + applicationPassport$application$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$0$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$1$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$2$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$3$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$4$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$5$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$6$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$7$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$8$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$9$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + } & { + extraFile$application$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$0$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$1$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$2$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$3$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$4$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$5$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$6$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$7$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$8$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$9$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + } & { + notification$application$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$0$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$1$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$2$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$3$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$4$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$5$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$6$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$7$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$8$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$9$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + } & { + sessionMessage$application$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$0$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$1$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$2$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$3$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$4$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$5$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$6$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$7$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$8$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$9$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + } & { + token$application$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$0$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$1$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$2$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$3$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$4$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$5$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$6$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$7$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$8$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$9$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + } & { + wechatMenu$application$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$0$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$1$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$2$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$3$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$4$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$5$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$6$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$7$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$8$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$9$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + } & { + wechatPublicAutoReply$application$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$0$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$1$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$2$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$3$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$4$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$5$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$6$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$7$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$8$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$9$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + } & { + wechatPublicTag$application$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$0$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$1$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$2$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$3$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$4$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$5$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$6$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$7$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$8$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$9$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + } & { + wechatQrCode$application$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$0$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$1$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$2$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$3$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$4$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$5$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$6$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$7$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$8$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$9$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + } & { + wechatTemplate$application$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$0$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$1$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$2$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$3$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$4$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$5$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$6$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$7$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$8$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$9$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + } & { + wechatUser$application$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$0$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$1$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$2$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$3$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$4$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$5$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$6$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$7$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$8$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$9$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + } & { + pay$application$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$0$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$1$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$2$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$3$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$4$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$5$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$6$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$7$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$8$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$9$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + } & { + wpProduct$application$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$0$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$1$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$2$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$3$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$4$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$5$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$6$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$7$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$8$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$9$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + } & { session$entity$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { $entity: "session"; }) | undefined; - } & Partial> & { + session$entity$$0$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$1$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$2$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$3$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$4$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$5$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$6$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$7$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$8$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$9$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + } & { [k: string]: any; "#id"?: `node-${number}` | undefined; id?: number | undefined; @@ -317,9 +751,6 @@ export declare class BackendRuntimeContext; refineOpRecords(): Promise; diff --git a/es/oak-app-domain/AbstractAccount/Schema.d.ts b/es/oak-app-domain/AbstractAccount/Schema.d.ts index bb004538..75515cd7 100644 --- a/es/oak-app-domain/AbstractAccount/Schema.d.ts +++ b/es/oak-app-domain/AbstractAccount/Schema.d.ts @@ -11,13 +11,7 @@ export type OpSchema = EntityShape & { withdrawTransferLossRatio?: Decimal<4, 2> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - taxLossRatio: Decimal<4, 2>; - refundGapDays?: Int<4> | null; - refundCompensateRatio?: Int<4> | null; - allowWithdrawTransfer: Boolean; - withdrawTransferLossRatio?: Decimal<4, 2> | null; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/es/oak-app-domain/Account/Schema.d.ts b/es/oak-app-domain/Account/Schema.d.ts index e62d1b0b..dbc2c77d 100644 --- a/es/oak-app-domain/Account/Schema.d.ts +++ b/es/oak-app-domain/Account/Schema.d.ts @@ -21,27 +21,28 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - total: Price; - avail: Price; - refundable: Price; - ofSystemId: ForeignKey<"system">; - entity: "system" | "user" | string; - entityId: String<64>; - ableState?: AbleState | null; +type AccountOper$accountAggr = "accountOper$account$$aggr" | "accountOper$account$$0$$aggr" | "accountOper$account$$1$$aggr" | "accountOper$account$$2$$aggr" | "accountOper$account$$3$$aggr" | "accountOper$account$$4$$aggr" | "accountOper$account$$5$$aggr" | "accountOper$account$$6$$aggr" | "accountOper$account$$7$$aggr" | "accountOper$account$$8$$aggr" | "accountOper$account$$9$$aggr"; +type Deposit$accountAggr = "deposit$account$$aggr" | "deposit$account$$0$$aggr" | "deposit$account$$1$$aggr" | "deposit$account$$2$$aggr" | "deposit$account$$3$$aggr" | "deposit$account$$4$$aggr" | "deposit$account$$5$$aggr" | "deposit$account$$6$$aggr" | "deposit$account$$7$$aggr" | "deposit$account$$8$$aggr" | "deposit$account$$9$$aggr"; +type Withdraw$accountAggr = "withdraw$account$$aggr" | "withdraw$account$$0$$aggr" | "withdraw$account$$1$$aggr" | "withdraw$account$$2$$aggr" | "withdraw$account$$3$$aggr" | "withdraw$account$$4$$aggr" | "withdraw$account$$5$$aggr" | "withdraw$account$$6$$aggr" | "withdraw$account$$7$$aggr" | "withdraw$account$$8$$aggr" | "withdraw$account$$9$$aggr"; +type Pay$entityAggr = "pay$entity$$aggr" | "pay$entity$$0$$aggr" | "pay$entity$$1$$aggr" | "pay$entity$$2$$aggr" | "pay$entity$$3$$aggr" | "pay$entity$$4$$aggr" | "pay$entity$$5$$aggr" | "pay$entity$$6$$aggr" | "pay$entity$$7$$aggr" | "pay$entity$$8$$aggr" | "pay$entity$$9$$aggr"; +export type Schema = OpSchema & { ofSystem: System.Schema; system?: System.Schema; user?: User.Schema; accountOper$account?: Array; - accountOper$account$$aggr?: AggregationResult; deposit$account?: Array; - deposit$account$$aggr?: AggregationResult; withdraw$account?: Array; - withdraw$account$$aggr?: AggregationResult; pay$entity?: Array; - pay$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in AccountOper$accountAggr]?: AggregationResult; +} & { + [A in Deposit$accountAggr]?: AggregationResult; +} & { + [A in Withdraw$accountAggr]?: AggregationResult; +} & { + [A in Pay$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -84,28 +85,32 @@ export type Projection = { accountOper$account?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$account$$aggr?: AccountOper.Aggregation & { - $entity: "accountOper"; - }; deposit$account?: Deposit.Selection & { $entity: "deposit"; }; - deposit$account$$aggr?: Deposit.Aggregation & { - $entity: "deposit"; - }; withdraw$account?: Withdraw.Selection & { $entity: "withdraw"; }; - withdraw$account$$aggr?: Withdraw.Aggregation & { - $entity: "withdraw"; - }; pay$entity?: Pay.Selection & { $entity: "pay"; }; - pay$entity$$aggr?: Pay.Aggregation & { +} & Partial> & { + [A in AccountOper$accountAggr]?: AccountOper.Aggregation & { + $entity: "accountOper"; + }; +} & { + [A in Deposit$accountAggr]?: Deposit.Aggregation & { + $entity: "deposit"; + }; +} & { + [A in Withdraw$accountAggr]?: Withdraw.Aggregation & { + $entity: "withdraw"; + }; +} & { + [A in Pay$entityAggr]?: Pay.Aggregation & { $entity: "pay"; }; -} & Partial>; +}; type AccountIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/AccountOper/Schema.d.ts b/es/oak-app-domain/AccountOper/Schema.d.ts index f53457ad..d78c306c 100644 --- a/es/oak-app-domain/AccountOper/Schema.d.ts +++ b/es/oak-app-domain/AccountOper/Schema.d.ts @@ -25,17 +25,7 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - accountId: ForeignKey<"account">; - type: Type; - totalPlus: Price; - availPlus: Price; - refundablePlus?: Price | null; - total: Price; - avail: Price; - refundable: Price; - entity: "deposit" | "order" | "pay" | "refund" | "withdraw" | "withdrawTransfer" | string; - entityId: String<64>; +export type Schema = OpSchema & { account: Account.Schema; deposit?: Deposit.Schema; order?: Order.Schema; diff --git a/es/oak-app-domain/ActionAuth/Schema.d.ts b/es/oak-app-domain/ActionAuth/Schema.d.ts index 2149098a..6bfd3f88 100644 --- a/es/oak-app-domain/ActionAuth/Schema.d.ts +++ b/es/oak-app-domain/ActionAuth/Schema.d.ts @@ -12,10 +12,7 @@ export type OpSchema = EntityShape & { deActions: Actions; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - relationId?: ForeignKey<"relation"> | null; - pathId: ForeignKey<"path">; - deActions: Actions; +export type Schema = OpSchema & { relation?: Relation.Schema | null; path: Path.Schema; } & { diff --git a/es/oak-app-domain/Address/Schema.d.ts b/es/oak-app-domain/Address/Schema.d.ts index aff68ac5..f45204a7 100644 --- a/es/oak-app-domain/Address/Schema.d.ts +++ b/es/oak-app-domain/Address/Schema.d.ts @@ -17,15 +17,7 @@ export type OpSchema = EntityShape & { entityId?: String<64> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - detail: String<32>; - areaId: ForeignKey<"area">; - phone: String<12>; - name: String<32>; - default: Boolean; - remark?: Text | null; - entity?: ("user" | string) | null; - entityId?: String<64> | null; +export type Schema = OpSchema & { area: Area.Schema; user?: User.Schema; } & { diff --git a/es/oak-app-domain/Application/Schema.d.ts b/es/oak-app-domain/Application/Schema.d.ts index 2bbefb00..4ec18e94 100644 --- a/es/oak-app-domain/Application/Schema.d.ts +++ b/es/oak-app-domain/Application/Schema.d.ts @@ -93,46 +93,67 @@ export type OpSchema = EntityShape & { domainId?: ForeignKey<"domain"> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - description?: Text | null; - type: AppType; - systemId: ForeignKey<"system">; - config: WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig; - style?: Style | null; - domainId?: ForeignKey<"domain"> | null; +type ApplicationPassport$applicationAggr = "applicationPassport$application$$aggr" | "applicationPassport$application$$0$$aggr" | "applicationPassport$application$$1$$aggr" | "applicationPassport$application$$2$$aggr" | "applicationPassport$application$$3$$aggr" | "applicationPassport$application$$4$$aggr" | "applicationPassport$application$$5$$aggr" | "applicationPassport$application$$6$$aggr" | "applicationPassport$application$$7$$aggr" | "applicationPassport$application$$8$$aggr" | "applicationPassport$application$$9$$aggr"; +type ExtraFile$applicationAggr = "extraFile$application$$aggr" | "extraFile$application$$0$$aggr" | "extraFile$application$$1$$aggr" | "extraFile$application$$2$$aggr" | "extraFile$application$$3$$aggr" | "extraFile$application$$4$$aggr" | "extraFile$application$$5$$aggr" | "extraFile$application$$6$$aggr" | "extraFile$application$$7$$aggr" | "extraFile$application$$8$$aggr" | "extraFile$application$$9$$aggr"; +type Notification$applicationAggr = "notification$application$$aggr" | "notification$application$$0$$aggr" | "notification$application$$1$$aggr" | "notification$application$$2$$aggr" | "notification$application$$3$$aggr" | "notification$application$$4$$aggr" | "notification$application$$5$$aggr" | "notification$application$$6$$aggr" | "notification$application$$7$$aggr" | "notification$application$$8$$aggr" | "notification$application$$9$$aggr"; +type SessionMessage$applicationAggr = "sessionMessage$application$$aggr" | "sessionMessage$application$$0$$aggr" | "sessionMessage$application$$1$$aggr" | "sessionMessage$application$$2$$aggr" | "sessionMessage$application$$3$$aggr" | "sessionMessage$application$$4$$aggr" | "sessionMessage$application$$5$$aggr" | "sessionMessage$application$$6$$aggr" | "sessionMessage$application$$7$$aggr" | "sessionMessage$application$$8$$aggr" | "sessionMessage$application$$9$$aggr"; +type Token$applicationAggr = "token$application$$aggr" | "token$application$$0$$aggr" | "token$application$$1$$aggr" | "token$application$$2$$aggr" | "token$application$$3$$aggr" | "token$application$$4$$aggr" | "token$application$$5$$aggr" | "token$application$$6$$aggr" | "token$application$$7$$aggr" | "token$application$$8$$aggr" | "token$application$$9$$aggr"; +type WechatMenu$applicationAggr = "wechatMenu$application$$aggr" | "wechatMenu$application$$0$$aggr" | "wechatMenu$application$$1$$aggr" | "wechatMenu$application$$2$$aggr" | "wechatMenu$application$$3$$aggr" | "wechatMenu$application$$4$$aggr" | "wechatMenu$application$$5$$aggr" | "wechatMenu$application$$6$$aggr" | "wechatMenu$application$$7$$aggr" | "wechatMenu$application$$8$$aggr" | "wechatMenu$application$$9$$aggr"; +type WechatPublicAutoReply$applicationAggr = "wechatPublicAutoReply$application$$aggr" | "wechatPublicAutoReply$application$$0$$aggr" | "wechatPublicAutoReply$application$$1$$aggr" | "wechatPublicAutoReply$application$$2$$aggr" | "wechatPublicAutoReply$application$$3$$aggr" | "wechatPublicAutoReply$application$$4$$aggr" | "wechatPublicAutoReply$application$$5$$aggr" | "wechatPublicAutoReply$application$$6$$aggr" | "wechatPublicAutoReply$application$$7$$aggr" | "wechatPublicAutoReply$application$$8$$aggr" | "wechatPublicAutoReply$application$$9$$aggr"; +type WechatPublicTag$applicationAggr = "wechatPublicTag$application$$aggr" | "wechatPublicTag$application$$0$$aggr" | "wechatPublicTag$application$$1$$aggr" | "wechatPublicTag$application$$2$$aggr" | "wechatPublicTag$application$$3$$aggr" | "wechatPublicTag$application$$4$$aggr" | "wechatPublicTag$application$$5$$aggr" | "wechatPublicTag$application$$6$$aggr" | "wechatPublicTag$application$$7$$aggr" | "wechatPublicTag$application$$8$$aggr" | "wechatPublicTag$application$$9$$aggr"; +type WechatQrCode$applicationAggr = "wechatQrCode$application$$aggr" | "wechatQrCode$application$$0$$aggr" | "wechatQrCode$application$$1$$aggr" | "wechatQrCode$application$$2$$aggr" | "wechatQrCode$application$$3$$aggr" | "wechatQrCode$application$$4$$aggr" | "wechatQrCode$application$$5$$aggr" | "wechatQrCode$application$$6$$aggr" | "wechatQrCode$application$$7$$aggr" | "wechatQrCode$application$$8$$aggr" | "wechatQrCode$application$$9$$aggr"; +type WechatTemplate$applicationAggr = "wechatTemplate$application$$aggr" | "wechatTemplate$application$$0$$aggr" | "wechatTemplate$application$$1$$aggr" | "wechatTemplate$application$$2$$aggr" | "wechatTemplate$application$$3$$aggr" | "wechatTemplate$application$$4$$aggr" | "wechatTemplate$application$$5$$aggr" | "wechatTemplate$application$$6$$aggr" | "wechatTemplate$application$$7$$aggr" | "wechatTemplate$application$$8$$aggr" | "wechatTemplate$application$$9$$aggr"; +type WechatUser$applicationAggr = "wechatUser$application$$aggr" | "wechatUser$application$$0$$aggr" | "wechatUser$application$$1$$aggr" | "wechatUser$application$$2$$aggr" | "wechatUser$application$$3$$aggr" | "wechatUser$application$$4$$aggr" | "wechatUser$application$$5$$aggr" | "wechatUser$application$$6$$aggr" | "wechatUser$application$$7$$aggr" | "wechatUser$application$$8$$aggr" | "wechatUser$application$$9$$aggr"; +type Pay$applicationAggr = "pay$application$$aggr" | "pay$application$$0$$aggr" | "pay$application$$1$$aggr" | "pay$application$$2$$aggr" | "pay$application$$3$$aggr" | "pay$application$$4$$aggr" | "pay$application$$5$$aggr" | "pay$application$$6$$aggr" | "pay$application$$7$$aggr" | "pay$application$$8$$aggr" | "pay$application$$9$$aggr"; +type WpProduct$applicationAggr = "wpProduct$application$$aggr" | "wpProduct$application$$0$$aggr" | "wpProduct$application$$1$$aggr" | "wpProduct$application$$2$$aggr" | "wpProduct$application$$3$$aggr" | "wpProduct$application$$4$$aggr" | "wpProduct$application$$5$$aggr" | "wpProduct$application$$6$$aggr" | "wpProduct$application$$7$$aggr" | "wpProduct$application$$8$$aggr" | "wpProduct$application$$9$$aggr"; +type Session$entityAggr = "session$entity$$aggr" | "session$entity$$0$$aggr" | "session$entity$$1$$aggr" | "session$entity$$2$$aggr" | "session$entity$$3$$aggr" | "session$entity$$4$$aggr" | "session$entity$$5$$aggr" | "session$entity$$6$$aggr" | "session$entity$$7$$aggr" | "session$entity$$8$$aggr" | "session$entity$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; domain?: Domain.Schema | null; applicationPassport$application?: Array; - applicationPassport$application$$aggr?: AggregationResult; extraFile$application?: Array; - extraFile$application$$aggr?: AggregationResult; notification$application?: Array; - notification$application$$aggr?: AggregationResult; sessionMessage$application?: Array; - sessionMessage$application$$aggr?: AggregationResult; token$application?: Array; - token$application$$aggr?: AggregationResult; wechatMenu$application?: Array; - wechatMenu$application$$aggr?: AggregationResult; wechatPublicAutoReply$application?: Array; - wechatPublicAutoReply$application$$aggr?: AggregationResult; wechatPublicTag$application?: Array; - wechatPublicTag$application$$aggr?: AggregationResult; wechatQrCode$application?: Array; - wechatQrCode$application$$aggr?: AggregationResult; wechatTemplate$application?: Array; - wechatTemplate$application$$aggr?: AggregationResult; wechatUser$application?: Array; - wechatUser$application$$aggr?: AggregationResult; pay$application?: Array; - pay$application$$aggr?: AggregationResult; wpProduct$application?: Array; - wpProduct$application$$aggr?: AggregationResult; session$entity?: Array; - session$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ApplicationPassport$applicationAggr]?: AggregationResult; +} & { + [A in ExtraFile$applicationAggr]?: AggregationResult; +} & { + [A in Notification$applicationAggr]?: AggregationResult; +} & { + [A in SessionMessage$applicationAggr]?: AggregationResult; +} & { + [A in Token$applicationAggr]?: AggregationResult; +} & { + [A in WechatMenu$applicationAggr]?: AggregationResult; +} & { + [A in WechatPublicAutoReply$applicationAggr]?: AggregationResult; +} & { + [A in WechatPublicTag$applicationAggr]?: AggregationResult; +} & { + [A in WechatQrCode$applicationAggr]?: AggregationResult; +} & { + [A in WechatTemplate$applicationAggr]?: AggregationResult; +} & { + [A in WechatUser$applicationAggr]?: AggregationResult; +} & { + [A in Pay$applicationAggr]?: AggregationResult; +} & { + [A in WpProduct$applicationAggr]?: AggregationResult; +} & { + [A in Session$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -183,88 +204,102 @@ export type Projection = { applicationPassport$application?: ApplicationPassport.Selection & { $entity: "applicationPassport"; }; - applicationPassport$application$$aggr?: ApplicationPassport.Aggregation & { - $entity: "applicationPassport"; - }; extraFile$application?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$application$$aggr?: ExtraFile.Aggregation & { - $entity: "extraFile"; - }; notification$application?: Notification.Selection & { $entity: "notification"; }; - notification$application$$aggr?: Notification.Aggregation & { - $entity: "notification"; - }; sessionMessage$application?: SessionMessage.Selection & { $entity: "sessionMessage"; }; - sessionMessage$application$$aggr?: SessionMessage.Aggregation & { - $entity: "sessionMessage"; - }; token$application?: Token.Selection & { $entity: "token"; }; - token$application$$aggr?: Token.Aggregation & { - $entity: "token"; - }; wechatMenu$application?: WechatMenu.Selection & { $entity: "wechatMenu"; }; - wechatMenu$application$$aggr?: WechatMenu.Aggregation & { - $entity: "wechatMenu"; - }; wechatPublicAutoReply$application?: WechatPublicAutoReply.Selection & { $entity: "wechatPublicAutoReply"; }; - wechatPublicAutoReply$application$$aggr?: WechatPublicAutoReply.Aggregation & { - $entity: "wechatPublicAutoReply"; - }; wechatPublicTag$application?: WechatPublicTag.Selection & { $entity: "wechatPublicTag"; }; - wechatPublicTag$application$$aggr?: WechatPublicTag.Aggregation & { - $entity: "wechatPublicTag"; - }; wechatQrCode$application?: WechatQrCode.Selection & { $entity: "wechatQrCode"; }; - wechatQrCode$application$$aggr?: WechatQrCode.Aggregation & { - $entity: "wechatQrCode"; - }; wechatTemplate$application?: WechatTemplate.Selection & { $entity: "wechatTemplate"; }; - wechatTemplate$application$$aggr?: WechatTemplate.Aggregation & { - $entity: "wechatTemplate"; - }; wechatUser$application?: WechatUser.Selection & { $entity: "wechatUser"; }; - wechatUser$application$$aggr?: WechatUser.Aggregation & { - $entity: "wechatUser"; - }; pay$application?: Pay.Selection & { $entity: "pay"; }; - pay$application$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; wpProduct$application?: WpProduct.Selection & { $entity: "wpProduct"; }; - wpProduct$application$$aggr?: WpProduct.Aggregation & { - $entity: "wpProduct"; - }; session$entity?: Session.Selection & { $entity: "session"; }; - session$entity$$aggr?: Session.Aggregation & { +} & Partial> & { + [A in ApplicationPassport$applicationAggr]?: ApplicationPassport.Aggregation & { + $entity: "applicationPassport"; + }; +} & { + [A in ExtraFile$applicationAggr]?: ExtraFile.Aggregation & { + $entity: "extraFile"; + }; +} & { + [A in Notification$applicationAggr]?: Notification.Aggregation & { + $entity: "notification"; + }; +} & { + [A in SessionMessage$applicationAggr]?: SessionMessage.Aggregation & { + $entity: "sessionMessage"; + }; +} & { + [A in Token$applicationAggr]?: Token.Aggregation & { + $entity: "token"; + }; +} & { + [A in WechatMenu$applicationAggr]?: WechatMenu.Aggregation & { + $entity: "wechatMenu"; + }; +} & { + [A in WechatPublicAutoReply$applicationAggr]?: WechatPublicAutoReply.Aggregation & { + $entity: "wechatPublicAutoReply"; + }; +} & { + [A in WechatPublicTag$applicationAggr]?: WechatPublicTag.Aggregation & { + $entity: "wechatPublicTag"; + }; +} & { + [A in WechatQrCode$applicationAggr]?: WechatQrCode.Aggregation & { + $entity: "wechatQrCode"; + }; +} & { + [A in WechatTemplate$applicationAggr]?: WechatTemplate.Aggregation & { + $entity: "wechatTemplate"; + }; +} & { + [A in WechatUser$applicationAggr]?: WechatUser.Aggregation & { + $entity: "wechatUser"; + }; +} & { + [A in Pay$applicationAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in WpProduct$applicationAggr]?: WpProduct.Aggregation & { + $entity: "wpProduct"; + }; +} & { + [A in Session$entityAggr]?: Session.Aggregation & { $entity: "session"; }; -} & Partial>; +}; type ApplicationIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/ApplicationPassport/Schema.d.ts b/es/oak-app-domain/ApplicationPassport/Schema.d.ts index f6871f44..3a8b6f9e 100644 --- a/es/oak-app-domain/ApplicationPassport/Schema.d.ts +++ b/es/oak-app-domain/ApplicationPassport/Schema.d.ts @@ -12,10 +12,7 @@ export type OpSchema = EntityShape & { isDefault: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - applicationId: ForeignKey<"application">; - passportId: ForeignKey<"passport">; - isDefault: Boolean; +export type Schema = OpSchema & { application: Application.Schema; passport: Passport.Schema; } & { diff --git a/es/oak-app-domain/Area/Schema.d.ts b/es/oak-app-domain/Area/Schema.d.ts index 04eed7f4..a56685ad 100644 --- a/es/oak-app-domain/Area/Schema.d.ts +++ b/es/oak-app-domain/Area/Schema.d.ts @@ -16,24 +16,26 @@ export type OpSchema = EntityShape & { center: Geo; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - level: "province" | "city" | "district" | "street" | "country"; - depth: 0 | 1 | 2 | 3 | 4; - parentId?: ForeignKey<"area"> | null; - code: String<12>; - center: Geo; +type Address$areaAggr = "address$area$$aggr" | "address$area$$0$$aggr" | "address$area$$1$$aggr" | "address$area$$2$$aggr" | "address$area$$3$$aggr" | "address$area$$4$$aggr" | "address$area$$5$$aggr" | "address$area$$6$$aggr" | "address$area$$7$$aggr" | "address$area$$8$$aggr" | "address$area$$9$$aggr"; +type Area$parentAggr = "area$parent$$aggr" | "area$parent$$0$$aggr" | "area$parent$$1$$aggr" | "area$parent$$2$$aggr" | "area$parent$$3$$aggr" | "area$parent$$4$$aggr" | "area$parent$$5$$aggr" | "area$parent$$6$$aggr" | "area$parent$$7$$aggr" | "area$parent$$8$$aggr" | "area$parent$$9$$aggr"; +type Station$areaAggr = "station$area$$aggr" | "station$area$$0$$aggr" | "station$area$$1$$aggr" | "station$area$$2$$aggr" | "station$area$$3$$aggr" | "station$area$$4$$aggr" | "station$area$$5$$aggr" | "station$area$$6$$aggr" | "station$area$$7$$aggr" | "station$area$$8$$aggr" | "station$area$$9$$aggr"; +type Subway$areaAggr = "subway$area$$aggr" | "subway$area$$0$$aggr" | "subway$area$$1$$aggr" | "subway$area$$2$$aggr" | "subway$area$$3$$aggr" | "subway$area$$4$$aggr" | "subway$area$$5$$aggr" | "subway$area$$6$$aggr" | "subway$area$$7$$aggr" | "subway$area$$8$$aggr" | "subway$area$$9$$aggr"; +export type Schema = OpSchema & { parent?: Schema | null; address$area?: Array; - address$area$$aggr?: AggregationResult; area$parent?: Array; - area$parent$$aggr?: AggregationResult; station$area?: Array; - station$area$$aggr?: AggregationResult; subway$area?: Array; - subway$area$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Address$areaAggr]?: AggregationResult; +} & { + [A in Area$parentAggr]?: AggregationResult; +} & { + [A in Station$areaAggr]?: AggregationResult; +} & { + [A in Subway$areaAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -69,28 +71,32 @@ export type Projection = { address$area?: Address.Selection & { $entity: "address"; }; - address$area$$aggr?: Address.Aggregation & { - $entity: "address"; - }; area$parent?: Selection & { $entity: "area"; }; - area$parent$$aggr?: Aggregation & { - $entity: "area"; - }; station$area?: Station.Selection & { $entity: "station"; }; - station$area$$aggr?: Station.Aggregation & { - $entity: "station"; - }; subway$area?: Subway.Selection & { $entity: "subway"; }; - subway$area$$aggr?: Subway.Aggregation & { +} & Partial> & { + [A in Address$areaAggr]?: Address.Aggregation & { + $entity: "address"; + }; +} & { + [A in Area$parentAggr]?: Aggregation & { + $entity: "area"; + }; +} & { + [A in Station$areaAggr]?: Station.Aggregation & { + $entity: "station"; + }; +} & { + [A in Subway$areaAggr]?: Subway.Aggregation & { $entity: "subway"; }; -} & Partial>; +}; type AreaIdProjection = OneOf<{ id: number; parentId: number; diff --git a/es/oak-app-domain/Article/Schema.d.ts b/es/oak-app-domain/Article/Schema.d.ts index d3ef7d84..74a15012 100644 --- a/es/oak-app-domain/Article/Schema.d.ts +++ b/es/oak-app-domain/Article/Schema.d.ts @@ -12,15 +12,14 @@ export type OpSchema = EntityShape & { articleMenuId: ForeignKey<"articleMenu">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - content: Text; - articleMenuId: ForeignKey<"articleMenu">; +type ExtraFile$entityAggr = "extraFile$entity$$aggr" | "extraFile$entity$$0$$aggr" | "extraFile$entity$$1$$aggr" | "extraFile$entity$$2$$aggr" | "extraFile$entity$$3$$aggr" | "extraFile$entity$$4$$aggr" | "extraFile$entity$$5$$aggr" | "extraFile$entity$$6$$aggr" | "extraFile$entity$$7$$aggr" | "extraFile$entity$$8$$aggr" | "extraFile$entity$$9$$aggr"; +export type Schema = OpSchema & { articleMenu: ArticleMenu.Schema; extraFile$entity?: Array; - extraFile$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ExtraFile$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -48,10 +47,11 @@ export type Projection = { extraFile$entity?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$entity$$aggr?: ExtraFile.Aggregation & { +} & Partial> & { + [A in ExtraFile$entityAggr]?: ExtraFile.Aggregation & { $entity: "extraFile"; }; -} & Partial>; +}; type ArticleIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/ArticleMenu/Schema.d.ts b/es/oak-app-domain/ArticleMenu/Schema.d.ts index 6b447b9b..7b5ba5e2 100644 --- a/es/oak-app-domain/ArticleMenu/Schema.d.ts +++ b/es/oak-app-domain/ArticleMenu/Schema.d.ts @@ -15,22 +15,22 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - isArticle: Boolean; - parentId?: ForeignKey<"articleMenu"> | null; - isLeaf?: Boolean | null; - entity: String<32>; - entityId: String<64>; +type Article$articleMenuAggr = "article$articleMenu$$aggr" | "article$articleMenu$$0$$aggr" | "article$articleMenu$$1$$aggr" | "article$articleMenu$$2$$aggr" | "article$articleMenu$$3$$aggr" | "article$articleMenu$$4$$aggr" | "article$articleMenu$$5$$aggr" | "article$articleMenu$$6$$aggr" | "article$articleMenu$$7$$aggr" | "article$articleMenu$$8$$aggr" | "article$articleMenu$$9$$aggr"; +type ArticleMenu$parentAggr = "articleMenu$parent$$aggr" | "articleMenu$parent$$0$$aggr" | "articleMenu$parent$$1$$aggr" | "articleMenu$parent$$2$$aggr" | "articleMenu$parent$$3$$aggr" | "articleMenu$parent$$4$$aggr" | "articleMenu$parent$$5$$aggr" | "articleMenu$parent$$6$$aggr" | "articleMenu$parent$$7$$aggr" | "articleMenu$parent$$8$$aggr" | "articleMenu$parent$$9$$aggr"; +type ExtraFile$entityAggr = "extraFile$entity$$aggr" | "extraFile$entity$$0$$aggr" | "extraFile$entity$$1$$aggr" | "extraFile$entity$$2$$aggr" | "extraFile$entity$$3$$aggr" | "extraFile$entity$$4$$aggr" | "extraFile$entity$$5$$aggr" | "extraFile$entity$$6$$aggr" | "extraFile$entity$$7$$aggr" | "extraFile$entity$$8$$aggr" | "extraFile$entity$$9$$aggr"; +export type Schema = OpSchema & { parent?: Schema | null; article$articleMenu?: Array; - article$articleMenu$$aggr?: AggregationResult; articleMenu$parent?: Array; - articleMenu$parent$$aggr?: AggregationResult; extraFile$entity?: Array; - extraFile$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Article$articleMenuAggr]?: AggregationResult; +} & { + [A in ArticleMenu$parentAggr]?: AggregationResult; +} & { + [A in ExtraFile$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -66,22 +66,25 @@ export type Projection = { article$articleMenu?: Article.Selection & { $entity: "article"; }; - article$articleMenu$$aggr?: Article.Aggregation & { - $entity: "article"; - }; articleMenu$parent?: Selection & { $entity: "articleMenu"; }; - articleMenu$parent$$aggr?: Aggregation & { - $entity: "articleMenu"; - }; extraFile$entity?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$entity$$aggr?: ExtraFile.Aggregation & { +} & Partial> & { + [A in Article$articleMenuAggr]?: Article.Aggregation & { + $entity: "article"; + }; +} & { + [A in ArticleMenu$parentAggr]?: Aggregation & { + $entity: "articleMenu"; + }; +} & { + [A in ExtraFile$entityAggr]?: ExtraFile.Aggregation & { $entity: "extraFile"; }; -} & Partial>; +}; type ArticleMenuIdProjection = OneOf<{ id: number; parentId: number; diff --git a/es/oak-app-domain/Captcha/Schema.d.ts b/es/oak-app-domain/Captcha/Schema.d.ts index 2da81a47..0e0746fe 100644 --- a/es/oak-app-domain/Captcha/Schema.d.ts +++ b/es/oak-app-domain/Captcha/Schema.d.ts @@ -16,18 +16,7 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - origin: "mobile" | "email"; - content: String<32>; - code: String<8>; - visitorId: Text; - reason?: Text | null; - env: Object; - expired: Boolean; - expiresAt: Datetime; - type: "login" | "changePassword" | "confirm"; - iState?: IState | null; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/es/oak-app-domain/ChangePasswordTemp/Schema.d.ts b/es/oak-app-domain/ChangePasswordTemp/Schema.d.ts index 85d1fa1e..247609ee 100644 --- a/es/oak-app-domain/ChangePasswordTemp/Schema.d.ts +++ b/es/oak-app-domain/ChangePasswordTemp/Schema.d.ts @@ -12,11 +12,7 @@ export type OpSchema = EntityShape & { result: "success" | "fail"; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - prevPassword?: String<32> | null; - newPassword?: String<32> | null; - result: "success" | "fail"; +export type Schema = OpSchema & { user: User.Schema; } & { [A in ExpressionKey]?: any; diff --git a/es/oak-app-domain/Deposit/Schema.d.ts b/es/oak-app-domain/Deposit/Schema.d.ts index cc32ee0b..0014837f 100644 --- a/es/oak-app-domain/Deposit/Schema.d.ts +++ b/es/oak-app-domain/Deposit/Schema.d.ts @@ -16,20 +16,19 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - price: Price; - loss: Price; - accountId: ForeignKey<"account">; - creatorId: ForeignKey<"user">; - iState?: IState | null; +type Pay$depositAggr = "pay$deposit$$aggr" | "pay$deposit$$0$$aggr" | "pay$deposit$$1$$aggr" | "pay$deposit$$2$$aggr" | "pay$deposit$$3$$aggr" | "pay$deposit$$4$$aggr" | "pay$deposit$$5$$aggr" | "pay$deposit$$6$$aggr" | "pay$deposit$$7$$aggr" | "pay$deposit$$8$$aggr" | "pay$deposit$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { account: Account.Schema; creator: User.Schema; pay$deposit?: Array; - pay$deposit$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Pay$depositAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -64,16 +63,18 @@ export type Projection = { pay$deposit?: Pay.Selection & { $entity: "pay"; }; - pay$deposit$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in Pay$depositAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type DepositIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Domain/Schema.d.ts b/es/oak-app-domain/Domain/Schema.d.ts index a3ced1fc..7f5c372a 100644 --- a/es/oak-app-domain/Domain/Schema.d.ts +++ b/es/oak-app-domain/Domain/Schema.d.ts @@ -14,17 +14,14 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - url: String<64>; - apiPath?: String<32> | null; - protocol: "http:" | "https:"; - port: Int<2>; - systemId: ForeignKey<"system">; +type Application$domainAggr = "application$domain$$aggr" | "application$domain$$0$$aggr" | "application$domain$$1$$aggr" | "application$domain$$2$$aggr" | "application$domain$$3$$aggr" | "application$domain$$4$$aggr" | "application$domain$$5$$aggr" | "application$domain$$6$$aggr" | "application$domain$$7$$aggr" | "application$domain$$8$$aggr" | "application$domain$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; application$domain?: Array; - application$domain$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Application$domainAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -56,10 +53,11 @@ export type Projection = { application$domain?: Application.Selection & { $entity: "application"; }; - application$domain$$aggr?: Application.Aggregation & { +} & Partial> & { + [A in Application$domainAggr]?: Application.Aggregation & { $entity: "application"; }; -} & Partial>; +}; type DomainIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Email/Schema.d.ts b/es/oak-app-domain/Email/Schema.d.ts index de14d964..d53fe3a0 100644 --- a/es/oak-app-domain/Email/Schema.d.ts +++ b/es/oak-app-domain/Email/Schema.d.ts @@ -13,15 +13,14 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - email: String<32>; - userId: ForeignKey<"user">; - ableState?: AbleState | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -49,10 +48,11 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type EmailIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/ExtraFile/Schema.d.ts b/es/oak-app-domain/ExtraFile/Schema.d.ts index 8000484a..c6de5004 100644 --- a/es/oak-app-domain/ExtraFile/Schema.d.ts +++ b/es/oak-app-domain/ExtraFile/Schema.d.ts @@ -32,27 +32,7 @@ export type OpSchema = EntityShape & { applicationId: ForeignKey<"application">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - origin: "qiniu" | "wechat" | "ctyun" | "aliyun" | "tencent" | "unknown"; - type: "image" | "video" | "audio" | "file"; - bucket?: String<32> | null; - objectId?: String<64> | null; - tag1?: String<32> | null; - tag2?: String<32> | null; - filename: String<256>; - md5?: Text | null; - entity: "article" | "articleMenu" | "sessionMessage" | "user" | string; - entityId: String<64>; - extra1?: Text | null; - extra2?: Object | null; - extension?: String<16> | null; - size?: Int<8> | null; - sort?: Float<22, 10> | null; - fileType?: String<128> | null; - isBridge?: Boolean | null; - uploadState: "success" | "failed" | "uploading"; - uploadMeta?: Object | null; - applicationId: ForeignKey<"application">; +export type Schema = OpSchema & { application: Application.Schema; article?: Article.Schema; articleMenu?: ArticleMenu.Schema; diff --git a/es/oak-app-domain/I18n/Schema.d.ts b/es/oak-app-domain/I18n/Schema.d.ts index a3b5f81d..346e68cc 100644 --- a/es/oak-app-domain/I18n/Schema.d.ts +++ b/es/oak-app-domain/I18n/Schema.d.ts @@ -11,13 +11,7 @@ export type OpSchema = EntityShape & { data: Object; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - module: String<64>; - position: String<188>; - namespace: String<256>; - language: String<32>; - data: Object; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/es/oak-app-domain/Livestream/Schema.d.ts b/es/oak-app-domain/Livestream/Schema.d.ts index c30a6709..6918faa4 100644 --- a/es/oak-app-domain/Livestream/Schema.d.ts +++ b/es/oak-app-domain/Livestream/Schema.d.ts @@ -17,19 +17,7 @@ export type OpSchema = EntityShape & { expireAt: Datetime; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - title: String<32>; - streamTitle: String<32>; - liveonly: "online" | "offline"; - hub: String<32>; - streamKey: String<64>; - entity: String<32>; - entityId: String<64>; - rtmpPushUrl: String<64>; - rtmpPlayUrl: String<64>; - pcPushUrl: String<64>; - expireAt: Datetime; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/es/oak-app-domain/Log/Schema.d.ts b/es/oak-app-domain/Log/Schema.d.ts index 54a1eead..3802cd71 100644 --- a/es/oak-app-domain/Log/Schema.d.ts +++ b/es/oak-app-domain/Log/Schema.d.ts @@ -10,14 +10,13 @@ export type OpSchema = EntityShape & { iState: "normal" | "rollbacked"; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: String<32>; - entityId: String<64>; - iState: "normal" | "rollbacked"; +type Oper$logAggr = "oper$log$$aggr" | "oper$log$$0$$aggr" | "oper$log$$1$$aggr" | "oper$log$$2$$aggr" | "oper$log$$3$$aggr" | "oper$log$$4$$aggr" | "oper$log$$5$$aggr" | "oper$log$$6$$aggr" | "oper$log$$7$$aggr" | "oper$log$$8$$aggr" | "oper$log$$9$$aggr"; +export type Schema = OpSchema & { oper$log?: Array; - oper$log$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Oper$logAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -43,10 +42,11 @@ export type Projection = { oper$log?: Oper.Selection & { $entity: "oper"; }; - oper$log$$aggr?: Oper.Aggregation & { +} & Partial> & { + [A in Oper$logAggr]?: Oper.Aggregation & { $entity: "oper"; }; -} & Partial>; +}; type LogIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/LoginName/Schema.d.ts b/es/oak-app-domain/LoginName/Schema.d.ts index 62bd4dbf..192267de 100644 --- a/es/oak-app-domain/LoginName/Schema.d.ts +++ b/es/oak-app-domain/LoginName/Schema.d.ts @@ -13,15 +13,14 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - userId: ForeignKey<"user">; - ableState?: AbleState | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -49,10 +48,11 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type LoginNameIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Message/Schema.d.ts b/es/oak-app-domain/Message/Schema.d.ts index 04726d01..3bb7bfda 100644 --- a/es/oak-app-domain/Message/Schema.d.ts +++ b/es/oak-app-domain/Message/Schema.d.ts @@ -37,29 +37,19 @@ export type OpSchema = EntityShape & { visitState?: VisitState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: String<32>; - entityId: String<64>; - userId: ForeignKey<"user">; - type: String<64>; - weight: Weight; - restriction?: MessageRestriction | null; - title: String<256>; - content: Text; - data?: Object | null; - router?: Router | null; - platformId?: ForeignKey<"platform"> | null; - channels?: Channels | null; - iState?: IState | null; - visitState?: VisitState | null; +type MessageSystem$messageAggr = "messageSystem$message$$aggr" | "messageSystem$message$$0$$aggr" | "messageSystem$message$$1$$aggr" | "messageSystem$message$$2$$aggr" | "messageSystem$message$$3$$aggr" | "messageSystem$message$$4$$aggr" | "messageSystem$message$$5$$aggr" | "messageSystem$message$$6$$aggr" | "messageSystem$message$$7$$aggr" | "messageSystem$message$$8$$aggr" | "messageSystem$message$$9$$aggr"; +type WechatMpJump$messageAggr = "wechatMpJump$message$$aggr" | "wechatMpJump$message$$0$$aggr" | "wechatMpJump$message$$1$$aggr" | "wechatMpJump$message$$2$$aggr" | "wechatMpJump$message$$3$$aggr" | "wechatMpJump$message$$4$$aggr" | "wechatMpJump$message$$5$$aggr" | "wechatMpJump$message$$6$$aggr" | "wechatMpJump$message$$7$$aggr" | "wechatMpJump$message$$8$$aggr" | "wechatMpJump$message$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; platform?: Platform.Schema | null; messageSystem$message?: Array; - messageSystem$message$$aggr?: AggregationResult; wechatMpJump$message?: Array; - wechatMpJump$message$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in MessageSystem$messageAggr]?: AggregationResult; +} & { + [A in WechatMpJump$messageAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -112,16 +102,18 @@ export type Projection = { messageSystem$message?: MessageSystem.Selection & { $entity: "messageSystem"; }; - messageSystem$message$$aggr?: MessageSystem.Aggregation & { - $entity: "messageSystem"; - }; wechatMpJump$message?: WechatMpJump.Selection & { $entity: "wechatMpJump"; }; - wechatMpJump$message$$aggr?: WechatMpJump.Aggregation & { +} & Partial> & { + [A in MessageSystem$messageAggr]?: MessageSystem.Aggregation & { + $entity: "messageSystem"; + }; +} & { + [A in WechatMpJump$messageAggr]?: WechatMpJump.Aggregation & { $entity: "wechatMpJump"; }; -} & Partial>; +}; type MessageIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/MessageSystem/Schema.d.ts b/es/oak-app-domain/MessageSystem/Schema.d.ts index 0f7551f4..ade4b8d5 100644 --- a/es/oak-app-domain/MessageSystem/Schema.d.ts +++ b/es/oak-app-domain/MessageSystem/Schema.d.ts @@ -11,15 +11,15 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - messageId: ForeignKey<"message">; - systemId: ForeignKey<"system">; +type Notification$messageSystemAggr = "notification$messageSystem$$aggr" | "notification$messageSystem$$0$$aggr" | "notification$messageSystem$$1$$aggr" | "notification$messageSystem$$2$$aggr" | "notification$messageSystem$$3$$aggr" | "notification$messageSystem$$4$$aggr" | "notification$messageSystem$$5$$aggr" | "notification$messageSystem$$6$$aggr" | "notification$messageSystem$$7$$aggr" | "notification$messageSystem$$8$$aggr" | "notification$messageSystem$$9$$aggr"; +export type Schema = OpSchema & { message: Message.Schema; system: System.Schema; notification$messageSystem?: Array; - notification$messageSystem$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Notification$messageSystemAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -47,10 +47,11 @@ export type Projection = { notification$messageSystem?: Notification.Selection & { $entity: "notification"; }; - notification$messageSystem$$aggr?: Notification.Aggregation & { +} & Partial> & { + [A in Notification$messageSystemAggr]?: Notification.Aggregation & { $entity: "notification"; }; -} & Partial>; +}; type MessageSystemIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/MessageType/Schema.d.ts b/es/oak-app-domain/MessageType/Schema.d.ts index 4ea472bd..b6499c40 100644 --- a/es/oak-app-domain/MessageType/Schema.d.ts +++ b/es/oak-app-domain/MessageType/Schema.d.ts @@ -7,9 +7,7 @@ export type OpSchema = EntityShape & { type: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - type: String<64>; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/es/oak-app-domain/MessageTypeSmsTemplate/Schema.d.ts b/es/oak-app-domain/MessageTypeSmsTemplate/Schema.d.ts index 51b3d973..76288d69 100644 --- a/es/oak-app-domain/MessageTypeSmsTemplate/Schema.d.ts +++ b/es/oak-app-domain/MessageTypeSmsTemplate/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { templateId: ForeignKey<"smsTemplate">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - type: String<64>; - templateId: ForeignKey<"smsTemplate">; +export type Schema = OpSchema & { template: SmsTemplate.Schema; } & { [A in ExpressionKey]?: any; diff --git a/es/oak-app-domain/MessageTypeTemplate/Schema.d.ts b/es/oak-app-domain/MessageTypeTemplate/Schema.d.ts index 12dde6c5..66816933 100644 --- a/es/oak-app-domain/MessageTypeTemplate/Schema.d.ts +++ b/es/oak-app-domain/MessageTypeTemplate/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { templateId: ForeignKey<"wechatTemplate">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - type: String<64>; - templateId: ForeignKey<"wechatTemplate">; +export type Schema = OpSchema & { template: WechatTemplate.Schema; } & { [A in ExpressionKey]?: any; diff --git a/es/oak-app-domain/Mobile/Schema.d.ts b/es/oak-app-domain/Mobile/Schema.d.ts index 63998fc3..8e826916 100644 --- a/es/oak-app-domain/Mobile/Schema.d.ts +++ b/es/oak-app-domain/Mobile/Schema.d.ts @@ -13,15 +13,14 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - mobile: String<16>; - userId?: ForeignKey<"user"> | null; - ableState?: AbleState | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user?: User.Schema | null; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -49,10 +48,11 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type MobileIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Modi/Schema.d.ts b/es/oak-app-domain/Modi/Schema.d.ts index 74ccc7dc..b67f85ac 100644 --- a/es/oak-app-domain/Modi/Schema.d.ts +++ b/es/oak-app-domain/Modi/Schema.d.ts @@ -15,19 +15,13 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - targetEntity: String<32>; - entity: String<32>; - entityId: String<64>; - action: String<24>; - data: Object; - filter?: Object | null; - extra?: Object | null; - iState?: IState | null; +type ModiEntity$modiAggr = "modiEntity$modi$$aggr" | "modiEntity$modi$$0$$aggr" | "modiEntity$modi$$1$$aggr" | "modiEntity$modi$$2$$aggr" | "modiEntity$modi$$3$$aggr" | "modiEntity$modi$$4$$aggr" | "modiEntity$modi$$5$$aggr" | "modiEntity$modi$$6$$aggr" | "modiEntity$modi$$7$$aggr" | "modiEntity$modi$$8$$aggr" | "modiEntity$modi$$9$$aggr"; +export type Schema = OpSchema & { modiEntity$modi?: Array; - modiEntity$modi$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ModiEntity$modiAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -63,10 +57,11 @@ export type Projection = { modiEntity$modi?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$modi$$aggr?: ModiEntity.Aggregation & { +} & Partial> & { + [A in ModiEntity$modiAggr]?: ModiEntity.Aggregation & { $entity: "modiEntity"; }; -} & Partial>; +}; type ModiIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/ModiEntity/Schema.d.ts b/es/oak-app-domain/ModiEntity/Schema.d.ts index 5d20d72b..129ae203 100644 --- a/es/oak-app-domain/ModiEntity/Schema.d.ts +++ b/es/oak-app-domain/ModiEntity/Schema.d.ts @@ -19,10 +19,7 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - modiId: ForeignKey<"modi">; - entity: "user" | "wechatPay" | "withdraw" | "withdrawAccount" | "withdrawChannel" | "withdrawTransfer" | "wpAccount" | "wpProduct" | string; - entityId: String<64>; +export type Schema = OpSchema & { modi: Modi.Schema; user?: User.Schema; wechatPay?: WechatPay.Schema; diff --git a/es/oak-app-domain/Notification/Schema.d.ts b/es/oak-app-domain/Notification/Schema.d.ts index 07a62249..fc6523c3 100644 --- a/es/oak-app-domain/Notification/Schema.d.ts +++ b/es/oak-app-domain/Notification/Schema.d.ts @@ -18,15 +18,7 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - channel: Channel; - applicationId?: ForeignKey<"application"> | null; - data?: Object | null; - messageSystemId: ForeignKey<"messageSystem">; - data1?: Object | null; - data2?: Object | null; - templateId?: String<128> | null; - iState?: IState | null; +export type Schema = OpSchema & { application?: Application.Schema | null; messageSystem: MessageSystem.Schema; } & { diff --git a/es/oak-app-domain/OfflineAccount/Schema.d.ts b/es/oak-app-domain/OfflineAccount/Schema.d.ts index 4b60674b..45d6a53f 100644 --- a/es/oak-app-domain/OfflineAccount/Schema.d.ts +++ b/es/oak-app-domain/OfflineAccount/Schema.d.ts @@ -25,30 +25,22 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - taxLossRatio: Decimal<4, 2>; - refundGapDays?: Int<4> | null; - refundCompensateRatio?: Int<4> | null; - allowWithdrawTransfer: Boolean; - withdrawTransferLossRatio?: Decimal<4, 2> | null; - type: "bank" | "alipay" | "wechat" | "shouqianba" | "others"; - channel?: String<32> | null; - name?: String<64> | null; - qrCode?: Text | null; - allowDeposit: Boolean; - allowPay: Boolean; - systemId: ForeignKey<"system">; - price: Price; - enabled: Boolean; +type Pay$entityAggr = "pay$entity$$aggr" | "pay$entity$$0$$aggr" | "pay$entity$$1$$aggr" | "pay$entity$$2$$aggr" | "pay$entity$$3$$aggr" | "pay$entity$$4$$aggr" | "pay$entity$$5$$aggr" | "pay$entity$$6$$aggr" | "pay$entity$$7$$aggr" | "pay$entity$$8$$aggr" | "pay$entity$$9$$aggr"; +type SysAccountOper$entityAggr = "sysAccountOper$entity$$aggr" | "sysAccountOper$entity$$0$$aggr" | "sysAccountOper$entity$$1$$aggr" | "sysAccountOper$entity$$2$$aggr" | "sysAccountOper$entity$$3$$aggr" | "sysAccountOper$entity$$4$$aggr" | "sysAccountOper$entity$$5$$aggr" | "sysAccountOper$entity$$6$$aggr" | "sysAccountOper$entity$$7$$aggr" | "sysAccountOper$entity$$8$$aggr" | "sysAccountOper$entity$$9$$aggr"; +type WithdrawChannel$entityAggr = "withdrawChannel$entity$$aggr" | "withdrawChannel$entity$$0$$aggr" | "withdrawChannel$entity$$1$$aggr" | "withdrawChannel$entity$$2$$aggr" | "withdrawChannel$entity$$3$$aggr" | "withdrawChannel$entity$$4$$aggr" | "withdrawChannel$entity$$5$$aggr" | "withdrawChannel$entity$$6$$aggr" | "withdrawChannel$entity$$7$$aggr" | "withdrawChannel$entity$$8$$aggr" | "withdrawChannel$entity$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; pay$entity?: Array; - pay$entity$$aggr?: AggregationResult; sysAccountOper$entity?: Array; - sysAccountOper$entity$$aggr?: AggregationResult; withdrawChannel$entity?: Array; - withdrawChannel$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Pay$entityAggr]?: AggregationResult; +} & { + [A in SysAccountOper$entityAggr]?: AggregationResult; +} & { + [A in WithdrawChannel$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -100,22 +92,25 @@ export type Projection = { pay$entity?: Pay.Selection & { $entity: "pay"; }; - pay$entity$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; sysAccountOper$entity?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$entity$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; withdrawChannel$entity?: WithdrawChannel.Selection & { $entity: "withdrawChannel"; }; - withdrawChannel$entity$$aggr?: WithdrawChannel.Aggregation & { +} & Partial> & { + [A in Pay$entityAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in SysAccountOper$entityAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in WithdrawChannel$entityAggr]?: WithdrawChannel.Aggregation & { $entity: "withdrawChannel"; }; -} & Partial>; +}; type OfflineAccountIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Oper/Schema.d.ts b/es/oak-app-domain/Oper/Schema.d.ts index 8c5f3c18..a8689396 100644 --- a/es/oak-app-domain/Oper/Schema.d.ts +++ b/es/oak-app-domain/Oper/Schema.d.ts @@ -20,23 +20,15 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - action: String<24>; - data: Object; - filter?: Object | null; - extra?: Object | null; - operatorId?: ForeignKey<"user"> | null; - targetEntity: String<32>; - bornAt?: Datetime | null; - logId?: ForeignKey<"log"> | null; - undoData?: Object | null; - iState?: IState | null; +type OperEntity$operAggr = "operEntity$oper$$aggr" | "operEntity$oper$$0$$aggr" | "operEntity$oper$$1$$aggr" | "operEntity$oper$$2$$aggr" | "operEntity$oper$$3$$aggr" | "operEntity$oper$$4$$aggr" | "operEntity$oper$$5$$aggr" | "operEntity$oper$$6$$aggr" | "operEntity$oper$$7$$aggr" | "operEntity$oper$$8$$aggr" | "operEntity$oper$$9$$aggr"; +export type Schema = OpSchema & { operator?: User.Schema | null; log?: Log.Schema | null; operEntity$oper?: Array; - operEntity$oper$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in OperEntity$operAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -80,10 +72,11 @@ export type Projection = { operEntity$oper?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$oper$$aggr?: OperEntity.Aggregation & { +} & Partial> & { + [A in OperEntity$operAggr]?: OperEntity.Aggregation & { $entity: "operEntity"; }; -} & Partial>; +}; type OperIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/OperEntity/Schema.d.ts b/es/oak-app-domain/OperEntity/Schema.d.ts index 4f216d22..51cf0827 100644 --- a/es/oak-app-domain/OperEntity/Schema.d.ts +++ b/es/oak-app-domain/OperEntity/Schema.d.ts @@ -19,10 +19,7 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - operId: ForeignKey<"oper">; - entity: "user" | "wechatPay" | "withdraw" | "withdrawAccount" | "withdrawChannel" | "withdrawTransfer" | "wpAccount" | "wpProduct" | string; - entityId: String<64>; +export type Schema = OpSchema & { oper: Oper.Schema; user?: User.Schema; wechatPay?: WechatPay.Schema; diff --git a/es/oak-app-domain/Order/Schema.d.ts b/es/oak-app-domain/Order/Schema.d.ts index 6c7fad75..225c2e29 100644 --- a/es/oak-app-domain/Order/Schema.d.ts +++ b/es/oak-app-domain/Order/Schema.d.ts @@ -24,28 +24,19 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - price: Price; - paid: Price; - refunded: Price; - title: String<32>; - desc: Text; - timeoutAt?: Datetime | null; - creatorId: ForeignKey<"user">; - entity: String<32>; - entityId: String<64>; - settled: Boolean; - allowPartialPay?: Boolean | null; - systemId: ForeignKey<"system">; - iState?: IState | null; +type Pay$orderAggr = "pay$order$$aggr" | "pay$order$$0$$aggr" | "pay$order$$1$$aggr" | "pay$order$$2$$aggr" | "pay$order$$3$$aggr" | "pay$order$$4$$aggr" | "pay$order$$5$$aggr" | "pay$order$$6$$aggr" | "pay$order$$7$$aggr" | "pay$order$$8$$aggr" | "pay$order$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { creator: User.Schema; system: System.Schema; pay$order?: Array; - pay$order$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Pay$orderAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -96,16 +87,18 @@ export type Projection = { pay$order?: Pay.Selection & { $entity: "pay"; }; - pay$order$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in Pay$orderAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type OrderIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Parasite/Schema.d.ts b/es/oak-app-domain/Parasite/Schema.d.ts index 95517b05..ceadc08c 100644 --- a/es/oak-app-domain/Parasite/Schema.d.ts +++ b/es/oak-app-domain/Parasite/Schema.d.ts @@ -23,21 +23,14 @@ export type OpSchema = EntityShape & { tokenLifeLength?: Int<4> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - entity: String<32>; - entityId: String<64>; - showTip?: Boolean | null; - expiresAt: Datetime; - expired: Boolean; - redirectTo: RedirectTo; - multiple?: Boolean | null; - tokenLifeLength?: Int<4> | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -77,10 +70,11 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type ParasiteIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Passport/Schema.d.ts b/es/oak-app-domain/Passport/Schema.d.ts index 3625ef03..c11a0e17 100644 --- a/es/oak-app-domain/Passport/Schema.d.ts +++ b/es/oak-app-domain/Passport/Schema.d.ts @@ -36,16 +36,14 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - systemId: ForeignKey<"system">; - type: Type; - config?: (SmsConfig | EmailConfig | PfwConfig | MfwConfig) | null; - enabled: Boolean; +type ApplicationPassport$passportAggr = "applicationPassport$passport$$aggr" | "applicationPassport$passport$$0$$aggr" | "applicationPassport$passport$$1$$aggr" | "applicationPassport$passport$$2$$aggr" | "applicationPassport$passport$$3$$aggr" | "applicationPassport$passport$$4$$aggr" | "applicationPassport$passport$$5$$aggr" | "applicationPassport$passport$$6$$aggr" | "applicationPassport$passport$$7$$aggr" | "applicationPassport$passport$$8$$aggr" | "applicationPassport$passport$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; applicationPassport$passport?: Array; - applicationPassport$passport$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ApplicationPassport$passportAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -75,10 +73,11 @@ export type Projection = { applicationPassport$passport?: ApplicationPassport.Selection & { $entity: "applicationPassport"; }; - applicationPassport$passport$$aggr?: ApplicationPassport.Aggregation & { +} & Partial> & { + [A in ApplicationPassport$passportAggr]?: ApplicationPassport.Aggregation & { $entity: "applicationPassport"; }; -} & Partial>; +}; type PassportIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Path/Schema.d.ts b/es/oak-app-domain/Path/Schema.d.ts index 9d105675..906337af 100644 --- a/es/oak-app-domain/Path/Schema.d.ts +++ b/es/oak-app-domain/Path/Schema.d.ts @@ -13,18 +13,17 @@ export type OpSchema = EntityShape & { desc?: String<256> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - destEntity: String<32>; - value: String<256>; - recursive: Boolean; - sourceEntity: String<32>; - desc?: String<256> | null; +type ActionAuth$pathAggr = "actionAuth$path$$aggr" | "actionAuth$path$$0$$aggr" | "actionAuth$path$$1$$aggr" | "actionAuth$path$$2$$aggr" | "actionAuth$path$$3$$aggr" | "actionAuth$path$$4$$aggr" | "actionAuth$path$$5$$aggr" | "actionAuth$path$$6$$aggr" | "actionAuth$path$$7$$aggr" | "actionAuth$path$$8$$aggr" | "actionAuth$path$$9$$aggr"; +type RelationAuth$pathAggr = "relationAuth$path$$aggr" | "relationAuth$path$$0$$aggr" | "relationAuth$path$$1$$aggr" | "relationAuth$path$$2$$aggr" | "relationAuth$path$$3$$aggr" | "relationAuth$path$$4$$aggr" | "relationAuth$path$$5$$aggr" | "relationAuth$path$$6$$aggr" | "relationAuth$path$$7$$aggr" | "relationAuth$path$$8$$aggr" | "relationAuth$path$$9$$aggr"; +export type Schema = OpSchema & { actionAuth$path?: Array; - actionAuth$path$$aggr?: AggregationResult; relationAuth$path?: Array; - relationAuth$path$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ActionAuth$pathAggr]?: AggregationResult; +} & { + [A in RelationAuth$pathAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -55,16 +54,18 @@ export type Projection = { actionAuth$path?: ActionAuth.Selection & { $entity: "actionAuth"; }; - actionAuth$path$$aggr?: ActionAuth.Aggregation & { - $entity: "actionAuth"; - }; relationAuth$path?: RelationAuth.Selection & { $entity: "relationAuth"; }; - relationAuth$path$$aggr?: RelationAuth.Aggregation & { +} & Partial> & { + [A in ActionAuth$pathAggr]?: ActionAuth.Aggregation & { + $entity: "actionAuth"; + }; +} & { + [A in RelationAuth$pathAggr]?: RelationAuth.Aggregation & { $entity: "relationAuth"; }; -} & Partial>; +}; type PathIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Pay/Schema.d.ts b/es/oak-app-domain/Pay/Schema.d.ts index 0d10028d..5959e861 100644 --- a/es/oak-app-domain/Pay/Schema.d.ts +++ b/es/oak-app-domain/Pay/Schema.d.ts @@ -37,27 +37,10 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - price: Price; - paid: Price; - refunded: Price; - entity: "account" | "offlineAccount" | "wpProduct" | string; - entityId: String<64>; - timeoutAt?: Datetime | null; - successAt?: Datetime | null; - forbidRefundAt?: Datetime | null; - refundable: Boolean; - depositId?: ForeignKey<"deposit"> | null; - orderId?: ForeignKey<"order"> | null; - externalId?: String<80> | null; - meta: Object; - applicationId: ForeignKey<"application">; - creatorId: ForeignKey<"user">; - phantom1?: String<32> | null; - phantom2?: String<32> | null; - phantom3?: Int<4> | null; - phantom4?: Int<8> | null; - iState?: IState | null; +type Refund$payAggr = "refund$pay$$aggr" | "refund$pay$$0$$aggr" | "refund$pay$$1$$aggr" | "refund$pay$$2$$aggr" | "refund$pay$$3$$aggr" | "refund$pay$$4$$aggr" | "refund$pay$$5$$aggr" | "refund$pay$$6$$aggr" | "refund$pay$$7$$aggr" | "refund$pay$$8$$aggr" | "refund$pay$$9$$aggr"; +type SysAccountOper$payAggr = "sysAccountOper$pay$$aggr" | "sysAccountOper$pay$$0$$aggr" | "sysAccountOper$pay$$1$$aggr" | "sysAccountOper$pay$$2$$aggr" | "sysAccountOper$pay$$3$$aggr" | "sysAccountOper$pay$$4$$aggr" | "sysAccountOper$pay$$5$$aggr" | "sysAccountOper$pay$$6$$aggr" | "sysAccountOper$pay$$7$$aggr" | "sysAccountOper$pay$$8$$aggr" | "sysAccountOper$pay$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { deposit?: Deposit.Schema | null; order?: Order.Schema | null; application: Application.Schema; @@ -66,13 +49,16 @@ export type Schema = EntityShape & { offlineAccount?: OfflineAccount.Schema; wpProduct?: WpProduct.Schema; refund$pay?: Array; - refund$pay$$aggr?: AggregationResult; sysAccountOper$pay?: Array; - sysAccountOper$pay$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Refund$payAggr]?: AggregationResult; +} & { + [A in SysAccountOper$payAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -148,22 +134,25 @@ export type Projection = { refund$pay?: Refund.Selection & { $entity: "refund"; }; - refund$pay$$aggr?: Refund.Aggregation & { - $entity: "refund"; - }; sysAccountOper$pay?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$pay$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in Refund$payAggr]?: Refund.Aggregation & { + $entity: "refund"; + }; +} & { + [A in SysAccountOper$payAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type PayIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Platform/Schema.d.ts b/es/oak-app-domain/Platform/Schema.d.ts index 25c135b8..d5d36ffe 100644 --- a/es/oak-app-domain/Platform/Schema.d.ts +++ b/es/oak-app-domain/Platform/Schema.d.ts @@ -17,19 +17,17 @@ export type OpSchema = EntityShape & { entityId?: String<64> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - description?: Text | null; - config: Config; - style?: Style | null; - entity?: String<32> | null; - entityId?: String<64> | null; +type Message$platformAggr = "message$platform$$aggr" | "message$platform$$0$$aggr" | "message$platform$$1$$aggr" | "message$platform$$2$$aggr" | "message$platform$$3$$aggr" | "message$platform$$4$$aggr" | "message$platform$$5$$aggr" | "message$platform$$6$$aggr" | "message$platform$$7$$aggr" | "message$platform$$8$$aggr" | "message$platform$$9$$aggr"; +type System$platformAggr = "system$platform$$aggr" | "system$platform$$0$$aggr" | "system$platform$$1$$aggr" | "system$platform$$2$$aggr" | "system$platform$$3$$aggr" | "system$platform$$4$$aggr" | "system$platform$$5$$aggr" | "system$platform$$6$$aggr" | "system$platform$$7$$aggr" | "system$platform$$8$$aggr" | "system$platform$$9$$aggr"; +export type Schema = OpSchema & { message$platform?: Array; - message$platform$$aggr?: AggregationResult; system$platform?: Array; - system$platform$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Message$platformAggr]?: AggregationResult; +} & { + [A in System$platformAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -62,16 +60,18 @@ export type Projection = { message$platform?: Message.Selection & { $entity: "message"; }; - message$platform$$aggr?: Message.Aggregation & { - $entity: "message"; - }; system$platform?: System.Selection & { $entity: "system"; }; - system$platform$$aggr?: System.Aggregation & { +} & Partial> & { + [A in Message$platformAggr]?: Message.Aggregation & { + $entity: "message"; + }; +} & { + [A in System$platformAggr]?: System.Aggregation & { $entity: "system"; }; -} & Partial>; +}; type PlatformIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/ReadRemark/Schema.d.ts b/es/oak-app-domain/ReadRemark/Schema.d.ts index 38b4d811..6db38c76 100644 --- a/es/oak-app-domain/ReadRemark/Schema.d.ts +++ b/es/oak-app-domain/ReadRemark/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { sessionId: ForeignKey<"session">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - sessionId: ForeignKey<"session">; +export type Schema = OpSchema & { user: User.Schema; session: Session.Schema; } & { diff --git a/es/oak-app-domain/Refund/Schema.d.ts b/es/oak-app-domain/Refund/Schema.d.ts index e0f83100..61d8b772 100644 --- a/es/oak-app-domain/Refund/Schema.d.ts +++ b/es/oak-app-domain/Refund/Schema.d.ts @@ -23,27 +23,20 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - withdrawId?: ForeignKey<"withdraw"> | null; - loss: Price; - payId: ForeignKey<"pay">; - meta?: Object | null; - externalMeta?: Object | null; - externalId?: String<128> | null; - price: Price; - creatorId: ForeignKey<"user">; - reason?: Text | null; - successAt?: Datetime | null; - iState?: IState | null; +type SysAccountOper$refundAggr = "sysAccountOper$refund$$aggr" | "sysAccountOper$refund$$0$$aggr" | "sysAccountOper$refund$$1$$aggr" | "sysAccountOper$refund$$2$$aggr" | "sysAccountOper$refund$$3$$aggr" | "sysAccountOper$refund$$4$$aggr" | "sysAccountOper$refund$$5$$aggr" | "sysAccountOper$refund$$6$$aggr" | "sysAccountOper$refund$$7$$aggr" | "sysAccountOper$refund$$8$$aggr" | "sysAccountOper$refund$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { withdraw?: Withdraw.Schema | null; pay: Pay.Schema; creator: User.Schema; sysAccountOper$refund?: Array; - sysAccountOper$refund$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SysAccountOper$refundAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -92,16 +85,18 @@ export type Projection = { sysAccountOper$refund?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$refund$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in SysAccountOper$refundAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type RefundIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Relation/Schema.d.ts b/es/oak-app-domain/Relation/Schema.d.ts index dc0046b7..9fa781d4 100644 --- a/es/oak-app-domain/Relation/Schema.d.ts +++ b/es/oak-app-domain/Relation/Schema.d.ts @@ -17,25 +17,31 @@ export type OpSchema = EntityShape & { display?: String<32> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: "session" | "toDo" | string; - entityId?: String<64> | null; - name?: String<32> | null; - display?: String<32> | null; +type ActionAuth$relationAggr = "actionAuth$relation$$aggr" | "actionAuth$relation$$0$$aggr" | "actionAuth$relation$$1$$aggr" | "actionAuth$relation$$2$$aggr" | "actionAuth$relation$$3$$aggr" | "actionAuth$relation$$4$$aggr" | "actionAuth$relation$$5$$aggr" | "actionAuth$relation$$6$$aggr" | "actionAuth$relation$$7$$aggr" | "actionAuth$relation$$8$$aggr" | "actionAuth$relation$$9$$aggr"; +type RelationAuth$sourceRelationAggr = "relationAuth$sourceRelation$$aggr" | "relationAuth$sourceRelation$$0$$aggr" | "relationAuth$sourceRelation$$1$$aggr" | "relationAuth$sourceRelation$$2$$aggr" | "relationAuth$sourceRelation$$3$$aggr" | "relationAuth$sourceRelation$$4$$aggr" | "relationAuth$sourceRelation$$5$$aggr" | "relationAuth$sourceRelation$$6$$aggr" | "relationAuth$sourceRelation$$7$$aggr" | "relationAuth$sourceRelation$$8$$aggr" | "relationAuth$sourceRelation$$9$$aggr"; +type RelationAuth$destRelationAggr = "relationAuth$destRelation$$aggr" | "relationAuth$destRelation$$0$$aggr" | "relationAuth$destRelation$$1$$aggr" | "relationAuth$destRelation$$2$$aggr" | "relationAuth$destRelation$$3$$aggr" | "relationAuth$destRelation$$4$$aggr" | "relationAuth$destRelation$$5$$aggr" | "relationAuth$destRelation$$6$$aggr" | "relationAuth$destRelation$$7$$aggr" | "relationAuth$destRelation$$8$$aggr" | "relationAuth$destRelation$$9$$aggr"; +type UserEntityClaim$relationAggr = "userEntityClaim$relation$$aggr" | "userEntityClaim$relation$$0$$aggr" | "userEntityClaim$relation$$1$$aggr" | "userEntityClaim$relation$$2$$aggr" | "userEntityClaim$relation$$3$$aggr" | "userEntityClaim$relation$$4$$aggr" | "userEntityClaim$relation$$5$$aggr" | "userEntityClaim$relation$$6$$aggr" | "userEntityClaim$relation$$7$$aggr" | "userEntityClaim$relation$$8$$aggr" | "userEntityClaim$relation$$9$$aggr"; +type UserRelation$relationAggr = "userRelation$relation$$aggr" | "userRelation$relation$$0$$aggr" | "userRelation$relation$$1$$aggr" | "userRelation$relation$$2$$aggr" | "userRelation$relation$$3$$aggr" | "userRelation$relation$$4$$aggr" | "userRelation$relation$$5$$aggr" | "userRelation$relation$$6$$aggr" | "userRelation$relation$$7$$aggr" | "userRelation$relation$$8$$aggr" | "userRelation$relation$$9$$aggr"; +export type Schema = OpSchema & { session?: Session.Schema; toDo?: ToDo.Schema; actionAuth$relation?: Array; - actionAuth$relation$$aggr?: AggregationResult; relationAuth$sourceRelation?: Array; - relationAuth$sourceRelation$$aggr?: AggregationResult; relationAuth$destRelation?: Array; - relationAuth$destRelation$$aggr?: AggregationResult; userEntityClaim$relation?: Array; - userEntityClaim$relation$$aggr?: AggregationResult; userRelation$relation?: Array; - userRelation$relation$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ActionAuth$relationAggr]?: AggregationResult; +} & { + [A in RelationAuth$sourceRelationAggr]?: AggregationResult; +} & { + [A in RelationAuth$destRelationAggr]?: AggregationResult; +} & { + [A in UserEntityClaim$relationAggr]?: AggregationResult; +} & { + [A in UserRelation$relationAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -71,34 +77,39 @@ export type Projection = { actionAuth$relation?: ActionAuth.Selection & { $entity: "actionAuth"; }; - actionAuth$relation$$aggr?: ActionAuth.Aggregation & { - $entity: "actionAuth"; - }; relationAuth$sourceRelation?: RelationAuth.Selection & { $entity: "relationAuth"; }; - relationAuth$sourceRelation$$aggr?: RelationAuth.Aggregation & { - $entity: "relationAuth"; - }; relationAuth$destRelation?: RelationAuth.Selection & { $entity: "relationAuth"; }; - relationAuth$destRelation$$aggr?: RelationAuth.Aggregation & { - $entity: "relationAuth"; - }; userEntityClaim$relation?: UserEntityClaim.Selection & { $entity: "userEntityClaim"; }; - userEntityClaim$relation$$aggr?: UserEntityClaim.Aggregation & { - $entity: "userEntityClaim"; - }; userRelation$relation?: UserRelation.Selection & { $entity: "userRelation"; }; - userRelation$relation$$aggr?: UserRelation.Aggregation & { +} & Partial> & { + [A in ActionAuth$relationAggr]?: ActionAuth.Aggregation & { + $entity: "actionAuth"; + }; +} & { + [A in RelationAuth$sourceRelationAggr]?: RelationAuth.Aggregation & { + $entity: "relationAuth"; + }; +} & { + [A in RelationAuth$destRelationAggr]?: RelationAuth.Aggregation & { + $entity: "relationAuth"; + }; +} & { + [A in UserEntityClaim$relationAggr]?: UserEntityClaim.Aggregation & { + $entity: "userEntityClaim"; + }; +} & { + [A in UserRelation$relationAggr]?: UserRelation.Aggregation & { $entity: "userRelation"; }; -} & Partial>; +}; type RelationIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/RelationAuth/Schema.d.ts b/es/oak-app-domain/RelationAuth/Schema.d.ts index 53adb3e5..2bd74e51 100644 --- a/es/oak-app-domain/RelationAuth/Schema.d.ts +++ b/es/oak-app-domain/RelationAuth/Schema.d.ts @@ -11,10 +11,7 @@ export type OpSchema = EntityShape & { destRelationId: ForeignKey<"relation">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - sourceRelationId: ForeignKey<"relation">; - pathId: ForeignKey<"path">; - destRelationId: ForeignKey<"relation">; +export type Schema = OpSchema & { sourceRelation: Relation.Schema; path: Path.Schema; destRelation: Relation.Schema; diff --git a/es/oak-app-domain/Session/Schema.d.ts b/es/oak-app-domain/Session/Schema.d.ts index 43914057..a0de55c6 100644 --- a/es/oak-app-domain/Session/Schema.d.ts +++ b/es/oak-app-domain/Session/Schema.d.ts @@ -18,24 +18,27 @@ export type OpSchema = EntityShape & { openId?: String<32> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: "application" | string; - entityId: String<64>; - userId?: ForeignKey<"user"> | null; - lmts?: Datetime | null; - openId?: String<32> | null; +type ReadRemark$sessionAggr = "readRemark$session$$aggr" | "readRemark$session$$0$$aggr" | "readRemark$session$$1$$aggr" | "readRemark$session$$2$$aggr" | "readRemark$session$$3$$aggr" | "readRemark$session$$4$$aggr" | "readRemark$session$$5$$aggr" | "readRemark$session$$6$$aggr" | "readRemark$session$$7$$aggr" | "readRemark$session$$8$$aggr" | "readRemark$session$$9$$aggr"; +type SessionMessage$sessionAggr = "sessionMessage$session$$aggr" | "sessionMessage$session$$0$$aggr" | "sessionMessage$session$$1$$aggr" | "sessionMessage$session$$2$$aggr" | "sessionMessage$session$$3$$aggr" | "sessionMessage$session$$4$$aggr" | "sessionMessage$session$$5$$aggr" | "sessionMessage$session$$6$$aggr" | "sessionMessage$session$$7$$aggr" | "sessionMessage$session$$8$$aggr" | "sessionMessage$session$$9$$aggr"; +type Relation$entityAggr = "relation$entity$$aggr" | "relation$entity$$0$$aggr" | "relation$entity$$1$$aggr" | "relation$entity$$2$$aggr" | "relation$entity$$3$$aggr" | "relation$entity$$4$$aggr" | "relation$entity$$5$$aggr" | "relation$entity$$6$$aggr" | "relation$entity$$7$$aggr" | "relation$entity$$8$$aggr" | "relation$entity$$9$$aggr"; +type UserRelation$entityAggr = "userRelation$entity$$aggr" | "userRelation$entity$$0$$aggr" | "userRelation$entity$$1$$aggr" | "userRelation$entity$$2$$aggr" | "userRelation$entity$$3$$aggr" | "userRelation$entity$$4$$aggr" | "userRelation$entity$$5$$aggr" | "userRelation$entity$$6$$aggr" | "userRelation$entity$$7$$aggr" | "userRelation$entity$$8$$aggr" | "userRelation$entity$$9$$aggr"; +export type Schema = OpSchema & { user?: User.Schema | null; application?: Application.Schema; readRemark$session?: Array; - readRemark$session$$aggr?: AggregationResult; sessionMessage$session?: Array; - sessionMessage$session$$aggr?: AggregationResult; relation$entity?: Array; - relation$entity$$aggr?: AggregationResult; userRelation$entity?: Array; - userRelation$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ReadRemark$sessionAggr]?: AggregationResult; +} & { + [A in SessionMessage$sessionAggr]?: AggregationResult; +} & { + [A in Relation$entityAggr]?: AggregationResult; +} & { + [A in UserRelation$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -72,28 +75,32 @@ export type Projection = { readRemark$session?: ReadRemark.Selection & { $entity: "readRemark"; }; - readRemark$session$$aggr?: ReadRemark.Aggregation & { - $entity: "readRemark"; - }; sessionMessage$session?: SessionMessage.Selection & { $entity: "sessionMessage"; }; - sessionMessage$session$$aggr?: SessionMessage.Aggregation & { - $entity: "sessionMessage"; - }; relation$entity?: Relation.Selection & { $entity: "relation"; }; - relation$entity$$aggr?: Relation.Aggregation & { - $entity: "relation"; - }; userRelation$entity?: UserRelation.Selection & { $entity: "userRelation"; }; - userRelation$entity$$aggr?: UserRelation.Aggregation & { +} & Partial> & { + [A in ReadRemark$sessionAggr]?: ReadRemark.Aggregation & { + $entity: "readRemark"; + }; +} & { + [A in SessionMessage$sessionAggr]?: SessionMessage.Aggregation & { + $entity: "sessionMessage"; + }; +} & { + [A in Relation$entityAggr]?: Relation.Aggregation & { + $entity: "relation"; + }; +} & { + [A in UserRelation$entityAggr]?: UserRelation.Aggregation & { $entity: "userRelation"; }; -} & Partial>; +}; type SessionIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/SessionMessage/Schema.d.ts b/es/oak-app-domain/SessionMessage/Schema.d.ts index fe504e3b..7177ff5c 100644 --- a/es/oak-app-domain/SessionMessage/Schema.d.ts +++ b/es/oak-app-domain/SessionMessage/Schema.d.ts @@ -23,25 +23,17 @@ export type OpSchema = EntityShape & { extra?: Object | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - applicationId: ForeignKey<"application">; - sessionId: ForeignKey<"session">; - userId?: ForeignKey<"user"> | null; - wechatUserId?: ForeignKey<"wechatUser"> | null; - createTime?: Datetime | null; - type: Type; - text?: Text | null; - link?: String<128> | null; - aaoe?: Boolean | null; - extra?: Object | null; +type ExtraFile$entityAggr = "extraFile$entity$$aggr" | "extraFile$entity$$0$$aggr" | "extraFile$entity$$1$$aggr" | "extraFile$entity$$2$$aggr" | "extraFile$entity$$3$$aggr" | "extraFile$entity$$4$$aggr" | "extraFile$entity$$5$$aggr" | "extraFile$entity$$6$$aggr" | "extraFile$entity$$7$$aggr" | "extraFile$entity$$8$$aggr" | "extraFile$entity$$9$$aggr"; +export type Schema = OpSchema & { application: Application.Schema; session: Session.Schema; user?: User.Schema | null; wechatUser?: WechatUser.Schema | null; extraFile$entity?: Array; - extraFile$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ExtraFile$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -89,10 +81,11 @@ export type Projection = { extraFile$entity?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$entity$$aggr?: ExtraFile.Aggregation & { +} & Partial> & { + [A in ExtraFile$entityAggr]?: ExtraFile.Aggregation & { $entity: "extraFile"; }; -} & Partial>; +}; type SessionMessageIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/SmsTemplate/Schema.d.ts b/es/oak-app-domain/SmsTemplate/Schema.d.ts index fe0487d5..0ff0186d 100644 --- a/es/oak-app-domain/SmsTemplate/Schema.d.ts +++ b/es/oak-app-domain/SmsTemplate/Schema.d.ts @@ -16,18 +16,14 @@ export type OpSchema = EntityShape & { syncAt: Datetime; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - systemId: ForeignKey<"system">; - origin: Origin; - templateName: Text; - templateCode: String<64>; - templateContent: Text; - syncAt: Datetime; +type MessageTypeSmsTemplate$templateAggr = "messageTypeSmsTemplate$template$$aggr" | "messageTypeSmsTemplate$template$$0$$aggr" | "messageTypeSmsTemplate$template$$1$$aggr" | "messageTypeSmsTemplate$template$$2$$aggr" | "messageTypeSmsTemplate$template$$3$$aggr" | "messageTypeSmsTemplate$template$$4$$aggr" | "messageTypeSmsTemplate$template$$5$$aggr" | "messageTypeSmsTemplate$template$$6$$aggr" | "messageTypeSmsTemplate$template$$7$$aggr" | "messageTypeSmsTemplate$template$$8$$aggr" | "messageTypeSmsTemplate$template$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; messageTypeSmsTemplate$template?: Array; - messageTypeSmsTemplate$template$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in MessageTypeSmsTemplate$templateAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -61,10 +57,11 @@ export type Projection = { messageTypeSmsTemplate$template?: MessageTypeSmsTemplate.Selection & { $entity: "messageTypeSmsTemplate"; }; - messageTypeSmsTemplate$template$$aggr?: MessageTypeSmsTemplate.Aggregation & { +} & Partial> & { + [A in MessageTypeSmsTemplate$templateAggr]?: MessageTypeSmsTemplate.Aggregation & { $entity: "messageTypeSmsTemplate"; }; -} & Partial>; +}; type SmsTemplateIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Station/Schema.d.ts b/es/oak-app-domain/Station/Schema.d.ts index c0a14e3d..8a88e900 100644 --- a/es/oak-app-domain/Station/Schema.d.ts +++ b/es/oak-app-domain/Station/Schema.d.ts @@ -11,14 +11,14 @@ export type OpSchema = EntityShape & { areaId: ForeignKey<"area">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - areaId: ForeignKey<"area">; +type SubwayStation$stationAggr = "subwayStation$station$$aggr" | "subwayStation$station$$0$$aggr" | "subwayStation$station$$1$$aggr" | "subwayStation$station$$2$$aggr" | "subwayStation$station$$3$$aggr" | "subwayStation$station$$4$$aggr" | "subwayStation$station$$5$$aggr" | "subwayStation$station$$6$$aggr" | "subwayStation$station$$7$$aggr" | "subwayStation$station$$8$$aggr" | "subwayStation$station$$9$$aggr"; +export type Schema = OpSchema & { area: Area.Schema; subwayStation$station?: Array; - subwayStation$station$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SubwayStation$stationAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -44,10 +44,11 @@ export type Projection = { subwayStation$station?: SubwayStation.Selection & { $entity: "subwayStation"; }; - subwayStation$station$$aggr?: SubwayStation.Aggregation & { +} & Partial> & { + [A in SubwayStation$stationAggr]?: SubwayStation.Aggregation & { $entity: "subwayStation"; }; -} & Partial>; +}; type StationIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Subscription/Schema.d.ts b/es/oak-app-domain/Subscription/Schema.d.ts index 62b3fd2e..b782f8b8 100644 --- a/es/oak-app-domain/Subscription/Schema.d.ts +++ b/es/oak-app-domain/Subscription/Schema.d.ts @@ -18,14 +18,7 @@ export type OpSchema = EntityShape & { offset?: Int<4> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: String<32>; - entityId: String<64>; - name: String<32>; - description?: Text | null; - config?: WechatPublicConfig | null; - offset?: Int<4> | null; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/es/oak-app-domain/Subway/Schema.d.ts b/es/oak-app-domain/Subway/Schema.d.ts index 3cb046a7..4e8e98e4 100644 --- a/es/oak-app-domain/Subway/Schema.d.ts +++ b/es/oak-app-domain/Subway/Schema.d.ts @@ -11,14 +11,14 @@ export type OpSchema = EntityShape & { areaId: ForeignKey<"area">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - areaId: ForeignKey<"area">; +type SubwayStation$subwayAggr = "subwayStation$subway$$aggr" | "subwayStation$subway$$0$$aggr" | "subwayStation$subway$$1$$aggr" | "subwayStation$subway$$2$$aggr" | "subwayStation$subway$$3$$aggr" | "subwayStation$subway$$4$$aggr" | "subwayStation$subway$$5$$aggr" | "subwayStation$subway$$6$$aggr" | "subwayStation$subway$$7$$aggr" | "subwayStation$subway$$8$$aggr" | "subwayStation$subway$$9$$aggr"; +export type Schema = OpSchema & { area: Area.Schema; subwayStation$subway?: Array; - subwayStation$subway$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SubwayStation$subwayAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -44,10 +44,11 @@ export type Projection = { subwayStation$subway?: SubwayStation.Selection & { $entity: "subwayStation"; }; - subwayStation$subway$$aggr?: SubwayStation.Aggregation & { +} & Partial> & { + [A in SubwayStation$subwayAggr]?: SubwayStation.Aggregation & { $entity: "subwayStation"; }; -} & Partial>; +}; type SubwayIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/SubwayStation/Schema.d.ts b/es/oak-app-domain/SubwayStation/Schema.d.ts index 5042f91b..ee7f6a97 100644 --- a/es/oak-app-domain/SubwayStation/Schema.d.ts +++ b/es/oak-app-domain/SubwayStation/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { subwayId: ForeignKey<"subway">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - stationId: ForeignKey<"station">; - subwayId: ForeignKey<"subway">; +export type Schema = OpSchema & { station: Station.Schema; subway: Subway.Schema; } & { diff --git a/es/oak-app-domain/SysAccountMove/Schema.d.ts b/es/oak-app-domain/SysAccountMove/Schema.d.ts index 95adeff3..c92e3ebd 100644 --- a/es/oak-app-domain/SysAccountMove/Schema.d.ts +++ b/es/oak-app-domain/SysAccountMove/Schema.d.ts @@ -15,18 +15,15 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - price: Price; - externalId: String<64>; - operatorId: ForeignKey<"user">; - remark?: Text | null; - systemId: ForeignKey<"system">; +type SysAccountOper$sysAccountMoveAggr = "sysAccountOper$sysAccountMove$$aggr" | "sysAccountOper$sysAccountMove$$0$$aggr" | "sysAccountOper$sysAccountMove$$1$$aggr" | "sysAccountOper$sysAccountMove$$2$$aggr" | "sysAccountOper$sysAccountMove$$3$$aggr" | "sysAccountOper$sysAccountMove$$4$$aggr" | "sysAccountOper$sysAccountMove$$5$$aggr" | "sysAccountOper$sysAccountMove$$6$$aggr" | "sysAccountOper$sysAccountMove$$7$$aggr" | "sysAccountOper$sysAccountMove$$8$$aggr" | "sysAccountOper$sysAccountMove$$9$$aggr"; +export type Schema = OpSchema & { operator: User.Schema; system: System.Schema; sysAccountOper$sysAccountMove?: Array; - sysAccountOper$sysAccountMove$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SysAccountOper$sysAccountMoveAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -60,10 +57,11 @@ export type Projection = { sysAccountOper$sysAccountMove?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$sysAccountMove$$aggr?: SysAccountOper.Aggregation & { +} & Partial> & { + [A in SysAccountOper$sysAccountMoveAggr]?: SysAccountOper.Aggregation & { $entity: "sysAccountOper"; }; -} & Partial>; +}; type SysAccountMoveIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/SysAccountOper/Schema.d.ts b/es/oak-app-domain/SysAccountOper/Schema.d.ts index eeb55d67..b733a43f 100644 --- a/es/oak-app-domain/SysAccountOper/Schema.d.ts +++ b/es/oak-app-domain/SysAccountOper/Schema.d.ts @@ -22,15 +22,7 @@ export type OpSchema = EntityShape & { sysAccountMoveId?: ForeignKey<"sysAccountMove"> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - delta: Price; - type: SysAccountOperType; - entity: "offlineAccount" | "wpAccount" | string; - entityId: String<64>; - payId?: ForeignKey<"pay"> | null; - refundId?: ForeignKey<"refund"> | null; - withdrawTransferId?: ForeignKey<"withdrawTransfer"> | null; - sysAccountMoveId?: ForeignKey<"sysAccountMove"> | null; +export type Schema = OpSchema & { pay?: Pay.Schema | null; refund?: Refund.Schema | null; withdrawTransfer?: WithdrawTransfer.Schema | null; diff --git a/es/oak-app-domain/System/Schema.d.ts b/es/oak-app-domain/System/Schema.d.ts index 2a5ad3bc..53261a6d 100644 --- a/es/oak-app-domain/System/Schema.d.ts +++ b/es/oak-app-domain/System/Schema.d.ts @@ -48,52 +48,74 @@ export type OpSchema = EntityShape & { payConfig?: PayConfig | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - description?: Text | null; - config: Config; - platformId?: ForeignKey<"platform"> | null; - folder?: String<16> | null; - super?: Boolean | null; - style?: Style | null; - entity?: String<32> | null; - entityId?: String<64> | null; - payConfig?: PayConfig | null; +type Application$systemAggr = "application$system$$aggr" | "application$system$$0$$aggr" | "application$system$$1$$aggr" | "application$system$$2$$aggr" | "application$system$$3$$aggr" | "application$system$$4$$aggr" | "application$system$$5$$aggr" | "application$system$$6$$aggr" | "application$system$$7$$aggr" | "application$system$$8$$aggr" | "application$system$$9$$aggr"; +type Domain$systemAggr = "domain$system$$aggr" | "domain$system$$0$$aggr" | "domain$system$$1$$aggr" | "domain$system$$2$$aggr" | "domain$system$$3$$aggr" | "domain$system$$4$$aggr" | "domain$system$$5$$aggr" | "domain$system$$6$$aggr" | "domain$system$$7$$aggr" | "domain$system$$8$$aggr" | "domain$system$$9$$aggr"; +type MessageSystem$systemAggr = "messageSystem$system$$aggr" | "messageSystem$system$$0$$aggr" | "messageSystem$system$$1$$aggr" | "messageSystem$system$$2$$aggr" | "messageSystem$system$$3$$aggr" | "messageSystem$system$$4$$aggr" | "messageSystem$system$$5$$aggr" | "messageSystem$system$$6$$aggr" | "messageSystem$system$$7$$aggr" | "messageSystem$system$$8$$aggr" | "messageSystem$system$$9$$aggr"; +type Passport$systemAggr = "passport$system$$aggr" | "passport$system$$0$$aggr" | "passport$system$$1$$aggr" | "passport$system$$2$$aggr" | "passport$system$$3$$aggr" | "passport$system$$4$$aggr" | "passport$system$$5$$aggr" | "passport$system$$6$$aggr" | "passport$system$$7$$aggr" | "passport$system$$8$$aggr" | "passport$system$$9$$aggr"; +type SmsTemplate$systemAggr = "smsTemplate$system$$aggr" | "smsTemplate$system$$0$$aggr" | "smsTemplate$system$$1$$aggr" | "smsTemplate$system$$2$$aggr" | "smsTemplate$system$$3$$aggr" | "smsTemplate$system$$4$$aggr" | "smsTemplate$system$$5$$aggr" | "smsTemplate$system$$6$$aggr" | "smsTemplate$system$$7$$aggr" | "smsTemplate$system$$8$$aggr" | "smsTemplate$system$$9$$aggr"; +type UserSystem$systemAggr = "userSystem$system$$aggr" | "userSystem$system$$0$$aggr" | "userSystem$system$$1$$aggr" | "userSystem$system$$2$$aggr" | "userSystem$system$$3$$aggr" | "userSystem$system$$4$$aggr" | "userSystem$system$$5$$aggr" | "userSystem$system$$6$$aggr" | "userSystem$system$$7$$aggr" | "userSystem$system$$8$$aggr" | "userSystem$system$$9$$aggr"; +type Account$ofSystemAggr = "account$ofSystem$$aggr" | "account$ofSystem$$0$$aggr" | "account$ofSystem$$1$$aggr" | "account$ofSystem$$2$$aggr" | "account$ofSystem$$3$$aggr" | "account$ofSystem$$4$$aggr" | "account$ofSystem$$5$$aggr" | "account$ofSystem$$6$$aggr" | "account$ofSystem$$7$$aggr" | "account$ofSystem$$8$$aggr" | "account$ofSystem$$9$$aggr"; +type Account$entityAggr = "account$entity$$aggr" | "account$entity$$0$$aggr" | "account$entity$$1$$aggr" | "account$entity$$2$$aggr" | "account$entity$$3$$aggr" | "account$entity$$4$$aggr" | "account$entity$$5$$aggr" | "account$entity$$6$$aggr" | "account$entity$$7$$aggr" | "account$entity$$8$$aggr" | "account$entity$$9$$aggr"; +type OfflineAccount$systemAggr = "offlineAccount$system$$aggr" | "offlineAccount$system$$0$$aggr" | "offlineAccount$system$$1$$aggr" | "offlineAccount$system$$2$$aggr" | "offlineAccount$system$$3$$aggr" | "offlineAccount$system$$4$$aggr" | "offlineAccount$system$$5$$aggr" | "offlineAccount$system$$6$$aggr" | "offlineAccount$system$$7$$aggr" | "offlineAccount$system$$8$$aggr" | "offlineAccount$system$$9$$aggr"; +type Order$systemAggr = "order$system$$aggr" | "order$system$$0$$aggr" | "order$system$$1$$aggr" | "order$system$$2$$aggr" | "order$system$$3$$aggr" | "order$system$$4$$aggr" | "order$system$$5$$aggr" | "order$system$$6$$aggr" | "order$system$$7$$aggr" | "order$system$$8$$aggr" | "order$system$$9$$aggr"; +type SysAccountMove$systemAggr = "sysAccountMove$system$$aggr" | "sysAccountMove$system$$0$$aggr" | "sysAccountMove$system$$1$$aggr" | "sysAccountMove$system$$2$$aggr" | "sysAccountMove$system$$3$$aggr" | "sysAccountMove$system$$4$$aggr" | "sysAccountMove$system$$5$$aggr" | "sysAccountMove$system$$6$$aggr" | "sysAccountMove$system$$7$$aggr" | "sysAccountMove$system$$8$$aggr" | "sysAccountMove$system$$9$$aggr"; +type WechatPay$systemAggr = "wechatPay$system$$aggr" | "wechatPay$system$$0$$aggr" | "wechatPay$system$$1$$aggr" | "wechatPay$system$$2$$aggr" | "wechatPay$system$$3$$aggr" | "wechatPay$system$$4$$aggr" | "wechatPay$system$$5$$aggr" | "wechatPay$system$$6$$aggr" | "wechatPay$system$$7$$aggr" | "wechatPay$system$$8$$aggr" | "wechatPay$system$$9$$aggr"; +type WithdrawAccount$ofSystemAggr = "withdrawAccount$ofSystem$$aggr" | "withdrawAccount$ofSystem$$0$$aggr" | "withdrawAccount$ofSystem$$1$$aggr" | "withdrawAccount$ofSystem$$2$$aggr" | "withdrawAccount$ofSystem$$3$$aggr" | "withdrawAccount$ofSystem$$4$$aggr" | "withdrawAccount$ofSystem$$5$$aggr" | "withdrawAccount$ofSystem$$6$$aggr" | "withdrawAccount$ofSystem$$7$$aggr" | "withdrawAccount$ofSystem$$8$$aggr" | "withdrawAccount$ofSystem$$9$$aggr"; +type WithdrawAccount$entityAggr = "withdrawAccount$entity$$aggr" | "withdrawAccount$entity$$0$$aggr" | "withdrawAccount$entity$$1$$aggr" | "withdrawAccount$entity$$2$$aggr" | "withdrawAccount$entity$$3$$aggr" | "withdrawAccount$entity$$4$$aggr" | "withdrawAccount$entity$$5$$aggr" | "withdrawAccount$entity$$6$$aggr" | "withdrawAccount$entity$$7$$aggr" | "withdrawAccount$entity$$8$$aggr" | "withdrawAccount$entity$$9$$aggr"; +type WithdrawChannel$systemAggr = "withdrawChannel$system$$aggr" | "withdrawChannel$system$$0$$aggr" | "withdrawChannel$system$$1$$aggr" | "withdrawChannel$system$$2$$aggr" | "withdrawChannel$system$$3$$aggr" | "withdrawChannel$system$$4$$aggr" | "withdrawChannel$system$$5$$aggr" | "withdrawChannel$system$$6$$aggr" | "withdrawChannel$system$$7$$aggr" | "withdrawChannel$system$$8$$aggr" | "withdrawChannel$system$$9$$aggr"; +type WpAccount$systemAggr = "wpAccount$system$$aggr" | "wpAccount$system$$0$$aggr" | "wpAccount$system$$1$$aggr" | "wpAccount$system$$2$$aggr" | "wpAccount$system$$3$$aggr" | "wpAccount$system$$4$$aggr" | "wpAccount$system$$5$$aggr" | "wpAccount$system$$6$$aggr" | "wpAccount$system$$7$$aggr" | "wpAccount$system$$8$$aggr" | "wpAccount$system$$9$$aggr"; +export type Schema = OpSchema & { platform?: Platform.Schema | null; application$system?: Array; - application$system$$aggr?: AggregationResult; domain$system?: Array; - domain$system$$aggr?: AggregationResult; messageSystem$system?: Array; - messageSystem$system$$aggr?: AggregationResult; passport$system?: Array; - passport$system$$aggr?: AggregationResult; smsTemplate$system?: Array; - smsTemplate$system$$aggr?: AggregationResult; userSystem$system?: Array; - userSystem$system$$aggr?: AggregationResult; account$ofSystem?: Array; - account$ofSystem$$aggr?: AggregationResult; account$entity?: Array; - account$entity$$aggr?: AggregationResult; offlineAccount$system?: Array; - offlineAccount$system$$aggr?: AggregationResult; order$system?: Array; - order$system$$aggr?: AggregationResult; sysAccountMove$system?: Array; - sysAccountMove$system$$aggr?: AggregationResult; wechatPay$system?: Array; - wechatPay$system$$aggr?: AggregationResult; withdrawAccount$ofSystem?: Array; - withdrawAccount$ofSystem$$aggr?: AggregationResult; withdrawAccount$entity?: Array; - withdrawAccount$entity$$aggr?: AggregationResult; withdrawChannel$system?: Array; - withdrawChannel$system$$aggr?: AggregationResult; wpAccount$system?: Array; - wpAccount$system$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Application$systemAggr]?: AggregationResult; +} & { + [A in Domain$systemAggr]?: AggregationResult; +} & { + [A in MessageSystem$systemAggr]?: AggregationResult; +} & { + [A in Passport$systemAggr]?: AggregationResult; +} & { + [A in SmsTemplate$systemAggr]?: AggregationResult; +} & { + [A in UserSystem$systemAggr]?: AggregationResult; +} & { + [A in Account$ofSystemAggr]?: AggregationResult; +} & { + [A in Account$entityAggr]?: AggregationResult; +} & { + [A in OfflineAccount$systemAggr]?: AggregationResult; +} & { + [A in Order$systemAggr]?: AggregationResult; +} & { + [A in SysAccountMove$systemAggr]?: AggregationResult; +} & { + [A in WechatPay$systemAggr]?: AggregationResult; +} & { + [A in WithdrawAccount$ofSystemAggr]?: AggregationResult; +} & { + [A in WithdrawAccount$entityAggr]?: AggregationResult; +} & { + [A in WithdrawChannel$systemAggr]?: AggregationResult; +} & { + [A in WpAccount$systemAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -150,100 +172,116 @@ export type Projection = { application$system?: Application.Selection & { $entity: "application"; }; - application$system$$aggr?: Application.Aggregation & { - $entity: "application"; - }; domain$system?: Domain.Selection & { $entity: "domain"; }; - domain$system$$aggr?: Domain.Aggregation & { - $entity: "domain"; - }; messageSystem$system?: MessageSystem.Selection & { $entity: "messageSystem"; }; - messageSystem$system$$aggr?: MessageSystem.Aggregation & { - $entity: "messageSystem"; - }; passport$system?: Passport.Selection & { $entity: "passport"; }; - passport$system$$aggr?: Passport.Aggregation & { - $entity: "passport"; - }; smsTemplate$system?: SmsTemplate.Selection & { $entity: "smsTemplate"; }; - smsTemplate$system$$aggr?: SmsTemplate.Aggregation & { - $entity: "smsTemplate"; - }; userSystem$system?: UserSystem.Selection & { $entity: "userSystem"; }; - userSystem$system$$aggr?: UserSystem.Aggregation & { - $entity: "userSystem"; - }; account$ofSystem?: Account.Selection & { $entity: "account"; }; - account$ofSystem$$aggr?: Account.Aggregation & { - $entity: "account"; - }; account$entity?: Account.Selection & { $entity: "account"; }; - account$entity$$aggr?: Account.Aggregation & { - $entity: "account"; - }; offlineAccount$system?: OfflineAccount.Selection & { $entity: "offlineAccount"; }; - offlineAccount$system$$aggr?: OfflineAccount.Aggregation & { - $entity: "offlineAccount"; - }; order$system?: Order.Selection & { $entity: "order"; }; - order$system$$aggr?: Order.Aggregation & { - $entity: "order"; - }; sysAccountMove$system?: SysAccountMove.Selection & { $entity: "sysAccountMove"; }; - sysAccountMove$system$$aggr?: SysAccountMove.Aggregation & { - $entity: "sysAccountMove"; - }; wechatPay$system?: WechatPay.Selection & { $entity: "wechatPay"; }; - wechatPay$system$$aggr?: WechatPay.Aggregation & { - $entity: "wechatPay"; - }; withdrawAccount$ofSystem?: WithdrawAccount.Selection & { $entity: "withdrawAccount"; }; - withdrawAccount$ofSystem$$aggr?: WithdrawAccount.Aggregation & { - $entity: "withdrawAccount"; - }; withdrawAccount$entity?: WithdrawAccount.Selection & { $entity: "withdrawAccount"; }; - withdrawAccount$entity$$aggr?: WithdrawAccount.Aggregation & { - $entity: "withdrawAccount"; - }; withdrawChannel$system?: WithdrawChannel.Selection & { $entity: "withdrawChannel"; }; - withdrawChannel$system$$aggr?: WithdrawChannel.Aggregation & { - $entity: "withdrawChannel"; - }; wpAccount$system?: WpAccount.Selection & { $entity: "wpAccount"; }; - wpAccount$system$$aggr?: WpAccount.Aggregation & { +} & Partial> & { + [A in Application$systemAggr]?: Application.Aggregation & { + $entity: "application"; + }; +} & { + [A in Domain$systemAggr]?: Domain.Aggregation & { + $entity: "domain"; + }; +} & { + [A in MessageSystem$systemAggr]?: MessageSystem.Aggregation & { + $entity: "messageSystem"; + }; +} & { + [A in Passport$systemAggr]?: Passport.Aggregation & { + $entity: "passport"; + }; +} & { + [A in SmsTemplate$systemAggr]?: SmsTemplate.Aggregation & { + $entity: "smsTemplate"; + }; +} & { + [A in UserSystem$systemAggr]?: UserSystem.Aggregation & { + $entity: "userSystem"; + }; +} & { + [A in Account$ofSystemAggr]?: Account.Aggregation & { + $entity: "account"; + }; +} & { + [A in Account$entityAggr]?: Account.Aggregation & { + $entity: "account"; + }; +} & { + [A in OfflineAccount$systemAggr]?: OfflineAccount.Aggregation & { + $entity: "offlineAccount"; + }; +} & { + [A in Order$systemAggr]?: Order.Aggregation & { + $entity: "order"; + }; +} & { + [A in SysAccountMove$systemAggr]?: SysAccountMove.Aggregation & { + $entity: "sysAccountMove"; + }; +} & { + [A in WechatPay$systemAggr]?: WechatPay.Aggregation & { + $entity: "wechatPay"; + }; +} & { + [A in WithdrawAccount$ofSystemAggr]?: WithdrawAccount.Aggregation & { + $entity: "withdrawAccount"; + }; +} & { + [A in WithdrawAccount$entityAggr]?: WithdrawAccount.Aggregation & { + $entity: "withdrawAccount"; + }; +} & { + [A in WithdrawChannel$systemAggr]?: WithdrawChannel.Aggregation & { + $entity: "withdrawChannel"; + }; +} & { + [A in WpAccount$systemAggr]?: WpAccount.Aggregation & { $entity: "wpAccount"; }; -} & Partial>; +}; type SystemIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/ToDo/Schema.d.ts b/es/oak-app-domain/ToDo/Schema.d.ts index 70ff28bb..46f91ad7 100644 --- a/es/oak-app-domain/ToDo/Schema.d.ts +++ b/es/oak-app-domain/ToDo/Schema.d.ts @@ -23,22 +23,17 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - title: Text; - description?: Text | null; - targetEntity: String<32>; - targetFilter: Object; - action: String<32>; - redirectTo: RedirectToProps; - entity: String<32>; - entityId: String<64>; - iState?: IState | null; +type Relation$entityAggr = "relation$entity$$aggr" | "relation$entity$$0$$aggr" | "relation$entity$$1$$aggr" | "relation$entity$$2$$aggr" | "relation$entity$$3$$aggr" | "relation$entity$$4$$aggr" | "relation$entity$$5$$aggr" | "relation$entity$$6$$aggr" | "relation$entity$$7$$aggr" | "relation$entity$$8$$aggr" | "relation$entity$$9$$aggr"; +type UserRelation$entityAggr = "userRelation$entity$$aggr" | "userRelation$entity$$0$$aggr" | "userRelation$entity$$1$$aggr" | "userRelation$entity$$2$$aggr" | "userRelation$entity$$3$$aggr" | "userRelation$entity$$4$$aggr" | "userRelation$entity$$5$$aggr" | "userRelation$entity$$6$$aggr" | "userRelation$entity$$7$$aggr" | "userRelation$entity$$8$$aggr" | "userRelation$entity$$9$$aggr"; +export type Schema = OpSchema & { relation$entity?: Array; - relation$entity$$aggr?: AggregationResult; userRelation$entity?: Array; - userRelation$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Relation$entityAggr]?: AggregationResult; +} & { + [A in UserRelation$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -77,16 +72,18 @@ export type Projection = { relation$entity?: Relation.Selection & { $entity: "relation"; }; - relation$entity$$aggr?: Relation.Aggregation & { - $entity: "relation"; - }; userRelation$entity?: UserRelation.Selection & { $entity: "userRelation"; }; - userRelation$entity$$aggr?: UserRelation.Aggregation & { +} & Partial> & { + [A in Relation$entityAggr]?: Relation.Aggregation & { + $entity: "relation"; + }; +} & { + [A in UserRelation$entityAggr]?: UserRelation.Aggregation & { $entity: "userRelation"; }; -} & Partial>; +}; type ToDoIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Token/Schema.d.ts b/es/oak-app-domain/Token/Schema.d.ts index 36b49a37..74b8dfb0 100644 --- a/es/oak-app-domain/Token/Schema.d.ts +++ b/es/oak-app-domain/Token/Schema.d.ts @@ -28,18 +28,7 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - applicationId?: ForeignKey<"application"> | null; - entity: "email" | "loginName" | "mobile" | "parasite" | "wechatLogin" | "wechatUser" | string; - entityId: String<64>; - userId?: ForeignKey<"user"> | null; - playerId?: ForeignKey<"user"> | null; - disablesAt?: Datetime | null; - env: Environment; - refreshedAt: Datetime; - value: String<64>; - oldValue?: String<64> | null; - ableState?: AbleState | null; +export type Schema = OpSchema & { application?: Application.Schema | null; user?: User.Schema | null; player?: User.Schema | null; diff --git a/es/oak-app-domain/User/Schema.d.ts b/es/oak-app-domain/User/Schema.d.ts index a91923d8..d5cd3a15 100644 --- a/es/oak-app-domain/User/Schema.d.ts +++ b/es/oak-app-domain/User/Schema.d.ts @@ -53,91 +53,146 @@ export type OpSchema = EntityShape & { userState?: UserState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name?: String<16> | null; - nickname?: String<64> | null; - password?: Text | null; - refId?: ForeignKey<"user"> | null; - passwordSha1?: Text | null; - birth?: Datetime | null; - gender?: ("male" | "female") | null; - idCardType?: ("ID-Card" | "passport" | "Mainland-passport") | null; - idNumber?: String<32> | null; - isRoot?: Boolean | null; - hasPassword?: Boolean | null; - idState?: IdState | null; - userState?: UserState | null; +type Oper$operatorAggr = "oper$operator$$aggr" | "oper$operator$$0$$aggr" | "oper$operator$$1$$aggr" | "oper$operator$$2$$aggr" | "oper$operator$$3$$aggr" | "oper$operator$$4$$aggr" | "oper$operator$$5$$aggr" | "oper$operator$$6$$aggr" | "oper$operator$$7$$aggr" | "oper$operator$$8$$aggr" | "oper$operator$$9$$aggr"; +type User$refAggr = "user$ref$$aggr" | "user$ref$$0$$aggr" | "user$ref$$1$$aggr" | "user$ref$$2$$aggr" | "user$ref$$3$$aggr" | "user$ref$$4$$aggr" | "user$ref$$5$$aggr" | "user$ref$$6$$aggr" | "user$ref$$7$$aggr" | "user$ref$$8$$aggr" | "user$ref$$9$$aggr"; +type UserEntityClaim$userAggr = "userEntityClaim$user$$aggr" | "userEntityClaim$user$$0$$aggr" | "userEntityClaim$user$$1$$aggr" | "userEntityClaim$user$$2$$aggr" | "userEntityClaim$user$$3$$aggr" | "userEntityClaim$user$$4$$aggr" | "userEntityClaim$user$$5$$aggr" | "userEntityClaim$user$$6$$aggr" | "userEntityClaim$user$$7$$aggr" | "userEntityClaim$user$$8$$aggr" | "userEntityClaim$user$$9$$aggr"; +type UserRelation$userAggr = "userRelation$user$$aggr" | "userRelation$user$$0$$aggr" | "userRelation$user$$1$$aggr" | "userRelation$user$$2$$aggr" | "userRelation$user$$3$$aggr" | "userRelation$user$$4$$aggr" | "userRelation$user$$5$$aggr" | "userRelation$user$$6$$aggr" | "userRelation$user$$7$$aggr" | "userRelation$user$$8$$aggr" | "userRelation$user$$9$$aggr"; +type ChangePasswordTemp$userAggr = "changePasswordTemp$user$$aggr" | "changePasswordTemp$user$$0$$aggr" | "changePasswordTemp$user$$1$$aggr" | "changePasswordTemp$user$$2$$aggr" | "changePasswordTemp$user$$3$$aggr" | "changePasswordTemp$user$$4$$aggr" | "changePasswordTemp$user$$5$$aggr" | "changePasswordTemp$user$$6$$aggr" | "changePasswordTemp$user$$7$$aggr" | "changePasswordTemp$user$$8$$aggr" | "changePasswordTemp$user$$9$$aggr"; +type Email$userAggr = "email$user$$aggr" | "email$user$$0$$aggr" | "email$user$$1$$aggr" | "email$user$$2$$aggr" | "email$user$$3$$aggr" | "email$user$$4$$aggr" | "email$user$$5$$aggr" | "email$user$$6$$aggr" | "email$user$$7$$aggr" | "email$user$$8$$aggr" | "email$user$$9$$aggr"; +type LoginName$userAggr = "loginName$user$$aggr" | "loginName$user$$0$$aggr" | "loginName$user$$1$$aggr" | "loginName$user$$2$$aggr" | "loginName$user$$3$$aggr" | "loginName$user$$4$$aggr" | "loginName$user$$5$$aggr" | "loginName$user$$6$$aggr" | "loginName$user$$7$$aggr" | "loginName$user$$8$$aggr" | "loginName$user$$9$$aggr"; +type Message$userAggr = "message$user$$aggr" | "message$user$$0$$aggr" | "message$user$$1$$aggr" | "message$user$$2$$aggr" | "message$user$$3$$aggr" | "message$user$$4$$aggr" | "message$user$$5$$aggr" | "message$user$$6$$aggr" | "message$user$$7$$aggr" | "message$user$$8$$aggr" | "message$user$$9$$aggr"; +type Mobile$userAggr = "mobile$user$$aggr" | "mobile$user$$0$$aggr" | "mobile$user$$1$$aggr" | "mobile$user$$2$$aggr" | "mobile$user$$3$$aggr" | "mobile$user$$4$$aggr" | "mobile$user$$5$$aggr" | "mobile$user$$6$$aggr" | "mobile$user$$7$$aggr" | "mobile$user$$8$$aggr" | "mobile$user$$9$$aggr"; +type Parasite$userAggr = "parasite$user$$aggr" | "parasite$user$$0$$aggr" | "parasite$user$$1$$aggr" | "parasite$user$$2$$aggr" | "parasite$user$$3$$aggr" | "parasite$user$$4$$aggr" | "parasite$user$$5$$aggr" | "parasite$user$$6$$aggr" | "parasite$user$$7$$aggr" | "parasite$user$$8$$aggr" | "parasite$user$$9$$aggr"; +type ReadRemark$userAggr = "readRemark$user$$aggr" | "readRemark$user$$0$$aggr" | "readRemark$user$$1$$aggr" | "readRemark$user$$2$$aggr" | "readRemark$user$$3$$aggr" | "readRemark$user$$4$$aggr" | "readRemark$user$$5$$aggr" | "readRemark$user$$6$$aggr" | "readRemark$user$$7$$aggr" | "readRemark$user$$8$$aggr" | "readRemark$user$$9$$aggr"; +type Session$userAggr = "session$user$$aggr" | "session$user$$0$$aggr" | "session$user$$1$$aggr" | "session$user$$2$$aggr" | "session$user$$3$$aggr" | "session$user$$4$$aggr" | "session$user$$5$$aggr" | "session$user$$6$$aggr" | "session$user$$7$$aggr" | "session$user$$8$$aggr" | "session$user$$9$$aggr"; +type SessionMessage$userAggr = "sessionMessage$user$$aggr" | "sessionMessage$user$$0$$aggr" | "sessionMessage$user$$1$$aggr" | "sessionMessage$user$$2$$aggr" | "sessionMessage$user$$3$$aggr" | "sessionMessage$user$$4$$aggr" | "sessionMessage$user$$5$$aggr" | "sessionMessage$user$$6$$aggr" | "sessionMessage$user$$7$$aggr" | "sessionMessage$user$$8$$aggr" | "sessionMessage$user$$9$$aggr"; +type Token$userAggr = "token$user$$aggr" | "token$user$$0$$aggr" | "token$user$$1$$aggr" | "token$user$$2$$aggr" | "token$user$$3$$aggr" | "token$user$$4$$aggr" | "token$user$$5$$aggr" | "token$user$$6$$aggr" | "token$user$$7$$aggr" | "token$user$$8$$aggr" | "token$user$$9$$aggr"; +type Token$playerAggr = "token$player$$aggr" | "token$player$$0$$aggr" | "token$player$$1$$aggr" | "token$player$$2$$aggr" | "token$player$$3$$aggr" | "token$player$$4$$aggr" | "token$player$$5$$aggr" | "token$player$$6$$aggr" | "token$player$$7$$aggr" | "token$player$$8$$aggr" | "token$player$$9$$aggr"; +type UserEntityGrant$granterAggr = "userEntityGrant$granter$$aggr" | "userEntityGrant$granter$$0$$aggr" | "userEntityGrant$granter$$1$$aggr" | "userEntityGrant$granter$$2$$aggr" | "userEntityGrant$granter$$3$$aggr" | "userEntityGrant$granter$$4$$aggr" | "userEntityGrant$granter$$5$$aggr" | "userEntityGrant$granter$$6$$aggr" | "userEntityGrant$granter$$7$$aggr" | "userEntityGrant$granter$$8$$aggr" | "userEntityGrant$granter$$9$$aggr"; +type UserSystem$userAggr = "userSystem$user$$aggr" | "userSystem$user$$0$$aggr" | "userSystem$user$$1$$aggr" | "userSystem$user$$2$$aggr" | "userSystem$user$$3$$aggr" | "userSystem$user$$4$$aggr" | "userSystem$user$$5$$aggr" | "userSystem$user$$6$$aggr" | "userSystem$user$$7$$aggr" | "userSystem$user$$8$$aggr" | "userSystem$user$$9$$aggr"; +type WechatLogin$userAggr = "wechatLogin$user$$aggr" | "wechatLogin$user$$0$$aggr" | "wechatLogin$user$$1$$aggr" | "wechatLogin$user$$2$$aggr" | "wechatLogin$user$$3$$aggr" | "wechatLogin$user$$4$$aggr" | "wechatLogin$user$$5$$aggr" | "wechatLogin$user$$6$$aggr" | "wechatLogin$user$$7$$aggr" | "wechatLogin$user$$8$$aggr" | "wechatLogin$user$$9$$aggr"; +type WechatUser$userAggr = "wechatUser$user$$aggr" | "wechatUser$user$$0$$aggr" | "wechatUser$user$$1$$aggr" | "wechatUser$user$$2$$aggr" | "wechatUser$user$$3$$aggr" | "wechatUser$user$$4$$aggr" | "wechatUser$user$$5$$aggr" | "wechatUser$user$$6$$aggr" | "wechatUser$user$$7$$aggr" | "wechatUser$user$$8$$aggr" | "wechatUser$user$$9$$aggr"; +type Deposit$creatorAggr = "deposit$creator$$aggr" | "deposit$creator$$0$$aggr" | "deposit$creator$$1$$aggr" | "deposit$creator$$2$$aggr" | "deposit$creator$$3$$aggr" | "deposit$creator$$4$$aggr" | "deposit$creator$$5$$aggr" | "deposit$creator$$6$$aggr" | "deposit$creator$$7$$aggr" | "deposit$creator$$8$$aggr" | "deposit$creator$$9$$aggr"; +type Order$creatorAggr = "order$creator$$aggr" | "order$creator$$0$$aggr" | "order$creator$$1$$aggr" | "order$creator$$2$$aggr" | "order$creator$$3$$aggr" | "order$creator$$4$$aggr" | "order$creator$$5$$aggr" | "order$creator$$6$$aggr" | "order$creator$$7$$aggr" | "order$creator$$8$$aggr" | "order$creator$$9$$aggr"; +type Pay$creatorAggr = "pay$creator$$aggr" | "pay$creator$$0$$aggr" | "pay$creator$$1$$aggr" | "pay$creator$$2$$aggr" | "pay$creator$$3$$aggr" | "pay$creator$$4$$aggr" | "pay$creator$$5$$aggr" | "pay$creator$$6$$aggr" | "pay$creator$$7$$aggr" | "pay$creator$$8$$aggr" | "pay$creator$$9$$aggr"; +type Refund$creatorAggr = "refund$creator$$aggr" | "refund$creator$$0$$aggr" | "refund$creator$$1$$aggr" | "refund$creator$$2$$aggr" | "refund$creator$$3$$aggr" | "refund$creator$$4$$aggr" | "refund$creator$$5$$aggr" | "refund$creator$$6$$aggr" | "refund$creator$$7$$aggr" | "refund$creator$$8$$aggr" | "refund$creator$$9$$aggr"; +type SysAccountMove$operatorAggr = "sysAccountMove$operator$$aggr" | "sysAccountMove$operator$$0$$aggr" | "sysAccountMove$operator$$1$$aggr" | "sysAccountMove$operator$$2$$aggr" | "sysAccountMove$operator$$3$$aggr" | "sysAccountMove$operator$$4$$aggr" | "sysAccountMove$operator$$5$$aggr" | "sysAccountMove$operator$$6$$aggr" | "sysAccountMove$operator$$7$$aggr" | "sysAccountMove$operator$$8$$aggr" | "sysAccountMove$operator$$9$$aggr"; +type Withdraw$creatorAggr = "withdraw$creator$$aggr" | "withdraw$creator$$0$$aggr" | "withdraw$creator$$1$$aggr" | "withdraw$creator$$2$$aggr" | "withdraw$creator$$3$$aggr" | "withdraw$creator$$4$$aggr" | "withdraw$creator$$5$$aggr" | "withdraw$creator$$6$$aggr" | "withdraw$creator$$7$$aggr" | "withdraw$creator$$8$$aggr" | "withdraw$creator$$9$$aggr"; +type WithdrawTransfer$operatorAggr = "withdrawTransfer$operator$$aggr" | "withdrawTransfer$operator$$0$$aggr" | "withdrawTransfer$operator$$1$$aggr" | "withdrawTransfer$operator$$2$$aggr" | "withdrawTransfer$operator$$3$$aggr" | "withdrawTransfer$operator$$4$$aggr" | "withdrawTransfer$operator$$5$$aggr" | "withdrawTransfer$operator$$6$$aggr" | "withdrawTransfer$operator$$7$$aggr" | "withdrawTransfer$operator$$8$$aggr" | "withdrawTransfer$operator$$9$$aggr"; +type WithdrawTransfer$creatorAggr = "withdrawTransfer$creator$$aggr" | "withdrawTransfer$creator$$0$$aggr" | "withdrawTransfer$creator$$1$$aggr" | "withdrawTransfer$creator$$2$$aggr" | "withdrawTransfer$creator$$3$$aggr" | "withdrawTransfer$creator$$4$$aggr" | "withdrawTransfer$creator$$5$$aggr" | "withdrawTransfer$creator$$6$$aggr" | "withdrawTransfer$creator$$7$$aggr" | "withdrawTransfer$creator$$8$$aggr" | "withdrawTransfer$creator$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type ExtraFile$entityAggr = "extraFile$entity$$aggr" | "extraFile$entity$$0$$aggr" | "extraFile$entity$$1$$aggr" | "extraFile$entity$$2$$aggr" | "extraFile$entity$$3$$aggr" | "extraFile$entity$$4$$aggr" | "extraFile$entity$$5$$aggr" | "extraFile$entity$$6$$aggr" | "extraFile$entity$$7$$aggr" | "extraFile$entity$$8$$aggr" | "extraFile$entity$$9$$aggr"; +type WechatQrCode$entityAggr = "wechatQrCode$entity$$aggr" | "wechatQrCode$entity$$0$$aggr" | "wechatQrCode$entity$$1$$aggr" | "wechatQrCode$entity$$2$$aggr" | "wechatQrCode$entity$$3$$aggr" | "wechatQrCode$entity$$4$$aggr" | "wechatQrCode$entity$$5$$aggr" | "wechatQrCode$entity$$6$$aggr" | "wechatQrCode$entity$$7$$aggr" | "wechatQrCode$entity$$8$$aggr" | "wechatQrCode$entity$$9$$aggr"; +type Address$entityAggr = "address$entity$$aggr" | "address$entity$$0$$aggr" | "address$entity$$1$$aggr" | "address$entity$$2$$aggr" | "address$entity$$3$$aggr" | "address$entity$$4$$aggr" | "address$entity$$5$$aggr" | "address$entity$$6$$aggr" | "address$entity$$7$$aggr" | "address$entity$$8$$aggr" | "address$entity$$9$$aggr"; +type Account$entityAggr = "account$entity$$aggr" | "account$entity$$0$$aggr" | "account$entity$$1$$aggr" | "account$entity$$2$$aggr" | "account$entity$$3$$aggr" | "account$entity$$4$$aggr" | "account$entity$$5$$aggr" | "account$entity$$6$$aggr" | "account$entity$$7$$aggr" | "account$entity$$8$$aggr" | "account$entity$$9$$aggr"; +type WithdrawAccount$entityAggr = "withdrawAccount$entity$$aggr" | "withdrawAccount$entity$$0$$aggr" | "withdrawAccount$entity$$1$$aggr" | "withdrawAccount$entity$$2$$aggr" | "withdrawAccount$entity$$3$$aggr" | "withdrawAccount$entity$$4$$aggr" | "withdrawAccount$entity$$5$$aggr" | "withdrawAccount$entity$$6$$aggr" | "withdrawAccount$entity$$7$$aggr" | "withdrawAccount$entity$$8$$aggr" | "withdrawAccount$entity$$9$$aggr"; +export type Schema = OpSchema & { ref?: Schema | null; oper$operator?: Array; - oper$operator$$aggr?: AggregationResult; user$ref?: Array; - user$ref$$aggr?: AggregationResult; userEntityClaim$user?: Array; - userEntityClaim$user$$aggr?: AggregationResult; userRelation$user?: Array; - userRelation$user$$aggr?: AggregationResult; changePasswordTemp$user?: Array; - changePasswordTemp$user$$aggr?: AggregationResult; email$user?: Array; - email$user$$aggr?: AggregationResult; loginName$user?: Array; - loginName$user$$aggr?: AggregationResult; message$user?: Array; - message$user$$aggr?: AggregationResult; mobile$user?: Array; - mobile$user$$aggr?: AggregationResult; parasite$user?: Array; - parasite$user$$aggr?: AggregationResult; readRemark$user?: Array; - readRemark$user$$aggr?: AggregationResult; session$user?: Array; - session$user$$aggr?: AggregationResult; sessionMessage$user?: Array; - sessionMessage$user$$aggr?: AggregationResult; token$user?: Array; - token$user$$aggr?: AggregationResult; token$player?: Array; - token$player$$aggr?: AggregationResult; userEntityGrant$granter?: Array; - userEntityGrant$granter$$aggr?: AggregationResult; userSystem$user?: Array; - userSystem$user$$aggr?: AggregationResult; wechatLogin$user?: Array; - wechatLogin$user$$aggr?: AggregationResult; wechatUser$user?: Array; - wechatUser$user$$aggr?: AggregationResult; deposit$creator?: Array; - deposit$creator$$aggr?: AggregationResult; order$creator?: Array; - order$creator$$aggr?: AggregationResult; pay$creator?: Array; - pay$creator$$aggr?: AggregationResult; refund$creator?: Array; - refund$creator$$aggr?: AggregationResult; sysAccountMove$operator?: Array; - sysAccountMove$operator$$aggr?: AggregationResult; withdraw$creator?: Array; - withdraw$creator$$aggr?: AggregationResult; withdrawTransfer$operator?: Array; - withdrawTransfer$operator$$aggr?: AggregationResult; withdrawTransfer$creator?: Array; - withdrawTransfer$creator$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; extraFile$entity?: Array; - extraFile$entity$$aggr?: AggregationResult; wechatQrCode$entity?: Array; - wechatQrCode$entity$$aggr?: AggregationResult; address$entity?: Array; - address$entity$$aggr?: AggregationResult; account$entity?: Array; - account$entity$$aggr?: AggregationResult; withdrawAccount$entity?: Array; - withdrawAccount$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Oper$operatorAggr]?: AggregationResult; +} & { + [A in User$refAggr]?: AggregationResult; +} & { + [A in UserEntityClaim$userAggr]?: AggregationResult; +} & { + [A in UserRelation$userAggr]?: AggregationResult; +} & { + [A in ChangePasswordTemp$userAggr]?: AggregationResult; +} & { + [A in Email$userAggr]?: AggregationResult; +} & { + [A in LoginName$userAggr]?: AggregationResult; +} & { + [A in Message$userAggr]?: AggregationResult; +} & { + [A in Mobile$userAggr]?: AggregationResult; +} & { + [A in Parasite$userAggr]?: AggregationResult; +} & { + [A in ReadRemark$userAggr]?: AggregationResult; +} & { + [A in Session$userAggr]?: AggregationResult; +} & { + [A in SessionMessage$userAggr]?: AggregationResult; +} & { + [A in Token$userAggr]?: AggregationResult; +} & { + [A in Token$playerAggr]?: AggregationResult; +} & { + [A in UserEntityGrant$granterAggr]?: AggregationResult; +} & { + [A in UserSystem$userAggr]?: AggregationResult; +} & { + [A in WechatLogin$userAggr]?: AggregationResult; +} & { + [A in WechatUser$userAggr]?: AggregationResult; +} & { + [A in Deposit$creatorAggr]?: AggregationResult; +} & { + [A in Order$creatorAggr]?: AggregationResult; +} & { + [A in Pay$creatorAggr]?: AggregationResult; +} & { + [A in Refund$creatorAggr]?: AggregationResult; +} & { + [A in SysAccountMove$operatorAggr]?: AggregationResult; +} & { + [A in Withdraw$creatorAggr]?: AggregationResult; +} & { + [A in WithdrawTransfer$operatorAggr]?: AggregationResult; +} & { + [A in WithdrawTransfer$creatorAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in ExtraFile$entityAggr]?: AggregationResult; +} & { + [A in WechatQrCode$entityAggr]?: AggregationResult; +} & { + [A in Address$entityAggr]?: AggregationResult; +} & { + [A in Account$entityAggr]?: AggregationResult; +} & { + [A in WithdrawAccount$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -218,208 +273,242 @@ export type Projection = { oper$operator?: Oper.Selection & { $entity: "oper"; }; - oper$operator$$aggr?: Oper.Aggregation & { - $entity: "oper"; - }; user$ref?: Selection & { $entity: "user"; }; - user$ref$$aggr?: Aggregation & { - $entity: "user"; - }; userEntityClaim$user?: UserEntityClaim.Selection & { $entity: "userEntityClaim"; }; - userEntityClaim$user$$aggr?: UserEntityClaim.Aggregation & { - $entity: "userEntityClaim"; - }; userRelation$user?: UserRelation.Selection & { $entity: "userRelation"; }; - userRelation$user$$aggr?: UserRelation.Aggregation & { - $entity: "userRelation"; - }; changePasswordTemp$user?: ChangePasswordTemp.Selection & { $entity: "changePasswordTemp"; }; - changePasswordTemp$user$$aggr?: ChangePasswordTemp.Aggregation & { - $entity: "changePasswordTemp"; - }; email$user?: Email.Selection & { $entity: "email"; }; - email$user$$aggr?: Email.Aggregation & { - $entity: "email"; - }; loginName$user?: LoginName.Selection & { $entity: "loginName"; }; - loginName$user$$aggr?: LoginName.Aggregation & { - $entity: "loginName"; - }; message$user?: Message.Selection & { $entity: "message"; }; - message$user$$aggr?: Message.Aggregation & { - $entity: "message"; - }; mobile$user?: Mobile.Selection & { $entity: "mobile"; }; - mobile$user$$aggr?: Mobile.Aggregation & { - $entity: "mobile"; - }; parasite$user?: Parasite.Selection & { $entity: "parasite"; }; - parasite$user$$aggr?: Parasite.Aggregation & { - $entity: "parasite"; - }; readRemark$user?: ReadRemark.Selection & { $entity: "readRemark"; }; - readRemark$user$$aggr?: ReadRemark.Aggregation & { - $entity: "readRemark"; - }; session$user?: Session.Selection & { $entity: "session"; }; - session$user$$aggr?: Session.Aggregation & { - $entity: "session"; - }; sessionMessage$user?: SessionMessage.Selection & { $entity: "sessionMessage"; }; - sessionMessage$user$$aggr?: SessionMessage.Aggregation & { - $entity: "sessionMessage"; - }; token$user?: Token.Selection & { $entity: "token"; }; - token$user$$aggr?: Token.Aggregation & { - $entity: "token"; - }; token$player?: Token.Selection & { $entity: "token"; }; - token$player$$aggr?: Token.Aggregation & { - $entity: "token"; - }; userEntityGrant$granter?: UserEntityGrant.Selection & { $entity: "userEntityGrant"; }; - userEntityGrant$granter$$aggr?: UserEntityGrant.Aggregation & { - $entity: "userEntityGrant"; - }; userSystem$user?: UserSystem.Selection & { $entity: "userSystem"; }; - userSystem$user$$aggr?: UserSystem.Aggregation & { - $entity: "userSystem"; - }; wechatLogin$user?: WechatLogin.Selection & { $entity: "wechatLogin"; }; - wechatLogin$user$$aggr?: WechatLogin.Aggregation & { - $entity: "wechatLogin"; - }; wechatUser$user?: WechatUser.Selection & { $entity: "wechatUser"; }; - wechatUser$user$$aggr?: WechatUser.Aggregation & { - $entity: "wechatUser"; - }; deposit$creator?: Deposit.Selection & { $entity: "deposit"; }; - deposit$creator$$aggr?: Deposit.Aggregation & { - $entity: "deposit"; - }; order$creator?: Order.Selection & { $entity: "order"; }; - order$creator$$aggr?: Order.Aggregation & { - $entity: "order"; - }; pay$creator?: Pay.Selection & { $entity: "pay"; }; - pay$creator$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; refund$creator?: Refund.Selection & { $entity: "refund"; }; - refund$creator$$aggr?: Refund.Aggregation & { - $entity: "refund"; - }; sysAccountMove$operator?: SysAccountMove.Selection & { $entity: "sysAccountMove"; }; - sysAccountMove$operator$$aggr?: SysAccountMove.Aggregation & { - $entity: "sysAccountMove"; - }; withdraw$creator?: Withdraw.Selection & { $entity: "withdraw"; }; - withdraw$creator$$aggr?: Withdraw.Aggregation & { - $entity: "withdraw"; - }; withdrawTransfer$operator?: WithdrawTransfer.Selection & { $entity: "withdrawTransfer"; }; - withdrawTransfer$operator$$aggr?: WithdrawTransfer.Aggregation & { - $entity: "withdrawTransfer"; - }; withdrawTransfer$creator?: WithdrawTransfer.Selection & { $entity: "withdrawTransfer"; }; - withdrawTransfer$creator$$aggr?: WithdrawTransfer.Aggregation & { - $entity: "withdrawTransfer"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; extraFile$entity?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$entity$$aggr?: ExtraFile.Aggregation & { - $entity: "extraFile"; - }; wechatQrCode$entity?: WechatQrCode.Selection & { $entity: "wechatQrCode"; }; - wechatQrCode$entity$$aggr?: WechatQrCode.Aggregation & { - $entity: "wechatQrCode"; - }; address$entity?: Address.Selection & { $entity: "address"; }; - address$entity$$aggr?: Address.Aggregation & { - $entity: "address"; - }; account$entity?: Account.Selection & { $entity: "account"; }; - account$entity$$aggr?: Account.Aggregation & { - $entity: "account"; - }; withdrawAccount$entity?: WithdrawAccount.Selection & { $entity: "withdrawAccount"; }; - withdrawAccount$entity$$aggr?: WithdrawAccount.Aggregation & { +} & Partial> & { + [A in Oper$operatorAggr]?: Oper.Aggregation & { + $entity: "oper"; + }; +} & { + [A in User$refAggr]?: Aggregation & { + $entity: "user"; + }; +} & { + [A in UserEntityClaim$userAggr]?: UserEntityClaim.Aggregation & { + $entity: "userEntityClaim"; + }; +} & { + [A in UserRelation$userAggr]?: UserRelation.Aggregation & { + $entity: "userRelation"; + }; +} & { + [A in ChangePasswordTemp$userAggr]?: ChangePasswordTemp.Aggregation & { + $entity: "changePasswordTemp"; + }; +} & { + [A in Email$userAggr]?: Email.Aggregation & { + $entity: "email"; + }; +} & { + [A in LoginName$userAggr]?: LoginName.Aggregation & { + $entity: "loginName"; + }; +} & { + [A in Message$userAggr]?: Message.Aggregation & { + $entity: "message"; + }; +} & { + [A in Mobile$userAggr]?: Mobile.Aggregation & { + $entity: "mobile"; + }; +} & { + [A in Parasite$userAggr]?: Parasite.Aggregation & { + $entity: "parasite"; + }; +} & { + [A in ReadRemark$userAggr]?: ReadRemark.Aggregation & { + $entity: "readRemark"; + }; +} & { + [A in Session$userAggr]?: Session.Aggregation & { + $entity: "session"; + }; +} & { + [A in SessionMessage$userAggr]?: SessionMessage.Aggregation & { + $entity: "sessionMessage"; + }; +} & { + [A in Token$userAggr]?: Token.Aggregation & { + $entity: "token"; + }; +} & { + [A in Token$playerAggr]?: Token.Aggregation & { + $entity: "token"; + }; +} & { + [A in UserEntityGrant$granterAggr]?: UserEntityGrant.Aggregation & { + $entity: "userEntityGrant"; + }; +} & { + [A in UserSystem$userAggr]?: UserSystem.Aggregation & { + $entity: "userSystem"; + }; +} & { + [A in WechatLogin$userAggr]?: WechatLogin.Aggregation & { + $entity: "wechatLogin"; + }; +} & { + [A in WechatUser$userAggr]?: WechatUser.Aggregation & { + $entity: "wechatUser"; + }; +} & { + [A in Deposit$creatorAggr]?: Deposit.Aggregation & { + $entity: "deposit"; + }; +} & { + [A in Order$creatorAggr]?: Order.Aggregation & { + $entity: "order"; + }; +} & { + [A in Pay$creatorAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in Refund$creatorAggr]?: Refund.Aggregation & { + $entity: "refund"; + }; +} & { + [A in SysAccountMove$operatorAggr]?: SysAccountMove.Aggregation & { + $entity: "sysAccountMove"; + }; +} & { + [A in Withdraw$creatorAggr]?: Withdraw.Aggregation & { + $entity: "withdraw"; + }; +} & { + [A in WithdrawTransfer$operatorAggr]?: WithdrawTransfer.Aggregation & { + $entity: "withdrawTransfer"; + }; +} & { + [A in WithdrawTransfer$creatorAggr]?: WithdrawTransfer.Aggregation & { + $entity: "withdrawTransfer"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in ExtraFile$entityAggr]?: ExtraFile.Aggregation & { + $entity: "extraFile"; + }; +} & { + [A in WechatQrCode$entityAggr]?: WechatQrCode.Aggregation & { + $entity: "wechatQrCode"; + }; +} & { + [A in Address$entityAggr]?: Address.Aggregation & { + $entity: "address"; + }; +} & { + [A in Account$entityAggr]?: Account.Aggregation & { + $entity: "account"; + }; +} & { + [A in WithdrawAccount$entityAggr]?: WithdrawAccount.Aggregation & { $entity: "withdrawAccount"; }; -} & Partial>; +}; type UserIdProjection = OneOf<{ id: number; refId: number; diff --git a/es/oak-app-domain/UserEntityClaim/Schema.d.ts b/es/oak-app-domain/UserEntityClaim/Schema.d.ts index d9378c5e..b6d55dc1 100644 --- a/es/oak-app-domain/UserEntityClaim/Schema.d.ts +++ b/es/oak-app-domain/UserEntityClaim/Schema.d.ts @@ -16,12 +16,7 @@ export type OpSchema = EntityShape & { userRelationId: ForeignKey<"userRelation">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - uegId: ForeignKey<"userEntityGrant">; - userId: ForeignKey<"user">; - relationId: ForeignKey<"relation">; - claimEntityId: String<64>; - userRelationId: ForeignKey<"userRelation">; +export type Schema = OpSchema & { ueg: UserEntityGrant.Schema; user: User.Schema; relation: Relation.Schema; diff --git a/es/oak-app-domain/UserEntityGrant/Schema.d.ts b/es/oak-app-domain/UserEntityGrant/Schema.d.ts index 0475893b..9f4d8790 100644 --- a/es/oak-app-domain/UserEntityGrant/Schema.d.ts +++ b/es/oak-app-domain/UserEntityGrant/Schema.d.ts @@ -35,30 +35,18 @@ export type OpSchema = EntityShape & { claimUrl: String<128>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - relationEntity: String<32>; - relationEntityFilter: Object; - relationIds: RelationIds; - entity: String<32>; - entityId: String<64>; - type: "grant" | "transfer"; - rule: Rule; - ruleOnRow: Rule; - multiple?: Boolean | null; - remark?: Text | null; - granterId: ForeignKey<"user">; - qrCodeType: QrCodeType; - expiresAt?: Datetime | null; - expired?: Boolean | null; - redirectTo?: RedirectToProps | null; - claimUrl: String<128>; +type UserEntityClaim$uegAggr = "userEntityClaim$ueg$$aggr" | "userEntityClaim$ueg$$0$$aggr" | "userEntityClaim$ueg$$1$$aggr" | "userEntityClaim$ueg$$2$$aggr" | "userEntityClaim$ueg$$3$$aggr" | "userEntityClaim$ueg$$4$$aggr" | "userEntityClaim$ueg$$5$$aggr" | "userEntityClaim$ueg$$6$$aggr" | "userEntityClaim$ueg$$7$$aggr" | "userEntityClaim$ueg$$8$$aggr" | "userEntityClaim$ueg$$9$$aggr"; +type WechatQrCode$entityAggr = "wechatQrCode$entity$$aggr" | "wechatQrCode$entity$$0$$aggr" | "wechatQrCode$entity$$1$$aggr" | "wechatQrCode$entity$$2$$aggr" | "wechatQrCode$entity$$3$$aggr" | "wechatQrCode$entity$$4$$aggr" | "wechatQrCode$entity$$5$$aggr" | "wechatQrCode$entity$$6$$aggr" | "wechatQrCode$entity$$7$$aggr" | "wechatQrCode$entity$$8$$aggr" | "wechatQrCode$entity$$9$$aggr"; +export type Schema = OpSchema & { granter: User.Schema; userEntityClaim$ueg?: Array; - userEntityClaim$ueg$$aggr?: AggregationResult; wechatQrCode$entity?: Array; - wechatQrCode$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in UserEntityClaim$uegAggr]?: AggregationResult; +} & { + [A in WechatQrCode$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -113,16 +101,18 @@ export type Projection = { userEntityClaim$ueg?: UserEntityClaim.Selection & { $entity: "userEntityClaim"; }; - userEntityClaim$ueg$$aggr?: UserEntityClaim.Aggregation & { - $entity: "userEntityClaim"; - }; wechatQrCode$entity?: WechatQrCode.Selection & { $entity: "wechatQrCode"; }; - wechatQrCode$entity$$aggr?: WechatQrCode.Aggregation & { +} & Partial> & { + [A in UserEntityClaim$uegAggr]?: UserEntityClaim.Aggregation & { + $entity: "userEntityClaim"; + }; +} & { + [A in WechatQrCode$entityAggr]?: WechatQrCode.Aggregation & { $entity: "wechatQrCode"; }; -} & Partial>; +}; type UserEntityGrantIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/UserRelation/Schema.d.ts b/es/oak-app-domain/UserRelation/Schema.d.ts index 8b36141c..35048d2f 100644 --- a/es/oak-app-domain/UserRelation/Schema.d.ts +++ b/es/oak-app-domain/UserRelation/Schema.d.ts @@ -16,19 +16,17 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - relationId: ForeignKey<"relation">; - entity: "session" | "toDo" | string; - entityId: String<64>; +type UserEntityClaim$userRelationAggr = "userEntityClaim$userRelation$$aggr" | "userEntityClaim$userRelation$$0$$aggr" | "userEntityClaim$userRelation$$1$$aggr" | "userEntityClaim$userRelation$$2$$aggr" | "userEntityClaim$userRelation$$3$$aggr" | "userEntityClaim$userRelation$$4$$aggr" | "userEntityClaim$userRelation$$5$$aggr" | "userEntityClaim$userRelation$$6$$aggr" | "userEntityClaim$userRelation$$7$$aggr" | "userEntityClaim$userRelation$$8$$aggr" | "userEntityClaim$userRelation$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; relation: Relation.Schema; session?: Session.Schema; toDo?: ToDo.Schema; userEntityClaim$userRelation?: Array; - userEntityClaim$userRelation$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in UserEntityClaim$userRelationAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -64,10 +62,11 @@ export type Projection = { userEntityClaim$userRelation?: UserEntityClaim.Selection & { $entity: "userEntityClaim"; }; - userEntityClaim$userRelation$$aggr?: UserEntityClaim.Aggregation & { +} & Partial> & { + [A in UserEntityClaim$userRelationAggr]?: UserEntityClaim.Aggregation & { $entity: "userEntityClaim"; }; -} & Partial>; +}; type UserRelationIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/UserSystem/Schema.d.ts b/es/oak-app-domain/UserSystem/Schema.d.ts index 998f1d25..f02073a3 100644 --- a/es/oak-app-domain/UserSystem/Schema.d.ts +++ b/es/oak-app-domain/UserSystem/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - systemId: ForeignKey<"system">; +export type Schema = OpSchema & { user: User.Schema; system: System.Schema; } & { diff --git a/es/oak-app-domain/UserWechatPublicTag/Schema.d.ts b/es/oak-app-domain/UserWechatPublicTag/Schema.d.ts index 3a93ec57..c1aabcad 100644 --- a/es/oak-app-domain/UserWechatPublicTag/Schema.d.ts +++ b/es/oak-app-domain/UserWechatPublicTag/Schema.d.ts @@ -14,12 +14,7 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - wechatPublicTagId: ForeignKey<"wechatPublicTag">; - wechatUserId: ForeignKey<"wechatUser">; - sync: Boolean; - syncAt: Datetime; - iState?: IState | null; +export type Schema = OpSchema & { wechatPublicTag: WechatPublicTag.Schema; wechatUser: WechatUser.Schema; } & { diff --git a/es/oak-app-domain/WechatLogin/Schema.d.ts b/es/oak-app-domain/WechatLogin/Schema.d.ts index 0af54f04..8f8005e5 100644 --- a/es/oak-app-domain/WechatLogin/Schema.d.ts +++ b/es/oak-app-domain/WechatLogin/Schema.d.ts @@ -20,23 +20,19 @@ export type OpSchema = EntityShape & { wechatUserId?: ForeignKey<"wechatUser"> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId?: ForeignKey<"user"> | null; - type: "bind" | "login"; - successed: Boolean; - remark?: Text | null; - qrCodeType: QrCodeType; - expiresAt?: Datetime | null; - expired?: Boolean | null; - wechatUserId?: ForeignKey<"wechatUser"> | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +type WechatQrCode$entityAggr = "wechatQrCode$entity$$aggr" | "wechatQrCode$entity$$0$$aggr" | "wechatQrCode$entity$$1$$aggr" | "wechatQrCode$entity$$2$$aggr" | "wechatQrCode$entity$$3$$aggr" | "wechatQrCode$entity$$4$$aggr" | "wechatQrCode$entity$$5$$aggr" | "wechatQrCode$entity$$6$$aggr" | "wechatQrCode$entity$$7$$aggr" | "wechatQrCode$entity$$8$$aggr" | "wechatQrCode$entity$$9$$aggr"; +export type Schema = OpSchema & { user?: User.Schema | null; wechatUser?: WechatUser.Schema | null; token$entity?: Array; - token$entity$$aggr?: AggregationResult; wechatQrCode$entity?: Array; - wechatQrCode$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; +} & { + [A in WechatQrCode$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -77,16 +73,18 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { - $entity: "token"; - }; wechatQrCode$entity?: WechatQrCode.Selection & { $entity: "wechatQrCode"; }; - wechatQrCode$entity$$aggr?: WechatQrCode.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { + $entity: "token"; + }; +} & { + [A in WechatQrCode$entityAggr]?: WechatQrCode.Aggregation & { $entity: "wechatQrCode"; }; -} & Partial>; +}; type WechatLoginIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WechatMenu/Schema.d.ts b/es/oak-app-domain/WechatMenu/Schema.d.ts index 244a117c..95eccd7d 100644 --- a/es/oak-app-domain/WechatMenu/Schema.d.ts +++ b/es/oak-app-domain/WechatMenu/Schema.d.ts @@ -20,12 +20,7 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - menuId?: Int<4> | null; - menuConfig: Config; - applicationId: ForeignKey<"application">; - wechatPublicTagId?: ForeignKey<"wechatPublicTag"> | null; - iState?: IState | null; +export type Schema = OpSchema & { application: Application.Schema; wechatPublicTag?: WechatPublicTag.Schema | null; } & { diff --git a/es/oak-app-domain/WechatMpJump/Schema.d.ts b/es/oak-app-domain/WechatMpJump/Schema.d.ts index d01e0909..7f0b44e9 100644 --- a/es/oak-app-domain/WechatMpJump/Schema.d.ts +++ b/es/oak-app-domain/WechatMpJump/Schema.d.ts @@ -20,14 +20,7 @@ export type OpSchema = EntityShape & { expired?: Boolean | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - messageId?: ForeignKey<"message"> | null; - jump_wxa?: Jump_wxa | null; - openlink?: String<256> | null; - expireType?: Int<1> | null; - expireInterval?: Int<2> | null; - expiresAt?: Datetime | null; - expired?: Boolean | null; +export type Schema = OpSchema & { message?: Message.Schema | null; } & { [A in ExpressionKey]?: any; diff --git a/es/oak-app-domain/WechatPay/Schema.d.ts b/es/oak-app-domain/WechatPay/Schema.d.ts index b5fe2c74..1d84fc98 100644 --- a/es/oak-app-domain/WechatPay/Schema.d.ts +++ b/es/oak-app-domain/WechatPay/Schema.d.ts @@ -14,19 +14,22 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - payNotifyUrl: String<128>; - refundNotifyUrl: String<128>; - systemId: ForeignKey<"system">; +type WpAccount$wechatPayAggr = "wpAccount$wechatPay$$aggr" | "wpAccount$wechatPay$$0$$aggr" | "wpAccount$wechatPay$$1$$aggr" | "wpAccount$wechatPay$$2$$aggr" | "wpAccount$wechatPay$$3$$aggr" | "wpAccount$wechatPay$$4$$aggr" | "wpAccount$wechatPay$$5$$aggr" | "wpAccount$wechatPay$$6$$aggr" | "wpAccount$wechatPay$$7$$aggr" | "wpAccount$wechatPay$$8$$aggr" | "wpAccount$wechatPay$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; wpAccount$wechatPay?: Array; - wpAccount$wechatPay$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in WpAccount$wechatPayAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -56,22 +59,25 @@ export type Projection = { wpAccount$wechatPay?: WpAccount.Selection & { $entity: "wpAccount"; }; - wpAccount$wechatPay$$aggr?: WpAccount.Aggregation & { - $entity: "wpAccount"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { +} & Partial> & { + [A in WpAccount$wechatPayAggr]?: WpAccount.Aggregation & { + $entity: "wpAccount"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { $entity: "operEntity"; }; -} & Partial>; +}; type WechatPayIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WechatPublicAutoReply/Schema.d.ts b/es/oak-app-domain/WechatPublicAutoReply/Schema.d.ts index 15c02cce..21eb5a11 100644 --- a/es/oak-app-domain/WechatPublicAutoReply/Schema.d.ts +++ b/es/oak-app-domain/WechatPublicAutoReply/Schema.d.ts @@ -17,11 +17,7 @@ export type OpSchema = EntityShape & { event: "subscribe" | "unsubscribe" | "keyword" | "auto"; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - content: content; - applicationId: ForeignKey<"application">; - type: "text" | "image" | "video" | "voice"; - event: "subscribe" | "unsubscribe" | "keyword" | "auto"; +export type Schema = OpSchema & { application: Application.Schema; } & { [A in ExpressionKey]?: any; diff --git a/es/oak-app-domain/WechatPublicTag/Schema.d.ts b/es/oak-app-domain/WechatPublicTag/Schema.d.ts index 6a906e1b..e5b2cf48 100644 --- a/es/oak-app-domain/WechatPublicTag/Schema.d.ts +++ b/es/oak-app-domain/WechatPublicTag/Schema.d.ts @@ -16,20 +16,18 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - text: String<32>; - applicationId: ForeignKey<"application">; - wechatId?: Uint<4> | null; - sync?: Boolean | null; - syncAt?: Datetime | null; - iState?: IState | null; +type UserWechatPublicTag$wechatPublicTagAggr = "userWechatPublicTag$wechatPublicTag$$aggr" | "userWechatPublicTag$wechatPublicTag$$0$$aggr" | "userWechatPublicTag$wechatPublicTag$$1$$aggr" | "userWechatPublicTag$wechatPublicTag$$2$$aggr" | "userWechatPublicTag$wechatPublicTag$$3$$aggr" | "userWechatPublicTag$wechatPublicTag$$4$$aggr" | "userWechatPublicTag$wechatPublicTag$$5$$aggr" | "userWechatPublicTag$wechatPublicTag$$6$$aggr" | "userWechatPublicTag$wechatPublicTag$$7$$aggr" | "userWechatPublicTag$wechatPublicTag$$8$$aggr" | "userWechatPublicTag$wechatPublicTag$$9$$aggr"; +type WechatMenu$wechatPublicTagAggr = "wechatMenu$wechatPublicTag$$aggr" | "wechatMenu$wechatPublicTag$$0$$aggr" | "wechatMenu$wechatPublicTag$$1$$aggr" | "wechatMenu$wechatPublicTag$$2$$aggr" | "wechatMenu$wechatPublicTag$$3$$aggr" | "wechatMenu$wechatPublicTag$$4$$aggr" | "wechatMenu$wechatPublicTag$$5$$aggr" | "wechatMenu$wechatPublicTag$$6$$aggr" | "wechatMenu$wechatPublicTag$$7$$aggr" | "wechatMenu$wechatPublicTag$$8$$aggr" | "wechatMenu$wechatPublicTag$$9$$aggr"; +export type Schema = OpSchema & { application: Application.Schema; userWechatPublicTag$wechatPublicTag?: Array; - userWechatPublicTag$wechatPublicTag$$aggr?: AggregationResult; wechatMenu$wechatPublicTag?: Array; - wechatMenu$wechatPublicTag$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in UserWechatPublicTag$wechatPublicTagAggr]?: AggregationResult; +} & { + [A in WechatMenu$wechatPublicTagAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -64,16 +62,18 @@ export type Projection = { userWechatPublicTag$wechatPublicTag?: UserWechatPublicTag.Selection & { $entity: "userWechatPublicTag"; }; - userWechatPublicTag$wechatPublicTag$$aggr?: UserWechatPublicTag.Aggregation & { - $entity: "userWechatPublicTag"; - }; wechatMenu$wechatPublicTag?: WechatMenu.Selection & { $entity: "wechatMenu"; }; - wechatMenu$wechatPublicTag$$aggr?: WechatMenu.Aggregation & { +} & Partial> & { + [A in UserWechatPublicTag$wechatPublicTagAggr]?: UserWechatPublicTag.Aggregation & { + $entity: "userWechatPublicTag"; + }; +} & { + [A in WechatMenu$wechatPublicTagAggr]?: WechatMenu.Aggregation & { $entity: "wechatMenu"; }; -} & Partial>; +}; type WechatPublicTagIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WechatQrCode/Schema.d.ts b/es/oak-app-domain/WechatQrCode/Schema.d.ts index 376f63fa..fe4f9e6d 100644 --- a/es/oak-app-domain/WechatQrCode/Schema.d.ts +++ b/es/oak-app-domain/WechatQrCode/Schema.d.ts @@ -32,21 +32,7 @@ export type OpSchema = EntityShape & { props: WechatQrCodeProps; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: "user" | "userEntityGrant" | "wechatLogin" | string; - entityId: String<64>; - type: QrCodeType; - allowShare: Boolean; - tag?: String<32> | null; - tag2?: String<64> | null; - expiresAt?: Datetime | null; - expired?: Boolean | null; - ticket?: Text | null; - url?: String<256> | null; - permanent?: Boolean | null; - buffer?: Text | null; - applicationId: ForeignKey<"application">; - props: WechatQrCodeProps; +export type Schema = OpSchema & { application: Application.Schema; user?: User.Schema; userEntityGrant?: UserEntityGrant.Schema; diff --git a/es/oak-app-domain/WechatTemplate/Schema.d.ts b/es/oak-app-domain/WechatTemplate/Schema.d.ts index 985bb780..bd9a9839 100644 --- a/es/oak-app-domain/WechatTemplate/Schema.d.ts +++ b/es/oak-app-domain/WechatTemplate/Schema.d.ts @@ -24,23 +24,14 @@ export type OpSchema = EntityShape & { type?: ("2" | "3") | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - applicationId: ForeignKey<"application">; - wechatId: String<64>; - title: Text; - primaryIndustry?: Text | null; - deputyIndustry?: Text | null; - content?: Text | null; - example?: Text | null; - param?: Object | null; - syncAt: Datetime; - keywordEnumValueList?: KeywordEnumValueList | null; - type?: ("2" | "3") | null; +type MessageTypeTemplate$templateAggr = "messageTypeTemplate$template$$aggr" | "messageTypeTemplate$template$$0$$aggr" | "messageTypeTemplate$template$$1$$aggr" | "messageTypeTemplate$template$$2$$aggr" | "messageTypeTemplate$template$$3$$aggr" | "messageTypeTemplate$template$$4$$aggr" | "messageTypeTemplate$template$$5$$aggr" | "messageTypeTemplate$template$$6$$aggr" | "messageTypeTemplate$template$$7$$aggr" | "messageTypeTemplate$template$$8$$aggr" | "messageTypeTemplate$template$$9$$aggr"; +export type Schema = OpSchema & { application: Application.Schema; messageTypeTemplate$template?: Array; - messageTypeTemplate$template$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in MessageTypeTemplate$templateAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -84,10 +75,11 @@ export type Projection = { messageTypeTemplate$template?: MessageTypeTemplate.Selection & { $entity: "messageTypeTemplate"; }; - messageTypeTemplate$template$$aggr?: MessageTypeTemplate.Aggregation & { +} & Partial> & { + [A in MessageTypeTemplate$templateAggr]?: MessageTypeTemplate.Aggregation & { $entity: "messageTypeTemplate"; }; -} & Partial>; +}; type WechatTemplateIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WechatUser/Schema.d.ts b/es/oak-app-domain/WechatUser/Schema.d.ts index 61604501..45a94ee9 100644 --- a/es/oak-app-domain/WechatUser/Schema.d.ts +++ b/es/oak-app-domain/WechatUser/Schema.d.ts @@ -29,35 +29,27 @@ export type OpSchema = EntityShape & { avatar?: Image | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - origin: "mp" | "public" | "web" | "native"; - openId?: String<32> | null; - unionId?: String<32> | null; - sessionKey?: String<64> | null; - accessToken?: String<128> | null; - refreshToken?: String<128> | null; - scope?: String<64> | null; - atExpiredAt?: Datetime | null; - rtExpiredAt?: Datetime | null; - subscribed?: Boolean | null; - subscribedAt?: Datetime | null; - unsubscribedAt?: Datetime | null; - userId?: ForeignKey<"user"> | null; - applicationId: ForeignKey<"application">; - nickname?: String<128> | null; - avatar?: Image | null; +type SessionMessage$wechatUserAggr = "sessionMessage$wechatUser$$aggr" | "sessionMessage$wechatUser$$0$$aggr" | "sessionMessage$wechatUser$$1$$aggr" | "sessionMessage$wechatUser$$2$$aggr" | "sessionMessage$wechatUser$$3$$aggr" | "sessionMessage$wechatUser$$4$$aggr" | "sessionMessage$wechatUser$$5$$aggr" | "sessionMessage$wechatUser$$6$$aggr" | "sessionMessage$wechatUser$$7$$aggr" | "sessionMessage$wechatUser$$8$$aggr" | "sessionMessage$wechatUser$$9$$aggr"; +type UserWechatPublicTag$wechatUserAggr = "userWechatPublicTag$wechatUser$$aggr" | "userWechatPublicTag$wechatUser$$0$$aggr" | "userWechatPublicTag$wechatUser$$1$$aggr" | "userWechatPublicTag$wechatUser$$2$$aggr" | "userWechatPublicTag$wechatUser$$3$$aggr" | "userWechatPublicTag$wechatUser$$4$$aggr" | "userWechatPublicTag$wechatUser$$5$$aggr" | "userWechatPublicTag$wechatUser$$6$$aggr" | "userWechatPublicTag$wechatUser$$7$$aggr" | "userWechatPublicTag$wechatUser$$8$$aggr" | "userWechatPublicTag$wechatUser$$9$$aggr"; +type WechatLogin$wechatUserAggr = "wechatLogin$wechatUser$$aggr" | "wechatLogin$wechatUser$$0$$aggr" | "wechatLogin$wechatUser$$1$$aggr" | "wechatLogin$wechatUser$$2$$aggr" | "wechatLogin$wechatUser$$3$$aggr" | "wechatLogin$wechatUser$$4$$aggr" | "wechatLogin$wechatUser$$5$$aggr" | "wechatLogin$wechatUser$$6$$aggr" | "wechatLogin$wechatUser$$7$$aggr" | "wechatLogin$wechatUser$$8$$aggr" | "wechatLogin$wechatUser$$9$$aggr"; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user?: User.Schema | null; application: Application.Schema; sessionMessage$wechatUser?: Array; - sessionMessage$wechatUser$$aggr?: AggregationResult; userWechatPublicTag$wechatUser?: Array; - userWechatPublicTag$wechatUser$$aggr?: AggregationResult; wechatLogin$wechatUser?: Array; - wechatLogin$wechatUser$$aggr?: AggregationResult; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SessionMessage$wechatUserAggr]?: AggregationResult; +} & { + [A in UserWechatPublicTag$wechatUserAggr]?: AggregationResult; +} & { + [A in WechatLogin$wechatUserAggr]?: AggregationResult; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -116,28 +108,32 @@ export type Projection = { sessionMessage$wechatUser?: SessionMessage.Selection & { $entity: "sessionMessage"; }; - sessionMessage$wechatUser$$aggr?: SessionMessage.Aggregation & { - $entity: "sessionMessage"; - }; userWechatPublicTag$wechatUser?: UserWechatPublicTag.Selection & { $entity: "userWechatPublicTag"; }; - userWechatPublicTag$wechatUser$$aggr?: UserWechatPublicTag.Aggregation & { - $entity: "userWechatPublicTag"; - }; wechatLogin$wechatUser?: WechatLogin.Selection & { $entity: "wechatLogin"; }; - wechatLogin$wechatUser$$aggr?: WechatLogin.Aggregation & { - $entity: "wechatLogin"; - }; token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in SessionMessage$wechatUserAggr]?: SessionMessage.Aggregation & { + $entity: "sessionMessage"; + }; +} & { + [A in UserWechatPublicTag$wechatUserAggr]?: UserWechatPublicTag.Aggregation & { + $entity: "userWechatPublicTag"; + }; +} & { + [A in WechatLogin$wechatUserAggr]?: WechatLogin.Aggregation & { + $entity: "wechatLogin"; + }; +} & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type WechatUserIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/Withdraw/Schema.d.ts b/es/oak-app-domain/Withdraw/Schema.d.ts index ecaf2dba..f8ddc72b 100644 --- a/es/oak-app-domain/Withdraw/Schema.d.ts +++ b/es/oak-app-domain/Withdraw/Schema.d.ts @@ -23,30 +23,31 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - accountId: ForeignKey<"account">; - price: Price; - loss: Price; - dealPrice: Price; - dealLoss: Price; - creatorId: ForeignKey<"user">; - reason?: Text | null; - meta?: Object | null; - iState?: IState | null; +type Refund$withdrawAggr = "refund$withdraw$$aggr" | "refund$withdraw$$0$$aggr" | "refund$withdraw$$1$$aggr" | "refund$withdraw$$2$$aggr" | "refund$withdraw$$3$$aggr" | "refund$withdraw$$4$$aggr" | "refund$withdraw$$5$$aggr" | "refund$withdraw$$6$$aggr" | "refund$withdraw$$7$$aggr" | "refund$withdraw$$8$$aggr" | "refund$withdraw$$9$$aggr"; +type WithdrawTransfer$withdrawAggr = "withdrawTransfer$withdraw$$aggr" | "withdrawTransfer$withdraw$$0$$aggr" | "withdrawTransfer$withdraw$$1$$aggr" | "withdrawTransfer$withdraw$$2$$aggr" | "withdrawTransfer$withdraw$$3$$aggr" | "withdrawTransfer$withdraw$$4$$aggr" | "withdrawTransfer$withdraw$$5$$aggr" | "withdrawTransfer$withdraw$$6$$aggr" | "withdrawTransfer$withdraw$$7$$aggr" | "withdrawTransfer$withdraw$$8$$aggr" | "withdrawTransfer$withdraw$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { account: Account.Schema; creator: User.Schema; refund$withdraw?: Array; - refund$withdraw$$aggr?: AggregationResult; withdrawTransfer$withdraw?: Array; - withdrawTransfer$withdraw$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Refund$withdrawAggr]?: AggregationResult; +} & { + [A in WithdrawTransfer$withdrawAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -92,34 +93,39 @@ export type Projection = { refund$withdraw?: Refund.Selection & { $entity: "refund"; }; - refund$withdraw$$aggr?: Refund.Aggregation & { - $entity: "refund"; - }; withdrawTransfer$withdraw?: WithdrawTransfer.Selection & { $entity: "withdrawTransfer"; }; - withdrawTransfer$withdraw$$aggr?: WithdrawTransfer.Aggregation & { - $entity: "withdrawTransfer"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in Refund$withdrawAggr]?: Refund.Aggregation & { + $entity: "refund"; + }; +} & { + [A in WithdrawTransfer$withdrawAggr]?: WithdrawTransfer.Aggregation & { + $entity: "withdrawTransfer"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type WithdrawIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WithdrawAccount/Schema.d.ts b/es/oak-app-domain/WithdrawAccount/Schema.d.ts index 716a3058..dcc53c22 100644 --- a/es/oak-app-domain/WithdrawAccount/Schema.d.ts +++ b/es/oak-app-domain/WithdrawAccount/Schema.d.ts @@ -23,29 +23,25 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - org?: String<128> | null; - name: String<64>; - code: String<64>; - ofSystemId: ForeignKey<"system">; - data?: Object | null; - channelId: ForeignKey<"withdrawChannel">; - entity: "system" | "user" | string; - entityId: String<64>; - isDefault: Boolean; - enabled: Boolean; +type WithdrawTransfer$withdrawAccountAggr = "withdrawTransfer$withdrawAccount$$aggr" | "withdrawTransfer$withdrawAccount$$0$$aggr" | "withdrawTransfer$withdrawAccount$$1$$aggr" | "withdrawTransfer$withdrawAccount$$2$$aggr" | "withdrawTransfer$withdrawAccount$$3$$aggr" | "withdrawTransfer$withdrawAccount$$4$$aggr" | "withdrawTransfer$withdrawAccount$$5$$aggr" | "withdrawTransfer$withdrawAccount$$6$$aggr" | "withdrawTransfer$withdrawAccount$$7$$aggr" | "withdrawTransfer$withdrawAccount$$8$$aggr" | "withdrawTransfer$withdrawAccount$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +export type Schema = OpSchema & { ofSystem: System.Schema; channel: WithdrawChannel.Schema; system?: System.Schema; user?: User.Schema; withdrawTransfer$withdrawAccount?: Array; - withdrawTransfer$withdrawAccount$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in WithdrawTransfer$withdrawAccountAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -95,22 +91,25 @@ export type Projection = { withdrawTransfer$withdrawAccount?: WithdrawTransfer.Selection & { $entity: "withdrawTransfer"; }; - withdrawTransfer$withdrawAccount$$aggr?: WithdrawTransfer.Aggregation & { - $entity: "withdrawTransfer"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { +} & Partial> & { + [A in WithdrawTransfer$withdrawAccountAggr]?: WithdrawTransfer.Aggregation & { + $entity: "withdrawTransfer"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { $entity: "operEntity"; }; -} & Partial>; +}; type WithdrawAccountIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WithdrawChannel/Schema.d.ts b/es/oak-app-domain/WithdrawChannel/Schema.d.ts index cf644e43..d381a979 100644 --- a/es/oak-app-domain/WithdrawChannel/Schema.d.ts +++ b/es/oak-app-domain/WithdrawChannel/Schema.d.ts @@ -17,22 +17,24 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: "offlineAccount" | "wpAccount" | string; - entityId: String<64>; - enabled: Boolean; - systemId: ForeignKey<"system">; +type WithdrawAccount$channelAggr = "withdrawAccount$channel$$aggr" | "withdrawAccount$channel$$0$$aggr" | "withdrawAccount$channel$$1$$aggr" | "withdrawAccount$channel$$2$$aggr" | "withdrawAccount$channel$$3$$aggr" | "withdrawAccount$channel$$4$$aggr" | "withdrawAccount$channel$$5$$aggr" | "withdrawAccount$channel$$6$$aggr" | "withdrawAccount$channel$$7$$aggr" | "withdrawAccount$channel$$8$$aggr" | "withdrawAccount$channel$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; offlineAccount?: OfflineAccount.Schema; wpAccount?: WpAccount.Schema; withdrawAccount$channel?: Array; - withdrawAccount$channel$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in WithdrawAccount$channelAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -68,22 +70,25 @@ export type Projection = { withdrawAccount$channel?: WithdrawAccount.Selection & { $entity: "withdrawAccount"; }; - withdrawAccount$channel$$aggr?: WithdrawAccount.Aggregation & { - $entity: "withdrawAccount"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { +} & Partial> & { + [A in WithdrawAccount$channelAggr]?: WithdrawAccount.Aggregation & { + $entity: "withdrawAccount"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { $entity: "operEntity"; }; -} & Partial>; +}; type WithdrawChannelIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WithdrawTransfer/Schema.d.ts b/es/oak-app-domain/WithdrawTransfer/Schema.d.ts index 1f26b8d9..6db2fe9c 100644 --- a/es/oak-app-domain/WithdrawTransfer/Schema.d.ts +++ b/es/oak-app-domain/WithdrawTransfer/Schema.d.ts @@ -24,31 +24,29 @@ export type OpSchema = EntityShape & { reason?: Text | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - iState?: IState | null; - withdrawId: ForeignKey<"withdraw">; - withdrawAccountId: ForeignKey<"withdrawAccount">; - price: Price; - loss: Price; - operatorId?: ForeignKey<"user"> | null; - creatorId: ForeignKey<"user">; - externalId?: String<128> | null; - meta: Object; - reason?: Text | null; +type SysAccountOper$withdrawTransferAggr = "sysAccountOper$withdrawTransfer$$aggr" | "sysAccountOper$withdrawTransfer$$0$$aggr" | "sysAccountOper$withdrawTransfer$$1$$aggr" | "sysAccountOper$withdrawTransfer$$2$$aggr" | "sysAccountOper$withdrawTransfer$$3$$aggr" | "sysAccountOper$withdrawTransfer$$4$$aggr" | "sysAccountOper$withdrawTransfer$$5$$aggr" | "sysAccountOper$withdrawTransfer$$6$$aggr" | "sysAccountOper$withdrawTransfer$$7$$aggr" | "sysAccountOper$withdrawTransfer$$8$$aggr" | "sysAccountOper$withdrawTransfer$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { withdraw: Withdraw.Schema; withdrawAccount: WithdrawAccount.Schema; operator?: User.Schema | null; creator: User.Schema; sysAccountOper$withdrawTransfer?: Array; - sysAccountOper$withdrawTransfer$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SysAccountOper$withdrawTransferAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -99,28 +97,32 @@ export type Projection = { sysAccountOper$withdrawTransfer?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$withdrawTransfer$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in SysAccountOper$withdrawTransferAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type WithdrawTransferIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WpAccount/Schema.d.ts b/es/oak-app-domain/WpAccount/Schema.d.ts index c6905e3d..47fdcf87 100644 --- a/es/oak-app-domain/WpAccount/Schema.d.ts +++ b/es/oak-app-domain/WpAccount/Schema.d.ts @@ -27,34 +27,31 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - taxLossRatio: Decimal<4, 2>; - refundGapDays?: Int<4> | null; - refundCompensateRatio?: Int<4> | null; - allowWithdrawTransfer: Boolean; - withdrawTransferLossRatio?: Decimal<4, 2> | null; - wechatPayId: ForeignKey<"wechatPay">; - mchId: String<128>; - publicKeyFilePath: Text; - privateKeyFilePath: Text; - apiV3Key: String<32>; - price: Price; - systemId: ForeignKey<"system">; - enabled: Boolean; +type WpProduct$wpAccountAggr = "wpProduct$wpAccount$$aggr" | "wpProduct$wpAccount$$0$$aggr" | "wpProduct$wpAccount$$1$$aggr" | "wpProduct$wpAccount$$2$$aggr" | "wpProduct$wpAccount$$3$$aggr" | "wpProduct$wpAccount$$4$$aggr" | "wpProduct$wpAccount$$5$$aggr" | "wpProduct$wpAccount$$6$$aggr" | "wpProduct$wpAccount$$7$$aggr" | "wpProduct$wpAccount$$8$$aggr" | "wpProduct$wpAccount$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type SysAccountOper$entityAggr = "sysAccountOper$entity$$aggr" | "sysAccountOper$entity$$0$$aggr" | "sysAccountOper$entity$$1$$aggr" | "sysAccountOper$entity$$2$$aggr" | "sysAccountOper$entity$$3$$aggr" | "sysAccountOper$entity$$4$$aggr" | "sysAccountOper$entity$$5$$aggr" | "sysAccountOper$entity$$6$$aggr" | "sysAccountOper$entity$$7$$aggr" | "sysAccountOper$entity$$8$$aggr" | "sysAccountOper$entity$$9$$aggr"; +type WithdrawChannel$entityAggr = "withdrawChannel$entity$$aggr" | "withdrawChannel$entity$$0$$aggr" | "withdrawChannel$entity$$1$$aggr" | "withdrawChannel$entity$$2$$aggr" | "withdrawChannel$entity$$3$$aggr" | "withdrawChannel$entity$$4$$aggr" | "withdrawChannel$entity$$5$$aggr" | "withdrawChannel$entity$$6$$aggr" | "withdrawChannel$entity$$7$$aggr" | "withdrawChannel$entity$$8$$aggr" | "withdrawChannel$entity$$9$$aggr"; +export type Schema = OpSchema & { wechatPay: WechatPay.Schema; system: System.Schema; wpProduct$wpAccount?: Array; - wpProduct$wpAccount$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; sysAccountOper$entity?: Array; - sysAccountOper$entity$$aggr?: AggregationResult; withdrawChannel$entity?: Array; - withdrawChannel$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in WpProduct$wpAccountAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in SysAccountOper$entityAggr]?: AggregationResult; +} & { + [A in WithdrawChannel$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -108,34 +105,39 @@ export type Projection = { wpProduct$wpAccount?: WpProduct.Selection & { $entity: "wpProduct"; }; - wpProduct$wpAccount$$aggr?: WpProduct.Aggregation & { - $entity: "wpProduct"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; sysAccountOper$entity?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$entity$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; withdrawChannel$entity?: WithdrawChannel.Selection & { $entity: "withdrawChannel"; }; - withdrawChannel$entity$$aggr?: WithdrawChannel.Aggregation & { +} & Partial> & { + [A in WpProduct$wpAccountAggr]?: WpProduct.Aggregation & { + $entity: "wpProduct"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in SysAccountOper$entityAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in WithdrawChannel$entityAggr]?: WithdrawChannel.Aggregation & { $entity: "withdrawChannel"; }; -} & Partial>; +}; type WpAccountIdProjection = OneOf<{ id: number; }>; diff --git a/es/oak-app-domain/WpProduct/Schema.d.ts b/es/oak-app-domain/WpProduct/Schema.d.ts index 774a1c09..8f449b1a 100644 --- a/es/oak-app-domain/WpProduct/Schema.d.ts +++ b/es/oak-app-domain/WpProduct/Schema.d.ts @@ -17,22 +17,23 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - wpAccountId: ForeignKey<"wpAccount">; - type: "native" | "mp" | "jsapi" | "h5" | "app"; - taxLossRatio?: Decimal<4, 2> | null; - applicationId: ForeignKey<"application">; - enabled: Boolean; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type Pay$entityAggr = "pay$entity$$aggr" | "pay$entity$$0$$aggr" | "pay$entity$$1$$aggr" | "pay$entity$$2$$aggr" | "pay$entity$$3$$aggr" | "pay$entity$$4$$aggr" | "pay$entity$$5$$aggr" | "pay$entity$$6$$aggr" | "pay$entity$$7$$aggr" | "pay$entity$$8$$aggr" | "pay$entity$$9$$aggr"; +export type Schema = OpSchema & { wpAccount: WpAccount.Schema; application: Application.Schema; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; pay$entity?: Array; - pay$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in Pay$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -68,22 +69,25 @@ export type Projection = { modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; pay$entity?: Pay.Selection & { $entity: "pay"; }; - pay$entity$$aggr?: Pay.Aggregation & { +} & Partial> & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in Pay$entityAggr]?: Pay.Aggregation & { $entity: "pay"; }; -} & Partial>; +}; type WpProductIdProjection = OneOf<{ id: number; }>; diff --git a/es/triggers/account.js b/es/triggers/account.js index 34cdb2df..cfaf7352 100644 --- a/es/triggers/account.js +++ b/es/triggers/account.js @@ -38,7 +38,7 @@ const triggers = [ price: 1, }, filter: { - iState: 'paying', + iState: 'unpaid', orderId: { $exists: true, } diff --git a/es/triggers/accountOper.js b/es/triggers/accountOper.js index c7de7387..91ecc9b3 100644 --- a/es/triggers/accountOper.js +++ b/es/triggers/accountOper.js @@ -1,7 +1,6 @@ import { generateNewIdAsync } from 'oak-domain/lib/utils/uuid'; import assert from 'assert'; import { DATA_SUBSCRIBER_KEYS } from '../config/constants'; -import { OakInputIllegalException } from 'oak-domain/lib/types'; const triggers = [ { name: '当生成accountOper时，修改account中的值，并向订阅者推送', @@ -25,14 +24,14 @@ const triggers = [ }, { forUpdate: true }); const { total, avail, refundable } = account; // 提现和退款不能把账户提成负数 - if (['withdraw', 'refund'].includes(type)) { - if (avail + availPlus < 0) { - throw new OakInputIllegalException('accountOper', ['availPlus'], 'withdraw::availOverflow'); - } - if (refundablePlus && refundable + refundablePlus < 0) { - throw new OakInputIllegalException('accountOper', ['availPlus'], 'withdraw::refundableOverflow'); - } - } + // if (['withdraw', 'refund'].includes(type!)) { + // if (avail! + availPlus! < 0) { + // throw new OakInputIllegalException('accountOper', ['availPlus'], 'withdraw::availOverflow'); + // } + // if (refundablePlus && refundable ! + refundablePlus < 0) { + // throw new OakInputIllegalException('accountOper', ['availPlus'], 'withdraw::refundableOverflow'); + // } + // } const total2 = total + totalPlus; const avail2 = avail + availPlus; const refundable2 = refundable + (refundablePlus || 0); diff --git a/es/utils/application.d.ts b/es/utils/application.d.ts index c7ec4133..80efb3a6 100644 --- a/es/utils/application.d.ts +++ b/es/utils/application.d.ts @@ -34,9 +34,6 @@ export declare const mergedProjection: { } & { $entity: "applicationPassport"; }) | undefined; - applicationPassport$application$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { - $entity: "applicationPassport"; - }) | undefined; extraFile$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -53,9 +50,6 @@ export declare const mergedProjection: { } & { $entity: "extraFile"; }) | undefined; - extraFile$application$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { - $entity: "extraFile"; - }) | undefined; notification$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -72,9 +66,6 @@ export declare const mergedProjection: { } & { $entity: "notification"; }) | undefined; - notification$application$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { - $entity: "notification"; - }) | undefined; sessionMessage$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -91,9 +82,6 @@ export declare const mergedProjection: { } & { $entity: "sessionMessage"; }) | undefined; - sessionMessage$application$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { - $entity: "sessionMessage"; - }) | undefined; token$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -110,9 +98,6 @@ export declare const mergedProjection: { } & { $entity: "token"; }) | undefined; - token$application$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { - $entity: "token"; - }) | undefined; wechatMenu$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -129,9 +114,6 @@ export declare const mergedProjection: { } & { $entity: "wechatMenu"; }) | undefined; - wechatMenu$application$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { - $entity: "wechatMenu"; - }) | undefined; wechatPublicAutoReply$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -148,9 +130,6 @@ export declare const mergedProjection: { } & { $entity: "wechatPublicAutoReply"; }) | undefined; - wechatPublicAutoReply$application$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { - $entity: "wechatPublicAutoReply"; - }) | undefined; wechatPublicTag$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -167,9 +146,6 @@ export declare const mergedProjection: { } & { $entity: "wechatPublicTag"; }) | undefined; - wechatPublicTag$application$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { - $entity: "wechatPublicTag"; - }) | undefined; wechatQrCode$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -186,9 +162,6 @@ export declare const mergedProjection: { } & { $entity: "wechatQrCode"; }) | undefined; - wechatQrCode$application$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { - $entity: "wechatQrCode"; - }) | undefined; wechatTemplate$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -205,9 +178,6 @@ export declare const mergedProjection: { } & { $entity: "wechatTemplate"; }) | undefined; - wechatTemplate$application$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { - $entity: "wechatTemplate"; - }) | undefined; wechatUser$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -224,9 +194,6 @@ export declare const mergedProjection: { } & { $entity: "wechatUser"; }) | undefined; - wechatUser$application$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { - $entity: "wechatUser"; - }) | undefined; pay$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -243,9 +210,6 @@ export declare const mergedProjection: { } & { $entity: "pay"; }) | undefined; - pay$application$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { - $entity: "pay"; - }) | undefined; wpProduct$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -262,9 +226,6 @@ export declare const mergedProjection: { } & { $entity: "wpProduct"; }) | undefined; - wpProduct$application$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { - $entity: "wpProduct"; - }) | undefined; session$entity?: ({ id?: string | undefined; action?: "select" | undefined; @@ -281,10 +242,483 @@ export declare const mergedProjection: { } & { $entity: "session"; }) | undefined; +} & Partial> & { + applicationPassport$application$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$0$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$1$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$2$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$3$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$4$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$5$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$6$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$7$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$8$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$9$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; +} & { + extraFile$application$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$0$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$1$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$2$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$3$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$4$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$5$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$6$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$7$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$8$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$9$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; +} & { + notification$application$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$0$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$1$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$2$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$3$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$4$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$5$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$6$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$7$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$8$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$9$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; +} & { + sessionMessage$application$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$0$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$1$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$2$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$3$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$4$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$5$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$6$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$7$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$8$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$9$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; +} & { + token$application$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$0$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$1$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$2$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$3$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$4$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$5$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$6$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$7$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$8$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$9$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; +} & { + wechatMenu$application$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$0$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$1$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$2$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$3$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$4$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$5$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$6$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$7$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$8$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$9$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; +} & { + wechatPublicAutoReply$application$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$0$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$1$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$2$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$3$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$4$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$5$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$6$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$7$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$8$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$9$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; +} & { + wechatPublicTag$application$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$0$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$1$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$2$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$3$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$4$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$5$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$6$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$7$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$8$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$9$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; +} & { + wechatQrCode$application$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$0$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$1$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$2$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$3$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$4$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$5$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$6$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$7$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$8$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$9$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; +} & { + wechatTemplate$application$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$0$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$1$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$2$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$3$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$4$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$5$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$6$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$7$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$8$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$9$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; +} & { + wechatUser$application$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$0$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$1$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$2$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$3$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$4$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$5$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$6$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$7$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$8$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$9$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; +} & { + pay$application$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$0$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$1$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$2$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$3$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$4$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$5$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$6$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$7$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$8$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$9$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; +} & { + wpProduct$application$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$0$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$1$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$2$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$3$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$4$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$5$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$6$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$7$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$8$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$9$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; +} & { session$entity$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { $entity: "session"; }) | undefined; -} & Partial> & { + session$entity$$0$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$1$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$2$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$3$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$4$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$5$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$6$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$7$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$8$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$9$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; +} & { [k: string]: any; "#id"?: `node-${number}` | undefined; id?: number | undefined; @@ -316,9 +750,6 @@ export declare const mergedProjection: { } & { $entity: "applicationPassport"; }) | undefined; - applicationPassport$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { - $entity: "applicationPassport"; - }) | undefined; extraFile$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -335,9 +766,6 @@ export declare const mergedProjection: { } & { $entity: "extraFile"; }) | undefined; - extraFile$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { - $entity: "extraFile"; - }) | undefined; notification$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -354,9 +782,6 @@ export declare const mergedProjection: { } & { $entity: "notification"; }) | undefined; - notification$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { - $entity: "notification"; - }) | undefined; sessionMessage$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -373,9 +798,6 @@ export declare const mergedProjection: { } & { $entity: "sessionMessage"; }) | undefined; - sessionMessage$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { - $entity: "sessionMessage"; - }) | undefined; token$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -392,9 +814,6 @@ export declare const mergedProjection: { } & { $entity: "token"; }) | undefined; - token$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { - $entity: "token"; - }) | undefined; wechatMenu$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -411,9 +830,6 @@ export declare const mergedProjection: { } & { $entity: "wechatMenu"; }) | undefined; - wechatMenu$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { - $entity: "wechatMenu"; - }) | undefined; wechatPublicAutoReply$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -430,9 +846,6 @@ export declare const mergedProjection: { } & { $entity: "wechatPublicAutoReply"; }) | undefined; - wechatPublicAutoReply$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { - $entity: "wechatPublicAutoReply"; - }) | undefined; wechatPublicTag$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -449,9 +862,6 @@ export declare const mergedProjection: { } & { $entity: "wechatPublicTag"; }) | undefined; - wechatPublicTag$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { - $entity: "wechatPublicTag"; - }) | undefined; wechatQrCode$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -468,9 +878,6 @@ export declare const mergedProjection: { } & { $entity: "wechatQrCode"; }) | undefined; - wechatQrCode$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { - $entity: "wechatQrCode"; - }) | undefined; wechatTemplate$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -487,9 +894,6 @@ export declare const mergedProjection: { } & { $entity: "wechatTemplate"; }) | undefined; - wechatTemplate$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { - $entity: "wechatTemplate"; - }) | undefined; wechatUser$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -506,9 +910,6 @@ export declare const mergedProjection: { } & { $entity: "wechatUser"; }) | undefined; - wechatUser$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { - $entity: "wechatUser"; - }) | undefined; session$entity?: ({ id?: string | undefined; action?: "select" | undefined; @@ -525,7 +926,412 @@ export declare const mergedProjection: { } & { $entity: "session"; }) | undefined; +} & { + applicationPassport$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; +} & { + extraFile$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; +} & { + notification$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; +} & { + sessionMessage$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; +} & { + token$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; +} & { + wechatMenu$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; +} & { + wechatPublicAutoReply$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; +} & { + wechatPublicTag$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; +} & { + wechatQrCode$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; +} & { + wechatTemplate$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; +} & { + wechatUser$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; +} & { session$entity$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { $entity: "session"; }) | undefined; + session$entity$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; }; diff --git a/es/utils/payClazz/Account.js b/es/utils/payClazz/Account.js index 104e49d3..db166b3b 100644 --- a/es/utils/payClazz/Account.js +++ b/es/utils/payClazz/Account.js @@ -50,24 +50,40 @@ export default class Account { } }, { forUpdate: true }); const { avail } = account; - const paid = Math.min(price, avail); - if (paid > 0) { - data.accountOper$entity = [ - { + // const paid = Math.min(price!, avail!); + // if (paid > 0) { + // data.accountOper$entity = [ + // { + // id: await generateNewIdAsync(), + // action: 'create', + // data: { + // id: await generateNewIdAsync(), + // totalPlus: -paid, + // availPlus: -paid, + // type: 'consume', + // accountId: account.id!, + // }, + // } + // ]; + // data.meta = {}; + // data.paid = paid; + // } + //允许将account扣成负数 + data.accountOper$entity = [ + { + id: await generateNewIdAsync(), + action: 'create', + data: { id: await generateNewIdAsync(), - action: 'create', - data: { - id: await generateNewIdAsync(), - totalPlus: -paid, - availPlus: -paid, - type: 'consume', - accountId: account.id, - }, - } - ]; - data.meta = {}; - data.paid = paid; - } + totalPlus: -price, + availPlus: -price, + type: 'consume', + accountId: account.id, + }, + } + ]; + data.meta = {}; + data.paid = price; } getState(pay) { throw new Error("account类型的pay不应该需要查询此状态"); diff --git a/es/utils/payClazz/WechatPay/index.d.ts b/es/utils/payClazz/WechatPay/index.d.ts index eeba2b4b..ce1d041a 100644 --- a/es/utils/payClazz/WechatPay/index.d.ts +++ b/es/utils/payClazz/WechatPay/index.d.ts @@ -1,4 +1,4 @@ import WechatPay from './WechatPay'; import WechatPayDebug from './WechatPay.debug'; -declare const _default: typeof WechatPayDebug | typeof WechatPay; +declare const _default: typeof WechatPay | typeof WechatPayDebug; export default _default; diff --git a/lib/aspects/withdraw.d.ts b/lib/aspects/withdraw.d.ts index 2ea225ee..5d27ce2e 100644 --- a/lib/aspects/withdraw.d.ts +++ b/lib/aspects/withdraw.d.ts @@ -3,7 +3,7 @@ export declare function getWithdrawCreateData(params: { accountId: string; price: number; withdrawAccountId?: string; -}, context: BRC): Promise<(Partial> & { +}, context: BRC): Promise<(Partial> & { id: string; } & { accountId: string; @@ -17,7 +17,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { accountId: string; @@ -31,7 +31,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; @@ -45,7 +45,7 @@ export declare function getWithdrawCreateData(params: { modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit[]> | import("oak-domain/lib/types").Operation<"create", Omit>[] | undefined; -}) | (Partial> & { +}) | (Partial> & { id: string; } & { account?: undefined; diff --git a/lib/context/BackendRuntimeContext.d.ts b/lib/context/BackendRuntimeContext.d.ts index aefe6ccb..8a936226 100644 --- a/lib/context/BackendRuntimeContext.d.ts +++ b/lib/context/BackendRuntimeContext.d.ts @@ -35,9 +35,6 @@ export declare class BackendRuntimeContext> & { + applicationPassport$application$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$0$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$1$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$2$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$3$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$4$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$5$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$6$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$7$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$8$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$9$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + } & { + extraFile$application$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$0$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$1$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$2$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$3$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$4$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$5$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$6$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$7$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$8$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$9$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + } & { + notification$application$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$0$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$1$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$2$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$3$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$4$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$5$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$6$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$7$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$8$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$9$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + } & { + sessionMessage$application$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$0$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$1$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$2$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$3$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$4$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$5$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$6$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$7$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$8$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$9$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + } & { + token$application$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$0$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$1$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$2$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$3$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$4$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$5$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$6$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$7$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$8$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$9$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + } & { + wechatMenu$application$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$0$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$1$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$2$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$3$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$4$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$5$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$6$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$7$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$8$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$9$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + } & { + wechatPublicAutoReply$application$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$0$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$1$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$2$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$3$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$4$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$5$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$6$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$7$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$8$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$9$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + } & { + wechatPublicTag$application$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$0$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$1$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$2$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$3$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$4$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$5$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$6$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$7$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$8$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$9$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + } & { + wechatQrCode$application$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$0$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$1$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$2$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$3$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$4$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$5$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$6$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$7$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$8$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$9$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + } & { + wechatTemplate$application$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$0$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$1$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$2$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$3$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$4$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$5$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$6$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$7$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$8$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$9$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + } & { + wechatUser$application$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$0$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$1$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$2$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$3$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$4$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$5$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$6$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$7$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$8$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$9$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + } & { + pay$application$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$0$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$1$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$2$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$3$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$4$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$5$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$6$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$7$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$8$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$9$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + } & { + wpProduct$application$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$0$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$1$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$2$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$3$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$4$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$5$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$6$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$7$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$8$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$9$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + } & { session$entity$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { $entity: "session"; }) | undefined; - } & Partial> & { + session$entity$$0$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$1$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$2$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$3$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$4$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$5$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$6$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$7$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$8$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$9$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + } & { [k: string]: any; "#id"?: `node-${number}` | undefined; id?: number | undefined; @@ -317,9 +751,6 @@ export declare class BackendRuntimeContext; refineOpRecords(): Promise; diff --git a/lib/oak-app-domain/AbstractAccount/Schema.d.ts b/lib/oak-app-domain/AbstractAccount/Schema.d.ts index bb004538..75515cd7 100644 --- a/lib/oak-app-domain/AbstractAccount/Schema.d.ts +++ b/lib/oak-app-domain/AbstractAccount/Schema.d.ts @@ -11,13 +11,7 @@ export type OpSchema = EntityShape & { withdrawTransferLossRatio?: Decimal<4, 2> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - taxLossRatio: Decimal<4, 2>; - refundGapDays?: Int<4> | null; - refundCompensateRatio?: Int<4> | null; - allowWithdrawTransfer: Boolean; - withdrawTransferLossRatio?: Decimal<4, 2> | null; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/lib/oak-app-domain/Account/Schema.d.ts b/lib/oak-app-domain/Account/Schema.d.ts index e62d1b0b..dbc2c77d 100644 --- a/lib/oak-app-domain/Account/Schema.d.ts +++ b/lib/oak-app-domain/Account/Schema.d.ts @@ -21,27 +21,28 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - total: Price; - avail: Price; - refundable: Price; - ofSystemId: ForeignKey<"system">; - entity: "system" | "user" | string; - entityId: String<64>; - ableState?: AbleState | null; +type AccountOper$accountAggr = "accountOper$account$$aggr" | "accountOper$account$$0$$aggr" | "accountOper$account$$1$$aggr" | "accountOper$account$$2$$aggr" | "accountOper$account$$3$$aggr" | "accountOper$account$$4$$aggr" | "accountOper$account$$5$$aggr" | "accountOper$account$$6$$aggr" | "accountOper$account$$7$$aggr" | "accountOper$account$$8$$aggr" | "accountOper$account$$9$$aggr"; +type Deposit$accountAggr = "deposit$account$$aggr" | "deposit$account$$0$$aggr" | "deposit$account$$1$$aggr" | "deposit$account$$2$$aggr" | "deposit$account$$3$$aggr" | "deposit$account$$4$$aggr" | "deposit$account$$5$$aggr" | "deposit$account$$6$$aggr" | "deposit$account$$7$$aggr" | "deposit$account$$8$$aggr" | "deposit$account$$9$$aggr"; +type Withdraw$accountAggr = "withdraw$account$$aggr" | "withdraw$account$$0$$aggr" | "withdraw$account$$1$$aggr" | "withdraw$account$$2$$aggr" | "withdraw$account$$3$$aggr" | "withdraw$account$$4$$aggr" | "withdraw$account$$5$$aggr" | "withdraw$account$$6$$aggr" | "withdraw$account$$7$$aggr" | "withdraw$account$$8$$aggr" | "withdraw$account$$9$$aggr"; +type Pay$entityAggr = "pay$entity$$aggr" | "pay$entity$$0$$aggr" | "pay$entity$$1$$aggr" | "pay$entity$$2$$aggr" | "pay$entity$$3$$aggr" | "pay$entity$$4$$aggr" | "pay$entity$$5$$aggr" | "pay$entity$$6$$aggr" | "pay$entity$$7$$aggr" | "pay$entity$$8$$aggr" | "pay$entity$$9$$aggr"; +export type Schema = OpSchema & { ofSystem: System.Schema; system?: System.Schema; user?: User.Schema; accountOper$account?: Array; - accountOper$account$$aggr?: AggregationResult; deposit$account?: Array; - deposit$account$$aggr?: AggregationResult; withdraw$account?: Array; - withdraw$account$$aggr?: AggregationResult; pay$entity?: Array; - pay$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in AccountOper$accountAggr]?: AggregationResult; +} & { + [A in Deposit$accountAggr]?: AggregationResult; +} & { + [A in Withdraw$accountAggr]?: AggregationResult; +} & { + [A in Pay$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -84,28 +85,32 @@ export type Projection = { accountOper$account?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$account$$aggr?: AccountOper.Aggregation & { - $entity: "accountOper"; - }; deposit$account?: Deposit.Selection & { $entity: "deposit"; }; - deposit$account$$aggr?: Deposit.Aggregation & { - $entity: "deposit"; - }; withdraw$account?: Withdraw.Selection & { $entity: "withdraw"; }; - withdraw$account$$aggr?: Withdraw.Aggregation & { - $entity: "withdraw"; - }; pay$entity?: Pay.Selection & { $entity: "pay"; }; - pay$entity$$aggr?: Pay.Aggregation & { +} & Partial> & { + [A in AccountOper$accountAggr]?: AccountOper.Aggregation & { + $entity: "accountOper"; + }; +} & { + [A in Deposit$accountAggr]?: Deposit.Aggregation & { + $entity: "deposit"; + }; +} & { + [A in Withdraw$accountAggr]?: Withdraw.Aggregation & { + $entity: "withdraw"; + }; +} & { + [A in Pay$entityAggr]?: Pay.Aggregation & { $entity: "pay"; }; -} & Partial>; +}; type AccountIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/AccountOper/Schema.d.ts b/lib/oak-app-domain/AccountOper/Schema.d.ts index f53457ad..d78c306c 100644 --- a/lib/oak-app-domain/AccountOper/Schema.d.ts +++ b/lib/oak-app-domain/AccountOper/Schema.d.ts @@ -25,17 +25,7 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - accountId: ForeignKey<"account">; - type: Type; - totalPlus: Price; - availPlus: Price; - refundablePlus?: Price | null; - total: Price; - avail: Price; - refundable: Price; - entity: "deposit" | "order" | "pay" | "refund" | "withdraw" | "withdrawTransfer" | string; - entityId: String<64>; +export type Schema = OpSchema & { account: Account.Schema; deposit?: Deposit.Schema; order?: Order.Schema; diff --git a/lib/oak-app-domain/ActionAuth/Schema.d.ts b/lib/oak-app-domain/ActionAuth/Schema.d.ts index 2149098a..6bfd3f88 100644 --- a/lib/oak-app-domain/ActionAuth/Schema.d.ts +++ b/lib/oak-app-domain/ActionAuth/Schema.d.ts @@ -12,10 +12,7 @@ export type OpSchema = EntityShape & { deActions: Actions; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - relationId?: ForeignKey<"relation"> | null; - pathId: ForeignKey<"path">; - deActions: Actions; +export type Schema = OpSchema & { relation?: Relation.Schema | null; path: Path.Schema; } & { diff --git a/lib/oak-app-domain/Address/Schema.d.ts b/lib/oak-app-domain/Address/Schema.d.ts index aff68ac5..f45204a7 100644 --- a/lib/oak-app-domain/Address/Schema.d.ts +++ b/lib/oak-app-domain/Address/Schema.d.ts @@ -17,15 +17,7 @@ export type OpSchema = EntityShape & { entityId?: String<64> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - detail: String<32>; - areaId: ForeignKey<"area">; - phone: String<12>; - name: String<32>; - default: Boolean; - remark?: Text | null; - entity?: ("user" | string) | null; - entityId?: String<64> | null; +export type Schema = OpSchema & { area: Area.Schema; user?: User.Schema; } & { diff --git a/lib/oak-app-domain/Application/Schema.d.ts b/lib/oak-app-domain/Application/Schema.d.ts index 2bbefb00..4ec18e94 100644 --- a/lib/oak-app-domain/Application/Schema.d.ts +++ b/lib/oak-app-domain/Application/Schema.d.ts @@ -93,46 +93,67 @@ export type OpSchema = EntityShape & { domainId?: ForeignKey<"domain"> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - description?: Text | null; - type: AppType; - systemId: ForeignKey<"system">; - config: WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig; - style?: Style | null; - domainId?: ForeignKey<"domain"> | null; +type ApplicationPassport$applicationAggr = "applicationPassport$application$$aggr" | "applicationPassport$application$$0$$aggr" | "applicationPassport$application$$1$$aggr" | "applicationPassport$application$$2$$aggr" | "applicationPassport$application$$3$$aggr" | "applicationPassport$application$$4$$aggr" | "applicationPassport$application$$5$$aggr" | "applicationPassport$application$$6$$aggr" | "applicationPassport$application$$7$$aggr" | "applicationPassport$application$$8$$aggr" | "applicationPassport$application$$9$$aggr"; +type ExtraFile$applicationAggr = "extraFile$application$$aggr" | "extraFile$application$$0$$aggr" | "extraFile$application$$1$$aggr" | "extraFile$application$$2$$aggr" | "extraFile$application$$3$$aggr" | "extraFile$application$$4$$aggr" | "extraFile$application$$5$$aggr" | "extraFile$application$$6$$aggr" | "extraFile$application$$7$$aggr" | "extraFile$application$$8$$aggr" | "extraFile$application$$9$$aggr"; +type Notification$applicationAggr = "notification$application$$aggr" | "notification$application$$0$$aggr" | "notification$application$$1$$aggr" | "notification$application$$2$$aggr" | "notification$application$$3$$aggr" | "notification$application$$4$$aggr" | "notification$application$$5$$aggr" | "notification$application$$6$$aggr" | "notification$application$$7$$aggr" | "notification$application$$8$$aggr" | "notification$application$$9$$aggr"; +type SessionMessage$applicationAggr = "sessionMessage$application$$aggr" | "sessionMessage$application$$0$$aggr" | "sessionMessage$application$$1$$aggr" | "sessionMessage$application$$2$$aggr" | "sessionMessage$application$$3$$aggr" | "sessionMessage$application$$4$$aggr" | "sessionMessage$application$$5$$aggr" | "sessionMessage$application$$6$$aggr" | "sessionMessage$application$$7$$aggr" | "sessionMessage$application$$8$$aggr" | "sessionMessage$application$$9$$aggr"; +type Token$applicationAggr = "token$application$$aggr" | "token$application$$0$$aggr" | "token$application$$1$$aggr" | "token$application$$2$$aggr" | "token$application$$3$$aggr" | "token$application$$4$$aggr" | "token$application$$5$$aggr" | "token$application$$6$$aggr" | "token$application$$7$$aggr" | "token$application$$8$$aggr" | "token$application$$9$$aggr"; +type WechatMenu$applicationAggr = "wechatMenu$application$$aggr" | "wechatMenu$application$$0$$aggr" | "wechatMenu$application$$1$$aggr" | "wechatMenu$application$$2$$aggr" | "wechatMenu$application$$3$$aggr" | "wechatMenu$application$$4$$aggr" | "wechatMenu$application$$5$$aggr" | "wechatMenu$application$$6$$aggr" | "wechatMenu$application$$7$$aggr" | "wechatMenu$application$$8$$aggr" | "wechatMenu$application$$9$$aggr"; +type WechatPublicAutoReply$applicationAggr = "wechatPublicAutoReply$application$$aggr" | "wechatPublicAutoReply$application$$0$$aggr" | "wechatPublicAutoReply$application$$1$$aggr" | "wechatPublicAutoReply$application$$2$$aggr" | "wechatPublicAutoReply$application$$3$$aggr" | "wechatPublicAutoReply$application$$4$$aggr" | "wechatPublicAutoReply$application$$5$$aggr" | "wechatPublicAutoReply$application$$6$$aggr" | "wechatPublicAutoReply$application$$7$$aggr" | "wechatPublicAutoReply$application$$8$$aggr" | "wechatPublicAutoReply$application$$9$$aggr"; +type WechatPublicTag$applicationAggr = "wechatPublicTag$application$$aggr" | "wechatPublicTag$application$$0$$aggr" | "wechatPublicTag$application$$1$$aggr" | "wechatPublicTag$application$$2$$aggr" | "wechatPublicTag$application$$3$$aggr" | "wechatPublicTag$application$$4$$aggr" | "wechatPublicTag$application$$5$$aggr" | "wechatPublicTag$application$$6$$aggr" | "wechatPublicTag$application$$7$$aggr" | "wechatPublicTag$application$$8$$aggr" | "wechatPublicTag$application$$9$$aggr"; +type WechatQrCode$applicationAggr = "wechatQrCode$application$$aggr" | "wechatQrCode$application$$0$$aggr" | "wechatQrCode$application$$1$$aggr" | "wechatQrCode$application$$2$$aggr" | "wechatQrCode$application$$3$$aggr" | "wechatQrCode$application$$4$$aggr" | "wechatQrCode$application$$5$$aggr" | "wechatQrCode$application$$6$$aggr" | "wechatQrCode$application$$7$$aggr" | "wechatQrCode$application$$8$$aggr" | "wechatQrCode$application$$9$$aggr"; +type WechatTemplate$applicationAggr = "wechatTemplate$application$$aggr" | "wechatTemplate$application$$0$$aggr" | "wechatTemplate$application$$1$$aggr" | "wechatTemplate$application$$2$$aggr" | "wechatTemplate$application$$3$$aggr" | "wechatTemplate$application$$4$$aggr" | "wechatTemplate$application$$5$$aggr" | "wechatTemplate$application$$6$$aggr" | "wechatTemplate$application$$7$$aggr" | "wechatTemplate$application$$8$$aggr" | "wechatTemplate$application$$9$$aggr"; +type WechatUser$applicationAggr = "wechatUser$application$$aggr" | "wechatUser$application$$0$$aggr" | "wechatUser$application$$1$$aggr" | "wechatUser$application$$2$$aggr" | "wechatUser$application$$3$$aggr" | "wechatUser$application$$4$$aggr" | "wechatUser$application$$5$$aggr" | "wechatUser$application$$6$$aggr" | "wechatUser$application$$7$$aggr" | "wechatUser$application$$8$$aggr" | "wechatUser$application$$9$$aggr"; +type Pay$applicationAggr = "pay$application$$aggr" | "pay$application$$0$$aggr" | "pay$application$$1$$aggr" | "pay$application$$2$$aggr" | "pay$application$$3$$aggr" | "pay$application$$4$$aggr" | "pay$application$$5$$aggr" | "pay$application$$6$$aggr" | "pay$application$$7$$aggr" | "pay$application$$8$$aggr" | "pay$application$$9$$aggr"; +type WpProduct$applicationAggr = "wpProduct$application$$aggr" | "wpProduct$application$$0$$aggr" | "wpProduct$application$$1$$aggr" | "wpProduct$application$$2$$aggr" | "wpProduct$application$$3$$aggr" | "wpProduct$application$$4$$aggr" | "wpProduct$application$$5$$aggr" | "wpProduct$application$$6$$aggr" | "wpProduct$application$$7$$aggr" | "wpProduct$application$$8$$aggr" | "wpProduct$application$$9$$aggr"; +type Session$entityAggr = "session$entity$$aggr" | "session$entity$$0$$aggr" | "session$entity$$1$$aggr" | "session$entity$$2$$aggr" | "session$entity$$3$$aggr" | "session$entity$$4$$aggr" | "session$entity$$5$$aggr" | "session$entity$$6$$aggr" | "session$entity$$7$$aggr" | "session$entity$$8$$aggr" | "session$entity$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; domain?: Domain.Schema | null; applicationPassport$application?: Array; - applicationPassport$application$$aggr?: AggregationResult; extraFile$application?: Array; - extraFile$application$$aggr?: AggregationResult; notification$application?: Array; - notification$application$$aggr?: AggregationResult; sessionMessage$application?: Array; - sessionMessage$application$$aggr?: AggregationResult; token$application?: Array; - token$application$$aggr?: AggregationResult; wechatMenu$application?: Array; - wechatMenu$application$$aggr?: AggregationResult; wechatPublicAutoReply$application?: Array; - wechatPublicAutoReply$application$$aggr?: AggregationResult; wechatPublicTag$application?: Array; - wechatPublicTag$application$$aggr?: AggregationResult; wechatQrCode$application?: Array; - wechatQrCode$application$$aggr?: AggregationResult; wechatTemplate$application?: Array; - wechatTemplate$application$$aggr?: AggregationResult; wechatUser$application?: Array; - wechatUser$application$$aggr?: AggregationResult; pay$application?: Array; - pay$application$$aggr?: AggregationResult; wpProduct$application?: Array; - wpProduct$application$$aggr?: AggregationResult; session$entity?: Array; - session$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ApplicationPassport$applicationAggr]?: AggregationResult; +} & { + [A in ExtraFile$applicationAggr]?: AggregationResult; +} & { + [A in Notification$applicationAggr]?: AggregationResult; +} & { + [A in SessionMessage$applicationAggr]?: AggregationResult; +} & { + [A in Token$applicationAggr]?: AggregationResult; +} & { + [A in WechatMenu$applicationAggr]?: AggregationResult; +} & { + [A in WechatPublicAutoReply$applicationAggr]?: AggregationResult; +} & { + [A in WechatPublicTag$applicationAggr]?: AggregationResult; +} & { + [A in WechatQrCode$applicationAggr]?: AggregationResult; +} & { + [A in WechatTemplate$applicationAggr]?: AggregationResult; +} & { + [A in WechatUser$applicationAggr]?: AggregationResult; +} & { + [A in Pay$applicationAggr]?: AggregationResult; +} & { + [A in WpProduct$applicationAggr]?: AggregationResult; +} & { + [A in Session$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -183,88 +204,102 @@ export type Projection = { applicationPassport$application?: ApplicationPassport.Selection & { $entity: "applicationPassport"; }; - applicationPassport$application$$aggr?: ApplicationPassport.Aggregation & { - $entity: "applicationPassport"; - }; extraFile$application?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$application$$aggr?: ExtraFile.Aggregation & { - $entity: "extraFile"; - }; notification$application?: Notification.Selection & { $entity: "notification"; }; - notification$application$$aggr?: Notification.Aggregation & { - $entity: "notification"; - }; sessionMessage$application?: SessionMessage.Selection & { $entity: "sessionMessage"; }; - sessionMessage$application$$aggr?: SessionMessage.Aggregation & { - $entity: "sessionMessage"; - }; token$application?: Token.Selection & { $entity: "token"; }; - token$application$$aggr?: Token.Aggregation & { - $entity: "token"; - }; wechatMenu$application?: WechatMenu.Selection & { $entity: "wechatMenu"; }; - wechatMenu$application$$aggr?: WechatMenu.Aggregation & { - $entity: "wechatMenu"; - }; wechatPublicAutoReply$application?: WechatPublicAutoReply.Selection & { $entity: "wechatPublicAutoReply"; }; - wechatPublicAutoReply$application$$aggr?: WechatPublicAutoReply.Aggregation & { - $entity: "wechatPublicAutoReply"; - }; wechatPublicTag$application?: WechatPublicTag.Selection & { $entity: "wechatPublicTag"; }; - wechatPublicTag$application$$aggr?: WechatPublicTag.Aggregation & { - $entity: "wechatPublicTag"; - }; wechatQrCode$application?: WechatQrCode.Selection & { $entity: "wechatQrCode"; }; - wechatQrCode$application$$aggr?: WechatQrCode.Aggregation & { - $entity: "wechatQrCode"; - }; wechatTemplate$application?: WechatTemplate.Selection & { $entity: "wechatTemplate"; }; - wechatTemplate$application$$aggr?: WechatTemplate.Aggregation & { - $entity: "wechatTemplate"; - }; wechatUser$application?: WechatUser.Selection & { $entity: "wechatUser"; }; - wechatUser$application$$aggr?: WechatUser.Aggregation & { - $entity: "wechatUser"; - }; pay$application?: Pay.Selection & { $entity: "pay"; }; - pay$application$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; wpProduct$application?: WpProduct.Selection & { $entity: "wpProduct"; }; - wpProduct$application$$aggr?: WpProduct.Aggregation & { - $entity: "wpProduct"; - }; session$entity?: Session.Selection & { $entity: "session"; }; - session$entity$$aggr?: Session.Aggregation & { +} & Partial> & { + [A in ApplicationPassport$applicationAggr]?: ApplicationPassport.Aggregation & { + $entity: "applicationPassport"; + }; +} & { + [A in ExtraFile$applicationAggr]?: ExtraFile.Aggregation & { + $entity: "extraFile"; + }; +} & { + [A in Notification$applicationAggr]?: Notification.Aggregation & { + $entity: "notification"; + }; +} & { + [A in SessionMessage$applicationAggr]?: SessionMessage.Aggregation & { + $entity: "sessionMessage"; + }; +} & { + [A in Token$applicationAggr]?: Token.Aggregation & { + $entity: "token"; + }; +} & { + [A in WechatMenu$applicationAggr]?: WechatMenu.Aggregation & { + $entity: "wechatMenu"; + }; +} & { + [A in WechatPublicAutoReply$applicationAggr]?: WechatPublicAutoReply.Aggregation & { + $entity: "wechatPublicAutoReply"; + }; +} & { + [A in WechatPublicTag$applicationAggr]?: WechatPublicTag.Aggregation & { + $entity: "wechatPublicTag"; + }; +} & { + [A in WechatQrCode$applicationAggr]?: WechatQrCode.Aggregation & { + $entity: "wechatQrCode"; + }; +} & { + [A in WechatTemplate$applicationAggr]?: WechatTemplate.Aggregation & { + $entity: "wechatTemplate"; + }; +} & { + [A in WechatUser$applicationAggr]?: WechatUser.Aggregation & { + $entity: "wechatUser"; + }; +} & { + [A in Pay$applicationAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in WpProduct$applicationAggr]?: WpProduct.Aggregation & { + $entity: "wpProduct"; + }; +} & { + [A in Session$entityAggr]?: Session.Aggregation & { $entity: "session"; }; -} & Partial>; +}; type ApplicationIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/ApplicationPassport/Schema.d.ts b/lib/oak-app-domain/ApplicationPassport/Schema.d.ts index f6871f44..3a8b6f9e 100644 --- a/lib/oak-app-domain/ApplicationPassport/Schema.d.ts +++ b/lib/oak-app-domain/ApplicationPassport/Schema.d.ts @@ -12,10 +12,7 @@ export type OpSchema = EntityShape & { isDefault: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - applicationId: ForeignKey<"application">; - passportId: ForeignKey<"passport">; - isDefault: Boolean; +export type Schema = OpSchema & { application: Application.Schema; passport: Passport.Schema; } & { diff --git a/lib/oak-app-domain/Area/Schema.d.ts b/lib/oak-app-domain/Area/Schema.d.ts index 04eed7f4..a56685ad 100644 --- a/lib/oak-app-domain/Area/Schema.d.ts +++ b/lib/oak-app-domain/Area/Schema.d.ts @@ -16,24 +16,26 @@ export type OpSchema = EntityShape & { center: Geo; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - level: "province" | "city" | "district" | "street" | "country"; - depth: 0 | 1 | 2 | 3 | 4; - parentId?: ForeignKey<"area"> | null; - code: String<12>; - center: Geo; +type Address$areaAggr = "address$area$$aggr" | "address$area$$0$$aggr" | "address$area$$1$$aggr" | "address$area$$2$$aggr" | "address$area$$3$$aggr" | "address$area$$4$$aggr" | "address$area$$5$$aggr" | "address$area$$6$$aggr" | "address$area$$7$$aggr" | "address$area$$8$$aggr" | "address$area$$9$$aggr"; +type Area$parentAggr = "area$parent$$aggr" | "area$parent$$0$$aggr" | "area$parent$$1$$aggr" | "area$parent$$2$$aggr" | "area$parent$$3$$aggr" | "area$parent$$4$$aggr" | "area$parent$$5$$aggr" | "area$parent$$6$$aggr" | "area$parent$$7$$aggr" | "area$parent$$8$$aggr" | "area$parent$$9$$aggr"; +type Station$areaAggr = "station$area$$aggr" | "station$area$$0$$aggr" | "station$area$$1$$aggr" | "station$area$$2$$aggr" | "station$area$$3$$aggr" | "station$area$$4$$aggr" | "station$area$$5$$aggr" | "station$area$$6$$aggr" | "station$area$$7$$aggr" | "station$area$$8$$aggr" | "station$area$$9$$aggr"; +type Subway$areaAggr = "subway$area$$aggr" | "subway$area$$0$$aggr" | "subway$area$$1$$aggr" | "subway$area$$2$$aggr" | "subway$area$$3$$aggr" | "subway$area$$4$$aggr" | "subway$area$$5$$aggr" | "subway$area$$6$$aggr" | "subway$area$$7$$aggr" | "subway$area$$8$$aggr" | "subway$area$$9$$aggr"; +export type Schema = OpSchema & { parent?: Schema | null; address$area?: Array; - address$area$$aggr?: AggregationResult; area$parent?: Array; - area$parent$$aggr?: AggregationResult; station$area?: Array; - station$area$$aggr?: AggregationResult; subway$area?: Array; - subway$area$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Address$areaAggr]?: AggregationResult; +} & { + [A in Area$parentAggr]?: AggregationResult; +} & { + [A in Station$areaAggr]?: AggregationResult; +} & { + [A in Subway$areaAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -69,28 +71,32 @@ export type Projection = { address$area?: Address.Selection & { $entity: "address"; }; - address$area$$aggr?: Address.Aggregation & { - $entity: "address"; - }; area$parent?: Selection & { $entity: "area"; }; - area$parent$$aggr?: Aggregation & { - $entity: "area"; - }; station$area?: Station.Selection & { $entity: "station"; }; - station$area$$aggr?: Station.Aggregation & { - $entity: "station"; - }; subway$area?: Subway.Selection & { $entity: "subway"; }; - subway$area$$aggr?: Subway.Aggregation & { +} & Partial> & { + [A in Address$areaAggr]?: Address.Aggregation & { + $entity: "address"; + }; +} & { + [A in Area$parentAggr]?: Aggregation & { + $entity: "area"; + }; +} & { + [A in Station$areaAggr]?: Station.Aggregation & { + $entity: "station"; + }; +} & { + [A in Subway$areaAggr]?: Subway.Aggregation & { $entity: "subway"; }; -} & Partial>; +}; type AreaIdProjection = OneOf<{ id: number; parentId: number; diff --git a/lib/oak-app-domain/Article/Schema.d.ts b/lib/oak-app-domain/Article/Schema.d.ts index d3ef7d84..74a15012 100644 --- a/lib/oak-app-domain/Article/Schema.d.ts +++ b/lib/oak-app-domain/Article/Schema.d.ts @@ -12,15 +12,14 @@ export type OpSchema = EntityShape & { articleMenuId: ForeignKey<"articleMenu">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - content: Text; - articleMenuId: ForeignKey<"articleMenu">; +type ExtraFile$entityAggr = "extraFile$entity$$aggr" | "extraFile$entity$$0$$aggr" | "extraFile$entity$$1$$aggr" | "extraFile$entity$$2$$aggr" | "extraFile$entity$$3$$aggr" | "extraFile$entity$$4$$aggr" | "extraFile$entity$$5$$aggr" | "extraFile$entity$$6$$aggr" | "extraFile$entity$$7$$aggr" | "extraFile$entity$$8$$aggr" | "extraFile$entity$$9$$aggr"; +export type Schema = OpSchema & { articleMenu: ArticleMenu.Schema; extraFile$entity?: Array; - extraFile$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ExtraFile$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -48,10 +47,11 @@ export type Projection = { extraFile$entity?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$entity$$aggr?: ExtraFile.Aggregation & { +} & Partial> & { + [A in ExtraFile$entityAggr]?: ExtraFile.Aggregation & { $entity: "extraFile"; }; -} & Partial>; +}; type ArticleIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/ArticleMenu/Schema.d.ts b/lib/oak-app-domain/ArticleMenu/Schema.d.ts index 6b447b9b..7b5ba5e2 100644 --- a/lib/oak-app-domain/ArticleMenu/Schema.d.ts +++ b/lib/oak-app-domain/ArticleMenu/Schema.d.ts @@ -15,22 +15,22 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - isArticle: Boolean; - parentId?: ForeignKey<"articleMenu"> | null; - isLeaf?: Boolean | null; - entity: String<32>; - entityId: String<64>; +type Article$articleMenuAggr = "article$articleMenu$$aggr" | "article$articleMenu$$0$$aggr" | "article$articleMenu$$1$$aggr" | "article$articleMenu$$2$$aggr" | "article$articleMenu$$3$$aggr" | "article$articleMenu$$4$$aggr" | "article$articleMenu$$5$$aggr" | "article$articleMenu$$6$$aggr" | "article$articleMenu$$7$$aggr" | "article$articleMenu$$8$$aggr" | "article$articleMenu$$9$$aggr"; +type ArticleMenu$parentAggr = "articleMenu$parent$$aggr" | "articleMenu$parent$$0$$aggr" | "articleMenu$parent$$1$$aggr" | "articleMenu$parent$$2$$aggr" | "articleMenu$parent$$3$$aggr" | "articleMenu$parent$$4$$aggr" | "articleMenu$parent$$5$$aggr" | "articleMenu$parent$$6$$aggr" | "articleMenu$parent$$7$$aggr" | "articleMenu$parent$$8$$aggr" | "articleMenu$parent$$9$$aggr"; +type ExtraFile$entityAggr = "extraFile$entity$$aggr" | "extraFile$entity$$0$$aggr" | "extraFile$entity$$1$$aggr" | "extraFile$entity$$2$$aggr" | "extraFile$entity$$3$$aggr" | "extraFile$entity$$4$$aggr" | "extraFile$entity$$5$$aggr" | "extraFile$entity$$6$$aggr" | "extraFile$entity$$7$$aggr" | "extraFile$entity$$8$$aggr" | "extraFile$entity$$9$$aggr"; +export type Schema = OpSchema & { parent?: Schema | null; article$articleMenu?: Array; - article$articleMenu$$aggr?: AggregationResult; articleMenu$parent?: Array; - articleMenu$parent$$aggr?: AggregationResult; extraFile$entity?: Array; - extraFile$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Article$articleMenuAggr]?: AggregationResult; +} & { + [A in ArticleMenu$parentAggr]?: AggregationResult; +} & { + [A in ExtraFile$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -66,22 +66,25 @@ export type Projection = { article$articleMenu?: Article.Selection & { $entity: "article"; }; - article$articleMenu$$aggr?: Article.Aggregation & { - $entity: "article"; - }; articleMenu$parent?: Selection & { $entity: "articleMenu"; }; - articleMenu$parent$$aggr?: Aggregation & { - $entity: "articleMenu"; - }; extraFile$entity?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$entity$$aggr?: ExtraFile.Aggregation & { +} & Partial> & { + [A in Article$articleMenuAggr]?: Article.Aggregation & { + $entity: "article"; + }; +} & { + [A in ArticleMenu$parentAggr]?: Aggregation & { + $entity: "articleMenu"; + }; +} & { + [A in ExtraFile$entityAggr]?: ExtraFile.Aggregation & { $entity: "extraFile"; }; -} & Partial>; +}; type ArticleMenuIdProjection = OneOf<{ id: number; parentId: number; diff --git a/lib/oak-app-domain/Captcha/Schema.d.ts b/lib/oak-app-domain/Captcha/Schema.d.ts index 2da81a47..0e0746fe 100644 --- a/lib/oak-app-domain/Captcha/Schema.d.ts +++ b/lib/oak-app-domain/Captcha/Schema.d.ts @@ -16,18 +16,7 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - origin: "mobile" | "email"; - content: String<32>; - code: String<8>; - visitorId: Text; - reason?: Text | null; - env: Object; - expired: Boolean; - expiresAt: Datetime; - type: "login" | "changePassword" | "confirm"; - iState?: IState | null; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/lib/oak-app-domain/ChangePasswordTemp/Schema.d.ts b/lib/oak-app-domain/ChangePasswordTemp/Schema.d.ts index 85d1fa1e..247609ee 100644 --- a/lib/oak-app-domain/ChangePasswordTemp/Schema.d.ts +++ b/lib/oak-app-domain/ChangePasswordTemp/Schema.d.ts @@ -12,11 +12,7 @@ export type OpSchema = EntityShape & { result: "success" | "fail"; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - prevPassword?: String<32> | null; - newPassword?: String<32> | null; - result: "success" | "fail"; +export type Schema = OpSchema & { user: User.Schema; } & { [A in ExpressionKey]?: any; diff --git a/lib/oak-app-domain/Deposit/Schema.d.ts b/lib/oak-app-domain/Deposit/Schema.d.ts index cc32ee0b..0014837f 100644 --- a/lib/oak-app-domain/Deposit/Schema.d.ts +++ b/lib/oak-app-domain/Deposit/Schema.d.ts @@ -16,20 +16,19 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - price: Price; - loss: Price; - accountId: ForeignKey<"account">; - creatorId: ForeignKey<"user">; - iState?: IState | null; +type Pay$depositAggr = "pay$deposit$$aggr" | "pay$deposit$$0$$aggr" | "pay$deposit$$1$$aggr" | "pay$deposit$$2$$aggr" | "pay$deposit$$3$$aggr" | "pay$deposit$$4$$aggr" | "pay$deposit$$5$$aggr" | "pay$deposit$$6$$aggr" | "pay$deposit$$7$$aggr" | "pay$deposit$$8$$aggr" | "pay$deposit$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { account: Account.Schema; creator: User.Schema; pay$deposit?: Array; - pay$deposit$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Pay$depositAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -64,16 +63,18 @@ export type Projection = { pay$deposit?: Pay.Selection & { $entity: "pay"; }; - pay$deposit$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in Pay$depositAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type DepositIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Domain/Schema.d.ts b/lib/oak-app-domain/Domain/Schema.d.ts index a3ced1fc..7f5c372a 100644 --- a/lib/oak-app-domain/Domain/Schema.d.ts +++ b/lib/oak-app-domain/Domain/Schema.d.ts @@ -14,17 +14,14 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - url: String<64>; - apiPath?: String<32> | null; - protocol: "http:" | "https:"; - port: Int<2>; - systemId: ForeignKey<"system">; +type Application$domainAggr = "application$domain$$aggr" | "application$domain$$0$$aggr" | "application$domain$$1$$aggr" | "application$domain$$2$$aggr" | "application$domain$$3$$aggr" | "application$domain$$4$$aggr" | "application$domain$$5$$aggr" | "application$domain$$6$$aggr" | "application$domain$$7$$aggr" | "application$domain$$8$$aggr" | "application$domain$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; application$domain?: Array; - application$domain$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Application$domainAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -56,10 +53,11 @@ export type Projection = { application$domain?: Application.Selection & { $entity: "application"; }; - application$domain$$aggr?: Application.Aggregation & { +} & Partial> & { + [A in Application$domainAggr]?: Application.Aggregation & { $entity: "application"; }; -} & Partial>; +}; type DomainIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Email/Schema.d.ts b/lib/oak-app-domain/Email/Schema.d.ts index de14d964..d53fe3a0 100644 --- a/lib/oak-app-domain/Email/Schema.d.ts +++ b/lib/oak-app-domain/Email/Schema.d.ts @@ -13,15 +13,14 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - email: String<32>; - userId: ForeignKey<"user">; - ableState?: AbleState | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -49,10 +48,11 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type EmailIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/ExtraFile/Schema.d.ts b/lib/oak-app-domain/ExtraFile/Schema.d.ts index 8000484a..c6de5004 100644 --- a/lib/oak-app-domain/ExtraFile/Schema.d.ts +++ b/lib/oak-app-domain/ExtraFile/Schema.d.ts @@ -32,27 +32,7 @@ export type OpSchema = EntityShape & { applicationId: ForeignKey<"application">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - origin: "qiniu" | "wechat" | "ctyun" | "aliyun" | "tencent" | "unknown"; - type: "image" | "video" | "audio" | "file"; - bucket?: String<32> | null; - objectId?: String<64> | null; - tag1?: String<32> | null; - tag2?: String<32> | null; - filename: String<256>; - md5?: Text | null; - entity: "article" | "articleMenu" | "sessionMessage" | "user" | string; - entityId: String<64>; - extra1?: Text | null; - extra2?: Object | null; - extension?: String<16> | null; - size?: Int<8> | null; - sort?: Float<22, 10> | null; - fileType?: String<128> | null; - isBridge?: Boolean | null; - uploadState: "success" | "failed" | "uploading"; - uploadMeta?: Object | null; - applicationId: ForeignKey<"application">; +export type Schema = OpSchema & { application: Application.Schema; article?: Article.Schema; articleMenu?: ArticleMenu.Schema; diff --git a/lib/oak-app-domain/I18n/Schema.d.ts b/lib/oak-app-domain/I18n/Schema.d.ts index a3b5f81d..346e68cc 100644 --- a/lib/oak-app-domain/I18n/Schema.d.ts +++ b/lib/oak-app-domain/I18n/Schema.d.ts @@ -11,13 +11,7 @@ export type OpSchema = EntityShape & { data: Object; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - module: String<64>; - position: String<188>; - namespace: String<256>; - language: String<32>; - data: Object; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/lib/oak-app-domain/Livestream/Schema.d.ts b/lib/oak-app-domain/Livestream/Schema.d.ts index c30a6709..6918faa4 100644 --- a/lib/oak-app-domain/Livestream/Schema.d.ts +++ b/lib/oak-app-domain/Livestream/Schema.d.ts @@ -17,19 +17,7 @@ export type OpSchema = EntityShape & { expireAt: Datetime; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - title: String<32>; - streamTitle: String<32>; - liveonly: "online" | "offline"; - hub: String<32>; - streamKey: String<64>; - entity: String<32>; - entityId: String<64>; - rtmpPushUrl: String<64>; - rtmpPlayUrl: String<64>; - pcPushUrl: String<64>; - expireAt: Datetime; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/lib/oak-app-domain/Log/Schema.d.ts b/lib/oak-app-domain/Log/Schema.d.ts index 54a1eead..3802cd71 100644 --- a/lib/oak-app-domain/Log/Schema.d.ts +++ b/lib/oak-app-domain/Log/Schema.d.ts @@ -10,14 +10,13 @@ export type OpSchema = EntityShape & { iState: "normal" | "rollbacked"; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: String<32>; - entityId: String<64>; - iState: "normal" | "rollbacked"; +type Oper$logAggr = "oper$log$$aggr" | "oper$log$$0$$aggr" | "oper$log$$1$$aggr" | "oper$log$$2$$aggr" | "oper$log$$3$$aggr" | "oper$log$$4$$aggr" | "oper$log$$5$$aggr" | "oper$log$$6$$aggr" | "oper$log$$7$$aggr" | "oper$log$$8$$aggr" | "oper$log$$9$$aggr"; +export type Schema = OpSchema & { oper$log?: Array; - oper$log$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Oper$logAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -43,10 +42,11 @@ export type Projection = { oper$log?: Oper.Selection & { $entity: "oper"; }; - oper$log$$aggr?: Oper.Aggregation & { +} & Partial> & { + [A in Oper$logAggr]?: Oper.Aggregation & { $entity: "oper"; }; -} & Partial>; +}; type LogIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/LoginName/Schema.d.ts b/lib/oak-app-domain/LoginName/Schema.d.ts index 62bd4dbf..192267de 100644 --- a/lib/oak-app-domain/LoginName/Schema.d.ts +++ b/lib/oak-app-domain/LoginName/Schema.d.ts @@ -13,15 +13,14 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - userId: ForeignKey<"user">; - ableState?: AbleState | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -49,10 +48,11 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type LoginNameIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Message/Schema.d.ts b/lib/oak-app-domain/Message/Schema.d.ts index 04726d01..3bb7bfda 100644 --- a/lib/oak-app-domain/Message/Schema.d.ts +++ b/lib/oak-app-domain/Message/Schema.d.ts @@ -37,29 +37,19 @@ export type OpSchema = EntityShape & { visitState?: VisitState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: String<32>; - entityId: String<64>; - userId: ForeignKey<"user">; - type: String<64>; - weight: Weight; - restriction?: MessageRestriction | null; - title: String<256>; - content: Text; - data?: Object | null; - router?: Router | null; - platformId?: ForeignKey<"platform"> | null; - channels?: Channels | null; - iState?: IState | null; - visitState?: VisitState | null; +type MessageSystem$messageAggr = "messageSystem$message$$aggr" | "messageSystem$message$$0$$aggr" | "messageSystem$message$$1$$aggr" | "messageSystem$message$$2$$aggr" | "messageSystem$message$$3$$aggr" | "messageSystem$message$$4$$aggr" | "messageSystem$message$$5$$aggr" | "messageSystem$message$$6$$aggr" | "messageSystem$message$$7$$aggr" | "messageSystem$message$$8$$aggr" | "messageSystem$message$$9$$aggr"; +type WechatMpJump$messageAggr = "wechatMpJump$message$$aggr" | "wechatMpJump$message$$0$$aggr" | "wechatMpJump$message$$1$$aggr" | "wechatMpJump$message$$2$$aggr" | "wechatMpJump$message$$3$$aggr" | "wechatMpJump$message$$4$$aggr" | "wechatMpJump$message$$5$$aggr" | "wechatMpJump$message$$6$$aggr" | "wechatMpJump$message$$7$$aggr" | "wechatMpJump$message$$8$$aggr" | "wechatMpJump$message$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; platform?: Platform.Schema | null; messageSystem$message?: Array; - messageSystem$message$$aggr?: AggregationResult; wechatMpJump$message?: Array; - wechatMpJump$message$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in MessageSystem$messageAggr]?: AggregationResult; +} & { + [A in WechatMpJump$messageAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -112,16 +102,18 @@ export type Projection = { messageSystem$message?: MessageSystem.Selection & { $entity: "messageSystem"; }; - messageSystem$message$$aggr?: MessageSystem.Aggregation & { - $entity: "messageSystem"; - }; wechatMpJump$message?: WechatMpJump.Selection & { $entity: "wechatMpJump"; }; - wechatMpJump$message$$aggr?: WechatMpJump.Aggregation & { +} & Partial> & { + [A in MessageSystem$messageAggr]?: MessageSystem.Aggregation & { + $entity: "messageSystem"; + }; +} & { + [A in WechatMpJump$messageAggr]?: WechatMpJump.Aggregation & { $entity: "wechatMpJump"; }; -} & Partial>; +}; type MessageIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/MessageSystem/Schema.d.ts b/lib/oak-app-domain/MessageSystem/Schema.d.ts index 0f7551f4..ade4b8d5 100644 --- a/lib/oak-app-domain/MessageSystem/Schema.d.ts +++ b/lib/oak-app-domain/MessageSystem/Schema.d.ts @@ -11,15 +11,15 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - messageId: ForeignKey<"message">; - systemId: ForeignKey<"system">; +type Notification$messageSystemAggr = "notification$messageSystem$$aggr" | "notification$messageSystem$$0$$aggr" | "notification$messageSystem$$1$$aggr" | "notification$messageSystem$$2$$aggr" | "notification$messageSystem$$3$$aggr" | "notification$messageSystem$$4$$aggr" | "notification$messageSystem$$5$$aggr" | "notification$messageSystem$$6$$aggr" | "notification$messageSystem$$7$$aggr" | "notification$messageSystem$$8$$aggr" | "notification$messageSystem$$9$$aggr"; +export type Schema = OpSchema & { message: Message.Schema; system: System.Schema; notification$messageSystem?: Array; - notification$messageSystem$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Notification$messageSystemAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -47,10 +47,11 @@ export type Projection = { notification$messageSystem?: Notification.Selection & { $entity: "notification"; }; - notification$messageSystem$$aggr?: Notification.Aggregation & { +} & Partial> & { + [A in Notification$messageSystemAggr]?: Notification.Aggregation & { $entity: "notification"; }; -} & Partial>; +}; type MessageSystemIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/MessageType/Schema.d.ts b/lib/oak-app-domain/MessageType/Schema.d.ts index 4ea472bd..b6499c40 100644 --- a/lib/oak-app-domain/MessageType/Schema.d.ts +++ b/lib/oak-app-domain/MessageType/Schema.d.ts @@ -7,9 +7,7 @@ export type OpSchema = EntityShape & { type: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - type: String<64>; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/lib/oak-app-domain/MessageTypeSmsTemplate/Schema.d.ts b/lib/oak-app-domain/MessageTypeSmsTemplate/Schema.d.ts index 51b3d973..76288d69 100644 --- a/lib/oak-app-domain/MessageTypeSmsTemplate/Schema.d.ts +++ b/lib/oak-app-domain/MessageTypeSmsTemplate/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { templateId: ForeignKey<"smsTemplate">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - type: String<64>; - templateId: ForeignKey<"smsTemplate">; +export type Schema = OpSchema & { template: SmsTemplate.Schema; } & { [A in ExpressionKey]?: any; diff --git a/lib/oak-app-domain/MessageTypeTemplate/Schema.d.ts b/lib/oak-app-domain/MessageTypeTemplate/Schema.d.ts index 12dde6c5..66816933 100644 --- a/lib/oak-app-domain/MessageTypeTemplate/Schema.d.ts +++ b/lib/oak-app-domain/MessageTypeTemplate/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { templateId: ForeignKey<"wechatTemplate">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - type: String<64>; - templateId: ForeignKey<"wechatTemplate">; +export type Schema = OpSchema & { template: WechatTemplate.Schema; } & { [A in ExpressionKey]?: any; diff --git a/lib/oak-app-domain/Mobile/Schema.d.ts b/lib/oak-app-domain/Mobile/Schema.d.ts index 63998fc3..8e826916 100644 --- a/lib/oak-app-domain/Mobile/Schema.d.ts +++ b/lib/oak-app-domain/Mobile/Schema.d.ts @@ -13,15 +13,14 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - mobile: String<16>; - userId?: ForeignKey<"user"> | null; - ableState?: AbleState | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user?: User.Schema | null; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -49,10 +48,11 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type MobileIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Modi/Schema.d.ts b/lib/oak-app-domain/Modi/Schema.d.ts index 74ccc7dc..b67f85ac 100644 --- a/lib/oak-app-domain/Modi/Schema.d.ts +++ b/lib/oak-app-domain/Modi/Schema.d.ts @@ -15,19 +15,13 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - targetEntity: String<32>; - entity: String<32>; - entityId: String<64>; - action: String<24>; - data: Object; - filter?: Object | null; - extra?: Object | null; - iState?: IState | null; +type ModiEntity$modiAggr = "modiEntity$modi$$aggr" | "modiEntity$modi$$0$$aggr" | "modiEntity$modi$$1$$aggr" | "modiEntity$modi$$2$$aggr" | "modiEntity$modi$$3$$aggr" | "modiEntity$modi$$4$$aggr" | "modiEntity$modi$$5$$aggr" | "modiEntity$modi$$6$$aggr" | "modiEntity$modi$$7$$aggr" | "modiEntity$modi$$8$$aggr" | "modiEntity$modi$$9$$aggr"; +export type Schema = OpSchema & { modiEntity$modi?: Array; - modiEntity$modi$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ModiEntity$modiAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -63,10 +57,11 @@ export type Projection = { modiEntity$modi?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$modi$$aggr?: ModiEntity.Aggregation & { +} & Partial> & { + [A in ModiEntity$modiAggr]?: ModiEntity.Aggregation & { $entity: "modiEntity"; }; -} & Partial>; +}; type ModiIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/ModiEntity/Schema.d.ts b/lib/oak-app-domain/ModiEntity/Schema.d.ts index 5d20d72b..129ae203 100644 --- a/lib/oak-app-domain/ModiEntity/Schema.d.ts +++ b/lib/oak-app-domain/ModiEntity/Schema.d.ts @@ -19,10 +19,7 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - modiId: ForeignKey<"modi">; - entity: "user" | "wechatPay" | "withdraw" | "withdrawAccount" | "withdrawChannel" | "withdrawTransfer" | "wpAccount" | "wpProduct" | string; - entityId: String<64>; +export type Schema = OpSchema & { modi: Modi.Schema; user?: User.Schema; wechatPay?: WechatPay.Schema; diff --git a/lib/oak-app-domain/Notification/Schema.d.ts b/lib/oak-app-domain/Notification/Schema.d.ts index 07a62249..fc6523c3 100644 --- a/lib/oak-app-domain/Notification/Schema.d.ts +++ b/lib/oak-app-domain/Notification/Schema.d.ts @@ -18,15 +18,7 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - channel: Channel; - applicationId?: ForeignKey<"application"> | null; - data?: Object | null; - messageSystemId: ForeignKey<"messageSystem">; - data1?: Object | null; - data2?: Object | null; - templateId?: String<128> | null; - iState?: IState | null; +export type Schema = OpSchema & { application?: Application.Schema | null; messageSystem: MessageSystem.Schema; } & { diff --git a/lib/oak-app-domain/OfflineAccount/Schema.d.ts b/lib/oak-app-domain/OfflineAccount/Schema.d.ts index 4b60674b..45d6a53f 100644 --- a/lib/oak-app-domain/OfflineAccount/Schema.d.ts +++ b/lib/oak-app-domain/OfflineAccount/Schema.d.ts @@ -25,30 +25,22 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - taxLossRatio: Decimal<4, 2>; - refundGapDays?: Int<4> | null; - refundCompensateRatio?: Int<4> | null; - allowWithdrawTransfer: Boolean; - withdrawTransferLossRatio?: Decimal<4, 2> | null; - type: "bank" | "alipay" | "wechat" | "shouqianba" | "others"; - channel?: String<32> | null; - name?: String<64> | null; - qrCode?: Text | null; - allowDeposit: Boolean; - allowPay: Boolean; - systemId: ForeignKey<"system">; - price: Price; - enabled: Boolean; +type Pay$entityAggr = "pay$entity$$aggr" | "pay$entity$$0$$aggr" | "pay$entity$$1$$aggr" | "pay$entity$$2$$aggr" | "pay$entity$$3$$aggr" | "pay$entity$$4$$aggr" | "pay$entity$$5$$aggr" | "pay$entity$$6$$aggr" | "pay$entity$$7$$aggr" | "pay$entity$$8$$aggr" | "pay$entity$$9$$aggr"; +type SysAccountOper$entityAggr = "sysAccountOper$entity$$aggr" | "sysAccountOper$entity$$0$$aggr" | "sysAccountOper$entity$$1$$aggr" | "sysAccountOper$entity$$2$$aggr" | "sysAccountOper$entity$$3$$aggr" | "sysAccountOper$entity$$4$$aggr" | "sysAccountOper$entity$$5$$aggr" | "sysAccountOper$entity$$6$$aggr" | "sysAccountOper$entity$$7$$aggr" | "sysAccountOper$entity$$8$$aggr" | "sysAccountOper$entity$$9$$aggr"; +type WithdrawChannel$entityAggr = "withdrawChannel$entity$$aggr" | "withdrawChannel$entity$$0$$aggr" | "withdrawChannel$entity$$1$$aggr" | "withdrawChannel$entity$$2$$aggr" | "withdrawChannel$entity$$3$$aggr" | "withdrawChannel$entity$$4$$aggr" | "withdrawChannel$entity$$5$$aggr" | "withdrawChannel$entity$$6$$aggr" | "withdrawChannel$entity$$7$$aggr" | "withdrawChannel$entity$$8$$aggr" | "withdrawChannel$entity$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; pay$entity?: Array; - pay$entity$$aggr?: AggregationResult; sysAccountOper$entity?: Array; - sysAccountOper$entity$$aggr?: AggregationResult; withdrawChannel$entity?: Array; - withdrawChannel$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Pay$entityAggr]?: AggregationResult; +} & { + [A in SysAccountOper$entityAggr]?: AggregationResult; +} & { + [A in WithdrawChannel$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -100,22 +92,25 @@ export type Projection = { pay$entity?: Pay.Selection & { $entity: "pay"; }; - pay$entity$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; sysAccountOper$entity?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$entity$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; withdrawChannel$entity?: WithdrawChannel.Selection & { $entity: "withdrawChannel"; }; - withdrawChannel$entity$$aggr?: WithdrawChannel.Aggregation & { +} & Partial> & { + [A in Pay$entityAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in SysAccountOper$entityAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in WithdrawChannel$entityAggr]?: WithdrawChannel.Aggregation & { $entity: "withdrawChannel"; }; -} & Partial>; +}; type OfflineAccountIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Oper/Schema.d.ts b/lib/oak-app-domain/Oper/Schema.d.ts index 8c5f3c18..a8689396 100644 --- a/lib/oak-app-domain/Oper/Schema.d.ts +++ b/lib/oak-app-domain/Oper/Schema.d.ts @@ -20,23 +20,15 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - action: String<24>; - data: Object; - filter?: Object | null; - extra?: Object | null; - operatorId?: ForeignKey<"user"> | null; - targetEntity: String<32>; - bornAt?: Datetime | null; - logId?: ForeignKey<"log"> | null; - undoData?: Object | null; - iState?: IState | null; +type OperEntity$operAggr = "operEntity$oper$$aggr" | "operEntity$oper$$0$$aggr" | "operEntity$oper$$1$$aggr" | "operEntity$oper$$2$$aggr" | "operEntity$oper$$3$$aggr" | "operEntity$oper$$4$$aggr" | "operEntity$oper$$5$$aggr" | "operEntity$oper$$6$$aggr" | "operEntity$oper$$7$$aggr" | "operEntity$oper$$8$$aggr" | "operEntity$oper$$9$$aggr"; +export type Schema = OpSchema & { operator?: User.Schema | null; log?: Log.Schema | null; operEntity$oper?: Array; - operEntity$oper$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in OperEntity$operAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -80,10 +72,11 @@ export type Projection = { operEntity$oper?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$oper$$aggr?: OperEntity.Aggregation & { +} & Partial> & { + [A in OperEntity$operAggr]?: OperEntity.Aggregation & { $entity: "operEntity"; }; -} & Partial>; +}; type OperIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/OperEntity/Schema.d.ts b/lib/oak-app-domain/OperEntity/Schema.d.ts index 4f216d22..51cf0827 100644 --- a/lib/oak-app-domain/OperEntity/Schema.d.ts +++ b/lib/oak-app-domain/OperEntity/Schema.d.ts @@ -19,10 +19,7 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - operId: ForeignKey<"oper">; - entity: "user" | "wechatPay" | "withdraw" | "withdrawAccount" | "withdrawChannel" | "withdrawTransfer" | "wpAccount" | "wpProduct" | string; - entityId: String<64>; +export type Schema = OpSchema & { oper: Oper.Schema; user?: User.Schema; wechatPay?: WechatPay.Schema; diff --git a/lib/oak-app-domain/Order/Schema.d.ts b/lib/oak-app-domain/Order/Schema.d.ts index 6c7fad75..225c2e29 100644 --- a/lib/oak-app-domain/Order/Schema.d.ts +++ b/lib/oak-app-domain/Order/Schema.d.ts @@ -24,28 +24,19 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - price: Price; - paid: Price; - refunded: Price; - title: String<32>; - desc: Text; - timeoutAt?: Datetime | null; - creatorId: ForeignKey<"user">; - entity: String<32>; - entityId: String<64>; - settled: Boolean; - allowPartialPay?: Boolean | null; - systemId: ForeignKey<"system">; - iState?: IState | null; +type Pay$orderAggr = "pay$order$$aggr" | "pay$order$$0$$aggr" | "pay$order$$1$$aggr" | "pay$order$$2$$aggr" | "pay$order$$3$$aggr" | "pay$order$$4$$aggr" | "pay$order$$5$$aggr" | "pay$order$$6$$aggr" | "pay$order$$7$$aggr" | "pay$order$$8$$aggr" | "pay$order$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { creator: User.Schema; system: System.Schema; pay$order?: Array; - pay$order$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Pay$orderAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -96,16 +87,18 @@ export type Projection = { pay$order?: Pay.Selection & { $entity: "pay"; }; - pay$order$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in Pay$orderAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type OrderIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Parasite/Schema.d.ts b/lib/oak-app-domain/Parasite/Schema.d.ts index 95517b05..ceadc08c 100644 --- a/lib/oak-app-domain/Parasite/Schema.d.ts +++ b/lib/oak-app-domain/Parasite/Schema.d.ts @@ -23,21 +23,14 @@ export type OpSchema = EntityShape & { tokenLifeLength?: Int<4> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - entity: String<32>; - entityId: String<64>; - showTip?: Boolean | null; - expiresAt: Datetime; - expired: Boolean; - redirectTo: RedirectTo; - multiple?: Boolean | null; - tokenLifeLength?: Int<4> | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -77,10 +70,11 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type ParasiteIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Passport/Schema.d.ts b/lib/oak-app-domain/Passport/Schema.d.ts index 3625ef03..c11a0e17 100644 --- a/lib/oak-app-domain/Passport/Schema.d.ts +++ b/lib/oak-app-domain/Passport/Schema.d.ts @@ -36,16 +36,14 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - systemId: ForeignKey<"system">; - type: Type; - config?: (SmsConfig | EmailConfig | PfwConfig | MfwConfig) | null; - enabled: Boolean; +type ApplicationPassport$passportAggr = "applicationPassport$passport$$aggr" | "applicationPassport$passport$$0$$aggr" | "applicationPassport$passport$$1$$aggr" | "applicationPassport$passport$$2$$aggr" | "applicationPassport$passport$$3$$aggr" | "applicationPassport$passport$$4$$aggr" | "applicationPassport$passport$$5$$aggr" | "applicationPassport$passport$$6$$aggr" | "applicationPassport$passport$$7$$aggr" | "applicationPassport$passport$$8$$aggr" | "applicationPassport$passport$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; applicationPassport$passport?: Array; - applicationPassport$passport$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ApplicationPassport$passportAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -75,10 +73,11 @@ export type Projection = { applicationPassport$passport?: ApplicationPassport.Selection & { $entity: "applicationPassport"; }; - applicationPassport$passport$$aggr?: ApplicationPassport.Aggregation & { +} & Partial> & { + [A in ApplicationPassport$passportAggr]?: ApplicationPassport.Aggregation & { $entity: "applicationPassport"; }; -} & Partial>; +}; type PassportIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Path/Schema.d.ts b/lib/oak-app-domain/Path/Schema.d.ts index 9d105675..906337af 100644 --- a/lib/oak-app-domain/Path/Schema.d.ts +++ b/lib/oak-app-domain/Path/Schema.d.ts @@ -13,18 +13,17 @@ export type OpSchema = EntityShape & { desc?: String<256> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - destEntity: String<32>; - value: String<256>; - recursive: Boolean; - sourceEntity: String<32>; - desc?: String<256> | null; +type ActionAuth$pathAggr = "actionAuth$path$$aggr" | "actionAuth$path$$0$$aggr" | "actionAuth$path$$1$$aggr" | "actionAuth$path$$2$$aggr" | "actionAuth$path$$3$$aggr" | "actionAuth$path$$4$$aggr" | "actionAuth$path$$5$$aggr" | "actionAuth$path$$6$$aggr" | "actionAuth$path$$7$$aggr" | "actionAuth$path$$8$$aggr" | "actionAuth$path$$9$$aggr"; +type RelationAuth$pathAggr = "relationAuth$path$$aggr" | "relationAuth$path$$0$$aggr" | "relationAuth$path$$1$$aggr" | "relationAuth$path$$2$$aggr" | "relationAuth$path$$3$$aggr" | "relationAuth$path$$4$$aggr" | "relationAuth$path$$5$$aggr" | "relationAuth$path$$6$$aggr" | "relationAuth$path$$7$$aggr" | "relationAuth$path$$8$$aggr" | "relationAuth$path$$9$$aggr"; +export type Schema = OpSchema & { actionAuth$path?: Array; - actionAuth$path$$aggr?: AggregationResult; relationAuth$path?: Array; - relationAuth$path$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ActionAuth$pathAggr]?: AggregationResult; +} & { + [A in RelationAuth$pathAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -55,16 +54,18 @@ export type Projection = { actionAuth$path?: ActionAuth.Selection & { $entity: "actionAuth"; }; - actionAuth$path$$aggr?: ActionAuth.Aggregation & { - $entity: "actionAuth"; - }; relationAuth$path?: RelationAuth.Selection & { $entity: "relationAuth"; }; - relationAuth$path$$aggr?: RelationAuth.Aggregation & { +} & Partial> & { + [A in ActionAuth$pathAggr]?: ActionAuth.Aggregation & { + $entity: "actionAuth"; + }; +} & { + [A in RelationAuth$pathAggr]?: RelationAuth.Aggregation & { $entity: "relationAuth"; }; -} & Partial>; +}; type PathIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Pay/Schema.d.ts b/lib/oak-app-domain/Pay/Schema.d.ts index 0d10028d..5959e861 100644 --- a/lib/oak-app-domain/Pay/Schema.d.ts +++ b/lib/oak-app-domain/Pay/Schema.d.ts @@ -37,27 +37,10 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - price: Price; - paid: Price; - refunded: Price; - entity: "account" | "offlineAccount" | "wpProduct" | string; - entityId: String<64>; - timeoutAt?: Datetime | null; - successAt?: Datetime | null; - forbidRefundAt?: Datetime | null; - refundable: Boolean; - depositId?: ForeignKey<"deposit"> | null; - orderId?: ForeignKey<"order"> | null; - externalId?: String<80> | null; - meta: Object; - applicationId: ForeignKey<"application">; - creatorId: ForeignKey<"user">; - phantom1?: String<32> | null; - phantom2?: String<32> | null; - phantom3?: Int<4> | null; - phantom4?: Int<8> | null; - iState?: IState | null; +type Refund$payAggr = "refund$pay$$aggr" | "refund$pay$$0$$aggr" | "refund$pay$$1$$aggr" | "refund$pay$$2$$aggr" | "refund$pay$$3$$aggr" | "refund$pay$$4$$aggr" | "refund$pay$$5$$aggr" | "refund$pay$$6$$aggr" | "refund$pay$$7$$aggr" | "refund$pay$$8$$aggr" | "refund$pay$$9$$aggr"; +type SysAccountOper$payAggr = "sysAccountOper$pay$$aggr" | "sysAccountOper$pay$$0$$aggr" | "sysAccountOper$pay$$1$$aggr" | "sysAccountOper$pay$$2$$aggr" | "sysAccountOper$pay$$3$$aggr" | "sysAccountOper$pay$$4$$aggr" | "sysAccountOper$pay$$5$$aggr" | "sysAccountOper$pay$$6$$aggr" | "sysAccountOper$pay$$7$$aggr" | "sysAccountOper$pay$$8$$aggr" | "sysAccountOper$pay$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { deposit?: Deposit.Schema | null; order?: Order.Schema | null; application: Application.Schema; @@ -66,13 +49,16 @@ export type Schema = EntityShape & { offlineAccount?: OfflineAccount.Schema; wpProduct?: WpProduct.Schema; refund$pay?: Array; - refund$pay$$aggr?: AggregationResult; sysAccountOper$pay?: Array; - sysAccountOper$pay$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Refund$payAggr]?: AggregationResult; +} & { + [A in SysAccountOper$payAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -148,22 +134,25 @@ export type Projection = { refund$pay?: Refund.Selection & { $entity: "refund"; }; - refund$pay$$aggr?: Refund.Aggregation & { - $entity: "refund"; - }; sysAccountOper$pay?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$pay$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in Refund$payAggr]?: Refund.Aggregation & { + $entity: "refund"; + }; +} & { + [A in SysAccountOper$payAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type PayIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Platform/Schema.d.ts b/lib/oak-app-domain/Platform/Schema.d.ts index 25c135b8..d5d36ffe 100644 --- a/lib/oak-app-domain/Platform/Schema.d.ts +++ b/lib/oak-app-domain/Platform/Schema.d.ts @@ -17,19 +17,17 @@ export type OpSchema = EntityShape & { entityId?: String<64> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - description?: Text | null; - config: Config; - style?: Style | null; - entity?: String<32> | null; - entityId?: String<64> | null; +type Message$platformAggr = "message$platform$$aggr" | "message$platform$$0$$aggr" | "message$platform$$1$$aggr" | "message$platform$$2$$aggr" | "message$platform$$3$$aggr" | "message$platform$$4$$aggr" | "message$platform$$5$$aggr" | "message$platform$$6$$aggr" | "message$platform$$7$$aggr" | "message$platform$$8$$aggr" | "message$platform$$9$$aggr"; +type System$platformAggr = "system$platform$$aggr" | "system$platform$$0$$aggr" | "system$platform$$1$$aggr" | "system$platform$$2$$aggr" | "system$platform$$3$$aggr" | "system$platform$$4$$aggr" | "system$platform$$5$$aggr" | "system$platform$$6$$aggr" | "system$platform$$7$$aggr" | "system$platform$$8$$aggr" | "system$platform$$9$$aggr"; +export type Schema = OpSchema & { message$platform?: Array; - message$platform$$aggr?: AggregationResult; system$platform?: Array; - system$platform$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Message$platformAggr]?: AggregationResult; +} & { + [A in System$platformAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -62,16 +60,18 @@ export type Projection = { message$platform?: Message.Selection & { $entity: "message"; }; - message$platform$$aggr?: Message.Aggregation & { - $entity: "message"; - }; system$platform?: System.Selection & { $entity: "system"; }; - system$platform$$aggr?: System.Aggregation & { +} & Partial> & { + [A in Message$platformAggr]?: Message.Aggregation & { + $entity: "message"; + }; +} & { + [A in System$platformAggr]?: System.Aggregation & { $entity: "system"; }; -} & Partial>; +}; type PlatformIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/ReadRemark/Schema.d.ts b/lib/oak-app-domain/ReadRemark/Schema.d.ts index 38b4d811..6db38c76 100644 --- a/lib/oak-app-domain/ReadRemark/Schema.d.ts +++ b/lib/oak-app-domain/ReadRemark/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { sessionId: ForeignKey<"session">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - sessionId: ForeignKey<"session">; +export type Schema = OpSchema & { user: User.Schema; session: Session.Schema; } & { diff --git a/lib/oak-app-domain/Refund/Schema.d.ts b/lib/oak-app-domain/Refund/Schema.d.ts index e0f83100..61d8b772 100644 --- a/lib/oak-app-domain/Refund/Schema.d.ts +++ b/lib/oak-app-domain/Refund/Schema.d.ts @@ -23,27 +23,20 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - withdrawId?: ForeignKey<"withdraw"> | null; - loss: Price; - payId: ForeignKey<"pay">; - meta?: Object | null; - externalMeta?: Object | null; - externalId?: String<128> | null; - price: Price; - creatorId: ForeignKey<"user">; - reason?: Text | null; - successAt?: Datetime | null; - iState?: IState | null; +type SysAccountOper$refundAggr = "sysAccountOper$refund$$aggr" | "sysAccountOper$refund$$0$$aggr" | "sysAccountOper$refund$$1$$aggr" | "sysAccountOper$refund$$2$$aggr" | "sysAccountOper$refund$$3$$aggr" | "sysAccountOper$refund$$4$$aggr" | "sysAccountOper$refund$$5$$aggr" | "sysAccountOper$refund$$6$$aggr" | "sysAccountOper$refund$$7$$aggr" | "sysAccountOper$refund$$8$$aggr" | "sysAccountOper$refund$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { withdraw?: Withdraw.Schema | null; pay: Pay.Schema; creator: User.Schema; sysAccountOper$refund?: Array; - sysAccountOper$refund$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SysAccountOper$refundAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -92,16 +85,18 @@ export type Projection = { sysAccountOper$refund?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$refund$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in SysAccountOper$refundAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type RefundIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Relation/Schema.d.ts b/lib/oak-app-domain/Relation/Schema.d.ts index dc0046b7..9fa781d4 100644 --- a/lib/oak-app-domain/Relation/Schema.d.ts +++ b/lib/oak-app-domain/Relation/Schema.d.ts @@ -17,25 +17,31 @@ export type OpSchema = EntityShape & { display?: String<32> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: "session" | "toDo" | string; - entityId?: String<64> | null; - name?: String<32> | null; - display?: String<32> | null; +type ActionAuth$relationAggr = "actionAuth$relation$$aggr" | "actionAuth$relation$$0$$aggr" | "actionAuth$relation$$1$$aggr" | "actionAuth$relation$$2$$aggr" | "actionAuth$relation$$3$$aggr" | "actionAuth$relation$$4$$aggr" | "actionAuth$relation$$5$$aggr" | "actionAuth$relation$$6$$aggr" | "actionAuth$relation$$7$$aggr" | "actionAuth$relation$$8$$aggr" | "actionAuth$relation$$9$$aggr"; +type RelationAuth$sourceRelationAggr = "relationAuth$sourceRelation$$aggr" | "relationAuth$sourceRelation$$0$$aggr" | "relationAuth$sourceRelation$$1$$aggr" | "relationAuth$sourceRelation$$2$$aggr" | "relationAuth$sourceRelation$$3$$aggr" | "relationAuth$sourceRelation$$4$$aggr" | "relationAuth$sourceRelation$$5$$aggr" | "relationAuth$sourceRelation$$6$$aggr" | "relationAuth$sourceRelation$$7$$aggr" | "relationAuth$sourceRelation$$8$$aggr" | "relationAuth$sourceRelation$$9$$aggr"; +type RelationAuth$destRelationAggr = "relationAuth$destRelation$$aggr" | "relationAuth$destRelation$$0$$aggr" | "relationAuth$destRelation$$1$$aggr" | "relationAuth$destRelation$$2$$aggr" | "relationAuth$destRelation$$3$$aggr" | "relationAuth$destRelation$$4$$aggr" | "relationAuth$destRelation$$5$$aggr" | "relationAuth$destRelation$$6$$aggr" | "relationAuth$destRelation$$7$$aggr" | "relationAuth$destRelation$$8$$aggr" | "relationAuth$destRelation$$9$$aggr"; +type UserEntityClaim$relationAggr = "userEntityClaim$relation$$aggr" | "userEntityClaim$relation$$0$$aggr" | "userEntityClaim$relation$$1$$aggr" | "userEntityClaim$relation$$2$$aggr" | "userEntityClaim$relation$$3$$aggr" | "userEntityClaim$relation$$4$$aggr" | "userEntityClaim$relation$$5$$aggr" | "userEntityClaim$relation$$6$$aggr" | "userEntityClaim$relation$$7$$aggr" | "userEntityClaim$relation$$8$$aggr" | "userEntityClaim$relation$$9$$aggr"; +type UserRelation$relationAggr = "userRelation$relation$$aggr" | "userRelation$relation$$0$$aggr" | "userRelation$relation$$1$$aggr" | "userRelation$relation$$2$$aggr" | "userRelation$relation$$3$$aggr" | "userRelation$relation$$4$$aggr" | "userRelation$relation$$5$$aggr" | "userRelation$relation$$6$$aggr" | "userRelation$relation$$7$$aggr" | "userRelation$relation$$8$$aggr" | "userRelation$relation$$9$$aggr"; +export type Schema = OpSchema & { session?: Session.Schema; toDo?: ToDo.Schema; actionAuth$relation?: Array; - actionAuth$relation$$aggr?: AggregationResult; relationAuth$sourceRelation?: Array; - relationAuth$sourceRelation$$aggr?: AggregationResult; relationAuth$destRelation?: Array; - relationAuth$destRelation$$aggr?: AggregationResult; userEntityClaim$relation?: Array; - userEntityClaim$relation$$aggr?: AggregationResult; userRelation$relation?: Array; - userRelation$relation$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ActionAuth$relationAggr]?: AggregationResult; +} & { + [A in RelationAuth$sourceRelationAggr]?: AggregationResult; +} & { + [A in RelationAuth$destRelationAggr]?: AggregationResult; +} & { + [A in UserEntityClaim$relationAggr]?: AggregationResult; +} & { + [A in UserRelation$relationAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -71,34 +77,39 @@ export type Projection = { actionAuth$relation?: ActionAuth.Selection & { $entity: "actionAuth"; }; - actionAuth$relation$$aggr?: ActionAuth.Aggregation & { - $entity: "actionAuth"; - }; relationAuth$sourceRelation?: RelationAuth.Selection & { $entity: "relationAuth"; }; - relationAuth$sourceRelation$$aggr?: RelationAuth.Aggregation & { - $entity: "relationAuth"; - }; relationAuth$destRelation?: RelationAuth.Selection & { $entity: "relationAuth"; }; - relationAuth$destRelation$$aggr?: RelationAuth.Aggregation & { - $entity: "relationAuth"; - }; userEntityClaim$relation?: UserEntityClaim.Selection & { $entity: "userEntityClaim"; }; - userEntityClaim$relation$$aggr?: UserEntityClaim.Aggregation & { - $entity: "userEntityClaim"; - }; userRelation$relation?: UserRelation.Selection & { $entity: "userRelation"; }; - userRelation$relation$$aggr?: UserRelation.Aggregation & { +} & Partial> & { + [A in ActionAuth$relationAggr]?: ActionAuth.Aggregation & { + $entity: "actionAuth"; + }; +} & { + [A in RelationAuth$sourceRelationAggr]?: RelationAuth.Aggregation & { + $entity: "relationAuth"; + }; +} & { + [A in RelationAuth$destRelationAggr]?: RelationAuth.Aggregation & { + $entity: "relationAuth"; + }; +} & { + [A in UserEntityClaim$relationAggr]?: UserEntityClaim.Aggregation & { + $entity: "userEntityClaim"; + }; +} & { + [A in UserRelation$relationAggr]?: UserRelation.Aggregation & { $entity: "userRelation"; }; -} & Partial>; +}; type RelationIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/RelationAuth/Schema.d.ts b/lib/oak-app-domain/RelationAuth/Schema.d.ts index 53adb3e5..2bd74e51 100644 --- a/lib/oak-app-domain/RelationAuth/Schema.d.ts +++ b/lib/oak-app-domain/RelationAuth/Schema.d.ts @@ -11,10 +11,7 @@ export type OpSchema = EntityShape & { destRelationId: ForeignKey<"relation">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - sourceRelationId: ForeignKey<"relation">; - pathId: ForeignKey<"path">; - destRelationId: ForeignKey<"relation">; +export type Schema = OpSchema & { sourceRelation: Relation.Schema; path: Path.Schema; destRelation: Relation.Schema; diff --git a/lib/oak-app-domain/Session/Schema.d.ts b/lib/oak-app-domain/Session/Schema.d.ts index 43914057..a0de55c6 100644 --- a/lib/oak-app-domain/Session/Schema.d.ts +++ b/lib/oak-app-domain/Session/Schema.d.ts @@ -18,24 +18,27 @@ export type OpSchema = EntityShape & { openId?: String<32> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: "application" | string; - entityId: String<64>; - userId?: ForeignKey<"user"> | null; - lmts?: Datetime | null; - openId?: String<32> | null; +type ReadRemark$sessionAggr = "readRemark$session$$aggr" | "readRemark$session$$0$$aggr" | "readRemark$session$$1$$aggr" | "readRemark$session$$2$$aggr" | "readRemark$session$$3$$aggr" | "readRemark$session$$4$$aggr" | "readRemark$session$$5$$aggr" | "readRemark$session$$6$$aggr" | "readRemark$session$$7$$aggr" | "readRemark$session$$8$$aggr" | "readRemark$session$$9$$aggr"; +type SessionMessage$sessionAggr = "sessionMessage$session$$aggr" | "sessionMessage$session$$0$$aggr" | "sessionMessage$session$$1$$aggr" | "sessionMessage$session$$2$$aggr" | "sessionMessage$session$$3$$aggr" | "sessionMessage$session$$4$$aggr" | "sessionMessage$session$$5$$aggr" | "sessionMessage$session$$6$$aggr" | "sessionMessage$session$$7$$aggr" | "sessionMessage$session$$8$$aggr" | "sessionMessage$session$$9$$aggr"; +type Relation$entityAggr = "relation$entity$$aggr" | "relation$entity$$0$$aggr" | "relation$entity$$1$$aggr" | "relation$entity$$2$$aggr" | "relation$entity$$3$$aggr" | "relation$entity$$4$$aggr" | "relation$entity$$5$$aggr" | "relation$entity$$6$$aggr" | "relation$entity$$7$$aggr" | "relation$entity$$8$$aggr" | "relation$entity$$9$$aggr"; +type UserRelation$entityAggr = "userRelation$entity$$aggr" | "userRelation$entity$$0$$aggr" | "userRelation$entity$$1$$aggr" | "userRelation$entity$$2$$aggr" | "userRelation$entity$$3$$aggr" | "userRelation$entity$$4$$aggr" | "userRelation$entity$$5$$aggr" | "userRelation$entity$$6$$aggr" | "userRelation$entity$$7$$aggr" | "userRelation$entity$$8$$aggr" | "userRelation$entity$$9$$aggr"; +export type Schema = OpSchema & { user?: User.Schema | null; application?: Application.Schema; readRemark$session?: Array; - readRemark$session$$aggr?: AggregationResult; sessionMessage$session?: Array; - sessionMessage$session$$aggr?: AggregationResult; relation$entity?: Array; - relation$entity$$aggr?: AggregationResult; userRelation$entity?: Array; - userRelation$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ReadRemark$sessionAggr]?: AggregationResult; +} & { + [A in SessionMessage$sessionAggr]?: AggregationResult; +} & { + [A in Relation$entityAggr]?: AggregationResult; +} & { + [A in UserRelation$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -72,28 +75,32 @@ export type Projection = { readRemark$session?: ReadRemark.Selection & { $entity: "readRemark"; }; - readRemark$session$$aggr?: ReadRemark.Aggregation & { - $entity: "readRemark"; - }; sessionMessage$session?: SessionMessage.Selection & { $entity: "sessionMessage"; }; - sessionMessage$session$$aggr?: SessionMessage.Aggregation & { - $entity: "sessionMessage"; - }; relation$entity?: Relation.Selection & { $entity: "relation"; }; - relation$entity$$aggr?: Relation.Aggregation & { - $entity: "relation"; - }; userRelation$entity?: UserRelation.Selection & { $entity: "userRelation"; }; - userRelation$entity$$aggr?: UserRelation.Aggregation & { +} & Partial> & { + [A in ReadRemark$sessionAggr]?: ReadRemark.Aggregation & { + $entity: "readRemark"; + }; +} & { + [A in SessionMessage$sessionAggr]?: SessionMessage.Aggregation & { + $entity: "sessionMessage"; + }; +} & { + [A in Relation$entityAggr]?: Relation.Aggregation & { + $entity: "relation"; + }; +} & { + [A in UserRelation$entityAggr]?: UserRelation.Aggregation & { $entity: "userRelation"; }; -} & Partial>; +}; type SessionIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/SessionMessage/Schema.d.ts b/lib/oak-app-domain/SessionMessage/Schema.d.ts index fe504e3b..7177ff5c 100644 --- a/lib/oak-app-domain/SessionMessage/Schema.d.ts +++ b/lib/oak-app-domain/SessionMessage/Schema.d.ts @@ -23,25 +23,17 @@ export type OpSchema = EntityShape & { extra?: Object | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - applicationId: ForeignKey<"application">; - sessionId: ForeignKey<"session">; - userId?: ForeignKey<"user"> | null; - wechatUserId?: ForeignKey<"wechatUser"> | null; - createTime?: Datetime | null; - type: Type; - text?: Text | null; - link?: String<128> | null; - aaoe?: Boolean | null; - extra?: Object | null; +type ExtraFile$entityAggr = "extraFile$entity$$aggr" | "extraFile$entity$$0$$aggr" | "extraFile$entity$$1$$aggr" | "extraFile$entity$$2$$aggr" | "extraFile$entity$$3$$aggr" | "extraFile$entity$$4$$aggr" | "extraFile$entity$$5$$aggr" | "extraFile$entity$$6$$aggr" | "extraFile$entity$$7$$aggr" | "extraFile$entity$$8$$aggr" | "extraFile$entity$$9$$aggr"; +export type Schema = OpSchema & { application: Application.Schema; session: Session.Schema; user?: User.Schema | null; wechatUser?: WechatUser.Schema | null; extraFile$entity?: Array; - extraFile$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ExtraFile$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -89,10 +81,11 @@ export type Projection = { extraFile$entity?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$entity$$aggr?: ExtraFile.Aggregation & { +} & Partial> & { + [A in ExtraFile$entityAggr]?: ExtraFile.Aggregation & { $entity: "extraFile"; }; -} & Partial>; +}; type SessionMessageIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/SmsTemplate/Schema.d.ts b/lib/oak-app-domain/SmsTemplate/Schema.d.ts index fe0487d5..0ff0186d 100644 --- a/lib/oak-app-domain/SmsTemplate/Schema.d.ts +++ b/lib/oak-app-domain/SmsTemplate/Schema.d.ts @@ -16,18 +16,14 @@ export type OpSchema = EntityShape & { syncAt: Datetime; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - systemId: ForeignKey<"system">; - origin: Origin; - templateName: Text; - templateCode: String<64>; - templateContent: Text; - syncAt: Datetime; +type MessageTypeSmsTemplate$templateAggr = "messageTypeSmsTemplate$template$$aggr" | "messageTypeSmsTemplate$template$$0$$aggr" | "messageTypeSmsTemplate$template$$1$$aggr" | "messageTypeSmsTemplate$template$$2$$aggr" | "messageTypeSmsTemplate$template$$3$$aggr" | "messageTypeSmsTemplate$template$$4$$aggr" | "messageTypeSmsTemplate$template$$5$$aggr" | "messageTypeSmsTemplate$template$$6$$aggr" | "messageTypeSmsTemplate$template$$7$$aggr" | "messageTypeSmsTemplate$template$$8$$aggr" | "messageTypeSmsTemplate$template$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; messageTypeSmsTemplate$template?: Array; - messageTypeSmsTemplate$template$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in MessageTypeSmsTemplate$templateAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -61,10 +57,11 @@ export type Projection = { messageTypeSmsTemplate$template?: MessageTypeSmsTemplate.Selection & { $entity: "messageTypeSmsTemplate"; }; - messageTypeSmsTemplate$template$$aggr?: MessageTypeSmsTemplate.Aggregation & { +} & Partial> & { + [A in MessageTypeSmsTemplate$templateAggr]?: MessageTypeSmsTemplate.Aggregation & { $entity: "messageTypeSmsTemplate"; }; -} & Partial>; +}; type SmsTemplateIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Station/Schema.d.ts b/lib/oak-app-domain/Station/Schema.d.ts index c0a14e3d..8a88e900 100644 --- a/lib/oak-app-domain/Station/Schema.d.ts +++ b/lib/oak-app-domain/Station/Schema.d.ts @@ -11,14 +11,14 @@ export type OpSchema = EntityShape & { areaId: ForeignKey<"area">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - areaId: ForeignKey<"area">; +type SubwayStation$stationAggr = "subwayStation$station$$aggr" | "subwayStation$station$$0$$aggr" | "subwayStation$station$$1$$aggr" | "subwayStation$station$$2$$aggr" | "subwayStation$station$$3$$aggr" | "subwayStation$station$$4$$aggr" | "subwayStation$station$$5$$aggr" | "subwayStation$station$$6$$aggr" | "subwayStation$station$$7$$aggr" | "subwayStation$station$$8$$aggr" | "subwayStation$station$$9$$aggr"; +export type Schema = OpSchema & { area: Area.Schema; subwayStation$station?: Array; - subwayStation$station$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SubwayStation$stationAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -44,10 +44,11 @@ export type Projection = { subwayStation$station?: SubwayStation.Selection & { $entity: "subwayStation"; }; - subwayStation$station$$aggr?: SubwayStation.Aggregation & { +} & Partial> & { + [A in SubwayStation$stationAggr]?: SubwayStation.Aggregation & { $entity: "subwayStation"; }; -} & Partial>; +}; type StationIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Subscription/Schema.d.ts b/lib/oak-app-domain/Subscription/Schema.d.ts index 62b3fd2e..b782f8b8 100644 --- a/lib/oak-app-domain/Subscription/Schema.d.ts +++ b/lib/oak-app-domain/Subscription/Schema.d.ts @@ -18,14 +18,7 @@ export type OpSchema = EntityShape & { offset?: Int<4> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: String<32>; - entityId: String<64>; - name: String<32>; - description?: Text | null; - config?: WechatPublicConfig | null; - offset?: Int<4> | null; -} & { +export type Schema = OpSchema & {} & { [A in ExpressionKey]?: any; }; type AttrFilter = { diff --git a/lib/oak-app-domain/Subway/Schema.d.ts b/lib/oak-app-domain/Subway/Schema.d.ts index 3cb046a7..4e8e98e4 100644 --- a/lib/oak-app-domain/Subway/Schema.d.ts +++ b/lib/oak-app-domain/Subway/Schema.d.ts @@ -11,14 +11,14 @@ export type OpSchema = EntityShape & { areaId: ForeignKey<"area">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - areaId: ForeignKey<"area">; +type SubwayStation$subwayAggr = "subwayStation$subway$$aggr" | "subwayStation$subway$$0$$aggr" | "subwayStation$subway$$1$$aggr" | "subwayStation$subway$$2$$aggr" | "subwayStation$subway$$3$$aggr" | "subwayStation$subway$$4$$aggr" | "subwayStation$subway$$5$$aggr" | "subwayStation$subway$$6$$aggr" | "subwayStation$subway$$7$$aggr" | "subwayStation$subway$$8$$aggr" | "subwayStation$subway$$9$$aggr"; +export type Schema = OpSchema & { area: Area.Schema; subwayStation$subway?: Array; - subwayStation$subway$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SubwayStation$subwayAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -44,10 +44,11 @@ export type Projection = { subwayStation$subway?: SubwayStation.Selection & { $entity: "subwayStation"; }; - subwayStation$subway$$aggr?: SubwayStation.Aggregation & { +} & Partial> & { + [A in SubwayStation$subwayAggr]?: SubwayStation.Aggregation & { $entity: "subwayStation"; }; -} & Partial>; +}; type SubwayIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/SubwayStation/Schema.d.ts b/lib/oak-app-domain/SubwayStation/Schema.d.ts index 5042f91b..ee7f6a97 100644 --- a/lib/oak-app-domain/SubwayStation/Schema.d.ts +++ b/lib/oak-app-domain/SubwayStation/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { subwayId: ForeignKey<"subway">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - stationId: ForeignKey<"station">; - subwayId: ForeignKey<"subway">; +export type Schema = OpSchema & { station: Station.Schema; subway: Subway.Schema; } & { diff --git a/lib/oak-app-domain/SysAccountMove/Schema.d.ts b/lib/oak-app-domain/SysAccountMove/Schema.d.ts index 95adeff3..c92e3ebd 100644 --- a/lib/oak-app-domain/SysAccountMove/Schema.d.ts +++ b/lib/oak-app-domain/SysAccountMove/Schema.d.ts @@ -15,18 +15,15 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - price: Price; - externalId: String<64>; - operatorId: ForeignKey<"user">; - remark?: Text | null; - systemId: ForeignKey<"system">; +type SysAccountOper$sysAccountMoveAggr = "sysAccountOper$sysAccountMove$$aggr" | "sysAccountOper$sysAccountMove$$0$$aggr" | "sysAccountOper$sysAccountMove$$1$$aggr" | "sysAccountOper$sysAccountMove$$2$$aggr" | "sysAccountOper$sysAccountMove$$3$$aggr" | "sysAccountOper$sysAccountMove$$4$$aggr" | "sysAccountOper$sysAccountMove$$5$$aggr" | "sysAccountOper$sysAccountMove$$6$$aggr" | "sysAccountOper$sysAccountMove$$7$$aggr" | "sysAccountOper$sysAccountMove$$8$$aggr" | "sysAccountOper$sysAccountMove$$9$$aggr"; +export type Schema = OpSchema & { operator: User.Schema; system: System.Schema; sysAccountOper$sysAccountMove?: Array; - sysAccountOper$sysAccountMove$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SysAccountOper$sysAccountMoveAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -60,10 +57,11 @@ export type Projection = { sysAccountOper$sysAccountMove?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$sysAccountMove$$aggr?: SysAccountOper.Aggregation & { +} & Partial> & { + [A in SysAccountOper$sysAccountMoveAggr]?: SysAccountOper.Aggregation & { $entity: "sysAccountOper"; }; -} & Partial>; +}; type SysAccountMoveIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/SysAccountOper/Schema.d.ts b/lib/oak-app-domain/SysAccountOper/Schema.d.ts index eeb55d67..b733a43f 100644 --- a/lib/oak-app-domain/SysAccountOper/Schema.d.ts +++ b/lib/oak-app-domain/SysAccountOper/Schema.d.ts @@ -22,15 +22,7 @@ export type OpSchema = EntityShape & { sysAccountMoveId?: ForeignKey<"sysAccountMove"> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - delta: Price; - type: SysAccountOperType; - entity: "offlineAccount" | "wpAccount" | string; - entityId: String<64>; - payId?: ForeignKey<"pay"> | null; - refundId?: ForeignKey<"refund"> | null; - withdrawTransferId?: ForeignKey<"withdrawTransfer"> | null; - sysAccountMoveId?: ForeignKey<"sysAccountMove"> | null; +export type Schema = OpSchema & { pay?: Pay.Schema | null; refund?: Refund.Schema | null; withdrawTransfer?: WithdrawTransfer.Schema | null; diff --git a/lib/oak-app-domain/System/Schema.d.ts b/lib/oak-app-domain/System/Schema.d.ts index 2a5ad3bc..53261a6d 100644 --- a/lib/oak-app-domain/System/Schema.d.ts +++ b/lib/oak-app-domain/System/Schema.d.ts @@ -48,52 +48,74 @@ export type OpSchema = EntityShape & { payConfig?: PayConfig | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name: String<32>; - description?: Text | null; - config: Config; - platformId?: ForeignKey<"platform"> | null; - folder?: String<16> | null; - super?: Boolean | null; - style?: Style | null; - entity?: String<32> | null; - entityId?: String<64> | null; - payConfig?: PayConfig | null; +type Application$systemAggr = "application$system$$aggr" | "application$system$$0$$aggr" | "application$system$$1$$aggr" | "application$system$$2$$aggr" | "application$system$$3$$aggr" | "application$system$$4$$aggr" | "application$system$$5$$aggr" | "application$system$$6$$aggr" | "application$system$$7$$aggr" | "application$system$$8$$aggr" | "application$system$$9$$aggr"; +type Domain$systemAggr = "domain$system$$aggr" | "domain$system$$0$$aggr" | "domain$system$$1$$aggr" | "domain$system$$2$$aggr" | "domain$system$$3$$aggr" | "domain$system$$4$$aggr" | "domain$system$$5$$aggr" | "domain$system$$6$$aggr" | "domain$system$$7$$aggr" | "domain$system$$8$$aggr" | "domain$system$$9$$aggr"; +type MessageSystem$systemAggr = "messageSystem$system$$aggr" | "messageSystem$system$$0$$aggr" | "messageSystem$system$$1$$aggr" | "messageSystem$system$$2$$aggr" | "messageSystem$system$$3$$aggr" | "messageSystem$system$$4$$aggr" | "messageSystem$system$$5$$aggr" | "messageSystem$system$$6$$aggr" | "messageSystem$system$$7$$aggr" | "messageSystem$system$$8$$aggr" | "messageSystem$system$$9$$aggr"; +type Passport$systemAggr = "passport$system$$aggr" | "passport$system$$0$$aggr" | "passport$system$$1$$aggr" | "passport$system$$2$$aggr" | "passport$system$$3$$aggr" | "passport$system$$4$$aggr" | "passport$system$$5$$aggr" | "passport$system$$6$$aggr" | "passport$system$$7$$aggr" | "passport$system$$8$$aggr" | "passport$system$$9$$aggr"; +type SmsTemplate$systemAggr = "smsTemplate$system$$aggr" | "smsTemplate$system$$0$$aggr" | "smsTemplate$system$$1$$aggr" | "smsTemplate$system$$2$$aggr" | "smsTemplate$system$$3$$aggr" | "smsTemplate$system$$4$$aggr" | "smsTemplate$system$$5$$aggr" | "smsTemplate$system$$6$$aggr" | "smsTemplate$system$$7$$aggr" | "smsTemplate$system$$8$$aggr" | "smsTemplate$system$$9$$aggr"; +type UserSystem$systemAggr = "userSystem$system$$aggr" | "userSystem$system$$0$$aggr" | "userSystem$system$$1$$aggr" | "userSystem$system$$2$$aggr" | "userSystem$system$$3$$aggr" | "userSystem$system$$4$$aggr" | "userSystem$system$$5$$aggr" | "userSystem$system$$6$$aggr" | "userSystem$system$$7$$aggr" | "userSystem$system$$8$$aggr" | "userSystem$system$$9$$aggr"; +type Account$ofSystemAggr = "account$ofSystem$$aggr" | "account$ofSystem$$0$$aggr" | "account$ofSystem$$1$$aggr" | "account$ofSystem$$2$$aggr" | "account$ofSystem$$3$$aggr" | "account$ofSystem$$4$$aggr" | "account$ofSystem$$5$$aggr" | "account$ofSystem$$6$$aggr" | "account$ofSystem$$7$$aggr" | "account$ofSystem$$8$$aggr" | "account$ofSystem$$9$$aggr"; +type Account$entityAggr = "account$entity$$aggr" | "account$entity$$0$$aggr" | "account$entity$$1$$aggr" | "account$entity$$2$$aggr" | "account$entity$$3$$aggr" | "account$entity$$4$$aggr" | "account$entity$$5$$aggr" | "account$entity$$6$$aggr" | "account$entity$$7$$aggr" | "account$entity$$8$$aggr" | "account$entity$$9$$aggr"; +type OfflineAccount$systemAggr = "offlineAccount$system$$aggr" | "offlineAccount$system$$0$$aggr" | "offlineAccount$system$$1$$aggr" | "offlineAccount$system$$2$$aggr" | "offlineAccount$system$$3$$aggr" | "offlineAccount$system$$4$$aggr" | "offlineAccount$system$$5$$aggr" | "offlineAccount$system$$6$$aggr" | "offlineAccount$system$$7$$aggr" | "offlineAccount$system$$8$$aggr" | "offlineAccount$system$$9$$aggr"; +type Order$systemAggr = "order$system$$aggr" | "order$system$$0$$aggr" | "order$system$$1$$aggr" | "order$system$$2$$aggr" | "order$system$$3$$aggr" | "order$system$$4$$aggr" | "order$system$$5$$aggr" | "order$system$$6$$aggr" | "order$system$$7$$aggr" | "order$system$$8$$aggr" | "order$system$$9$$aggr"; +type SysAccountMove$systemAggr = "sysAccountMove$system$$aggr" | "sysAccountMove$system$$0$$aggr" | "sysAccountMove$system$$1$$aggr" | "sysAccountMove$system$$2$$aggr" | "sysAccountMove$system$$3$$aggr" | "sysAccountMove$system$$4$$aggr" | "sysAccountMove$system$$5$$aggr" | "sysAccountMove$system$$6$$aggr" | "sysAccountMove$system$$7$$aggr" | "sysAccountMove$system$$8$$aggr" | "sysAccountMove$system$$9$$aggr"; +type WechatPay$systemAggr = "wechatPay$system$$aggr" | "wechatPay$system$$0$$aggr" | "wechatPay$system$$1$$aggr" | "wechatPay$system$$2$$aggr" | "wechatPay$system$$3$$aggr" | "wechatPay$system$$4$$aggr" | "wechatPay$system$$5$$aggr" | "wechatPay$system$$6$$aggr" | "wechatPay$system$$7$$aggr" | "wechatPay$system$$8$$aggr" | "wechatPay$system$$9$$aggr"; +type WithdrawAccount$ofSystemAggr = "withdrawAccount$ofSystem$$aggr" | "withdrawAccount$ofSystem$$0$$aggr" | "withdrawAccount$ofSystem$$1$$aggr" | "withdrawAccount$ofSystem$$2$$aggr" | "withdrawAccount$ofSystem$$3$$aggr" | "withdrawAccount$ofSystem$$4$$aggr" | "withdrawAccount$ofSystem$$5$$aggr" | "withdrawAccount$ofSystem$$6$$aggr" | "withdrawAccount$ofSystem$$7$$aggr" | "withdrawAccount$ofSystem$$8$$aggr" | "withdrawAccount$ofSystem$$9$$aggr"; +type WithdrawAccount$entityAggr = "withdrawAccount$entity$$aggr" | "withdrawAccount$entity$$0$$aggr" | "withdrawAccount$entity$$1$$aggr" | "withdrawAccount$entity$$2$$aggr" | "withdrawAccount$entity$$3$$aggr" | "withdrawAccount$entity$$4$$aggr" | "withdrawAccount$entity$$5$$aggr" | "withdrawAccount$entity$$6$$aggr" | "withdrawAccount$entity$$7$$aggr" | "withdrawAccount$entity$$8$$aggr" | "withdrawAccount$entity$$9$$aggr"; +type WithdrawChannel$systemAggr = "withdrawChannel$system$$aggr" | "withdrawChannel$system$$0$$aggr" | "withdrawChannel$system$$1$$aggr" | "withdrawChannel$system$$2$$aggr" | "withdrawChannel$system$$3$$aggr" | "withdrawChannel$system$$4$$aggr" | "withdrawChannel$system$$5$$aggr" | "withdrawChannel$system$$6$$aggr" | "withdrawChannel$system$$7$$aggr" | "withdrawChannel$system$$8$$aggr" | "withdrawChannel$system$$9$$aggr"; +type WpAccount$systemAggr = "wpAccount$system$$aggr" | "wpAccount$system$$0$$aggr" | "wpAccount$system$$1$$aggr" | "wpAccount$system$$2$$aggr" | "wpAccount$system$$3$$aggr" | "wpAccount$system$$4$$aggr" | "wpAccount$system$$5$$aggr" | "wpAccount$system$$6$$aggr" | "wpAccount$system$$7$$aggr" | "wpAccount$system$$8$$aggr" | "wpAccount$system$$9$$aggr"; +export type Schema = OpSchema & { platform?: Platform.Schema | null; application$system?: Array; - application$system$$aggr?: AggregationResult; domain$system?: Array; - domain$system$$aggr?: AggregationResult; messageSystem$system?: Array; - messageSystem$system$$aggr?: AggregationResult; passport$system?: Array; - passport$system$$aggr?: AggregationResult; smsTemplate$system?: Array; - smsTemplate$system$$aggr?: AggregationResult; userSystem$system?: Array; - userSystem$system$$aggr?: AggregationResult; account$ofSystem?: Array; - account$ofSystem$$aggr?: AggregationResult; account$entity?: Array; - account$entity$$aggr?: AggregationResult; offlineAccount$system?: Array; - offlineAccount$system$$aggr?: AggregationResult; order$system?: Array; - order$system$$aggr?: AggregationResult; sysAccountMove$system?: Array; - sysAccountMove$system$$aggr?: AggregationResult; wechatPay$system?: Array; - wechatPay$system$$aggr?: AggregationResult; withdrawAccount$ofSystem?: Array; - withdrawAccount$ofSystem$$aggr?: AggregationResult; withdrawAccount$entity?: Array; - withdrawAccount$entity$$aggr?: AggregationResult; withdrawChannel$system?: Array; - withdrawChannel$system$$aggr?: AggregationResult; wpAccount$system?: Array; - wpAccount$system$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Application$systemAggr]?: AggregationResult; +} & { + [A in Domain$systemAggr]?: AggregationResult; +} & { + [A in MessageSystem$systemAggr]?: AggregationResult; +} & { + [A in Passport$systemAggr]?: AggregationResult; +} & { + [A in SmsTemplate$systemAggr]?: AggregationResult; +} & { + [A in UserSystem$systemAggr]?: AggregationResult; +} & { + [A in Account$ofSystemAggr]?: AggregationResult; +} & { + [A in Account$entityAggr]?: AggregationResult; +} & { + [A in OfflineAccount$systemAggr]?: AggregationResult; +} & { + [A in Order$systemAggr]?: AggregationResult; +} & { + [A in SysAccountMove$systemAggr]?: AggregationResult; +} & { + [A in WechatPay$systemAggr]?: AggregationResult; +} & { + [A in WithdrawAccount$ofSystemAggr]?: AggregationResult; +} & { + [A in WithdrawAccount$entityAggr]?: AggregationResult; +} & { + [A in WithdrawChannel$systemAggr]?: AggregationResult; +} & { + [A in WpAccount$systemAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -150,100 +172,116 @@ export type Projection = { application$system?: Application.Selection & { $entity: "application"; }; - application$system$$aggr?: Application.Aggregation & { - $entity: "application"; - }; domain$system?: Domain.Selection & { $entity: "domain"; }; - domain$system$$aggr?: Domain.Aggregation & { - $entity: "domain"; - }; messageSystem$system?: MessageSystem.Selection & { $entity: "messageSystem"; }; - messageSystem$system$$aggr?: MessageSystem.Aggregation & { - $entity: "messageSystem"; - }; passport$system?: Passport.Selection & { $entity: "passport"; }; - passport$system$$aggr?: Passport.Aggregation & { - $entity: "passport"; - }; smsTemplate$system?: SmsTemplate.Selection & { $entity: "smsTemplate"; }; - smsTemplate$system$$aggr?: SmsTemplate.Aggregation & { - $entity: "smsTemplate"; - }; userSystem$system?: UserSystem.Selection & { $entity: "userSystem"; }; - userSystem$system$$aggr?: UserSystem.Aggregation & { - $entity: "userSystem"; - }; account$ofSystem?: Account.Selection & { $entity: "account"; }; - account$ofSystem$$aggr?: Account.Aggregation & { - $entity: "account"; - }; account$entity?: Account.Selection & { $entity: "account"; }; - account$entity$$aggr?: Account.Aggregation & { - $entity: "account"; - }; offlineAccount$system?: OfflineAccount.Selection & { $entity: "offlineAccount"; }; - offlineAccount$system$$aggr?: OfflineAccount.Aggregation & { - $entity: "offlineAccount"; - }; order$system?: Order.Selection & { $entity: "order"; }; - order$system$$aggr?: Order.Aggregation & { - $entity: "order"; - }; sysAccountMove$system?: SysAccountMove.Selection & { $entity: "sysAccountMove"; }; - sysAccountMove$system$$aggr?: SysAccountMove.Aggregation & { - $entity: "sysAccountMove"; - }; wechatPay$system?: WechatPay.Selection & { $entity: "wechatPay"; }; - wechatPay$system$$aggr?: WechatPay.Aggregation & { - $entity: "wechatPay"; - }; withdrawAccount$ofSystem?: WithdrawAccount.Selection & { $entity: "withdrawAccount"; }; - withdrawAccount$ofSystem$$aggr?: WithdrawAccount.Aggregation & { - $entity: "withdrawAccount"; - }; withdrawAccount$entity?: WithdrawAccount.Selection & { $entity: "withdrawAccount"; }; - withdrawAccount$entity$$aggr?: WithdrawAccount.Aggregation & { - $entity: "withdrawAccount"; - }; withdrawChannel$system?: WithdrawChannel.Selection & { $entity: "withdrawChannel"; }; - withdrawChannel$system$$aggr?: WithdrawChannel.Aggregation & { - $entity: "withdrawChannel"; - }; wpAccount$system?: WpAccount.Selection & { $entity: "wpAccount"; }; - wpAccount$system$$aggr?: WpAccount.Aggregation & { +} & Partial> & { + [A in Application$systemAggr]?: Application.Aggregation & { + $entity: "application"; + }; +} & { + [A in Domain$systemAggr]?: Domain.Aggregation & { + $entity: "domain"; + }; +} & { + [A in MessageSystem$systemAggr]?: MessageSystem.Aggregation & { + $entity: "messageSystem"; + }; +} & { + [A in Passport$systemAggr]?: Passport.Aggregation & { + $entity: "passport"; + }; +} & { + [A in SmsTemplate$systemAggr]?: SmsTemplate.Aggregation & { + $entity: "smsTemplate"; + }; +} & { + [A in UserSystem$systemAggr]?: UserSystem.Aggregation & { + $entity: "userSystem"; + }; +} & { + [A in Account$ofSystemAggr]?: Account.Aggregation & { + $entity: "account"; + }; +} & { + [A in Account$entityAggr]?: Account.Aggregation & { + $entity: "account"; + }; +} & { + [A in OfflineAccount$systemAggr]?: OfflineAccount.Aggregation & { + $entity: "offlineAccount"; + }; +} & { + [A in Order$systemAggr]?: Order.Aggregation & { + $entity: "order"; + }; +} & { + [A in SysAccountMove$systemAggr]?: SysAccountMove.Aggregation & { + $entity: "sysAccountMove"; + }; +} & { + [A in WechatPay$systemAggr]?: WechatPay.Aggregation & { + $entity: "wechatPay"; + }; +} & { + [A in WithdrawAccount$ofSystemAggr]?: WithdrawAccount.Aggregation & { + $entity: "withdrawAccount"; + }; +} & { + [A in WithdrawAccount$entityAggr]?: WithdrawAccount.Aggregation & { + $entity: "withdrawAccount"; + }; +} & { + [A in WithdrawChannel$systemAggr]?: WithdrawChannel.Aggregation & { + $entity: "withdrawChannel"; + }; +} & { + [A in WpAccount$systemAggr]?: WpAccount.Aggregation & { $entity: "wpAccount"; }; -} & Partial>; +}; type SystemIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/ToDo/Schema.d.ts b/lib/oak-app-domain/ToDo/Schema.d.ts index 70ff28bb..46f91ad7 100644 --- a/lib/oak-app-domain/ToDo/Schema.d.ts +++ b/lib/oak-app-domain/ToDo/Schema.d.ts @@ -23,22 +23,17 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - title: Text; - description?: Text | null; - targetEntity: String<32>; - targetFilter: Object; - action: String<32>; - redirectTo: RedirectToProps; - entity: String<32>; - entityId: String<64>; - iState?: IState | null; +type Relation$entityAggr = "relation$entity$$aggr" | "relation$entity$$0$$aggr" | "relation$entity$$1$$aggr" | "relation$entity$$2$$aggr" | "relation$entity$$3$$aggr" | "relation$entity$$4$$aggr" | "relation$entity$$5$$aggr" | "relation$entity$$6$$aggr" | "relation$entity$$7$$aggr" | "relation$entity$$8$$aggr" | "relation$entity$$9$$aggr"; +type UserRelation$entityAggr = "userRelation$entity$$aggr" | "userRelation$entity$$0$$aggr" | "userRelation$entity$$1$$aggr" | "userRelation$entity$$2$$aggr" | "userRelation$entity$$3$$aggr" | "userRelation$entity$$4$$aggr" | "userRelation$entity$$5$$aggr" | "userRelation$entity$$6$$aggr" | "userRelation$entity$$7$$aggr" | "userRelation$entity$$8$$aggr" | "userRelation$entity$$9$$aggr"; +export type Schema = OpSchema & { relation$entity?: Array; - relation$entity$$aggr?: AggregationResult; userRelation$entity?: Array; - userRelation$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Relation$entityAggr]?: AggregationResult; +} & { + [A in UserRelation$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -77,16 +72,18 @@ export type Projection = { relation$entity?: Relation.Selection & { $entity: "relation"; }; - relation$entity$$aggr?: Relation.Aggregation & { - $entity: "relation"; - }; userRelation$entity?: UserRelation.Selection & { $entity: "userRelation"; }; - userRelation$entity$$aggr?: UserRelation.Aggregation & { +} & Partial> & { + [A in Relation$entityAggr]?: Relation.Aggregation & { + $entity: "relation"; + }; +} & { + [A in UserRelation$entityAggr]?: UserRelation.Aggregation & { $entity: "userRelation"; }; -} & Partial>; +}; type ToDoIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Token/Schema.d.ts b/lib/oak-app-domain/Token/Schema.d.ts index 36b49a37..74b8dfb0 100644 --- a/lib/oak-app-domain/Token/Schema.d.ts +++ b/lib/oak-app-domain/Token/Schema.d.ts @@ -28,18 +28,7 @@ export type OpSchema = EntityShape & { ableState?: AbleState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - applicationId?: ForeignKey<"application"> | null; - entity: "email" | "loginName" | "mobile" | "parasite" | "wechatLogin" | "wechatUser" | string; - entityId: String<64>; - userId?: ForeignKey<"user"> | null; - playerId?: ForeignKey<"user"> | null; - disablesAt?: Datetime | null; - env: Environment; - refreshedAt: Datetime; - value: String<64>; - oldValue?: String<64> | null; - ableState?: AbleState | null; +export type Schema = OpSchema & { application?: Application.Schema | null; user?: User.Schema | null; player?: User.Schema | null; diff --git a/lib/oak-app-domain/User/Schema.d.ts b/lib/oak-app-domain/User/Schema.d.ts index a91923d8..d5cd3a15 100644 --- a/lib/oak-app-domain/User/Schema.d.ts +++ b/lib/oak-app-domain/User/Schema.d.ts @@ -53,91 +53,146 @@ export type OpSchema = EntityShape & { userState?: UserState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - name?: String<16> | null; - nickname?: String<64> | null; - password?: Text | null; - refId?: ForeignKey<"user"> | null; - passwordSha1?: Text | null; - birth?: Datetime | null; - gender?: ("male" | "female") | null; - idCardType?: ("ID-Card" | "passport" | "Mainland-passport") | null; - idNumber?: String<32> | null; - isRoot?: Boolean | null; - hasPassword?: Boolean | null; - idState?: IdState | null; - userState?: UserState | null; +type Oper$operatorAggr = "oper$operator$$aggr" | "oper$operator$$0$$aggr" | "oper$operator$$1$$aggr" | "oper$operator$$2$$aggr" | "oper$operator$$3$$aggr" | "oper$operator$$4$$aggr" | "oper$operator$$5$$aggr" | "oper$operator$$6$$aggr" | "oper$operator$$7$$aggr" | "oper$operator$$8$$aggr" | "oper$operator$$9$$aggr"; +type User$refAggr = "user$ref$$aggr" | "user$ref$$0$$aggr" | "user$ref$$1$$aggr" | "user$ref$$2$$aggr" | "user$ref$$3$$aggr" | "user$ref$$4$$aggr" | "user$ref$$5$$aggr" | "user$ref$$6$$aggr" | "user$ref$$7$$aggr" | "user$ref$$8$$aggr" | "user$ref$$9$$aggr"; +type UserEntityClaim$userAggr = "userEntityClaim$user$$aggr" | "userEntityClaim$user$$0$$aggr" | "userEntityClaim$user$$1$$aggr" | "userEntityClaim$user$$2$$aggr" | "userEntityClaim$user$$3$$aggr" | "userEntityClaim$user$$4$$aggr" | "userEntityClaim$user$$5$$aggr" | "userEntityClaim$user$$6$$aggr" | "userEntityClaim$user$$7$$aggr" | "userEntityClaim$user$$8$$aggr" | "userEntityClaim$user$$9$$aggr"; +type UserRelation$userAggr = "userRelation$user$$aggr" | "userRelation$user$$0$$aggr" | "userRelation$user$$1$$aggr" | "userRelation$user$$2$$aggr" | "userRelation$user$$3$$aggr" | "userRelation$user$$4$$aggr" | "userRelation$user$$5$$aggr" | "userRelation$user$$6$$aggr" | "userRelation$user$$7$$aggr" | "userRelation$user$$8$$aggr" | "userRelation$user$$9$$aggr"; +type ChangePasswordTemp$userAggr = "changePasswordTemp$user$$aggr" | "changePasswordTemp$user$$0$$aggr" | "changePasswordTemp$user$$1$$aggr" | "changePasswordTemp$user$$2$$aggr" | "changePasswordTemp$user$$3$$aggr" | "changePasswordTemp$user$$4$$aggr" | "changePasswordTemp$user$$5$$aggr" | "changePasswordTemp$user$$6$$aggr" | "changePasswordTemp$user$$7$$aggr" | "changePasswordTemp$user$$8$$aggr" | "changePasswordTemp$user$$9$$aggr"; +type Email$userAggr = "email$user$$aggr" | "email$user$$0$$aggr" | "email$user$$1$$aggr" | "email$user$$2$$aggr" | "email$user$$3$$aggr" | "email$user$$4$$aggr" | "email$user$$5$$aggr" | "email$user$$6$$aggr" | "email$user$$7$$aggr" | "email$user$$8$$aggr" | "email$user$$9$$aggr"; +type LoginName$userAggr = "loginName$user$$aggr" | "loginName$user$$0$$aggr" | "loginName$user$$1$$aggr" | "loginName$user$$2$$aggr" | "loginName$user$$3$$aggr" | "loginName$user$$4$$aggr" | "loginName$user$$5$$aggr" | "loginName$user$$6$$aggr" | "loginName$user$$7$$aggr" | "loginName$user$$8$$aggr" | "loginName$user$$9$$aggr"; +type Message$userAggr = "message$user$$aggr" | "message$user$$0$$aggr" | "message$user$$1$$aggr" | "message$user$$2$$aggr" | "message$user$$3$$aggr" | "message$user$$4$$aggr" | "message$user$$5$$aggr" | "message$user$$6$$aggr" | "message$user$$7$$aggr" | "message$user$$8$$aggr" | "message$user$$9$$aggr"; +type Mobile$userAggr = "mobile$user$$aggr" | "mobile$user$$0$$aggr" | "mobile$user$$1$$aggr" | "mobile$user$$2$$aggr" | "mobile$user$$3$$aggr" | "mobile$user$$4$$aggr" | "mobile$user$$5$$aggr" | "mobile$user$$6$$aggr" | "mobile$user$$7$$aggr" | "mobile$user$$8$$aggr" | "mobile$user$$9$$aggr"; +type Parasite$userAggr = "parasite$user$$aggr" | "parasite$user$$0$$aggr" | "parasite$user$$1$$aggr" | "parasite$user$$2$$aggr" | "parasite$user$$3$$aggr" | "parasite$user$$4$$aggr" | "parasite$user$$5$$aggr" | "parasite$user$$6$$aggr" | "parasite$user$$7$$aggr" | "parasite$user$$8$$aggr" | "parasite$user$$9$$aggr"; +type ReadRemark$userAggr = "readRemark$user$$aggr" | "readRemark$user$$0$$aggr" | "readRemark$user$$1$$aggr" | "readRemark$user$$2$$aggr" | "readRemark$user$$3$$aggr" | "readRemark$user$$4$$aggr" | "readRemark$user$$5$$aggr" | "readRemark$user$$6$$aggr" | "readRemark$user$$7$$aggr" | "readRemark$user$$8$$aggr" | "readRemark$user$$9$$aggr"; +type Session$userAggr = "session$user$$aggr" | "session$user$$0$$aggr" | "session$user$$1$$aggr" | "session$user$$2$$aggr" | "session$user$$3$$aggr" | "session$user$$4$$aggr" | "session$user$$5$$aggr" | "session$user$$6$$aggr" | "session$user$$7$$aggr" | "session$user$$8$$aggr" | "session$user$$9$$aggr"; +type SessionMessage$userAggr = "sessionMessage$user$$aggr" | "sessionMessage$user$$0$$aggr" | "sessionMessage$user$$1$$aggr" | "sessionMessage$user$$2$$aggr" | "sessionMessage$user$$3$$aggr" | "sessionMessage$user$$4$$aggr" | "sessionMessage$user$$5$$aggr" | "sessionMessage$user$$6$$aggr" | "sessionMessage$user$$7$$aggr" | "sessionMessage$user$$8$$aggr" | "sessionMessage$user$$9$$aggr"; +type Token$userAggr = "token$user$$aggr" | "token$user$$0$$aggr" | "token$user$$1$$aggr" | "token$user$$2$$aggr" | "token$user$$3$$aggr" | "token$user$$4$$aggr" | "token$user$$5$$aggr" | "token$user$$6$$aggr" | "token$user$$7$$aggr" | "token$user$$8$$aggr" | "token$user$$9$$aggr"; +type Token$playerAggr = "token$player$$aggr" | "token$player$$0$$aggr" | "token$player$$1$$aggr" | "token$player$$2$$aggr" | "token$player$$3$$aggr" | "token$player$$4$$aggr" | "token$player$$5$$aggr" | "token$player$$6$$aggr" | "token$player$$7$$aggr" | "token$player$$8$$aggr" | "token$player$$9$$aggr"; +type UserEntityGrant$granterAggr = "userEntityGrant$granter$$aggr" | "userEntityGrant$granter$$0$$aggr" | "userEntityGrant$granter$$1$$aggr" | "userEntityGrant$granter$$2$$aggr" | "userEntityGrant$granter$$3$$aggr" | "userEntityGrant$granter$$4$$aggr" | "userEntityGrant$granter$$5$$aggr" | "userEntityGrant$granter$$6$$aggr" | "userEntityGrant$granter$$7$$aggr" | "userEntityGrant$granter$$8$$aggr" | "userEntityGrant$granter$$9$$aggr"; +type UserSystem$userAggr = "userSystem$user$$aggr" | "userSystem$user$$0$$aggr" | "userSystem$user$$1$$aggr" | "userSystem$user$$2$$aggr" | "userSystem$user$$3$$aggr" | "userSystem$user$$4$$aggr" | "userSystem$user$$5$$aggr" | "userSystem$user$$6$$aggr" | "userSystem$user$$7$$aggr" | "userSystem$user$$8$$aggr" | "userSystem$user$$9$$aggr"; +type WechatLogin$userAggr = "wechatLogin$user$$aggr" | "wechatLogin$user$$0$$aggr" | "wechatLogin$user$$1$$aggr" | "wechatLogin$user$$2$$aggr" | "wechatLogin$user$$3$$aggr" | "wechatLogin$user$$4$$aggr" | "wechatLogin$user$$5$$aggr" | "wechatLogin$user$$6$$aggr" | "wechatLogin$user$$7$$aggr" | "wechatLogin$user$$8$$aggr" | "wechatLogin$user$$9$$aggr"; +type WechatUser$userAggr = "wechatUser$user$$aggr" | "wechatUser$user$$0$$aggr" | "wechatUser$user$$1$$aggr" | "wechatUser$user$$2$$aggr" | "wechatUser$user$$3$$aggr" | "wechatUser$user$$4$$aggr" | "wechatUser$user$$5$$aggr" | "wechatUser$user$$6$$aggr" | "wechatUser$user$$7$$aggr" | "wechatUser$user$$8$$aggr" | "wechatUser$user$$9$$aggr"; +type Deposit$creatorAggr = "deposit$creator$$aggr" | "deposit$creator$$0$$aggr" | "deposit$creator$$1$$aggr" | "deposit$creator$$2$$aggr" | "deposit$creator$$3$$aggr" | "deposit$creator$$4$$aggr" | "deposit$creator$$5$$aggr" | "deposit$creator$$6$$aggr" | "deposit$creator$$7$$aggr" | "deposit$creator$$8$$aggr" | "deposit$creator$$9$$aggr"; +type Order$creatorAggr = "order$creator$$aggr" | "order$creator$$0$$aggr" | "order$creator$$1$$aggr" | "order$creator$$2$$aggr" | "order$creator$$3$$aggr" | "order$creator$$4$$aggr" | "order$creator$$5$$aggr" | "order$creator$$6$$aggr" | "order$creator$$7$$aggr" | "order$creator$$8$$aggr" | "order$creator$$9$$aggr"; +type Pay$creatorAggr = "pay$creator$$aggr" | "pay$creator$$0$$aggr" | "pay$creator$$1$$aggr" | "pay$creator$$2$$aggr" | "pay$creator$$3$$aggr" | "pay$creator$$4$$aggr" | "pay$creator$$5$$aggr" | "pay$creator$$6$$aggr" | "pay$creator$$7$$aggr" | "pay$creator$$8$$aggr" | "pay$creator$$9$$aggr"; +type Refund$creatorAggr = "refund$creator$$aggr" | "refund$creator$$0$$aggr" | "refund$creator$$1$$aggr" | "refund$creator$$2$$aggr" | "refund$creator$$3$$aggr" | "refund$creator$$4$$aggr" | "refund$creator$$5$$aggr" | "refund$creator$$6$$aggr" | "refund$creator$$7$$aggr" | "refund$creator$$8$$aggr" | "refund$creator$$9$$aggr"; +type SysAccountMove$operatorAggr = "sysAccountMove$operator$$aggr" | "sysAccountMove$operator$$0$$aggr" | "sysAccountMove$operator$$1$$aggr" | "sysAccountMove$operator$$2$$aggr" | "sysAccountMove$operator$$3$$aggr" | "sysAccountMove$operator$$4$$aggr" | "sysAccountMove$operator$$5$$aggr" | "sysAccountMove$operator$$6$$aggr" | "sysAccountMove$operator$$7$$aggr" | "sysAccountMove$operator$$8$$aggr" | "sysAccountMove$operator$$9$$aggr"; +type Withdraw$creatorAggr = "withdraw$creator$$aggr" | "withdraw$creator$$0$$aggr" | "withdraw$creator$$1$$aggr" | "withdraw$creator$$2$$aggr" | "withdraw$creator$$3$$aggr" | "withdraw$creator$$4$$aggr" | "withdraw$creator$$5$$aggr" | "withdraw$creator$$6$$aggr" | "withdraw$creator$$7$$aggr" | "withdraw$creator$$8$$aggr" | "withdraw$creator$$9$$aggr"; +type WithdrawTransfer$operatorAggr = "withdrawTransfer$operator$$aggr" | "withdrawTransfer$operator$$0$$aggr" | "withdrawTransfer$operator$$1$$aggr" | "withdrawTransfer$operator$$2$$aggr" | "withdrawTransfer$operator$$3$$aggr" | "withdrawTransfer$operator$$4$$aggr" | "withdrawTransfer$operator$$5$$aggr" | "withdrawTransfer$operator$$6$$aggr" | "withdrawTransfer$operator$$7$$aggr" | "withdrawTransfer$operator$$8$$aggr" | "withdrawTransfer$operator$$9$$aggr"; +type WithdrawTransfer$creatorAggr = "withdrawTransfer$creator$$aggr" | "withdrawTransfer$creator$$0$$aggr" | "withdrawTransfer$creator$$1$$aggr" | "withdrawTransfer$creator$$2$$aggr" | "withdrawTransfer$creator$$3$$aggr" | "withdrawTransfer$creator$$4$$aggr" | "withdrawTransfer$creator$$5$$aggr" | "withdrawTransfer$creator$$6$$aggr" | "withdrawTransfer$creator$$7$$aggr" | "withdrawTransfer$creator$$8$$aggr" | "withdrawTransfer$creator$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type ExtraFile$entityAggr = "extraFile$entity$$aggr" | "extraFile$entity$$0$$aggr" | "extraFile$entity$$1$$aggr" | "extraFile$entity$$2$$aggr" | "extraFile$entity$$3$$aggr" | "extraFile$entity$$4$$aggr" | "extraFile$entity$$5$$aggr" | "extraFile$entity$$6$$aggr" | "extraFile$entity$$7$$aggr" | "extraFile$entity$$8$$aggr" | "extraFile$entity$$9$$aggr"; +type WechatQrCode$entityAggr = "wechatQrCode$entity$$aggr" | "wechatQrCode$entity$$0$$aggr" | "wechatQrCode$entity$$1$$aggr" | "wechatQrCode$entity$$2$$aggr" | "wechatQrCode$entity$$3$$aggr" | "wechatQrCode$entity$$4$$aggr" | "wechatQrCode$entity$$5$$aggr" | "wechatQrCode$entity$$6$$aggr" | "wechatQrCode$entity$$7$$aggr" | "wechatQrCode$entity$$8$$aggr" | "wechatQrCode$entity$$9$$aggr"; +type Address$entityAggr = "address$entity$$aggr" | "address$entity$$0$$aggr" | "address$entity$$1$$aggr" | "address$entity$$2$$aggr" | "address$entity$$3$$aggr" | "address$entity$$4$$aggr" | "address$entity$$5$$aggr" | "address$entity$$6$$aggr" | "address$entity$$7$$aggr" | "address$entity$$8$$aggr" | "address$entity$$9$$aggr"; +type Account$entityAggr = "account$entity$$aggr" | "account$entity$$0$$aggr" | "account$entity$$1$$aggr" | "account$entity$$2$$aggr" | "account$entity$$3$$aggr" | "account$entity$$4$$aggr" | "account$entity$$5$$aggr" | "account$entity$$6$$aggr" | "account$entity$$7$$aggr" | "account$entity$$8$$aggr" | "account$entity$$9$$aggr"; +type WithdrawAccount$entityAggr = "withdrawAccount$entity$$aggr" | "withdrawAccount$entity$$0$$aggr" | "withdrawAccount$entity$$1$$aggr" | "withdrawAccount$entity$$2$$aggr" | "withdrawAccount$entity$$3$$aggr" | "withdrawAccount$entity$$4$$aggr" | "withdrawAccount$entity$$5$$aggr" | "withdrawAccount$entity$$6$$aggr" | "withdrawAccount$entity$$7$$aggr" | "withdrawAccount$entity$$8$$aggr" | "withdrawAccount$entity$$9$$aggr"; +export type Schema = OpSchema & { ref?: Schema | null; oper$operator?: Array; - oper$operator$$aggr?: AggregationResult; user$ref?: Array; - user$ref$$aggr?: AggregationResult; userEntityClaim$user?: Array; - userEntityClaim$user$$aggr?: AggregationResult; userRelation$user?: Array; - userRelation$user$$aggr?: AggregationResult; changePasswordTemp$user?: Array; - changePasswordTemp$user$$aggr?: AggregationResult; email$user?: Array; - email$user$$aggr?: AggregationResult; loginName$user?: Array; - loginName$user$$aggr?: AggregationResult; message$user?: Array; - message$user$$aggr?: AggregationResult; mobile$user?: Array; - mobile$user$$aggr?: AggregationResult; parasite$user?: Array; - parasite$user$$aggr?: AggregationResult; readRemark$user?: Array; - readRemark$user$$aggr?: AggregationResult; session$user?: Array; - session$user$$aggr?: AggregationResult; sessionMessage$user?: Array; - sessionMessage$user$$aggr?: AggregationResult; token$user?: Array; - token$user$$aggr?: AggregationResult; token$player?: Array; - token$player$$aggr?: AggregationResult; userEntityGrant$granter?: Array; - userEntityGrant$granter$$aggr?: AggregationResult; userSystem$user?: Array; - userSystem$user$$aggr?: AggregationResult; wechatLogin$user?: Array; - wechatLogin$user$$aggr?: AggregationResult; wechatUser$user?: Array; - wechatUser$user$$aggr?: AggregationResult; deposit$creator?: Array; - deposit$creator$$aggr?: AggregationResult; order$creator?: Array; - order$creator$$aggr?: AggregationResult; pay$creator?: Array; - pay$creator$$aggr?: AggregationResult; refund$creator?: Array; - refund$creator$$aggr?: AggregationResult; sysAccountMove$operator?: Array; - sysAccountMove$operator$$aggr?: AggregationResult; withdraw$creator?: Array; - withdraw$creator$$aggr?: AggregationResult; withdrawTransfer$operator?: Array; - withdrawTransfer$operator$$aggr?: AggregationResult; withdrawTransfer$creator?: Array; - withdrawTransfer$creator$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; extraFile$entity?: Array; - extraFile$entity$$aggr?: AggregationResult; wechatQrCode$entity?: Array; - wechatQrCode$entity$$aggr?: AggregationResult; address$entity?: Array; - address$entity$$aggr?: AggregationResult; account$entity?: Array; - account$entity$$aggr?: AggregationResult; withdrawAccount$entity?: Array; - withdrawAccount$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Oper$operatorAggr]?: AggregationResult; +} & { + [A in User$refAggr]?: AggregationResult; +} & { + [A in UserEntityClaim$userAggr]?: AggregationResult; +} & { + [A in UserRelation$userAggr]?: AggregationResult; +} & { + [A in ChangePasswordTemp$userAggr]?: AggregationResult; +} & { + [A in Email$userAggr]?: AggregationResult; +} & { + [A in LoginName$userAggr]?: AggregationResult; +} & { + [A in Message$userAggr]?: AggregationResult; +} & { + [A in Mobile$userAggr]?: AggregationResult; +} & { + [A in Parasite$userAggr]?: AggregationResult; +} & { + [A in ReadRemark$userAggr]?: AggregationResult; +} & { + [A in Session$userAggr]?: AggregationResult; +} & { + [A in SessionMessage$userAggr]?: AggregationResult; +} & { + [A in Token$userAggr]?: AggregationResult; +} & { + [A in Token$playerAggr]?: AggregationResult; +} & { + [A in UserEntityGrant$granterAggr]?: AggregationResult; +} & { + [A in UserSystem$userAggr]?: AggregationResult; +} & { + [A in WechatLogin$userAggr]?: AggregationResult; +} & { + [A in WechatUser$userAggr]?: AggregationResult; +} & { + [A in Deposit$creatorAggr]?: AggregationResult; +} & { + [A in Order$creatorAggr]?: AggregationResult; +} & { + [A in Pay$creatorAggr]?: AggregationResult; +} & { + [A in Refund$creatorAggr]?: AggregationResult; +} & { + [A in SysAccountMove$operatorAggr]?: AggregationResult; +} & { + [A in Withdraw$creatorAggr]?: AggregationResult; +} & { + [A in WithdrawTransfer$operatorAggr]?: AggregationResult; +} & { + [A in WithdrawTransfer$creatorAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in ExtraFile$entityAggr]?: AggregationResult; +} & { + [A in WechatQrCode$entityAggr]?: AggregationResult; +} & { + [A in Address$entityAggr]?: AggregationResult; +} & { + [A in Account$entityAggr]?: AggregationResult; +} & { + [A in WithdrawAccount$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -218,208 +273,242 @@ export type Projection = { oper$operator?: Oper.Selection & { $entity: "oper"; }; - oper$operator$$aggr?: Oper.Aggregation & { - $entity: "oper"; - }; user$ref?: Selection & { $entity: "user"; }; - user$ref$$aggr?: Aggregation & { - $entity: "user"; - }; userEntityClaim$user?: UserEntityClaim.Selection & { $entity: "userEntityClaim"; }; - userEntityClaim$user$$aggr?: UserEntityClaim.Aggregation & { - $entity: "userEntityClaim"; - }; userRelation$user?: UserRelation.Selection & { $entity: "userRelation"; }; - userRelation$user$$aggr?: UserRelation.Aggregation & { - $entity: "userRelation"; - }; changePasswordTemp$user?: ChangePasswordTemp.Selection & { $entity: "changePasswordTemp"; }; - changePasswordTemp$user$$aggr?: ChangePasswordTemp.Aggregation & { - $entity: "changePasswordTemp"; - }; email$user?: Email.Selection & { $entity: "email"; }; - email$user$$aggr?: Email.Aggregation & { - $entity: "email"; - }; loginName$user?: LoginName.Selection & { $entity: "loginName"; }; - loginName$user$$aggr?: LoginName.Aggregation & { - $entity: "loginName"; - }; message$user?: Message.Selection & { $entity: "message"; }; - message$user$$aggr?: Message.Aggregation & { - $entity: "message"; - }; mobile$user?: Mobile.Selection & { $entity: "mobile"; }; - mobile$user$$aggr?: Mobile.Aggregation & { - $entity: "mobile"; - }; parasite$user?: Parasite.Selection & { $entity: "parasite"; }; - parasite$user$$aggr?: Parasite.Aggregation & { - $entity: "parasite"; - }; readRemark$user?: ReadRemark.Selection & { $entity: "readRemark"; }; - readRemark$user$$aggr?: ReadRemark.Aggregation & { - $entity: "readRemark"; - }; session$user?: Session.Selection & { $entity: "session"; }; - session$user$$aggr?: Session.Aggregation & { - $entity: "session"; - }; sessionMessage$user?: SessionMessage.Selection & { $entity: "sessionMessage"; }; - sessionMessage$user$$aggr?: SessionMessage.Aggregation & { - $entity: "sessionMessage"; - }; token$user?: Token.Selection & { $entity: "token"; }; - token$user$$aggr?: Token.Aggregation & { - $entity: "token"; - }; token$player?: Token.Selection & { $entity: "token"; }; - token$player$$aggr?: Token.Aggregation & { - $entity: "token"; - }; userEntityGrant$granter?: UserEntityGrant.Selection & { $entity: "userEntityGrant"; }; - userEntityGrant$granter$$aggr?: UserEntityGrant.Aggregation & { - $entity: "userEntityGrant"; - }; userSystem$user?: UserSystem.Selection & { $entity: "userSystem"; }; - userSystem$user$$aggr?: UserSystem.Aggregation & { - $entity: "userSystem"; - }; wechatLogin$user?: WechatLogin.Selection & { $entity: "wechatLogin"; }; - wechatLogin$user$$aggr?: WechatLogin.Aggregation & { - $entity: "wechatLogin"; - }; wechatUser$user?: WechatUser.Selection & { $entity: "wechatUser"; }; - wechatUser$user$$aggr?: WechatUser.Aggregation & { - $entity: "wechatUser"; - }; deposit$creator?: Deposit.Selection & { $entity: "deposit"; }; - deposit$creator$$aggr?: Deposit.Aggregation & { - $entity: "deposit"; - }; order$creator?: Order.Selection & { $entity: "order"; }; - order$creator$$aggr?: Order.Aggregation & { - $entity: "order"; - }; pay$creator?: Pay.Selection & { $entity: "pay"; }; - pay$creator$$aggr?: Pay.Aggregation & { - $entity: "pay"; - }; refund$creator?: Refund.Selection & { $entity: "refund"; }; - refund$creator$$aggr?: Refund.Aggregation & { - $entity: "refund"; - }; sysAccountMove$operator?: SysAccountMove.Selection & { $entity: "sysAccountMove"; }; - sysAccountMove$operator$$aggr?: SysAccountMove.Aggregation & { - $entity: "sysAccountMove"; - }; withdraw$creator?: Withdraw.Selection & { $entity: "withdraw"; }; - withdraw$creator$$aggr?: Withdraw.Aggregation & { - $entity: "withdraw"; - }; withdrawTransfer$operator?: WithdrawTransfer.Selection & { $entity: "withdrawTransfer"; }; - withdrawTransfer$operator$$aggr?: WithdrawTransfer.Aggregation & { - $entity: "withdrawTransfer"; - }; withdrawTransfer$creator?: WithdrawTransfer.Selection & { $entity: "withdrawTransfer"; }; - withdrawTransfer$creator$$aggr?: WithdrawTransfer.Aggregation & { - $entity: "withdrawTransfer"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; extraFile$entity?: ExtraFile.Selection & { $entity: "extraFile"; }; - extraFile$entity$$aggr?: ExtraFile.Aggregation & { - $entity: "extraFile"; - }; wechatQrCode$entity?: WechatQrCode.Selection & { $entity: "wechatQrCode"; }; - wechatQrCode$entity$$aggr?: WechatQrCode.Aggregation & { - $entity: "wechatQrCode"; - }; address$entity?: Address.Selection & { $entity: "address"; }; - address$entity$$aggr?: Address.Aggregation & { - $entity: "address"; - }; account$entity?: Account.Selection & { $entity: "account"; }; - account$entity$$aggr?: Account.Aggregation & { - $entity: "account"; - }; withdrawAccount$entity?: WithdrawAccount.Selection & { $entity: "withdrawAccount"; }; - withdrawAccount$entity$$aggr?: WithdrawAccount.Aggregation & { +} & Partial> & { + [A in Oper$operatorAggr]?: Oper.Aggregation & { + $entity: "oper"; + }; +} & { + [A in User$refAggr]?: Aggregation & { + $entity: "user"; + }; +} & { + [A in UserEntityClaim$userAggr]?: UserEntityClaim.Aggregation & { + $entity: "userEntityClaim"; + }; +} & { + [A in UserRelation$userAggr]?: UserRelation.Aggregation & { + $entity: "userRelation"; + }; +} & { + [A in ChangePasswordTemp$userAggr]?: ChangePasswordTemp.Aggregation & { + $entity: "changePasswordTemp"; + }; +} & { + [A in Email$userAggr]?: Email.Aggregation & { + $entity: "email"; + }; +} & { + [A in LoginName$userAggr]?: LoginName.Aggregation & { + $entity: "loginName"; + }; +} & { + [A in Message$userAggr]?: Message.Aggregation & { + $entity: "message"; + }; +} & { + [A in Mobile$userAggr]?: Mobile.Aggregation & { + $entity: "mobile"; + }; +} & { + [A in Parasite$userAggr]?: Parasite.Aggregation & { + $entity: "parasite"; + }; +} & { + [A in ReadRemark$userAggr]?: ReadRemark.Aggregation & { + $entity: "readRemark"; + }; +} & { + [A in Session$userAggr]?: Session.Aggregation & { + $entity: "session"; + }; +} & { + [A in SessionMessage$userAggr]?: SessionMessage.Aggregation & { + $entity: "sessionMessage"; + }; +} & { + [A in Token$userAggr]?: Token.Aggregation & { + $entity: "token"; + }; +} & { + [A in Token$playerAggr]?: Token.Aggregation & { + $entity: "token"; + }; +} & { + [A in UserEntityGrant$granterAggr]?: UserEntityGrant.Aggregation & { + $entity: "userEntityGrant"; + }; +} & { + [A in UserSystem$userAggr]?: UserSystem.Aggregation & { + $entity: "userSystem"; + }; +} & { + [A in WechatLogin$userAggr]?: WechatLogin.Aggregation & { + $entity: "wechatLogin"; + }; +} & { + [A in WechatUser$userAggr]?: WechatUser.Aggregation & { + $entity: "wechatUser"; + }; +} & { + [A in Deposit$creatorAggr]?: Deposit.Aggregation & { + $entity: "deposit"; + }; +} & { + [A in Order$creatorAggr]?: Order.Aggregation & { + $entity: "order"; + }; +} & { + [A in Pay$creatorAggr]?: Pay.Aggregation & { + $entity: "pay"; + }; +} & { + [A in Refund$creatorAggr]?: Refund.Aggregation & { + $entity: "refund"; + }; +} & { + [A in SysAccountMove$operatorAggr]?: SysAccountMove.Aggregation & { + $entity: "sysAccountMove"; + }; +} & { + [A in Withdraw$creatorAggr]?: Withdraw.Aggregation & { + $entity: "withdraw"; + }; +} & { + [A in WithdrawTransfer$operatorAggr]?: WithdrawTransfer.Aggregation & { + $entity: "withdrawTransfer"; + }; +} & { + [A in WithdrawTransfer$creatorAggr]?: WithdrawTransfer.Aggregation & { + $entity: "withdrawTransfer"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in ExtraFile$entityAggr]?: ExtraFile.Aggregation & { + $entity: "extraFile"; + }; +} & { + [A in WechatQrCode$entityAggr]?: WechatQrCode.Aggregation & { + $entity: "wechatQrCode"; + }; +} & { + [A in Address$entityAggr]?: Address.Aggregation & { + $entity: "address"; + }; +} & { + [A in Account$entityAggr]?: Account.Aggregation & { + $entity: "account"; + }; +} & { + [A in WithdrawAccount$entityAggr]?: WithdrawAccount.Aggregation & { $entity: "withdrawAccount"; }; -} & Partial>; +}; type UserIdProjection = OneOf<{ id: number; refId: number; diff --git a/lib/oak-app-domain/UserEntityClaim/Schema.d.ts b/lib/oak-app-domain/UserEntityClaim/Schema.d.ts index d9378c5e..b6d55dc1 100644 --- a/lib/oak-app-domain/UserEntityClaim/Schema.d.ts +++ b/lib/oak-app-domain/UserEntityClaim/Schema.d.ts @@ -16,12 +16,7 @@ export type OpSchema = EntityShape & { userRelationId: ForeignKey<"userRelation">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - uegId: ForeignKey<"userEntityGrant">; - userId: ForeignKey<"user">; - relationId: ForeignKey<"relation">; - claimEntityId: String<64>; - userRelationId: ForeignKey<"userRelation">; +export type Schema = OpSchema & { ueg: UserEntityGrant.Schema; user: User.Schema; relation: Relation.Schema; diff --git a/lib/oak-app-domain/UserEntityGrant/Schema.d.ts b/lib/oak-app-domain/UserEntityGrant/Schema.d.ts index 0475893b..9f4d8790 100644 --- a/lib/oak-app-domain/UserEntityGrant/Schema.d.ts +++ b/lib/oak-app-domain/UserEntityGrant/Schema.d.ts @@ -35,30 +35,18 @@ export type OpSchema = EntityShape & { claimUrl: String<128>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - relationEntity: String<32>; - relationEntityFilter: Object; - relationIds: RelationIds; - entity: String<32>; - entityId: String<64>; - type: "grant" | "transfer"; - rule: Rule; - ruleOnRow: Rule; - multiple?: Boolean | null; - remark?: Text | null; - granterId: ForeignKey<"user">; - qrCodeType: QrCodeType; - expiresAt?: Datetime | null; - expired?: Boolean | null; - redirectTo?: RedirectToProps | null; - claimUrl: String<128>; +type UserEntityClaim$uegAggr = "userEntityClaim$ueg$$aggr" | "userEntityClaim$ueg$$0$$aggr" | "userEntityClaim$ueg$$1$$aggr" | "userEntityClaim$ueg$$2$$aggr" | "userEntityClaim$ueg$$3$$aggr" | "userEntityClaim$ueg$$4$$aggr" | "userEntityClaim$ueg$$5$$aggr" | "userEntityClaim$ueg$$6$$aggr" | "userEntityClaim$ueg$$7$$aggr" | "userEntityClaim$ueg$$8$$aggr" | "userEntityClaim$ueg$$9$$aggr"; +type WechatQrCode$entityAggr = "wechatQrCode$entity$$aggr" | "wechatQrCode$entity$$0$$aggr" | "wechatQrCode$entity$$1$$aggr" | "wechatQrCode$entity$$2$$aggr" | "wechatQrCode$entity$$3$$aggr" | "wechatQrCode$entity$$4$$aggr" | "wechatQrCode$entity$$5$$aggr" | "wechatQrCode$entity$$6$$aggr" | "wechatQrCode$entity$$7$$aggr" | "wechatQrCode$entity$$8$$aggr" | "wechatQrCode$entity$$9$$aggr"; +export type Schema = OpSchema & { granter: User.Schema; userEntityClaim$ueg?: Array; - userEntityClaim$ueg$$aggr?: AggregationResult; wechatQrCode$entity?: Array; - wechatQrCode$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in UserEntityClaim$uegAggr]?: AggregationResult; +} & { + [A in WechatQrCode$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -113,16 +101,18 @@ export type Projection = { userEntityClaim$ueg?: UserEntityClaim.Selection & { $entity: "userEntityClaim"; }; - userEntityClaim$ueg$$aggr?: UserEntityClaim.Aggregation & { - $entity: "userEntityClaim"; - }; wechatQrCode$entity?: WechatQrCode.Selection & { $entity: "wechatQrCode"; }; - wechatQrCode$entity$$aggr?: WechatQrCode.Aggregation & { +} & Partial> & { + [A in UserEntityClaim$uegAggr]?: UserEntityClaim.Aggregation & { + $entity: "userEntityClaim"; + }; +} & { + [A in WechatQrCode$entityAggr]?: WechatQrCode.Aggregation & { $entity: "wechatQrCode"; }; -} & Partial>; +}; type UserEntityGrantIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/UserRelation/Schema.d.ts b/lib/oak-app-domain/UserRelation/Schema.d.ts index 8b36141c..35048d2f 100644 --- a/lib/oak-app-domain/UserRelation/Schema.d.ts +++ b/lib/oak-app-domain/UserRelation/Schema.d.ts @@ -16,19 +16,17 @@ export type OpSchema = EntityShape & { entityId: String<64>; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - relationId: ForeignKey<"relation">; - entity: "session" | "toDo" | string; - entityId: String<64>; +type UserEntityClaim$userRelationAggr = "userEntityClaim$userRelation$$aggr" | "userEntityClaim$userRelation$$0$$aggr" | "userEntityClaim$userRelation$$1$$aggr" | "userEntityClaim$userRelation$$2$$aggr" | "userEntityClaim$userRelation$$3$$aggr" | "userEntityClaim$userRelation$$4$$aggr" | "userEntityClaim$userRelation$$5$$aggr" | "userEntityClaim$userRelation$$6$$aggr" | "userEntityClaim$userRelation$$7$$aggr" | "userEntityClaim$userRelation$$8$$aggr" | "userEntityClaim$userRelation$$9$$aggr"; +export type Schema = OpSchema & { user: User.Schema; relation: Relation.Schema; session?: Session.Schema; toDo?: ToDo.Schema; userEntityClaim$userRelation?: Array; - userEntityClaim$userRelation$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in UserEntityClaim$userRelationAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -64,10 +62,11 @@ export type Projection = { userEntityClaim$userRelation?: UserEntityClaim.Selection & { $entity: "userEntityClaim"; }; - userEntityClaim$userRelation$$aggr?: UserEntityClaim.Aggregation & { +} & Partial> & { + [A in UserEntityClaim$userRelationAggr]?: UserEntityClaim.Aggregation & { $entity: "userEntityClaim"; }; -} & Partial>; +}; type UserRelationIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/UserSystem/Schema.d.ts b/lib/oak-app-domain/UserSystem/Schema.d.ts index 998f1d25..f02073a3 100644 --- a/lib/oak-app-domain/UserSystem/Schema.d.ts +++ b/lib/oak-app-domain/UserSystem/Schema.d.ts @@ -10,9 +10,7 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId: ForeignKey<"user">; - systemId: ForeignKey<"system">; +export type Schema = OpSchema & { user: User.Schema; system: System.Schema; } & { diff --git a/lib/oak-app-domain/UserWechatPublicTag/Schema.d.ts b/lib/oak-app-domain/UserWechatPublicTag/Schema.d.ts index 3a93ec57..c1aabcad 100644 --- a/lib/oak-app-domain/UserWechatPublicTag/Schema.d.ts +++ b/lib/oak-app-domain/UserWechatPublicTag/Schema.d.ts @@ -14,12 +14,7 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - wechatPublicTagId: ForeignKey<"wechatPublicTag">; - wechatUserId: ForeignKey<"wechatUser">; - sync: Boolean; - syncAt: Datetime; - iState?: IState | null; +export type Schema = OpSchema & { wechatPublicTag: WechatPublicTag.Schema; wechatUser: WechatUser.Schema; } & { diff --git a/lib/oak-app-domain/WechatLogin/Schema.d.ts b/lib/oak-app-domain/WechatLogin/Schema.d.ts index 0af54f04..8f8005e5 100644 --- a/lib/oak-app-domain/WechatLogin/Schema.d.ts +++ b/lib/oak-app-domain/WechatLogin/Schema.d.ts @@ -20,23 +20,19 @@ export type OpSchema = EntityShape & { wechatUserId?: ForeignKey<"wechatUser"> | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - userId?: ForeignKey<"user"> | null; - type: "bind" | "login"; - successed: Boolean; - remark?: Text | null; - qrCodeType: QrCodeType; - expiresAt?: Datetime | null; - expired?: Boolean | null; - wechatUserId?: ForeignKey<"wechatUser"> | null; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +type WechatQrCode$entityAggr = "wechatQrCode$entity$$aggr" | "wechatQrCode$entity$$0$$aggr" | "wechatQrCode$entity$$1$$aggr" | "wechatQrCode$entity$$2$$aggr" | "wechatQrCode$entity$$3$$aggr" | "wechatQrCode$entity$$4$$aggr" | "wechatQrCode$entity$$5$$aggr" | "wechatQrCode$entity$$6$$aggr" | "wechatQrCode$entity$$7$$aggr" | "wechatQrCode$entity$$8$$aggr" | "wechatQrCode$entity$$9$$aggr"; +export type Schema = OpSchema & { user?: User.Schema | null; wechatUser?: WechatUser.Schema | null; token$entity?: Array; - token$entity$$aggr?: AggregationResult; wechatQrCode$entity?: Array; - wechatQrCode$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Token$entityAggr]?: AggregationResult; +} & { + [A in WechatQrCode$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -77,16 +73,18 @@ export type Projection = { token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { - $entity: "token"; - }; wechatQrCode$entity?: WechatQrCode.Selection & { $entity: "wechatQrCode"; }; - wechatQrCode$entity$$aggr?: WechatQrCode.Aggregation & { +} & Partial> & { + [A in Token$entityAggr]?: Token.Aggregation & { + $entity: "token"; + }; +} & { + [A in WechatQrCode$entityAggr]?: WechatQrCode.Aggregation & { $entity: "wechatQrCode"; }; -} & Partial>; +}; type WechatLoginIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WechatMenu/Schema.d.ts b/lib/oak-app-domain/WechatMenu/Schema.d.ts index 244a117c..95eccd7d 100644 --- a/lib/oak-app-domain/WechatMenu/Schema.d.ts +++ b/lib/oak-app-domain/WechatMenu/Schema.d.ts @@ -20,12 +20,7 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - menuId?: Int<4> | null; - menuConfig: Config; - applicationId: ForeignKey<"application">; - wechatPublicTagId?: ForeignKey<"wechatPublicTag"> | null; - iState?: IState | null; +export type Schema = OpSchema & { application: Application.Schema; wechatPublicTag?: WechatPublicTag.Schema | null; } & { diff --git a/lib/oak-app-domain/WechatMpJump/Schema.d.ts b/lib/oak-app-domain/WechatMpJump/Schema.d.ts index d01e0909..7f0b44e9 100644 --- a/lib/oak-app-domain/WechatMpJump/Schema.d.ts +++ b/lib/oak-app-domain/WechatMpJump/Schema.d.ts @@ -20,14 +20,7 @@ export type OpSchema = EntityShape & { expired?: Boolean | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - messageId?: ForeignKey<"message"> | null; - jump_wxa?: Jump_wxa | null; - openlink?: String<256> | null; - expireType?: Int<1> | null; - expireInterval?: Int<2> | null; - expiresAt?: Datetime | null; - expired?: Boolean | null; +export type Schema = OpSchema & { message?: Message.Schema | null; } & { [A in ExpressionKey]?: any; diff --git a/lib/oak-app-domain/WechatPay/Schema.d.ts b/lib/oak-app-domain/WechatPay/Schema.d.ts index b5fe2c74..1d84fc98 100644 --- a/lib/oak-app-domain/WechatPay/Schema.d.ts +++ b/lib/oak-app-domain/WechatPay/Schema.d.ts @@ -14,19 +14,22 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - payNotifyUrl: String<128>; - refundNotifyUrl: String<128>; - systemId: ForeignKey<"system">; +type WpAccount$wechatPayAggr = "wpAccount$wechatPay$$aggr" | "wpAccount$wechatPay$$0$$aggr" | "wpAccount$wechatPay$$1$$aggr" | "wpAccount$wechatPay$$2$$aggr" | "wpAccount$wechatPay$$3$$aggr" | "wpAccount$wechatPay$$4$$aggr" | "wpAccount$wechatPay$$5$$aggr" | "wpAccount$wechatPay$$6$$aggr" | "wpAccount$wechatPay$$7$$aggr" | "wpAccount$wechatPay$$8$$aggr" | "wpAccount$wechatPay$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; wpAccount$wechatPay?: Array; - wpAccount$wechatPay$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in WpAccount$wechatPayAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -56,22 +59,25 @@ export type Projection = { wpAccount$wechatPay?: WpAccount.Selection & { $entity: "wpAccount"; }; - wpAccount$wechatPay$$aggr?: WpAccount.Aggregation & { - $entity: "wpAccount"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { +} & Partial> & { + [A in WpAccount$wechatPayAggr]?: WpAccount.Aggregation & { + $entity: "wpAccount"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { $entity: "operEntity"; }; -} & Partial>; +}; type WechatPayIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WechatPublicAutoReply/Schema.d.ts b/lib/oak-app-domain/WechatPublicAutoReply/Schema.d.ts index 15c02cce..21eb5a11 100644 --- a/lib/oak-app-domain/WechatPublicAutoReply/Schema.d.ts +++ b/lib/oak-app-domain/WechatPublicAutoReply/Schema.d.ts @@ -17,11 +17,7 @@ export type OpSchema = EntityShape & { event: "subscribe" | "unsubscribe" | "keyword" | "auto"; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - content: content; - applicationId: ForeignKey<"application">; - type: "text" | "image" | "video" | "voice"; - event: "subscribe" | "unsubscribe" | "keyword" | "auto"; +export type Schema = OpSchema & { application: Application.Schema; } & { [A in ExpressionKey]?: any; diff --git a/lib/oak-app-domain/WechatPublicTag/Schema.d.ts b/lib/oak-app-domain/WechatPublicTag/Schema.d.ts index 6a906e1b..e5b2cf48 100644 --- a/lib/oak-app-domain/WechatPublicTag/Schema.d.ts +++ b/lib/oak-app-domain/WechatPublicTag/Schema.d.ts @@ -16,20 +16,18 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - text: String<32>; - applicationId: ForeignKey<"application">; - wechatId?: Uint<4> | null; - sync?: Boolean | null; - syncAt?: Datetime | null; - iState?: IState | null; +type UserWechatPublicTag$wechatPublicTagAggr = "userWechatPublicTag$wechatPublicTag$$aggr" | "userWechatPublicTag$wechatPublicTag$$0$$aggr" | "userWechatPublicTag$wechatPublicTag$$1$$aggr" | "userWechatPublicTag$wechatPublicTag$$2$$aggr" | "userWechatPublicTag$wechatPublicTag$$3$$aggr" | "userWechatPublicTag$wechatPublicTag$$4$$aggr" | "userWechatPublicTag$wechatPublicTag$$5$$aggr" | "userWechatPublicTag$wechatPublicTag$$6$$aggr" | "userWechatPublicTag$wechatPublicTag$$7$$aggr" | "userWechatPublicTag$wechatPublicTag$$8$$aggr" | "userWechatPublicTag$wechatPublicTag$$9$$aggr"; +type WechatMenu$wechatPublicTagAggr = "wechatMenu$wechatPublicTag$$aggr" | "wechatMenu$wechatPublicTag$$0$$aggr" | "wechatMenu$wechatPublicTag$$1$$aggr" | "wechatMenu$wechatPublicTag$$2$$aggr" | "wechatMenu$wechatPublicTag$$3$$aggr" | "wechatMenu$wechatPublicTag$$4$$aggr" | "wechatMenu$wechatPublicTag$$5$$aggr" | "wechatMenu$wechatPublicTag$$6$$aggr" | "wechatMenu$wechatPublicTag$$7$$aggr" | "wechatMenu$wechatPublicTag$$8$$aggr" | "wechatMenu$wechatPublicTag$$9$$aggr"; +export type Schema = OpSchema & { application: Application.Schema; userWechatPublicTag$wechatPublicTag?: Array; - userWechatPublicTag$wechatPublicTag$$aggr?: AggregationResult; wechatMenu$wechatPublicTag?: Array; - wechatMenu$wechatPublicTag$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in UserWechatPublicTag$wechatPublicTagAggr]?: AggregationResult; +} & { + [A in WechatMenu$wechatPublicTagAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -64,16 +62,18 @@ export type Projection = { userWechatPublicTag$wechatPublicTag?: UserWechatPublicTag.Selection & { $entity: "userWechatPublicTag"; }; - userWechatPublicTag$wechatPublicTag$$aggr?: UserWechatPublicTag.Aggregation & { - $entity: "userWechatPublicTag"; - }; wechatMenu$wechatPublicTag?: WechatMenu.Selection & { $entity: "wechatMenu"; }; - wechatMenu$wechatPublicTag$$aggr?: WechatMenu.Aggregation & { +} & Partial> & { + [A in UserWechatPublicTag$wechatPublicTagAggr]?: UserWechatPublicTag.Aggregation & { + $entity: "userWechatPublicTag"; + }; +} & { + [A in WechatMenu$wechatPublicTagAggr]?: WechatMenu.Aggregation & { $entity: "wechatMenu"; }; -} & Partial>; +}; type WechatPublicTagIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WechatQrCode/Schema.d.ts b/lib/oak-app-domain/WechatQrCode/Schema.d.ts index 376f63fa..fe4f9e6d 100644 --- a/lib/oak-app-domain/WechatQrCode/Schema.d.ts +++ b/lib/oak-app-domain/WechatQrCode/Schema.d.ts @@ -32,21 +32,7 @@ export type OpSchema = EntityShape & { props: WechatQrCodeProps; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: "user" | "userEntityGrant" | "wechatLogin" | string; - entityId: String<64>; - type: QrCodeType; - allowShare: Boolean; - tag?: String<32> | null; - tag2?: String<64> | null; - expiresAt?: Datetime | null; - expired?: Boolean | null; - ticket?: Text | null; - url?: String<256> | null; - permanent?: Boolean | null; - buffer?: Text | null; - applicationId: ForeignKey<"application">; - props: WechatQrCodeProps; +export type Schema = OpSchema & { application: Application.Schema; user?: User.Schema; userEntityGrant?: UserEntityGrant.Schema; diff --git a/lib/oak-app-domain/WechatTemplate/Schema.d.ts b/lib/oak-app-domain/WechatTemplate/Schema.d.ts index 985bb780..bd9a9839 100644 --- a/lib/oak-app-domain/WechatTemplate/Schema.d.ts +++ b/lib/oak-app-domain/WechatTemplate/Schema.d.ts @@ -24,23 +24,14 @@ export type OpSchema = EntityShape & { type?: ("2" | "3") | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - applicationId: ForeignKey<"application">; - wechatId: String<64>; - title: Text; - primaryIndustry?: Text | null; - deputyIndustry?: Text | null; - content?: Text | null; - example?: Text | null; - param?: Object | null; - syncAt: Datetime; - keywordEnumValueList?: KeywordEnumValueList | null; - type?: ("2" | "3") | null; +type MessageTypeTemplate$templateAggr = "messageTypeTemplate$template$$aggr" | "messageTypeTemplate$template$$0$$aggr" | "messageTypeTemplate$template$$1$$aggr" | "messageTypeTemplate$template$$2$$aggr" | "messageTypeTemplate$template$$3$$aggr" | "messageTypeTemplate$template$$4$$aggr" | "messageTypeTemplate$template$$5$$aggr" | "messageTypeTemplate$template$$6$$aggr" | "messageTypeTemplate$template$$7$$aggr" | "messageTypeTemplate$template$$8$$aggr" | "messageTypeTemplate$template$$9$$aggr"; +export type Schema = OpSchema & { application: Application.Schema; messageTypeTemplate$template?: Array; - messageTypeTemplate$template$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in MessageTypeTemplate$templateAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -84,10 +75,11 @@ export type Projection = { messageTypeTemplate$template?: MessageTypeTemplate.Selection & { $entity: "messageTypeTemplate"; }; - messageTypeTemplate$template$$aggr?: MessageTypeTemplate.Aggregation & { +} & Partial> & { + [A in MessageTypeTemplate$templateAggr]?: MessageTypeTemplate.Aggregation & { $entity: "messageTypeTemplate"; }; -} & Partial>; +}; type WechatTemplateIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WechatUser/Schema.d.ts b/lib/oak-app-domain/WechatUser/Schema.d.ts index 61604501..45a94ee9 100644 --- a/lib/oak-app-domain/WechatUser/Schema.d.ts +++ b/lib/oak-app-domain/WechatUser/Schema.d.ts @@ -29,35 +29,27 @@ export type OpSchema = EntityShape & { avatar?: Image | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - origin: "mp" | "public" | "web" | "native"; - openId?: String<32> | null; - unionId?: String<32> | null; - sessionKey?: String<64> | null; - accessToken?: String<128> | null; - refreshToken?: String<128> | null; - scope?: String<64> | null; - atExpiredAt?: Datetime | null; - rtExpiredAt?: Datetime | null; - subscribed?: Boolean | null; - subscribedAt?: Datetime | null; - unsubscribedAt?: Datetime | null; - userId?: ForeignKey<"user"> | null; - applicationId: ForeignKey<"application">; - nickname?: String<128> | null; - avatar?: Image | null; +type SessionMessage$wechatUserAggr = "sessionMessage$wechatUser$$aggr" | "sessionMessage$wechatUser$$0$$aggr" | "sessionMessage$wechatUser$$1$$aggr" | "sessionMessage$wechatUser$$2$$aggr" | "sessionMessage$wechatUser$$3$$aggr" | "sessionMessage$wechatUser$$4$$aggr" | "sessionMessage$wechatUser$$5$$aggr" | "sessionMessage$wechatUser$$6$$aggr" | "sessionMessage$wechatUser$$7$$aggr" | "sessionMessage$wechatUser$$8$$aggr" | "sessionMessage$wechatUser$$9$$aggr"; +type UserWechatPublicTag$wechatUserAggr = "userWechatPublicTag$wechatUser$$aggr" | "userWechatPublicTag$wechatUser$$0$$aggr" | "userWechatPublicTag$wechatUser$$1$$aggr" | "userWechatPublicTag$wechatUser$$2$$aggr" | "userWechatPublicTag$wechatUser$$3$$aggr" | "userWechatPublicTag$wechatUser$$4$$aggr" | "userWechatPublicTag$wechatUser$$5$$aggr" | "userWechatPublicTag$wechatUser$$6$$aggr" | "userWechatPublicTag$wechatUser$$7$$aggr" | "userWechatPublicTag$wechatUser$$8$$aggr" | "userWechatPublicTag$wechatUser$$9$$aggr"; +type WechatLogin$wechatUserAggr = "wechatLogin$wechatUser$$aggr" | "wechatLogin$wechatUser$$0$$aggr" | "wechatLogin$wechatUser$$1$$aggr" | "wechatLogin$wechatUser$$2$$aggr" | "wechatLogin$wechatUser$$3$$aggr" | "wechatLogin$wechatUser$$4$$aggr" | "wechatLogin$wechatUser$$5$$aggr" | "wechatLogin$wechatUser$$6$$aggr" | "wechatLogin$wechatUser$$7$$aggr" | "wechatLogin$wechatUser$$8$$aggr" | "wechatLogin$wechatUser$$9$$aggr"; +type Token$entityAggr = "token$entity$$aggr" | "token$entity$$0$$aggr" | "token$entity$$1$$aggr" | "token$entity$$2$$aggr" | "token$entity$$3$$aggr" | "token$entity$$4$$aggr" | "token$entity$$5$$aggr" | "token$entity$$6$$aggr" | "token$entity$$7$$aggr" | "token$entity$$8$$aggr" | "token$entity$$9$$aggr"; +export type Schema = OpSchema & { user?: User.Schema | null; application: Application.Schema; sessionMessage$wechatUser?: Array; - sessionMessage$wechatUser$$aggr?: AggregationResult; userWechatPublicTag$wechatUser?: Array; - userWechatPublicTag$wechatUser$$aggr?: AggregationResult; wechatLogin$wechatUser?: Array; - wechatLogin$wechatUser$$aggr?: AggregationResult; token$entity?: Array; - token$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SessionMessage$wechatUserAggr]?: AggregationResult; +} & { + [A in UserWechatPublicTag$wechatUserAggr]?: AggregationResult; +} & { + [A in WechatLogin$wechatUserAggr]?: AggregationResult; +} & { + [A in Token$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -116,28 +108,32 @@ export type Projection = { sessionMessage$wechatUser?: SessionMessage.Selection & { $entity: "sessionMessage"; }; - sessionMessage$wechatUser$$aggr?: SessionMessage.Aggregation & { - $entity: "sessionMessage"; - }; userWechatPublicTag$wechatUser?: UserWechatPublicTag.Selection & { $entity: "userWechatPublicTag"; }; - userWechatPublicTag$wechatUser$$aggr?: UserWechatPublicTag.Aggregation & { - $entity: "userWechatPublicTag"; - }; wechatLogin$wechatUser?: WechatLogin.Selection & { $entity: "wechatLogin"; }; - wechatLogin$wechatUser$$aggr?: WechatLogin.Aggregation & { - $entity: "wechatLogin"; - }; token$entity?: Token.Selection & { $entity: "token"; }; - token$entity$$aggr?: Token.Aggregation & { +} & Partial> & { + [A in SessionMessage$wechatUserAggr]?: SessionMessage.Aggregation & { + $entity: "sessionMessage"; + }; +} & { + [A in UserWechatPublicTag$wechatUserAggr]?: UserWechatPublicTag.Aggregation & { + $entity: "userWechatPublicTag"; + }; +} & { + [A in WechatLogin$wechatUserAggr]?: WechatLogin.Aggregation & { + $entity: "wechatLogin"; + }; +} & { + [A in Token$entityAggr]?: Token.Aggregation & { $entity: "token"; }; -} & Partial>; +}; type WechatUserIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/Withdraw/Schema.d.ts b/lib/oak-app-domain/Withdraw/Schema.d.ts index ecaf2dba..f8ddc72b 100644 --- a/lib/oak-app-domain/Withdraw/Schema.d.ts +++ b/lib/oak-app-domain/Withdraw/Schema.d.ts @@ -23,30 +23,31 @@ export type OpSchema = EntityShape & { iState?: IState | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - accountId: ForeignKey<"account">; - price: Price; - loss: Price; - dealPrice: Price; - dealLoss: Price; - creatorId: ForeignKey<"user">; - reason?: Text | null; - meta?: Object | null; - iState?: IState | null; +type Refund$withdrawAggr = "refund$withdraw$$aggr" | "refund$withdraw$$0$$aggr" | "refund$withdraw$$1$$aggr" | "refund$withdraw$$2$$aggr" | "refund$withdraw$$3$$aggr" | "refund$withdraw$$4$$aggr" | "refund$withdraw$$5$$aggr" | "refund$withdraw$$6$$aggr" | "refund$withdraw$$7$$aggr" | "refund$withdraw$$8$$aggr" | "refund$withdraw$$9$$aggr"; +type WithdrawTransfer$withdrawAggr = "withdrawTransfer$withdraw$$aggr" | "withdrawTransfer$withdraw$$0$$aggr" | "withdrawTransfer$withdraw$$1$$aggr" | "withdrawTransfer$withdraw$$2$$aggr" | "withdrawTransfer$withdraw$$3$$aggr" | "withdrawTransfer$withdraw$$4$$aggr" | "withdrawTransfer$withdraw$$5$$aggr" | "withdrawTransfer$withdraw$$6$$aggr" | "withdrawTransfer$withdraw$$7$$aggr" | "withdrawTransfer$withdraw$$8$$aggr" | "withdrawTransfer$withdraw$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { account: Account.Schema; creator: User.Schema; refund$withdraw?: Array; - refund$withdraw$$aggr?: AggregationResult; withdrawTransfer$withdraw?: Array; - withdrawTransfer$withdraw$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in Refund$withdrawAggr]?: AggregationResult; +} & { + [A in WithdrawTransfer$withdrawAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -92,34 +93,39 @@ export type Projection = { refund$withdraw?: Refund.Selection & { $entity: "refund"; }; - refund$withdraw$$aggr?: Refund.Aggregation & { - $entity: "refund"; - }; withdrawTransfer$withdraw?: WithdrawTransfer.Selection & { $entity: "withdrawTransfer"; }; - withdrawTransfer$withdraw$$aggr?: WithdrawTransfer.Aggregation & { - $entity: "withdrawTransfer"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in Refund$withdrawAggr]?: Refund.Aggregation & { + $entity: "refund"; + }; +} & { + [A in WithdrawTransfer$withdrawAggr]?: WithdrawTransfer.Aggregation & { + $entity: "withdrawTransfer"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type WithdrawIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WithdrawAccount/Schema.d.ts b/lib/oak-app-domain/WithdrawAccount/Schema.d.ts index 716a3058..dcc53c22 100644 --- a/lib/oak-app-domain/WithdrawAccount/Schema.d.ts +++ b/lib/oak-app-domain/WithdrawAccount/Schema.d.ts @@ -23,29 +23,25 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - org?: String<128> | null; - name: String<64>; - code: String<64>; - ofSystemId: ForeignKey<"system">; - data?: Object | null; - channelId: ForeignKey<"withdrawChannel">; - entity: "system" | "user" | string; - entityId: String<64>; - isDefault: Boolean; - enabled: Boolean; +type WithdrawTransfer$withdrawAccountAggr = "withdrawTransfer$withdrawAccount$$aggr" | "withdrawTransfer$withdrawAccount$$0$$aggr" | "withdrawTransfer$withdrawAccount$$1$$aggr" | "withdrawTransfer$withdrawAccount$$2$$aggr" | "withdrawTransfer$withdrawAccount$$3$$aggr" | "withdrawTransfer$withdrawAccount$$4$$aggr" | "withdrawTransfer$withdrawAccount$$5$$aggr" | "withdrawTransfer$withdrawAccount$$6$$aggr" | "withdrawTransfer$withdrawAccount$$7$$aggr" | "withdrawTransfer$withdrawAccount$$8$$aggr" | "withdrawTransfer$withdrawAccount$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +export type Schema = OpSchema & { ofSystem: System.Schema; channel: WithdrawChannel.Schema; system?: System.Schema; user?: User.Schema; withdrawTransfer$withdrawAccount?: Array; - withdrawTransfer$withdrawAccount$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in WithdrawTransfer$withdrawAccountAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -95,22 +91,25 @@ export type Projection = { withdrawTransfer$withdrawAccount?: WithdrawTransfer.Selection & { $entity: "withdrawTransfer"; }; - withdrawTransfer$withdrawAccount$$aggr?: WithdrawTransfer.Aggregation & { - $entity: "withdrawTransfer"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { +} & Partial> & { + [A in WithdrawTransfer$withdrawAccountAggr]?: WithdrawTransfer.Aggregation & { + $entity: "withdrawTransfer"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { $entity: "operEntity"; }; -} & Partial>; +}; type WithdrawAccountIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WithdrawChannel/Schema.d.ts b/lib/oak-app-domain/WithdrawChannel/Schema.d.ts index cf644e43..d381a979 100644 --- a/lib/oak-app-domain/WithdrawChannel/Schema.d.ts +++ b/lib/oak-app-domain/WithdrawChannel/Schema.d.ts @@ -17,22 +17,24 @@ export type OpSchema = EntityShape & { systemId: ForeignKey<"system">; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - entity: "offlineAccount" | "wpAccount" | string; - entityId: String<64>; - enabled: Boolean; - systemId: ForeignKey<"system">; +type WithdrawAccount$channelAggr = "withdrawAccount$channel$$aggr" | "withdrawAccount$channel$$0$$aggr" | "withdrawAccount$channel$$1$$aggr" | "withdrawAccount$channel$$2$$aggr" | "withdrawAccount$channel$$3$$aggr" | "withdrawAccount$channel$$4$$aggr" | "withdrawAccount$channel$$5$$aggr" | "withdrawAccount$channel$$6$$aggr" | "withdrawAccount$channel$$7$$aggr" | "withdrawAccount$channel$$8$$aggr" | "withdrawAccount$channel$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +export type Schema = OpSchema & { system: System.Schema; offlineAccount?: OfflineAccount.Schema; wpAccount?: WpAccount.Schema; withdrawAccount$channel?: Array; - withdrawAccount$channel$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in WithdrawAccount$channelAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -68,22 +70,25 @@ export type Projection = { withdrawAccount$channel?: WithdrawAccount.Selection & { $entity: "withdrawAccount"; }; - withdrawAccount$channel$$aggr?: WithdrawAccount.Aggregation & { - $entity: "withdrawAccount"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { +} & Partial> & { + [A in WithdrawAccount$channelAggr]?: WithdrawAccount.Aggregation & { + $entity: "withdrawAccount"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { $entity: "operEntity"; }; -} & Partial>; +}; type WithdrawChannelIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WithdrawTransfer/Schema.d.ts b/lib/oak-app-domain/WithdrawTransfer/Schema.d.ts index 1f26b8d9..6db2fe9c 100644 --- a/lib/oak-app-domain/WithdrawTransfer/Schema.d.ts +++ b/lib/oak-app-domain/WithdrawTransfer/Schema.d.ts @@ -24,31 +24,29 @@ export type OpSchema = EntityShape & { reason?: Text | null; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - iState?: IState | null; - withdrawId: ForeignKey<"withdraw">; - withdrawAccountId: ForeignKey<"withdrawAccount">; - price: Price; - loss: Price; - operatorId?: ForeignKey<"user"> | null; - creatorId: ForeignKey<"user">; - externalId?: String<128> | null; - meta: Object; - reason?: Text | null; +type SysAccountOper$withdrawTransferAggr = "sysAccountOper$withdrawTransfer$$aggr" | "sysAccountOper$withdrawTransfer$$0$$aggr" | "sysAccountOper$withdrawTransfer$$1$$aggr" | "sysAccountOper$withdrawTransfer$$2$$aggr" | "sysAccountOper$withdrawTransfer$$3$$aggr" | "sysAccountOper$withdrawTransfer$$4$$aggr" | "sysAccountOper$withdrawTransfer$$5$$aggr" | "sysAccountOper$withdrawTransfer$$6$$aggr" | "sysAccountOper$withdrawTransfer$$7$$aggr" | "sysAccountOper$withdrawTransfer$$8$$aggr" | "sysAccountOper$withdrawTransfer$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type AccountOper$entityAggr = "accountOper$entity$$aggr" | "accountOper$entity$$0$$aggr" | "accountOper$entity$$1$$aggr" | "accountOper$entity$$2$$aggr" | "accountOper$entity$$3$$aggr" | "accountOper$entity$$4$$aggr" | "accountOper$entity$$5$$aggr" | "accountOper$entity$$6$$aggr" | "accountOper$entity$$7$$aggr" | "accountOper$entity$$8$$aggr" | "accountOper$entity$$9$$aggr"; +export type Schema = OpSchema & { withdraw: Withdraw.Schema; withdrawAccount: WithdrawAccount.Schema; operator?: User.Schema | null; creator: User.Schema; sysAccountOper$withdrawTransfer?: Array; - sysAccountOper$withdrawTransfer$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; accountOper$entity?: Array; - accountOper$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in SysAccountOper$withdrawTransferAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in AccountOper$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -99,28 +97,32 @@ export type Projection = { sysAccountOper$withdrawTransfer?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$withdrawTransfer$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; accountOper$entity?: AccountOper.Selection & { $entity: "accountOper"; }; - accountOper$entity$$aggr?: AccountOper.Aggregation & { +} & Partial> & { + [A in SysAccountOper$withdrawTransferAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in AccountOper$entityAggr]?: AccountOper.Aggregation & { $entity: "accountOper"; }; -} & Partial>; +}; type WithdrawTransferIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WpAccount/Schema.d.ts b/lib/oak-app-domain/WpAccount/Schema.d.ts index c6905e3d..47fdcf87 100644 --- a/lib/oak-app-domain/WpAccount/Schema.d.ts +++ b/lib/oak-app-domain/WpAccount/Schema.d.ts @@ -27,34 +27,31 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - taxLossRatio: Decimal<4, 2>; - refundGapDays?: Int<4> | null; - refundCompensateRatio?: Int<4> | null; - allowWithdrawTransfer: Boolean; - withdrawTransferLossRatio?: Decimal<4, 2> | null; - wechatPayId: ForeignKey<"wechatPay">; - mchId: String<128>; - publicKeyFilePath: Text; - privateKeyFilePath: Text; - apiV3Key: String<32>; - price: Price; - systemId: ForeignKey<"system">; - enabled: Boolean; +type WpProduct$wpAccountAggr = "wpProduct$wpAccount$$aggr" | "wpProduct$wpAccount$$0$$aggr" | "wpProduct$wpAccount$$1$$aggr" | "wpProduct$wpAccount$$2$$aggr" | "wpProduct$wpAccount$$3$$aggr" | "wpProduct$wpAccount$$4$$aggr" | "wpProduct$wpAccount$$5$$aggr" | "wpProduct$wpAccount$$6$$aggr" | "wpProduct$wpAccount$$7$$aggr" | "wpProduct$wpAccount$$8$$aggr" | "wpProduct$wpAccount$$9$$aggr"; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type SysAccountOper$entityAggr = "sysAccountOper$entity$$aggr" | "sysAccountOper$entity$$0$$aggr" | "sysAccountOper$entity$$1$$aggr" | "sysAccountOper$entity$$2$$aggr" | "sysAccountOper$entity$$3$$aggr" | "sysAccountOper$entity$$4$$aggr" | "sysAccountOper$entity$$5$$aggr" | "sysAccountOper$entity$$6$$aggr" | "sysAccountOper$entity$$7$$aggr" | "sysAccountOper$entity$$8$$aggr" | "sysAccountOper$entity$$9$$aggr"; +type WithdrawChannel$entityAggr = "withdrawChannel$entity$$aggr" | "withdrawChannel$entity$$0$$aggr" | "withdrawChannel$entity$$1$$aggr" | "withdrawChannel$entity$$2$$aggr" | "withdrawChannel$entity$$3$$aggr" | "withdrawChannel$entity$$4$$aggr" | "withdrawChannel$entity$$5$$aggr" | "withdrawChannel$entity$$6$$aggr" | "withdrawChannel$entity$$7$$aggr" | "withdrawChannel$entity$$8$$aggr" | "withdrawChannel$entity$$9$$aggr"; +export type Schema = OpSchema & { wechatPay: WechatPay.Schema; system: System.Schema; wpProduct$wpAccount?: Array; - wpProduct$wpAccount$$aggr?: AggregationResult; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; sysAccountOper$entity?: Array; - sysAccountOper$entity$$aggr?: AggregationResult; withdrawChannel$entity?: Array; - withdrawChannel$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in WpProduct$wpAccountAggr]?: AggregationResult; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in SysAccountOper$entityAggr]?: AggregationResult; +} & { + [A in WithdrawChannel$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -108,34 +105,39 @@ export type Projection = { wpProduct$wpAccount?: WpProduct.Selection & { $entity: "wpProduct"; }; - wpProduct$wpAccount$$aggr?: WpProduct.Aggregation & { - $entity: "wpProduct"; - }; modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; sysAccountOper$entity?: SysAccountOper.Selection & { $entity: "sysAccountOper"; }; - sysAccountOper$entity$$aggr?: SysAccountOper.Aggregation & { - $entity: "sysAccountOper"; - }; withdrawChannel$entity?: WithdrawChannel.Selection & { $entity: "withdrawChannel"; }; - withdrawChannel$entity$$aggr?: WithdrawChannel.Aggregation & { +} & Partial> & { + [A in WpProduct$wpAccountAggr]?: WpProduct.Aggregation & { + $entity: "wpProduct"; + }; +} & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in SysAccountOper$entityAggr]?: SysAccountOper.Aggregation & { + $entity: "sysAccountOper"; + }; +} & { + [A in WithdrawChannel$entityAggr]?: WithdrawChannel.Aggregation & { $entity: "withdrawChannel"; }; -} & Partial>; +}; type WpAccountIdProjection = OneOf<{ id: number; }>; diff --git a/lib/oak-app-domain/WpProduct/Schema.d.ts b/lib/oak-app-domain/WpProduct/Schema.d.ts index 774a1c09..8f449b1a 100644 --- a/lib/oak-app-domain/WpProduct/Schema.d.ts +++ b/lib/oak-app-domain/WpProduct/Schema.d.ts @@ -17,22 +17,23 @@ export type OpSchema = EntityShape & { enabled: Boolean; }; export type OpAttr = keyof OpSchema; -export type Schema = EntityShape & { - wpAccountId: ForeignKey<"wpAccount">; - type: "native" | "mp" | "jsapi" | "h5" | "app"; - taxLossRatio?: Decimal<4, 2> | null; - applicationId: ForeignKey<"application">; - enabled: Boolean; +type ModiEntity$entityAggr = "modiEntity$entity$$aggr" | "modiEntity$entity$$0$$aggr" | "modiEntity$entity$$1$$aggr" | "modiEntity$entity$$2$$aggr" | "modiEntity$entity$$3$$aggr" | "modiEntity$entity$$4$$aggr" | "modiEntity$entity$$5$$aggr" | "modiEntity$entity$$6$$aggr" | "modiEntity$entity$$7$$aggr" | "modiEntity$entity$$8$$aggr" | "modiEntity$entity$$9$$aggr"; +type OperEntity$entityAggr = "operEntity$entity$$aggr" | "operEntity$entity$$0$$aggr" | "operEntity$entity$$1$$aggr" | "operEntity$entity$$2$$aggr" | "operEntity$entity$$3$$aggr" | "operEntity$entity$$4$$aggr" | "operEntity$entity$$5$$aggr" | "operEntity$entity$$6$$aggr" | "operEntity$entity$$7$$aggr" | "operEntity$entity$$8$$aggr" | "operEntity$entity$$9$$aggr"; +type Pay$entityAggr = "pay$entity$$aggr" | "pay$entity$$0$$aggr" | "pay$entity$$1$$aggr" | "pay$entity$$2$$aggr" | "pay$entity$$3$$aggr" | "pay$entity$$4$$aggr" | "pay$entity$$5$$aggr" | "pay$entity$$6$$aggr" | "pay$entity$$7$$aggr" | "pay$entity$$8$$aggr" | "pay$entity$$9$$aggr"; +export type Schema = OpSchema & { wpAccount: WpAccount.Schema; application: Application.Schema; modiEntity$entity?: Array; - modiEntity$entity$$aggr?: AggregationResult; operEntity$entity?: Array; - operEntity$entity$$aggr?: AggregationResult; pay$entity?: Array; - pay$entity$$aggr?: AggregationResult; } & { [A in ExpressionKey]?: any; +} & { + [A in ModiEntity$entityAggr]?: AggregationResult; +} & { + [A in OperEntity$entityAggr]?: AggregationResult; +} & { + [A in Pay$entityAggr]?: AggregationResult; }; type AttrFilter = { id: Q_StringValue; @@ -68,22 +69,25 @@ export type Projection = { modiEntity$entity?: ModiEntity.Selection & { $entity: "modiEntity"; }; - modiEntity$entity$$aggr?: ModiEntity.Aggregation & { - $entity: "modiEntity"; - }; operEntity$entity?: OperEntity.Selection & { $entity: "operEntity"; }; - operEntity$entity$$aggr?: OperEntity.Aggregation & { - $entity: "operEntity"; - }; pay$entity?: Pay.Selection & { $entity: "pay"; }; - pay$entity$$aggr?: Pay.Aggregation & { +} & Partial> & { + [A in ModiEntity$entityAggr]?: ModiEntity.Aggregation & { + $entity: "modiEntity"; + }; +} & { + [A in OperEntity$entityAggr]?: OperEntity.Aggregation & { + $entity: "operEntity"; + }; +} & { + [A in Pay$entityAggr]?: Pay.Aggregation & { $entity: "pay"; }; -} & Partial>; +}; type WpProductIdProjection = OneOf<{ id: number; }>; diff --git a/lib/utils/application.d.ts b/lib/utils/application.d.ts index c7ec4133..80efb3a6 100644 --- a/lib/utils/application.d.ts +++ b/lib/utils/application.d.ts @@ -34,9 +34,6 @@ export declare const mergedProjection: { } & { $entity: "applicationPassport"; }) | undefined; - applicationPassport$application$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { - $entity: "applicationPassport"; - }) | undefined; extraFile$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -53,9 +50,6 @@ export declare const mergedProjection: { } & { $entity: "extraFile"; }) | undefined; - extraFile$application$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { - $entity: "extraFile"; - }) | undefined; notification$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -72,9 +66,6 @@ export declare const mergedProjection: { } & { $entity: "notification"; }) | undefined; - notification$application$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { - $entity: "notification"; - }) | undefined; sessionMessage$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -91,9 +82,6 @@ export declare const mergedProjection: { } & { $entity: "sessionMessage"; }) | undefined; - sessionMessage$application$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { - $entity: "sessionMessage"; - }) | undefined; token$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -110,9 +98,6 @@ export declare const mergedProjection: { } & { $entity: "token"; }) | undefined; - token$application$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { - $entity: "token"; - }) | undefined; wechatMenu$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -129,9 +114,6 @@ export declare const mergedProjection: { } & { $entity: "wechatMenu"; }) | undefined; - wechatMenu$application$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { - $entity: "wechatMenu"; - }) | undefined; wechatPublicAutoReply$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -148,9 +130,6 @@ export declare const mergedProjection: { } & { $entity: "wechatPublicAutoReply"; }) | undefined; - wechatPublicAutoReply$application$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { - $entity: "wechatPublicAutoReply"; - }) | undefined; wechatPublicTag$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -167,9 +146,6 @@ export declare const mergedProjection: { } & { $entity: "wechatPublicTag"; }) | undefined; - wechatPublicTag$application$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { - $entity: "wechatPublicTag"; - }) | undefined; wechatQrCode$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -186,9 +162,6 @@ export declare const mergedProjection: { } & { $entity: "wechatQrCode"; }) | undefined; - wechatQrCode$application$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { - $entity: "wechatQrCode"; - }) | undefined; wechatTemplate$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -205,9 +178,6 @@ export declare const mergedProjection: { } & { $entity: "wechatTemplate"; }) | undefined; - wechatTemplate$application$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { - $entity: "wechatTemplate"; - }) | undefined; wechatUser$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -224,9 +194,6 @@ export declare const mergedProjection: { } & { $entity: "wechatUser"; }) | undefined; - wechatUser$application$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { - $entity: "wechatUser"; - }) | undefined; pay$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -243,9 +210,6 @@ export declare const mergedProjection: { } & { $entity: "pay"; }) | undefined; - pay$application$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { - $entity: "pay"; - }) | undefined; wpProduct$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -262,9 +226,6 @@ export declare const mergedProjection: { } & { $entity: "wpProduct"; }) | undefined; - wpProduct$application$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { - $entity: "wpProduct"; - }) | undefined; session$entity?: ({ id?: string | undefined; action?: "select" | undefined; @@ -281,10 +242,483 @@ export declare const mergedProjection: { } & { $entity: "session"; }) | undefined; +} & Partial> & { + applicationPassport$application$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$0$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$1$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$2$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$3$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$4$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$5$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$6$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$7$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$8$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$9$$aggr?: (import("../oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; +} & { + extraFile$application$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$0$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$1$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$2$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$3$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$4$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$5$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$6$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$7$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$8$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$9$$aggr?: (import("../oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; +} & { + notification$application$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$0$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$1$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$2$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$3$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$4$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$5$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$6$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$7$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$8$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$9$$aggr?: (import("../oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; +} & { + sessionMessage$application$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$0$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$1$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$2$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$3$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$4$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$5$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$6$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$7$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$8$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$9$$aggr?: (import("../oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; +} & { + token$application$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$0$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$1$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$2$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$3$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$4$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$5$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$6$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$7$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$8$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$9$$aggr?: (import("../oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; +} & { + wechatMenu$application$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$0$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$1$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$2$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$3$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$4$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$5$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$6$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$7$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$8$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$9$$aggr?: (import("../oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; +} & { + wechatPublicAutoReply$application$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$0$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$1$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$2$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$3$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$4$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$5$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$6$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$7$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$8$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$9$$aggr?: (import("../oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; +} & { + wechatPublicTag$application$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$0$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$1$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$2$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$3$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$4$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$5$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$6$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$7$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$8$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$9$$aggr?: (import("../oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; +} & { + wechatQrCode$application$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$0$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$1$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$2$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$3$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$4$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$5$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$6$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$7$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$8$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$9$$aggr?: (import("../oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; +} & { + wechatTemplate$application$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$0$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$1$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$2$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$3$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$4$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$5$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$6$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$7$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$8$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$9$$aggr?: (import("../oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; +} & { + wechatUser$application$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$0$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$1$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$2$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$3$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$4$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$5$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$6$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$7$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$8$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$9$$aggr?: (import("../oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; +} & { + pay$application$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$0$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$1$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$2$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$3$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$4$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$5$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$6$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$7$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$8$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; + pay$application$$9$$aggr?: (import("../oak-app-domain/Pay/Schema").Aggregation & { + $entity: "pay"; + }) | undefined; +} & { + wpProduct$application$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$0$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$1$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$2$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$3$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$4$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$5$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$6$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$7$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$8$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; + wpProduct$application$$9$$aggr?: (import("../oak-app-domain/WpProduct/Schema").Aggregation & { + $entity: "wpProduct"; + }) | undefined; +} & { session$entity$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { $entity: "session"; }) | undefined; -} & Partial> & { + session$entity$$0$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$1$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$2$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$3$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$4$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$5$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$6$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$7$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$8$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$9$$aggr?: (import("../oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; +} & { [k: string]: any; "#id"?: `node-${number}` | undefined; id?: number | undefined; @@ -316,9 +750,6 @@ export declare const mergedProjection: { } & { $entity: "applicationPassport"; }) | undefined; - applicationPassport$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { - $entity: "applicationPassport"; - }) | undefined; extraFile$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -335,9 +766,6 @@ export declare const mergedProjection: { } & { $entity: "extraFile"; }) | undefined; - extraFile$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { - $entity: "extraFile"; - }) | undefined; notification$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -354,9 +782,6 @@ export declare const mergedProjection: { } & { $entity: "notification"; }) | undefined; - notification$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { - $entity: "notification"; - }) | undefined; sessionMessage$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -373,9 +798,6 @@ export declare const mergedProjection: { } & { $entity: "sessionMessage"; }) | undefined; - sessionMessage$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { - $entity: "sessionMessage"; - }) | undefined; token$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -392,9 +814,6 @@ export declare const mergedProjection: { } & { $entity: "token"; }) | undefined; - token$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { - $entity: "token"; - }) | undefined; wechatMenu$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -411,9 +830,6 @@ export declare const mergedProjection: { } & { $entity: "wechatMenu"; }) | undefined; - wechatMenu$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { - $entity: "wechatMenu"; - }) | undefined; wechatPublicAutoReply$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -430,9 +846,6 @@ export declare const mergedProjection: { } & { $entity: "wechatPublicAutoReply"; }) | undefined; - wechatPublicAutoReply$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { - $entity: "wechatPublicAutoReply"; - }) | undefined; wechatPublicTag$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -449,9 +862,6 @@ export declare const mergedProjection: { } & { $entity: "wechatPublicTag"; }) | undefined; - wechatPublicTag$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { - $entity: "wechatPublicTag"; - }) | undefined; wechatQrCode$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -468,9 +878,6 @@ export declare const mergedProjection: { } & { $entity: "wechatQrCode"; }) | undefined; - wechatQrCode$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { - $entity: "wechatQrCode"; - }) | undefined; wechatTemplate$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -487,9 +894,6 @@ export declare const mergedProjection: { } & { $entity: "wechatTemplate"; }) | undefined; - wechatTemplate$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { - $entity: "wechatTemplate"; - }) | undefined; wechatUser$application?: ({ id?: string | undefined; action?: "select" | undefined; @@ -506,9 +910,6 @@ export declare const mergedProjection: { } & { $entity: "wechatUser"; }) | undefined; - wechatUser$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { - $entity: "wechatUser"; - }) | undefined; session$entity?: ({ id?: string | undefined; action?: "select" | undefined; @@ -525,7 +926,412 @@ export declare const mergedProjection: { } & { $entity: "session"; }) | undefined; +} & { + applicationPassport$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; + applicationPassport$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/ApplicationPassport/Schema").Aggregation & { + $entity: "applicationPassport"; + }) | undefined; +} & { + extraFile$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; + extraFile$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/ExtraFile/Schema").Aggregation & { + $entity: "extraFile"; + }) | undefined; +} & { + notification$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; + notification$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/Notification/Schema").Aggregation & { + $entity: "notification"; + }) | undefined; +} & { + sessionMessage$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; + sessionMessage$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/SessionMessage/Schema").Aggregation & { + $entity: "sessionMessage"; + }) | undefined; +} & { + token$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; + token$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/Token/Schema").Aggregation & { + $entity: "token"; + }) | undefined; +} & { + wechatMenu$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; + wechatMenu$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatMenu/Schema").Aggregation & { + $entity: "wechatMenu"; + }) | undefined; +} & { + wechatPublicAutoReply$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; + wechatPublicAutoReply$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicAutoReply/Schema").Aggregation & { + $entity: "wechatPublicAutoReply"; + }) | undefined; +} & { + wechatPublicTag$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; + wechatPublicTag$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatPublicTag/Schema").Aggregation & { + $entity: "wechatPublicTag"; + }) | undefined; +} & { + wechatQrCode$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; + wechatQrCode$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatQrCode/Schema").Aggregation & { + $entity: "wechatQrCode"; + }) | undefined; +} & { + wechatTemplate$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; + wechatTemplate$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatTemplate/Schema").Aggregation & { + $entity: "wechatTemplate"; + }) | undefined; +} & { + wechatUser$application$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; + wechatUser$application$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/WechatUser/Schema").Aggregation & { + $entity: "wechatUser"; + }) | undefined; +} & { session$entity$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { $entity: "session"; }) | undefined; + session$entity$$0$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$1$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$2$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$3$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$4$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$5$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$6$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$7$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$8$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; + session$entity$$9$$aggr?: (import("oak-general-business/lib/oak-app-domain/Session/Schema").Aggregation & { + $entity: "session"; + }) | undefined; }; diff --git a/lib/utils/payClazz/WechatPay/index.d.ts b/lib/utils/payClazz/WechatPay/index.d.ts index eeba2b4b..ce1d041a 100644 --- a/lib/utils/payClazz/WechatPay/index.d.ts +++ b/lib/utils/payClazz/WechatPay/index.d.ts @@ -1,4 +1,4 @@ import WechatPay from './WechatPay'; import WechatPayDebug from './WechatPay.debug'; -declare const _default: typeof WechatPayDebug | typeof WechatPay; +declare const _default: typeof WechatPay | typeof WechatPayDebug; export default _default; diff --git a/package.json b/package.json index 5e3ccfb3..8c79f3de 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,9 @@ "dependencies": { "classnames": "^2.3.1", "dayjs": "^1.11.5", - "oak-domain": "^5.1.5", - "oak-frontend-base": "^5.3.13", - "oak-general-business": "~5.5.3", + "oak-domain": "file:../oak-domain", + "oak-frontend-base": "file:../oak-frontend-base", + "oak-general-business": "file:../oak-general-business", "wechat-pay-nodejs": "^0.2.3" }, "peerDependencies": { diff --git a/src/components/AbstractComponents.ts b/src/components/AbstractComponents.ts index 8f5a1a45..4d1d18a8 100644 --- a/src/components/AbstractComponents.ts +++ b/src/components/AbstractComponents.ts @@ -2,6 +2,7 @@ * 抽象组件在业务层根据EntityDict的重新声明 * by Xc 20230807 */ + // @ts-nocheck import React from 'react'; import { EntityDict } from '../oak-app-domain';