fix: modify large queries use query more to fetch all needed records

package.json

@@ -6,15 +6,15 @@
   "bugs": "https://github.com/forcedotcom/salesforcedx-apex/issues",
   "main": "lib/src/index.js",
   "dependencies": {
-    "@salesforce/core": "^5.3.18",
+    "@salesforce/core": "^5.3.20",
     "@salesforce/kit": "^3.0.15",
     "@types/istanbul-reports": "^3.0.4",
     "faye": "1.4.0",
     "glob": "^10.3.10",
     "istanbul-lib-coverage": "^3.2.2",
     "istanbul-lib-report": "^3.0.1",
     "istanbul-reports": "^3.1.6",
-    "jsforce": "^2.0.0-beta.28"
+    "jsforce": "^2.0.0-beta.29"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^18.1.0",
@@ -86,4 +86,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}

src/tests/asyncTests.ts

@@ -19,7 +19,6 @@ import {
   ApexTestResult,
   ApexTestResultData,
   ApexTestResultOutcome,
-  ApexTestResultRecord,
   ApexTestRunResult,
   ApexTestRunResultRecord,
   ApexTestRunResultStatus,
@@ -28,7 +27,7 @@ import {
   TestResult,
   TestRunIdResult
 } from './types';
-import { calculatePercentage, isValidTestRunID } from './utils';
+import { calculatePercentage, isValidTestRunID, queryAll } from './utils';
 import * as util from 'util';
 import { QUERY_RECORD_LIMIT } from './constants';
 import { CodeCoverage } from './codeCoverage';
@@ -307,9 +306,7 @@ export class AsyncTests {
     }
 
     const queryPromises = queries.map((query) => {
-      return this.connection.tooling.query<ApexTestResultRecord>(query, {
-        autoFetch: true
-      });
+      return queryAll(this.connection, query, true);
     });
     const apexTestResults = await Promise.all(queryPromises);
     return apexTestResults as ApexTestResult[];

src/tests/codeCoverage.ts

@@ -9,14 +9,12 @@ import { Connection } from '@salesforce/core';
 import {
   ApexCodeCoverage,
   ApexCodeCoverageAggregate,
-  ApexCodeCoverageAggregateRecord,
-  ApexCodeCoverageRecord,
   ApexOrgWideCoverage,
   CodeCoverageResult,
   PerClassCoverage
 } from './types';
 import * as util from 'util';
-import { calculatePercentage } from './utils';
+import { calculatePercentage, queryAll } from './utils';
 import { QUERY_RECORD_LIMIT } from './constants';
 
 export class CodeCoverage {
@@ -176,11 +174,7 @@ export class CodeCoverage {
       // that has takes a type that extends the jsforce Record.
       // ApexCodeCoverageRecord and ApexCodeCoverageAggregateRecord
       // are the Records compatible types defined in this project.
-      return this.connection.tooling.query<
-        ApexCodeCoverageRecord | ApexCodeCoverageAggregateRecord
-      >(query, {
-        autoFetch: true
-      });
+      return queryAll(this.connection, query, true);
     });
 
     // Note here the result of the .all call is of type QueryResult<ApexCodeCoverageAggregateRecord | ApexCodeCoverageRecord>[]

src/tests/utils.ts

@@ -8,6 +8,7 @@
 import { Connection } from '@salesforce/core';
 import { CLASS_ID_PREFIX, TEST_RUN_ID_PREFIX } from './constants';
 import { NamespaceInfo } from './types';
+import { QueryResult } from 'jsforce';
 
 export function isValidTestRunID(testRunId: string): boolean {
   return (
@@ -54,3 +55,24 @@ export async function queryNamespaces(
 
   return [...orgNamespaces, ...installedNamespaces];
 }
+
+export const queryAll = async <T>(
+  connection: Connection,
+  query: string,
+  tooling = false
+): Promise<QueryResult<T>> => {
+  const conn = tooling ? connection.tooling : connection;
+  const allRecords: T[] = [];
+  let result = await conn.query<T>(query);
+  allRecords.push(...result.records);
+  while (!result.done) {
+    result = (await conn.queryMore(result.nextRecordsUrl)) as QueryResult<T>;
+    allRecords.push(...result.records);
+  }
+
+  return {
+    done: true,
+    totalSize: allRecords.length,
+    records: allRecords
+  } as QueryResult<T>;
+};

test/tests/asyncTests.test.ts

@@ -710,10 +710,9 @@ describe('Run Apex tests asynchronously', () => {
     };
 
     it('should split into multiple queries if query is longer than char limit', async () => {
-      const mockToolingQuery = sandboxStub.stub(
-        mockConnection.tooling,
-        'query'
-      );
+      const mockToolingQuery = sandboxStub
+        .stub(mockConnection.tooling, 'query')
+        .resolves({ done: true, totalSize: 1, records: [] });
 
       const asyncTestSrv = new AsyncTests(mockConnection);
       const result = await asyncTestSrv.getAsyncTestResults(testQueueItems);
@@ -723,10 +722,9 @@ describe('Run Apex tests asynchronously', () => {
     });
 
     it('should make a single api call if query is under char limit', async () => {
-      const mockToolingQuery = sandboxStub.stub(
-        mockConnection.tooling,
-        'query'
-      );
+      const mockToolingQuery = sandboxStub
+        .stub(mockConnection.tooling, 'query')
+        .resolves({ done: true, totalSize: 1, records: [] });
 
       const asyncTestSrv = new AsyncTests(mockConnection);
       const result = await asyncTestSrv.getAsyncTestResults(pollResponse);
@@ -747,10 +745,9 @@ describe('Run Apex tests asynchronously', () => {
         records: queueItemRecords
       };
 
-      const mockToolingQuery = sandboxStub.stub(
-        mockConnection.tooling,
-        'query'
-      );
+      const mockToolingQuery = sandboxStub
+        .stub(mockConnection.tooling, 'query')
+        .resolves({ done: true, totalSize: 1, records: [] });
 
       const asyncTestSrv = new AsyncTests(mockConnection);
       const result = await asyncTestSrv.getAsyncTestResults(testQueueItems);
@@ -771,10 +768,9 @@ describe('Run Apex tests asynchronously', () => {
         records: queueItemRecords
       };
 
-      const mockToolingQuery = sandboxStub.stub(
-        mockConnection.tooling,
-        'query'
-      );
+      const mockToolingQuery = sandboxStub
+        .stub(mockConnection.tooling, 'query')
+        .resolves({ done: true, totalSize: 1, records: [] });
 
       const asyncTestSrv = new AsyncTests(mockConnection);
       const result = await asyncTestSrv.getAsyncTestResults(testQueueItems);
@@ -792,10 +788,9 @@ describe('Run Apex tests asynchronously', () => {
         'SELECT Id, QueueItemId, StackTrace, Message, RunTime, TestTimestamp, AsyncApexJobId, MethodName, Outcome, ApexLogId, ApexClass.Id, ApexClass.Name, ApexClass.NamespacePrefix FROM ApexTestResult WHERE QueueItemId IN ';
       const queryStartSeparatorCount = queryStart.split(',').length - 1;
 
-      const mockToolingQuery = sandboxStub.stub(
-        mockConnection.tooling,
-        'query'
-      );
+      const mockToolingQuery = sandboxStub
+        .stub(mockConnection.tooling, 'query')
+        .resolves({ done: true, totalSize: 1, records: [] });
 
       const queueItemRecord: ApexTestQueueItemRecord[] = [];
 

tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es6",
-    "lib": ["es6", "dom"],
+    "target": "ES2020",
+    "lib": ["ES2020", "dom"],
     "sourceMap": true,
     "declaration": true,
     "moduleResolution": "node",