@salesforce/b2c-tooling-sdk 0.0.1 → 0.0.3

package/dist/cjs/cli/base-command.d.ts

@@ -0,0 +1,98 @@
+import { Command, type Interfaces } from '@oclif/core';
+import type { ResolvedB2CConfig } from '../config/index.js';
+import { type Logger } from '../logging/index.js';
+import { type ExtraParamsConfig } from '../clients/middleware.js';
+import type { ConfigSource } from '../config/types.js';
+export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof BaseCommand)['baseFlags'] & T['flags']>;
+export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
+/**
+ * Base command class for B2C CLI tools.
+ *
+ * Environment variables for logging:
+ * - SFCC_LOG_TO_STDOUT: Send logs to stdout instead of stderr
+ * - SFCC_LOG_COLORIZE: Force colors on/off (default: auto-detect TTY)
+ * - SFCC_REDACT_SECRETS: Set to 'false' to disable secret redaction
+ * - NO_COLOR: Industry standard to disable colors
+ */
+export declare abstract class BaseCommand<T extends typeof Command> extends Command {
+    static baseFlags: {
+        'log-level': Interfaces.OptionFlag<"trace" | "debug" | "info" | "warn" | "error" | "silent" | undefined, Interfaces.CustomOptions>;
+        debug: Interfaces.BooleanFlag<boolean>;
+        json: Interfaces.BooleanFlag<boolean>;
+        lang: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
+        config: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
+        instance: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
+        'working-directory': Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
+        'extra-query': Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
+        'extra-body': Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
+        'extra-headers': Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
+    };
+    protected flags: Flags<T>;
+    protected args: Args<T>;
+    protected resolvedConfig: ResolvedB2CConfig;
+    protected logger: Logger;
+    /** High-priority config sources from plugins (inserted before defaults) */
+    protected pluginSourcesBefore: ConfigSource[];
+    /** Low-priority config sources from plugins (inserted after defaults) */
+    protected pluginSourcesAfter: ConfigSource[];
+    init(): Promise<void>;
+    /**
+     * Determine colorize setting based on env vars and TTY.
+     * Priority: NO_COLOR > SFCC_LOG_COLORIZE > TTY detection
+     */
+    private shouldColorize;
+    protected configureLogging(): void;
+    /**
+     * Override oclif's log() to use pino.
+     */
+    log(message?: string, ...args: unknown[]): void;
+    /**
+     * Override oclif's warn() to use pino.
+     */
+    warn(input: string | Error): string | Error;
+    protected loadConfiguration(): ResolvedB2CConfig;
+    /**
+     * Collects config sources from plugins via the `b2c:config-sources` hook.
+     *
+     * This method is called during command initialization, after flags are parsed
+     * but before configuration is resolved. It allows CLI plugins to provide
+     * custom ConfigSource implementations.
+     *
+     * Plugin sources are collected into two arrays based on their priority:
+     * - `pluginSourcesBefore`: High priority sources (override defaults)
+     * - `pluginSourcesAfter`: Low priority sources (fill gaps)
+     */
+    protected collectPluginConfigSources(): Promise<void>;
+    /**
+     * Collects HTTP middleware from plugins via the `b2c:http-middleware` hook.
+     *
+     * This method is called during command initialization, after flags are parsed
+     * but before any API clients are created. It allows CLI plugins to provide
+     * custom middleware that will be applied to all HTTP clients.
+     *
+     * Plugin middleware is registered with the global middleware registry.
+     */
+    protected collectPluginHttpMiddleware(): Promise<void>;
+    /**
+     * Handle errors thrown during command execution.
+     *
+     * Logs the error using the structured logger (including cause if available).
+     * In JSON mode, outputs a JSON error object to stdout instead of oclif's default format.
+     */
+    protected catch(err: Error & {
+        exitCode?: number;
+    }): Promise<never>;
+    baseCommandTest(): void;
+    /**
+     * Parse extra params from --extra-query, --extra-body, and --extra-headers flags.
+     * Returns undefined if no extra params are specified.
+     *
+     * @returns ExtraParamsConfig or undefined
+     */
+    protected getExtraParams(): ExtraParamsConfig | undefined;
+    /**
+     * Register extra params (query, body, headers) as global middleware.
+     * This applies to ALL HTTP clients created during command execution.
+     */
+    private registerExtraParamsMiddleware;
+}

package/dist/cjs/cli/base-command.js

@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2025, Salesforce, Inc.
+ * SPDX-License-Identifier: Apache-2
+ * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
+ */
+import { Command, Flags } from '@oclif/core';
+import { loadConfig } from './config.js';
+import { setLanguage } from '../i18n/index.js';
+import { configureLogger, getLogger } from '../logging/index.js';
+import { createExtraParamsMiddleware } from '../clients/middleware.js';
+import { globalMiddlewareRegistry } from '../clients/middleware-registry.js';
+const LOG_LEVELS = ['trace', 'debug', 'info', 'warn', 'error', 'silent'];
+/**
+ * Base command class for B2C CLI tools.
+ *
+ * Environment variables for logging:
+ * - SFCC_LOG_TO_STDOUT: Send logs to stdout instead of stderr
+ * - SFCC_LOG_COLORIZE: Force colors on/off (default: auto-detect TTY)
+ * - SFCC_REDACT_SECRETS: Set to 'false' to disable secret redaction
+ * - NO_COLOR: Industry standard to disable colors
+ */
+export class BaseCommand extends Command {
+    static baseFlags = {
+        'log-level': Flags.option({
+            description: 'Set logging verbosity level',
+            env: 'SFCC_LOG_LEVEL',
+            options: LOG_LEVELS,
+            helpGroup: 'GLOBAL',
+        })(),
+        debug: Flags.boolean({
+            char: 'D',
+            description: 'Enable debug logging (shorthand for --log-level debug)',
+            env: 'SFCC_DEBUG',
+            default: false,
+            helpGroup: 'GLOBAL',
+        }),
+        json: Flags.boolean({
+            description: 'Output logs as JSON lines',
+            default: false,
+            helpGroup: 'GLOBAL',
+        }),
+        lang: Flags.string({
+            char: 'L',
+            description: 'Language for messages (e.g., en, de). Also respects LANGUAGE env var.',
+            helpGroup: 'GLOBAL',
+        }),
+        config: Flags.string({
+            description: 'Path to config file (in dw.json format; defaults to ./dw.json)',
+            env: 'SFCC_CONFIG',
+            helpGroup: 'GLOBAL',
+        }),
+        instance: Flags.string({
+            char: 'i',
+            description: 'Instance name from configuration file (i.e. dw.json, etc)',
+            env: 'SFCC_INSTANCE',
+            helpGroup: 'GLOBAL',
+        }),
+        'working-directory': Flags.string({
+            description: 'Project working directory',
+            env: 'SFCC_WORKING_DIRECTORY',
+            helpGroup: 'GLOBAL',
+        }),
+        'extra-query': Flags.string({
+            description: 'Extra query parameters as JSON (e.g., \'{"debug":"true"}\')',
+            env: 'SFCC_EXTRA_QUERY',
+            helpGroup: 'GLOBAL',
+            hidden: true,
+        }),
+        'extra-body': Flags.string({
+            description: 'Extra body fields to merge as JSON (e.g., \'{"_internal":true}\')',
+            env: 'SFCC_EXTRA_BODY',
+            helpGroup: 'GLOBAL',
+            hidden: true,
+        }),
+        'extra-headers': Flags.string({
+            description: 'Extra HTTP headers as JSON (e.g., \'{"X-Custom-Header": "value"}\')',
+            env: 'SFCC_EXTRA_HEADERS',
+            helpGroup: 'GLOBAL',
+            hidden: true,
+        }),
+    };
+    flags;
+    args;
+    resolvedConfig;
+    logger;
+    /** High-priority config sources from plugins (inserted before defaults) */
+    pluginSourcesBefore = [];
+    /** Low-priority config sources from plugins (inserted after defaults) */
+    pluginSourcesAfter = [];
+    async init() {
+        await super.init();
+        const { args, flags } = await this.parse({
+            flags: this.ctor.flags,
+            baseFlags: super.ctor.baseFlags,
+            args: this.ctor.args,
+            strict: this.ctor.strict,
+        });
+        this.flags = flags;
+        this.args = args;
+        if (this.flags.lang) {
+            setLanguage(this.flags.lang);
+        }
+        this.configureLogging();
+        // Register extra params middleware (from --extra-query, --extra-body, --extra-headers flags)
+        // This must happen before any API clients are created
+        this.registerExtraParamsMiddleware();
+        // Collect middleware from plugins before any API clients are created
+        await this.collectPluginHttpMiddleware();
+        // Collect config sources from plugins before loading configuration
+        await this.collectPluginConfigSources();
+        this.resolvedConfig = this.loadConfiguration();
+    }
+    /**
+     * Determine colorize setting based on env vars and TTY.
+     * Priority: NO_COLOR > SFCC_LOG_COLORIZE > TTY detection
+     */
+    shouldColorize() {
+        if (process.env.NO_COLOR !== undefined) {
+            return false;
+        }
+        // Default: colorize if stderr is a TTY
+        return process.stderr.isTTY ?? false;
+    }
+    configureLogging() {
+        let level = 'info';
+        if (this.flags['log-level']) {
+            level = this.flags['log-level'];
+        }
+        else if (this.flags.debug) {
+            level = 'debug';
+        }
+        // Default to stderr (fd 2), allow override to stdout (fd 1)
+        const fd = process.env.SFCC_LOG_TO_STDOUT ? 1 : 2;
+        // Redaction: default true, can be disabled
+        const redact = process.env.SFCC_REDACT_SECRETS !== 'false';
+        configureLogger({
+            level,
+            fd,
+            baseContext: { command: this.id },
+            json: this.flags.json,
+            colorize: this.shouldColorize(),
+            redact,
+        });
+        this.logger = getLogger();
+    }
+    /**
+     * Override oclif's log() to use pino.
+     */
+    log(message, ...args) {
+        if (message !== undefined) {
+            this.logger.info(args.length > 0 ? `${message} ${args.join(' ')}` : message);
+        }
+    }
+    /**
+     * Override oclif's warn() to use pino.
+     */
+    warn(input) {
+        const message = input instanceof Error ? input.message : input;
+        this.logger.warn(message);
+        return input;
+    }
+    loadConfiguration() {
+        const options = {
+            instance: this.flags.instance,
+            configPath: this.flags.config,
+        };
+        const pluginSources = {
+            before: this.pluginSourcesBefore,
+            after: this.pluginSourcesAfter,
+        };
+        return loadConfig({}, options, pluginSources);
+    }
+    /**
+     * Collects config sources from plugins via the `b2c:config-sources` hook.
+     *
+     * This method is called during command initialization, after flags are parsed
+     * but before configuration is resolved. It allows CLI plugins to provide
+     * custom ConfigSource implementations.
+     *
+     * Plugin sources are collected into two arrays based on their priority:
+     * - `pluginSourcesBefore`: High priority sources (override defaults)
+     * - `pluginSourcesAfter`: Low priority sources (fill gaps)
+     */
+    async collectPluginConfigSources() {
+        // Access flags that may be defined in subclasses (OAuthCommand, InstanceCommand)
+        const flags = this.flags;
+        const hookOptions = {
+            instance: this.flags.instance,
+            configPath: this.flags.config,
+            flags,
+            resolveOptions: {
+                instance: this.flags.instance,
+                configPath: this.flags.config,
+                accountManagerHost: flags['account-manager-host'],
+            },
+        };
+        const hookResult = await this.config.runHook('b2c:config-sources', hookOptions);
+        // Collect sources from all plugins that responded, respecting priority
+        for (const success of hookResult.successes) {
+            const result = success.result;
+            if (!result?.sources?.length)
+                continue;
+            if (result.priority === 'before') {
+                this.pluginSourcesBefore.push(...result.sources);
+            }
+            else {
+                // Default priority is 'after'
+                this.pluginSourcesAfter.push(...result.sources);
+            }
+        }
+        // Log warnings for hook failures (don't break the CLI)
+        for (const failure of hookResult.failures) {
+            this.logger?.warn(`Plugin ${failure.plugin.name} b2c:config-sources hook failed: ${failure.error.message}`);
+        }
+    }
+    /**
+     * Collects HTTP middleware from plugins via the `b2c:http-middleware` hook.
+     *
+     * This method is called during command initialization, after flags are parsed
+     * but before any API clients are created. It allows CLI plugins to provide
+     * custom middleware that will be applied to all HTTP clients.
+     *
+     * Plugin middleware is registered with the global middleware registry.
+     */
+    async collectPluginHttpMiddleware() {
+        const hookOptions = {
+            flags: this.flags,
+        };
+        const hookResult = await this.config.runHook('b2c:http-middleware', hookOptions);
+        // Register middleware from all plugins that responded
+        for (const success of hookResult.successes) {
+            const result = success.result;
+            if (!result?.providers?.length)
+                continue;
+            for (const provider of result.providers) {
+                globalMiddlewareRegistry.register(provider);
+                this.logger?.debug(`Registered HTTP middleware provider: ${provider.name}`);
+            }
+        }
+        // Log warnings for hook failures (don't break the CLI)
+        for (const failure of hookResult.failures) {
+            this.logger?.warn(`Plugin ${failure.plugin.name} b2c:http-middleware hook failed: ${failure.error.message}`);
+        }
+    }
+    /**
+     * Handle errors thrown during command execution.
+     *
+     * Logs the error using the structured logger (including cause if available).
+     * In JSON mode, outputs a JSON error object to stdout instead of oclif's default format.
+     */
+    async catch(err) {
+        const exitCode = err.exitCode ?? 1;
+        // Log if logger is available (may not be if error during init)
+        if (this.logger) {
+            this.logger.error({ cause: err?.cause }, err.message);
+        }
+        // In JSON mode, output structured error to stderr and exit
+        if (this.jsonEnabled()) {
+            const errorOutput = {
+                error: {
+                    message: err.message,
+                    code: exitCode,
+                    ...(err.cause ? { cause: String(err.cause) } : {}),
+                },
+            };
+            process.stderr.write(JSON.stringify(errorOutput) + '\n');
+            process.exit(exitCode);
+        }
+        // Use oclif's error() for proper exit code and display
+        this.error(err.message, { exit: exitCode });
+    }
+    baseCommandTest() {
+        this.logger.info('BaseCommand initialized');
+    }
+    /**
+     * Parse extra params from --extra-query, --extra-body, and --extra-headers flags.
+     * Returns undefined if no extra params are specified.
+     *
+     * @returns ExtraParamsConfig or undefined
+     */
+    getExtraParams() {
+        const extraQuery = this.flags['extra-query'];
+        const extraBody = this.flags['extra-body'];
+        const extraHeaders = this.flags['extra-headers'];
+        if (!extraQuery && !extraBody && !extraHeaders) {
+            return undefined;
+        }
+        const config = {};
+        if (extraQuery) {
+            try {
+                config.query = JSON.parse(extraQuery);
+            }
+            catch {
+                this.error(`Invalid JSON for --extra-query: ${extraQuery}`);
+            }
+        }
+        if (extraBody) {
+            try {
+                config.body = JSON.parse(extraBody);
+            }
+            catch {
+                this.error(`Invalid JSON for --extra-body: ${extraBody}`);
+            }
+        }
+        if (extraHeaders) {
+            try {
+                config.headers = JSON.parse(extraHeaders);
+            }
+            catch {
+                this.error(`Invalid JSON for --extra-headers: ${extraHeaders}`);
+            }
+        }
+        return config;
+    }
+    /**
+     * Register extra params (query, body, headers) as global middleware.
+     * This applies to ALL HTTP clients created during command execution.
+     */
+    registerExtraParamsMiddleware() {
+        const extraParams = this.getExtraParams();
+        if (!extraParams)
+            return;
+        globalMiddlewareRegistry.register({
+            name: 'cli-extra-params',
+            getMiddleware() {
+                return createExtraParamsMiddleware(extraParams);
+            },
+        });
+    }
+}
+//# sourceMappingURL=base-command.js.map

package/dist/cjs/cli/base-command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../../src/cli/base-command.ts"],"names":[],"mappings":"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"}

package/dist/cjs/cli/cartridge-command.d.ts

@@ -0,0 +1,65 @@
+import { Command } from '@oclif/core';
+import { InstanceCommand } from './instance-command.js';
+import { type CartridgeMapping, type FindCartridgesOptions } from '../operations/code/cartridges.js';
+import { CartridgeProviderRunner } from './cartridge-providers.js';
+/**
+ * Base command for cartridge operations (deploy, watch, etc.).
+ *
+ * Extends InstanceCommand with:
+ * - cartridgePath argument for specifying cartridge directory
+ * - cartridge include/exclude flags for filtering
+ *
+ * @example
+ * export default class MyCartridgeCommand extends CartridgeCommand<typeof MyCartridgeCommand> {
+ *   async run(): Promise<void> {
+ *     const cartridges = findCartridges(this.cartridgePath, this.cartridgeOptions);
+ *     // ...
+ *   }
+ * }
+ */
+export declare abstract class CartridgeCommand<T extends typeof Command> extends InstanceCommand<T> {
+    static baseArgs: {
+        cartridgePath: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static cartridgeFlags: {
+        cartridge: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'exclude-cartridge': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    /** Cartridge provider runner for custom cartridge discovery */
+    protected cartridgeProviderRunner?: CartridgeProviderRunner;
+    /**
+     * Override init to collect cartridge providers from plugins.
+     */
+    init(): Promise<void>;
+    /**
+     * Collects cartridge providers from plugins via the `b2c:cartridge-providers` hook.
+     */
+    protected collectCartridgeProviders(): Promise<void>;
+    /**
+     * Gets the cartridge path from args.
+     */
+    protected get cartridgePath(): string;
+    /**
+     * Gets the cartridge filter options from flags.
+     */
+    protected get cartridgeOptions(): FindCartridgesOptions;
+    /**
+     * Find cartridges using registered providers and the default discovery.
+     *
+     * This method integrates custom cartridge providers from plugins with the
+     * default `.project` file-based discovery. Providers with priority 'before'
+     * run first, then default discovery, then 'after' providers. Results are
+     * deduplicated by name (first wins) and transformers are applied.
+     *
+     * @param directory - Directory to search (defaults to cartridgePath)
+     * @param options - Filter options (defaults to cartridgeOptions)
+     * @returns Array of cartridge mappings from all sources
+     *
+     * @example
+     * ```typescript
+     * // In a cartridge command
+     * const cartridges = await this.findCartridgesWithProviders();
+     * ```
+     */
+    protected findCartridgesWithProviders(directory?: string, options?: FindCartridgesOptions): Promise<CartridgeMapping[]>;
+}

package/dist/cjs/cli/cartridge-command.js

@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2025, Salesforce, Inc.
+ * SPDX-License-Identifier: Apache-2
+ * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
+ */
+import path from 'node:path';
+import { Args, Flags } from '@oclif/core';
+import { InstanceCommand } from './instance-command.js';
+import { findCartridges } from '../operations/code/cartridges.js';
+import { CartridgeProviderRunner, } from './cartridge-providers.js';
+/**
+ * Base command for cartridge operations (deploy, watch, etc.).
+ *
+ * Extends InstanceCommand with:
+ * - cartridgePath argument for specifying cartridge directory
+ * - cartridge include/exclude flags for filtering
+ *
+ * @example
+ * export default class MyCartridgeCommand extends CartridgeCommand<typeof MyCartridgeCommand> {
+ *   async run(): Promise<void> {
+ *     const cartridges = findCartridges(this.cartridgePath, this.cartridgeOptions);
+ *     // ...
+ *   }
+ * }
+ */
+export class CartridgeCommand extends InstanceCommand {
+    static baseArgs = {
+        cartridgePath: Args.string({
+            description: 'Path to cartridges directory',
+            default: '.',
+        }),
+    };
+    static cartridgeFlags = {
+        cartridge: Flags.string({
+            char: 'c',
+            description: 'Include specific cartridge(s) (comma-separated)',
+            multiple: true,
+            multipleNonGreedy: true,
+            delimiter: ',',
+        }),
+        'exclude-cartridge': Flags.string({
+            char: 'x',
+            description: 'Exclude specific cartridge(s) (comma-separated)',
+            multiple: true,
+            multipleNonGreedy: true,
+            delimiter: ',',
+        }),
+    };
+    /** Cartridge provider runner for custom cartridge discovery */
+    cartridgeProviderRunner;
+    /**
+     * Override init to collect cartridge providers from plugins.
+     */
+    async init() {
+        await super.init();
+        await this.collectCartridgeProviders();
+    }
+    /**
+     * Collects cartridge providers from plugins via the `b2c:cartridge-providers` hook.
+     */
+    async collectCartridgeProviders() {
+        this.cartridgeProviderRunner = new CartridgeProviderRunner(this.logger);
+        const hookOptions = {
+            directory: this.cartridgePath,
+            flags: this.flags,
+        };
+        const hookResult = await this.config.runHook('b2c:cartridge-providers', hookOptions);
+        for (const success of hookResult.successes) {
+            const result = success.result;
+            if (result?.providers?.length) {
+                this.cartridgeProviderRunner.addProviders(result.providers);
+            }
+            if (result?.transformers?.length) {
+                this.cartridgeProviderRunner.addTransformers(result.transformers);
+            }
+        }
+        for (const failure of hookResult.failures) {
+            this.logger?.warn(`Plugin ${failure.plugin.name} b2c:cartridge-providers hook failed: ${failure.error.message}`);
+        }
+        const providerCount = this.cartridgeProviderRunner.providerCount;
+        const transformerCount = this.cartridgeProviderRunner.transformerCount;
+        if (providerCount > 0 || transformerCount > 0) {
+            this.logger?.debug(`Registered ${providerCount} cartridge provider(s) and ${transformerCount} transformer(s)`);
+        }
+    }
+    /**
+     * Gets the cartridge path from args.
+     */
+    get cartridgePath() {
+        return this.args.cartridgePath;
+    }
+    /**
+     * Gets the cartridge filter options from flags.
+     */
+    get cartridgeOptions() {
+        return {
+            include: this.flags.cartridge,
+            exclude: this.flags['exclude-cartridge'],
+        };
+    }
+    /**
+     * Find cartridges using registered providers and the default discovery.
+     *
+     * This method integrates custom cartridge providers from plugins with the
+     * default `.project` file-based discovery. Providers with priority 'before'
+     * run first, then default discovery, then 'after' providers. Results are
+     * deduplicated by name (first wins) and transformers are applied.
+     *
+     * @param directory - Directory to search (defaults to cartridgePath)
+     * @param options - Filter options (defaults to cartridgeOptions)
+     * @returns Array of cartridge mappings from all sources
+     *
+     * @example
+     * ```typescript
+     * // In a cartridge command
+     * const cartridges = await this.findCartridgesWithProviders();
+     * ```
+     */
+    async findCartridgesWithProviders(directory, options) {
+        const searchDir = directory ?? this.cartridgePath;
+        const filterOptions = options ?? this.cartridgeOptions;
+        // Resolve to absolute path
+        const absoluteDir = path.resolve(searchDir);
+        // Run default discovery
+        const defaultCartridges = findCartridges(absoluteDir, filterOptions);
+        // If no provider runner or no providers/transformers, return default
+        if (!this.cartridgeProviderRunner) {
+            return defaultCartridges;
+        }
+        // Build discovery options with full context
+        const discoveryOptions = {
+            directory: absoluteDir,
+            include: filterOptions.include,
+            exclude: filterOptions.exclude,
+            codeVersion: this.resolvedConfig?.values.codeVersion,
+            instance: this.instance,
+        };
+        // Run providers and transformers
+        return this.cartridgeProviderRunner.findCartridges(defaultCartridges, discoveryOptions);
+    }
+}
+//# sourceMappingURL=cartridge-command.js.map

package/dist/cjs/cli/cartridge-command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cartridge-command.js","sourceRoot":"","sources":["../../../src/cli/cartridge-command.ts"],"names":[],"mappings":"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"}