@salesforce/core 4.0.0 → 4.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (151) hide show
  1. package/LICENSE.txt +1 -1
  2. package/README.md +93 -44
  3. package/lib/config/authInfoConfig.d.ts +19 -0
  4. package/lib/config/authInfoConfig.js +35 -0
  5. package/lib/config/config.d.ts +87 -22
  6. package/lib/config/config.js +117 -65
  7. package/lib/config/configAggregator.d.ts +41 -35
  8. package/lib/config/configAggregator.js +102 -73
  9. package/lib/config/configFile.d.ts +2 -2
  10. package/lib/config/configFile.js +38 -29
  11. package/lib/config/configStore.d.ts +9 -9
  12. package/lib/config/configStore.js +17 -15
  13. package/lib/config/envVars.d.ts +15 -9
  14. package/lib/config/envVars.js +71 -47
  15. package/lib/config/orgUsersConfig.js +2 -0
  16. package/lib/config/sandboxOrgConfig.js +2 -0
  17. package/lib/config/sandboxProcessCache.d.ts +16 -0
  18. package/lib/config/sandboxProcessCache.js +38 -0
  19. package/lib/config/tokensConfig.d.ts +10 -0
  20. package/lib/config/tokensConfig.js +29 -0
  21. package/lib/config/ttlConfig.d.ts +34 -0
  22. package/lib/config/ttlConfig.js +50 -0
  23. package/lib/crypto/crypto.js +15 -22
  24. package/lib/crypto/keyChain.js +2 -3
  25. package/lib/crypto/keyChainImpl.d.ts +5 -3
  26. package/lib/crypto/keyChainImpl.js +58 -61
  27. package/lib/crypto/secureBuffer.d.ts +1 -1
  28. package/lib/deviceOauthService.d.ts +3 -3
  29. package/lib/deviceOauthService.js +27 -25
  30. package/lib/exported.d.ts +15 -12
  31. package/lib/exported.js +28 -16
  32. package/lib/global.d.ts +11 -3
  33. package/lib/global.js +39 -12
  34. package/lib/lifecycleEvents.d.ts +1 -1
  35. package/lib/lifecycleEvents.js +3 -0
  36. package/lib/logger.d.ts +19 -9
  37. package/lib/logger.js +112 -86
  38. package/lib/messages.d.ts +53 -36
  39. package/lib/messages.js +81 -91
  40. package/lib/org/authInfo.d.ts +56 -20
  41. package/lib/org/authInfo.js +232 -131
  42. package/lib/org/authRemover.d.ts +8 -7
  43. package/lib/org/authRemover.js +32 -28
  44. package/lib/org/connection.d.ts +13 -37
  45. package/lib/org/connection.js +78 -124
  46. package/lib/org/index.js +5 -1
  47. package/lib/org/org.d.ts +151 -48
  48. package/lib/org/org.js +468 -225
  49. package/lib/org/orgConfigProperties.d.ts +64 -3
  50. package/lib/org/orgConfigProperties.js +96 -4
  51. package/lib/org/permissionSetAssignment.js +4 -13
  52. package/lib/org/scratchOrgCache.d.ts +20 -0
  53. package/lib/org/scratchOrgCache.js +33 -0
  54. package/lib/org/scratchOrgCreate.d.ts +28 -17
  55. package/lib/org/scratchOrgCreate.js +125 -53
  56. package/lib/org/scratchOrgErrorCodes.d.ts +9 -3
  57. package/lib/org/scratchOrgErrorCodes.js +34 -17
  58. package/lib/org/scratchOrgFeatureDeprecation.js +1 -6
  59. package/lib/org/scratchOrgInfoApi.d.ts +21 -47
  60. package/lib/org/scratchOrgInfoApi.js +129 -63
  61. package/lib/org/scratchOrgInfoGenerator.d.ts +6 -5
  62. package/lib/org/scratchOrgInfoGenerator.js +76 -62
  63. package/lib/org/scratchOrgLifecycleEvents.d.ts +10 -0
  64. package/lib/org/scratchOrgLifecycleEvents.js +41 -0
  65. package/lib/org/scratchOrgSettingsGenerator.d.ts +44 -21
  66. package/lib/org/scratchOrgSettingsGenerator.js +165 -98
  67. package/lib/org/scratchOrgTypes.d.ts +43 -0
  68. package/lib/org/scratchOrgTypes.js +9 -0
  69. package/lib/org/user.d.ts +1 -1
  70. package/lib/org/user.js +25 -34
  71. package/lib/schema/printer.d.ts +6 -0
  72. package/lib/schema/printer.js +34 -31
  73. package/lib/schema/validator.d.ts +12 -10
  74. package/lib/schema/validator.js +56 -76
  75. package/lib/{sfdxError.d.ts → sfError.d.ts} +12 -20
  76. package/lib/{sfdxError.js → sfError.js} +40 -30
  77. package/lib/{sfdxProject.d.ts → sfProject.d.ts} +75 -35
  78. package/lib/sfProject.js +651 -0
  79. package/lib/stateAggregator/accessors/aliasAccessor.d.ts +129 -0
  80. package/lib/stateAggregator/accessors/aliasAccessor.js +263 -0
  81. package/lib/stateAggregator/accessors/orgAccessor.d.ts +101 -0
  82. package/lib/stateAggregator/accessors/orgAccessor.js +240 -0
  83. package/lib/stateAggregator/accessors/sandboxAccessor.d.ts +8 -0
  84. package/lib/stateAggregator/accessors/sandboxAccessor.js +28 -0
  85. package/lib/stateAggregator/accessors/tokenAccessor.d.ts +63 -0
  86. package/lib/stateAggregator/accessors/tokenAccessor.js +80 -0
  87. package/lib/stateAggregator/index.d.ts +4 -0
  88. package/lib/stateAggregator/index.js +27 -0
  89. package/lib/stateAggregator/stateAggregator.d.ts +25 -0
  90. package/lib/stateAggregator/stateAggregator.js +46 -0
  91. package/lib/status/myDomainResolver.d.ts +1 -1
  92. package/lib/status/myDomainResolver.js +4 -4
  93. package/lib/status/pollingClient.js +4 -4
  94. package/lib/status/streamingClient.d.ts +2 -2
  95. package/lib/status/streamingClient.js +58 -63
  96. package/lib/status/types.d.ts +2 -2
  97. package/lib/testSetup.d.ts +204 -75
  98. package/lib/testSetup.js +468 -164
  99. package/lib/util/cache.d.ts +2 -2
  100. package/lib/util/cache.js +6 -6
  101. package/lib/util/checkLightningDomain.js +3 -4
  102. package/lib/util/directoryWriter.d.ts +12 -0
  103. package/lib/util/directoryWriter.js +54 -0
  104. package/lib/util/getJwtAudienceUrl.js +1 -1
  105. package/lib/util/internal.d.ts +28 -2
  106. package/lib/util/internal.js +65 -8
  107. package/lib/util/jsonXmlTools.js +2 -4
  108. package/lib/util/mapKeys.d.ts +9 -9
  109. package/lib/util/mapKeys.js +13 -9
  110. package/lib/util/sfdc.d.ts +51 -51
  111. package/lib/util/sfdc.js +74 -79
  112. package/lib/util/sfdcUrl.d.ts +5 -19
  113. package/lib/util/sfdcUrl.js +40 -49
  114. package/lib/util/structuredWriter.d.ts +9 -0
  115. package/lib/util/structuredWriter.js +3 -0
  116. package/lib/util/zipWriter.d.ts +8 -6
  117. package/lib/util/zipWriter.js +13 -13
  118. package/lib/webOAuthServer.d.ts +20 -6
  119. package/lib/webOAuthServer.js +102 -56
  120. package/messageTransformer/messageTransformer.ts +93 -0
  121. package/messages/auth.md +9 -1
  122. package/messages/config.md +42 -6
  123. package/messages/connection.md +8 -0
  124. package/messages/core.md +10 -0
  125. package/messages/envVars.md +37 -3
  126. package/messages/org.md +21 -1
  127. package/messages/scratchOrgCreate.md +2 -6
  128. package/messages/scratchOrgErrorCodes.md +17 -1
  129. package/messages/scratchOrgInfoApi.md +9 -0
  130. package/messages/scratchOrgInfoGenerator.md +9 -1
  131. package/package.json +123 -46
  132. package/CHANGELOG.md +0 -1244
  133. package/lib/config/keychainConfig.d.ts +0 -19
  134. package/lib/config/keychainConfig.js +0 -43
  135. package/lib/globalInfo/accessors/aliasAccessor.d.ts +0 -83
  136. package/lib/globalInfo/accessors/aliasAccessor.js +0 -130
  137. package/lib/globalInfo/accessors/orgAccessor.d.ts +0 -13
  138. package/lib/globalInfo/accessors/orgAccessor.js +0 -45
  139. package/lib/globalInfo/accessors/tokenAccessor.d.ts +0 -13
  140. package/lib/globalInfo/accessors/tokenAccessor.js +0 -35
  141. package/lib/globalInfo/globalInfoConfig.d.ts +0 -36
  142. package/lib/globalInfo/globalInfoConfig.js +0 -105
  143. package/lib/globalInfo/index.d.ts +0 -6
  144. package/lib/globalInfo/index.js +0 -29
  145. package/lib/globalInfo/sfdxDataHandler.d.ts +0 -43
  146. package/lib/globalInfo/sfdxDataHandler.js +0 -217
  147. package/lib/globalInfo/types.d.ts +0 -39
  148. package/lib/globalInfo/types.js +0 -10
  149. package/lib/sfdxProject.js +0 -557
  150. package/lib/util/fs.d.ts +0 -201
  151. package/lib/util/fs.js +0 -378
package/lib/org/authRemover.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { AsyncOptionalCreatable } from '@salesforce/kit';
2
- import { SfOrg, SfOrgs } from '../globalInfo';
2
+ import { JsonMap } from '@salesforce/ts-types';
3
+ import { AuthFields } from '.';
3
4
  /**
4
5
  * Handles the removing of authorizations, which includes deleting the auth file
5
6
  * in the global .sfdx folder, deleting any configs that are associated with the username/alias,
@@ -25,7 +26,7 @@ import { SfOrg, SfOrgs } from '../globalInfo';
25
26
  */
26
27
  export declare class AuthRemover extends AsyncOptionalCreatable {
27
28
  private config;
28
- private globalInfo;
29
+ private stateAggregator;
29
30
  private logger;
30
31
  /**
31
32
  * Removes the authentication and any configs or aliases associated with it
@@ -39,19 +40,19 @@ export declare class AuthRemover extends AsyncOptionalCreatable {
39
40
  removeAllAuths(): Promise<void>;
40
41
  /**
41
42
  * Finds authorization files for username/alias in the global .sfdx folder
42
- * **Throws** *{@link SfdxError}{ name: 'TargetOrgNotSetError' }* if no target-org
43
- * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
43
+ * **Throws** *{@link SfError}{ name: 'TargetOrgNotSetError' }* if no target-org
44
+ * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
44
45
  *
45
46
  * @param usernameOrAlias username or alias of the auth you want to find, defaults to the configured target-org
46
47
  * @returns {Promise<SfOrg>}
47
48
  */
48
- findAuth(usernameOrAlias?: string): Promise<SfOrg>;
49
+ findAuth(usernameOrAlias?: string): Promise<AuthFields>;
49
50
  /**
50
51
  * Finds all org authorizations in the global info file (.sf/sf.json)
51
52
  *
52
- * @returns {SfOrgs}
53
+ * @returns {Record<string, AuthFields>}
53
54
  */
54
- findAllAuths(): SfOrgs;
55
+ findAllAuths(): Record<string, AuthFields & JsonMap>;
55
56
  protected init(): Promise<void>;
56
57
  /**
57
58
  * Returns the username for a given alias if the alias exists.
package/lib/org/authRemover.js CHANGED
@@ -11,11 +11,9 @@ const kit_1 = require("@salesforce/kit");
11
11
  const configAggregator_1 = require("../config/configAggregator");
12
12
  const logger_1 = require("../logger");
13
13
  const messages_1 = require("../messages");
14
- const globalInfo_1 = require("../globalInfo");
14
+ const stateAggregator_1 = require("../stateAggregator");
15
15
  const orgConfigProperties_1 = require("./orgConfigProperties");
16
- messages_1.Messages.importMessagesDirectory(__dirname);
17
- const coreMessages = messages_1.Messages.load('@salesforce/core', 'core', ['namedOrgNotFound']);
18
- const messages = messages_1.Messages.load('@salesforce/core', 'auth', ['targetOrgNotSet']);
16
+ const messages = new messages_1.Messages('@salesforce/core', 'auth', new Map([["targetOrgNotSet", "A default user is not set."], ["targetOrgNotSet.actions", ["Run the \"sfdx auth\" commands with --setdefaultusername to connect to an org and set it as your default org.", "Run \"force:org:create\" with --setdefaultusername to create a scratch org and set it as your default org.", "Run \"sfdx config:set defaultusername=<username>\" to set your default username."]], ["portInUse", "Cannot start the OAuth redirect server on port %s."], ["portInUse.actions", ["Kill the process running on port %s or use a custom connected app and update OauthLocalPort in the sfdx-project.json file."]], ["invalidRequestMethod", "Invalid request method: %s"], ["invalidRequestUri", "Invalid request uri: %s"], ["pollingTimeout", "The device authorization request timed out. After executing force:auth:device:login, you must approve access to the device within 10 minutes. This can happen if the URL wasn\u2019t copied into the browser, login was not attempted, or the 2FA process was not completed within 10 minutes. Request authorization again."], ["serverErrorHTMLResponse", "<html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 370px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 370px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id=\"center\"><div id=\"logo-container\"><img id=\"logo\" aria-hidden=\"true\" name=\"logo\" alt=\"Salesforce\" src=\"data:image/svg+xml;base64,%s\"></div><div id=\"header\">%s</div><div id=\"message\">%s<br/><br/>This is most likely <b>not</b> an error with the Salesforce CLI. Please ensure all information is accurate and try again.</div><div id=\"footer\">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>"], ["missingAuthCode", "No authentication code found on login response."], ["serverSuccessHTMLResponse", "<html><head><style>body {background-color:#F4F6F9; font-family: Arial, sans-serif; font-size: 0.8125rem; line-height: 1.5rem; color: #16325c;} #center {margin: auto; width: 300px; padding: 100px 0px 20px;} #logo-container {margin-left: auto; margin-right: auto; text-align: center;} #logo {max-width: 180px; max-height: 113px; margin-bottom: 2rem; border: 0;} #header {font-size: 1.5rem; text-align: center; margin-bottom: 1rem;} #message {background-color: #FFFFFF; margin: 0px auto; padding: 1.25rem; border-radius: 0.25rem; border: 1px solid #D8DDE6;} #footer {height: 24px; width: 300px; text-align: center; font-size: .75rem; position: absolute; bottom: 10;}</style></head><body><div id=\"center\"><div id=\"logo-container\"><img id=\"logo\" aria-hidden=\"true\" name=\"logo\" alt=\"Salesforce\" src=\"data:image/svg+xml;base64,%s\"></div><div id=\"header\">Authentication Successful</div><div id=\"message\">You've successfully logged in. You can now close this browser tab or window.</div><div id=\"footer\">&copy; %s Salesforce, Inc. All rights reserved.</div></div></body></html>"], ["serverSfdcImage", "<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 262 184" style="enable-background:new 0 0 262 184;" xml:space="preserve">
<style type="text/css">
	.st0{fill:#00A1E0;}
	.st1{fill:#FFFFFF;}
</style>
<title>logo-salesforce</title>
<desc>Created with Sketch.</desc>
<g id="Test-B">
	<g id="Mobile-Nav---Test-B-_x28_0_x29_">
		<g id="Group">
			<g id="logo-salesforce">
				<path id="Fill-1" class="st0" d="M109.2,20.9c8.4-8.7,20.1-14.2,33-14.2c17.2,0,32.1,9.6,40.1,23.8c6.9-3.1,14.6-4.8,22.7-4.8
					c31,0,56,25.3,56,56.5s-25.1,56.5-56,56.5c-3.8,0-7.5-0.4-11-1.1c-7,12.5-20.4,21-35.8,21c-6.4,0-12.5-1.5-17.9-4.1
					c-7.1,16.7-23.7,28.5-43,28.5c-20.1,0-37.3-12.7-43.9-30.6c-2.9,0.6-5.9,0.9-8.9,0.9c-24,0-43.4-19.6-43.4-43.9
					c0-16.2,8.7-30.4,21.7-38c-2.7-6.1-4.2-12.9-4.2-20.1C18.5,23.6,41.2,1,69,1C85.4,1,100,8.8,109.2,20.9"/>
				<path id="Combined-Shape" class="st1" d="M38.7,95.4l1.1-2.9c0.2-0.5,0.5-0.3,0.7-0.2c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2
					c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0
					c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7
					c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4
					c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9C38.7,95.9,38.5,95.8,38.7,95.4z M116.7,95.4l1.1-2.9c0.2-0.5,0.6-0.3,0.7-0.2
					c0.3,0.2,0.5,0.3,0.9,0.6c3.1,2,6,2,6.9,2c2.3,0,3.8-1.2,3.8-2.9v-0.1c0-1.8-2.2-2.5-4.8-3.3l-0.6-0.2c-3.5-1-7.3-2.5-7.3-6.9
					v-0.1c0-4.2,3.4-7.2,8.3-7.2l0.5,0c2.9,0,5.6,0.8,7.6,2.1c0.2,0.1,0.4,0.3,0.3,0.6c-0.1,0.3-1,2.6-1.1,2.9
					c-0.2,0.5-0.7,0.2-0.7,0.2c-1.8-1-4.5-1.7-6.8-1.7c-2.1,0-3.4,1.1-3.4,2.6v0.1c0,1.7,2.3,2.5,4.9,3.3l0.5,0.1
					c3.5,1.1,7.2,2.6,7.2,6.9v0.1c0,4.6-3.3,7.4-8.6,7.4c-2.6,0-5.1-0.4-7.8-1.8c-0.5-0.3-1-0.5-1.5-0.9
					C116.8,95.9,116.6,95.8,116.7,95.4z M174.5,81.7c0.4,1.5,0.7,3.1,0.7,4.8s-0.2,3.3-0.7,4.8c-0.4,1.5-1.1,2.8-2,3.9
					c-0.9,1.1-2.1,2-3.4,2.6c-1.4,0.6-3,0.9-4.8,0.9c-1.8,0-3.4-0.3-4.8-0.9c-1.4-0.6-2.5-1.5-3.4-2.6c-0.9-1.1-1.6-2.4-2-3.9
					c-0.4-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.4-2.6c1.4-0.6,3-1,4.8-1
					c1.8,0,3.4,0.3,4.8,1c1.4,0.6,2.5,1.5,3.4,2.6C173.4,78.9,174.1,80.2,174.5,81.7z M170,86.4c0-2.6-0.5-4.6-1.4-6
					c-0.9-1.4-2.4-2.1-4.3-2.1c-2,0-3.4,0.7-4.3,2.1c-0.9,1.4-1.4,3.4-1.4,6c0,2.6,0.5,4.6,1.4,6.1c0.9,1.4,2.3,2.1,4.3,2.1
					c2,0,3.4-0.7,4.3-2.1C169.6,91.1,170,89,170,86.4z M211.1,93.9l1.1,3c0.1,0.4-0.2,0.5-0.2,0.5c-1.7,0.7-4,1.1-6.3,1.1
					c-3.9,0-6.8-1.1-8.8-3.3c-2-2.2-3-5.2-3-8.9c0-1.7,0.2-3.3,0.7-4.8c0.5-1.5,1.2-2.8,2.2-3.9c1-1.1,2.2-2,3.6-2.6
					c1.4-0.6,3.1-1,5-1c1.3,0,2.4,0.1,3.3,0.2c1,0.2,2.4,0.5,3,0.8c0.1,0,0.4,0.2,0.3,0.5c-0.4,1.2-0.7,2-1.1,3
					c-0.2,0.5-0.5,0.3-0.5,0.3c-1.5-0.5-2.9-0.7-4.7-0.7c-2.2,0-3.9,0.7-4.9,2.2c-1.1,1.4-1.7,3.3-1.7,5.9c0,2.8,0.7,4.8,1.9,6.1
					c1.2,1.3,2.9,1.9,5.1,1.9c0.9,0,1.7-0.1,2.4-0.2c0.7-0.1,1.4-0.3,2.1-0.6C210.5,93.6,210.9,93.5,211.1,93.9z M233.8,80.8
					c1,3.4,0.5,6.3,0.4,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C232.5,77.9,233.4,79.4,233.8,80.8z M218.8,84h10.7
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C219.4,81.3,219.1,82.5,218.8,84z M113.1,80.8
					c1,3.4,0.5,6.3,0.5,6.5c0,0.4-0.4,0.4-0.4,0.4l-15.1,0c0.1,2.3,0.6,3.9,1.8,5c1.1,1.1,2.8,1.8,5.2,1.8c3.6,0,5.1-0.7,6.2-1.1
					c0,0,0.4-0.1,0.6,0.3l1,2.8c0.2,0.5,0,0.6-0.1,0.7c-0.9,0.5-3.2,1.5-7.6,1.5c-2.1,0-4-0.3-5.5-0.9c-1.5-0.6-2.8-1.4-3.8-2.5
					c-1-1.1-1.7-2.4-2.2-3.8c-0.5-1.5-0.7-3.1-0.7-4.8c0-1.7,0.2-3.3,0.7-4.8c0.4-1.5,1.1-2.8,2-3.9c0.9-1.1,2.1-2,3.5-2.6
					c1.4-0.7,3.1-1,5-1c1.6,0,3.1,0.3,4.3,0.9c0.9,0.4,1.9,1.1,2.9,2.2C111.8,77.9,112.8,79.4,113.1,80.8z M98.1,84h10.8
					c-0.1-1.4-0.4-2.6-1-3.6c-0.9-1.4-2.2-2.2-4.2-2.2c-2,0-3.4,0.8-4.3,2.2C98.7,81.3,98.4,82.5,98.1,84z M71.6,83.2
					c0,0,1.2,0.1,2.5,0.3v-0.6c0-2-0.4-3-1.2-3.6c-0.8-0.6-2.1-1-3.7-1c0,0-3.7,0-6.6,1.5c-0.1,0.1-0.2,0.1-0.2,0.1
					s-0.4,0.1-0.5-0.2l-1.1-2.9c-0.2-0.4,0.1-0.6,0.1-0.6c1.4-1.1,4.6-1.7,4.6-1.7c1.1-0.2,2.9-0.4,4-0.4c3,0,5.3,0.7,6.9,2.1
					c1.6,1.4,2.4,3.6,2.4,6.7l0,13.8c0,0,0,0.4-0.3,0.5c0,0-0.6,0.2-1.1,0.3c-0.5,0.1-2.3,0.5-3.8,0.7c-1.5,0.3-3,0.4-4.6,0.4
					c-1.5,0-2.8-0.1-4-0.4c-1.2-0.3-2.2-0.7-3.1-1.3c-0.8-0.6-1.5-1.4-2-2.4c-0.5-0.9-0.7-2.1-0.7-3.4c0-1.3,0.3-2.5,0.8-3.5
					c0.5-1,1.3-1.8,2.2-2.5c0.9-0.7,2-1.1,3.1-1.5c1.2-0.3,2.4-0.5,3.7-0.5C70.2,83.2,71,83.2,71.6,83.2z M65.6,93.8
					c0,0,1.4,1.1,4.4,0.9c2.2-0.1,4.1-0.5,4.1-0.5v-6.9c0,0-1.9-0.3-4.1-0.3c-3.1,0-4.4,1.1-4.4,1.1c-0.9,0.6-1.3,1.6-1.3,2.9
					c0,0.8,0.2,1.5,0.5,2C64.9,93.2,65,93.4,65.6,93.8z M193.1,75.5c-0.1,0.4-0.9,2.5-1.1,3.2c-0.1,0.3-0.3,0.4-0.6,0.4
					c0,0-0.9-0.2-1.7-0.2c-0.5,0-1.3,0.1-2,0.3c-0.7,0.2-1.3,0.6-1.9,1.1c-0.6,0.5-1,1.3-1.3,2.2c-0.3,0.9-0.5,2.4-0.5,4v11.2
					c0,0.3-0.2,0.5-0.5,0.5h-4c-0.3,0-0.5-0.2-0.5-0.5V75.2c0-0.3,0.2-0.5,0.4-0.5h3.9c0.3,0,0.4,0.2,0.4,0.5V77
					c0.6-0.8,1.6-1.5,2.5-1.9c0.9-0.4,2-0.7,3.9-0.6c1,0.1,2.3,0.3,2.5,0.4C193,75,193.2,75.1,193.1,75.5z M156,65.1
					c0.1,0,0.4,0.2,0.3,0.5l-1.2,3.2c-0.1,0.2-0.2,0.4-0.7,0.2c-0.1,0-0.3-0.1-0.8-0.2c-0.3-0.1-0.8-0.1-1.2-0.1
					c-0.6,0-1.1,0.1-1.6,0.2c-0.5,0.1-0.9,0.4-1.3,0.8c-0.4,0.4-0.8,0.9-1.1,1.6c-0.6,1.6-0.8,3.3-0.8,3.4h4.8
					c0.4,0,0.5,0.2,0.5,0.5l-0.6,3.1c-0.1,0.5-0.5,0.4-0.5,0.4h-5L143.6,98c-0.4,2-0.8,3.7-1.3,5.1c-0.5,1.4-1.1,2.4-2,3.4
					c-0.8,0.9-1.7,1.6-2.8,1.9c-1,0.4-2.3,0.6-3.7,0.6c-0.7,0-1.4,0-2.2-0.2c-0.6-0.1-0.9-0.2-1.4-0.4c-0.2-0.1-0.3-0.3-0.2-0.6
					c0.1-0.3,1-2.7,1.1-3.1c0.2-0.4,0.5-0.2,0.5-0.2c0.3,0.1,0.5,0.2,0.8,0.3c0.4,0.1,0.8,0.1,1.2,0.1c0.7,0,1.3-0.1,1.8-0.3
					c0.6-0.2,1-0.6,1.4-1.1c0.4-0.5,0.7-1.2,1.1-2.1c0.3-0.9,0.6-2.2,0.9-3.7l3.4-18.9h-3.3c-0.4,0-0.5-0.2-0.5-0.5l0.6-3.1
					c0.1-0.5,0.5-0.4,0.5-0.4h3.4l0.2-1c0.5-3,1.5-5.3,3-6.8c1.5-1.5,3.7-2.3,6.4-2.3c0.8,0,1.5,0.1,2.1,0.2
					C155,64.8,155.5,64.9,156,65.1z M88.6,97.6c0,0.3-0.2,0.5-0.4,0.5h-4c-0.3,0-0.4-0.2-0.4-0.5V65.5c0-0.2,0.2-0.5,0.4-0.5h4
					c0.3,0,0.4,0.2,0.4,0.5V97.6z"/>
			</g>
		</g>
	</g>
</g>
</svg>
"]]));
19
17
  /**
20
18
  * Handles the removing of authorizations, which includes deleting the auth file
21
19
  * in the global .sfdx folder, deleting any configs that are associated with the username/alias,
@@ -50,9 +48,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
50
48
  this.logger.debug(`Removing authorization for user ${username}`);
51
49
  await this.unsetConfigValues(username);
52
50
  await this.unsetAliases(username);
53
- this.unsetTokens(username);
54
- this.globalInfo.orgs.unset(username);
55
- await this.globalInfo.write();
51
+ await this.unsetTokens(username);
52
+ await this.stateAggregator.orgs.remove(username);
56
53
  }
57
54
  /**
58
55
  * Removes all authentication files and any configs or aliases associated with them
@@ -61,37 +58,39 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
61
58
  const auths = this.findAllAuths();
62
59
  const usernames = Object.keys(auths);
63
60
  for (const username of usernames) {
61
+ // prevent ConfigFile collision bug
62
+ // eslint-disable-next-line no-await-in-loop
64
63
  await this.removeAuth(username);
65
64
  }
66
65
  }
67
66
  /**
68
67
  * Finds authorization files for username/alias in the global .sfdx folder
69
- * **Throws** *{@link SfdxError}{ name: 'TargetOrgNotSetError' }* if no target-org
70
- * **Throws** *{@link SfdxError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
68
+ * **Throws** *{@link SfError}{ name: 'TargetOrgNotSetError' }* if no target-org
69
+ * **Throws** *{@link SfError}{ name: 'NamedOrgNotFoundError' }* if specified user is not found
71
70
  *
72
71
  * @param usernameOrAlias username or alias of the auth you want to find, defaults to the configured target-org
73
72
  * @returns {Promise<SfOrg>}
74
73
  */
75
74
  async findAuth(usernameOrAlias) {
76
- const username = usernameOrAlias ? await this.resolveUsername(usernameOrAlias) : this.getTargetOrg();
77
- const auth = this.globalInfo.orgs.get(username);
78
- if (!auth) {
79
- throw coreMessages.createError('namedOrgNotFound');
80
- }
81
- return auth;
75
+ const username = await this.resolveUsername(usernameOrAlias ?? this.getTargetOrg());
76
+ return this.stateAggregator.orgs.get(username, false, true);
82
77
  }
83
78
  /**
84
79
  * Finds all org authorizations in the global info file (.sf/sf.json)
85
80
  *
86
- * @returns {SfOrgs}
81
+ * @returns {Record<string, AuthFields>}
87
82
  */
88
83
  findAllAuths() {
89
- return this.globalInfo.orgs.getAll();
84
+ const orgs = this.stateAggregator.orgs.getAll();
85
+ return orgs.reduce((x, y) =>
86
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
87
+ ({ ...x, [y.username]: y }), {});
90
88
  }
91
89
  async init() {
92
90
  this.logger = await logger_1.Logger.child(this.constructor.name);
93
91
  this.config = await configAggregator_1.ConfigAggregator.create();
94
- this.globalInfo = await globalInfo_1.GlobalInfo.getInstance();
92
+ this.stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
93
+ await this.stateAggregator.orgs.readAll();
95
94
  }
96
95
  /**
97
96
  * Returns the username for a given alias if the alias exists.
@@ -99,8 +98,9 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
99
98
  * @param usernameOrAlias username or alias
100
99
  * @returns {Promise<string>}
101
100
  */
101
+ // eslint-disable-next-line @typescript-eslint/require-await
102
102
  async resolveUsername(usernameOrAlias) {
103
- return this.globalInfo.aliases.resolveUsername(usernameOrAlias);
103
+ return this.stateAggregator.aliases.resolveUsername(usernameOrAlias);
104
104
  }
105
105
  /**
106
106
  * @returns {string}
@@ -119,7 +119,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
119
119
  * @returns {Promise<string[]>}
120
120
  */
121
121
  getAliases(username) {
122
- return this.globalInfo.aliases.getAll(username);
122
+ return this.stateAggregator.aliases.getAll(username);
123
123
  }
124
124
  /**
125
125
  * Unsets any configured values (both global and local) for provided username
@@ -128,7 +128,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
128
128
  */
129
129
  async unsetConfigValues(username) {
130
130
  const aliases = this.getAliases(username);
131
- this.logger.debug(`Clearing config keys for username ${username} and aliases: ${aliases}`);
131
+ this.logger.debug(`Clearing config keys for username ${username} and aliases: ${aliases.join(',')}`);
132
132
  const configs = [this.config.getGlobalConfig(), this.config.getLocalConfig()];
133
133
  for (const config of configs) {
134
134
  if (config) {
@@ -138,7 +138,7 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
138
138
  .filter((k) => !!k)
139
139
  .reduce((x, y) => x.concat(y), []);
140
140
  const allKeys = keysWithUsername.concat(keysWithAlias);
141
- this.logger.debug(`Found these config keys to remove: ${allKeys}`);
141
+ this.logger.debug(`Found these config keys to remove: ${allKeys.join(',')}`);
142
142
  allKeys.forEach((key) => {
143
143
  try {
144
144
  config.unset(key);
@@ -147,6 +147,8 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
147
147
  this.logger.debug(`Failed to remove ${key}`);
148
148
  }
149
149
  });
150
+ // prevent ConfigFile collision bug
151
+ // eslint-disable-next-line no-await-in-loop
150
152
  await config.write();
151
153
  }
152
154
  }
@@ -158,20 +160,22 @@ class AuthRemover extends kit_1.AsyncOptionalCreatable {
158
160
  */
159
161
  async unsetAliases(username) {
160
162
  this.logger.debug(`Clearing aliases for username: ${username}`);
161
- const existingAliases = this.globalInfo.aliases.getAll(username);
163
+ const existingAliases = this.stateAggregator.aliases.getAll(username);
162
164
  if (existingAliases.length === 0)
163
165
  return;
164
- this.logger.debug(`Found these aliases to remove: ${existingAliases}`);
165
- existingAliases.forEach((alias) => this.globalInfo.aliases.unset(alias));
166
+ this.logger.debug(`Found these aliases to remove: ${existingAliases.join(',')}`);
167
+ existingAliases.forEach((alias) => this.stateAggregator.aliases.unset(alias));
168
+ await this.stateAggregator.aliases.write();
166
169
  }
167
- unsetTokens(username) {
170
+ async unsetTokens(username) {
168
171
  this.logger.debug(`Clearing tokens for username: ${username}`);
169
- const tokens = this.globalInfo.tokens.getAll();
172
+ const tokens = this.stateAggregator.tokens.getAll();
170
173
  for (const [key, token] of Object.entries(tokens)) {
171
174
  if (token.user === username) {
172
- this.globalInfo.tokens.unset(key);
175
+ this.stateAggregator.tokens.unset(key);
173
176
  }
174
177
  }
178
+ await this.stateAggregator.tokens.write();
175
179
  }
176
180
  }
177
181
  exports.AuthRemover = AuthRemover;
package/lib/org/connection.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  /// <reference types="node" />
2
2
  import { AsyncResult, DeployOptions, DeployResultLocator } from 'jsforce/api/metadata';
3
- import { JsonCollection, JsonMap, Optional } from '@salesforce/ts-types';
3
+ import { JsonMap, Optional } from '@salesforce/ts-types';
4
4
  import { Connection as JSForceConnection, ConnectionConfig, HttpRequest, QueryOptions, QueryResult, Record, Schema } from 'jsforce';
5
5
  import { Tooling as JSForceTooling } from 'jsforce/lib/api/tooling';
6
6
  import { StreamPromise } from 'jsforce/lib/util/promise';
@@ -11,24 +11,11 @@ export declare const SFDX_HTTP_HEADERS: {
11
11
  'user-agent': string;
12
12
  };
13
13
  export declare const DNS_ERROR_NAME = "DomainNotFoundError";
14
- declare type recentValidationOptions = {
15
- id: string;
16
- rest?: boolean;
17
- };
18
- export declare type DeployOptionsWithRest = Partial<DeployOptions> & {
14
+ export type DeployOptionsWithRest = Partial<DeployOptions> & {
19
15
  rest?: boolean;
20
16
  };
21
17
  export interface Tooling<S extends Schema = Schema> extends JSForceTooling<S> {
22
18
  _logger: any;
23
- /**
24
- * Executes a query and auto-fetches (i.e., "queryMore") all results. This is especially
25
- * useful with large query result sizes, such as over 2000 records. The default maximum
26
- * fetch size is 10,000 records. Modify this via the options argument.
27
- *
28
- * @param soql The SOQL string.
29
- * @param options The query options. NOTE: the autoFetch option will always be true.
30
- */
31
- autoFetchQuery<T extends Schema = S>(soql: string, options?: QueryOptions): Promise<QueryResult<T>>;
32
19
  }
33
20
  /**
34
21
  * Handles connections and requests to Salesforce Orgs.
@@ -46,13 +33,11 @@ export interface Tooling<S extends Schema = Schema> extends JSForceTooling<S> {
46
33
  * ```
47
34
  */
48
35
  export declare class Connection<S extends Schema = Schema> extends JSForceConnection<S> {
49
- /**
50
- * Tooling api reference.
51
- */
52
- get tooling(): Tooling<S>;
53
36
  private logger;
54
37
  private options;
55
38
  private username;
39
+ private hasResolved;
40
+ private maxApiVersion;
56
41
  /**
57
42
  * Constructor
58
43
  * **Do not directly construct instances of this class -- use {@link Connection.create} instead.**
@@ -61,6 +46,10 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
61
46
  * @ignore
62
47
  */
63
48
  constructor(options: Connection.Options<S>);
49
+ /**
50
+ * Tooling api reference.
51
+ */
52
+ get tooling(): Tooling<S>;
64
53
  /**
65
54
  * Creates an instance of a Connection. Performs additional async initializations.
66
55
  *
@@ -72,14 +61,10 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
72
61
  */
73
62
  init(): Promise<void>;
74
63
  /**
75
- * TODO: This should be moved into JSForce V2 once ready
76
- * this is only a temporary solution to support both REST and SOAP APIs
77
- *
78
64
  * deploy a zipped buffer from the SDRL with REST or SOAP
79
65
  *
80
66
  * @param zipInput data to deploy
81
67
  * @param options JSForce deploy options + a boolean for rest
82
- * @param callback
83
68
  */
84
69
  deploy(zipInput: Buffer, options: DeployOptionsWithRest): Promise<DeployResultLocator<AsyncResult & Schema>>;
85
70
  /**
@@ -94,16 +79,6 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
94
79
  * The Force API base url for the instance.
95
80
  */
96
81
  baseUrl(): string;
97
- /**
98
- * TODO: This should be moved into JSForce V2 once ready
99
- * this is only a temporary solution to support both REST and SOAP APIs
100
- *
101
- * Will deploy a recently validated deploy request
102
- *
103
- * @param options.id = the deploy ID that's been validated already from a previous checkOnly deploy request
104
- * @param options.rest = a boolean whether or not to use the REST API
105
- */
106
- deployRecentValidation(options: recentValidationOptions): Promise<JsonCollection>;
107
82
  /**
108
83
  * Retrieves the highest api version that is supported by the target server instance.
109
84
  */
@@ -123,7 +98,7 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
123
98
  /**
124
99
  * Set the API version for all connection requests.
125
100
  *
126
- * **Throws** *{@link SfdxError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
101
+ * **Throws** *{@link SfError}{ name: 'IncorrectAPIVersionError' }* Incorrect API version.
127
102
  *
128
103
  * @param version The API version.
129
104
  */
@@ -162,7 +137,9 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
162
137
  * @param soql The SOQL string.
163
138
  * @param queryOptions The query options. NOTE: the autoFetch option will always be true.
164
139
  */
165
- autoFetchQuery<T extends Schema = S>(soql: string, queryOptions?: Partial<QueryOptions>): Promise<QueryResult<T>>;
140
+ autoFetchQuery<T extends Schema = S>(soql: string, queryOptions?: Partial<QueryOptions & {
141
+ tooling: boolean;
142
+ }>): Promise<QueryResult<T>>;
166
143
  /**
167
144
  * Executes a query using either standard REST or Tooling API, returning a single record.
168
145
  * Will throw if either zero records are found OR multiple records are found.
@@ -176,7 +153,7 @@ export declare class Connection<S extends Schema = Schema> extends JSForceConnec
176
153
  * Useful for the raw methods (request, requestRaw) that use the accessToken directly and don't handle refreshes
177
154
  */
178
155
  refreshAuth(): Promise<void>;
179
- private loadInstanceApiVersion;
156
+ private getCachedApiVersion;
180
157
  }
181
158
  export declare const SingleRecordQueryErrors: {
182
159
  NoRecords: string;
@@ -206,4 +183,3 @@ export declare namespace Connection {
206
183
  connectionOptions?: ConnectionConfig<S>;
207
184
  }
208
185
  }
209
- export {};