Adjust unit tests

src/__tests__/pinecone.test.ts

@@ -1,5 +1,14 @@
 import { Pinecone } from '../pinecone';
 import type { PineconeConfiguration } from '../data';
+import crossFetch from 'cross-fetch';
+
+jest.mock('cross-fetch', () => {
+  //Mock the default export
+  return {
+    __esModule: true,
+    default: jest.fn(),
+  };
+});
 
 jest.mock('../data/fetch');
 jest.mock('../data/upsert');
@@ -96,7 +105,7 @@ describe('Pinecone', () => {
         const client = new Pinecone();
 
         expect(client.getConfig().projectId).toEqual('test-project');
-        expect(global.fetch).not.toHaveBeenCalled();
+        expect(crossFetch).not.toHaveBeenCalled();
       });
 
       test('config object should take precedence when both config object and environment variables are provided', () => {

src/data/__tests__/projectIdSingleton.test.ts

@@ -1,4 +1,13 @@
 import { ProjectIdSingleton } from '../projectIdSingleton';
+import crossFetch from 'cross-fetch';
+
+jest.mock('cross-fetch', () => {
+  //Mock the default export
+  return {
+    __esModule: true,
+    default: jest.fn(),
+  };
+});
 
 describe('ProjectIdSingleton', () => {
   afterEach(() => {
@@ -7,12 +16,10 @@ describe('ProjectIdSingleton', () => {
 
   test('issues whoami requests for unknown projectId', async () => {
     // @ts-ignore
-    global.fetch = jest.fn(() =>
-      Promise.resolve({
-        status: 200,
-        json: () => Promise.resolve({ project_name: 'abcdef' }),
-      })
-    );
+    crossFetch.mockResolvedValue({
+      status: 200,
+      json: () => Promise.resolve({ project_name: 'abcdef' }),
+    });
 
     const testApiKey = 'api-key-1';
     const testConfig = {
@@ -23,7 +30,7 @@ describe('ProjectIdSingleton', () => {
     const id = await ProjectIdSingleton.getProjectId(testConfig);
 
     expect(id).toEqual('abcdef');
-    expect(global.fetch).toHaveBeenCalledWith(
+    expect(crossFetch).toHaveBeenCalledWith(
       'https://controller.gcp-free.pinecone.io/actions/whoami',
       {
         headers: {
@@ -38,12 +45,10 @@ describe('ProjectIdSingleton', () => {
 
   test('only makes API call once per api key', async () => {
     // @ts-ignore
-    global.fetch = jest.fn(() =>
-      Promise.resolve({
-        status: 200,
-        json: () => Promise.resolve({ project_name: 'xyzxyz' }),
-      })
-    );
+    crossFetch.mockResolvedValue({
+      status: 200,
+      json: () => Promise.resolve({ project_name: 'xyzxyz' }),
+    });
 
     const testApiKey = 'api-key-2';
     const testConfig2 = {
@@ -53,15 +58,15 @@ describe('ProjectIdSingleton', () => {
 
     const id = await ProjectIdSingleton.getProjectId(testConfig2);
     expect(id).toEqual('xyzxyz');
-    expect(global.fetch).toHaveBeenCalledTimes(1);
+    expect(crossFetch).toHaveBeenCalledTimes(1);
 
     const id2 = await ProjectIdSingleton.getProjectId(testConfig2);
     expect(id2).toEqual('xyzxyz');
-    expect(global.fetch).toHaveBeenCalledTimes(1);
+    expect(crossFetch).toHaveBeenCalledTimes(1);
 
     await ProjectIdSingleton.getProjectId(testConfig2);
     await ProjectIdSingleton.getProjectId(testConfig2);
     await ProjectIdSingleton.getProjectId(testConfig2);
-    expect(global.fetch).toHaveBeenCalledTimes(1);
+    expect(crossFetch).toHaveBeenCalledTimes(1);
   });
 });

src/data/__tests__/upsert.test.ts

@@ -7,7 +7,7 @@ import {
   VectorOperationsApi,
   type UpsertOperationRequest,
 } from '../../pinecone-generated-ts-fetch';
-import { VectorOperationsProvider } from '../vectorOperationsProvider';
+import type { VectorOperationsProvider } from '../vectorOperationsProvider';
 
 const setupResponse = (response, isSuccess) => {
   const fakeUpsert: (req: UpsertOperationRequest) => Promise<object> = jest

src/data/upsert.ts

@@ -32,8 +32,8 @@ export class UpsertCommand<T extends RecordMetadata = RecordMetadata> {
       });
       return;
     } catch (e) {
-      // const err = await handleApiError(e);
-      throw e;
+      const err = await handleApiError(e);
+      throw err;
     }
   }
 }

src/data/vectorOperationsProvider.ts

@@ -6,7 +6,6 @@ import {
 } from '../pinecone-generated-ts-fetch';
 import { queryParamsStringify, buildUserAgent } from '../utils';
 import { ProjectIdSingleton } from './projectIdSingleton';
-import { debugLog } from '../utils';
 import fetch from 'cross-fetch';
 
 const basePath = (config: PineconeConfiguration, indexName: string) =>
@@ -46,16 +45,14 @@ export class VectorOperationsProvider {
   }
 
   buildVectorOperationsConfig(config, indexName) {
-    debugLog('Building config that targets ' + basePath(config, indexName));
-
     const indexConfigurationParameters: ConfigurationParameters = {
       basePath: basePath(config, indexName),
       apiKey: config.apiKey,
       queryParamsStringify,
       headers: {
         'User-Agent': buildUserAgent(false),
       },
-      fetchApi: fetch
+      fetchApi: fetch,
     };
 
     const indexConfiguration = new Configuration(indexConfigurationParameters);

src/integration/data/deleteMany.test.ts

@@ -13,7 +13,7 @@ describe('deleteMany', () => {
   beforeAll(async () => {
     pinecone = new Pinecone();
 
-    // await createIndexIfDoesNotExist(pinecone, INDEX_NAME);
+    await createIndexIfDoesNotExist(pinecone, INDEX_NAME);
 
     namespace = randomString(16);
     index = pinecone.index(INDEX_NAME);

src/pinecone.ts

@@ -63,7 +63,7 @@ export class Pinecone {
       headers: {
         'User-Agent': buildUserAgent(false),
       },
-      fetchApi: fetch
+      fetchApi: fetch,
     };
     const api = new IndexOperationsApi(new ApiConfiguration(apiConfig));
 

tsconfig.json

@@ -11,8 +11,9 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "types": ["node", "jest"],
-    "noImplicitAny": false
+    "noImplicitAny": false,
+    "resolveJsonModule": true
   },
   "include": ["src/**/*"],
-  "exclude": ["dist", "src/v0/pinecone-generated-ts-fetch"]
+  "exclude": ["node_modules"]
 }

utils/globalUnitTestSetup.ts

@@ -1,14 +1,7 @@
+import 'cross-fetch/polyfill';
+
 // We want unit tests to fail if they attempt API calls without specifying mock responses
 beforeEach(() => {
   jest.resetModules();
   jest.resetAllMocks();
-
-  // @ts-ignore
-  global.fetch = jest.fn(() =>
-    Promise.resolve({
-      json: () => {
-        throw new Error('Attempted to fetch but no fetch mock was set.');
-      },
-    })
-  );
 });