Skip to content

Commit 40f90d6

Browse files
shetzelmshanemc
shetzel
and
mshanemc
authored
fix: bump lib versions (#82)
* fix: bump lib versions * refactor: use fixed jsforce/query(autofetch) Co-authored-by: mshanemc <shane.mclaughlin@salesforce.com>
1 parent 65484e0 commit 40f90d6

File tree

5 files changed

+73
-55
lines changed

5 files changed

+73
-55
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"!lib/**/*.map"
3131
],
3232
"dependencies": {
33-
"@salesforce/cli-plugins-testkit": "^2.2.0",
34-
"@salesforce/core": "^3.20.1",
33+
"@salesforce/cli-plugins-testkit": "^2.3.0",
34+
"@salesforce/core": "^3.21.2",
3535
"@salesforce/kit": "^1.5.42",
36-
"@salesforce/source-deploy-retrieve": "^6.0.2",
36+
"@salesforce/source-deploy-retrieve": "^6.1.0",
3737
"@salesforce/ts-types": "^1.5.20",
3838
"archiver": "^5.2.0",
3939
"chai-each": "^0.0.1",

‎src/assertions.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { debug, Debugger } from 'debug';
1616
import { ApexClass, ApexTestResult, Commands, Context, SourceMember, SourceState, StatusResult } from './types';
1717
import { ExecutionLog } from './executionLog';
1818
import { countFiles, FileTracker } from './fileTracker';
19-
import { autoFetchQuery } from './autoFetchQuery';
2019

2120
use(chaiEach);
2221

@@ -398,7 +397,7 @@ export class Assertions {
398397

399398
private async retrieveSourceMembers(globs: string[], ignore: string[] = []): Promise<SourceMember[]> {
400399
const query = 'SELECT Id,MemberName,MemberType,RevisionCounter FROM SourceMember';
401-
const result = this.connection ? await autoFetchQuery<SourceMember>(query, this.connection, true) : undefined;
400+
const result = await this.connection?.tooling.query<SourceMember>(query, { autoFetch: true, maxFetch: 50_000 });
402401
const all = await this.doGlob(globs);
403402
const ignoreFiles = await this.doGlob(ignore, false);
404403
const toTrack = all.filter((file) => !ignoreFiles.includes(file));
@@ -424,13 +423,13 @@ export class Assertions {
424423

425424
private async retrieveApexTestResults(): Promise<ApexTestResult[]> {
426425
const query = 'SELECT TestTimestamp, ApexClassId FROM ApexTestResult';
427-
const result = this.connection ? await autoFetchQuery<ApexTestResult>(query, this.connection, true) : undefined;
426+
const result = await this.connection?.tooling.query<ApexTestResult>(query, { autoFetch: true, maxFetch: 50_000 });
428427
return result?.records || [];
429428
}
430429

431430
private async retrieveApexClasses(classNames?: string[]): Promise<ApexClass[]> {
432431
const query = 'SELECT Name,Id FROM ApexClass';
433-
const result = this.connection ? await autoFetchQuery<ApexClass>(query, this.connection, true) : undefined;
432+
const result = await this.connection?.tooling.query<ApexClass>(query, { autoFetch: true, maxFetch: 50_000 });
434433
const records = result?.records || [];
435434
return classNames ? records.filter((r) => classNames.includes(r.Name)) : records;
436435
}

‎src/autoFetchQuery.ts‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/executionLog.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
import { ensureString } from '@salesforce/ts-types';
9-
import { autoFetchQuery } from './autoFetchQuery';
109
import { Context, SourceMember } from './types';
1110

1211
/**
@@ -58,9 +57,10 @@ export class ExecutionLog {
5857

5958
private async querySourceMembers(): Promise<SourceMember[]> {
6059
const query = 'SELECT Id,MemberName,MemberType,RevisionCounter FROM SourceMember';
61-
const result = this.context.connection
62-
? await autoFetchQuery<SourceMember>(query, this.context.connection, true)
63-
: undefined;
60+
const result = await this.context.connection?.tooling.query<SourceMember>(query, {
61+
autoFetch: true,
62+
maxFetch: 50_000,
63+
});
6464
return result?.records || [];
6565
}
6666
}

‎yarn.lock‎

Lines changed: 63 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -567,10 +567,10 @@
567567
mv "~2"
568568
safe-json-stringify "~1"
569569

570-
"@salesforce/cli-plugins-testkit@^2.2.0":
571-
version "2.2.0"
572-
resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-2.2.0.tgz#ead6cf3652a595b8b1915be939dc82e6b2a02be9"
573-
integrity sha512-dKPAiElzOirELP2aGHQdkENxKDrEjypJfQUHvbPCKBX1rjDah0utrKSEAbNkTIGzaZrV+TxZhcy/AghtD69EGQ==
570+
"@salesforce/cli-plugins-testkit@^2.3.0":
571+
version "2.3.0"
572+
resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-2.3.0.tgz#fabc0d60e3d63c158405153d45917464da349482"
573+
integrity sha512-96vZC+fpJdcnZGLfj7U1PKKgFxa01+ZcSIxydB5qZFu5XYmWjg3C3ah3nlSlIo7RRcM3qhthmeZWRERLsz04zA==
574574
dependencies:
575575
"@salesforce/core" "^3.20.1"
576576
"@salesforce/kit" "^1.5.42"
@@ -581,7 +581,7 @@
581581
strip-ansi "6.0.1"
582582
ts-retry-promise "^0.6.0"
583583

584-
"@salesforce/core@^3.19.0", "@salesforce/core@^3.20.1":
584+
"@salesforce/core@^3.20.1":
585585
version "3.20.1"
586586
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.20.1.tgz#2f293a84eb793ce549ee42045877b82b9cf5e8d0"
587587
integrity sha512-lOy+qJ9YxwUmvKG9eAvnWJn1yOHvd4G/3vuvUTXugj9G8JTqUyPwKFmWgIS2FSEBWkRIhDQnEIXbgrM6/ytC4A==
@@ -606,6 +606,31 @@
606606
mkdirp "1.0.4"
607607
ts-retry-promise "^0.6.0"
608608

609+
"@salesforce/core@^3.21.1", "@salesforce/core@^3.21.2":
610+
version "3.21.2"
611+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.21.2.tgz#7c01d0307830d8af2ad63970c23264863f280142"
612+
integrity sha512-B8Qe2qeS0RsPg8nzMNA7SB6grgJOEJTVET8gyOfhEsfdYpgKH0XVn8ox+gCAha4bdj2ebiDrba7IeMMx7nl7Mw==
613+
dependencies:
614+
"@salesforce/bunyan" "^2.0.0"
615+
"@salesforce/kit" "^1.5.41"
616+
"@salesforce/schemas" "^1.1.0"
617+
"@salesforce/ts-types" "^1.5.20"
618+
"@types/graceful-fs" "^4.1.5"
619+
"@types/mkdirp" "^1.0.2"
620+
"@types/semver" "^7.3.9"
621+
ajv "^8.11.0"
622+
archiver "^5.3.0"
623+
change-case "^4.1.2"
624+
debug "^3.2.7"
625+
faye "^1.4.0"
626+
form-data "^4.0.0"
627+
graceful-fs "^4.2.9"
628+
js2xmlparser "^4.0.1"
629+
jsforce "2.0.0-beta.11"
630+
jsonwebtoken "8.5.1"
631+
mkdirp "1.0.4"
632+
ts-retry-promise "^0.6.0"
633+
609634
"@salesforce/dev-config@^3.0.0":
610635
version "3.0.1"
611636
resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-3.0.1.tgz#631a952abfd69e7cdb0fb312ba4b1656ae632b90"
@@ -670,17 +695,17 @@
670695
resolved "https://registry.npmjs.org/@salesforce/schemas/-/schemas-1.1.0.tgz#bbf94a11ee036f2b0ec6ba82306cd9565a6ba26b"
671696
integrity sha512-6D7DvE6nFxpLyyTnrOIbbAeCJw2r/EpinFAcMh6gU0gA/CGfSbwV/8uR3uHLYL2zCyCZLH8jJ4dZ3BzCMqc+Eg==
672697

673-
"@salesforce/source-deploy-retrieve@^6.0.2":
674-
version "6.0.2"
675-
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-6.0.2.tgz#7f3441f4ecf1244bf7f2f3487374d8e9324411d1"
676-
integrity sha512-JiJBMkY/ER4GhVymhMuRpguPXxHL1E3MIDM0yw/q1Bc1UBFUj9gGS/I4UvSmQ3ma2S/BrbZnYwfdAzyz8n+56Q==
698+
"@salesforce/source-deploy-retrieve@^6.1.0":
699+
version "6.1.0"
700+
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-6.1.0.tgz#4cea1206b9f179ff217cf283657d3d231610c673"
701+
integrity sha512-r6XRsznFshjbl9luRRHG8da2QtKSGM6dvW8IpFPReA4PzdyLVlkEVp89jLFK5UmnbqKGfA8QPd31Ajh38DlSWg==
677702
dependencies:
678-
"@salesforce/core" "^3.19.0"
703+
"@salesforce/core" "^3.21.1"
679704
"@salesforce/kit" "^1.5.41"
680705
"@salesforce/ts-types" "^1.5.20"
681706
archiver "^5.3.0"
682707
fast-xml-parser "^3.17.4"
683-
got "^11.8.2"
708+
got "^11.8.5"
684709
graceful-fs "^4.2.8"
685710
ignore "^5.1.8"
686711
mime "2.6.0"
@@ -3035,7 +3060,7 @@ globby@^11.0.1, globby@^11.0.3:
30353060
merge2 "^1.4.1"
30363061
slash "^3.0.0"
30373062

3038-
got@^11.8.2:
3063+
got@^11.8.5:
30393064
version "11.8.5"
30403065
resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
30413066
integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
@@ -3648,6 +3673,32 @@ jsforce@2.0.0-beta.10:
36483673
strip-ansi "^6.0.0"
36493674
xml2js "^0.4.22"
36503675

3676+
jsforce@2.0.0-beta.11:
3677+
version "2.0.0-beta.11"
3678+
resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.11.tgz#3bce7a91aee425e72392057bb3fda53b6b2b829f"
3679+
integrity sha512-K/4F7mqMya2mnT16aFvd743MMQCA7MfXR85aKd1V87b2Ol/MDzfxTDwXWC8iXWDjTCT7KkZtcYMnY7ZxqbUOQA==
3680+
dependencies:
3681+
"@babel/runtime" "^7.12.5"
3682+
"@babel/runtime-corejs3" "^7.12.5"
3683+
"@types/node" "^12.19.9"
3684+
abort-controller "^3.0.0"
3685+
base64url "^3.0.1"
3686+
commander "^4.0.1"
3687+
core-js "^3.6.4"
3688+
csv-parse "^4.8.2"
3689+
csv-stringify "^5.3.4"
3690+
faye "^1.4.0"
3691+
form-data "^4.0.0"
3692+
fs-extra "^8.1.0"
3693+
https-proxy-agent "^5.0.0"
3694+
inquirer "^7.0.0"
3695+
multistream "^3.1.0"
3696+
node-fetch "^2.6.1"
3697+
open "^7.0.0"
3698+
regenerator-runtime "^0.13.3"
3699+
strip-ansi "^6.0.0"
3700+
xml2js "^0.4.22"
3701+
36513702
json-buffer@3.0.1, json-buffer@~3.0.1:
36523703
version "3.0.1"
36533704
resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"

0 commit comments

Comments
 (0)