@wenex/sdk 1.0.17 → 1.0.18

package/common/core/interfaces/dto.interface.d.ts

@@ -4,3 +4,6 @@ import { MakeOptional } from './helper.interface';
 export type Dto<T extends Core = Core, K extends keyof T = keyof Core> = MakeOptional<T, keyof Core | K> & {
     _id?: Types.ObjectId;
 };
+export type NesteDto<T extends Dto<Core>, R extends {
+    [K in keyof T]?: any;
+}> = Omit<T, keyof R> & R;

package/common/interfaces/auth/grants/grant.interface.d.ts

@@ -1,7 +1,7 @@
 import type { Document } from 'mongoose';
 import { Action, Resource } from '../../../core';
-import { Core, Dto } from '../../../core/interfaces';
 import { GrantTime, GrantTimeDto } from './time.interface';
+import { Core, Dto, NesteDto } from '../../../core/interfaces';
 export interface Grant<Properties extends object = object> extends Core<Properties> {
     subject: string;
     action: Action;
@@ -12,6 +12,6 @@ export interface Grant<Properties extends object = object> extends Core<Properti
     time?: GrantTime[];
 }
 export type GrantDoc<Properties extends object = object> = Grant<Properties> & Document;
-export type GrantDto<Properties extends object = object> = Dto<Omit<Grant<Properties>, 'time'>> & {
+export type GrantDto<Properties extends object = object> = NesteDto<Dto<Grant<Properties>>, {
     time?: GrantTimeDto[];
-};
+}>;

package/common/interfaces/domain/apps/app.interface.d.ts

@@ -1,8 +1,8 @@
 import type { Document } from 'mongoose';
 import { Scope } from '../../../core';
 import { AppType } from '../../../enums/domain';
-import { Core, Dto } from '../../../core/interfaces';
 import { GrantType, Status } from '../../../core/enums';
+import { Core, Dto, NesteDto } from '../../../core/interfaces';
 import { AppChangeLog, AppChangeLogDto } from './change-log.interface';
 export interface App<Properties extends object = object> extends Core<Properties> {
     type: AppType;
@@ -20,6 +20,6 @@ export interface App<Properties extends object = object> extends Core<Properties
     change_logs?: AppChangeLog[];
 }
 export type AppDoc<Properties extends object = object> = App<Properties> & Document;
-export type AppDto<Properties extends object = object> = Dto<Omit<App<Properties>, 'change_logs'>> & {
+export type AppDto<Properties extends object = object> = NesteDto<Dto<App<Properties>>, {
     change_logs?: AppChangeLogDto[];
-};
+}>;

package/common/interfaces/domain/clients/client.interface.d.ts

@@ -1,7 +1,7 @@
 import type { Document } from 'mongoose';
 import { Scope } from '../../../core';
 import { ClientPlan } from '../../../enums/domain';
-import { Core, Dto } from '../../../core/interfaces';
+import { Core, Dto, NesteDto } from '../../../core/interfaces';
 import { GrantType, State, Status } from '../../../core/enums';
 import { ClientDomain, ClientDomainDto } from './domain.interface';
 import { ClientService, ClientServiceDto } from './service.interface';
@@ -28,7 +28,7 @@ export interface Client<Properties extends object = object> extends Core<Propert
     services?: ClientService[];
 }
 export type ClientDoc<Properties extends object = object> = Client<Properties> & Document;
-export type ClientDto<Properties extends object = object> = Dto<Omit<Client<Properties>, 'domains' | 'services'>, 'state' | 'api_key' | 'client_id' | 'expiration_date'> & {
+export type ClientDto<Properties extends object = object> = NesteDto<Dto<Client<Properties>, 'state' | 'api_key' | 'client_id' | 'expiration_date'>, {
     domains: ClientDomainDto[];
     services?: ClientServiceDto[];
-};
+}>;

package/common/interfaces/touch/emails/email.interface.d.ts

@@ -1,7 +1,7 @@
 import type { Document } from 'mongoose';
 import { EmailProvider } from '../../../enums/touch';
-import { Core, Dto, MakeOptional } from '../../../core/interfaces';
-import { EmailSmtp } from './smtp.interface';
+import { EmailSmtp, EmailSmtpDto } from './smtp.interface';
+import { Core, Dto, NesteDto } from '../../../core/interfaces';
 export interface Email<Properties extends object = object> extends Core<Properties> {
     provider: EmailProvider;
     to: string[];
@@ -18,5 +18,7 @@ export interface Email<Properties extends object = object> extends Core<Properti
     smtp?: EmailSmtp;
 }
 export type EmailDoc<Properties extends object = object> = Email<Properties> & Document;
-export type EmailDto<Properties extends object = object> = Dto<Email<Properties>>;
-export type EmailSendDto<Properties extends object = object> = MakeOptional<Omit<EmailDto<Properties>, 'smtp'>, 'provider'>;
+export type EmailDto<Properties extends object = object> = NesteDto<Dto<Email<Properties>>, {
+    smtp?: EmailSmtpDto;
+}>;
+export type EmailSendDto<Properties extends object = object> = Dto<Omit<Email<Properties>, 'smtp'>, 'provider'>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenex/sdk",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "Wenex SDK",
   "main": "index.js",
   "types": "index.d.ts",