chore: updates

forcedotcom · Mar 7, 2024 · df30677 · df30677
1 parent 5ae6122
commit df30677
Show file tree

Hide file tree

Showing 37 changed files with 559 additions and 50 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@salesforce/core",
+  "name": "@salesforce/core-bundle",
   "version": "6.7.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
@@ -18,8 +18,6 @@
     "lint": "wireit",
     "lint-fix": "yarn sf-lint --fix",
     "postcompile": "tsc -p typedocExamples",
-    "prepack": "sf-prepack",
-    "prepare": "sf-install",
     "test": "wireit",
     "test:only": "wireit",
     "test:perf": "ts-node test/perf/logger/main.test.ts"
@@ -66,6 +64,10 @@
     "@types/proper-lockfile": "^4.1.4",
     "benchmark": "^2.1.4",
     "chai-string": "^1.5.0",
+    "esbuild": "^0.19.5",
+    "esbuild-plugin-pino": "^2.1.0",
+    "esbuild-plugin-tsc": "^0.4.0",
+    "npm-dts": "^1.3.12",
     "ts-node": "^10.9.2",
     "ts-patch": "^3.1.1",
     "typescript": "^5.3.3"

diff --git a/scripts/updateForBundling.js b/scripts/updateForBundling.js
@@ -1,4 +1,5 @@
 const fs = require('fs');
+const path = require('path');
 
 // Function to update package.json
 function updatePackageJson() {
@@ -62,6 +63,32 @@ function updateLoggerTs() {
   });
 }
 
+function updateLoadMessagesParam() {
+  const dirs = ['./src', './test'];
+  function replaceTextInFile(filePath) {
+    const data = fs.readFileSync(filePath, 'utf8');
+    const result = data.replace(
+      /Messages\.loadMessages\('@salesforce\/core'/g,
+      "Messages.loadMessages('@salesforce/core-bundle'"
+    );
+    fs.writeFileSync(filePath, result, 'utf8');
+  }
+  function traverseDirectory(directory) {
+    fs.readdirSync(directory).forEach((file) => {
+      const fullPath = path.join(directory, file);
+      if (fs.lstatSync(fullPath).isDirectory()) {
+        traverseDirectory(fullPath);
+      } else if (path.extname(fullPath) === '.ts') {
+        replaceTextInFile(fullPath);
+      }
+    });
+  }
+  dirs.forEach((dir) => {
+    traverseDirectory(dir);
+  });
+}
+
 // Run the update functions
 updatePackageJson();
 updateLoggerTs();
+updateLoadMessagesParam();
diff --git a/src/config/config.ts b/src/config/config.ts
@@ -21,7 +21,7 @@ import { ConfigContents, ConfigValue, Key } from './configStackTypes';
 import { LWWState, stateFromContents } from './lwwMap';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'config');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'config');
 
 const SFDX_CONFIG_FILE_NAME = 'sfdx-config.json';
 const CONFIG_FILE_NAME = 'config.json';

diff --git a/src/config/configAggregator.ts b/src/config/configAggregator.ts
@@ -13,7 +13,7 @@ import { EnvVars } from './envVars';
 import { Config, ConfigPropertyMeta } from './config';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'config');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'config');
 
 /**
  * Information about a config property.

diff --git a/src/config/envVars.ts b/src/config/envVars.ts
@@ -12,7 +12,7 @@ import { Messages } from '../messages';
 import { Lifecycle } from '../lifecycleEvents';
 
 Messages.importMessagesDirectory(pathJoin(__dirname));
-const messages = Messages.loadMessages('@salesforce/core', 'envVars');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'envVars');
 
 export enum EnvironmentVariable {
   'FORCE_OPEN_URL' = 'FORCE_OPEN_URL',

diff --git a/src/crypto/crypto.ts b/src/crypto/crypto.ts
@@ -111,7 +111,7 @@ const detectCryptoVersion = (pwd?: string): void => {
 };
 
 Messages.importMessagesDirectory(pathJoin(__dirname));
-const messages = Messages.loadMessages('@salesforce/core', 'encryption');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'encryption');
 
 interface CredType {
   username: string;

diff --git a/src/crypto/keyChain.ts b/src/crypto/keyChain.ts
@@ -11,7 +11,7 @@ import { Messages } from '../messages';
 import { KeyChain, keyChainImpl } from './keyChainImpl';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'encryption');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'encryption');
 
 /**
  * Gets the os level keychain impl.

diff --git a/src/crypto/keyChainImpl.ts b/src/crypto/keyChainImpl.ts
@@ -18,7 +18,7 @@ import { SfError } from '../sfError';
 import { Messages } from '../messages';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'encryption');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'encryption');
 
 export type FsIfc = Pick<typeof nodeFs, 'statSync'>;
 

diff --git a/src/deviceOauthService.ts b/src/deviceOauthService.ts
@@ -19,7 +19,7 @@ import { SfError } from './sfError';
 import { Messages } from './messages';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'auth');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'auth');
 
 export interface DeviceCodeResponse extends JsonMap {
   device_code: string;

diff --git a/src/index.ts b/src/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2023, 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
+ */
+export * from './exported';
+export * from './testSetup';
diff --git a/src/logger/logger.ts b/src/logger/logger.ts
@@ -180,7 +180,7 @@ export class Logger {
           transport: {
             pipeline: [
               {
-                target: path.join('..', '..', 'lib', 'logger', 'transformStream'),
+                target: './transformStream',
               },
               getWriteStream(level),
             ],

diff --git a/src/org/authInfo.ts b/src/org/authInfo.ts
@@ -42,7 +42,7 @@ import { OrgConfigProperties } from './orgConfigProperties';
 import { Org, SandboxFields } from './org';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'core');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'core');
 
 /**
  * Fields for authorization, org, and local information.

diff --git a/src/org/authRemover.ts b/src/org/authRemover.ts
@@ -15,7 +15,7 @@ import { OrgConfigProperties } from './orgConfigProperties';
 import { AuthFields } from './authInfo';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'auth');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'auth');
 
 /**
  * Handles  the removing of authorizations, which includes deleting the auth file

diff --git a/src/org/connection.ts b/src/org/connection.ts
@@ -34,7 +34,7 @@ import { AuthFields, AuthInfo } from './authInfo';
 import { OrgConfigProperties } from './orgConfigProperties';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'connection');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'connection');
 
 const clientId = `sfdx toolbelt:${process.env.SFDX_SET_CLIENT_IDS ?? ''}`;
 export const SFDX_HTTP_HEADERS = {

diff --git a/src/org/org.ts b/src/org/org.ts
@@ -42,7 +42,7 @@ import { scratchOrgCreate, ScratchOrgCreateOptions, ScratchOrgCreateResult } fro
 import { OrgConfigProperties } from './orgConfigProperties';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'org');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'org');
 
 export type OrganizationInformation = {
   Name: string;

diff --git a/src/org/orgConfigProperties.ts b/src/org/orgConfigProperties.ts
@@ -13,7 +13,7 @@ import { SfdcUrl } from '../util/sfdcUrl';
 import { validateApiVersion } from '../util/sfdc';
 
 Messages.importMessagesDirectory(pathJoin(__dirname));
-const messages = Messages.loadMessages('@salesforce/core', 'config');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'config');
 
 export enum OrgConfigProperties {
   /**

diff --git a/src/org/permissionSetAssignment.ts b/src/org/permissionSetAssignment.ts
@@ -15,7 +15,7 @@ import { SfError } from '../sfError';
 import { Org } from './org';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'permissionSetAssignment');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'permissionSetAssignment');
 
 /**
  * Map of fields name for a permission set assignment

diff --git a/src/org/scratchOrgCreate.ts b/src/org/scratchOrgCreate.ts
@@ -30,7 +30,7 @@ import { ScratchOrgCache } from './scratchOrgCache';
 import { validateScratchOrgInfoForResume } from './scratchOrgErrorCodes';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgCreate');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgCreate');
 
 export const DEFAULT_STREAM_TIMEOUT_MINUTES = 6;
 

diff --git a/src/org/scratchOrgErrorCodes.ts b/src/org/scratchOrgErrorCodes.ts
@@ -16,8 +16,8 @@ import { emit } from './scratchOrgLifecycleEvents';
 const WORKSPACE_CONFIG_FILENAME = 'sfdx-project.json';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgErrorCodes');
-const namedMessages = Messages.loadMessages('@salesforce/core', 'scratchOrgErrorCodes');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgErrorCodes');
+const namedMessages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgErrorCodes');
 
 // getMessage will throw when the code isn't found
 // and we don't know whether a given code takes arguments or not

diff --git a/src/org/scratchOrgFeatureDeprecation.ts b/src/org/scratchOrgFeatureDeprecation.ts
@@ -15,7 +15,7 @@ import { isString } from '@salesforce/ts-types';
 // Local
 import { Messages } from '../messages';
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgFeatureDeprecation');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgFeatureDeprecation');
 const FEATURE_TYPES = {
   // simpleFeatureMapping holds a set of direct replacement values for features.
   simpleFeatureMapping: {

diff --git a/src/org/scratchOrgInfoApi.ts b/src/org/scratchOrgInfoApi.ts
@@ -31,8 +31,8 @@ export interface JsForceError extends Error {
 }
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgInfoApi');
-const errorCodes = Messages.loadMessages('@salesforce/core', 'scratchOrgErrorCodes');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgInfoApi');
+const errorCodes = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgErrorCodes');
 
 /**
  * Returns the url to be used to authorize into the new scratch org

diff --git a/src/org/scratchOrgInfoGenerator.ts b/src/org/scratchOrgInfoGenerator.ts
@@ -17,7 +17,7 @@ import { ScratchOrgFeatureDeprecation } from './scratchOrgFeatureDeprecation';
 import { DEFAULT_CONNECTED_APP_INFO } from './authInfo';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgInfoGenerator');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgInfoGenerator');
 
 type PartialScratchOrgInfo = Pick<
   ScratchOrgInfo,

diff --git a/src/org/scratchOrgSettingsGenerator.ts b/src/org/scratchOrgSettingsGenerator.ts
@@ -215,7 +215,7 @@ export default class SettingsGenerator {
   }) {
     this.logger = Logger.childFromRoot('SettingsGenerator');
     if (options?.capitalizeRecordTypes === undefined) {
-      const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgSettingsGenerator');
+      const messages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgSettingsGenerator');
       void Lifecycle.getInstance().emitWarning(messages.getMessage('noCapitalizeRecordTypeConfigVar'));
       this.capitalizeRecordTypes = true;
     } else {

diff --git a/src/org/user.ts b/src/org/user.ts
@@ -50,7 +50,7 @@ const scimEndpoint = '/services/scim/v1/Users';
 const scimHeaders = { 'auto-approve-user': 'true' };
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'user');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'user');
 
 /**
  * A Map of Required Salesforce User fields.

diff --git a/src/sfProject.ts b/src/sfProject.ts
@@ -21,9 +21,9 @@ import { Messages } from './messages';
 import { findUpperCaseKeys } from './util/findUppercaseKeys';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'config');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'config');
 
-const coreMessages = Messages.loadMessages('@salesforce/core', 'core');
+const coreMessages = Messages.loadMessages('@salesforce/core-bundle', 'core');
 
 export type PackageDirDependency = {
   [k: string]: unknown;

diff --git a/src/stateAggregator/accessors/orgAccessor.ts b/src/stateAggregator/accessors/orgAccessor.ts
@@ -88,7 +88,7 @@ export abstract class BaseOrgAccessor<T extends ConfigFile, P extends ConfigCont
     const config = this.configs.get(username);
     if (throwOnNotFound && config?.keys().length === 0) {
       Messages.importMessagesDirectory(__dirname);
-      const messages = Messages.loadMessages('@salesforce/core', 'core');
+      const messages = Messages.loadMessages('@salesforce/core-bundle', 'core');
       throw messages.createError('namedOrgNotFound', [username]);
     }
     if (config) {

diff --git a/src/status/streamingClient.ts b/src/status/streamingClient.ts
@@ -19,7 +19,7 @@ import { CometClient, CometSubscription, Message, StatusResult, StreamingExtensi
 export { CometClient, CometSubscription, Message, StatusResult, StreamingExtension, StreamProcessor };
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'streaming');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'streaming');
 
 /**
  * Inner streaming client interface. This implements the Cometd behavior.

diff --git a/src/util/internal.ts b/src/util/internal.ts
@@ -12,7 +12,7 @@ import { Messages } from '../messages';
 import { SfError } from '../sfError';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'config');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'config');
 
 /**
  * The name of the project config file.

diff --git a/src/webOAuthServer.ts b/src/webOAuthServer.ts
@@ -23,7 +23,7 @@ import { SfProjectJson } from './sfProject';
 import { JwtOAuth2Config } from './org/authInfo';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'auth');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'auth');
 
 // Server ignores requests for site icons
 const iconPaths = ['/favicon.ico', '/apple-touch-icon-precomposed.png'];

diff --git a/test/unit/config/configAggregatorTest.ts b/test/unit/config/configAggregatorTest.ts
@@ -20,8 +20,8 @@ const testEnvVars = ['SF_TARGET_ORG', 'SFDX_MAX_QUERY_LIMIT', 'SF_ORG_MAX_QUERY_
 chaiConfig.truncateThreshold = 0;
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'config');
-const envMessages = Messages.loadMessages('@salesforce/core', 'envVars');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'config');
+const envMessages = Messages.loadMessages('@salesforce/core-bundle', 'envVars');
 
 const telemetryConfigFilter = (i: ConfigInfo) => i.key !== 'disable-telemetry';
 

diff --git a/test/unit/config/envVarsTest.ts b/test/unit/config/envVarsTest.ts
@@ -12,7 +12,7 @@ import { Lifecycle } from '../../../src/lifecycleEvents';
 import { Messages } from '../../../src/messages';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'envVars');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'envVars');
 
 describe('envVars', () => {
   const testEnvVars = ['foo', 'SFDX_ACCESS_TOKEN', 'SF_ACCESS_TOKEN'];

diff --git a/test/unit/crypto/cryptoTest.ts b/test/unit/crypto/cryptoTest.ts
@@ -195,7 +195,9 @@ describe('CryptoTests', function () {
 
       it('Decrypt should fail without env var, and add extra message', async () => {
         setCryptoVersionEnvVar(envVarValue);
-        const message = Messages.loadMessages('@salesforce/core', 'encryption').getMessage('macKeychainOutOfSync');
+        const message = Messages.loadMessages('@salesforce/core-bundle', 'encryption').getMessage(
+          'macKeychainOutOfSync'
+        );
         const err = Error('Failed to decipher auth data. reason: Unsupported state or unable to authenticate data.');
         const sfdxErr = SfError.wrap(err);
         sfdxErr.actions = [];
@@ -220,7 +222,9 @@ describe('CryptoTests', function () {
       it('Decrypt should fail but not add extra message with env var', async () => {
         setCryptoVersionEnvVar(envVarValue);
         process.env.SF_USE_GENERIC_UNIX_KEYCHAIN = 'false';
-        const message: string = Messages.loadMessages('@salesforce/core', 'encryption').getMessage('authDecryptError');
+        const message: string = Messages.loadMessages('@salesforce/core-bundle', 'encryption').getMessage(
+          'authDecryptError'
+        );
         const errorMessage: object = SfError.wrap(new Error(message));
         stubMethod($$.SANDBOX, os, 'platform').returns('darwin');
         stubMethod($$.SANDBOX, crypto, 'decrypt').callsFake(() => ({

diff --git a/test/unit/org/orgTest.ts b/test/unit/org/orgTest.ts
@@ -38,7 +38,7 @@ import { Lifecycle } from '../../../src/lifecycleEvents';
 
 chaiConfig.truncateThreshold = 0;
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'org');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'org');
 
 describe('Org Tests', () => {
   const $$ = new TestContext();

diff --git a/test/unit/org/scratchOrgInfoApiTest.ts b/test/unit/org/scratchOrgInfoApiTest.ts
@@ -30,8 +30,8 @@ import { Messages } from '../../../src/messages';
 import { SfError } from '../../../src/sfError';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgInfoApi');
-const errorCodesMessages = Messages.loadMessages('@salesforce/core', 'scratchOrgErrorCodes');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgInfoApi');
+const errorCodesMessages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgErrorCodes');
 
 const scratchOrgInfoId = '2SRK0000001QZxF';
 const TEMPLATE_SCRATCH_ORG_INFO: ScratchOrgInfo = {

diff --git a/test/unit/org/scratchOrgInfoGeneratorTest.ts b/test/unit/org/scratchOrgInfoGeneratorTest.ts
@@ -26,7 +26,7 @@ const packageVersionSubscriberId = '04tB0000000cWwnIAE';
 const badPackageId = '03iB0000000cWwnIAE';
 
 Messages.importMessagesDirectory(__dirname);
-const messages = Messages.loadMessages('@salesforce/core', 'scratchOrgInfoGenerator');
+const messages = Messages.loadMessages('@salesforce/core-bundle', 'scratchOrgInfoGenerator');
 
 describe('scratchOrgInfoGenerator', () => {
   const $$ = new TestContext();

diff --git a/test/unit/projectTest.ts b/test/unit/projectTest.ts
@@ -447,7 +447,7 @@ describe('SfProject', () => {
         shouldThrowSync(() => project.getPackageDirectories());
       } catch (e) {
         expect((e as Error).message).to.equal(
-          Messages.loadMessages('@salesforce/core', 'config').getMessage('singleNonDefaultPackage')
+          Messages.loadMessages('@salesforce/core-bundle', 'config').getMessage('singleNonDefaultPackage')
         );
       }
     });