localization; linting fixes

Author: clavery

.github/workflows/ci.yml

@@ -49,8 +49,5 @@ jobs:
       - name: Build packages
         run: pnpm -r run build
 
-      - name: Run tests
+      - name: Run tests and lint
         run: pnpm -r run test
-
-      - name: Run linter
-        run: pnpm -r run lint

.gitignore

@@ -14,3 +14,4 @@ package-lock.json
 
 .claude/settings.local.json
 .envrc
+CLAUDE.md

packages/b2c-cli/eslint.config.mjs

@@ -6,4 +6,34 @@ import {fileURLToPath} from 'node:url'
 
 const gitignorePath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '.gitignore')
 
-export default [includeIgnoreFile(gitignorePath), ...oclif, prettier]
+export default [
+  includeIgnoreFile(gitignorePath),
+  ...oclif,
+  prettier,
+  {
+    rules: {
+      // Disable perfectionist rules - we use prettier for formatting
+      'perfectionist/sort-imports': 'off',
+      'perfectionist/sort-objects': 'off',
+      'perfectionist/sort-object-types': 'off',
+      'perfectionist/sort-interfaces': 'off',
+      'perfectionist/sort-named-exports': 'off',
+      'perfectionist/sort-named-imports': 'off',
+      // Disable stylistic rules that conflict with our style
+      '@stylistic/lines-between-class-members': 'off',
+      '@stylistic/padding-line-between-statements': 'off',
+      // Allow TODO comments
+      'no-warning-comments': 'off',
+      // Don't require destructuring
+      'prefer-destructuring': 'off',
+      // Allow underscore-prefixed unused variables
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+        },
+      ],
+    },
+  },
+]

packages/b2c-cli/src/commands/code/deploy.ts

@@ -1,6 +1,7 @@
 import { Args } from '@oclif/core'
 import { uploadCartridges } from '@salesforce/b2c-tooling'
 import { InstanceCommand } from '@salesforce/b2c-tooling/cli'
+import { t } from '../../i18n/index.js'
 
 export default class Deploy extends InstanceCommand<typeof Deploy> {
   static args = {
@@ -10,7 +11,7 @@ export default class Deploy extends InstanceCommand<typeof Deploy> {
     }),
   }
 
-  static description = 'Deploy cartridges to a B2C Commerce instance'
+  static description = t('commands.code.deploy.description', 'Deploy cartridges to a B2C Commerce instance')
 
   static examples = [
     '<%= config.bin %> <%= command.id %>',
@@ -24,17 +25,20 @@ export default class Deploy extends InstanceCommand<typeof Deploy> {
     this.requireWebDavCredentials()
 
     const instance = this.createWebDavInstance()
+    const path = this.args.cartridgePath
+    const hostname = this.resolvedConfig.hostname!
+    const version = this.resolvedConfig.codeVersion!
 
-    this.log(`Deploying cartridges from ${this.args.cartridgePath}...`)
-    this.log(`Target: ${this.resolvedConfig.hostname}`)
-    this.log(`Code Version: ${this.resolvedConfig.codeVersion}`)
+    this.log(t('commands.code.deploy.deploying', 'Deploying cartridges from {{path}}...', { path }))
+    this.log(t('commands.code.deploy.target', 'Target: {{hostname}}', { hostname }))
+    this.log(t('commands.code.deploy.codeVersion', 'Code Version: {{version}}', { version }))
 
     try {
-      await uploadCartridges(instance, this.args.cartridgePath)
-      this.log('Deployment complete')
+      await uploadCartridges(instance, path)
+      this.log(t('commands.code.deploy.complete', 'Deployment complete'))
     } catch (error) {
       if (error instanceof Error) {
-        this.error(`Deployment failed: ${error.message}`)
+        this.error(t('commands.code.deploy.failed', 'Deployment failed: {{message}}', { message: error.message }))
       }
       throw error
     }

packages/b2c-cli/src/commands/mrt/env-var/set.ts

@@ -1,5 +1,6 @@
 import { Args, Flags } from '@oclif/core'
 import { MrtCommand } from '@salesforce/b2c-tooling/cli'
+import { t } from '../../../i18n/index.js'
 
 /**
  * Stub command demonstrating MrtCommand usage.
@@ -17,7 +18,7 @@ export default class MrtEnvVarSet extends MrtCommand<typeof MrtEnvVarSet> {
     }),
   }
 
-  static description = 'Set an environment variable on a Managed Runtime project'
+  static description = t('commands.mrt.envVar.set.description', 'Set an environment variable on a Managed Runtime project')
 
   static examples = [
     '<%= config.bin %> <%= command.id %> MY_VAR "my value" --project acme-storefront --environment production',
@@ -38,14 +39,19 @@ export default class MrtEnvVarSet extends MrtCommand<typeof MrtEnvVarSet> {
   async run(): Promise<void> {
     this.requireMrtCredentials()
 
-    this.log(`Setting ${this.args.key} on ${this.flags.project}/${this.flags.environment}...`)
+    const key = this.args.key
+    const value = this.args.value
+    const project = this.flags.project
+    const environment = this.flags.environment
+
+    this.log(t('commands.mrt.envVar.set.setting', 'Setting {{key}} on {{project}}/{{environment}}...', { key, project, environment }))
 
     // TODO: Implement actual MRT API call using this.createMrtClient()
 
     this.log('')
-    this.log('(stub) Environment variable setting not yet implemented')
-    this.log(`Would set ${this.args.key}=${this.args.value}`)
-    this.log(`Project: ${this.flags.project}`)
-    this.log(`Environment: ${this.flags.environment}`)
+    this.log(t('commands.mrt.envVar.set.stub', '(stub) Environment variable setting not yet implemented'))
+    this.log(t('commands.mrt.envVar.set.wouldSet', 'Would set {{key}}={{value}}', { key, value }))
+    this.log(t('commands.mrt.envVar.set.project', 'Project: {{project}}', { project }))
+    this.log(t('commands.mrt.envVar.set.environment', 'Environment: {{environment}}', { environment }))
   }
 }

packages/b2c-cli/src/commands/sandbox/create.ts

@@ -1,5 +1,6 @@
 import { Args, Flags } from '@oclif/core'
 import { OAuthCommand } from '@salesforce/b2c-tooling/cli'
+import { t } from '../../i18n/index.js'
 
 /**
  * Stub command demonstrating OAuthCommand usage.
@@ -13,7 +14,7 @@ export default class SandboxCreate extends OAuthCommand<typeof SandboxCreate> {
     }),
   }
 
-  static description = 'Create a new on-demand sandbox'
+  static description = t('commands.sandbox.create.description', 'Create a new on-demand sandbox')
 
   static examples = [
     '<%= config.bin %> <%= command.id %> abcd --ttl 24',
@@ -34,14 +35,19 @@ export default class SandboxCreate extends OAuthCommand<typeof SandboxCreate> {
   async run(): Promise<void> {
     this.requireOAuthCredentials()
 
-    this.log(`Creating sandbox in realm ${this.args.realm}...`)
-    this.log(`Profile: ${this.flags.profile}`)
-    this.log(`TTL: ${this.flags.ttl} hours`)
+    const realm = this.args.realm
+    const profile = this.flags.profile
+    const ttl = this.flags.ttl
+    const clientId = this.resolvedConfig.clientId
+
+    this.log(t('commands.sandbox.create.creating', 'Creating sandbox in realm {{realm}}...', { realm }))
+    this.log(t('commands.sandbox.create.profile', 'Profile: {{profile}}', { profile }))
+    this.log(t('commands.sandbox.create.ttl', 'TTL: {{ttl}} hours', { ttl }))
 
     // TODO: Implement actual ODS API call using this.getOAuthStrategy()
 
     this.log('')
-    this.log('(stub) Sandbox creation not yet implemented')
-    this.log(`Would create sandbox with OAuth client: ${this.resolvedConfig.clientId}`)
+    this.log(t('commands.sandbox.create.stub', '(stub) Sandbox creation not yet implemented'))
+    this.log(t('commands.sandbox.create.wouldCreate', 'Would create sandbox with OAuth client: {{clientId}}', { clientId }))
   }
 }

packages/b2c-cli/src/commands/sites/list.ts

@@ -1,4 +1,5 @@
 import { InstanceCommand } from '@salesforce/b2c-tooling/cli'
+import { t } from '../../i18n/index.js'
 
 interface SitesResponse {
   _v: string
@@ -12,7 +13,7 @@ interface SitesResponse {
 }
 
 export default class SitesList extends InstanceCommand<typeof SitesList> {
-  static description = 'List sites on a B2C Commerce instance'
+  static description = t('commands.sites.list.description', 'List sites on a B2C Commerce instance')
 
   static examples = [
     '<%= config.bin %> <%= command.id %>',
@@ -24,37 +25,46 @@ export default class SitesList extends InstanceCommand<typeof SitesList> {
     this.requireOAuthCredentials()
 
     const instance = this.createApiInstance()
+    const hostname = this.resolvedConfig.hostname!
 
-    this.log(`Fetching sites from ${this.resolvedConfig.hostname}...`)
+    this.log(t('commands.sites.list.fetching', 'Fetching sites from {{hostname}}...', { hostname }))
 
     try {
       const response = await instance.ocapiDataRequest('sites?select=(**)')
 
       if (!response.ok) {
         const errorText = await response.text()
-        this.error(`Failed to fetch sites: ${response.status} ${response.statusText}\n${errorText}`)
+        this.error(
+          t('commands.sites.list.fetchFailed', 'Failed to fetch sites: {{status}} {{statusText}}\n{{error}}', {
+            status: response.status,
+            statusText: response.statusText,
+            error: errorText,
+          })
+        )
       }
 
       const data = (await response.json()) as SitesResponse
 
       if (data.count === 0) {
-        this.log('No sites found.')
+        this.log(t('commands.sites.list.noSites', 'No sites found.'))
         return
       }
 
-      this.log(`\nFound ${data.count} site(s):\n`)
+      this.log('')
+      this.log(t('commands.sites.list.foundSites', 'Found {{count}} site(s):', { count: data.count }))
+      this.log('')
 
       for (const site of data.data) {
         const displayName = site.display_name?.default || site.id
         const status = site.status || 'unknown'
         this.log(`  ${site.id}`)
-        this.log(`    Display Name: ${displayName}`)
-        this.log(`    Status: ${status}`)
+        this.log(`    ${t('commands.sites.list.displayName', 'Display Name: {{name}}', { name: displayName })}`)
+        this.log(`    ${t('commands.sites.list.status', 'Status: {{status}}', { status })}`)
         this.log('')
       }
     } catch (error) {
       if (error instanceof Error) {
-        this.error(`Failed to fetch sites: ${error.message}`)
+        this.error(t('commands.sites.list.error', 'Failed to fetch sites: {{message}}', { message: error.message }))
       }
       throw error
     }

packages/b2c-cli/src/i18n/index.ts

@@ -0,0 +1,42 @@
+/**
+ * i18n setup for b2c-cli.
+ *
+ * This module registers CLI-specific translations with the 'cli' namespace.
+ * The core i18n infrastructure comes from @salesforce/b2c-tooling.
+ *
+ * Usage in commands:
+ *   import { t } from '../i18n/index.js'
+ *   this.log(t('commands.sites.list.fetching', 'Fetching sites from {{hostname}}...', { hostname }))
+ */
+
+import {registerTranslations, t as toolingT, TOptions} from '@salesforce/b2c-tooling'
+import {locales} from './locales/index.js'
+
+/** The namespace used by b2c-cli messages */
+export const CLI_NAMESPACE = 'cli'
+
+// Register all CLI translations
+for (const [lang, translations] of Object.entries(locales)) {
+  registerTranslations(CLI_NAMESPACE, lang, translations)
+}
+
+/**
+ * Translate a CLI message key with an inline default.
+ *
+ * This is a convenience wrapper that uses the 'cli' namespace.
+ * For b2c-tooling messages, import t directly from @salesforce/b2c-tooling.
+ *
+ * @param key - Dot-notation key (e.g., 'commands.sites.list.fetching')
+ * @param defaultValue - The default English string
+ * @param options - Optional interpolation values
+ * @returns The translated string
+ *
+ * @example
+ * t('commands.sites.list.fetching', 'Fetching sites from {{hostname}}...', { hostname })
+ */
+export function t(key: string, defaultValue: string, options?: TOptions): string {
+  return toolingT(`${CLI_NAMESPACE}:${key}`, defaultValue, options)
+}
+
+// Re-export for convenience
+export {setLanguage, getLanguage, getI18nInstance} from '@salesforce/b2c-tooling'

packages/b2c-cli/src/i18n/locales/de.ts

@@ -0,0 +1,51 @@
+/**
+ * DE - German translations for b2c-cli commands.
+ */
+export const de = {
+  commands: {
+    sites: {
+      list: {
+        description: 'Sites auf einer B2C Commerce-Instanz auflisten',
+        fetching: 'Rufe Sites von {{hostname}} ab...',
+        fetchFailed: 'Sites konnten nicht abgerufen werden: {{status}} {{statusText}}\n{{error}}',
+        noSites: 'Keine Sites gefunden.',
+        foundSites: '{{count}} Site(s) gefunden:',
+        displayName: 'Anzeigename: {{name}}',
+        status: 'Status: {{status}}',
+        error: 'Sites konnten nicht abgerufen werden: {{message}}',
+      },
+    },
+    code: {
+      deploy: {
+        description: 'Cartridges auf eine B2C Commerce-Instanz deployen',
+        deploying: 'Deploye Cartridges von {{path}}...',
+        target: 'Ziel: {{hostname}}',
+        codeVersion: 'Code-Version: {{version}}',
+        complete: 'Deployment abgeschlossen',
+        failed: 'Deployment fehlgeschlagen: {{message}}',
+      },
+    },
+    sandbox: {
+      create: {
+        description: 'Eine neue On-Demand-Sandbox erstellen',
+        creating: 'Erstelle Sandbox in Realm {{realm}}...',
+        profile: 'Profil: {{profile}}',
+        ttl: 'TTL: {{ttl}} Stunden',
+        stub: '(stub) Sandbox-Erstellung noch nicht implementiert',
+        wouldCreate: 'Würde Sandbox mit OAuth-Client erstellen: {{clientId}}',
+      },
+    },
+    mrt: {
+      envVar: {
+        set: {
+          description: 'Eine Umgebungsvariable für ein Managed Runtime-Projekt setzen',
+          setting: 'Setze {{key}} auf {{project}}/{{environment}}...',
+          stub: '(stub) Umgebungsvariablen-Einstellung noch nicht implementiert',
+          wouldSet: 'Würde {{key}}={{value}} setzen',
+          project: 'Projekt: {{project}}',
+          environment: 'Umgebung: {{environment}}',
+        },
+      },
+    },
+  },
+}

packages/b2c-cli/src/i18n/locales/en.ts

@@ -0,0 +1,54 @@
+/**
+ * EN - English translations for b2c-cli commands.
+ *
+ * Note: These serve as documentation of translatable strings.
+ * English defaults are also defined inline at point of use via t().
+ */
+export const en = {
+  commands: {
+    sites: {
+      list: {
+        description: 'List sites on a B2C Commerce instance',
+        fetching: 'Fetching sites from {{hostname}}...',
+        fetchFailed: 'Failed to fetch sites: {{status}} {{statusText}}\n{{error}}',
+        noSites: 'No sites found.',
+        foundSites: 'Found {{count}} site(s):',
+        displayName: 'Display Name: {{name}}',
+        status: 'Status: {{status}}',
+        error: 'Failed to fetch sites: {{message}}',
+      },
+    },
+    code: {
+      deploy: {
+        description: 'Deploy cartridges to a B2C Commerce instance',
+        deploying: 'Deploying cartridges from {{path}}...',
+        target: 'Target: {{hostname}}',
+        codeVersion: 'Code Version: {{version}}',
+        complete: 'Deployment complete',
+        failed: 'Deployment failed: {{message}}',
+      },
+    },
+    sandbox: {
+      create: {
+        description: 'Create a new on-demand sandbox',
+        creating: 'Creating sandbox in realm {{realm}}...',
+        profile: 'Profile: {{profile}}',
+        ttl: 'TTL: {{ttl}} hours',
+        stub: '(stub) Sandbox creation not yet implemented',
+        wouldCreate: 'Would create sandbox with OAuth client: {{clientId}}',
+      },
+    },
+    mrt: {
+      envVar: {
+        set: {
+          description: 'Set an environment variable on a Managed Runtime project',
+          setting: 'Setting {{key}} on {{project}}/{{environment}}...',
+          stub: '(stub) Environment variable setting not yet implemented',
+          wouldSet: 'Would set {{key}}={{value}}',
+          project: 'Project: {{project}}',
+          environment: 'Environment: {{environment}}',
+        },
+      },
+    },
+  },
+}