execution conditions; typescript module syntax

clavery · clavery · commit 15d016d292ed · 2025-11-25T19:28:42.000-05:00
diff --git a/AGENTS.md b/AGENTS.md
@@ -1,9 +1,14 @@
 
+- this is a monorepo project; packages:
+  - ./packages/b2c-cli - the command line interface built with oclif
+  - ./packages/b2c-tooling - the SDK/library for B2C Commerce operations; support the CLI and can be used standalone
+
 ## Setup/Packaging
 
 - use `pnpm` over `npm` for package management
 - the `pnpm run test` commands also run the linter after tests
 - use `pnpm run -r format` (or individually in packages) to format code with prettier
+- use `exports` field in package.json files to define public API surface for packages; use `development` field for nodejs --conditions for development ergonomics (packages/b2c-cli/bin/dev.js will use this condition)
 
 ## Documentation
 
diff --git a/README.md b/README.md
@@ -5,7 +5,9 @@
 
 - Separate CLI and SDK
 - Logging
+  - redaction
 - Localization Support
+- supply chain security
 
 ## CLI
 
diff --git a/packages/b2c-cli/bin/dev.js b/packages/b2c-cli/bin/dev.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --import tsx
+#!/usr/bin/env -S node --conditions development --import tsx
 
 import {execute} from '@oclif/core';
 
diff --git a/packages/b2c-cli/src/commands/_test/index.ts b/packages/b2c-cli/src/commands/_test/index.ts
@@ -33,7 +33,7 @@ export default class Test extends BaseCommand<typeof Test> {
         username: 'testuser',
         password: 'secret123',
         client_secret: 'abc123xyz', // eslint-disable-line camelcase
-        token: 'Bearer eyJhbGciOiJIUzI1NiJ9.test',
+        accessToken: 'eyJhbGciOiJIUzI1NiJ9.test',
       },
       'This should have redacted fields',
     );
diff --git a/packages/b2c-cli/src/i18n/index.ts b/packages/b2c-cli/src/i18n/index.ts
@@ -9,7 +9,7 @@
  *   this.log(t('commands.sites.list.fetching', 'Fetching sites from {{hostname}}...', { hostname }))
  */
 
-import {registerTranslations, t as toolingT, TOptions} from '@salesforce/b2c-tooling';
+import {registerTranslations, t as toolingT, type TOptions} from '@salesforce/b2c-tooling';
 import {locales} from './locales/index.js';
 
 /** The namespace used by b2c-cli messages */
diff --git a/packages/b2c-cli/src/index.ts b/packages/b2c-cli/src/index.ts
@@ -10,6 +10,5 @@ export {
   // Config utilities
   loadConfig,
   findDwJson,
-  ResolvedConfig,
-  LoadConfigOptions,
 } from '@salesforce/b2c-tooling/cli';
+export type {ResolvedConfig, LoadConfigOptions} from '@salesforce/b2c-tooling/cli';
diff --git a/packages/b2c-cli/tsconfig.json b/packages/b2c-cli/tsconfig.json
@@ -5,7 +5,8 @@
     "rootDir": "src",
     "skipLibCheck": true,
     "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    "verbatimModuleSyntax": true
   },
   "include": ["./src/**/*"]
 }
diff --git a/packages/b2c-tooling/package.json b/packages/b2c-tooling/package.json
@@ -14,6 +14,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "development": "./src/index.ts",
       "import": {
         "types": "./dist/esm/index.d.ts",
         "default": "./dist/esm/index.js"
@@ -24,6 +25,7 @@
       }
     },
     "./auth": {
+      "development": "./src/auth/index.ts",
       "import": {
         "types": "./dist/esm/auth/index.d.ts",
         "default": "./dist/esm/auth/index.js"
@@ -34,6 +36,7 @@
       }
     },
     "./instance": {
+      "development": "./src/instance/index.ts",
       "import": {
         "types": "./dist/esm/instance/index.d.ts",
         "default": "./dist/esm/instance/index.js"
@@ -44,6 +47,7 @@
       }
     },
     "./platform": {
+      "development": "./src/platform/index.ts",
       "import": {
         "types": "./dist/esm/platform/index.d.ts",
         "default": "./dist/esm/platform/index.js"
@@ -54,6 +58,7 @@
       }
     },
     "./operations/code": {
+      "development": "./src/operations/code/index.ts",
       "import": {
         "types": "./dist/esm/operations/code/index.d.ts",
         "default": "./dist/esm/operations/code/index.js"
@@ -64,6 +69,7 @@
       }
     },
     "./operations/jobs": {
+      "development": "./src/operations/jobs/index.ts",
       "import": {
         "types": "./dist/esm/operations/jobs/index.d.ts",
         "default": "./dist/esm/operations/jobs/index.js"
@@ -74,6 +80,7 @@
       }
     },
     "./operations/sites": {
+      "development": "./src/operations/sites/index.ts",
       "import": {
         "types": "./dist/esm/operations/sites/index.d.ts",
         "default": "./dist/esm/operations/sites/index.js"
@@ -84,6 +91,7 @@
       }
     },
     "./cli": {
+      "development": "./src/cli/index.ts",
       "import": {
         "types": "./dist/esm/cli/index.d.ts",
         "default": "./dist/esm/cli/index.js"
@@ -94,6 +102,7 @@
       }
     },
     "./logging": {
+      "development": "./src/logging/index.ts",
       "import": {
         "types": "./dist/esm/logging/index.d.ts",
         "default": "./dist/esm/logging/index.js"
diff --git a/packages/b2c-tooling/src/auth/api-key.ts b/packages/b2c-tooling/src/auth/api-key.ts
@@ -1,4 +1,4 @@
-import {AuthStrategy} from './types.js';
+import type {AuthStrategy} from './types.js';
 
 export class ApiKeyStrategy implements AuthStrategy {
   constructor(
diff --git a/packages/b2c-tooling/src/auth/basic.ts b/packages/b2c-tooling/src/auth/basic.ts
@@ -1,4 +1,4 @@
-import {AuthStrategy} from './types.js';
+import type {AuthStrategy} from './types.js';
 
 export class BasicAuthStrategy implements AuthStrategy {
   private encoded: string;
diff --git a/packages/b2c-tooling/src/auth/index.ts b/packages/b2c-tooling/src/auth/index.ts
@@ -30,7 +30,8 @@
  *
  * @module auth
  */
-export {AuthStrategy, AccessTokenResponse, DecodedJWT} from './types.js';
+export type {AuthStrategy, AccessTokenResponse, DecodedJWT} from './types.js';
 export {BasicAuthStrategy} from './basic.js';
-export {OAuthStrategy, OAuthConfig, decodeJWT} from './oauth.js';
+export {OAuthStrategy, decodeJWT} from './oauth.js';
+export type {OAuthConfig} from './oauth.js';
 export {ApiKeyStrategy} from './api-key.js';
diff --git a/packages/b2c-tooling/src/auth/oauth.ts b/packages/b2c-tooling/src/auth/oauth.ts
@@ -1,4 +1,4 @@
-import {AuthStrategy, AccessTokenResponse, DecodedJWT} from './types.js';
+import type {AuthStrategy, AccessTokenResponse, DecodedJWT} from './types.js';
 import {getLogger} from '../logger.js';
 
 const DEFAULT_ACCOUNT_MANAGER_HOST = 'account.demandware.com';
diff --git a/packages/b2c-tooling/src/cli/base-command.ts b/packages/b2c-tooling/src/cli/base-command.ts
@@ -1,5 +1,6 @@
-import {Command, Flags, Interfaces} from '@oclif/core';
-import {loadConfig, ResolvedConfig, LoadConfigOptions} from './config.js';
+import {Command, Flags, type Interfaces} from '@oclif/core';
+import {loadConfig} from './config.js';
+import type {ResolvedConfig, LoadConfigOptions} from './config.js';
 import {setLanguage} from '../i18n/index.js';
 import {configureLogger, getLogger, type LogLevel, type Logger} from '../logging/index.js';
 
diff --git a/packages/b2c-tooling/src/cli/index.ts b/packages/b2c-tooling/src/cli/index.ts
@@ -1,8 +1,10 @@
 // Base command classes
-export {BaseCommand, Flags, Args} from './base-command.js';
+export {BaseCommand} from './base-command.js';
+export type {Flags, Args} from './base-command.js';
 export {OAuthCommand} from './oauth-command.js';
 export {InstanceCommand} from './instance-command.js';
 export {MrtCommand} from './mrt-command.js';
 
 // Config utilities
-export {loadConfig, findDwJson, ResolvedConfig, LoadConfigOptions} from './config.js';
+export {loadConfig, findDwJson} from './config.js';
+export type {ResolvedConfig, LoadConfigOptions} from './config.js';
diff --git a/packages/b2c-tooling/src/cli/instance-command.ts b/packages/b2c-tooling/src/cli/instance-command.ts
@@ -1,7 +1,8 @@
 import {Command, Flags} from '@oclif/core';
 import {OAuthCommand} from './oauth-command.js';
-import {loadConfig, ResolvedConfig, LoadConfigOptions} from './config.js';
-import {AuthStrategy} from '../auth/types.js';
+import {loadConfig} from './config.js';
+import type {ResolvedConfig, LoadConfigOptions} from './config.js';
+import type {AuthStrategy} from '../auth/types.js';
 import {BasicAuthStrategy} from '../auth/basic.js';
 import {OAuthStrategy} from '../auth/oauth.js';
 import {B2CInstance} from '../instance/index.js';
diff --git a/packages/b2c-tooling/src/cli/mrt-command.ts b/packages/b2c-tooling/src/cli/mrt-command.ts
@@ -1,9 +1,11 @@
 import {Command, Flags} from '@oclif/core';
 import {BaseCommand} from './base-command.js';
-import {loadConfig, ResolvedConfig, LoadConfigOptions} from './config.js';
-import {AuthStrategy} from '../auth/types.js';
+import {loadConfig} from './config.js';
+import type {ResolvedConfig, LoadConfigOptions} from './config.js';
+import type {AuthStrategy} from '../auth/types.js';
 import {ApiKeyStrategy} from '../auth/api-key.js';
-import {MrtClient, MrtProject} from '../platform/mrt.js';
+import {MrtClient} from '../platform/mrt.js';
+import type {MrtProject} from '../platform/mrt.js';
 import {t} from '../i18n/index.js';
 
 /**
diff --git a/packages/b2c-tooling/src/cli/oauth-command.ts b/packages/b2c-tooling/src/cli/oauth-command.ts
@@ -1,7 +1,8 @@
 import {Command, Flags} from '@oclif/core';
 import {BaseCommand} from './base-command.js';
-import {loadConfig, ResolvedConfig, LoadConfigOptions} from './config.js';
-import {AuthStrategy} from '../auth/types.js';
+import {loadConfig} from './config.js';
+import type {ResolvedConfig, LoadConfigOptions} from './config.js';
+import type {AuthStrategy} from '../auth/types.js';
 import {OAuthStrategy} from '../auth/oauth.js';
 import {t} from '../i18n/index.js';
 
diff --git a/packages/b2c-tooling/src/i18n/index.ts b/packages/b2c-tooling/src/i18n/index.ts
@@ -53,7 +53,7 @@
  *
  * @module i18n
  */
-import i18next, {TOptions, Resource} from 'i18next';
+import i18next, {type TOptions, type Resource} from 'i18next';
 
 // Re-export TOptions for consumers
 export type {TOptions} from 'i18next';
diff --git a/packages/b2c-tooling/src/index.ts b/packages/b2c-tooling/src/index.ts
@@ -11,28 +11,24 @@ export {t, setLanguage, getLanguage, getI18nInstance, registerTranslations, B2C_
 export type {TOptions} from './i18n/index.js';
 
 // Auth Layer - Strategies
-export {
-  AuthStrategy,
-  AccessTokenResponse,
-  DecodedJWT,
-  BasicAuthStrategy,
-  OAuthStrategy,
-  OAuthConfig,
-  ApiKeyStrategy,
-  decodeJWT,
-} from './auth/index.js';
+export {BasicAuthStrategy, OAuthStrategy, ApiKeyStrategy, decodeJWT} from './auth/index.js';
+export type {AuthStrategy, AccessTokenResponse, DecodedJWT, OAuthConfig} from './auth/index.js';
 
 // Context Layer - Instance
-export {B2CInstance, InstanceConfig} from './instance/index.js';
+export {B2CInstance} from './instance/index.js';
+export type {InstanceConfig} from './instance/index.js';
 
 // Context Layer - Platform
-export {MrtClient, MrtProject, OdsClient, OdsConfig} from './platform/index.js';
+export {MrtClient, OdsClient} from './platform/index.js';
+export type {MrtProject, OdsConfig} from './platform/index.js';
 
 // Operations - Code
 export {uploadCartridges, activateCodeVersion} from './operations/code/index.js';
 
 // Operations - Jobs
-export {runJob, getJobStatus, JobExecutionResult} from './operations/jobs/index.js';
+export {runJob, getJobStatus} from './operations/jobs/index.js';
+export type {JobExecutionResult} from './operations/jobs/index.js';
 
 // Operations - Sites
-export {listSites, getSite, Site} from './operations/sites/index.js';
+export {listSites, getSite} from './operations/sites/index.js';
+export type {Site} from './operations/sites/index.js';
diff --git a/packages/b2c-tooling/src/instance/index.ts b/packages/b2c-tooling/src/instance/index.ts
@@ -27,7 +27,7 @@
  *
  * @module instance
  */
-import {AuthStrategy} from '../auth/types.js';
+import type {AuthStrategy} from '../auth/types.js';
 
 export interface InstanceConfig {
   hostname: string;
diff --git a/packages/b2c-tooling/src/logging/logger.ts b/packages/b2c-tooling/src/logging/logger.ts
@@ -5,7 +5,30 @@
 import pino from 'pino';
 import pretty from 'pino-pretty';
 import type {Logger, LoggerOptions} from './types.js';
-import {getRedactPaths} from './redaction.js';
+
+const REDACT_FIELDS = [
+  'password',
+  'client_secret',
+  'clientSecret',
+  'access_token',
+  'accessToken',
+  'refresh_token',
+  'refreshToken',
+  'api_key',
+  'apiKey',
+  'token',
+  'secret',
+  'authorization',
+];
+
+const REDACT_PATHS = REDACT_FIELDS.flatMap((field) => [field, `*.${field}`]);
+
+function censor(value: unknown): string {
+  if (typeof value === 'string' && value.length > 10) {
+    return `${value.slice(0, 4)}REDACTED`;
+  }
+  return 'REDACTED';
+}
 
 let globalLogger: Logger | null = null;
 let globalOptions: LoggerOptions = {level: 'info'};
@@ -25,8 +48,8 @@ function createPinoLogger(options: LoggerOptions): Logger {
 
   if (options.redact !== false) {
     pinoOptions.redact = {
-      paths: getRedactPaths(),
-      censor: '[REDACTED]',
+      paths: REDACT_PATHS,
+      censor,
     };
   }
 
diff --git a/packages/b2c-tooling/src/logging/redaction.ts b/packages/b2c-tooling/src/logging/redaction.ts
diff --git a/packages/b2c-tooling/src/operations/jobs/index.ts b/packages/b2c-tooling/src/operations/jobs/index.ts
@@ -41,4 +41,5 @@
  *
  * @module operations/jobs
  */
-export {runJob, getJobStatus, JobExecutionResult} from './run.js';
+export {runJob, getJobStatus} from './run.js';
+export type {JobExecutionResult} from './run.js';
diff --git a/packages/b2c-tooling/src/platform/index.ts b/packages/b2c-tooling/src/platform/index.ts
@@ -32,5 +32,7 @@
  *
  * @module platform
  */
-export {MrtClient, MrtProject} from './mrt.js';
-export {OdsClient, OdsConfig} from './ods.js';
+export {MrtClient} from './mrt.js';
+export type {MrtProject} from './mrt.js';
+export {OdsClient} from './ods.js';
+export type {OdsConfig} from './ods.js';
diff --git a/packages/b2c-tooling/src/platform/mrt.ts b/packages/b2c-tooling/src/platform/mrt.ts
@@ -1,4 +1,4 @@
-import {AuthStrategy} from '../auth/types.js';
+import type {AuthStrategy} from '../auth/types.js';
 
 export interface MrtProject {
   org: string;
diff --git a/packages/b2c-tooling/src/platform/ods.ts b/packages/b2c-tooling/src/platform/ods.ts
@@ -1,4 +1,4 @@
-import {AuthStrategy} from '../auth/types.js';
+import type {AuthStrategy} from '../auth/types.js';
 
 export interface OdsConfig {
   region?: string;
diff --git a/packages/b2c-tooling/tsconfig.cjs.json b/packages/b2c-tooling/tsconfig.cjs.json
@@ -4,6 +4,7 @@
     "module": "CommonJS",
     "moduleResolution": "node",
     "outDir": "dist/cjs",
-    "rootDir": "src"
+    "rootDir": "src",
+    "verbatimModuleSyntax": false
   }
 }
diff --git a/packages/b2c-tooling/tsconfig.json b/packages/b2c-tooling/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "skipLibCheck": true,
     "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    "verbatimModuleSyntax": true
   },
   "include": ["src/**/*"]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env -S node --import tsx`
	`1`	`+#!/usr/bin/env -S node --conditions development --import tsx`
`2`	`2`
`3`	`3`	`import {execute} from '@oclif/core';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {AuthStrategy} from './types.js';`
	`1`	`+import type {AuthStrategy} from './types.js';`
`2`	`2`
`3`	`3`	`export class ApiKeyStrategy implements AuthStrategy {`
`4`	`4`	`constructor(`