@wpmoo/toolkit 0.9.18 → 0.9.19

package/dist/cockpit/menu.js

@@ -51,36 +51,14 @@ function moduleDisabledReason(command, moduleCount) {
 function disabledReason(command, serviceStatus, moduleCount) {
     return serviceDisabledReason(command, serviceStatus) ?? moduleDisabledReason(command, moduleCount);
 }
-function disabledMenuReasons(serviceStatus, moduleCount) {
-    const reasons = [];
-    if (serviceStatus?.kind === 'docker-not-running')
-        reasons.push('Docker not running.');
-    if (serviceStatus?.kind === 'running')
-        reasons.push('Already running.');
-    if (serviceStatus?.kind === 'stopped')
-        reasons.push('Services stopped.');
-    if (moduleCount === 0)
-        reasons.push('No modules found.');
-    return reasons;
-}
-function disabledError(serviceStatus, moduleCount) {
-    const reasons = disabledMenuReasons(serviceStatus, moduleCount);
-    if (reasons.length === 0) {
-        return undefined;
-    }
-    return [
-        'This option is disabled and cannot be selected.',
-        ...reasons.map((reason) => `Reason: ${reason}`),
-    ].join('\n');
+function disabledError() {
+    return 'This option is disabled and cannot be selected.';
 }
-function moduleChoiceDisabledValue(reason) {
+function commandDisabledValue(reason) {
     if (!reason) {
         return undefined;
     }
-    return reason === 'No modules found.' ? reason : true;
-}
-function commandDisabledValue(command, serviceStatus, moduleCount) {
-    return moduleChoiceDisabledValue(disabledReason(command, serviceStatus, moduleCount));
+    return reason;
 }
 function categoryChoices(category, index, serviceStatus, moduleCount) {
     const choices = [
@@ -92,7 +70,7 @@ function categoryChoices(category, index, serviceStatus, moduleCount) {
                 value: command,
                 name: commandName(command),
                 short: command.label,
-                disabled: commandDisabledValue(command, serviceStatus, moduleCount),
+                disabled: commandDisabledValue(disabledReason(command, serviceStatus, moduleCount)),
             };
         }),
     ];
@@ -148,7 +126,7 @@ export async function selectCockpitTopLevelMenu(options = {}) {
         pageSize: topLevelPageSize(choices.length),
         loop: false,
         hideMessage: true,
-        disabledError: disabledError(options.serviceStatus, options.moduleCount),
+        disabledError: disabledError(),
         navigationWarning: options.navigationWarning,
         escapeBehavior: 'ignore',
     });

package/dist/prompts/index.js

@@ -129,13 +129,30 @@ function renderedNavigationWarning(navigationWarning) {
     const warning = typeof navigationWarning === 'function' ? navigationWarning() : navigationWarning;
     return warning ? `\u001B[2m\u001B[38;2;226;184;96m${warning}\u001B[0m` : undefined;
 }
-function hiddenSelectTheme(disabledError, navigationHelp = 'exit', navigationWarning, hideMessage = true) {
+function hiddenSelectTheme(disabledError, navigationHelp = 'exit', navigationWarning, hideMessage = true, disabledReasonLabels = []) {
+    let activeDisabledReason;
     const keysHelpTip = navigationHelp === 'back'
         ? '↑↓ navigate • ⏎ select • Esc to go back'
         : '↑↓ navigate • ⏎ select • Ctrl+C exit';
+    const disabledLabelPattern = / \(disabled\)$/u;
+    const disabledReasonSuffixes = [...disabledReasonLabels]
+        .sort((left, right) => right.length - left.length)
+        .map((reason) => ` ${reason}`);
+    const cursor = '\u001B[38;2;226;184;96m❯\u001B[39m';
+    const disabledCursor = '-';
     const style = {
         highlight: (text) => text,
-        disabled: (text) => styleText('dim', text.replace(/ \(disabled\)$/u, ''), { validateStream: false }),
+        disabled: (text) => {
+            let renderedText = text.replace(disabledLabelPattern, '');
+            const reasonSuffix = disabledReasonSuffixes.find((suffix) => renderedText.endsWith(suffix));
+            if (reasonSuffix) {
+                renderedText = renderedText.slice(0, -reasonSuffix.length);
+            }
+            if (text.startsWith(`${cursor} `) || text.startsWith(`${disabledCursor} ${cursor} `)) {
+                activeDisabledReason = reasonSuffix?.trim();
+            }
+            return styleText('dim', renderedText, { validateStream: false });
+        },
         keysHelpTip: () => {
             const warning = renderedNavigationWarning(navigationWarning);
             return warning ? `${warning}\n${keysHelpTip}` : keysHelpTip;
@@ -147,12 +164,34 @@ function hiddenSelectTheme(disabledError, navigationHelp = 'exit', navigationWar
     return {
         prefix: '',
         icon: {
-            cursor: '\u001B[38;2;226;184;96m❯\u001B[39m',
+            cursor,
         },
         style,
-        i18n: disabledError ? { disabledError } : undefined,
+        i18n: disabledError ? disabledErrorI18n(disabledError, () => activeDisabledReason) : undefined,
     };
 }
+function disabledErrorI18n(disabledError, activeReason) {
+    const i18n = { disabledError };
+    Object.defineProperty(i18n, 'disabledError', {
+        get: () => {
+            const reason = activeReason();
+            return reason ? `${disabledError}\nReason: ${reason}` : disabledError;
+        },
+    });
+    return i18n;
+}
+function collectDisabledReasonLabels(choices) {
+    const reasons = new Set();
+    for (const choice of choices) {
+        if (typeof choice === 'object' &&
+            choice !== null &&
+            'disabled' in choice &&
+            typeof choice.disabled === 'string') {
+            reasons.add(choice.disabled);
+        }
+    }
+    return [...reasons];
+}
 function withHiddenSelectMessage(config) {
     if (!config.hideMessage &&
         !config.disabledError &&
@@ -165,7 +204,7 @@ function withHiddenSelectMessage(config) {
     return {
         ...inquirerConfig,
         message: config.hideMessage ? '' : inquirerConfig.message,
-        theme: hiddenSelectTheme(disabledError, navigationHelp, navigationWarning, Boolean(config.hideMessage)),
+        theme: hiddenSelectTheme(disabledError, navigationHelp, navigationWarning, Boolean(config.hideMessage), collectDisabledReasonLabels(inquirerConfig.choices)),
     };
 }
 function asInquirerConfirmConfig(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpmoo/toolkit",
-  "version": "0.9.18",
+  "version": "0.9.19",
   "description": "WPMoo Toolkit for development, staging, and production lifecycle workflows.",
   "type": "module",
   "repository": {