@cerios/salesforce-sobjectly 1.0.0 → 1.2.0

package/dist/codegen.d.mts

@@ -1,52 +1,101 @@
 import { E as AuthProvider, O as HttpTransport, a as FieldDescribe, c as RecordTypeInfo, t as ChildRelationship, u as ApiVersion } from "./describe-Dj3J8o-x.mjs";
 //#region src/codegen/config.d.ts
-/** Client credentials read from environment variables (defaults shown). */
-interface EnvClientCredentialsAuth {
+/**
+ * A credential value in the config: usually `process.env.ANY_NAME` (so `undefined` type-checks),
+ * a `"${ANY_NAME}"` placeholder that is read from the environment (the way to do it in JSON), or
+ * a literal. A key that is set but ends up empty is an error; a key that is left out falls back
+ * to its default `SF_*` environment variable.
+ */
+type ConfigValue = string | undefined;
+/** OAuth 2.0 client credentials. Keys you leave out are read from the default variables shown. */
+interface ClientCredentialsAuth {
   type: "clientCredentials";
-  /** Defaults to `SF_LOGIN_URL` (your My Domain URL). */
+  /** Your My Domain URL. Defaults to the `SF_LOGIN_URL` variable. */
+  loginUrl?: ConfigValue;
+  /** Defaults to the `SF_CLIENT_ID` variable. */
+  clientId?: ConfigValue;
+  /** Defaults to the `SF_CLIENT_SECRET` variable. */
+  clientSecret?: ConfigValue;
+  /** @deprecated Use `loginUrl: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   loginUrlEnv?: string;
-  /** Defaults to `SF_CLIENT_ID`. */
+  /** @deprecated Use `clientId: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   clientIdEnv?: string;
-  /** Defaults to `SF_CLIENT_SECRET`. */
+  /** @deprecated Use `clientSecret: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   clientSecretEnv?: string;
 }
-/** An access token read from environment variables (defaults shown), e.g. from `sf org display`. */
-interface EnvAccessTokenAuth {
+/** A fixed access token, e.g. from `sf org display`. Keys you leave out are read from the default variables shown. */
+interface AccessTokenAuth {
   type: "accessToken";
-  /** Defaults to `SF_ACCESS_TOKEN`. */
+  /** Defaults to the `SF_ACCESS_TOKEN` variable. */
+  accessToken?: ConfigValue;
+  /** Defaults to the `SF_INSTANCE_URL` variable. */
+  instanceUrl?: ConfigValue;
+  /** @deprecated Use `accessToken: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   accessTokenEnv?: string;
-  /** Defaults to `SF_INSTANCE_URL`. */
+  /** @deprecated Use `instanceUrl: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   instanceUrlEnv?: string;
 }
-/** JWT bearer flow with values read from environment variables (defaults shown). */
-interface EnvJwtBearerAuth {
+/** OAuth 2.0 JWT bearer flow. Keys you leave out are read from the default variables shown. */
+interface JwtBearerAuth {
   type: "jwtBearer";
-  /** Defaults to `SF_LOGIN_URL`. */
+  /** Defaults to the `SF_LOGIN_URL` variable. */
+  loginUrl?: ConfigValue;
+  /** Defaults to the `SF_CLIENT_ID` variable. */
+  clientId?: ConfigValue;
+  /** Defaults to the `SF_USERNAME` variable. */
+  username?: ConfigValue;
+  /** The PEM key itself. Defaults to the `SF_PRIVATE_KEY` variable. */
+  privateKey?: ConfigValue;
+  /** A path to the PEM key file, used when `privateKey` is empty. Defaults to the `SF_PRIVATE_KEY_PATH` variable. */
+  privateKeyPath?: ConfigValue;
+  /** @deprecated Use `loginUrl: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   loginUrlEnv?: string;
-  /** Defaults to `SF_CLIENT_ID`. */
+  /** @deprecated Use `clientId: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   clientIdEnv?: string;
-  /** Defaults to `SF_USERNAME`. */
+  /** @deprecated Use `username: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   usernameEnv?: string;
-  /** The PEM key itself. Defaults to `SF_PRIVATE_KEY`. */
+  /** @deprecated Use `privateKey: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   privateKeyEnv?: string;
-  /** A path to the PEM key file, used when the key variable is empty. Defaults to `SF_PRIVATE_KEY_PATH`. */
+  /** @deprecated Use `privateKeyPath: process.env.NAME` (or `"${NAME}"` in JSON). Removed in 2.0. */
   privateKeyPathEnv?: string;
 }
-/** An auth setting that reads credentials from environment variables. The only kind a JSON config can use. */
 /** An org you are logged into with the Salesforce CLI (`sf org login web --alias my-org`). */
 interface SfCliAuth {
   type: "sfCli";
-  /** The org alias or username. Defaults to the CLI's default org. */
-  targetOrg?: string;
+  /**
+   * The org alias or username, e.g. `process.env.NAME` or a `"${NAME}"` placeholder. Left out, the
+   * CLI's default org is used (the CLI's own `SF_TARGET_ORG` variable can set it). Set but empty is an error.
+   */
+  targetOrg?: ConfigValue;
 }
-type EnvAuth = EnvClientCredentialsAuth | EnvAccessTokenAuth | EnvJwtBearerAuth | SfCliAuth;
-/** Env-based auth, or any auth provider (TypeScript configs only). */
-type CodegenAuth = EnvAuth | AuthProvider;
+/** An auth setting that can be written as data. The only kind a JSON config can use. */
+type AuthSetting = ClientCredentialsAuth | AccessTokenAuth | JwtBearerAuth | SfCliAuth;
+/** @deprecated Use `ClientCredentialsAuth`. */
+type EnvClientCredentialsAuth = ClientCredentialsAuth;
+/** @deprecated Use `AccessTokenAuth`. */
+type EnvAccessTokenAuth = AccessTokenAuth;
+/** @deprecated Use `JwtBearerAuth`. */
+type EnvJwtBearerAuth = JwtBearerAuth;
+/** @deprecated Use `AuthSetting`. */
+type EnvAuth = AuthSetting;
+/** An auth setting, or any auth provider (TypeScript configs only). */
+type CodegenAuth = AuthSetting | AuthProvider;
 type PicklistMode =
 /** Every picklist is `string`. */
 "string" |
 /** Restricted picklists become a union of their values; unrestricted ones `"A" | "B" | (string & {})`. */
-"union";
+"union" |
+/**
+ * Like `"union"`, plus a named `as const` object and type per picklist: `CaseStatus.Working`,
+ * `Status: CaseStatus`. Plain strings such as `"Working"` are still accepted.
+ */
+"const" |
+/**
+ * A TypeScript `enum` per picklist: `CaseStatus.Working`, `Status: CaseStatus`. Enums are nominal,
+ * so restricted picklists only accept enum members, not plain strings. Not usable with
+ * `erasableSyntaxOnly` or Node's type stripping.
+ */
+"enum";
 /**
  * The codegen config. `S` is the union of the listed sObject names; `defineConfig` infers it, so
  * per-sObject options such as `excludeCreateFields` only accept listed names.
@@ -66,7 +115,10 @@ interface CodegenConfig<S extends string = string> {
   sobjects?: readonly S[];
   /** sObjects to skip (applied after `sobjects`). */
   exclude?: readonly string[];
-  /** How to authenticate. Defaults to client credentials from `SF_LOGIN_URL`, `SF_CLIENT_ID` and `SF_CLIENT_SECRET`. */
+  /**
+   * How to authenticate, e.g. `{ type: "clientCredentials", clientId: process.env.MY_CLIENT_ID, ... }`.
+   * Defaults to client credentials from `SF_LOGIN_URL`, `SF_CLIENT_ID` and `SF_CLIENT_SECRET`.
+   */
   auth?: CodegenAuth;
   /** Fields to leave out of the create input per sObject (e.g. fields describe marks createable but REST rejects). */
   excludeCreateFields?: Partial<Record<NoInfer<S>, readonly string[]>>;
@@ -93,7 +145,7 @@ interface CodegenConfig<S extends string = string> {
  */
 type JsonCodegenConfig = Omit<CodegenConfig, "auth" | "format" | "transport"> & {
   $schema?: string;
-  auth?: EnvAuth;
+  auth?: AuthSetting;
 };
 /**
  * Type-checks a `sobjectly.config.ts`. The listed `sobjects` become a literal union, so a typo in
@@ -115,8 +167,11 @@ export declare function defineConfig<const S extends string = string>(config: Co
 type CodegenField = Pick<FieldDescribe, "name" | "label" | "type" | "nillable" | "createable" | "updateable" | "defaultedOnCreate" | "referenceTo" | "relationshipName"> & Partial<Pick<FieldDescribe, "picklistValues" | "restrictedPicklist" | "externalId" | "idLookup">>;
 /** Maps each Salesforce field type to a TypeScript type. Types not listed become `unknown`. */
 export declare const FIELD_TYPE_MAP: Readonly<Record<string, string>>;
-/** Returns the TypeScript type for a field, including `| null` for nillable fields. */
-export declare function mapFieldType(field: CodegenField, picklists?: PicklistMode): string;
+/**
+ * Returns the TypeScript type for a field, including `| null` for nillable fields. With picklist
+ * mode `"const"` or `"enum"`, `typeName` is the field's named picklist type; it replaces the union.
+ */
+export declare function mapFieldType(field: CodegenField, picklists?: PicklistMode, typeName?: string): string;
 //#endregion
 //#region src/codegen/generator.d.ts
 /** The subset of an sObject describe the generator needs. */
@@ -139,7 +194,8 @@ interface GenerateSourceOptions {
 }
 /**
  * Generates the TypeScript source for a set of sObject describes: a read interface, create
- * and update input types per sObject, and the `SObjectRegistry` that ties them together.
+ * and update input types per sObject, and the `SObjectRegistry` that ties them together. With
+ * picklist mode `"const"` or `"enum"`, each picklist also gets a named type before its sObject.
  * The output is deterministic: sObjects are sorted by name and fields by name (`Id` first).
  */
 export declare function generateSource(describes: readonly CodegenDescribe[], options?: GenerateSourceOptions): string;
@@ -177,8 +233,10 @@ export declare class CodegenConfigError extends Error {
   readonly name: string;
   constructor(source: string, problems: string[]);
 }
-/** The env-variable options each env-based auth type accepts. */
-export declare const AUTH_OPTIONS: Record<EnvAuth["type"], readonly string[]>;
+/** The options each auth type accepts: its credential keys, then the deprecated `*Env` keys. */
+export declare const AUTH_OPTIONS: Record<AuthSetting["type"], readonly string[]>;
+/** The deprecated `*Env` auth options, each mapped to the credential key that replaces it. */
+export declare const DEPRECATED_AUTH_OPTIONS: Readonly<Record<string, string>>;
 /** The options a config may contain. */
 export declare const CONFIG_OPTIONS: readonly string[];
 /**
@@ -246,7 +304,7 @@ interface InitResult {
   envExampleUpdated?: boolean;
   scriptAdded?: boolean;
 }
-/** The environment variables each auth type reads by default. */
+/** The environment variables the config written by `init` reads, per auth type. */
 export declare const AUTH_ENV_VARS: Record<InitAuthType, string[]>;
 /**
  * Creates a `sobjectly.config` file by asking for the API version, output path, sObjects, auth
@@ -268,7 +326,7 @@ export interface GenerateOptions {
   /** Directory that `output` is resolved against. Defaults to `process.cwd()`. */
   cwd?: string;
   logger?: CodegenLogger;
-  /** Environment to read credentials from. Defaults to `process.env`. */
+  /** Where `"${NAME}"` placeholders and the default `SF_*` variables are read from. Defaults to `process.env`. */
   env?: Record<string, string | undefined>;
   /** Write the file. Defaults to `true`; with `false` the source is only returned. */
   write?: boolean;
@@ -305,8 +363,32 @@ export declare function generate(input: CodegenConfig, options?: GenerateOptions
  * Only content counts: a file reformatted by Prettier, oxfmt or the `format` hook is up to date.
  */
 export declare function checkGenerated(input: CodegenConfig, options?: GenerateOptions): Promise<CheckResult>;
-/** Turns the config's auth setting into an auth provider, reading env-based credentials. */
-export declare function resolveAuth(auth: CodegenAuth | undefined, env: Record<string, string | undefined>): AuthProvider;
+export interface ResolveAuthOptions {
+  /** Receives deprecation warnings, e.g. for the `*Env` keys. */
+  warn?: (message: string) => void;
+}
+/**
+ * Turns the config's auth setting into an auth provider. Each credential comes from its key in
+ * the setting (a `"${NAME}"` placeholder is read from `env`), else from the variable a deprecated
+ * `*Env` key names, else from its default `SF_*` variable. Throws one error listing every
+ * missing credential.
+ */
+export declare function resolveAuth(auth: CodegenAuth | undefined, env: Record<string, string | undefined>, options?: ResolveAuthOptions): AuthProvider;
+export interface LoadAuthOptions extends ResolveAuthOptions {
+  /** The config file. Defaults to the first `sobjectly.config.{ts,mts,cts,json}` in `cwd`. */
+  configPath?: string;
+  /** Where to look for the config file. Defaults to `process.cwd()`. */
+  cwd?: string;
+  /** Where `"${NAME}"` placeholders and the default `SF_*` variables are read from. Defaults to `process.env`. */
+  env?: Record<string, string | undefined>;
+}
+/**
+ * Loads the sobjectly config and returns an auth provider for its `auth` setting, so the client
+ * logs in the same way as `sobjectly generate`:
+ * `new SalesforceClient({ apiVersion: API_VERSION, auth: await loadAuth() })`.
+ * Throws when no config file is found, or one error listing every missing credential.
+ */
+export declare function loadAuth(options?: LoadAuthOptions): Promise<AuthProvider>;
 //#endregion
-export type { Choice, CodegenAuth, CodegenConfig, CodegenDescribe, CodegenField, EnvAccessTokenAuth, EnvAuth, EnvClientCredentialsAuth, EnvJwtBearerAuth, GenerateSourceOptions, GeneratedFileHashes, InitAnswers, InitAuthType, InitConfigFormat, InitOptions, InitResult, JsonCodegenConfig, PicklistMode, Prompter, SfCliAuth };
+export type { AccessTokenAuth, AuthSetting, Choice, ClientCredentialsAuth, CodegenAuth, CodegenConfig, CodegenDescribe, CodegenField, ConfigValue, EnvAccessTokenAuth, EnvAuth, EnvClientCredentialsAuth, EnvJwtBearerAuth, GenerateSourceOptions, GeneratedFileHashes, InitAnswers, InitAuthType, InitConfigFormat, InitOptions, InitResult, JsonCodegenConfig, JwtBearerAuth, PicklistMode, Prompter, SfCliAuth };
 //# sourceMappingURL=codegen.d.mts.map

package/dist/codegen.mjs

@@ -1,10 +1,10 @@
-import { C as validateConfig, D as FIELD_TYPE_MAP, E as readGeneratedHashes, O as init_type_mapper, S as init_validate_config, T as init_generator, _ as defineConfig, a as init_prompter, b as CONFIG_OPTIONS, c as init_init, d as runInit, f as CONFIG_FILE_NAMES, g as loadConfig, h as init_load_config, i as resolveAuth, k as mapFieldType, l as parseSObjects, m as findConfigFiles, n as generate, o as readlinePrompter, p as findConfigFile, r as init_codegen, s as AUTH_ENV_VARS, t as checkGenerated, u as renderConfig, v as init_config, w as generateSource, x as CodegenConfigError, y as AUTH_OPTIONS } from "./codegen-CSx0WAtK.mjs";
+import { A as FIELD_TYPE_MAP, C as DEPRECATED_AUTH_OPTIONS, D as generateSource, E as validateConfig, M as mapFieldType, O as init_generator, S as CodegenConfigError, T as init_validate_config, _ as findConfigFiles, a as resolveAuth, b as AUTH_OPTIONS, c as AUTH_ENV_VARS, d as renderConfig, f as runInit, g as findConfigFile, h as CONFIG_FILE_NAMES, i as loadAuth, j as init_type_mapper, k as readGeneratedHashes, l as init_init, m as init_config, n as generate, o as init_prompter, p as defineConfig, r as init_codegen, s as readlinePrompter, t as checkGenerated, u as parseSObjects, v as init_load_config, x as CONFIG_OPTIONS, y as loadConfig } from "./codegen-0L2ebG9j.mjs";
 init_type_mapper();
 init_generator();
 init_validate_config();
-init_config();
 init_load_config();
+init_config();
 init_init();
 init_prompter();
 init_codegen();
-export { AUTH_ENV_VARS, AUTH_OPTIONS, CONFIG_FILE_NAMES, CONFIG_OPTIONS, CodegenConfigError, FIELD_TYPE_MAP, checkGenerated, defineConfig, findConfigFile, findConfigFiles, generate, generateSource, loadConfig, mapFieldType, parseSObjects, readGeneratedHashes, readlinePrompter, renderConfig, resolveAuth, runInit, validateConfig };
+export { AUTH_ENV_VARS, AUTH_OPTIONS, CONFIG_FILE_NAMES, CONFIG_OPTIONS, CodegenConfigError, DEPRECATED_AUTH_OPTIONS, FIELD_TYPE_MAP, checkGenerated, defineConfig, findConfigFile, findConfigFiles, generate, generateSource, loadAuth, loadConfig, mapFieldType, parseSObjects, readGeneratedHashes, readlinePrompter, renderConfig, resolveAuth, runInit, validateConfig };

package/dist/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_sf_cli = require("./sf-cli-DEVZQTR7.cjs");
+const require_sf_cli = require("./sf-cli-S2BrCbik.cjs");
 exports.ActionsApi = require_sf_cli.ActionsApi;
 exports.ApexExecutionError = require_sf_cli.ApexExecutionError;
 exports.ApprovalsApi = require_sf_cli.ApprovalsApi;

package/dist/index.d.cts

@@ -51,6 +51,8 @@ interface RequestEvent {
   url: string;
   /** Request headers with `Authorization` redacted. */
   headers: Record<string, string>;
+  /** The body as sent: JSON or form text, or bytes for binary uploads. `undefined` without a body. */
+  body?: string | Uint8Array;
   attempt: number;
 }
 interface ResponseEvent extends RequestEvent {
@@ -58,11 +60,19 @@ interface ResponseEvent extends RequestEvent {
   durationMs: number;
   /** Response headers without `set-cookie`. */
   responseHeaders: Record<string, string>;
+  /**
+   * The response body: text for JSON, XML, CSV and `text/*`, bytes otherwise. `undefined` when
+   * empty, and for successful streamed responses (Bulk API query results), which aren't read yet.
+   */
+  responseBody?: string | Uint8Array;
 }
-/** Observability hooks, e.g. for logging in test reports. Tokens are never passed to hooks. */
+/**
+ * Observability hooks, e.g. for logging requests and responses in test reports. Tokens are never
+ * passed to hooks. A hook may return a promise; it is not awaited, and a rejection is ignored.
+ */
 interface RequestHooks {
-  onRequest?(event: RequestEvent): void;
-  onResponse?(event: ResponseEvent): void;
+  onRequest?(event: RequestEvent): void | Promise<void>;
+  onResponse?(event: ResponseEvent): void | Promise<void>;
 }
 interface ApiUsage {
   used: number;
@@ -111,6 +121,7 @@ export declare class SalesforceConnection {
   resolveUrl(path: string, instanceUrl: string, query?: Record<string, QueryParamValue>): URL;
   private sendOnce;
   private prepare;
+  /** `body` is left out for a streamed response that hasn't been read yet. */
   private afterResponse;
   private toResult;
   private errorFor;
@@ -2078,7 +2089,7 @@ interface SalesforceClientOptions {
   allowedOrigins?: string[];
   /** Headers sent with every request, e.g. `{ "Sforce-Call-Options": "client=my-app" }`. */
   headers?: Record<string, string>;
-  /** Observability hooks. Tokens are redacted. */
+  /** Observability hooks, e.g. for logging request and response bodies. Tokens are redacted. */
   hooks?: RequestHooks;
   /**
    * Cache metadata (describe, UI API object info, record type ids) in memory for the lifetime of

package/dist/index.d.mts

@@ -51,6 +51,8 @@ interface RequestEvent {
   url: string;
   /** Request headers with `Authorization` redacted. */
   headers: Record<string, string>;
+  /** The body as sent: JSON or form text, or bytes for binary uploads. `undefined` without a body. */
+  body?: string | Uint8Array;
   attempt: number;
 }
 interface ResponseEvent extends RequestEvent {
@@ -58,11 +60,19 @@ interface ResponseEvent extends RequestEvent {
   durationMs: number;
   /** Response headers without `set-cookie`. */
   responseHeaders: Record<string, string>;
+  /**
+   * The response body: text for JSON, XML, CSV and `text/*`, bytes otherwise. `undefined` when
+   * empty, and for successful streamed responses (Bulk API query results), which aren't read yet.
+   */
+  responseBody?: string | Uint8Array;
 }
-/** Observability hooks, e.g. for logging in test reports. Tokens are never passed to hooks. */
+/**
+ * Observability hooks, e.g. for logging requests and responses in test reports. Tokens are never
+ * passed to hooks. A hook may return a promise; it is not awaited, and a rejection is ignored.
+ */
 interface RequestHooks {
-  onRequest?(event: RequestEvent): void;
-  onResponse?(event: ResponseEvent): void;
+  onRequest?(event: RequestEvent): void | Promise<void>;
+  onResponse?(event: ResponseEvent): void | Promise<void>;
 }
 interface ApiUsage {
   used: number;
@@ -111,6 +121,7 @@ export declare class SalesforceConnection {
   resolveUrl(path: string, instanceUrl: string, query?: Record<string, QueryParamValue>): URL;
   private sendOnce;
   private prepare;
+  /** `body` is left out for a streamed response that hasn't been read yet. */
   private afterResponse;
   private toResult;
   private errorFor;
@@ -2078,7 +2089,7 @@ interface SalesforceClientOptions {
   allowedOrigins?: string[];
   /** Headers sent with every request, e.g. `{ "Sforce-Call-Options": "client=my-app" }`. */
   headers?: Record<string, string>;
-  /** Observability hooks. Tokens are redacted. */
+  /** Observability hooks, e.g. for logging request and response bodies. Tokens are redacted. */
   hooks?: RequestHooks;
   /**
    * Cache metadata (describe, UI API object info, record type ids) in memory for the lifetime of

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { $ as BulkApi, A as init_search, At as init_errors, B as MAX_UPLOAD_BYTES, C as init_ui_api, Ct as soslEscape, D as isSObjectType, Dt as SalesforcePartialFailureError, E as init_query_builder, Et as SalesforceError, F as init_quick_actions, Ft as MetadataCache, G as init_events, H as buildMultipart, I as QueryApi, It as init_cache, J as CompositeRequestBuilder, K as toPublishResult, L as init_query, M as init_reports, Mt as init_api_version, N as reportRows, Nt as isApiVersion, O as soqlFor, Ot as SalesforceSaveError, P as QuickActionsApi, Pt as normalizeApiVersion, Q as init_collections, R as FilesApi, S as UiApi, St as soqlLiteral, T as TypeOfBuilder, Tt as SalesforceBulkJobError, U as init_multipart, V as init_files, W as EventsApi, X as init_composite, Y as CompositeResponse, Z as CollectionsApi, _ as DebugLogCaptureError, _t as init_escape, a as createJwtAssertion, at as parseCsv, b as SObjectResource, bt as soqlEscape, c as refreshToken, ct as toCsv, d as init_client, dt as ActionsApi, et as BulkIngestJob, f as ApexExecutionError, ft as init_actions, g as DEFAULT_DEBUG_LEVELS, gt as init_connection, h as DEBUG_LEVEL_NAME, ht as SalesforceConnection, i as clientCredentials, it as init_csv, j as ReportsApi, jt as isSalesforceError, k as SearchApi, kt as hasErrorCode, l as tokenProvider, lt as ApprovalsApi, m as init_tooling, mt as init_fetch_transport, n as sfCli, nt as init_bulk, o as init_providers, ot as parseCsvRows, p as ToolingApi, pt as fetchTransport, q as CompositeApi, r as accessToken, rt as CsvRowParser, s as jwtBearer, st as parseCsvStream, t as init_sf_cli, tt as BulkQueryJob, u as SalesforceClient, ut as init_approvals, v as DebugLogsApi, vt as soqlDate, w as SoqlQueryBuilder, wt as SalesforceAuthError, x as init_sobject, xt as soqlEscapeDateOnly, y as init_debug_logs, yt as soqlDateLiteral, z as MAX_JSON_UPLOAD_BYTES } from "./sf-cli-CtWtdkJ0.mjs";
+import { $ as BulkApi, A as init_search, At as init_errors, B as MAX_UPLOAD_BYTES, C as init_ui_api, Ct as soslEscape, D as isSObjectType, Dt as SalesforcePartialFailureError, E as init_query_builder, Et as SalesforceError, F as init_quick_actions, Ft as MetadataCache, G as init_events, H as buildMultipart, I as QueryApi, It as init_cache, J as CompositeRequestBuilder, K as toPublishResult, L as init_query, M as init_reports, Mt as init_api_version, N as reportRows, Nt as isApiVersion, O as soqlFor, Ot as SalesforceSaveError, P as QuickActionsApi, Pt as normalizeApiVersion, Q as init_collections, R as FilesApi, S as UiApi, St as soqlLiteral, T as TypeOfBuilder, Tt as SalesforceBulkJobError, U as init_multipart, V as init_files, W as EventsApi, X as init_composite, Y as CompositeResponse, Z as CollectionsApi, _ as DebugLogCaptureError, _t as init_escape, a as createJwtAssertion, at as parseCsv, b as SObjectResource, bt as soqlEscape, c as refreshToken, ct as toCsv, d as init_client, dt as ActionsApi, et as BulkIngestJob, f as ApexExecutionError, ft as init_actions, g as DEFAULT_DEBUG_LEVELS, gt as init_connection, h as DEBUG_LEVEL_NAME, ht as SalesforceConnection, i as clientCredentials, it as init_csv, j as ReportsApi, jt as isSalesforceError, k as SearchApi, kt as hasErrorCode, l as tokenProvider, lt as ApprovalsApi, m as init_tooling, mt as init_fetch_transport, n as sfCli, nt as init_bulk, o as init_providers, ot as parseCsvRows, p as ToolingApi, pt as fetchTransport, q as CompositeApi, r as accessToken, rt as CsvRowParser, s as jwtBearer, st as parseCsvStream, t as init_sf_cli, tt as BulkQueryJob, u as SalesforceClient, ut as init_approvals, v as DebugLogsApi, vt as soqlDate, w as SoqlQueryBuilder, wt as SalesforceAuthError, x as init_sobject, xt as soqlEscapeDateOnly, y as init_debug_logs, yt as soqlDateLiteral, z as MAX_JSON_UPLOAD_BYTES } from "./sf-cli-D2PgjErx.mjs";
 //#region src/index.ts
 init_client();
 init_providers();

package/dist/{sf-cli-CtWtdkJ0.mjs → sf-cli-D2PgjErx.mjs}

@@ -478,10 +478,14 @@ function toBytes(body) {
 function assertSerializable(body) {
 	if (typeof Blob !== "undefined" && body instanceof Blob || typeof FormData !== "undefined" && body instanceof FormData || typeof ReadableStream !== "undefined" && body instanceof ReadableStream) throw new TypeError("Unsupported request body: Blob, FormData and streams can't be sent. Pass a Uint8Array (see buildMultipart for multipart).");
 }
-/** Runs an observability hook; a throwing hook must never change the outcome of a request. */
+/**
+* Runs an observability hook; a throwing hook must never change the outcome of a request. A
+* returned promise is not awaited, and its rejection is swallowed so it can't go unhandled.
+*/
 function callHook(hook) {
 	try {
-		hook();
+		const result = hook();
+		if (result && typeof result.catch === "function") result.catch(() => void 0);
 	} catch {}
 }
 function setDefault(headers, name, value) {
@@ -506,6 +510,11 @@ function parseBody(response, responseType, strict = false) {
 	}
 	return text;
 }
+/** A response body for hooks: decoded text for text content types, bytes otherwise. */
+function eventBody(body, headers) {
+	if (body.byteLength === 0) return;
+	return isTextContentType((headers.get("content-type") ?? "").toLowerCase()) ? decoder$1.decode(body) : body;
+}
 function isTextContentType(contentType) {
 	return contentType === "" || contentType.includes("json") || contentType.startsWith("text/") || contentType.includes("xml") || contentType.includes("csv");
 }
@@ -675,7 +684,7 @@ var init_connection = __esmMin((() => {
 			const signal = combineSignals(request.signal, timeoutMs);
 			const prepared = this.prepare(request, method, token, attempt, signal, timeoutMs);
 			const response = await this._transport.send(prepared.transportRequest);
-			this.afterResponse(prepared.event, response.status, response.headers);
+			this.afterResponse(prepared.event, response);
 			return response;
 		}
 		prepare(request, method, token, attempt, signal, timeoutMs) {
@@ -687,6 +696,7 @@ var init_connection = __esmMin((() => {
 				method,
 				url: url.toString(),
 				headers: redactHeaders(headers),
+				body,
 				attempt
 			};
 			callHook(() => this._hooks.onRequest?.(event));
@@ -705,14 +715,16 @@ var init_connection = __esmMin((() => {
 				}
 			};
 		}
-		afterResponse(event, status, headers) {
-			this.trackApiUsage(headers);
+		/** `body` is left out for a streamed response that hasn't been read yet. */
+		afterResponse(event, response) {
+			this.trackApiUsage(response.headers);
 			const { started, ...requestEvent } = event;
 			callHook(() => this._hooks.onResponse?.({
 				...requestEvent,
-				status,
+				status: response.status,
 				durationMs: Date.now() - started,
-				responseHeaders: headersToObject(headers)
+				responseHeaders: headersToObject(response.headers),
+				responseBody: response.body && eventBody(response.body, response.headers)
 			}));
 		}
 		toResult(request, method, response) {
@@ -747,13 +759,20 @@ var init_connection = __esmMin((() => {
 			let reauthenticated = false;
 			let retries = 0;
 			for (let attempt = 1;; attempt++) {
-				const response = await this.openStream(stream, request, method, token, attempt, timeoutMs);
-				if (response.status >= 200 && response.status < 300) return response;
+				const { event, response } = await this.openStream(stream, request, method, token, attempt, timeoutMs);
+				if (response.status >= 200 && response.status < 300) {
+					this.afterResponse(event, {
+						status: response.status,
+						headers: response.headers
+					});
+					return response;
+				}
 				const buffered = {
 					status: response.status,
 					headers: response.headers,
 					body: await collect(response.body)
 				};
+				this.afterResponse(event, buffered);
 				if (response.status === 401 && !reauthenticated && this._auth.invalidate) {
 					reauthenticated = true;
 					const next = await this.reauthenticate(token, request.signal, timeoutMs);
@@ -780,9 +799,10 @@ var init_connection = __esmMin((() => {
 			const signal = request.signal ? AbortSignal.any([request.signal, headerTimeout.signal]) : headerTimeout.signal;
 			try {
 				const prepared = this.prepare(request, method, token, attempt, signal, 0);
-				const response = await stream(prepared.transportRequest);
-				this.afterResponse(prepared.event, response.status, response.headers);
-				return response;
+				return {
+					event: prepared.event,
+					response: await stream(prepared.transportRequest)
+				};
 			} finally {
 				clearTimeout(timer);
 			}
@@ -3965,14 +3985,17 @@ var init_sf_cli = __esmMin((() => {
 			"/c",
 			`"${[command, ...args].map(quoteForCmd).join(" ")}"`
 		]] : [command, [...args]];
+		const env = {
+			...process.env,
+			SF_JSON_TO_STDOUT: "true",
+			NO_COLOR: "1"
+		};
+		delete env.FORCE_COLOR;
 		execFile(file, fileArgs, {
 			windowsHide: true,
 			windowsVerbatimArguments: windows,
 			maxBuffer: 10485760,
-			env: {
-				...process.env,
-				SF_JSON_TO_STDOUT: "true"
-			}
+			env
 		}, (error, stdout, stderr) => {
 			if (error && (error.code === "ENOENT" || windows && (error.code === CMD_NOT_FOUND || /is not recognized/i.test(stderr)))) reject(Object.assign(/* @__PURE__ */ new Error(`${command} was not found`), { code: "ENOENT" }));
 			else if (error && !stdout.includes("{")) reject(/* @__PURE__ */ new Error(`${error.message}${stderr ? `\n${stderr.trim()}` : ""}`));
@@ -3983,4 +4006,4 @@ var init_sf_cli = __esmMin((() => {
 //#endregion
 export { BulkApi as $, init_search as A, init_errors as At, MAX_UPLOAD_BYTES as B, init_ui_api as C, soslEscape as Ct, isSObjectType as D, SalesforcePartialFailureError as Dt, init_query_builder as E, SalesforceError as Et, init_quick_actions as F, MetadataCache as Ft, init_events as G, buildMultipart as H, QueryApi as I, init_cache as It, CompositeRequestBuilder as J, toPublishResult as K, init_query as L, __commonJSMin as Lt, init_reports as M, init_api_version as Mt, reportRows as N, isApiVersion as Nt, soqlFor as O, SalesforceSaveError as Ot, QuickActionsApi as P, normalizeApiVersion as Pt, init_collections as Q, FilesApi as R, __esmMin as Rt, UiApi as S, soqlLiteral as St, TypeOfBuilder as T, SalesforceBulkJobError as Tt, init_multipart as U, init_files as V, EventsApi as W, init_composite as X, CompositeResponse as Y, CollectionsApi as Z, DebugLogCaptureError as _, init_escape as _t, createJwtAssertion as a, parseCsv as at, SObjectResource as b, soqlEscape as bt, refreshToken as c, toCsv as ct, init_client as d, ActionsApi as dt, BulkIngestJob as et, ApexExecutionError as f, init_actions as ft, DEFAULT_DEBUG_LEVELS as g, init_connection as gt, DEBUG_LEVEL_NAME as h, SalesforceConnection as ht, clientCredentials as i, init_csv as it, ReportsApi as j, isSalesforceError as jt, SearchApi as k, hasErrorCode as kt, tokenProvider as l, ApprovalsApi as lt, init_tooling as m, init_fetch_transport as mt, sfCli as n, init_bulk as nt, init_providers as o, parseCsvRows as ot, ToolingApi as p, fetchTransport as pt, CompositeApi as q, accessToken as r, CsvRowParser as rt, jwtBearer as s, parseCsvStream as st, init_sf_cli as t, BulkQueryJob as tt, SalesforceClient as u, init_approvals as ut, DebugLogsApi as v, soqlDate as vt, SoqlQueryBuilder as w, SalesforceAuthError as wt, init_sobject as x, soqlEscapeDateOnly as xt, init_debug_logs as y, soqlDateLiteral as yt, MAX_JSON_UPLOAD_BYTES as z };
 
-//# sourceMappingURL=sf-cli-CtWtdkJ0.mjs.map
+//# sourceMappingURL=sf-cli-D2PgjErx.mjs.map