@salesforce/source-testkit 1.1.1 → 1.2.2

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.2.2](https://github.com/salesforcecli/source-testkit/compare/v1.2.1...v1.2.2) (2022-06-18)
+
+### Bug Fixes
+
+- shared autoFetchQuery ([1c23a9f](https://github.com/salesforcecli/source-testkit/commit/1c23a9f84eaaa548558b4deb71ae621497a9e922))
+
+### [1.2.1](https://github.com/salesforcecli/source-testkit/compare/v1.2.0...v1.2.1) (2022-06-18)
+
+### Bug Fixes
+
+- remove autofetch queries that were set to 50k ([5854728](https://github.com/salesforcecli/source-testkit/commit/58547288360792b9ac2af11f4be4959c4828ede5))
+
+## [1.2.0](https://github.com/salesforcecli/source-testkit/compare/v1.1.1...v1.2.0) (2022-06-08)
+
+### Features
+
+- bump core and regular testkit ([59701f8](https://github.com/salesforcecli/source-testkit/commit/59701f8da94028bc39fb34fc0ae2b0b32d582bef))
+
 ### [1.1.1](https://github.com/salesforcecli/source-testkit/compare/v1.1.0...v1.1.1) (2022-06-06)
 
 ### Bug Fixes

package/lib/assertions.js

@@ -15,6 +15,7 @@ const fg = require("fast-glob");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const debug_1 = require("debug");
 const fileTracker_1 = require("./fileTracker");
+const autoFetchQuery_1 = require("./autoFetchQuery");
 (0, chai_1.use)(chaiEach);
 /**
  * Assertions is a class that is designed to encapsulate common assertions we want to
@@ -334,12 +335,8 @@ class Assertions {
         (0, chai_1.expect)(someAreNotUpdated, 'expect some SourceMembers to not be updated').to.be.true;
     }
     async retrieveSourceMembers(globs, ignore = []) {
-        var _a;
         const query = 'SELECT Id,MemberName,MemberType,RevisionCounter FROM SourceMember';
-        const result = await ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.tooling.query(query, {
-            autoFetch: true,
-            maxFetch: 50000,
-        }));
+        const result = this.connection ? await (0, autoFetchQuery_1.autoFetchQuery)(query, this.connection, true) : undefined;
         const all = await this.doGlob(globs);
         const ignoreFiles = await this.doGlob(ignore, false);
         const toTrack = all.filter((file) => !ignoreFiles.includes(file));
@@ -365,15 +362,13 @@ class Assertions {
         });
     }
     async retrieveApexTestResults() {
-        var _a;
         const query = 'SELECT TestTimestamp, ApexClassId FROM ApexTestResult';
-        const result = await ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.tooling.query(query, { autoFetch: true, maxFetch: 50000 }));
+        const result = this.connection ? await (0, autoFetchQuery_1.autoFetchQuery)(query, this.connection, true) : undefined;
         return (result === null || result === void 0 ? void 0 : result.records) || [];
     }
     async retrieveApexClasses(classNames) {
-        var _a;
         const query = 'SELECT Name,Id FROM ApexClass';
-        const result = await ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.tooling.query(query, { autoFetch: true, maxFetch: 50000 }));
+        const result = this.connection ? await (0, autoFetchQuery_1.autoFetchQuery)(query, this.connection, true) : undefined;
         const records = (result === null || result === void 0 ? void 0 : result.records) || [];
         return classNames ? records.filter((r) => classNames.includes(r.Name)) : records;
     }

package/lib/autoFetchQuery.d.ts

@@ -0,0 +1,3 @@
+import { Connection } from '@salesforce/core';
+import { QueryResult } from 'jsforce';
+export declare const autoFetchQuery: <T>(query: string, conn: Connection, useTooling?: boolean, maxFetch?: number) => Promise<QueryResult<T>>;

package/lib/autoFetchQuery.js

@@ -0,0 +1,29 @@
+"use strict";
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoFetchQuery = void 0;
+const autoFetchQuery = async (query, conn, useTooling = false, maxFetch = 50000) => {
+    return new Promise((resolve, reject) => {
+        const records = [];
+        const res = (useTooling ? conn.tooling : conn)
+            .query(query)
+            .on('record', (rec) => records.push(rec))
+            .on('error', (err) => reject(err))
+            .on('end', () => {
+            var _a;
+            resolve({
+                done: true,
+                totalSize: (_a = res.totalSize) !== null && _a !== void 0 ? _a : 0,
+                records,
+            });
+        })
+            .run({ autoFetch: true, maxFetch });
+    });
+};
+exports.autoFetchQuery = autoFetchQuery;
+//# sourceMappingURL=autoFetchQuery.js.map

package/lib/executionLog.js

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionLog = void 0;
 const ts_types_1 = require("@salesforce/ts-types");
+const autoFetchQuery_1 = require("./autoFetchQuery");
 /**
  * This class maintains a map of command execution history.
  *
@@ -49,12 +50,10 @@ class ExecutionLog {
         return sorted[0];
     }
     async querySourceMembers() {
-        var _a;
         const query = 'SELECT Id,MemberName,MemberType,RevisionCounter FROM SourceMember';
-        const result = await ((_a = this.context.connection) === null || _a === void 0 ? void 0 : _a.tooling.query(query, {
-            autoFetch: true,
-            maxFetch: 50000,
-        }));
+        const result = this.context.connection
+            ? await (0, autoFetchQuery_1.autoFetchQuery)(query, this.context.connection, true)
+            : undefined;
         return (result === null || result === void 0 ? void 0 : result.records) || [];
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/source-testkit",
   "description": "testkit for running NUTs for source related commands",
-  "version": "1.1.1",
+  "version": "1.2.2",
   "author": "Salesforce",
   "license": "BSD-3-Clause",
   "main": "lib/index.js",
@@ -30,8 +30,8 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@salesforce/cli-plugins-testkit": "^2.1.4",
-    "@salesforce/core": "^3.19.4",
+    "@salesforce/cli-plugins-testkit": "^2.2.0",
+    "@salesforce/core": "^3.20.1",
     "@salesforce/kit": "^1.5.42",
     "@salesforce/source-deploy-retrieve": "^6.0.2",
     "@salesforce/ts-types": "^1.5.20",