diff --git a/lib/general-app-domain/EntityDict.d.ts b/lib/general-app-domain/EntityDict.d.ts index dc3924509..46b074533 100644 --- a/lib/general-app-domain/EntityDict.d.ts +++ b/lib/general-app-domain/EntityDict.d.ts @@ -1,13 +1,9 @@ -import { EntityDef as ActionAuth } from "./ActionAuth/Schema"; import { EntityDef as Modi } from "./Modi/Schema"; import { EntityDef as ModiEntity } from "./ModiEntity/Schema"; import { EntityDef as Oper } from "./Oper/Schema"; import { EntityDef as OperEntity } from "./OperEntity/Schema"; -import { EntityDef as Relation } from "./Relation/Schema"; -import { EntityDef as RelationAuth } from "./RelationAuth/Schema"; import { EntityDef as User } from "./User/Schema"; import { EntityDef as UserEntityGrant } from "./UserEntityGrant/Schema"; -import { EntityDef as UserRelation } from "./UserRelation/Schema"; import { EntityDef as Address } from "./Address/Schema"; import { EntityDef as Application } from "./Application/Schema"; import { EntityDef as Area } from "./Area/Schema"; @@ -35,16 +31,12 @@ import { EntityDef as WechatPublicTag } from "./WechatPublicTag/Schema"; import { EntityDef as WechatQrCode } from "./WechatQrCode/Schema"; import { EntityDef as WechatUser } from "./WechatUser/Schema"; export declare type EntityDict = { - actionAuth: ActionAuth; modi: Modi; modiEntity: ModiEntity; oper: Oper; operEntity: OperEntity; - relation: Relation; - relationAuth: RelationAuth; user: User; userEntityGrant: UserEntityGrant; - userRelation: UserRelation; address: Address; application: Application; area: Area; diff --git a/lib/general-app-domain/Storage.js b/lib/general-app-domain/Storage.js index e68f694f1..da6feb3e1 100644 --- a/lib/general-app-domain/Storage.js +++ b/lib/general-app-domain/Storage.js @@ -1,77 +1,69 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.storageSchema = void 0; -var Storage_1 = require("./ActionAuth/Storage"); -var Storage_2 = require("./Modi/Storage"); -var Storage_3 = require("./ModiEntity/Storage"); -var Storage_4 = require("./Oper/Storage"); -var Storage_5 = require("./OperEntity/Storage"); -var Storage_6 = require("./Relation/Storage"); -var Storage_7 = require("./RelationAuth/Storage"); -var Storage_8 = require("./User/Storage"); -var Storage_9 = require("./UserEntityGrant/Storage"); -var Storage_10 = require("./UserRelation/Storage"); -var Storage_11 = require("./Address/Storage"); -var Storage_12 = require("./Application/Storage"); -var Storage_13 = require("./Area/Storage"); -var Storage_14 = require("./Article/Storage"); -var Storage_15 = require("./Captcha/Storage"); -var Storage_16 = require("./Domain/Storage"); -var Storage_17 = require("./Email/Storage"); -var Storage_18 = require("./ExtraFile/Storage"); -var Storage_19 = require("./Livestream/Storage"); -var Storage_20 = require("./Message/Storage"); -var Storage_21 = require("./MessageSystem/Storage"); -var Storage_22 = require("./MessageType/Storage"); -var Storage_23 = require("./MessageTypeTemplateId/Storage"); -var Storage_24 = require("./Mobile/Storage"); -var Storage_25 = require("./Notification/Storage"); -var Storage_26 = require("./Platform/Storage"); -var Storage_27 = require("./UserRole/Storage"); -var Storage_28 = require("./Role/Storage"); -var Storage_29 = require("./Subscription/Storage"); -var Storage_30 = require("./System/Storage"); -var Storage_31 = require("./Token/Storage"); -var Storage_32 = require("./UserSystem/Storage"); -var Storage_33 = require("./UserWechatPublicTag/Storage"); -var Storage_34 = require("./WechatPublicTag/Storage"); -var Storage_35 = require("./WechatQrCode/Storage"); -var Storage_36 = require("./WechatUser/Storage"); +var Storage_1 = require("./Modi/Storage"); +var Storage_2 = require("./ModiEntity/Storage"); +var Storage_3 = require("./Oper/Storage"); +var Storage_4 = require("./OperEntity/Storage"); +var Storage_5 = require("./User/Storage"); +var Storage_6 = require("./UserEntityGrant/Storage"); +var Storage_7 = require("./Address/Storage"); +var Storage_8 = require("./Application/Storage"); +var Storage_9 = require("./Area/Storage"); +var Storage_10 = require("./Article/Storage"); +var Storage_11 = require("./Captcha/Storage"); +var Storage_12 = require("./Domain/Storage"); +var Storage_13 = require("./Email/Storage"); +var Storage_14 = require("./ExtraFile/Storage"); +var Storage_15 = require("./Livestream/Storage"); +var Storage_16 = require("./Message/Storage"); +var Storage_17 = require("./MessageSystem/Storage"); +var Storage_18 = require("./MessageType/Storage"); +var Storage_19 = require("./MessageTypeTemplateId/Storage"); +var Storage_20 = require("./Mobile/Storage"); +var Storage_21 = require("./Notification/Storage"); +var Storage_22 = require("./Platform/Storage"); +var Storage_23 = require("./UserRole/Storage"); +var Storage_24 = require("./Role/Storage"); +var Storage_25 = require("./Subscription/Storage"); +var Storage_26 = require("./System/Storage"); +var Storage_27 = require("./Token/Storage"); +var Storage_28 = require("./UserSystem/Storage"); +var Storage_29 = require("./UserWechatPublicTag/Storage"); +var Storage_30 = require("./WechatPublicTag/Storage"); +var Storage_31 = require("./WechatQrCode/Storage"); +var Storage_32 = require("./WechatUser/Storage"); exports.storageSchema = { - actionAuth: Storage_1.desc, - modi: Storage_2.desc, - modiEntity: Storage_3.desc, - oper: Storage_4.desc, - operEntity: Storage_5.desc, - relation: Storage_6.desc, - relationAuth: Storage_7.desc, - user: Storage_8.desc, - userEntityGrant: Storage_9.desc, - userRelation: Storage_10.desc, - address: Storage_11.desc, - application: Storage_12.desc, - area: Storage_13.desc, - article: Storage_14.desc, - captcha: Storage_15.desc, - domain: Storage_16.desc, - email: Storage_17.desc, - extraFile: Storage_18.desc, - livestream: Storage_19.desc, - message: Storage_20.desc, - messageSystem: Storage_21.desc, - messageType: Storage_22.desc, - messageTypeTemplateId: Storage_23.desc, - mobile: Storage_24.desc, - notification: Storage_25.desc, - platform: Storage_26.desc, - userRole: Storage_27.desc, - role: Storage_28.desc, - subscription: Storage_29.desc, - system: Storage_30.desc, - token: Storage_31.desc, - userSystem: Storage_32.desc, - userWechatPublicTag: Storage_33.desc, - wechatPublicTag: Storage_34.desc, - wechatQrCode: Storage_35.desc, - wechatUser: Storage_36.desc + modi: Storage_1.desc, + modiEntity: Storage_2.desc, + oper: Storage_3.desc, + operEntity: Storage_4.desc, + user: Storage_5.desc, + userEntityGrant: Storage_6.desc, + address: Storage_7.desc, + application: Storage_8.desc, + area: Storage_9.desc, + article: Storage_10.desc, + captcha: Storage_11.desc, + domain: Storage_12.desc, + email: Storage_13.desc, + extraFile: Storage_14.desc, + livestream: Storage_15.desc, + message: Storage_16.desc, + messageSystem: Storage_17.desc, + messageType: Storage_18.desc, + messageTypeTemplateId: Storage_19.desc, + mobile: Storage_20.desc, + notification: Storage_21.desc, + platform: Storage_22.desc, + userRole: Storage_23.desc, + role: Storage_24.desc, + subscription: Storage_25.desc, + system: Storage_26.desc, + token: Storage_27.desc, + userSystem: Storage_28.desc, + userWechatPublicTag: Storage_29.desc, + wechatPublicTag: Storage_30.desc, + wechatQrCode: Storage_31.desc, + wechatUser: Storage_32.desc }; diff --git a/lib/general-app-domain/User/Schema.d.ts b/lib/general-app-domain/User/Schema.d.ts index 0066d9911..c103ac3dc 100644 --- a/lib/general-app-domain/User/Schema.d.ts +++ b/lib/general-app-domain/User/Schema.d.ts @@ -6,7 +6,6 @@ import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOper import { Action, ParticularAction, UserState, IdState } from "./Action"; import { RelationAction } from "oak-domain/lib/actions/action"; import * as Oper from "../Oper/Schema"; -import * as UserRelation from "../UserRelation/Schema"; import * as Email from "../Email/Schema"; import * as Message from "../Message/Schema"; import * as Mobile from "../Mobile/Schema"; @@ -51,8 +50,6 @@ export declare type Schema = EntityShape & { oper$operator$$aggr?: AggregationResult; user$ref?: Array; user$ref$$aggr?: AggregationResult; - userRelation$user?: Array; - userRelation$user$$aggr?: AggregationResult; email$user?: Array; email$user$$aggr?: AggregationResult; message$user?: Array; @@ -136,12 +133,6 @@ export declare type Projection = { user$ref$$aggr?: Aggregation & { $entity: "user"; }; - userRelation$user?: UserRelation.Selection & { - $entity: "userRelation"; - }; - userRelation$user$$aggr?: UserRelation.Aggregation & { - $entity: "userRelation"; - }; email$user?: Email.Selection & { $entity: "email"; }; @@ -291,7 +282,6 @@ export declare type CreateOperationData = FormCreateData })) & { oper$operator?: OakOperation<"create", Omit[]> | Array>>; user$ref?: OakOperation, Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Filter>>; - userRelation$user?: OakOperation, UserRelation.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, UserRelation.Filter>>; email$user?: OakOperation, Email.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Email.Filter>>; message$user?: OakOperation, Message.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Message.Filter>>; mobile$user?: OakOperation, Mobile.Filter> | OakOperation<"create", Omit[]> | Array> | OakOperation, Mobile.Filter>>; @@ -327,7 +317,6 @@ export declare type UpdateOperationData = FormUpdateData [k: string]: any; oper$operator?: OakOperation<"create", Omit[]> | Array>>; user$ref?: UpdateOperation | RemoveOperation | OakOperation<"create", Omit[]> | Array> | UpdateOperation | RemoveOperation>; - userRelation$user?: UserRelation.UpdateOperation | UserRelation.RemoveOperation | OakOperation<"create", Omit[]> | Array> | UserRelation.UpdateOperation | UserRelation.RemoveOperation>; email$user?: Email.UpdateOperation | Email.RemoveOperation | OakOperation<"create", Omit[]> | Array> | Email.UpdateOperation | Email.RemoveOperation>; message$user?: Message.UpdateOperation | Message.RemoveOperation | OakOperation<"create", Omit[]> | Array> | Message.UpdateOperation | Message.RemoveOperation>; mobile$user?: Mobile.UpdateOperation | Mobile.RemoveOperation | OakOperation<"create", Omit[]> | Array> | Mobile.UpdateOperation | Mobile.RemoveOperation>; diff --git a/lib/general-app-domain/_SubQuery.d.ts b/lib/general-app-domain/_SubQuery.d.ts index 418c84eff..52d255b89 100644 --- a/lib/general-app-domain/_SubQuery.d.ts +++ b/lib/general-app-domain/_SubQuery.d.ts @@ -1,13 +1,9 @@ -import * as ActionAuth from "./ActionAuth/Schema"; import * as Modi from "./Modi/Schema"; import * as ModiEntity from "./ModiEntity/Schema"; import * as Oper from "./Oper/Schema"; import * as OperEntity from "./OperEntity/Schema"; -import * as Relation from "./Relation/Schema"; -import * as RelationAuth from "./RelationAuth/Schema"; import * as User from "./User/Schema"; import * as UserEntityGrant from "./UserEntityGrant/Schema"; -import * as UserRelation from "./UserRelation/Schema"; import * as Address from "./Address/Schema"; import * as Application from "./Application/Schema"; import * as Area from "./Area/Schema"; @@ -34,11 +30,6 @@ import * as UserWechatPublicTag from "./UserWechatPublicTag/Schema"; import * as WechatPublicTag from "./WechatPublicTag/Schema"; import * as WechatQrCode from "./WechatQrCode/Schema"; import * as WechatUser from "./WechatUser/Schema"; -export declare type ActionAuthIdSubQuery = { - [K in "$in" | "$nin"]?: (ActionAuth.ActionAuthIdSubQuery & { - entity: "actionAuth"; - }) | any; -}; export declare type ModiIdSubQuery = { [K in "$in" | "$nin"]?: (ModiEntity.ModiIdSubQuery & { entity: "modiEntity"; @@ -63,29 +54,11 @@ export declare type OperEntityIdSubQuery = { entity: "operEntity"; }) | any; }; -export declare type RelationIdSubQuery = { - [K in "$in" | "$nin"]?: (ActionAuth.RelationIdSubQuery & { - entity: "actionAuth"; - }) | (RelationAuth.RelationIdSubQuery & { - entity: "relationAuth"; - }) | (UserRelation.RelationIdSubQuery & { - entity: "userRelation"; - }) | (Relation.RelationIdSubQuery & { - entity: "relation"; - }) | any; -}; -export declare type RelationAuthIdSubQuery = { - [K in "$in" | "$nin"]?: (RelationAuth.RelationAuthIdSubQuery & { - entity: "relationAuth"; - }) | any; -}; export declare type UserIdSubQuery = { [K in "$in" | "$nin"]?: (Oper.UserIdSubQuery & { entity: "oper"; }) | (User.UserIdSubQuery & { entity: "user"; - }) | (UserRelation.UserIdSubQuery & { - entity: "userRelation"; }) | (Email.UserIdSubQuery & { entity: "email"; }) | (Message.UserIdSubQuery & { @@ -113,11 +86,6 @@ export declare type UserEntityGrantIdSubQuery = { entity: "userEntityGrant"; }) | any; }; -export declare type UserRelationIdSubQuery = { - [K in "$in" | "$nin"]?: (UserRelation.UserRelationIdSubQuery & { - entity: "userRelation"; - }) | any; -}; export declare type AddressIdSubQuery = { [K in "$in" | "$nin"]?: (Address.AddressIdSubQuery & { entity: "address";