@youversion/platform-react-hooks 1.18.1 → 1.20.0

package/dist/useVerseSelection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useVerseSelection.d.ts","sourceRoot":"","sources":["../src/useVerseSelection.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,iCAAiC,CAAC;AAEzC,wBAAgB,iBAAiB,IAAI,yBAAyB,CAM7D"}
+{"version":3,"file":"useVerseSelection.d.ts","sourceRoot":"","sources":["../src/useVerseSelection.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,yBAAyB,CAM7D"}

package/dist/useVerseSelection.js

@@ -1,5 +1,8 @@
 import { useContext } from 'react';
 import { VerseSelectionContext, } from './context/VerseSelectionContext';
+/**
+ * @deprecated No replacement needed. Remove usage. Will be removed in the next major version.
+ */
 export function useVerseSelection() {
     const context = useContext(VerseSelectionContext);
     if (!context) {

package/dist/useVerseSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useVerseSelection.js","sourceRoot":"","sources":["../src/useVerseSelection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EACL,qBAAqB,GAEtB,MAAM,iCAAiC,CAAC;AAEzC,MAAM,UAAU,iBAAiB;IAC/B,MAAM,OAAO,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAClD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"useVerseSelection.js","sourceRoot":"","sources":["../src/useVerseSelection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EACL,qBAAqB,GAEtB,MAAM,iCAAiC,CAAC;AAEzC;;GAEG;AACH,MAAM,UAAU,iBAAiB;IAC/B,MAAM,OAAO,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAClD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youversion/platform-react-hooks",
-  "version": "1.18.1",
+  "version": "1.20.0",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -22,7 +22,7 @@
     }
   },
   "dependencies": {
-    "@youversion/platform-core": "1.18.1"
+    "@youversion/platform-core": "1.20.0"
   },
   "peerDependencies": {
     "react": ">=19.1.0 <20.0.0"

package/src/__tests__/mocks/bibles.ts

@@ -1,4 +1,10 @@
-import type { BibleBook, BibleChapter, BibleVerse, BibleVersion } from '@youversion/platform-core';
+import type {
+  BibleBook,
+  BibleChapter,
+  BiblePassage,
+  BibleVerse,
+  BibleVersion,
+} from '@youversion/platform-core';
 
 /**
  * Creates a mock Bible version for testing
@@ -54,3 +60,14 @@ export const createMockVerse = (overrides?: Partial<BibleVerse>): BibleVerse =>
   title: '1',
   ...overrides,
 });
+
+/**
+ * Creates a mock Bible passage for testing
+ * @param overrides Optional properties to override defaults
+ */
+export const createMockPassage = (overrides?: Partial<BiblePassage>): BiblePassage => ({
+  id: 'JHN.3.16',
+  content: '<p>For God so loved the world...</p>',
+  reference: 'John 3:16',
+  ...overrides,
+});

package/src/__tests__/mocks/core-mock-factory.ts

@@ -0,0 +1,226 @@
+import { vi, type MockedFunction } from 'vitest';
+import type { YouVersionAPIUsers } from '@youversion/platform-core';
+
+interface MockUserInfoData {
+  name?: string;
+  id?: string;
+  email?: string;
+  avatar_url?: string;
+}
+
+interface MockAuthResultProps {
+  accessToken?: string;
+  expiresIn?: number;
+  refreshToken?: string;
+  idToken?: string;
+  yvpUserId?: string;
+  name?: string;
+  profilePicture?: string;
+  email?: string;
+}
+
+export class MockYouVersionUserInfo {
+  readonly name?: string;
+  readonly userId?: string;
+  readonly email?: string;
+  readonly avatarUrlFormat?: string;
+
+  constructor(data: MockUserInfoData) {
+    this.name = data.name;
+    this.userId = data.id;
+    this.email = data.email;
+    this.avatarUrlFormat = data.avatar_url;
+  }
+
+  getAvatarUrl(width: number = 200, height: number = 200): URL | null {
+    if (!this.avatarUrlFormat) {
+      return null;
+    }
+    try {
+      let urlString = this.avatarUrlFormat;
+      if (urlString.startsWith('//')) {
+        urlString = 'https:' + urlString;
+      }
+      urlString = urlString.replace('{width}', width.toString());
+      urlString = urlString.replace('{height}', height.toString());
+      return new URL(urlString);
+    } catch {
+      return null;
+    }
+  }
+
+  get avatarUrl(): URL | null {
+    return this.getAvatarUrl();
+  }
+}
+
+export class MockSignInWithYouVersionResult {
+  readonly accessToken: string | undefined;
+  readonly expiryDate: Date | undefined;
+  readonly refreshToken: string | undefined;
+  readonly idToken: string | undefined;
+  readonly yvpUserId: string | undefined;
+  readonly name: string | undefined;
+  readonly profilePicture: string | undefined;
+  readonly email: string | undefined;
+
+  constructor(props: MockAuthResultProps) {
+    this.accessToken = props.accessToken;
+    this.expiryDate = props.expiresIn ? new Date(Date.now() + props.expiresIn * 1000) : new Date();
+    this.refreshToken = props.refreshToken;
+    this.idToken = props.idToken;
+    this.yvpUserId = props.yvpUserId;
+    this.name = props.name;
+    this.profilePicture = props.profilePicture;
+    this.email = props.email;
+  }
+}
+
+interface MockConfiguration {
+  accessToken: string | null;
+  idToken: string | null;
+  refreshToken: string | null;
+  appKey: string;
+  apiHost: string;
+  installationId: string | null;
+  clearAuthTokens: MockedFunction<() => void>;
+  saveAuthData: MockedFunction<
+    (
+      accessToken: string | null,
+      refreshToken: string | null,
+      idToken: string | null,
+      installationId: string | null,
+    ) => void
+  >;
+}
+
+interface SimpleCoreMockFactory {
+  YouVersionAPIUsers: {
+    signIn: MockedFunction<typeof YouVersionAPIUsers.signIn>;
+    handleAuthCallback: MockedFunction<typeof YouVersionAPIUsers.handleAuthCallback>;
+    userInfo: MockedFunction<typeof YouVersionAPIUsers.userInfo>;
+    refreshTokenIfNeeded: MockedFunction<typeof YouVersionAPIUsers.refreshTokenIfNeeded>;
+  };
+  YouVersionPlatformConfiguration: MockConfiguration;
+  SignInWithYouVersionPermission: Record<string, string>;
+  YouVersionUserInfo: typeof MockYouVersionUserInfo;
+  SignInWithYouVersionResult: typeof MockSignInWithYouVersionResult;
+}
+
+interface GetterCoreMockFactory {
+  YouVersionAPIUsers: {
+    handleAuthCallback: MockedFunction<typeof YouVersionAPIUsers.handleAuthCallback>;
+    userInfo: MockedFunction<typeof YouVersionAPIUsers.userInfo>;
+    refreshTokenIfNeeded: MockedFunction<typeof YouVersionAPIUsers.refreshTokenIfNeeded>;
+  };
+  YouVersionPlatformConfiguration: {
+    appKey: string;
+    installationId: string;
+    apiHost: string;
+    readonly idToken: string | null;
+    readonly refreshToken: string | null;
+    readonly accessToken: string | null;
+    clearAuthTokens: MockedFunction<() => void>;
+    saveAuthData: MockedFunction<
+      (accessToken: string | null, refreshToken: string | null, idToken: string | null) => void
+    >;
+  };
+  YouVersionUserInfo: typeof MockYouVersionUserInfo;
+  SignInWithYouVersionResult: typeof MockSignInWithYouVersionResult;
+}
+
+export function createSimpleCoreMockFactory(): SimpleCoreMockFactory {
+  const mockConfiguration: MockConfiguration = {
+    accessToken: null,
+    idToken: null,
+    refreshToken: null,
+    appKey: '',
+    apiHost: 'test-api.example.com',
+    installationId: null,
+    clearAuthTokens: vi.fn(() => {
+      mockConfiguration.accessToken = null;
+      mockConfiguration.idToken = null;
+      mockConfiguration.refreshToken = null;
+    }),
+    saveAuthData: vi.fn(
+      (
+        accessToken: string | null,
+        refreshToken: string | null,
+        idToken: string | null,
+        installationId: string | null,
+      ) => {
+        mockConfiguration.accessToken = accessToken;
+        mockConfiguration.refreshToken = refreshToken;
+        mockConfiguration.idToken = idToken;
+        mockConfiguration.installationId = installationId;
+      },
+    ),
+  };
+
+  return {
+    YouVersionAPIUsers: {
+      signIn: vi.fn(),
+      handleAuthCallback: vi.fn(),
+      userInfo: vi.fn(),
+      refreshTokenIfNeeded: vi.fn(),
+    },
+    YouVersionPlatformConfiguration: mockConfiguration,
+    SignInWithYouVersionPermission: {
+      bibles: 'bibles',
+      highlights: 'highlights',
+      votd: 'votd',
+      demographics: 'demographics',
+      bibleActivity: 'bible_activity',
+    },
+    YouVersionUserInfo: MockYouVersionUserInfo,
+    SignInWithYouVersionResult: MockSignInWithYouVersionResult,
+  };
+}
+
+export function createGetterCoreMockFactory(): GetterCoreMockFactory {
+  let mockInstallationId = 'auto-generated-installation-id';
+  let mockIdToken: string | null = null;
+  let mockRefreshToken: string | null = null;
+  let mockAccessToken: string | null = null;
+
+  return {
+    YouVersionAPIUsers: {
+      handleAuthCallback: vi.fn(),
+      userInfo: vi.fn(),
+      refreshTokenIfNeeded: vi.fn(),
+    },
+    YouVersionPlatformConfiguration: {
+      appKey: '',
+      get installationId() {
+        return mockInstallationId;
+      },
+      set installationId(value) {
+        if (value) mockInstallationId = value;
+      },
+      apiHost: 'test-api.example.com',
+      get idToken() {
+        return mockIdToken;
+      },
+      get refreshToken() {
+        return mockRefreshToken;
+      },
+      get accessToken() {
+        return mockAccessToken;
+      },
+      clearAuthTokens: vi.fn(() => {
+        mockIdToken = null;
+        mockRefreshToken = null;
+        mockAccessToken = null;
+      }),
+      saveAuthData: vi.fn(
+        (accessToken: string | null, refreshToken: string | null, idToken: string | null) => {
+          mockAccessToken = accessToken;
+          mockRefreshToken = refreshToken;
+          mockIdToken = idToken;
+        },
+      ),
+    },
+    YouVersionUserInfo: MockYouVersionUserInfo,
+    SignInWithYouVersionResult: MockSignInWithYouVersionResult,
+  };
+}

package/src/context/ReaderContext.tsx

@@ -14,8 +14,14 @@ type ReaderContextData = {
   setVerse: (verse: BibleVerse | null) => void;
 };
 
+/**
+ * @deprecated No replacement needed. Remove usage. Will be removed in the next major version.
+ */
 export const ReaderContext = createContext<ReaderContextData | null>(null);
 
+/**
+ * @deprecated No replacement needed. Remove usage. Will be removed in the next major version.
+ */
 export function useReaderContext(): ReaderContextData {
   const context = useContext(ReaderContext);
 

package/src/context/ReaderProvider.tsx

@@ -11,6 +11,9 @@ type ReaderProviderProps = {
   currentVerse: BibleVerse | null;
 };
 
+/**
+ * @deprecated No replacement needed. Remove usage. Will be removed in the next major version.
+ */
 export function ReaderProvider(props: PropsWithChildren<ReaderProviderProps>): React.ReactElement {
   const [currentVersion, setCurrentVersion] = useState<BibleVersion>(props.currentVersion);
   const [currentBook, setCurrentBook] = useState<BibleBook>(props.currentBook);

package/src/context/VerseSelectionContext.tsx

@@ -1,5 +1,8 @@
 import { createContext } from 'react';
 
+/**
+ * @deprecated No replacement needed. Remove usage. Will be removed in the next major version.
+ */
 export type VerseSelectionContextData = {
   selectedVerseUsfms: Set<string>;
   toggleVerse: (usfm: string) => void;
@@ -8,4 +11,7 @@ export type VerseSelectionContextData = {
   selectedCount: number;
 };
 
+/**
+ * @deprecated No replacement needed. Remove usage. Will be removed in the next major version.
+ */
 export const VerseSelectionContext = createContext<VerseSelectionContextData | null>(null);

package/src/context/VerseSelectionProvider.tsx

@@ -1,6 +1,9 @@
 import { type PropsWithChildren, useCallback, useState } from 'react';
 import { VerseSelectionContext } from './VerseSelectionContext';
 
+/**
+ * @deprecated No replacement needed. Remove usage. Will be removed in the next major version.
+ */
 export function VerseSelectionProvider({ children }: PropsWithChildren): React.ReactElement {
   const [selectedVerseUsfms, setSelectedVerseUsfms] = useState<Set<string>>(new Set());
 

package/src/context/YouVersionAuthProvider.test.tsx

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-argument */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { render } from '@testing-library/react';
 import { YouVersionAPIUsers, YouVersionPlatformConfiguration } from '@youversion/platform-core';
 import YouVersionAuthProvider from './YouVersionAuthProvider';
@@ -7,118 +6,10 @@ import { useYouVersionAuthContext } from './YouVersionAuthContext';
 import type { AuthConfig } from '../types/auth';
 import { createMockUserInfo, createMockAuthResult } from '../__tests__/mocks/auth';
 
-// Mock the core modules
-vi.mock('@youversion/platform-core', () => {
-  let mockInstallationId = 'auto-generated-installation-id';
-  let mockIdToken: string | null = null;
-  let mockRefreshToken: string | null = null;
-  let mockAccessToken: string | null = null;
-
-  return {
-    YouVersionAPIUsers: {
-      handleAuthCallback: vi.fn(),
-      userInfo: vi.fn(),
-      refreshTokenIfNeeded: vi.fn(),
-    },
-    YouVersionPlatformConfiguration: {
-      appKey: '',
-      get installationId() {
-        return mockInstallationId;
-      },
-      set installationId(value) {
-        if (value) mockInstallationId = value;
-      },
-      apiHost: 'test-api.example.com',
-      get idToken() {
-        return mockIdToken;
-      },
-      get refreshToken() {
-        return mockRefreshToken;
-      },
-      get accessToken() {
-        return mockAccessToken;
-      },
-      clearAuthTokens: vi.fn(() => {
-        mockIdToken = null;
-        mockRefreshToken = null;
-        mockAccessToken = null;
-      }),
-      saveAuthData: vi.fn(
-        (accessToken: string | null, refreshToken: string | null, idToken: string | null) => {
-          mockAccessToken = accessToken;
-          mockRefreshToken = refreshToken;
-          mockIdToken = idToken;
-        },
-      ),
-    },
-    YouVersionUserInfo: class YouVersionUserInfo {
-      readonly name?: string;
-      readonly userId?: string;
-      readonly email?: string;
-      readonly avatarUrlFormat?: string;
-
-      constructor(data: any) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-        this.name = data.name;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-        this.userId = data.id;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-        this.email = data.email;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-        this.avatarUrlFormat = data.avatar_url;
-      }
-
-      getAvatarUrl(width: number = 200, height: number = 200): URL | null {
-        if (!this.avatarUrlFormat) {
-          return null;
-        }
-        try {
-          let urlString = this.avatarUrlFormat;
-          urlString = urlString.replace('{width}', width.toString());
-          urlString = urlString.replace('{height}', height.toString());
-          return new URL(urlString);
-        } catch {
-          return null;
-        }
-      }
-
-      get avatarUrl(): URL | null {
-        return this.getAvatarUrl();
-      }
-    },
-    SignInWithYouVersionResult: class SignInWithYouVersionResult {
-      accessToken: string | undefined;
-      expiryDate: Date | undefined;
-      refreshToken: string | undefined;
-      idToken: string | undefined;
-      yvpUserId: string | undefined;
-      name: string | undefined;
-      profilePicture: string | undefined;
-      email: string | undefined;
-
-      constructor(props: {
-        accessToken?: string;
-        expiresIn?: number;
-        refreshToken?: string;
-        idToken?: string;
-        yvpUserId?: string;
-        name?: string;
-        profilePicture?: string;
-        email?: string;
-      }) {
-        this.accessToken = props.accessToken;
-        this.expiryDate = props.expiresIn
-          ? new Date(Date.now() + props.expiresIn * 1000)
-          : new Date();
-        this.refreshToken = props.refreshToken;
-        this.idToken = props.idToken;
-        this.yvpUserId = props.yvpUserId;
-        this.name = props.name;
-        this.profilePicture = props.profilePicture;
-        this.email = props.email;
-      }
-    },
-  };
+// Mock the core modules using shared factory
+vi.mock('@youversion/platform-core', async () => {
+  const { createGetterCoreMockFactory } = await import('../__tests__/mocks/core-mock-factory');
+  return createGetterCoreMockFactory();
 });
 
 const mockConfig: AuthConfig = {
@@ -152,8 +43,6 @@ function TestChild() {
 
 describe('YouVersionAuthProvider', () => {
   beforeEach(() => {
-    vi.clearAllMocks();
-
     // Setup window mock
     vi.stubGlobal('window', mockWindow);
     mockWindow.location.search = '';
@@ -164,11 +53,6 @@ describe('YouVersionAuthProvider', () => {
     YouVersionPlatformConfiguration.clearAuthTokens();
   });
 
-  afterEach(() => {
-    vi.clearAllMocks();
-    vi.unstubAllGlobals();
-  });
-
   describe('initialization', () => {
     it('should configure YouVersionPlatformConfiguration on mount', async () => {
       render(
@@ -225,11 +109,10 @@ describe('YouVersionAuthProvider', () => {
   describe('OAuth callback handling', () => {
     it('should detect OAuth callback with state parameter', async () => {
       mockWindow.location.search = '?state=test-state&code=auth-code';
-      vi.mocked(YouVersionAPIUsers.handleAuthCallback).mockResolvedValue(mockAuthResult as any);
-      vi.mocked(YouVersionAPIUsers.userInfo).mockReturnValue(mockUserInfo as any);
+      vi.spyOn(YouVersionAPIUsers, 'userInfo').mockReturnValue(mockUserInfo);
 
       // Mock the configuration to return the id token after handleAuthCallback
-      vi.mocked(YouVersionAPIUsers.handleAuthCallback).mockImplementation(() => {
+      vi.spyOn(YouVersionAPIUsers, 'handleAuthCallback').mockImplementation(() => {
         YouVersionPlatformConfiguration.saveAuthData(null, null, 'test-id-token', null);
         return Promise.resolve(mockAuthResult as any);
       });
@@ -251,7 +134,7 @@ describe('YouVersionAuthProvider', () => {
 
     it('should detect OAuth callback with error parameter', async () => {
       mockWindow.location.search = '?error=access_denied&error_description=User+denied+access';
-      vi.mocked(YouVersionAPIUsers.handleAuthCallback).mockResolvedValue(mockAuthResult as any);
+      vi.spyOn(YouVersionAPIUsers, 'handleAuthCallback').mockResolvedValue(mockAuthResult);
 
       const { getByTestId } = render(
         <YouVersionAuthProvider config={mockConfig}>
@@ -269,7 +152,7 @@ describe('YouVersionAuthProvider', () => {
     it('should handle callback error and set error state', async () => {
       mockWindow.location.search = '?state=test-state&code=auth-code';
       const callbackError = new Error('Callback processing failed');
-      vi.mocked(YouVersionAPIUsers.handleAuthCallback).mockRejectedValue(callbackError);
+      vi.spyOn(YouVersionAPIUsers, 'handleAuthCallback').mockRejectedValue(callbackError);
 
       const { getByTestId } = render(
         <YouVersionAuthProvider config={mockConfig}>
@@ -286,7 +169,7 @@ describe('YouVersionAuthProvider', () => {
 
     it('should handle callback with no idToken', async () => {
       mockWindow.location.search = '?state=test-state&code=auth-code';
-      vi.mocked(YouVersionAPIUsers.handleAuthCallback).mockResolvedValue(mockAuthResult as any);
+      vi.spyOn(YouVersionAPIUsers, 'handleAuthCallback').mockResolvedValue(mockAuthResult);
       YouVersionPlatformConfiguration.saveAuthData(null, null, null, null);
 
       const { getByTestId } = render(
@@ -310,11 +193,11 @@ describe('YouVersionAuthProvider', () => {
       YouVersionPlatformConfiguration.saveAuthData(null, 'existing-refresh-token', null, null);
 
       // Mock refreshTokenIfNeeded to set the id token after successful refresh
-      vi.mocked(YouVersionAPIUsers.refreshTokenIfNeeded).mockImplementation(() => {
+      vi.spyOn(YouVersionAPIUsers, 'refreshTokenIfNeeded').mockImplementation(() => {
         YouVersionPlatformConfiguration.saveAuthData(null, null, 'refreshed-id-token', null);
         return Promise.resolve(true);
       });
-      vi.mocked(YouVersionAPIUsers.userInfo).mockReturnValue(mockUserInfo as any);
+      vi.spyOn(YouVersionAPIUsers, 'userInfo').mockReturnValue(mockUserInfo);
 
       const { getByTestId } = render(
         <YouVersionAuthProvider config={mockConfig}>
@@ -333,7 +216,7 @@ describe('YouVersionAuthProvider', () => {
 
     it('should handle refresh token failure', async () => {
       YouVersionPlatformConfiguration.saveAuthData(null, 'existing-refresh-token', null, null);
-      vi.mocked(YouVersionAPIUsers.refreshTokenIfNeeded).mockRejectedValue(
+      vi.spyOn(YouVersionAPIUsers, 'refreshTokenIfNeeded').mockRejectedValue(
         new Error('Refresh failed'),
       );
 
@@ -352,7 +235,7 @@ describe('YouVersionAuthProvider', () => {
 
     it('should clear user when refresh token exists but no idToken after refresh', async () => {
       YouVersionPlatformConfiguration.saveAuthData(null, 'existing-refresh-token', null, null);
-      vi.mocked(YouVersionAPIUsers.refreshTokenIfNeeded).mockResolvedValue(false);
+      vi.spyOn(YouVersionAPIUsers, 'refreshTokenIfNeeded').mockResolvedValue(false);
 
       const { getByTestId } = render(
         <YouVersionAuthProvider config={mockConfig}>

package/src/test/utils.tsx

@@ -0,0 +1,12 @@
+import type { ReactNode, ComponentType } from 'react';
+import { YouVersionContext } from '../context';
+
+export const createYVWrapper = (
+  appKey = 'test-app-key',
+  { theme }: { theme?: 'light' | 'dark' } = {},
+): ComponentType<{ children: ReactNode }> => {
+  const Wrapper = ({ children }: { children: ReactNode }) => (
+    <YouVersionContext.Provider value={{ appKey, theme }}>{children}</YouVersionContext.Provider>
+  );
+  return Wrapper;
+};

package/src/useBibleClient.test.tsx

@@ -1,9 +1,10 @@
 import { renderHook } from '@testing-library/react';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, expect, vi, it } from 'vitest';
 import type { ReactNode } from 'react';
 import { useBibleClient } from './useBibleClient';
 import { YouVersionContext } from './context';
 import { BibleClient, ApiClient } from '@youversion/platform-core';
+import { createYVWrapper } from './test/utils';
 
 vi.mock('@youversion/platform-core', async () => {
   const actual = await vi.importActual('@youversion/platform-core');
@@ -23,27 +24,12 @@ vi.mock('@youversion/platform-core', async () => {
 });
 
 describe('useBibleClient', () => {
-  const mockAppKey = 'test-app-key';
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
   it('should create and return a BibleClient instance when context is valid', () => {
-    const wrapper = ({ children }: { children: ReactNode }) => (
-      <YouVersionContext.Provider
-        value={{
-          appKey: mockAppKey,
-        }}
-      >
-        {children}
-      </YouVersionContext.Provider>
-    );
-
+    const wrapper = createYVWrapper();
     const { result } = renderHook(() => useBibleClient(), { wrapper });
 
     expect(ApiClient).toHaveBeenCalledWith({
-      appKey: mockAppKey,
+      appKey: 'test-app-key',
     });
     expect(BibleClient).toHaveBeenCalledWith(expect.objectContaining({ isApiClient: true }));
     expect(result.current).toEqual(expect.objectContaining({ isBibleClient: true }));
@@ -57,13 +43,7 @@ describe('useBibleClient', () => {
 
   it('should throw error when appKey is missing', () => {
     const wrapper = ({ children }: { children: ReactNode }) => (
-      <YouVersionContext.Provider
-        value={{
-          appKey: '',
-        }}
-      >
-        {children}
-      </YouVersionContext.Provider>
+      <YouVersionContext.Provider value={{ appKey: '' }}>{children}</YouVersionContext.Provider>
     );
 
     expect(() => renderHook(() => useBibleClient(), { wrapper })).toThrow(
@@ -72,16 +52,7 @@ describe('useBibleClient', () => {
   });
 
   it('should memoize the BibleClient instance', () => {
-    const wrapper = ({ children }: { children: ReactNode }) => (
-      <YouVersionContext.Provider
-        value={{
-          appKey: mockAppKey,
-        }}
-      >
-        {children}
-      </YouVersionContext.Provider>
-    );
-
+    const wrapper = createYVWrapper();
     const { result, rerender } = renderHook(() => useBibleClient(), { wrapper });
     const firstClient = result.current;
 
@@ -93,7 +64,7 @@ describe('useBibleClient', () => {
   });
 
   it('should create new BibleClient when appKey changes', () => {
-    let currentAppKey = mockAppKey;
+    let currentAppKey = 'test-app-key';
 
     const wrapper = ({ children }: { children: ReactNode }) => (
       <YouVersionContext.Provider
@@ -110,7 +81,7 @@ describe('useBibleClient', () => {
     const firstClient = result.current;
     expect(BibleClient).toHaveBeenCalledTimes(1);
     expect(ApiClient).toHaveBeenCalledWith({
-      appKey: mockAppKey,
+      appKey: 'test-app-key',
     });
 
     currentAppKey = 'new-app-key';