stream-chat-react-native-core 6.6.8-beta.3 → 7.0.0-rc.2

package/src/store/apis/getMembers.ts

@@ -2,26 +2,19 @@ import type { ChannelMemberResponse } from 'stream-chat';
 
 import { selectMembersForChannels } from './queries/selectMembersForChannels';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { mapStorableToMember } from '../mappers/mapStorableToMember';
 import { SqliteClient } from '../SqliteClient';
 
-export const getMembers = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
-  channelIds,
-}: {
-  channelIds: string[];
-}) => {
+export const getMembers = async ({ channelIds }: { channelIds: string[] }) => {
   SqliteClient.logger?.('info', 'getMembers', { channelIds });
   const memberRows = await selectMembersForChannels(channelIds);
-  const cidVsMembers: Record<string, ChannelMemberResponse<StreamChatGenerics>[]> = {};
+  const cidVsMembers: Record<string, ChannelMemberResponse[]> = {};
   memberRows.forEach((member) => {
     if (!cidVsMembers[member.cid]) {
       cidVsMembers[member.cid] = [];
     }
 
-    cidVsMembers[member.cid].push(mapStorableToMember<StreamChatGenerics>(member));
+    cidVsMembers[member.cid].push(mapStorableToMember(member));
   });
 
   return cidVsMembers;

package/src/store/apis/getReactions.ts

@@ -1,21 +1,18 @@
 import type { ReactionResponse } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { mapStorableToReaction } from '../mappers/mapStorableToReaction';
 import { SqliteClient } from '../SqliteClient';
 import { TableRowJoinedUser } from '../types';
 
-export const getReactions = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const getReactions = ({
   reactions,
 }: {
   reactions: TableRowJoinedUser<'reactions'>[];
-}): ReactionResponse<StreamChatGenerics>[] => {
+}): ReactionResponse[] => {
   SqliteClient.logger?.('info', 'getReactions', { reactions });
 
   // Enrich the channels with state
   return reactions.map((reaction) => ({
-    ...mapStorableToReaction<StreamChatGenerics>(reaction),
+    ...mapStorableToReaction(reaction),
   }));
 };

package/src/store/apis/getReactionsforFilterSort.ts

@@ -3,8 +3,6 @@ import type { ReactionFilters, ReactionResponse, ReactionSort } from 'stream-cha
 import { getReactions } from './getReactions';
 import { selectReactionsForMessages } from './queries/selectReactionsForMessages';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 import { SqliteClient } from '../SqliteClient';
 
 /**
@@ -13,17 +11,15 @@ import { SqliteClient } from '../SqliteClient';
  * @param filters The filters to be applied while fetching reactions.
  * @param sort The sort to be applied while fetching reactions.
  */
-export const getReactionsForFilterSort = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const getReactionsForFilterSort = async ({
   currentMessageId,
   filters,
   sort,
 }: {
   currentMessageId: string;
-  filters?: ReactionFilters<StreamChatGenerics>;
-  sort?: ReactionSort<StreamChatGenerics>;
-}): Promise<ReactionResponse<StreamChatGenerics>[] | null> => {
+  filters?: ReactionFilters;
+  sort?: ReactionSort;
+}): Promise<ReactionResponse[] | null> => {
   if (!filters && !sort) {
     console.warn('Please provide the query (filters/sort) to fetch channels from DB');
     return null;

package/src/store/apis/getReads.ts

@@ -2,26 +2,19 @@ import type { ReadResponse } from 'stream-chat';
 
 import { selectReadsForChannels } from './queries/selectReadsForChannels';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
 import { mapStorableToRead } from '../mappers/mapStorableToRead';
 import { SqliteClient } from '../SqliteClient';
 
-export const getReads = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
-  channelIds,
-}: {
-  channelIds: string[];
-}) => {
+export const getReads = async ({ channelIds }: { channelIds: string[] }) => {
   SqliteClient.logger?.('info', 'getReads', { channelIds });
   const reads = await selectReadsForChannels(channelIds);
-  const cidVsReads: Record<string, ReadResponse<StreamChatGenerics>[]> = {};
+  const cidVsReads: Record<string, ReadResponse[]> = {};
 
   reads.forEach((read) => {
     if (!cidVsReads[read.cid]) {
       cidVsReads[read.cid] = [];
     }
-    cidVsReads[read.cid].push(mapStorableToRead<StreamChatGenerics>(read));
+    cidVsReads[read.cid].push(mapStorableToRead(read));
   });
 
   return cidVsReads;

package/src/store/apis/queries/selectChannelIdsForFilterSort.ts

@@ -1,6 +1,5 @@
 import type { ChannelFilters, ChannelSort } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
 import { createSelectQuery } from '../../sqlite-utils/createSelectQuery';
 import { SqliteClient } from '../../SqliteClient';
 
@@ -16,14 +15,12 @@ import { convertFilterSortToQuery } from '../utils/convertFilterSortToQuery';
  * @returns Array of channel ids corresponding to filters & sort. Returns null if filters + sort query doesn't exist in "channelQueries" table.
  */
 
-export const selectChannelIdsForFilterSort = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const selectChannelIdsForFilterSort = async ({
   filters,
   sort,
 }: {
-  filters?: ChannelFilters<StreamChatGenerics>;
-  sort?: ChannelSort<StreamChatGenerics>;
+  filters?: ChannelFilters;
+  sort?: ChannelSort;
 }): Promise<string[] | null> => {
   const query = convertFilterSortToQuery({ filters, sort });
 

package/src/store/apis/updatePollMessage.ts

@@ -1,6 +1,5 @@
 import { isVoteAnswer, PollAnswer, PollResponse, PollVote } from 'stream-chat';
 
-import { DefaultStreamChatGenerics } from '../../types/types';
 import { mapPollToStorable } from '../mappers/mapPollToStorable';
 import { mapStorableToPoll } from '../mappers/mapStorableToPoll';
 import { createSelectQuery } from '../sqlite-utils/createSelectQuery';
@@ -8,9 +7,7 @@ import { createUpdateQuery } from '../sqlite-utils/createUpdateQuery';
 import { SqliteClient } from '../SqliteClient';
 import type { PreparedQueries, TableRow } from '../types';
 
-export const updatePollMessage = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const updatePollMessage = async ({
   eventType,
   flush = true,
   poll,
@@ -18,10 +15,10 @@ export const updatePollMessage = async <
   userID,
 }: {
   eventType: string;
-  poll: PollResponse<StreamChatGenerics>;
+  poll: PollResponse;
   userID: string;
   flush?: boolean;
-  poll_vote?: PollVote<StreamChatGenerics> | PollAnswer<StreamChatGenerics>;
+  poll_vote?: PollVote | PollAnswer;
 }) => {
   const queries: PreparedQueries[] = [];
 

package/src/store/apis/upsertChannelDataFromChannel.ts

@@ -1,17 +1,14 @@
 import type { Channel } from 'stream-chat';
 
-import { DefaultStreamChatGenerics } from '../../types/types';
 import { mapChannelToStorable } from '../mappers/mapChannelToStorable';
 import { createUpsertQuery } from '../sqlite-utils/createUpsertQuery';
 import { SqliteClient } from '../SqliteClient';
 
-export const upsertChannelDataFromChannel = async <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const upsertChannelDataFromChannel = async ({
   channel,
   flush = true,
 }: {
-  channel: Channel<StreamChatGenerics>;
+  channel: Channel;
   flush?: boolean;
 }) => {
   const storableChannel = mapChannelToStorable(channel);

package/src/store/apis/utils/convertFilterSortToQuery.ts

@@ -1,14 +1,10 @@
 import type { ChannelFilters, ChannelSort } from 'stream-chat';
 
-import type { DefaultStreamChatGenerics } from '../../../types/types';
-
-export const convertFilterSortToQuery = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->({
+export const convertFilterSortToQuery = ({
   filters,
   sort,
 }: {
-  filters?: ChannelFilters<StreamChatGenerics>;
-  sort?: ChannelSort<StreamChatGenerics>;
+  filters?: ChannelFilters;
+  sort?: ChannelSort;
 }) =>
   JSON.stringify(`${filters ? JSON.stringify(filters) : ''}-${sort ? JSON.stringify(sort) : ''}`);

package/src/store/mappers/mapChannelDataToStorable.ts

@@ -2,15 +2,9 @@ import type { ChannelResponse } from 'stream-chat';
 
 import { mapDateTimeToStorable } from './mapDateTimeToStorable';
 
-import type { DefaultStreamChatGenerics } from '../../types/types';
-
 import type { TableRow } from '../types';
 
-export const mapChannelDataToStorable = <
-  StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
->(
-  channel: ChannelResponse<StreamChatGenerics>,
-): TableRow<'channels'> => {
+export const mapChannelDataToStorable = (channel: ChannelResponse): TableRow<'channels'> => {
   const {
     auto_translation_enabled,
     auto_translation_language,

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/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,
@@ -35,6 +30,8 @@ export const mapStorableToPoll = <
     allow_answers,
     allow_user_suggested_options,
     answers_count,
+    // TODO: Investigate why this is now here, this is just a quickfix for now as we do not use it.
+    cid: '',
     created_at,
     created_by: JSON.parse(created_by),
     created_by_id,

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 {
+  DefaultAttachmentType,
+  DefaultChannelType,
+  DefaultCommandType,
+  DefaultEventType,
+  DefaultMemberType,
+  DefaultMessageType,
+  DefaultPollOptionType,
+  DefaultPollType,
+  DefaultReactionType,
+  DefaultThreadType,
+  DefaultUserType,
+} from './types';
+
+declare module 'stream-chat' {
+  /* eslint-disable @typescript-eslint/no-empty-object-type */
+
+  interface CustomAttachmentData extends DefaultAttachmentType {}
+
+  interface CustomChannelData extends DefaultChannelType {}
+
+  interface CustomCommandData extends DefaultCommandType {}
+
+  interface CustomEventData extends DefaultEventType {}
+
+  interface CustomMemberData extends DefaultMemberType {}
+
+  interface CustomUserData extends DefaultUserType {}
+
+  interface CustomMessageData extends DefaultMessageType {}
+
+  interface CustomPollOptionData extends DefaultPollOptionType {}
+
+  interface CustomPollData extends DefaultPollType {}
+
+  interface CustomReactionData extends DefaultReactionType {}
+
+  interface CustomThreadData extends DefaultThreadType {}
+
+  /* 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 } from 'stream-chat';
 
 import type { FileStateValue } from '../utils/utils';
 
@@ -57,67 +51,73 @@ export type FileUpload = {
   url?: string;
   waveform_data?: number[];
 };
-
-export type ImageUpload = {
-  file: Partial<Asset>;
-  id: string;
-  state: FileStateValue;
-  height?: number;
-  url?: string;
-  width?: number;
-};
-
-export type DefaultAttachmentType = UnknownType & {
+export interface DefaultAttachmentType {
   duration?: number;
   file_size?: number;
   mime_type?: string;
   originalFile?: File;
   originalImage?: Partial<Asset>;
   waveform_data?: number[];
-};
-
-export type Reaction = {
-  id: string;
-  name: string;
-  type: string;
-  image?: string;
-};
+}
 
-interface DefaultUserType extends UnknownType {
+export interface DefaultUserType {
   image?: string;
 }
 
-interface DefaultChannelType extends UnknownType {
+export interface DefaultChannelType {
   [key: string]: unknown;
 
   image?: string;
 }
 
-export interface DefaultStreamChatGenerics extends ExtendableGenerics {
-  attachmentType: DefaultAttachmentType;
-  channelType: DefaultChannelType;
-  commandType: LiteralStringForUnion;
-  eventType: UnknownType;
-  memberType: UnknownType;
-  messageType: UnknownType;
-  reactionType: UnknownType;
-  userType: DefaultUserType;
+export interface DefaultCommandType {
+  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 DefaultEventType {}
+
+export interface DefaultMemberType {}
+
+export interface DefaultMessageType {}
+
+export interface DefaultPollOptionType {}
+
+export interface DefaultPollType {}
+
+export interface DefaultReactionType {}
+
+export interface DefaultThreadType {}
+
+/* eslint-enable @typescript-eslint/no-empty-object-type */
+export type ImageUpload = {
+  file: Partial<Asset>;
+  id: string;
+  state: FileStateValue;
+  height?: number;
+  url?: string;
+  width?: number;
+};
+
+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 {