stream-chat-react-native-core 6.7.3 → 7.0.0-rc.10

package/src/store/mappers/mapChannelToStorable.ts

@@ -2,15 +2,9 @@ import type { Channel, ChannelResponse } from 'stream-chat';
 
 import { mapDateTimeToStorable } from './mapDateTimeToStorable';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 import type { TableRow } from '../types';
 
-export const mapChannelToStorable = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-): TableRow<'channels'> | undefined => {
+export const mapChannelToStorable = (channel: Channel): TableRow<'channels'> | undefined => {
   if (!channel.data) {
     return;
   }
@@ -40,7 +34,7 @@ export const mapChannelToStorable = <
     type,
     updated_at,
     ...extraData
-  } = channel.data as unknown as ChannelResponse<StreamChatGenerics>;
+  } = channel.data as unknown as ChannelResponse;
 
   return {
     autoTranslationEnabled: auto_translation_enabled,

package/src/store/mappers/mapMemberToStorable.ts

@@ -2,17 +2,14 @@ import type { ChannelMemberResponse } from 'stream-chat';
 
 import { mapDateTimeToStorable } from './mapDateTimeToStorable';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import type { TableRow } from '../types';
 
-export const mapMemberToStorable = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const mapMemberToStorable = ({
   cid,
   member,
 }: {
   cid: string;
-  member: ChannelMemberResponse<StreamChatGenerics>;
+  member: ChannelMemberResponse;
 }): TableRow<'members'> => {
   const {
     banned,

package/src/store/mappers/mapMessageToStorable.ts

@@ -1,11 +1,11 @@
-import type { FormatMessageResponse, MessageResponse } from 'stream-chat';
+import type { LocalMessage, MessageResponse } from 'stream-chat';
 
 import { mapDateTimeToStorable } from './mapDateTimeToStorable';
 
 import type { TableRow } from '../types';
 
 export const mapMessageToStorable = (
-  message: MessageResponse | FormatMessageResponse,
+  message: MessageResponse | LocalMessage,
 ): TableRow<'messages'> => {
   const {
     attachments,

package/src/store/mappers/mapReadToStorable.ts

@@ -2,17 +2,14 @@ import type { ReadResponse } from 'stream-chat';
 
 import { mapDateTimeToStorable } from './mapDateTimeToStorable';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import type { TableRow } from '../types';
 
-export const mapReadToStorable = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const mapReadToStorable = ({
   cid,
   read,
 }: {
   cid: string;
-  read: ReadResponse<StreamChatGenerics>;
+  read: ReadResponse;
 }): TableRow<'reads'> => {
   const { last_read, unread_messages, user } = read;
 

package/src/store/mappers/mapStorableToChannel.ts

@@ -1,16 +1,10 @@
 import type { ChannelAPIResponse } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import type { TableRow } from '../types';
 
-export const mapStorableToChannel = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
+export const mapStorableToChannel = (
   channelRow: TableRow<'channels'>,
-): Omit<
-  ChannelAPIResponse<StreamChatGenerics>,
-  'duration' | 'messages' | 'members' | 'pinned_messages'
-> => {
+): Omit<ChannelAPIResponse, 'duration' | 'messages' | 'members' | 'pinned_messages'> => {
   const {
     autoTranslationEnabled,
     autoTranslationLanguage,

package/src/store/mappers/mapStorableToMember.ts

@@ -2,14 +2,11 @@ import type { ChannelMemberResponse } from 'stream-chat';
 
 import { mapStorableToUser } from './mapStorableToUser';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import type { TableRowJoinedUser } from '../types';
 
-export const mapStorableToMember = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
+export const mapStorableToMember = (
   memberRow: TableRowJoinedUser<'members'>,
-): ChannelMemberResponse<StreamChatGenerics> => {
+): ChannelMemberResponse => {
   const {
     banned,
     channelRole,

package/src/store/mappers/mapStorableToMessage.ts

@@ -5,13 +5,9 @@ import { mapStorableToReaction } from './mapStorableToReaction';
 
 import { mapStorableToUser } from './mapStorableToUser';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 import type { TableRow, TableRowJoinedUser } from '../types';
 
-export const mapStorableToMessage = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const mapStorableToMessage = ({
   currentUserId,
   messageRow,
   pollRow,
@@ -21,7 +17,7 @@ export const mapStorableToMessage = <
   messageRow: TableRowJoinedUser<'messages'>;
   pollRow: TableRow<'poll'>;
   reactionRows: TableRowJoinedUser<'reactions'>[];
-}): MessageResponse<StreamChatGenerics> => {
+}): MessageResponse => {
   const {
     createdAt,
     deletedAt,
@@ -33,8 +29,7 @@ export const mapStorableToMessage = <
     user,
     ...rest
   } = messageRow;
-  const latestReactions =
-    reactionRows?.map((reaction) => mapStorableToReaction<StreamChatGenerics>(reaction)) || [];
+  const latestReactions = reactionRows?.map((reaction) => mapStorableToReaction(reaction)) || [];
 
   const ownReactions = latestReactions.filter((reaction) => reaction.user?.id === currentUserId);
 

package/src/store/mappers/mapStorableToPoll.ts

@@ -1,13 +1,8 @@
 import { PollResponse, VotingVisibility } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import type { TableRow } from '../types';
 
-export const mapStorableToPoll = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  pollRow: TableRow<'poll'>,
-): PollResponse<StreamChatGenerics> => {
+export const mapStorableToPoll = (pollRow: TableRow<'poll'>): PollResponse => {
   const {
     allow_answers,
     allow_user_suggested_options,

package/src/store/mappers/mapStorableToReaction.ts

@@ -2,15 +2,11 @@ import type { ReactionResponse } from 'stream-chat';
 
 import { mapStorableToUser } from './mapStorableToUser';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 import type { TableRowJoinedUser } from '../types';
 
-export const mapStorableToReaction = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
+export const mapStorableToReaction = (
   reactionRow: TableRowJoinedUser<'reactions'>,
-): ReactionResponse<StreamChatGenerics> => {
+): ReactionResponse => {
   const { createdAt, extraData, messageId, score, type, updatedAt, user } = reactionRow;
 
   return {

package/src/store/mappers/mapStorableToRead.ts

@@ -2,15 +2,9 @@ import type { ReadResponse } from 'stream-chat';
 
 import { mapStorableToUser } from './mapStorableToUser';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 import type { TableRowJoinedUser } from '../types';
 
-export const mapStorableToRead = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  row: TableRowJoinedUser<'reads'>,
-): ReadResponse<StreamChatGenerics> => {
+export const mapStorableToRead = (row: TableRowJoinedUser<'reads'>): ReadResponse => {
   const { lastRead, unreadMessages, user } = row;
 
   return {

package/src/store/mappers/mapStorableToUser.ts

@@ -1,13 +1,8 @@
 import type { UserResponse } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import type { TableRow } from '../types';
 
-export const mapStorableToUser = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  userRow: TableRow<'users'>,
-): UserResponse<StreamChatGenerics> => {
+export const mapStorableToUser = (userRow: TableRow<'users'>): UserResponse => {
   const { banned, createdAt, extraData, id, lastActive, online, role, updatedAt } = userRow;
 
   return {

package/src/types/stream-chat-common-custom-data.d.ts

@@ -0,0 +1,42 @@
+import 'stream-chat';
+import {
+  DefaultAttachmentData,
+  DefaultChannelData,
+  DefaultCommandData,
+  DefaultEventData,
+  DefaultMemberData,
+  DefaultMessageData,
+  DefaultPollData,
+  DefaultPollOptionData,
+  DefaultReactionData,
+  DefaultThreadData,
+  DefaultUserData,
+} from './types';
+
+declare module 'stream-chat' {
+  /* eslint-disable @typescript-eslint/no-empty-object-type */
+
+  interface CustomAttachmentData extends DefaultAttachmentData {}
+
+  interface CustomChannelData extends DefaultChannelData {}
+
+  interface CustomCommandData extends DefaultCommandData {}
+
+  interface CustomEventData extends DefaultEventData {}
+
+  interface CustomMemberData extends DefaultMemberData {}
+
+  interface CustomUserData extends DefaultUserData {}
+
+  interface CustomMessageData extends DefaultMessageData {}
+
+  interface CustomPollOptionData extends DefaultPollOptionData {}
+
+  interface CustomPollData extends DefaultPollData {}
+
+  interface CustomReactionData extends DefaultReactionData {}
+
+  interface CustomThreadData extends DefaultThreadData {}
+
+  /* eslint-enable @typescript-eslint/no-empty-object-type */
+}

package/src/types/types.ts

@@ -1,10 +1,4 @@
-import type {
-  ChannelFilters,
-  ChannelSort,
-  ChannelState,
-  ExtendableGenerics,
-  LiteralStringForUnion,
-} from 'stream-chat';
+import type { ChannelFilters, ChannelSort, ChannelState, FileReference } from 'stream-chat';
 
 import type { FileStateValue } from '../utils/utils';
 
@@ -18,106 +12,92 @@ export enum FileTypes {
   VoiceRecording = 'voiceRecording',
 }
 
-export type Asset = {
-  duration: number;
-  height: number;
-  name: string;
-  source: 'camera' | 'picker';
-  type: string;
-  uri: string;
-  width: number;
-  id?: string;
-  mimeType?: string;
-  originalUri?: string;
-  size?: number;
-};
-
-export type File = {
-  name: string;
-  duration?: number;
-  id?: string;
-  mimeType?: string;
-  originalUri?: string;
-  size?: number;
-  type?: FileTypes;
-  // The uri should be of type `string`. But is `string|undefined` because the same type is used for the response from Stream's Attachment. This shall be fixed.
-  uri?: string;
-  waveform_data?: number[];
-};
+export type File = FileReference;
 
+/**
+ * This is nothing but a substitute for the attachment type prior to sending the message.
+ * This will change if we unify the file uploads to attachments.
+ */
 export type FileUpload = {
   file: File;
   id: string;
   state: FileStateValue;
-  duration?: number;
-  paused?: boolean;
-  progress?: number;
-  thumb_url?: string;
-  type?: string;
+
+  mime_type?: string;
+
+  type?: FileTypes;
   url?: string;
+
+  thumb_url?: string;
+
+  duration?: number;
   waveform_data?: number[];
-};
 
-export type ImageUpload = {
-  file: Partial<Asset>;
-  id: string;
-  state: FileStateValue;
   height?: number;
-  url?: string;
   width?: number;
 };
 
-export type DefaultAttachmentType = UnknownType & {
+export type AudioUpload = FileUpload & {
+  progress?: number;
+  paused?: boolean;
+};
+
+export interface DefaultAttachmentData {
   duration?: number;
   file_size?: number;
   mime_type?: string;
   originalFile?: File;
-  originalImage?: Partial<Asset>;
+  originalImage?: File;
   waveform_data?: number[];
-};
-
-export type Reaction = {
-  id: string;
-  name: string;
-  type: string;
-  image?: string;
-};
+}
 
-interface DefaultUserType extends UnknownType {
+export interface DefaultUserData {
   image?: string;
 }
 
-interface DefaultChannelType extends UnknownType {
-  [key: string]: unknown;
-
+export interface DefaultChannelData {
   image?: string;
+  name?: string;
 }
 
-export interface DefaultStreamChatGenerics extends ExtendableGenerics {
-  attachmentType: DefaultAttachmentType;
-  channelType: DefaultChannelType;
-  commandType: LiteralStringForUnion;
-  eventType: UnknownType;
-  memberType: UnknownType;
-  messageType: UnknownType;
-  reactionType: UnknownType;
-  userType: DefaultUserType;
+export interface DefaultCommandData {
+  flag: unknown;
+  imgur: unknown;
 }
 
-export type ChannelListEventListenerOptions<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  filters?: ChannelFilters<StreamChatGenerics>;
-  sort?: ChannelSort<StreamChatGenerics>;
+/* eslint-disable @typescript-eslint/no-empty-object-type */
+
+export interface DefaultEventData {}
+
+export interface DefaultMemberData {}
+
+export interface DefaultMessageData {}
+
+export interface DefaultPollOptionData {}
+
+export interface DefaultPollData {}
+
+export interface DefaultReactionData {}
+
+export interface DefaultThreadData {}
+
+export type Reaction = {
+  id: string;
+  name: string;
+  type: string;
+  image?: string;
+};
+
+export type ChannelListEventListenerOptions = {
+  filters?: ChannelFilters;
+  sort?: ChannelSort;
 };
 
 export type UnknownType = Record<string, unknown>;
 
 export type ValueOf<T> = T[keyof T];
 
-export type ChannelUnreadState<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = Omit<ValueOf<ChannelState<StreamChatGenerics>['read']>, 'user'>;
+export type ChannelUnreadState = Omit<ValueOf<ChannelState['read']>, 'user'>;
 
 // ASYNC AUDIO EXPO:
 export enum AndroidOutputFormat {

package/src/utils/ACITriggerSettings.ts

@@ -15,13 +15,8 @@ import type {
   SuggestionUser,
 } from '../contexts/suggestionsContext/SuggestionsContext';
 import { Emoji } from '../emoji-data';
-import type { DefaultStreamChatGenerics } from '../types/types';
 
-const getCommands = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: Channel<StreamChatGenerics>,
-) => channel.getConfig()?.commands || [];
+const getCommands = (channel: Channel) => channel.getConfig()?.commands || [];
 
 export type TriggerSettingsOutputType = {
   caretPosition: string;
@@ -29,22 +24,17 @@ export type TriggerSettingsOutputType = {
   text: string;
 };
 
-export type TriggerSettings<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
+export type TriggerSettings = {
   '/'?: {
     dataProvider: (
-      query: CommandResponse<StreamChatGenerics>['name'],
+      query: CommandResponse['name'],
       text: string,
-      onReady?: (
-        data: CommandResponse<StreamChatGenerics>[],
-        q: CommandResponse<StreamChatGenerics>['name'],
-      ) => void,
+      onReady?: (data: CommandResponse[], q: CommandResponse['name']) => void,
       options?: {
         limit?: number;
       },
-    ) => SuggestionCommand<StreamChatGenerics>[];
-    output: (entity: CommandResponse<StreamChatGenerics>) => TriggerSettingsOutputType;
+    ) => SuggestionCommand[];
+    output: (entity: CommandResponse) => TriggerSettingsOutputType;
     type: SuggestionComponentType;
   };
   ':'?: {
@@ -57,31 +47,26 @@ export type TriggerSettings<
     type: SuggestionComponentType;
   };
   '@'?: {
-    callback: (item: SuggestionUser<StreamChatGenerics>) => void;
+    callback: (item: SuggestionUser) => void;
     dataProvider: (
-      query: SuggestionUser<StreamChatGenerics>['name'],
+      query: SuggestionUser['name'],
       _: string,
-      onReady?: (
-        data: SuggestionUser<StreamChatGenerics>[],
-        q: SuggestionUser<StreamChatGenerics>['name'],
-      ) => void,
+      onReady?: (data: SuggestionUser[], q: SuggestionUser['name']) => void,
       options?: {
         limit?: number;
         mentionAllAppUsersEnabled?: boolean;
-        mentionAllAppUsersQuery?: MentionAllAppUsersQuery<StreamChatGenerics>;
+        mentionAllAppUsersQuery?: MentionAllAppUsersQuery;
       },
-    ) => SuggestionUser<StreamChatGenerics>[] | Promise<void> | void;
-    output: (entity: SuggestionUser<StreamChatGenerics>) => TriggerSettingsOutputType;
+    ) => SuggestionUser[] | Promise<void> | void;
+    output: (entity: SuggestionUser) => TriggerSettingsOutputType;
     type: SuggestionComponentType;
   };
 };
 
-export type ACITriggerSettingsParams<
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-> = {
-  channel: Channel<StreamChatGenerics>;
-  client: StreamChat<StreamChatGenerics>;
-  onMentionSelectItem: (item: SuggestionUser<StreamChatGenerics>) => void;
+export type ACITriggerSettingsParams = {
+  channel: Channel;
+  client: StreamChat;
+  onMentionSelectItem: (item: SuggestionUser) => void;
   emojiSearchIndex?: EmojiSearchIndex;
 };
 
@@ -104,14 +89,12 @@ export type Trigger = '/' | '@' | ':';
  * previous call without waiting for a1. So in this case, we want to execute onReady, when trailing
  * end of debounce executes.
  */
-export const ACITriggerSettings = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const ACITriggerSettings = ({
   channel,
   client,
   emojiSearchIndex,
   onMentionSelectItem,
-}: ACITriggerSettingsParams<StreamChatGenerics>): TriggerSettings<StreamChatGenerics> => ({
+}: ACITriggerSettingsParams): TriggerSettings => ({
   '/': {
     dataProvider: (query, text, onReady, options = {}) => {
       try {
@@ -208,7 +191,7 @@ export const ACITriggerSettings = <
           return [];
         }
         if (options?.mentionAllAppUsersEnabled) {
-          return (queryUsersDebounced as DebouncedFunc<QueryUsersFunction<StreamChatGenerics>>)(
+          return (queryUsersDebounced as DebouncedFunc<QueryUsersFunction>)(
             client,
             query,
             (data) => {
@@ -257,7 +240,7 @@ export const ACITriggerSettings = <
           return data;
         }
 
-        return (queryMembersDebounced as DebouncedFunc<QueryMembersFunction<StreamChatGenerics>>)(
+        return (queryMembersDebounced as DebouncedFunc<QueryMembersFunction>)(
           client,
           channel,
           query,

package/src/utils/DBSyncManager.ts

@@ -11,7 +11,6 @@ import { deletePendingTask } from '../store/apis/deletePendingTask';
 import { getPendingTasks } from '../store/apis/getPendingTasks';
 import { SqliteClient } from '../store/SqliteClient';
 import type { PendingTask } from '../store/types';
-import type { DefaultStreamChatGenerics } from '../types/types';
 
 /**
  * DBSyncManager has the responsibility to sync the channel states
@@ -104,11 +103,7 @@ export class DBSyncManager {
     };
   };
 
-  static sync = async <
-    StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-  >(
-    client: StreamChat<StreamChatGenerics>,
-  ) => {
+  static sync = async (client: StreamChat) => {
     if (!this.client?.user) {
       return;
     }
@@ -165,20 +160,12 @@ export class DBSyncManager {
     await this.sync(this.client);
   };
 
-  static queueTask = async <
-    StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-  >({
-    client,
-    task,
-  }: {
-    client: StreamChat<StreamChatGenerics>;
-    task: PendingTask;
-  }) => {
+  static queueTask = async ({ client, task }: { client: StreamChat; task: PendingTask }) => {
     const removeFromApi = await addPendingTask(task);
 
     let response;
     try {
-      response = await this.executeTask<StreamChatGenerics>({ client, task });
+      response = await this.executeTask({ client, task });
     } catch (e) {
       if ((e as AxiosError<APIErrorResponse>)?.response?.data?.code === 4) {
         // Error code 16 - message already exists
@@ -193,15 +180,7 @@ export class DBSyncManager {
     return response;
   };
 
-  static executeTask = async <
-    StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-  >({
-    client,
-    task,
-  }: {
-    client: StreamChat<StreamChatGenerics>;
-    task: PendingTask;
-  }) => {
+  static executeTask = async ({ client, task }: { client: StreamChat; task: PendingTask }) => {
     const channel = client.channel(task.channelType, task.channelId);
 
     if (task.type === 'send-reaction') {
@@ -219,11 +198,7 @@ export class DBSyncManager {
     throw new Error('Invalid task type');
   };
 
-  static executePendingTasks = async <
-    StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
-  >(
-    client: StreamChat<StreamChatGenerics>,
-  ) => {
+  static executePendingTasks = async (client: StreamChat) => {
     const queue = await getPendingTasks();
     for (const task of queue) {
       if (!task.id) {
@@ -231,7 +206,7 @@ export class DBSyncManager {
       }
 
       try {
-        await this.executeTask<StreamChatGenerics>({
+        await this.executeTask({
           client,
           task,
         });

package/src/utils/addReactionToLocalState.ts

@@ -3,22 +3,18 @@ import type { Channel, ReactionResponse, UserResponse } from 'stream-chat';
 import { updateReaction } from '../store/apis';
 import { insertReaction } from '../store/apis/insertReaction';
 
-import type { DefaultStreamChatGenerics } from '../types/types';
-
-export const addReactionToLocalState = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const addReactionToLocalState = ({
   channel,
   enforceUniqueReaction,
   messageId,
   reactionType,
   user,
 }: {
-  channel: Channel<StreamChatGenerics>;
+  channel: Channel;
   enforceUniqueReaction: boolean;
   messageId: string;
   reactionType: string;
-  user: UserResponse<StreamChatGenerics>;
+  user: UserResponse;
 }) => {
   const message = channel.state.messages.find(({ id }) => id === messageId);