@wpmoo/toolkit 0.9.16 → 0.9.18

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';
     }
@@ -856,7 +856,7 @@ async function removeModuleOptionsFromPrompts(showIntro = true, cancelAction = '
         message: menuPromptMessage('Delete module files too?', cancelAction),
         active: 'Y',
         inactive: 'n',
-        initialValue: false,
+        initialValue: cancelAction === 'back',
     });
     handleCancel(deleteFiles, cancelAction);
     return {
@@ -1234,7 +1234,7 @@ async function runSelectedModuleAction(action, module, cwd) {
             message: menuPromptMessage('Delete module files too?', 'back'),
             active: 'Y',
             inactive: 'n',
-            initialValue: false,
+            initialValue: true,
         });
         handleCancel(deleteFiles, 'back');
         const removeCommand = cockpitCommands.find((entry) => entry.id === 'remove-module');
@@ -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,54 @@ function disabledReason(command, serviceStatus) {
     }
     return undefined;
 }
-function disabledMenuReason(serviceStatus) {
+function moduleDisabledReason(command, moduleCount) {
+    return moduleCount === 0 && moduleDependentCommandIds.has(command.id) ? 'No modules found.' : undefined;
+}
+function disabledReason(command, serviceStatus, moduleCount) {
+    return serviceDisabledReason(command, serviceStatus) ?? moduleDisabledReason(command, moduleCount);
+}
+function disabledMenuReasons(serviceStatus, moduleCount) {
+    const reasons = [];
     if (serviceStatus?.kind === 'docker-not-running')
-        return 'Docker not running.';
+        reasons.push('Docker not running.');
     if (serviceStatus?.kind === 'running')
-        return 'Already running.';
+        reasons.push('Already running.');
     if (serviceStatus?.kind === 'stopped')
-        return 'Services stopped.';
-    return undefined;
+        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 moduleChoiceDisabledValue(reason) {
+    if (!reason) {
+        return undefined;
+    }
+    return reason === 'No modules found.' ? reason : true;
 }
-function disabledError(serviceStatus) {
-    const reason = disabledMenuReason(serviceStatus);
-    return reason ? `This option is disabled and cannot be selected.\nReason: ${reason}` : undefined;
+function commandDisabledValue(command, serviceStatus, moduleCount) {
+    return moduleChoiceDisabledValue(disabledReason(command, serviceStatus, moduleCount));
 }
-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(command, serviceStatus, moduleCount),
             };
         }),
     ];
@@ -101,8 +125,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 +139,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 +148,7 @@ export async function selectCockpitTopLevelMenu(options = {}) {
         pageSize: topLevelPageSize(choices.length),
         loop: false,
         hideMessage: true,
-        disabledError: disabledError(options.serviceStatus),
+        disabledError: disabledError(options.serviceStatus, options.moduleCount),
         navigationWarning: options.navigationWarning,
         escapeBehavior: 'ignore',
     });

package/dist/module-actions.js

@@ -355,7 +355,7 @@ async function assertModuleCleanBeforeDelete(target, sourceType, repoPath, modul
     const repoRoot = sourceRepoPath(target, sourceType, repoPath);
     try {
         const result = await git.run(repoRoot, ['status', '--short', '--', moduleName]);
-        if (result.stdout.trim()) {
+        if (result.stdout.trim() && (await moduleHasCommittedFiles(repoRoot, moduleName, git))) {
             throw new Error(`Refusing to delete module ${moduleName} because it has dirty git changes in source repo ${repoPath}.`);
         }
     }
@@ -365,6 +365,15 @@ async function assertModuleCleanBeforeDelete(target, sourceType, repoPath, modul
         }
     }
 }
+async function moduleHasCommittedFiles(repoRoot, moduleName, git) {
+    try {
+        const result = await git.run(repoRoot, ['ls-tree', '-r', '--name-only', 'HEAD', '--', moduleName]);
+        return Boolean(result.stdout.trim());
+    }
+    catch {
+        return false;
+    }
+}
 export async function addModuleToSourceRepo(options, git = realGit) {
     const repoPath = validateRepoPath(options.repoPath);
     const moduleName = validateModuleName(options.moduleName);

package/package.json

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