@botpress/webchat 1.3.0 → 1.3.2

package/dist/adapters/index.d.ts

@@ -0,0 +1,4 @@
+export * from 'webchat-adapters';
+export * as target from './target';
+export * as messagingToTarget from './messaging-to-target';
+export * as webchatToTarget from './webchat-to-target';

package/dist/adapters/messaging-to-target.d.ts

@@ -0,0 +1,151 @@
+import * as adapters from 'webchat-adapters';
+import * as target from './target';
+type WithBubble<T extends target.Message> = target.BubbleOf<T>;
+export type MessagingToTargetAdapters = adapters.Adapter<adapters.messaging.Messages, target.Messages>;
+export declare const audioAdapter: ({ type, audio }: {
+    type: "audio";
+    audio: string;
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    title?: string | undefined;
+}) => {
+    type: "audio";
+    url: string;
+};
+export declare const cardAdapter: (card: {
+    title: string;
+    type: "card";
+    actions: ({
+        title: string;
+        text: string;
+        action: "Say something";
+    } | {
+        title: string;
+        action: "Open URL";
+        url: string;
+    } | {
+        title: string;
+        action: "Postback";
+        payload: string;
+    })[];
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    subtitle?: string | undefined;
+    image?: string | undefined;
+}) => WithBubble<target.ColumnMessage>;
+export declare const carouselAdapter: ({ items }: {
+    type: "carousel";
+    items: {
+        title: string;
+        type: "card";
+        actions: ({
+            title: string;
+            text: string;
+            action: "Say something";
+        } | {
+            title: string;
+            action: "Open URL";
+            url: string;
+        } | {
+            title: string;
+            action: "Postback";
+            payload: string;
+        })[];
+        className?: string | undefined;
+        avatarUrl?: string | undefined;
+        subtitle?: string | undefined;
+        image?: string | undefined;
+    }[];
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+}) => {
+    type: "carousel";
+    blocks: target.ColumnMessage[];
+};
+export declare const choiceAdapter: (x: {
+    type: "single-choice";
+    text: string;
+    choices: {
+        title: string;
+        value: string;
+    }[];
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    disableFreeText?: boolean | undefined;
+}) => target.Message;
+export declare const dropdownAdapter: (x: {
+    options: {
+        value: string;
+        label: string;
+    }[];
+    type: "dropdown";
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    message?: string | undefined;
+    allowCreation?: boolean | undefined;
+    placeholderText?: string | undefined;
+    allowMultiple?: boolean | undefined;
+    buttonText?: string | undefined;
+    width?: number | undefined;
+    displayInKeyboard?: boolean | undefined;
+    markdown?: boolean | undefined;
+    text?: string | undefined;
+}) => WithBubble<target.ColumnMessage>;
+export declare const fileAdapter: ({ file, ...props }: {
+    type: "file";
+    file: string;
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    title?: string | undefined;
+}) => {
+    type: "file";
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    title?: string | undefined;
+    url: string;
+};
+export declare const imageAdapter: ({ type, image }: {
+    type: "image";
+    image: string;
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+}) => {
+    type: "image";
+    url: string;
+};
+export declare const locationAdapter: ({ type, latitude, longitude, title, address }: {
+    type: "location";
+    latitude: number;
+    longitude: number;
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    address?: string | undefined;
+    title?: string | undefined;
+}) => {
+    type: "location";
+    latitude: number;
+    longitude: number;
+    title: string;
+};
+export declare const textAdapter: ({ type, text }: {
+    type: "text";
+    text: string;
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    markdown?: boolean | undefined;
+}) => WithBubble<{
+    type: "text";
+    text: string;
+}>;
+export declare const videoAdapter: ({ type, video }: {
+    type: "video";
+    video: string;
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    title?: string | undefined;
+}) => {
+    type: "video";
+    url: string;
+};
+export declare const messageAdapter: (message: adapters.messaging.Message) => target.Message;
+export {};

package/dist/adapters/target.d.ts

@@ -0,0 +1,77 @@
+import * as adapters from 'webchat-adapters';
+export type AudioMessage = {
+    type: 'audio';
+    url: string;
+};
+export type BubbleMessage = {
+    type: 'bubble';
+    block: Message;
+};
+export type ButtonMessage = {
+    type: 'button';
+    variant: 'action' | 'link';
+    reusable?: boolean;
+    groupId?: string;
+    text: string;
+    buttonValue: string;
+};
+export type CarouselMessage = {
+    type: 'carousel';
+    blocks: Message[];
+};
+export type ColumnMessage = {
+    type: 'column';
+    blocks: Message[];
+    horizontalAlignment?: 'left' | 'center' | 'right';
+    verticalAlignment?: 'top' | 'center' | 'bottom' | 'stretch';
+};
+export type DropdownMessage = {
+    label?: string;
+    type: 'dropdown';
+    reusable?: boolean;
+    options: {
+        label: string;
+        value: string;
+    }[];
+};
+export type FileMessage = {
+    type: 'file';
+    url: string;
+    title?: string;
+};
+export type ImageMessage = {
+    type: 'image';
+    orientation?: 'portrait' | 'landscape' | 'square' | 'auto';
+    url: string;
+};
+export type LocationMessage = {
+    type: 'location';
+    latitude: number;
+    longitude: number;
+    title?: string;
+};
+export type RowMessage = {
+    type: 'row';
+    blocks: Message[];
+    horizontalAlignment?: 'left' | 'center' | 'right' | 'stretch';
+    verticalAlignment?: 'top' | 'center' | 'bottom';
+};
+export type TextMessage = {
+    type: 'text';
+    text: string;
+};
+export type VideoMessage = {
+    type: 'video';
+    url: string;
+};
+export type Message = AudioMessage | BubbleMessage | ButtonMessage | CarouselMessage | ColumnMessage | DropdownMessage | FileMessage | ImageMessage | LocationMessage | RowMessage | TextMessage | VideoMessage;
+export type BubbleOf<T extends Message> = Omit<BubbleMessage, 'block'> & {
+    block: T;
+};
+export type ColumnOf<T extends Message> = Omit<ColumnMessage, 'blocks'> & {
+    blocks: T[];
+};
+export type RowOf<T extends Message> = Omit<RowMessage, 'blocks'> & {
+    blocks: T[];
+};
+export type Messages = adapters.MessagesOf<Message>;

package/dist/adapters/webchat-to-target.d.ts

@@ -0,0 +1,126 @@
+import * as adapters from 'webchat-adapters';
+import * as target from './target';
+export type WebchatToTargetAdapters = adapters.Adapter<adapters.webchat.Messages, target.Messages>;
+export declare const audioAdapter: (webchatMessage: {
+    type: "audio";
+    audioUrl: string;
+    className?: string | undefined;
+}) => {
+    type: "audio";
+    url: string;
+};
+export declare const cardAdapter: (webchatMessage: {
+    title: string;
+    type: "card";
+    actions: {
+        value: string;
+        action: "url" | "postback" | "say";
+        label: string;
+    }[];
+    className?: string | undefined;
+    subtitle?: string | undefined;
+    imageUrl?: string | undefined;
+}) => Omit<target.BubbleMessage, "block"> & {
+    block: target.ColumnMessage;
+};
+export declare const carouselAdapter: (webchatMessage: {
+    type: "carousel";
+    items: {
+        title: string;
+        actions: {
+            value: string;
+            action: "url" | "postback" | "say";
+            label: string;
+        }[];
+        className?: string | undefined;
+        subtitle?: string | undefined;
+        imageUrl?: string | undefined;
+    }[];
+    className?: string | undefined;
+}) => {
+    type: "carousel";
+    blocks: target.ColumnMessage[];
+};
+export declare const choiceAdapter: (webchatMessage: {
+    options: {
+        value: string;
+        label: string;
+    }[];
+    type: "choice";
+    text: string;
+    disableFreeText?: boolean | undefined;
+    className?: string | undefined;
+}) => target.Message;
+export declare const dropdownAdapter: (webchatMessage: {
+    options: {
+        value: string;
+        label: string;
+    }[];
+    type: "dropdown";
+    text: string;
+    className?: string | undefined;
+}) => Omit<target.BubbleMessage, "block"> & {
+    block: target.ColumnMessage;
+};
+export declare const fileAdapter: (webchatMessage: {
+    type: "file";
+    fileUrl: string;
+    title?: string | undefined;
+    className?: string | undefined;
+}) => {
+    type: "file";
+    className?: string | undefined;
+    avatarUrl?: string | undefined;
+    title?: string | undefined;
+    url: string;
+};
+export declare const imageAdapter: (webchatMessage: {
+    type: "image";
+    imageUrl: string;
+    className?: string | undefined;
+}) => {
+    type: "image";
+    url: string;
+};
+export declare const locationAdapter: (webchatMessage: {
+    type: "location";
+    latitude: number;
+    longitude: number;
+    title?: string | undefined;
+    address?: string | undefined;
+    className?: string | undefined;
+}) => {
+    type: "location";
+    latitude: number;
+    longitude: number;
+    title: string;
+};
+export declare const markdownAdapter: (webchatMessage: {
+    type: "markdown";
+    markdown: string;
+    className?: string | undefined;
+}) => Omit<target.BubbleMessage, "block"> & {
+    block: {
+        type: "text";
+        text: string;
+    };
+};
+export declare const textAdapter: (webchatMessage: {
+    type: "text";
+    text: string;
+    className?: string | undefined;
+}) => Omit<target.BubbleMessage, "block"> & {
+    block: {
+        type: "text";
+        text: string;
+    };
+};
+export declare const videoAdapter: (webchatMessage: {
+    type: "video";
+    videoUrl: string;
+    className?: string | undefined;
+}) => {
+    type: "video";
+    url: string;
+};
+export declare const messageAdapter: (message: adapters.webchat.Message) => target.Message;

package/dist/client/MessagingClient/client.d.ts

@@ -21,7 +21,7 @@ export declare class MessagingClient implements WebchatClient {
     conversationExists(id: string): Promise<boolean>;
     newConversation(): Promise<void>;
     listMessages(limit?: number): Promise<{
-        payload: import("webchat-adapters/src/target").Message;
+        payload: import("../../adapters/target").Message;
         id: string;
         conversationId: string;
         authorId: string | undefined;

package/dist/components/renderers/Audio.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { CommonBlockProps } from '../../types';
-export declare const Audio: import("react").ForwardRefExoticComponent<CommonBlockProps & import("webchat-adapters/src/target").AudioMessage & import("react").RefAttributes<HTMLAudioElement>>;
+export declare const Audio: import("react").ForwardRefExoticComponent<CommonBlockProps & import("../../adapters/target").AudioMessage & import("react").RefAttributes<HTMLAudioElement>>;

package/dist/components/renderers/Carousel.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { CommonBlockProps } from '../../types';
-export declare const Carousel: import("react").ForwardRefExoticComponent<CommonBlockProps & import("webchat-adapters/src/target").CarouselMessage & import("react").RefAttributes<HTMLDivElement>>;
+export declare const Carousel: import("react").ForwardRefExoticComponent<CommonBlockProps & import("../../adapters/target").CarouselMessage & import("react").RefAttributes<HTMLDivElement>>;

package/dist/components/renderers/File.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { CommonBlockProps } from '../../types';
-export declare const File: import("react").ForwardRefExoticComponent<CommonBlockProps & import("webchat-adapters/src/target").FileMessage & import("react").RefAttributes<HTMLAnchorElement>>;
+export declare const File: import("react").ForwardRefExoticComponent<CommonBlockProps & import("../../adapters/target").FileMessage & import("react").RefAttributes<HTMLAnchorElement>>;

package/dist/components/renderers/Image.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { CommonBlockProps } from '../../types';
-export declare const Image: import("react").ForwardRefExoticComponent<CommonBlockProps & import("webchat-adapters/src/target").ImageMessage & import("react").RefAttributes<HTMLImageElement>>;
+export declare const Image: import("react").ForwardRefExoticComponent<CommonBlockProps & import("../../adapters/target").ImageMessage & import("react").RefAttributes<HTMLImageElement>>;

package/dist/components/renderers/Location.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { CommonBlockProps } from '../../types';
-export declare const Location: import("react").ForwardRefExoticComponent<CommonBlockProps & import("webchat-adapters/src/target").LocationMessage & import("react").RefAttributes<HTMLAnchorElement>>;
+export declare const Location: import("react").ForwardRefExoticComponent<CommonBlockProps & import("../../adapters/target").LocationMessage & import("react").RefAttributes<HTMLAnchorElement>>;

package/dist/components/renderers/Video.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { CommonBlockProps } from '../../types';
-export declare const Video: import("react").ForwardRefExoticComponent<CommonBlockProps & import("webchat-adapters/src/target").VideoMessage & import("react").RefAttributes<HTMLVideoElement>>;
+export declare const Video: import("react").ForwardRefExoticComponent<CommonBlockProps & import("../../adapters/target").VideoMessage & import("react").RefAttributes<HTMLVideoElement>>;

package/dist/contexts/WebchatContext.d.ts

@@ -1,4 +1,4 @@
-import { CSSProperties, FC, ReactNode } from 'react';
+import { CSSProperties, FC, ReactNode, RefObject } from 'react';
 import { Theme, Configuration, BlockObject, BlockStyles, MessageObject } from '../types';
 import { EventEmitter, Events } from '../utils';
 import { WebchatClient } from '../client';
@@ -19,6 +19,7 @@ export type ModalProps = {
 };
 export type ContextVaue = {
     theme: Theme;
+    messageContainerRef: RefObject<HTMLUListElement>;
     renderers: Renderers;
     messages: MessageObject[];
     setMessages: React.Dispatch<React.SetStateAction<MessageObject[]>>;

package/dist/gen/client/api.d.ts

@@ -700,11 +700,11 @@ export interface CreateUserBody {
     'pictureUrl'?: string;
     /**
      * User data
-     * @type {{ [key: string]: any; }}
+     * @type {{ [key: string]: any | null; }}
      * @memberof CreateUserBody
      */
     'userData'?: {
-        [key: string]: any;
+        [key: string]: any | null;
     };
 }
 /**
@@ -848,10 +848,10 @@ export interface ListConversationMessagesResponse {
     'messages': Array<Message>;
     /**
      *
-     * @type {ListConversationsResponseMeta}
+     * @type {ListParticipantsResponseMeta}
      * @memberof ListConversationMessagesResponse
      */
-    'meta': ListConversationsResponseMeta;
+    'meta': ListParticipantsResponseMeta;
 }
 /**
  *
@@ -867,23 +867,10 @@ export interface ListConversationsResponse {
     'conversations': Array<Conversation>;
     /**
      *
-     * @type {ListConversationsResponseMeta}
+     * @type {ListParticipantsResponseMeta}
      * @memberof ListConversationsResponse
      */
-    'meta': ListConversationsResponseMeta;
-}
-/**
- *
- * @export
- * @interface ListConversationsResponseMeta
- */
-export interface ListConversationsResponseMeta {
-    /**
-     * The token to use to retrieve the next page of results, passed as a query string parameter (value should be URL-encoded) to this API endpoint.
-     * @type {string}
-     * @memberof ListConversationsResponseMeta
-     */
-    'nextToken'?: string;
+    'meta': ListParticipantsResponseMeta;
 }
 /**
  *
@@ -899,10 +886,23 @@ export interface ListParticipantsResponse {
     'participants': Array<User>;
     /**
      *
-     * @type {ListConversationsResponseMeta}
+     * @type {ListParticipantsResponseMeta}
      * @memberof ListParticipantsResponse
      */
-    'meta': ListConversationsResponseMeta;
+    'meta': ListParticipantsResponseMeta;
+}
+/**
+ *
+ * @export
+ * @interface ListParticipantsResponseMeta
+ */
+export interface ListParticipantsResponseMeta {
+    /**
+     * The token to use to retrieve the next page of results, passed as a query string parameter (value should be URL-encoded) to this API endpoint.
+     * @type {string}
+     * @memberof ListParticipantsResponseMeta
+     */
+    'nextToken'?: string;
 }
 /**
  * The Message object represents a message in a [Conversation](#schema_conversation) for a specific [User](#schema_user).
@@ -961,11 +961,11 @@ export interface UpdateUserBody {
     'pictureUrl'?: string;
     /**
      * User data
-     * @type {{ [key: string]: any; }}
+     * @type {{ [key: string]: any | null; }}
      * @memberof UpdateUserBody
      */
     'userData'?: {
-        [key: string]: any;
+        [key: string]: any | null;
     };
 }
 /**

package/dist/gen/client/client.d.ts

@@ -1,5 +1,5 @@
 import { AxiosInstance } from 'axios';
-import { Configuration, DefaultApiGetConversationRequest, DefaultApiCreateConversationRequest, DefaultApiDeleteConversationRequest, DefaultApiListConversationsRequest, DefaultApiListenConversationRequest, DefaultApiListConversationMessagesRequest, DefaultApiAddParticipantRequest, DefaultApiRemoveParticipantRequest, DefaultApiGetParticipantRequest, DefaultApiListParticipantsRequest, DefaultApiGetMessageRequest, DefaultApiCreateMessageRequest, DefaultApiDeleteMessageRequest, DefaultApiGetUserRequest, DefaultApiCreateUserRequest, DefaultApiUpdateUserRequest, DefaultApiDeleteUserRequest, DefaultApiGetEventRequest, DefaultApiCreateEventRequest } from '.';
+import { Configuration, DefaultApiAddParticipantRequest, DefaultApiCreateConversationRequest, DefaultApiDeleteConversationRequest, DefaultApiGetConversationRequest, DefaultApiGetParticipantRequest, DefaultApiListConversationMessagesRequest, DefaultApiListConversationsRequest, DefaultApiListParticipantsRequest, DefaultApiListenConversationRequest, DefaultApiRemoveParticipantRequest, DefaultApiCreateMessageRequest, DefaultApiDeleteMessageRequest, DefaultApiGetMessageRequest, DefaultApiCreateUserRequest, DefaultApiDeleteUserRequest, DefaultApiGetUserRequest, DefaultApiUpdateUserRequest, DefaultApiCreateEventRequest, DefaultApiGetEventRequest } from '.';
 type SimplifyOptions = {
     deep?: boolean;
 };
@@ -19,43 +19,43 @@ type Except<ObjectType, KeysType extends keyof ObjectType> = {
 export declare class ApiClient {
     private _innerClient;
     constructor(configuration?: Configuration, basePath?: string, axiosInstance?: AxiosInstance);
-    getConversation: (props: GetConversationProps) => Promise<import("./api").GetConversationResponse>;
+    addParticipant: ({ id, xUserKey, ...addParticipantBody }: AddParticipantProps) => Promise<import("./api").AddParticipantResponse>;
     createConversation: ({ xUserKey, ...createConversationBody }: CreateConversationProps) => Promise<import("./api").CreateConversationResponse>;
     deleteConversation: (props: DeleteConversationProps) => Promise<object>;
+    getConversation: (props: GetConversationProps) => Promise<import("./api").GetConversationResponse>;
+    getParticipant: (props: GetParticipantProps) => Promise<import("./api").GetParticipantResponse>;
+    listConversationMessages: (props: ListConversationMessagesProps) => Promise<import("./api").ListConversationMessagesResponse>;
     listConversations: (props: ListConversationsProps) => Promise<import("./api").ListConversationsResponse>;
+    listParticipants: (props: ListParticipantsProps) => Promise<import("./api").ListParticipantsResponse>;
     listenConversation: (props: ListenConversationProps) => Promise<object>;
-    listConversationMessages: (props: ListConversationMessagesProps) => Promise<import("./api").ListConversationMessagesResponse>;
-    addParticipant: ({ id, xUserKey, ...addParticipantBody }: AddParticipantProps) => Promise<import("./api").AddParticipantResponse>;
     removeParticipant: (props: RemoveParticipantProps) => Promise<object>;
-    getParticipant: (props: GetParticipantProps) => Promise<import("./api").GetParticipantResponse>;
-    listParticipants: (props: ListParticipantsProps) => Promise<import("./api").ListParticipantsResponse>;
-    getMessage: (props: GetMessageProps) => Promise<import("./api").GetMessageResponse>;
     createMessage: ({ xUserKey, ...createMessageBody }: CreateMessageProps) => Promise<import("./api").CreateMessageResponse>;
     deleteMessage: (props: DeleteMessageProps) => Promise<object>;
-    getUser: (props: GetUserProps) => Promise<import("./api").GetUserResponse>;
+    getMessage: (props: GetMessageProps) => Promise<import("./api").GetMessageResponse>;
     createUser: (createUserBody: CreateUserProps) => Promise<import("./api").CreateUserResponse>;
-    updateUser: ({ xUserKey, ...updateUserBody }: UpdateUserProps) => Promise<import("./api").UpdateUserResponse>;
     deleteUser: (props: DeleteUserProps) => Promise<object>;
-    getEvent: (props: GetEventProps) => Promise<import("./api").GetEventResponse>;
+    getUser: (props: GetUserProps) => Promise<import("./api").GetUserResponse>;
+    updateUser: ({ xUserKey, ...updateUserBody }: UpdateUserProps) => Promise<import("./api").UpdateUserResponse>;
     createEvent: ({ xUserKey, ...createEventBody }: CreateEventProps) => Promise<import("./api").CreateEventResponse>;
+    getEvent: (props: GetEventProps) => Promise<import("./api").GetEventResponse>;
 }
-export type GetConversationProps = Merge<DefaultApiGetConversationRequest, {}>;
+export type AddParticipantProps = Merge<Except<DefaultApiAddParticipantRequest, 'addParticipantBody'>, NonNullable<DefaultApiAddParticipantRequest['addParticipantBody']>>;
 export type CreateConversationProps = Merge<Except<DefaultApiCreateConversationRequest, 'createConversationBody'>, NonNullable<DefaultApiCreateConversationRequest['createConversationBody']>>;
 export type DeleteConversationProps = Merge<DefaultApiDeleteConversationRequest, {}>;
+export type GetConversationProps = Merge<DefaultApiGetConversationRequest, {}>;
+export type GetParticipantProps = Merge<DefaultApiGetParticipantRequest, {}>;
+export type ListConversationMessagesProps = Merge<DefaultApiListConversationMessagesRequest, {}>;
 export type ListConversationsProps = Merge<DefaultApiListConversationsRequest, {}>;
+export type ListParticipantsProps = Merge<DefaultApiListParticipantsRequest, {}>;
 export type ListenConversationProps = Merge<DefaultApiListenConversationRequest, {}>;
-export type ListConversationMessagesProps = Merge<DefaultApiListConversationMessagesRequest, {}>;
-export type AddParticipantProps = Merge<Except<DefaultApiAddParticipantRequest, 'addParticipantBody'>, NonNullable<DefaultApiAddParticipantRequest['addParticipantBody']>>;
 export type RemoveParticipantProps = Merge<DefaultApiRemoveParticipantRequest, {}>;
-export type GetParticipantProps = Merge<DefaultApiGetParticipantRequest, {}>;
-export type ListParticipantsProps = Merge<DefaultApiListParticipantsRequest, {}>;
-export type GetMessageProps = Merge<DefaultApiGetMessageRequest, {}>;
 export type CreateMessageProps = Merge<Except<DefaultApiCreateMessageRequest, 'createMessageBody'>, NonNullable<DefaultApiCreateMessageRequest['createMessageBody']>>;
 export type DeleteMessageProps = Merge<DefaultApiDeleteMessageRequest, {}>;
-export type GetUserProps = Merge<DefaultApiGetUserRequest, {}>;
+export type GetMessageProps = Merge<DefaultApiGetMessageRequest, {}>;
 export type CreateUserProps = Merge<Except<DefaultApiCreateUserRequest, 'createUserBody'>, NonNullable<DefaultApiCreateUserRequest['createUserBody']>>;
-export type UpdateUserProps = Merge<Except<DefaultApiUpdateUserRequest, 'updateUserBody'>, NonNullable<DefaultApiUpdateUserRequest['updateUserBody']>>;
 export type DeleteUserProps = Merge<DefaultApiDeleteUserRequest, {}>;
-export type GetEventProps = Merge<DefaultApiGetEventRequest, {}>;
+export type GetUserProps = Merge<DefaultApiGetUserRequest, {}>;
+export type UpdateUserProps = Merge<Except<DefaultApiUpdateUserRequest, 'updateUserBody'>, NonNullable<DefaultApiUpdateUserRequest['updateUserBody']>>;
 export type CreateEventProps = Merge<Except<DefaultApiCreateEventRequest, 'createEventBody'>, NonNullable<DefaultApiCreateEventRequest['createEventBody']>>;
+export type GetEventProps = Merge<DefaultApiGetEventRequest, {}>;
 export {};