@oclif/core 3.11.1-dev.1 → 3.12.1

package/lib/cli-ux/theme.d.ts

@@ -1,4 +1,4 @@
-import { StandardChalk, Theme, Themes } from '../interfaces/theme';
+import { StandardChalk, Theme } from '../interfaces/theme';
 /**
  * Add color to text.
  * @param color color to use. Can be hex code (e.g. `#ff0000`), rgb (e.g. `rgb(255, 255, 255)`) or a chalk color (e.g. `red`)
@@ -6,6 +6,6 @@ import { StandardChalk, Theme, Themes } from '../interfaces/theme';
  * @returns colorized string
  */
 export declare function colorize(color: string | StandardChalk | undefined, text: string): string;
-export declare function parseTheme(theme: Themes): Theme;
+export declare function parseTheme(theme: Record<string, string>): Theme;
 export declare function getColor(color: string): string;
 export declare function getColor(color: StandardChalk): StandardChalk;

package/lib/cli-ux/theme.js

@@ -46,9 +46,7 @@ function colorize(color, text) {
 }
 exports.colorize = colorize;
 function parseTheme(theme) {
-    const themes = theme.themes ?? {};
-    const selected = theme.selected ? themes[theme.selected] ?? {} : {};
-    return Object.fromEntries(Object.entries(selected)
+    return Object.fromEntries(Object.entries(theme)
         .map(([key, value]) => [key, getColor(value)])
         .filter(([_, value]) => value));
 }

package/lib/config/config.d.ts

@@ -2,7 +2,7 @@ import { Command } from '../command';
 import { Hook, Hooks, PJSON, Topic } from '../interfaces';
 import { ArchTypes, Config as IConfig, LoadOptions, PlatformTypes, VersionDetails } from '../interfaces/config';
 import { Plugin as IPlugin, Options } from '../interfaces/plugin';
-import { Theme, Themes } from '../interfaces/theme';
+import { Theme } from '../interfaces/theme';
 export declare class Config implements IConfig {
     options: Options;
     arch: ArchTypes;
@@ -94,8 +94,7 @@ export declare class Config implements IConfig {
     }): Promise<void>;
     loadThemes(): Promise<{
         file: string;
-        activeTheme: Theme | undefined;
-        themes: Themes | undefined;
+        theme: Theme | undefined;
     }>;
     protected macosCacheDir(): string | undefined;
     runCommand<T = unknown>(id: string, argv?: string[], cachedCommand?: Command.Loadable | null): Promise<T>;

package/lib/config/config.js

@@ -299,8 +299,8 @@ class Config {
         this.binPath = this.scopedEnvVar('BINPATH');
         this.npmRegistry = this.scopedEnvVar('NPM_REGISTRY') || this.pjson.oclif.npmRegistry;
         if (!this.scopedEnvVarTrue('DISABLE_THEME')) {
-            const { activeTheme } = await this.loadThemes();
-            this.theme = activeTheme;
+            const { theme } = await this.loadThemes();
+            this.theme = theme;
         }
         this.pjson.oclif.update = this.pjson.oclif.update || {};
         this.pjson.oclif.update.node = this.pjson.oclif.update.node || {};
@@ -358,15 +358,12 @@ class Config {
         }
     }
     async loadThemes() {
-        const themesFile = this.pjson.oclif.themesFile
-            ? (0, node_path_1.resolve)(this.root, this.pjson.oclif.themesFile)
-            : (0, node_path_1.resolve)(this.configDir, 'themes.json');
-        const themes = await (0, fs_1.safeReadJson)(themesFile);
-        const activeTheme = themes ? (0, theme_1.parseTheme)(themes) : undefined;
+        const file = (0, node_path_1.resolve)(this.configDir, 'theme.json');
+        const themes = await (0, fs_1.safeReadJson)(file);
+        const theme = themes ? (0, theme_1.parseTheme)(themes) : undefined;
         return {
-            activeTheme,
-            file: themesFile,
-            themes,
+            file,
+            theme,
         };
     }
     macosCacheDir() {

package/lib/help/util.js

@@ -43,7 +43,7 @@ function collateSpacedCmdIDFromArgs(argv, config) {
         const ids = (0, util_1.collectUsableIds)(config.commandIDs);
         const final = [];
         const idPresent = (id) => ids.has(id);
-        const finalizeId = (s) => (s ? [...final, s].join(':') : final.join(':'));
+        const finalizeId = (s) => (s ? [...final, s] : final).filter(Boolean).join(':');
         const hasArgs = () => {
             const id = finalizeId();
             if (!id)

package/lib/interfaces/index.d.ts

@@ -10,6 +10,6 @@ export type { Arg, BooleanFlag, CustomOptions, Deprecation, Flag, FlagDefinition
 export type { PJSON } from './pjson';
 export type { Options, Plugin, PluginOptions } from './plugin';
 export type { S3Manifest } from './s3-manifest';
-export type { Theme, Themes } from './theme';
+export type { Theme } from './theme';
 export type { Topic } from './topic';
 export type { TSConfig } from './ts-config';

package/lib/interfaces/pjson.d.ts

@@ -49,7 +49,6 @@ export declare namespace PJSON {
             repositoryPrefix?: string;
             schema?: number;
             state?: 'beta' | 'deprecated' | string;
-            themesFile?: string;
             topicSeparator?: ' ' | ':';
             topics?: {
                 [k: string]: {

package/lib/interfaces/theme.d.ts

@@ -1,6 +1,6 @@
 export declare const STANDARD_CHALK: readonly ["white", "black", "blue", "yellow", "green", "red", "magenta", "cyan", "gray", "blackBright", "redBright", "greenBright", "yellowBright", "blueBright", "magentaBright", "cyanBright", "whiteBright", "bgBlack", "bgRed", "bgGreen", "bgYellow", "bgBlue", "bgMagenta", "bgCyan", "bgWhite", "bgGray", "bgBlackBright", "bgRedBright", "bgGreenBright", "bgYellowBright", "bgBlueBright", "bgMagentaBright", "bgCyanBright", "bgWhiteBright", "bold", "underline", "dim", "italic", "strikethrough"];
 export type StandardChalk = (typeof STANDARD_CHALK)[number];
-export declare const THEME_KEYS: readonly ["alias", "bin", "command", "commandSummary", "dollarSign", "flag", "flagDefaultValue", "flagOptions", "flagRequired", "flagSeparator", "flagType", "sectionDescription", "sectionHeader", "topic", "version"];
+export declare const THEME_KEYS: readonly ["alias", "bin", "command", "commandSummary", "dollarSign", "flag", "flagDefaultValue", "flagOptions", "flagRequired", "flagSeparator", "sectionDescription", "sectionHeader", "topic", "version"];
 export type ThemeKey = (typeof THEME_KEYS)[number];
 export type Theme = {
     [key: string | ThemeKey]: string | StandardChalk | undefined;
@@ -14,13 +14,8 @@ export type Theme = {
     flagOptions?: string | StandardChalk;
     flagRequired?: string | StandardChalk;
     flagSeparator?: string | StandardChalk;
-    flagType?: string | StandardChalk;
     sectionDescription?: string | StandardChalk;
     sectionHeader?: string | StandardChalk;
     topic?: string | StandardChalk;
     version?: string | StandardChalk;
 };
-export type Themes = {
-    selected?: string;
-    themes?: Record<string, Record<string, string>>;
-};

package/lib/interfaces/theme.js

@@ -54,7 +54,6 @@ exports.THEME_KEYS = [
     'flagOptions',
     'flagRequired',
     'flagSeparator',
-    'flagType',
     'sectionDescription',
     'sectionHeader',
     'topic',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.11.1-dev.1",
+  "version": "3.12.1",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
@@ -34,7 +34,7 @@
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {
-    "@commitlint/config-conventional": "^17.7.0",
+    "@commitlint/config-conventional": "^17.8.1",
     "@oclif/plugin-help": "^5.2.20",
     "@oclif/plugin-plugins": "^3.3.0",
     "@oclif/prettier-config": "^0.2.1",