@salesforce/core 3.32.9 → 3.32.10

package/lib/config/config.d.ts

@@ -181,7 +181,7 @@ export declare const SFDX_ALLOWED_PROPERTIES: ({
 export declare const SfProperty: {
     [index: string]: ConfigPropertyMeta;
 };
-export declare type ConfigProperties = {
+export type ConfigProperties = {
     [index: string]: JsonPrimitive;
 };
 /**

package/lib/config/configStore.d.ts

@@ -4,16 +4,16 @@ import { Crypto } from '../crypto/crypto';
 /**
  * The allowed types stored in a config store.
  */
-export declare type ConfigValue = AnyJson;
+export type ConfigValue = AnyJson;
 /**
  * The type of entries in a config store defined by the key and value type of {@link ConfigContents}.
  */
-export declare type ConfigEntry = [string, ConfigValue];
+export type ConfigEntry = [string, ConfigValue];
 /**
  * The type of content a config stores.
  */
-export declare type ConfigContents<T = ConfigValue> = Dictionary<T>;
-export declare type Key<P extends ConfigContents> = Extract<keyof P, string>;
+export type ConfigContents<T = ConfigValue> = Dictionary<T>;
+export type Key<P extends ConfigContents> = Extract<keyof P, string>;
 /**
  * An interface for a config object with a persistent store.
  */

package/lib/config/envVars.d.ts

@@ -79,11 +79,11 @@ export declare enum EnvironmentVariable {
     'SF_INSTALLER' = "SF_INSTALLER",
     'SF_ENV' = "SF_ENV"
 }
-declare type EnvMetaData = {
+type EnvMetaData = {
     description: string;
     synonymOf: Nullable<string>;
 };
-declare type EnvType = {
+type EnvType = {
     [key in EnvironmentVariable]: EnvMetaData;
 };
 export declare const SUPPORTED_ENV_VARS: EnvType;

package/lib/config/sandboxProcessCache.d.ts

@@ -1,6 +1,6 @@
 import { SandboxProcessObject, SandboxRequest } from '../org';
 import { TTLConfig } from './ttlConfig';
-export declare type SandboxRequestCacheEntry = {
+export type SandboxRequestCacheEntry = {
     alias?: string;
     setDefault: boolean;
     prodOrgUsername: string;

package/lib/crypto/keyChainImpl.d.ts

@@ -4,7 +4,7 @@
 import * as childProcess from 'child_process';
 import * as nodeFs from 'fs';
 import { Nullable } from '@salesforce/ts-types';
-export declare type FsIfc = Pick<typeof nodeFs, 'statSync'>;
+export type FsIfc = Pick<typeof nodeFs, 'statSync'>;
 /**
  * Basic keychain interface.
  */
@@ -77,7 +77,7 @@ declare enum SecretField {
     ACCOUNT = "account",
     KEY = "key"
 }
-declare type SecretContents = {
+type SecretContents = {
     [SecretField.ACCOUNT]: string;
     [SecretField.KEY]?: string;
     [SecretField.SERVICE]: string;
@@ -112,5 +112,5 @@ export declare const keyChainImpl: {
     linux: KeychainAccess;
     validateProgram: (programPath: string, fsIfc: FsIfc, isExeIfc: (mode: number, gid: number, uid: number) => boolean) => Promise<void>;
 };
-export declare type KeyChain = GenericUnixKeychainAccess | GenericWindowsKeychainAccess | KeychainAccess;
+export type KeyChain = GenericUnixKeychainAccess | GenericWindowsKeychainAccess | KeychainAccess;
 export {};

package/lib/crypto/secureBuffer.d.ts

@@ -5,7 +5,7 @@ import { Optional } from '@salesforce/ts-types';
  *
  * @param buffer A buffer containing the decrypted secret.
  */
-export declare type DecipherCallback<T> = (buffer: Buffer) => T;
+export type DecipherCallback<T> = (buffer: Buffer) => T;
 /**
  * Used to store and retrieve a sensitive information in memory. This is not meant for at rest encryption.
  *

package/lib/lifecycleEvents.d.ts

@@ -1,5 +1,5 @@
 import { AnyJson } from '@salesforce/ts-types';
-declare type callback = (data: any) => Promise<void>;
+type callback = (data: any) => Promise<void>;
 /**
  * An asynchronous event listener and emitter that follows the singleton pattern. The singleton pattern allows lifecycle
  * events to be emitted from deep within a library and still be consumed by any other library or tool. It allows other

package/lib/logger.d.ts

@@ -6,7 +6,7 @@ import { Writable } from 'stream';
  * @param input The input to be serialized.
  * **See** {@link https://github.com/forcedotcom/node-bunyan#serializers|Bunyan Serializers API}
  */
-export declare type Serializer = (input: unknown) => unknown;
+export type Serializer = (input: unknown) => unknown;
 /**
  * A collection of named `Serializer`s.
  *
@@ -99,7 +99,7 @@ export interface LoggerStream {
 /**
  * Any numeric `Logger` level.
  */
-export declare type LoggerLevelValue = LoggerLevel | number;
+export type LoggerLevelValue = LoggerLevel | number;
 /**
  * A collection of named `FieldValue`s.
  *
@@ -111,7 +111,7 @@ export interface Fields {
 /**
  * All possible field value types.
  */
-export declare type FieldValue = string | number | boolean;
+export type FieldValue = string | number | boolean;
 /**
  * Log line interface
  */

package/lib/messages.d.ts

@@ -1,7 +1,7 @@
 import { AnyJson } from '@salesforce/ts-types';
 import { SfError } from './sfError';
-export declare type Tokens = Array<string | boolean | number | null | undefined>;
-export declare type StructuredMessage = {
+export type Tokens = Array<string | boolean | number | null | undefined>;
+export type StructuredMessage = {
     message: string;
     name: string;
     actions?: string[];
@@ -11,11 +11,11 @@ export declare type StructuredMessage = {
  *
  * @param locale The local set by the framework.
  */
-export declare type LoaderFunction<T extends string> = (locale: string) => Messages<T>;
-export declare type StoredMessage = string | string[] | {
+export type LoaderFunction<T extends string> = (locale: string) => Messages<T>;
+export type StoredMessage = string | string[] | {
     [s: string]: StoredMessage;
 };
-export declare type StoredMessageMap = Map<string, StoredMessage>;
+export type StoredMessageMap = Map<string, StoredMessage>;
 /**
  * The core message framework manages messages and allows them to be accessible by
  * all plugins and consumers of sfdx-core. It is set up to handle localization down

package/lib/org/authInfo.d.ts

@@ -6,7 +6,7 @@ import { Org } from './org';
 /**
  * Fields for authorization, org, and local information.
  */
-export declare type AuthFields = {
+export type AuthFields = {
     accessToken?: string;
     alias?: string;
     authCode?: string;
@@ -39,7 +39,7 @@ export declare type AuthFields = {
     [Org.Fields.IS_SCRATCH]?: boolean;
     [Org.Fields.TRIAL_EXPIRATION_DATE]?: Nullable<string>;
 };
-export declare type OrgAuthorization = {
+export type OrgAuthorization = {
     orgId: string;
     username: string;
     oauthMethod: 'jwt' | 'web' | 'token' | 'unknown';
@@ -61,7 +61,7 @@ export interface AccessTokenOptions {
     loginUrl?: string;
     instanceUrl?: string;
 }
-export declare type AuthSideEffects = {
+export type AuthSideEffects = {
     alias?: string;
     setDefault: boolean;
     setDefaultDevHub: boolean;
@@ -70,11 +70,11 @@ export declare type AuthSideEffects = {
 /**
  * A function to update a refresh token when the access token is expired.
  */
-export declare type RefreshFn = (conn: Connection, callback: (err: Nullable<Error>, accessToken?: string, res?: Record<string, unknown>) => Promise<void>) => Promise<void>;
+export type RefreshFn = (conn: Connection, callback: (err: Nullable<Error>, accessToken?: string, res?: Record<string, unknown>) => Promise<void>) => Promise<void>;
 /**
  * Options for {@link Connection}.
  */
-export declare type ConnectionOptions = AuthFields & {
+export type ConnectionOptions = AuthFields & {
     /**
      * OAuth options.
      */

package/lib/org/connection.d.ts

@@ -11,11 +11,11 @@ export declare const SFDX_HTTP_HEADERS: {
     'user-agent': string;
 };
 export declare const DNS_ERROR_NAME = "DomainNotFoundError";
-declare type recentValidationOptions = {
+type recentValidationOptions = {
     id: string;
     rest?: boolean;
 };
-export declare type DeployOptionsWithRest = Partial<DeployOptions> & {
+export type DeployOptionsWithRest = Partial<DeployOptions> & {
     rest?: boolean;
 };
 export interface Tooling<S extends Schema = Schema> extends JSForceTooling<S> {

package/lib/org/org.d.ts

@@ -5,7 +5,7 @@ import { OrgUsersConfig } from '../config/orgUsersConfig';
 import { Connection } from './connection';
 import { AuthFields, AuthInfo } from './authInfo';
 import { ScratchOrgCreateOptions, ScratchOrgCreateResult } from './scratchOrgCreate';
-export declare type OrganizationInformation = {
+export type OrganizationInformation = {
     Name: string;
     InstanceName: string;
     IsSandbox: boolean;
@@ -44,7 +44,7 @@ export interface SandboxUserAuthResponse {
     instanceUrl: string;
     loginUrl: string;
 }
-export declare type SandboxProcessObject = {
+export type SandboxProcessObject = {
     Id: string;
     Status: string;
     SandboxName: string;
@@ -58,19 +58,19 @@ export declare type SandboxProcessObject = {
     ApexClassId?: string;
     EndDate?: string;
 };
-export declare type SandboxRequest = {
+export type SandboxRequest = {
     SandboxName: string;
     LicenseType?: string;
     /** Should match a SandboxInfoId, not a SandboxProcessId */
     SourceId?: string;
     Description?: string;
 };
-export declare type ResumeSandboxRequest = {
+export type ResumeSandboxRequest = {
     SandboxName?: string;
     SandboxProcessObjId?: string;
 };
-export declare type ScratchOrgRequest = Omit<ScratchOrgCreateOptions, 'hubOrg'>;
-export declare type SandboxFields = {
+export type ScratchOrgRequest = Omit<ScratchOrgCreateOptions, 'hubOrg'>;
+export type SandboxFields = {
     sandboxOrgId: string;
     prodOrgUsername: string;
     sandboxName?: string;

package/lib/org/scratchOrgCache.d.ts

@@ -1,6 +1,6 @@
 import { JsonMap } from '@salesforce/ts-types';
 import { TTLConfig } from '../config/ttlConfig';
-export declare type CachedOptions = {
+export type CachedOptions = {
     hubUsername: string;
     /** stores the scratch definition, including settings/objectSettings */
     definitionjson: JsonMap;

package/lib/org/scratchOrgInfoGenerator.d.ts

@@ -1,7 +1,7 @@
 import { SfProjectJson } from '../sfProject';
 import { Org } from './org';
 import { ScratchOrgInfo } from './scratchOrgTypes';
-declare type PartialScratchOrgInfo = Pick<ScratchOrgInfo, 'ConnectedAppConsumerKey' | 'AuthCode' | 'Snapshot' | 'Status' | 'LoginUrl' | 'SignupEmail' | 'SignupUsername' | 'SignupInstance' | 'Username'>;
+type PartialScratchOrgInfo = Pick<ScratchOrgInfo, 'ConnectedAppConsumerKey' | 'AuthCode' | 'Snapshot' | 'Status' | 'LoginUrl' | 'SignupEmail' | 'SignupUsername' | 'SignupInstance' | 'Username'>;
 export interface ScratchOrgInfoPayload extends PartialScratchOrgInfo {
     orgName: string;
     package2AncestorIds: string;

package/lib/org/user.d.ts

@@ -22,7 +22,7 @@ export declare const REQUIRED_FIELDS: {
  *
  * **See** https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_objects_user.htm
  */
-export declare type UserFields = {
+export type UserFields = {
     -readonly [K in keyof typeof REQUIRED_FIELDS]: string;
 };
 /**

package/lib/sfProject.d.ts

@@ -1,12 +1,12 @@
 import { Dictionary, JsonMap, Nullable, Optional } from '@salesforce/ts-types';
 import { ConfigFile } from './config/configFile';
 import { ConfigContents } from './config/configStore';
-export declare type PackageDirDependency = {
+export type PackageDirDependency = {
     [k: string]: unknown;
     package: string;
     versionNumber?: string;
 };
-export declare type PackageDir = {
+export type PackageDir = {
     ancestorId?: string;
     ancestorVersion?: string;
     default?: boolean;
@@ -23,7 +23,7 @@ export declare type PackageDir = {
     versionName?: string;
     versionNumber?: string;
 };
-export declare type NamedPackageDir = PackageDir & {
+export type NamedPackageDir = PackageDir & {
     /**
      * The [normalized](https://nodejs.org/api/path.html#path_path_normalize_path) path used as the package name.
      */
@@ -33,7 +33,7 @@ export declare type NamedPackageDir = PackageDir & {
      */
     fullPath: string;
 };
-export declare type ProjectJson = ConfigContents & {
+export type ProjectJson = ConfigContents & {
     packageDirectories: PackageDir[];
     namespace?: string;
     sourceApiVersion?: string;

package/lib/stateAggregator/accessors/aliasAccessor.d.ts

@@ -2,7 +2,7 @@ import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { Nullable } from '@salesforce/ts-types';
 import { AuthFields, ConfigContents } from '../../exported';
 import { SfToken } from './tokenAccessor';
-export declare type Aliasable = string | (Partial<AuthFields> & Partial<SfToken>);
+export type Aliasable = string | (Partial<AuthFields> & Partial<SfToken>);
 export declare class AliasAccessor extends AsyncOptionalCreatable {
     private config;
     /**

package/lib/stateAggregator/accessors/tokenAccessor.d.ts

@@ -1,12 +1,12 @@
 import { AsyncOptionalCreatable } from '@salesforce/kit';
 import { JsonMap, Optional } from '@salesforce/ts-types';
-export declare type SfToken = {
+export type SfToken = {
     token: string;
     url: string;
     user?: string;
     timestamp: string;
 } & JsonMap;
-export declare type SfTokens = {
+export type SfTokens = {
     [key: string]: SfToken;
 };
 export declare class TokenAccessor extends AsyncOptionalCreatable {

package/lib/status/types.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 import { AnyFunction, AnyJson, JsonMap } from '@salesforce/ts-types';
-export declare type Message = JsonMap;
-export declare type Callback<T = unknown> = (...args: any[]) => T;
+export type Message = JsonMap;
+export type Callback<T = unknown> = (...args: any[]) => T;
 export interface StatusResult {
     /**
      * If the result of the streaming or polling client is expected to return a result

package/lib/testSetup.d.ts

@@ -87,6 +87,7 @@ export declare class TestContext {
         Config?: ConfigStub;
         SfProjectJson?: ConfigStub;
         TokensConfig?: ConfigStub;
+        OrgUsersConfig?: ConfigStub;
     };
     /**
      * A record of stubs created during instantiation.
@@ -170,6 +171,15 @@ export declare class TestContext {
      * Stub salesforce org authorizations.
      */
     stubAuths(...orgs: MockTestOrgData[]): Promise<void>;
+    /**
+     * Stub salesforce user authorizations.
+     *
+     * @param users The users to stub.
+     * The key is the username of the admin user and it must be included in the users array in order to obtain the orgId key for the remaining users.
+     * The admin user is excluded from the users array.
+     *
+     */
+    stubUsers(users: Record<string, MockTestOrgData[]>): void;
     /**
      * Stub salesforce sandbox authorizations.
      */
@@ -315,8 +325,8 @@ export declare const restoreContext: (testContext: TestContext) => void;
  *    $$.stubAliases({ 'myTestAlias': 'user@company.com' });
  *
  *    // Will use the contents set above.
- *    const username = (await StateAggregator.getInstance()).aliases.resolveUsername('myTestAlias');
- *    expect(username).to.equal('user@company.com');
+ *    const username = (await StateAggregator.getInstance()).aliases.resolveUsername("myTestAlias");
+ *    expect(username).to.equal("user@company.com");
  *  });
  * });
  * ```
@@ -333,7 +343,7 @@ export declare const unexpectedResult: SfError;
  * ```
  *  try {
  *      await call()
- *      assert.fail('this should never happen');
+ *      assert.fail("this should never happen");
  *  } catch (e) {
  *  ...
  *  }
@@ -355,7 +365,7 @@ export declare function shouldThrow(f: Promise<unknown>, message?: string): Prom
  * ```
  *  try {
  *      call()
- *      assert.fail('this should never happen');
+ *      assert.fail("this should never happen");
  *  } catch (e) {
  *  ...
  *  }
@@ -469,6 +479,19 @@ export declare class StreamingMockCometClient extends CometClient {
      */
     disconnect(): Promise<void>;
 }
+type MockUserInfo = {
+    Id: string;
+    Username: string;
+    LastName: string;
+    Alias: string;
+    Configs: string[] | undefined;
+    TimeZoneSidKey: string;
+    LocaleSidKey: string;
+    EmailEncodingKey: string;
+    ProfileId: string;
+    LanguageLocaleKey: string;
+    Email: string;
+};
 /**
  * Mock class for Salesforce Orgs.
  *
@@ -517,7 +540,7 @@ export declare class MockTestOrgData {
     /**
      * Return mock user information based on this org.
      */
-    getMockUserInfo(): JsonMap;
+    getMockUserInfo(): MockUserInfo;
     /**
      * Return the auth config file contents.
      */
@@ -552,3 +575,4 @@ export declare class MockTestSandboxData {
      */
     getConfig(): Promise<SandboxFields>;
 }
+export {};

package/lib/testSetup.js

@@ -196,6 +196,43 @@ class TestContext {
         };
         this.configStubs.AuthInfoConfig = { retrieveContents };
     }
+    /**
+     * Stub salesforce user authorizations.
+     *
+     * @param users The users to stub.
+     * The key is the username of the admin user and it must be included in the users array in order to obtain the orgId key for the remaining users.
+     * The admin user is excluded from the users array.
+     *
+     */
+    stubUsers(users) {
+        const mockUsers = Object.values(users).flatMap((orgUsers) => orgUsers.map((user) => {
+            const userInfo = user.getMockUserInfo();
+            return {
+                alias: userInfo.Alias ?? '',
+                email: userInfo.Email ?? '',
+                emailEncodingKey: userInfo.EmailEncodingKey ?? '',
+                id: userInfo.Id ?? '',
+                languageLocaleKey: userInfo.LanguageLocaleKey ?? '',
+                lastName: userInfo.LastName ?? '',
+                localeSidKey: userInfo.LocaleSidKey ?? '',
+                profileId: userInfo.ProfileId ?? '',
+                timeZoneSidKey: userInfo.TimeZoneSidKey ?? '',
+                username: userInfo.Username ?? '',
+            };
+        }));
+        const userOrgsMap = new Map(Object.entries(users).map(([adminUsername, orgs]) => {
+            const adminOrg = orgs.find((org) => org.username === adminUsername);
+            return adminOrg
+                ? [adminOrg.orgId, { usernames: orgs.filter((org) => org.username !== adminUsername) }]
+                : [undefined, undefined];
+        }));
+        (0, ts_sinon_1.stubMethod)(this.SANDBOX, org_1.User.prototype, 'retrieve').callsFake((username) => Promise.resolve(mockUsers.find((org) => org.username === username)));
+        const retrieveContents = async function () {
+            const orgId = (0, path_1.basename)(this.path.replace('.json', ''));
+            return Promise.resolve(userOrgsMap.get(orgId) ?? {});
+        };
+        this.configStubs.OrgUsersConfig = { retrieveContents };
+    }
     /**
      * Stub salesforce sandbox authorizations.
      */
@@ -535,8 +572,8 @@ const _testSetup = (sinon) => {
  *    $$.stubAliases({ 'myTestAlias': 'user@company.com' });
  *
  *    // Will use the contents set above.
- *    const username = (await StateAggregator.getInstance()).aliases.resolveUsername('myTestAlias');
- *    expect(username).to.equal('user@company.com');
+ *    const username = (await StateAggregator.getInstance()).aliases.resolveUsername("myTestAlias");
+ *    expect(username).to.equal("user@company.com");
  *  });
  * });
  * ```
@@ -553,7 +590,7 @@ exports.unexpectedResult = new sfError_1.SfError('This code was expected to fail
  * ```
  *  try {
  *      await call()
- *      assert.fail('this should never happen');
+ *      assert.fail("this should never happen");
  *  } catch (e) {
  *  ...
  *  }
@@ -584,7 +621,7 @@ exports.shouldThrow = shouldThrow;
  * ```
  *  try {
  *      call()
- *      assert.fail('this should never happen');
+ *      assert.fail("this should never happen");
  *  } catch (e) {
  *  ...
  *  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "3.32.9",
+  "version": "3.32.10",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -66,10 +66,10 @@
     "@types/shelljs": "0.8.11",
     "@typescript-eslint/eslint-plugin": "^5.41.0",
     "@typescript-eslint/parser": "^5.45.0",
-    "chai": "^4.3.4",
+    "chai": "^4.3.7",
     "chai-string": "^1.5.0",
     "commitizen": "^3.1.2",
-    "eslint": "^8.28.0",
+    "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-salesforce": "^1.1.0",
     "eslint-config-salesforce-license": "^0.1.6",
@@ -81,12 +81,12 @@
     "lodash": "^4.17.21",
     "mocha": "^9.1.3",
     "nyc": "^15.1.0",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.1",
     "pretty-quick": "^3.1.3",
     "shelljs": "0.8.5",
     "sinon": "^14.0.2",
     "ts-node": "^10.4.0",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.4"
   },
   "repository": {
     "type": "git",