@wpmoo/toolkit 0.9.17 → 0.9.19

package/dist/cli.js

@@ -280,8 +280,8 @@ async function showStartup(argv, skipUpdateCheck, details) {
     }
     console.log();
 }
-async function selectCockpitCommandFromMenu(serviceStatus) {
-    const selection = await selectCockpitTopLevelMenu({ serviceStatus });
+async function selectCockpitCommandFromMenu(serviceStatus, moduleCount) {
+    const selection = await selectCockpitTopLevelMenu({ serviceStatus, moduleCount });
     if (selection.kind === 'exit') {
         return 'exit';
     }
@@ -1453,7 +1453,7 @@ export async function runCli(cliArgv = process.argv.slice(2), cwd = process.cwd(
         };
         while (true) {
             try {
-                const command = await selectCockpitCommandFromMenu(serviceStatus);
+                const command = await selectCockpitCommandFromMenu(serviceStatus, status.kind === 'environment' ? status.moduleCandidateCount : undefined);
                 if (command === 'exit') {
                     return;
                 }

package/dist/cockpit/menu.js

@@ -20,6 +20,7 @@ const topLevelCategoryOrder = [
 ];
 const topLevelCommands = topLevelCategoryOrder.flatMap((category) => cockpitCommands.filter((command) => command.category === category && command.id !== 'exit'));
 const topLevelCommandLabelWidth = Math.max(...topLevelCommands.map((command) => command.label.length));
+const moduleDependentCommandIds = new Set(['list-modules', 'install', 'update', 'test', 'lint', 'pot', 'remove-module']);
 function rgb(red, green, blue, value) {
     return `\u001B[38;2;${red};${green};${blue}m${value}\u001B[39m`;
 }
@@ -32,7 +33,7 @@ function categoryHeading(category) {
 function commandName(command) {
     return `${rgb(226, 184, 96, ` ${command.label.padEnd(topLevelCommandLabelWidth)}`)}${dim(`  ${command.description}`)}`;
 }
-function disabledReason(command, serviceStatus) {
+function serviceDisabledReason(command, serviceStatus) {
     if (command.category !== 'services' || !serviceStatus)
         return undefined;
     if (serviceStatus.kind === 'docker-not-running')
@@ -44,31 +45,32 @@ function disabledReason(command, serviceStatus) {
     }
     return undefined;
 }
-function disabledMenuReason(serviceStatus) {
-    if (serviceStatus?.kind === 'docker-not-running')
-        return 'Docker not running.';
-    if (serviceStatus?.kind === 'running')
-        return 'Already running.';
-    if (serviceStatus?.kind === 'stopped')
-        return 'Services stopped.';
-    return undefined;
+function moduleDisabledReason(command, moduleCount) {
+    return moduleCount === 0 && moduleDependentCommandIds.has(command.id) ? 'No modules found.' : undefined;
 }
-function disabledError(serviceStatus) {
-    const reason = disabledMenuReason(serviceStatus);
-    return reason ? `This option is disabled and cannot be selected.\nReason: ${reason}` : undefined;
+function disabledReason(command, serviceStatus, moduleCount) {
+    return serviceDisabledReason(command, serviceStatus) ?? moduleDisabledReason(command, moduleCount);
+}
+function disabledError() {
+    return 'This option is disabled and cannot be selected.';
+}
+function commandDisabledValue(reason) {
+    if (!reason) {
+        return undefined;
+    }
+    return reason;
 }
-function categoryChoices(category, index, serviceStatus) {
+function categoryChoices(category, index, serviceStatus, moduleCount) {
     const choices = [
         promptSeparator(categoryHeading(category)),
         ...topLevelCommands
             .filter((command) => command.category === category)
             .map((command) => {
-            const reason = disabledReason(command, serviceStatus);
             return {
                 value: command,
                 name: commandName(command),
                 short: command.label,
-                disabled: reason ? true : undefined,
+                disabled: commandDisabledValue(disabledReason(command, serviceStatus, moduleCount)),
             };
         }),
     ];
@@ -101,8 +103,8 @@ function menuDeps(deps = {}) {
 function isCockpitCommand(value) {
     return typeof value === 'object' && value !== null && 'id' in value && 'slashAlias' in value;
 }
-function topLevelChoices(serviceStatus) {
-    return topLevelCategoryOrder.flatMap((category, index) => categoryChoices(category, index, serviceStatus));
+function topLevelChoices(serviceStatus, moduleCount) {
+    return topLevelCategoryOrder.flatMap((category, index) => categoryChoices(category, index, serviceStatus, moduleCount));
 }
 function defaultCommand(serviceStatus) {
     if (serviceStatus?.kind === 'running') {
@@ -115,7 +117,7 @@ function defaultCommand(serviceStatus) {
 }
 export async function selectCockpitTopLevelMenu(options = {}) {
     const deps = menuDeps(options);
-    const choices = topLevelChoices(options.serviceStatus);
+    const choices = topLevelChoices(options.serviceStatus, options.moduleCount);
     const cancelAction = 'back';
     const selected = await deps.select({
         message: '',
@@ -124,7 +126,7 @@ export async function selectCockpitTopLevelMenu(options = {}) {
         pageSize: topLevelPageSize(choices.length),
         loop: false,
         hideMessage: true,
-        disabledError: disabledError(options.serviceStatus),
+        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.17",
+  "version": "0.9.19",
   "description": "WPMoo Toolkit for development, staging, and production lifecycle workflows.",
   "type": "module",
   "repository": {