@oclif/core 4.0.0-beta.7 → 4.0.0-beta.8

package/lib/args.d.ts

@@ -21,14 +21,14 @@ import { Arg, ArgDefinition } from './interfaces/parser';
 export declare function custom<T = string, P = Record<string, unknown>>(defaults: Partial<Arg<T, P>>): ArgDefinition<T, P>;
 export declare const boolean: ArgDefinition<boolean, Record<string, unknown>>;
 export declare const integer: ArgDefinition<number, {
-    max?: number | undefined;
-    min?: number | undefined;
+    max?: number;
+    min?: number;
 }>;
 export declare const directory: ArgDefinition<string, {
-    exists?: boolean | undefined;
+    exists?: boolean;
 }>;
 export declare const file: ArgDefinition<string, {
-    exists?: boolean | undefined;
+    exists?: boolean;
 }>;
 /**
  * Initializes a string as a URL. Throws an error

package/lib/cache.d.ts

@@ -1,5 +1,5 @@
 import { Config } from './config/config';
-import { PJSON, Plugin } from './interfaces';
+import { Configuration, Plugin } from './interfaces';
 type OclifCoreInfo = {
     name: string;
     version: string;
@@ -7,7 +7,7 @@ type OclifCoreInfo = {
 type CacheContents = {
     rootPlugin: Plugin;
     config: Config;
-    exitCodes: PJSON.Plugin['oclif']['exitCodes'];
+    exitCodes: Configuration['exitCodes'];
     '@oclif/core': OclifCoreInfo;
 };
 type ValueOf<T> = T[keyof T];
@@ -21,7 +21,7 @@ export default class Cache extends Map<keyof CacheContents, ValueOf<CacheContent
     get(key: 'config'): Config | undefined;
     get(key: '@oclif/core'): OclifCoreInfo;
     get(key: 'rootPlugin'): Plugin | undefined;
-    get(key: 'exitCodes'): PJSON.Plugin['oclif']['exitCodes'] | undefined;
+    get(key: 'exitCodes'): Configuration['exitCodes'] | undefined;
     private getOclifCoreMeta;
 }
 export {};

package/lib/command.d.ts

@@ -143,15 +143,15 @@ export declare namespace Command {
      */
     type Cached = {
         [key: string]: unknown;
-        aliasPermutations?: string[];
+        aliasPermutations?: string[] | undefined;
         aliases: string[];
         args: {
             [name: string]: Arg.Cached;
         };
-        deprecateAliases?: boolean;
-        deprecationOptions?: Deprecation;
-        description?: string;
-        examples?: Example[];
+        deprecateAliases?: boolean | undefined;
+        deprecationOptions?: Deprecation | undefined;
+        description?: string | undefined;
+        examples?: Example[] | undefined;
         flags: {
             [name: string]: Flag.Cached;
         };
@@ -159,22 +159,22 @@ export declare namespace Command {
         hidden: boolean;
         hiddenAliases: string[];
         id: string;
-        isESM?: boolean;
-        permutations?: string[];
-        pluginAlias?: string;
-        pluginName?: string;
-        pluginType?: string;
-        relativePath?: string[];
-        state?: 'beta' | 'deprecated' | string;
-        strict?: boolean;
-        summary?: string;
-        type?: string;
-        usage?: string | string[];
+        isESM?: boolean | undefined;
+        permutations?: string[] | undefined;
+        pluginAlias?: string | undefined;
+        pluginName?: string | undefined;
+        pluginType?: string | undefined;
+        relativePath?: string[] | undefined;
+        state?: 'beta' | 'deprecated' | string | undefined;
+        strict?: boolean | undefined;
+        summary?: string | undefined;
+        type?: string | undefined;
+        usage?: string | string[] | undefined;
     };
     type Flag = IFlag<any>;
     namespace Flag {
         type Cached = Omit<Flag, 'input' | 'parse'> & (BooleanFlagProps | OptionFlagProps) & {
-            hasDynamicHelp?: boolean;
+            hasDynamicHelp?: boolean | undefined;
         };
         type Any = Cached | Flag;
     }

package/lib/command.js

@@ -39,7 +39,7 @@ const Parser = __importStar(require("./parser"));
 const aggregate_flags_1 = require("./util/aggregate-flags");
 const ids_1 = require("./util/ids");
 const util_2 = require("./util/util");
-const ux_1 = __importDefault(require("./ux"));
+const ux_1 = require("./ux");
 const pjson = cache_1.default.getInstance().get('@oclif/core');
 /**
  * swallows stdout epipe errors
@@ -168,7 +168,7 @@ class Command {
             if (!err.message)
                 throw err;
             try {
-                ux_1.default.action.stop(ansis_1.default.bold.red('!'));
+                ux_1.ux.action.stop(ansis_1.default.bold.red('!'));
             }
             catch { }
             throw err;
@@ -211,16 +211,16 @@ class Command {
     log(message = '', ...args) {
         if (!this.jsonEnabled()) {
             message = typeof message === 'string' ? message : (0, node_util_1.inspect)(message);
-            ux_1.default.stdout(message, ...args);
+            ux_1.ux.stdout(message, ...args);
         }
     }
     logJson(json) {
-        ux_1.default.stdout(ux_1.default.colorizeJson(json, { pretty: true, theme: this.config.theme?.json }));
+        ux_1.ux.stdout(ux_1.ux.colorizeJson(json, { pretty: true, theme: this.config.theme?.json }));
     }
     logToStderr(message = '', ...args) {
         if (!this.jsonEnabled()) {
             message = typeof message === 'string' ? message : (0, node_util_1.inspect)(message);
-            ux_1.default.stderr(message, ...args);
+            ux_1.ux.stderr(message, ...args);
         }
     }
     async parse(options, argv = this.argv) {

package/lib/config/config.d.ts

@@ -1,5 +1,5 @@
 import { Command } from '../command';
-import { Hook, Hooks, PJSON, Topic } from '../interfaces';
+import { Configuration, Hook, Hooks, PJSON, S3Templates, Topic, UserPJSON } from '../interfaces';
 import { ArchTypes, Config as IConfig, LoadOptions, PlatformTypes, VersionDetails } from '../interfaces/config';
 import { Plugin as IPlugin, Options } from '../interfaces/plugin';
 import { Theme } from '../interfaces/theme';
@@ -7,8 +7,8 @@ export declare class Config implements IConfig {
     options: Options;
     arch: ArchTypes;
     bin: string;
-    binAliases?: string[];
-    binPath?: string;
+    binAliases?: string[] | undefined;
+    binPath?: string | undefined;
     cacheDir: string;
     channel: string;
     configDir: string;
@@ -18,18 +18,18 @@ export declare class Config implements IConfig {
     home: string;
     isSingleCommandCLI: boolean;
     name: string;
-    npmRegistry?: string;
-    nsisCustomization?: string;
-    pjson: PJSON.CLI;
+    npmRegistry?: string | undefined;
+    nsisCustomization?: string | undefined;
+    pjson: PJSON;
     platform: PlatformTypes;
     plugins: Map<string, IPlugin>;
     root: string;
     shell: string;
-    theme?: Theme;
+    theme?: Theme | undefined;
     topicSeparator: ' ' | ':';
-    updateConfig: NonNullable<PJSON.CLI['oclif']['update']>;
+    updateConfig: NonNullable<Configuration['update']>;
     userAgent: string;
-    userPJSON?: PJSON.User;
+    userPJSON?: UserPJSON | undefined;
     valid: boolean;
     version: string;
     protected warned: boolean;
@@ -96,7 +96,7 @@ export declare class Config implements IConfig {
     protected macosCacheDir(): string | undefined;
     runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Loadable | null): Promise<T>;
     runHook<T extends keyof Hooks>(event: T, opts: Hooks[T]['options'], timeout?: number, captureErrors?: boolean): Promise<Hook.Result<Hooks[T]['return']>>;
-    s3Key(type: keyof PJSON.S3.Templates, ext?: '.tar.gz' | '.tar.xz' | IConfig.s3Key.Options, options?: IConfig.s3Key.Options): string;
+    s3Key(type: keyof S3Templates, ext?: '.tar.gz' | '.tar.xz' | IConfig.s3Key.Options, options?: IConfig.s3Key.Options): string;
     s3Url(key: string): string;
     scopedEnvVar(k: string): string | undefined;
     /**

package/lib/config/config.js

@@ -42,7 +42,7 @@ const settings_1 = require("../settings");
 const fs_1 = require("../util/fs");
 const os_1 = require("../util/os");
 const util_2 = require("../util/util");
-const ux_1 = __importDefault(require("../ux"));
+const ux_1 = require("../ux");
 const theme_1 = require("../ux/theme");
 const plugin_loader_1 = __importDefault(require("./plugin-loader"));
 const ts_path_1 = require("./ts-path");
@@ -318,10 +318,9 @@ class Config {
             node: this.pjson.oclif.update?.node ?? {},
             s3: this.buildS3Config(),
         };
-        this.isSingleCommandCLI = Boolean(this.pjson.oclif.default ||
-            (typeof this.pjson.oclif.commands !== 'string' &&
-                this.pjson.oclif.commands?.strategy === 'single' &&
-                this.pjson.oclif.commands?.target));
+        this.isSingleCommandCLI = Boolean(typeof this.pjson.oclif.commands !== 'string' &&
+            this.pjson.oclif.commands?.strategy === 'single' &&
+            this.pjson.oclif.commands?.target);
         this.maybeAdjustDebugSetting();
         await this.loadPluginsAndCommands();
         debug('config done');
@@ -358,12 +357,17 @@ class Config {
     async loadTheme() {
         if (this.scopedEnvVarTrue('DISABLE_THEME'))
             return;
-        const defaultThemeFile = this.pjson.oclif.theme
-            ? (0, node_path_1.resolve)(this.root, this.pjson.oclif.theme)
-            : this.pjson.oclif.theme;
         const userThemeFile = (0, node_path_1.resolve)(this.configDir, 'theme.json');
+        const getDefaultTheme = async () => {
+            if (!this.pjson.oclif.theme)
+                return;
+            if (typeof this.pjson.oclif.theme === 'string') {
+                return (0, fs_1.safeReadJson)((0, node_path_1.resolve)(this.root, this.pjson.oclif.theme));
+            }
+            return this.pjson.oclif.theme;
+        };
         const [defaultTheme, userTheme] = await Promise.all([
-            defaultThemeFile ? await (0, fs_1.safeReadJson)(defaultThemeFile) : undefined,
+            await getDefaultTheme(),
             await (0, fs_1.safeReadJson)(userThemeFile),
         ]);
         // Merge the default theme with the user theme, giving the user theme precedence.
@@ -468,7 +472,7 @@ class Config {
                     (0, errors_1.exit)(code);
                 },
                 log(message, ...args) {
-                    ux_1.default.stdout(message, ...args);
+                    ux_1.ux.stdout(message, ...args);
                 },
                 warn(message) {
                     (0, errors_1.warn)(message);
@@ -528,7 +532,7 @@ class Config {
             options = ext;
         else if (ext)
             options.ext = ext;
-        const template = this.updateConfig.s3.templates[options.platform ? 'target' : 'vanilla'][type] ?? '';
+        const template = this.updateConfig.s3.templates?.[options.platform ? 'target' : 'vanilla'][type] ?? '';
         return ejs.render(template, { ...this, ...options });
     }
     s3Url(key) {

package/lib/config/plugin-loader.d.ts

@@ -1,20 +1,20 @@
 import { PJSON } from '../interfaces';
 import { Plugin as IPlugin } from '../interfaces/plugin';
 type PluginLoaderOptions = {
-    plugins?: IPlugin[] | PluginsMap;
+    plugins?: IPlugin[] | PluginsMap | undefined;
     root: string;
 };
 type LoadOpts = {
     dataDir: string;
-    devPlugins?: boolean;
-    force?: boolean;
+    devPlugins?: boolean | undefined;
+    force?: boolean | undefined;
     rootPlugin: IPlugin;
-    userPlugins?: boolean;
+    userPlugins?: boolean | undefined;
     pluginAdditions?: {
         core?: string[];
         dev?: string[];
         path?: string;
-    };
+    } | undefined;
 };
 type PluginsMap = Map<string, IPlugin>;
 export default class PluginLoader {
@@ -28,7 +28,7 @@ export default class PluginLoader {
         plugins: PluginsMap;
     }>;
     loadRoot({ pjson }: {
-        pjson?: PJSON.Plugin;
+        pjson?: PJSON | undefined;
     }): Promise<IPlugin>;
     private loadCorePlugins;
     private loadDevPlugins;

package/lib/config/plugin.d.ts

@@ -19,10 +19,10 @@ export declare class Plugin implements IPlugin {
     manifest: Manifest;
     moduleType: 'commonjs' | 'module';
     name: string;
-    parent: Plugin | undefined;
-    pjson: PJSON.Plugin;
+    parent?: Plugin | undefined;
+    pjson: PJSON;
     root: string;
-    tag?: string;
+    tag?: string | undefined;
     type: string;
     valid: boolean;
     version: string;

package/lib/config/plugin.js

@@ -57,12 +57,9 @@ function processCommandIds(files) {
         return id === '' ? symbols_1.SINGLE_COMMAND_CLI_SYMBOL : id;
     });
 }
-function determineCommandDiscoveryOptions(commandDiscovery, defaultCmdId) {
+function determineCommandDiscoveryOptions(commandDiscovery) {
     if (!commandDiscovery)
         return;
-    if (typeof commandDiscovery === 'string' && defaultCmdId) {
-        return { strategy: 'single', target: commandDiscovery };
-    }
     if (typeof commandDiscovery === 'string') {
         return { globPatterns: GLOB_PATTERNS, strategy: 'pattern', target: commandDiscovery };
     }
@@ -202,7 +199,7 @@ class Plugin {
             k,
             (0, util_1.castArray)(v).map((v) => determineHookOptions(v)),
         ]));
-        this.commandDiscoveryOpts = determineCommandDiscoveryOptions(this.pjson.oclif?.commands, this.pjson.oclif?.default);
+        this.commandDiscoveryOpts = determineCommandDiscoveryOptions(this.pjson.oclif?.commands);
         this._debug('command discovery options', this.commandDiscoveryOpts);
         this.manifest = await this._manifest();
         this.commands = Object.entries(this.manifest.commands)

package/lib/config/ts-path.d.ts

@@ -6,4 +6,4 @@ export declare const TS_CONFIGS: Record<string, TSConfig | undefined>;
  * if there is a tsconfig and the original sources exist, it attempts to require ts-node
  */
 export declare function tsPath(root: string, orig: string, plugin: Plugin): Promise<string>;
-export declare function tsPath(root: string, orig: string | undefined, plugin?: Plugin): Promise<string | undefined>;
+export declare function tsPath(root: string, orig: string | undefined, plugin?: Plugin | undefined): Promise<string | undefined>;

package/lib/errors/errors/cli.d.ts

@@ -3,15 +3,15 @@ import { OclifError, PrettyPrintableError } from '../../interfaces/errors';
  * properties specific to internal oclif error handling
  */
 export declare function addOclifExitCode(error: Record<string, any>, options?: {
-    exit?: false | number;
+    exit?: false | number | undefined;
 }): OclifError;
 export declare class CLIError extends Error implements OclifError {
-    code?: string;
+    code?: string | undefined;
     oclif: OclifError['oclif'];
-    skipOclifErrorHandling?: boolean;
-    suggestions?: string[];
+    skipOclifErrorHandling?: boolean | undefined;
+    suggestions?: string[] | undefined;
     constructor(error: Error | string, options?: {
-        exit?: false | number;
+        exit?: false | number | undefined;
     } & PrettyPrintableError);
     get bang(): string | undefined;
     get stack(): string;

package/lib/errors/errors/pretty-print.d.ts

@@ -1,7 +1,7 @@
 import { PrettyPrintableError } from '../../interfaces/errors';
 type CLIErrorDisplayOptions = {
-    bang?: string;
-    name?: string;
+    bang?: string | undefined;
+    name?: string | undefined;
 };
 export declare function applyPrettyPrintOptions(error: Error, options: PrettyPrintableError): PrettyPrintableError;
 export default function prettyPrint(error: Error & PrettyPrintableError & CLIErrorDisplayOptions): string | undefined;

package/lib/flags.d.ts

@@ -72,8 +72,8 @@ export declare function boolean<T = boolean>(options?: Partial<BooleanFlag<T>>):
  * - `max` option allows to set a maximum value.
  */
 export declare const integer: FlagDefinition<number, {
-    max?: number | undefined;
-    min?: number | undefined;
+    max?: number;
+    min?: number;
 }, {
     multiple: false;
     requiredOrDefaulted: false;
@@ -84,7 +84,7 @@ export declare const integer: FlagDefinition<number, {
  * - `exists` option allows you to throw an error if the directory does not exist.
  */
 export declare const directory: FlagDefinition<string, {
-    exists?: boolean | undefined;
+    exists?: boolean;
 }, {
     multiple: false;
     requiredOrDefaulted: false;
@@ -95,7 +95,7 @@ export declare const directory: FlagDefinition<string, {
  * - `exists` option allows you to throw an error if the file does not exist.
  */
 export declare const file: FlagDefinition<string, {
-    exists?: boolean | undefined;
+    exists?: boolean;
 }, {
     multiple: false;
     requiredOrDefaulted: false;

package/lib/flush.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flush = void 0;
-const errors_1 = require("./errors");
+const error_1 = require("./errors/error");
 function timeout(p, ms) {
     function wait(ms, unref = false) {
         return new Promise((resolve) => {
@@ -10,7 +10,7 @@ function timeout(p, ms) {
                 t.unref();
         });
     }
-    return Promise.race([p, wait(ms, true).then(() => (0, errors_1.error)('timed out'))]);
+    return Promise.race([p, wait(ms, true).then(() => (0, error_1.error)('timed out'))]);
 }
 async function _flush() {
     const p = new Promise((resolve) => {

package/lib/help/formatter.d.ts

@@ -59,9 +59,9 @@ export declare class HelpFormatter {
     indent(body: string, spacing?: number): string;
     renderList(input: (string | undefined)[][], opts: {
         indentation: number;
-        multiline?: boolean;
-        spacer?: string;
-        stripAnsi?: boolean;
+        multiline?: boolean | undefined;
+        spacer?: string | undefined;
+        stripAnsi?: boolean | undefined;
     }): string;
     section(header: string, body: [string, string | undefined][] | HelpSection | HelpSectionKeyValueTable | string): string;
     /**

package/lib/help/index.d.ts

@@ -3,6 +3,7 @@ import * as Interfaces from '../interfaces';
 import { CommandHelp } from './command';
 import { HelpFormatter } from './formatter';
 export { CommandHelp } from './command';
+export { HelpFormatter, type HelpSection, type HelpSectionKeyValueTable, type HelpSectionRenderer } from './formatter';
 export { getHelpFlagAdditions, normalizeArgv, standardizeIDFromArgv } from './util';
 export declare abstract class HelpBase extends HelpFormatter {
     constructor(config: Interfaces.Config, opts?: Partial<Interfaces.HelpOptions>);

package/lib/help/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadHelpClass = exports.Help = exports.HelpBase = exports.standardizeIDFromArgv = exports.normalizeArgv = exports.getHelpFlagAdditions = exports.CommandHelp = void 0;
+exports.loadHelpClass = exports.Help = exports.HelpBase = exports.standardizeIDFromArgv = exports.normalizeArgv = exports.getHelpFlagAdditions = exports.HelpFormatter = exports.CommandHelp = void 0;
 const ansis_1 = __importDefault(require("ansis"));
 const ts_path_1 = require("../config/ts-path");
 const error_1 = require("../errors/error");
@@ -12,7 +12,7 @@ const symbols_1 = require("../symbols");
 const cache_default_value_1 = require("../util/cache-default-value");
 const ids_1 = require("../util/ids");
 const util_1 = require("../util/util");
-const ux_1 = __importDefault(require("../ux"));
+const ux_1 = require("../ux");
 const theme_1 = require("../ux/theme");
 const command_1 = require("./command");
 const formatter_1 = require("./formatter");
@@ -20,6 +20,8 @@ const root_1 = __importDefault(require("./root"));
 const util_2 = require("./util");
 var command_2 = require("./command");
 Object.defineProperty(exports, "CommandHelp", { enumerable: true, get: function () { return command_2.CommandHelp; } });
+var formatter_2 = require("./formatter");
+Object.defineProperty(exports, "HelpFormatter", { enumerable: true, get: function () { return formatter_2.HelpFormatter; } });
 var util_3 = require("./util");
 Object.defineProperty(exports, "getHelpFlagAdditions", { enumerable: true, get: function () { return util_3.getHelpFlagAdditions; } });
 Object.defineProperty(exports, "normalizeArgv", { enumerable: true, get: function () { return util_3.normalizeArgv; } });
@@ -144,7 +146,7 @@ class Help extends HelpBase {
         return new this.CommandHelpClass(command, this.config, this.opts);
     }
     log(...args) {
-        this.opts.sendToStderr ? ux_1.default.stderr(args) : ux_1.default.stdout(args);
+        this.opts.sendToStderr ? ux_1.ux.stderr(args) : ux_1.ux.stdout(args);
     }
     async showCommandHelp(command) {
         const name = command.id;
@@ -314,17 +316,24 @@ exports.Help = Help;
 function extractClass(exported) {
     return exported && exported.default ? exported.default : exported;
 }
+function determineLocation(helpClass) {
+    if (typeof helpClass === 'string')
+        return { identifier: 'default', target: helpClass };
+    if (!helpClass.identifier)
+        return { ...helpClass, identifier: 'default' };
+    return helpClass;
+}
 async function loadHelpClass(config) {
-    const { pjson } = config;
-    const configuredClass = pjson.oclif?.helpClass;
-    if (configuredClass) {
+    if (config.pjson.oclif?.helpClass) {
+        const { identifier, target } = determineLocation(config.pjson.oclif?.helpClass);
         try {
-            const path = (await (0, ts_path_1.tsPath)(config.root, configuredClass)) ?? configuredClass;
-            const exported = await (0, module_loader_1.load)(config, path);
-            return extractClass(exported);
+            const path = (await (0, ts_path_1.tsPath)(config.root, target)) ?? target;
+            const module = await (0, module_loader_1.load)(config, path);
+            const helpClass = module[identifier] ?? (identifier === 'default' ? extractClass(module) : undefined);
+            return extractClass(helpClass);
         }
         catch (error) {
-            throw new Error(`Unable to load configured help class "${configuredClass}", failed with message:\n${error.message}`);
+            throw new Error(`Unable to load configured help class "${target}", failed with message:\n${error.message}`);
         }
     }
     return Help;

package/lib/index.d.ts

@@ -6,15 +6,14 @@ export { handle } from './errors/handle';
 export { execute } from './execute';
 export * as Flags from './flags';
 export { flush } from './flush';
-export { CommandHelp, Help, HelpBase, loadHelpClass } from './help';
-export { HelpSection, HelpSectionKeyValueTable, HelpSectionRenderer } from './help/formatter';
+export { CommandHelp, Help, HelpBase, type HelpSection, type HelpSectionKeyValueTable, type HelpSectionRenderer, loadHelpClass, } from './help';
 export * as Interfaces from './interfaces';
-export { Hook } from './interfaces/hooks';
+export { type Hook } from './interfaces/hooks';
 export { getLogger } from './logger';
 export { run } from './main';
 export * as ModuleLoader from './module-loader';
 export * as Parser from './parser';
 export { Performance } from './performance';
-export { Settings, settings } from './settings';
+export { type Settings, settings } from './settings';
 export { toConfiguredId, toStandardizedId } from './util/ids';
-export { methods as ux } from './ux';
+export { ux } from './ux';

package/lib/index.js

@@ -69,4 +69,4 @@ var ids_1 = require("./util/ids");
 Object.defineProperty(exports, "toConfiguredId", { enumerable: true, get: function () { return ids_1.toConfiguredId; } });
 Object.defineProperty(exports, "toStandardizedId", { enumerable: true, get: function () { return ids_1.toStandardizedId; } });
 var ux_1 = require("./ux");
-Object.defineProperty(exports, "ux", { enumerable: true, get: function () { return ux_1.methods; } });
+Object.defineProperty(exports, "ux", { enumerable: true, get: function () { return ux_1.ux; } });

package/lib/interfaces/config.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Command } from '../command';
 import { Hook, Hooks } from './hooks';
-import { PJSON } from './pjson';
+import { Configuration, PJSON, S3Templates } from './pjson';
 import { Options, Plugin } from './plugin';
 import { Theme } from './theme';
 import { Topic } from './topic';
@@ -34,8 +34,8 @@ export interface Config {
     /**
      * name of any bin aliases that will execute the cli
      */
-    readonly binAliases?: string[];
-    readonly binPath?: string;
+    readonly binAliases?: string[] | undefined;
+    readonly binPath?: string | undefined;
     /**
      * cache directory to use for CLI
      *
@@ -89,9 +89,9 @@ export interface Config {
     /**
      * npm registry to use for installing plugins
      */
-    readonly npmRegistry?: string;
-    readonly nsisCustomization?: string;
-    readonly pjson: PJSON.CLI;
+    readonly npmRegistry?: string | undefined;
+    readonly nsisCustomization?: string | undefined;
+    readonly pjson: PJSON;
     /**
      * process.platform
      */
@@ -101,7 +101,7 @@ export interface Config {
     runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Loadable): Promise<T>;
     runHook<T extends keyof Hooks>(event: T, opts: Hooks[T]['options'], timeout?: number, captureErrors?: boolean): Promise<Hook.Result<Hooks[T]['return']>>;
     s3Key(type: 'unversioned' | 'versioned', ext: '.tar.gz' | '.tar.xz', options?: Config.s3Key.Options): string;
-    s3Key(type: keyof PJSON.S3.Templates, options?: Config.s3Key.Options): string;
+    s3Key(type: keyof S3Templates, options?: Config.s3Key.Options): string;
     s3Url(key: string): string;
     scopedEnvVar(key: string): string | undefined;
     scopedEnvVarKey(key: string): string;
@@ -111,10 +111,10 @@ export interface Config {
      * active shell
      */
     readonly shell: string;
-    readonly theme?: Theme;
+    readonly theme?: Theme | undefined;
     topicSeparator: ' ' | ':';
     readonly topics: Topic[];
-    readonly updateConfig: NonNullable<PJSON.CLI['oclif']['update']>;
+    readonly updateConfig: NonNullable<Configuration['update']>;
     /**
      * user agent to use for http calls
      *

package/lib/interfaces/errors.d.ts

@@ -3,25 +3,25 @@ export type CommandError = Error & {
 };
 export interface OclifError {
     oclif: {
-        exit?: number;
+        exit?: number | undefined;
     };
 }
 export interface PrettyPrintableError {
     /**
      * a unique error code for this error class
      */
-    code?: string;
+    code?: string | undefined;
     /**
      * message to display related to the error
      */
-    message?: string;
+    message?: string | undefined;
     /**
      * a url to find out more information related to this error
      * or fixing the error
      */
-    ref?: string;
+    ref?: string | undefined;
     /**
      * a suggestion that may be useful or provide additional context
      */
-    suggestions?: string[];
+    suggestions?: string[] | undefined;
 }

package/lib/interfaces/index.d.ts

@@ -8,7 +8,7 @@ export type { Hook, Hooks } from './hooks';
 export type { Logger } from './logger';
 export type { Manifest } from './manifest';
 export type { Arg, BooleanFlag, CustomOptions, Deprecation, Flag, FlagDefinition, OptionFlag } from './parser';
-export type { PJSON } from './pjson';
+export type { Configuration, PJSON, S3, S3Templates, UserPJSON } from './pjson';
 export type { Options, Plugin, PluginOptions } from './plugin';
 export type { S3Manifest } from './s3-manifest';
 export type { Theme } from './theme';