@drupal-canvas/cli 0.3.0 → 0.4.0

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import chalk2 from 'chalk';
 import { Command } from 'commander';
-import * as p9 from '@clack/prompts';
+import * as p from '@clack/prompts';
 import * as fs from 'fs';
 import fs__default, { realpathSync as realpathSync$1, readlinkSync, readdirSync, readdir as readdir$1, lstatSync, promises } from 'fs';
 import path11, { win32, posix } from 'path';
@@ -14,18 +14,18 @@ import { transformSync } from '@swc/wasm';
 import { basename } from 'path/win32';
 import { ESLint } from 'eslint';
 import { required } from '@drupal-canvas/eslint-config';
-import { table } from 'table';
 import { fileURLToPath } from 'url';
 import { EventEmitter } from 'events';
 import Stream from 'stream';
 import { StringDecoder } from 'string_decoder';
+import { table } from 'table';
 import * as yaml from 'js-yaml';
 import yaml__default from 'js-yaml';
 import { parse } from '@babel/parser';
 
 // package.json
 var package_default = {
-  version: "0.3.0"};
+  version: "0.4.0"};
 function loadEnvFiles() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || "";
   if (homeDir) {
@@ -65,7 +65,7 @@ async function ensureConfig(requiredKeys) {
 async function promptForConfig(key) {
   switch (key) {
     case "siteUrl": {
-      const value = await p9.text({
+      const value = await p.text({
         message: "Enter the site URL",
         placeholder: "https://example.com",
         validate: (value2) => {
@@ -75,45 +75,45 @@ async function promptForConfig(key) {
           return;
         }
       });
-      if (p9.isCancel(value)) {
-        p9.cancel("Operation cancelled");
+      if (p.isCancel(value)) {
+        p.cancel("Operation cancelled");
         process.exit(0);
       }
       setConfig({ siteUrl: value });
       break;
     }
     case "clientId": {
-      const value = await p9.text({
+      const value = await p.text({
         message: "Enter your client ID",
         validate: (value2) => {
           if (!value2) return "Client ID is required";
           return;
         }
       });
-      if (p9.isCancel(value)) {
-        p9.cancel("Operation cancelled");
+      if (p.isCancel(value)) {
+        p.cancel("Operation cancelled");
         process.exit(0);
       }
       setConfig({ clientId: value });
       break;
     }
     case "clientSecret": {
-      const value = await p9.password({
+      const value = await p.password({
         message: "Enter your client secret",
         validate: (value2) => {
           if (!value2) return "Client secret is required";
           return;
         }
       });
-      if (p9.isCancel(value)) {
-        p9.cancel("Operation cancelled");
+      if (p.isCancel(value)) {
+        p.cancel("Operation cancelled");
         process.exit(0);
       }
       setConfig({ clientSecret: value });
       break;
     }
     case "componentDir": {
-      const value = await p9.text({
+      const value = await p.text({
         message: "Enter the component directory",
         placeholder: "./components",
         validate: (value2) => {
@@ -121,8 +121,8 @@ async function promptForConfig(key) {
           return;
         }
       });
-      if (p9.isCancel(value)) {
-        p9.cancel("Operation cancelled");
+      if (p.isCancel(value)) {
+        p.cancel("Operation cancelled");
         process.exit(0);
       }
       setConfig({ componentDir: value });
@@ -10822,9 +10822,9 @@ async function downloadJsSourceFromCanvas(componentsToDownload) {
       }
     } catch (error) {
       if (error instanceof Error) {
-        p9.note(chalk2.red(`Error: ${error.message}`));
+        p.note(chalk2.red(`Error: ${error.message}`));
       } else {
-        p9.note(chalk2.red(`Unknown error: ${String(error)}`));
+        p.note(chalk2.red(`Unknown error: ${String(error)}`));
       }
     }
   }
@@ -10846,9 +10846,9 @@ async function copyLocalJsSource(componentsToCopy) {
     }
   } catch (error) {
     if (error instanceof Error) {
-      p9.note(chalk2.red(`Error: ${error.message}`));
+      p.note(chalk2.red(`Error: ${error.message}`));
     } else {
-      p9.note(chalk2.red(`Unknown error: ${String(error)}`));
+      p.note(chalk2.red(`Unknown error: ${String(error)}`));
     }
   }
 }
@@ -10866,7 +10866,7 @@ async function cleanUpCacheDirectory() {
       }
     }
   } catch (error) {
-    p9.note(
+    p.note(
       chalk2.red(
         `Failed to clean cache directory contents: ${error instanceof Error ? error.message : String(error)}`
       )
@@ -11086,57 +11086,28 @@ async function buildComponent(componentDir) {
   }
   return result;
 }
-function reportResults(results, title, itemLabel = "Component") {
-  results.sort((a, b) => a.itemName.localeCompare(b.itemName));
-  const successful = results.filter((r) => r.success).length;
-  const failed = results.filter((r) => !r.success).length;
-  const hasDetails = results.some((r) => (r.details?.length ?? 0) > 0);
-  const succeededText = failed === 0 ? chalk2.green(`${successful} succeeded`) : `${successful} succeeded`;
-  const failedText = failed > 0 ? chalk2.red(`${failed} failed`) : chalk2.dim(`${failed} failed`);
-  const summary = `${succeededText}, ${failedText}`;
-  if (results.length > 0) {
-    const tableData = [
-      hasDetails ? [chalk2.bold(title), "", ""] : [chalk2.bold(title), ""],
-      hasDetails ? [itemLabel, "Status", "Details"] : [itemLabel, "Status"],
-      ...results.map(
-        (r) => hasDetails ? [
-          r.itemName,
-          r.success ? chalk2.green("Success") : chalk2.red("Failed"),
-          r.details?.map(
-            (d2) => d2.heading ? `${chalk2.underline(d2.heading)}:
-${d2.content}` : d2.content
-          ).join("\n\n")
-        ] : [
-          r.itemName,
-          r.success ? chalk2.green("Success") : chalk2.red("Failed")
-        ]
-      ),
-      hasDetails ? ["SUMMARY", "", summary] : ["SUMMARY", summary]
-    ];
-    p9.log.info(
-      table(tableData, {
-        spanningCells: [
-          {
-            row: 0,
-            col: 0,
-            colSpan: hasDetails ? 3 : 2,
-            alignment: "center"
-          },
-          {
-            row: results.length + 2,
-            col: 0,
-            colSpan: hasDetails ? 2 : 1,
-            alignment: hasDetails ? "right" : "left"
-          }
-        ],
-        columns: {
-          // Limit the width of the details column for improved readability of long details.
-          2: { width: 100, wrapWord: true }
-        }
-      })
+
+// src/utils/command-helpers.ts
+var ALL_COMPONENTS_SELECTOR = "_allComponents";
+function validateComponentOptions(options) {
+  if (options.components && options.all) {
+    throw new Error(
+      "Cannot use --all and --components options together. Please use either:\n   \u2022 --components to specify specific components, or\n   \u2022 --all to process everything."
     );
   }
 }
+function updateConfigFromOptions(options) {
+  if (options.clientId) setConfig({ clientId: options.clientId });
+  if (options.clientSecret) setConfig({ clientSecret: options.clientSecret });
+  if (options.siteUrl) setConfig({ siteUrl: options.siteUrl });
+  if (options.dir) setConfig({ componentDir: options.dir });
+  if (options.scope) setConfig({ scope: options.scope });
+  if (options.all) setConfig({ all: options.all });
+  if (options.verbose) setConfig({ verbose: true });
+}
+function pluralizeComponent(count) {
+  return count === 1 ? "component" : "components";
+}
 
 // ../node_modules/@isaacs/balanced-match/dist/esm/index.js
 var balanced = (a, b, str) => {
@@ -17772,50 +17743,244 @@ async function findComponentDirectories(baseDir) {
   }
 }
 
-// src/utils/select-local-components.ts
-async function selectLocalComponents(allFlag, message = "Select components", baseDir) {
+// src/utils/component-selector.ts
+async function selectLocalComponents(options) {
   const config2 = getConfig();
-  const searchDir = config2.componentDir;
-  const componentDirs = await findComponentDirectories(searchDir);
-  if (componentDirs.length === 0) {
-    p9.outro(`\u{1F4C2} No local components were found in ${searchDir}`);
-    return null;
+  const componentDir = options.componentDir || config2.componentDir;
+  const allLocalDirs = await findComponentDirectories(componentDir);
+  if (allLocalDirs.length === 0) {
+    throw new Error(`No local components were found in ${componentDir}`);
+  }
+  if (options.components) {
+    return selectSpecificLocalComponents(
+      options.components,
+      allLocalDirs,
+      options
+    );
   }
-  if (allFlag) {
-    p9.log.info(`Selected all components`);
-    return componentDirs;
+  if (options.all) {
+    if (!options.skipConfirmation) {
+      const confirmed = await confirmSelection(
+        allLocalDirs.length,
+        options.confirmMessage
+      );
+      if (!confirmed) {
+        throw new Error("Operation cancelled by user");
+      }
+    }
+    p.log.info(`Selected all components`);
+    return { directories: allLocalDirs };
   }
-  const selectedDirs = await p9.multiselect({
-    message,
+  return selectLocalComponentsInteractive(allLocalDirs, options);
+}
+async function selectSpecificLocalComponents(componentsInput, allLocalDirs, options) {
+  const requestedNames = componentsInput.split(",").map((name) => name.trim()).filter((name) => name.length > 0);
+  const notFound = [];
+  const foundDirs = [];
+  for (const requestedName of requestedNames) {
+    const dir = allLocalDirs.find((d2) => path11.basename(d2) === requestedName);
+    if (dir) {
+      foundDirs.push(dir);
+    } else {
+      notFound.push(requestedName);
+    }
+  }
+  if (notFound.length > 0) {
+    const message = options.notFoundMessage || `The following component(s) were not found locally: ${notFound.join(", ")}`;
+    throw new Error(message);
+  }
+  if (!options.skipConfirmation) {
+    const confirmed = await confirmSelection(
+      foundDirs.length,
+      options.confirmMessage
+    );
+    if (!confirmed) {
+      throw new Error("Operation cancelled by user");
+    }
+  }
+  return { directories: foundDirs };
+}
+async function selectLocalComponentsInteractive(allLocalDirs, options) {
+  const selectedDirs = await p.multiselect({
+    message: options.selectMessage || "Select components",
     options: [
       {
-        value: "_allComponents",
+        value: ALL_COMPONENTS_SELECTOR,
         label: "All components"
       },
-      ...componentDirs.map((dir) => ({
+      ...allLocalDirs.map((dir) => ({
         value: dir,
         label: path11.basename(dir)
       }))
     ],
     required: true
   });
-  if (p9.isCancel(selectedDirs)) {
-    p9.cancel("Operation cancelled");
-    return null;
+  if (p.isCancel(selectedDirs)) {
+    throw new Error("Operation cancelled by user");
+  }
+  const finalDirs = selectedDirs.includes(ALL_COMPONENTS_SELECTOR) ? allLocalDirs : selectedDirs;
+  if (!options.skipConfirmation) {
+    const confirmed = await confirmSelection(
+      finalDirs.length,
+      options.confirmMessage
+    );
+    if (!confirmed) {
+      throw new Error("Operation cancelled by user");
+    }
+  }
+  return { directories: finalDirs };
+}
+async function selectRemoteComponents(allComponents, options) {
+  const componentCount = Object.keys(allComponents).length;
+  if (componentCount === 0) {
+    throw new Error("No components found");
+  }
+  if (options.all) {
+    if (!options.skipConfirmation) {
+      const confirmed = await confirmSelection(
+        componentCount,
+        options.confirmMessage
+      );
+      if (!confirmed) {
+        throw new Error("Operation cancelled by user");
+      }
+    }
+    return { components: allComponents };
+  }
+  if (options.components) {
+    return selectSpecificRemoteComponents(
+      options.components,
+      allComponents,
+      options
+    );
+  }
+  return selectRemoteComponentsInteractive(allComponents, options);
+}
+async function selectSpecificRemoteComponents(componentsInput, allComponents, options) {
+  const requestedNames = componentsInput.split(",").map((name) => name.trim()).filter((name) => name.length > 0);
+  const notFound = [];
+  const selected = {};
+  for (const requestedName of requestedNames) {
+    const component = allComponents[requestedName];
+    if (component) {
+      selected[requestedName] = component;
+    } else {
+      notFound.push(requestedName);
+    }
+  }
+  if (notFound.length > 0) {
+    const message = options.notFoundMessage || `The following component(s) were not found: ${notFound.join(", ")}`;
+    throw new Error(message);
+  }
+  if (!options.skipConfirmation) {
+    const confirmed = await confirmSelection(
+      Object.keys(selected).length,
+      options.confirmMessage
+    );
+    if (!confirmed) {
+      throw new Error("Operation cancelled by user");
+    }
   }
-  const count = selectedDirs.includes("_allComponents") ? componentDirs.length : selectedDirs.length;
-  const confirmBuild = await p9.confirm({
-    message: `Process ${count} components`,
+  return { components: selected };
+}
+async function selectRemoteComponentsInteractive(allComponents, options) {
+  const selectedMachineNames = await p.multiselect({
+    message: options.selectMessage || "Select components to download",
+    options: [
+      {
+        value: ALL_COMPONENTS_SELECTOR,
+        label: "All components"
+      },
+      ...Object.keys(allComponents).map((key) => ({
+        value: allComponents[key].machineName,
+        label: `${allComponents[key].name} (${allComponents[key].machineName})`
+      }))
+    ],
+    required: true
+  });
+  if (p.isCancel(selectedMachineNames)) {
+    throw new Error("Operation cancelled by user");
+  }
+  const selected = selectedMachineNames.includes(
+    ALL_COMPONENTS_SELECTOR
+  ) ? allComponents : Object.fromEntries(
+    Object.entries(allComponents).filter(
+      ([, component]) => selectedMachineNames.includes(component.machineName)
+    )
+  );
+  if (!options.skipConfirmation) {
+    const confirmed = await confirmSelection(
+      Object.keys(selected).length,
+      options.confirmMessage
+    );
+    if (!confirmed) {
+      throw new Error("Operation cancelled by user");
+    }
+  }
+  return { components: selected };
+}
+async function confirmSelection(count, customMessage) {
+  const componentLabel = count === 1 ? "component" : "components";
+  const message = customMessage || `Process ${count} ${componentLabel}?`;
+  const confirmed = await p.confirm({
+    message,
     initialValue: true
   });
-  if (p9.isCancel(confirmBuild) || !confirmBuild) {
-    p9.cancel("Operation cancelled");
-    return null;
+  if (p.isCancel(confirmed) || !confirmed) {
+    return false;
   }
-  if (selectedDirs.includes("_allComponents")) {
-    return componentDirs;
+  return true;
+}
+function reportResults(results, title, itemLabel = "Component") {
+  results.sort((a, b) => a.itemName.localeCompare(b.itemName));
+  const successful = results.filter((r) => r.success).length;
+  const failed = results.filter((r) => !r.success).length;
+  const hasDetails = results.some((r) => (r.details?.length ?? 0) > 0);
+  const succeededText = failed === 0 ? chalk2.green(`${successful} succeeded`) : `${successful} succeeded`;
+  const failedText = failed > 0 ? chalk2.red(`${failed} failed`) : chalk2.dim(`${failed} failed`);
+  const summary = `${succeededText}, ${failedText}`;
+  if (results.length > 0) {
+    const tableData = [
+      hasDetails ? [chalk2.bold(title), "", ""] : [chalk2.bold(title), ""],
+      hasDetails ? [itemLabel, "Status", "Details"] : [itemLabel, "Status"],
+      ...results.map(
+        (r) => hasDetails ? [
+          r.itemName,
+          r.success ? chalk2.green("Success") : chalk2.red("Failed"),
+          r.details?.map(
+            (d2) => d2.heading ? `${chalk2.underline(d2.heading)}:
+${d2.content}` : d2.content
+          ).join("\n\n") ?? ""
+        ] : [
+          r.itemName,
+          r.success ? chalk2.green("Success") : chalk2.red("Failed")
+        ]
+      ),
+      hasDetails ? ["SUMMARY", "", summary] : ["SUMMARY", summary]
+    ];
+    p.log.info(
+      table(tableData, {
+        spanningCells: [
+          {
+            row: 0,
+            col: 0,
+            colSpan: hasDetails ? 3 : 2,
+            alignment: "center"
+          },
+          {
+            row: results.length + 2,
+            col: 0,
+            colSpan: hasDetails ? 2 : 1,
+            alignment: hasDetails ? "right" : "left"
+          }
+        ],
+        columns: {
+          // Limit the width of the details column for improved readability of long details.
+          2: { width: 100, wrapWord: true }
+        }
+      })
+    );
   }
-  return selectedDirs;
 }
 
 // src/commands/build.ts
@@ -17823,75 +17988,84 @@ function buildCommand(program2) {
   program2.command("build").description("build local components and Tailwind CSS assets").option(
     "-d, --dir <directory>",
     "Component directory to build the components in"
-  ).option("--all", "Build all components").option("--no-tailwind", "Skip Tailwind CSS building").option("--client-id <id>", "Client ID").option("--client-secret <secret>", "Client Secret").option("--site-url <url>", "Site URL").option("--verbose", "Enable verbose output").action(async (options) => {
-    p9.intro(chalk2.bold("Drupal Canvas CLI: build"));
-    const allFlag = options.all || false;
-    const skipTailwind = !options.tailwind;
-    if (options.dir) setConfig({ componentDir: options.dir });
-    if (options.clientId) setConfig({ clientId: options.clientId });
-    if (options.clientSecret)
-      setConfig({ clientSecret: options.clientSecret });
-    if (options.siteUrl) setConfig({ siteUrl: options.siteUrl });
-    if (options.verbose) setConfig({ verbose: true });
-    if (!skipTailwind) {
-      await ensureConfig(["siteUrl", "clientId", "clientSecret"]);
-    }
-    const selectedComponents = await selectLocalComponents(
-      allFlag,
-      "Select components to build"
-    );
-    if (!selectedComponents || selectedComponents.length === 0) {
-      return;
-    }
-    const componentLabelPluralized = selectedComponents.length === 1 ? "component" : "components";
-    const s1 = p9.spinner();
-    s1.start(`Building ${componentLabelPluralized}`);
-    const results = [];
-    for (const componentDir of selectedComponents) {
-      results.push(await buildComponent(componentDir));
-    }
-    s1.stop(
-      chalk2.green(
-        `Processed ${selectedComponents.length} ${componentLabelPluralized}`
-      )
-    );
-    reportResults(results, "Built components", "Component");
-    if (results.map((result) => result.success).includes(false)) {
-      process.exit(1);
-    }
-    if (skipTailwind) {
-      p9.log.info("Skipping Tailwind CSS build");
-    } else {
-      const s2 = p9.spinner();
-      s2.start("Building Tailwind CSS");
-      const tailwindResult = await buildTailwindForComponents(
-        selectedComponents
+  ).option("--all", "Build all components").option(
+    "-c, --components <names>",
+    "Specific component(s) to build (comma-separated)"
+  ).option("--no-tailwind", "Skip Tailwind CSS building").option("-y, --yes", "Skip confirmation prompts").option("--client-id <id>", "Client ID").option("--client-secret <secret>", "Client Secret").option("--site-url <url>", "Site URL").option("--verbose", "Enable verbose output").action(async (options) => {
+    try {
+      p.intro(chalk2.bold("Drupal Canvas CLI: build"));
+      validateComponentOptions(options);
+      const allFlag = options.all || options.yes && !options.components || false;
+      const skipTailwind = !options.tailwind;
+      updateConfigFromOptions(options);
+      if (!skipTailwind) {
+        await ensureConfig(["siteUrl", "clientId", "clientSecret"]);
+      }
+      const { directories: componentsToBuild } = await selectLocalComponents({
+        all: allFlag,
+        components: options.components,
+        skipConfirmation: options.yes,
+        selectMessage: "Select components to build"
+      });
+      const componentLabelPluralized = pluralizeComponent(
+        componentsToBuild.length
       );
-      s2.stop(
+      const s1 = p.spinner();
+      s1.start(`Building ${componentLabelPluralized}`);
+      const results = [];
+      for (const componentDir of componentsToBuild) {
+        results.push(await buildComponent(componentDir));
+      }
+      s1.stop(
         chalk2.green(
-          `Processed Tailwind CSS classes from ${selectedComponents.length} selected local ${componentLabelPluralized} and all online components`
+          `Processed ${componentsToBuild.length} ${componentLabelPluralized}`
         )
       );
-      reportResults([tailwindResult], "Built assets", "Asset");
-      if (!tailwindResult.success) {
-        return process.exit(1);
+      reportResults(results, "Built components", "Component");
+      if (results.map((result) => result.success).includes(false)) {
+        process.exit(1);
+      }
+      if (skipTailwind) {
+        p.log.info("Skipping Tailwind CSS build");
+      } else {
+        const s2 = p.spinner();
+        s2.start("Building Tailwind CSS");
+        const tailwindResult = await buildTailwindForComponents(
+          componentsToBuild
+        );
+        s2.stop(
+          chalk2.green(
+            `Processed Tailwind CSS classes from ${componentsToBuild.length} selected local ${componentLabelPluralized} and all online components`
+          )
+        );
+        reportResults([tailwindResult], "Built assets", "Asset");
+        if (!tailwindResult.success) {
+          return process.exit(1);
+        }
       }
+      p.outro(`\u{1F4E6} Build completed`);
+    } catch (error) {
+      if (error instanceof Error) {
+        p.note(chalk2.red(`Error: ${error.message}`));
+      } else {
+        p.note(chalk2.red(`Unknown error: ${String(error)}`));
+      }
+      process.exit(1);
     }
-    p9.outro(`\u{1F4E6} Build completed`);
   });
 }
 function downloadCommand(program2) {
-  program2.command("download").description("download components to your local filesystem").option("--client-id <id>", "Client ID").option("--client-secret <secret>", "Client Secret").option("--site-url <url>", "Site URL").option("--scope <scope>", "Scope").option("-d, --dir <directory>", "Component directory").option("-c, --component <name>", "Specific component to download").option("--all", "Download all components").option("--verbose", "Enable verbose output").action(async (options) => {
-    p9.intro(chalk2.bold("Drupal Canvas CLI: download"));
+  program2.command("download").description("download components to your local filesystem").option("--client-id <id>", "Client ID").option("--client-secret <secret>", "Client Secret").option("--site-url <url>", "Site URL").option("--scope <scope>", "Scope").option("-d, --dir <directory>", "Component directory").option(
+    "-c, --components <names>",
+    "Specific component(s) to download (comma-separated)"
+  ).option("--all", "Download all components").option("-y, --yes", "Skip all confirmation prompts").option(
+    "--skip-overwrite",
+    "Skip downloading components that already exist locally"
+  ).option("--verbose", "Enable verbose output").action(async (options) => {
+    p.intro(chalk2.bold("Drupal Canvas CLI: download"));
     try {
-      if (options.clientId) setConfig({ clientId: options.clientId });
-      if (options.clientSecret)
-        setConfig({ clientSecret: options.clientSecret });
-      if (options.siteUrl) setConfig({ siteUrl: options.siteUrl });
-      if (options.dir) setConfig({ componentDir: options.dir });
-      if (options.all) setConfig({ all: options.all });
-      if (options.scope) setConfig({ scope: options.scope });
-      if (options.verbose) setConfig({ verbose: true });
+      validateComponentOptions(options);
+      updateConfigFromOptions(options);
       await ensureConfig([
         "siteUrl",
         "clientId",
@@ -17901,7 +18075,7 @@ function downloadCommand(program2) {
       ]);
       const config2 = getConfig();
       const apiService = await createApiService();
-      const s = p9.spinner();
+      const s = p.spinner();
       s.start("Fetching components");
       const components = await apiService.listComponents();
       const {
@@ -17909,63 +18083,21 @@ function downloadCommand(program2) {
       } = await apiService.getGlobalAssetLibrary();
       if (Object.keys(components).length === 0) {
         s.stop("No components found");
-        p9.outro("Download cancelled - no components were found");
+        p.outro("Download cancelled - no components were found");
         return;
       }
       s.stop(`Found ${Object.keys(components).length} components`);
-      let componentsToDownload = {};
-      if (options.all) {
-        componentsToDownload = components;
-      } else if (options.component) {
-        const component = Object.values(components).find(
-          (c) => c.machineName === options.component || c.name === options.component
-        );
-        if (!component) {
-          p9.note(chalk2.red(`Component "${options.component}" not found`));
-          p9.outro("Download cancelled");
-          return;
-        }
-        componentsToDownload = { component };
-      } else {
-        const selectedComponents = await p9.multiselect({
-          message: "Select components to download",
-          options: [
-            {
-              value: "_allComponents",
-              label: "All components"
-            },
-            ...Object.keys(components).map((key) => ({
-              value: components[key].machineName,
-              label: `${components[key].name} (${components[key].machineName})`
-            }))
-          ],
-          required: true
-        });
-        if (p9.isCancel(selectedComponents)) {
-          p9.cancel("Operation cancelled");
-          return;
-        }
-        if (selectedComponents.includes("_allComponents")) {
-          componentsToDownload = components;
-        } else {
-          componentsToDownload = Object.fromEntries(
-            Object.entries(components).filter(
-              ([, component]) => selectedComponents.includes(
-                component.machineName
-              )
-            )
-          );
-        }
-      }
-      const componentPluralized = `component${Object.keys(componentsToDownload).length > 1 ? "s" : ""}`;
-      const confirmDownload = await p9.confirm({
-        message: `Download ${Object.keys(componentsToDownload).length} ${componentPluralized} to ${config2.componentDir}?`,
-        initialValue: true
+      const allFlag = options.all || options.yes && !options.components || false;
+      const { components: componentsToDownload } = await selectRemoteComponents(components, {
+        all: allFlag,
+        components: options.components,
+        skipConfirmation: options.yes,
+        selectMessage: "Select components to download",
+        confirmMessage: `Download to ${config2.componentDir}?`
       });
-      if (p9.isCancel(confirmDownload) || !confirmDownload) {
-        p9.cancel("Operation cancelled");
-        return;
-      }
+      const componentPluralized = pluralizeComponent(
+        Object.keys(componentsToDownload).length
+      );
       const results = [];
       s.start(`Downloading ${componentPluralized}`);
       for (const key in componentsToDownload) {
@@ -17979,13 +18111,27 @@ function downloadCommand(program2) {
           if (dirExists) {
             const files = await fs2.readdir(componentDir);
             if (files.length > 0) {
-              const confirmDelete = await p9.confirm({
-                message: `The "${componentDir}" directory is not empty. Are you sure you want to delete and overwrite this directory?`,
-                initialValue: true
-              });
-              if (p9.isCancel(confirmDelete) || !confirmDelete) {
-                p9.cancel("Operation cancelled");
-                process.exit(0);
+              if (options.skipOverwrite) {
+                results.push({
+                  itemName: component.machineName,
+                  success: true,
+                  details: [
+                    {
+                      content: "Skipped (already exists)"
+                    }
+                  ]
+                });
+                continue;
+              }
+              if (!options.yes) {
+                const confirmDelete = await p.confirm({
+                  message: `The "${componentDir}" directory is not empty. Are you sure you want to delete and overwrite this directory?`,
+                  initialValue: true
+                });
+                if (p.isCancel(confirmDelete) || !confirmDelete) {
+                  p.cancel("Operation cancelled");
+                  process.exit(0);
+                }
               }
             }
           }
@@ -18065,12 +18211,12 @@ function downloadCommand(program2) {
         }
         reportResults([globalCssResult], "Downloaded assets", "Asset");
       }
-      p9.outro(`\u2B07\uFE0F Download command completed`);
+      p.outro(`\u2B07\uFE0F Download command completed`);
     } catch (error) {
       if (error instanceof Error) {
-        p9.note(chalk2.red(`Error: ${error.message}`));
+        p.note(chalk2.red(`Error: ${error.message}`));
       } else {
-        p9.note(chalk2.red(`Unknown error: ${String(error)}`));
+        p.note(chalk2.red(`Unknown error: ${String(error)}`));
       }
       process.exit(1);
     }
@@ -18084,7 +18230,7 @@ function scaffoldCommand(program2) {
     "-d, --dir <directory>",
     "Component directory to create component in"
   ).option("--verbose", "Enable verbose output").action(async (options) => {
-    p9.intro(chalk2.bold("Drupal Canvas CLI: scaffold"));
+    p.intro(chalk2.bold("Drupal Canvas CLI: scaffold"));
     try {
       if (options.dir) setConfig({ componentDir: options.dir });
       if (options.verbose) setConfig({ verbose: options.verbose });
@@ -18092,7 +18238,7 @@ function scaffoldCommand(program2) {
       const baseDir = config2.componentDir;
       let componentName = options.name;
       if (!componentName) {
-        const name = await p9.text({
+        const name = await p.text({
           message: "Enter the component name",
           placeholder: "my-component",
           validate: (value) => {
@@ -18102,14 +18248,14 @@ function scaffoldCommand(program2) {
             return;
           }
         });
-        if (p9.isCancel(name)) {
-          p9.cancel("Operation cancelled");
+        if (p.isCancel(name)) {
+          p.cancel("Operation cancelled");
           return;
         }
         componentName = name;
       }
       const componentDir = path11.join(baseDir, componentName);
-      const s = p9.spinner();
+      const s = p.spinner();
       s.start(`Creating component "${componentName}"`);
       try {
         await fs2.mkdir(componentDir, { recursive: true });
@@ -18120,12 +18266,12 @@ function scaffoldCommand(program2) {
         const files = await fs2.readdir(templateDir);
         const newDirFiles = await fs2.readdir(componentDir);
         if (newDirFiles.length > 0) {
-          const confirmDelete = await p9.confirm({
+          const confirmDelete = await p.confirm({
             message: `The "${componentDir}" directory is not empty. Do you want to proceed and potentially overwrite existing files?`,
             initialValue: true
           });
-          if (p9.isCancel(confirmDelete) || !confirmDelete) {
-            p9.cancel("Operation cancelled");
+          if (p.isCancel(confirmDelete) || !confirmDelete) {
+            p.cancel("Operation cancelled");
             process.exit(0);
           }
         }
@@ -18138,21 +18284,21 @@ function scaffoldCommand(program2) {
           await fs2.writeFile(destPath, content, "utf-8");
         }
         s.stop(chalk2.green(`Created component "${componentName}"`));
-        p9.note(`Component "${componentName}" has been created:
+        p.note(`Component "${componentName}" has been created:
 - Directory: ${componentDir}
 - Component metadata: ${path11.join(componentDir, `component.yml`)}
 - Source file: ${path11.join(componentDir, `index.jsx`)}
 - CSS file: ${path11.join(componentDir, `index.css`)}`);
-        p9.outro("\u{1F3D7}\uFE0F Scaffold command completed");
+        p.outro("\u{1F3D7}\uFE0F Scaffold command completed");
       } catch (error) {
         s.stop(chalk2.red(`Failed to create component "${componentName}"`));
         throw error;
       }
     } catch (error) {
       if (error instanceof Error) {
-        p9.note(chalk2.red(`Error: ${error.message}`));
+        p.note(chalk2.red(`Error: ${error.message}`));
       } else {
-        p9.note(chalk2.red(`Unknown error: ${String(error)}`));
+        p.note(chalk2.red(`Unknown error: ${String(error)}`));
       }
       process.exit(1);
     }
@@ -18347,12 +18493,12 @@ async function processInPool(items, processor, concurrency = 10) {
   }
   return results.sort((a, b) => a.index - b.index);
 }
-function createProgressCallback(spinner5, operation, total) {
+function createProgressCallback(spinner6, operation, total) {
   let completed = 0;
   return () => {
     completed++;
     const percentage = Math.round(completed / total * 100);
-    spinner5.message(`${operation} (${completed}/${total} - ${percentage}%)`);
+    spinner6.message(`${operation} (${completed}/${total} - ${percentage}%)`);
   };
 }
 
@@ -18436,19 +18582,16 @@ async function uploadComponents(uploadTasks, apiService, onProgress) {
   });
 }
 function uploadCommand(program2) {
-  program2.command("upload").description("build and upload local components and global CSS assets").option("--client-id <id>", "Client ID").option("--client-secret <secret>", "Client Secret").option("--site-url <url>", "Site URL").option("--scope <scope>", "Scope").option("-d, --dir <directory>", "Component directory").option("--all", "Upload all components").option("--verbose", "Verbose output").option("--no-tailwind", "Skip Tailwind CSS building").action(async (options) => {
-    const allFlag = options.all || false;
+  program2.command("upload").description("build and upload local components and global CSS assets").option("--client-id <id>", "Client ID").option("--client-secret <secret>", "Client Secret").option("--site-url <url>", "Site URL").option("--scope <scope>", "Scope").option("-d, --dir <directory>", "Component directory").option(
+    "-c, --components <names>",
+    "Specific component(s) to upload (comma-separated)"
+  ).option("--all", "Upload all components").option("-y, --yes", "Skip confirmation prompts").option("--verbose", "Verbose output").option("--no-tailwind", "Skip Tailwind CSS building").action(async (options) => {
+    const allFlag = options.all || options.yes && !options.components || false;
     const skipTailwind = !options.tailwind;
     try {
-      p9.intro(chalk2.bold("Drupal Canvas CLI: upload"));
-      if (options.clientId) setConfig({ clientId: options.clientId });
-      if (options.clientSecret)
-        setConfig({ clientSecret: options.clientSecret });
-      if (options.siteUrl) setConfig({ siteUrl: options.siteUrl });
-      if (options.dir) setConfig({ componentDir: options.dir });
-      if (options.scope) setConfig({ scope: options.scope });
-      if (options.all) setConfig({ all: options.all });
-      if (options.verbose) setConfig({ verbose: options.verbose });
+      p.intro(chalk2.bold("Drupal Canvas CLI: upload"));
+      validateComponentOptions(options);
+      updateConfigFromOptions(options);
       await ensureConfig([
         "siteUrl",
         "clientId",
@@ -18457,28 +18600,34 @@ function uploadCommand(program2) {
         "componentDir"
       ]);
       const config2 = getConfig();
-      const componentsToUpload = await selectLocalComponents(
-        allFlag,
-        "Select components to upload"
+      const { directories: componentsToUpload } = await selectLocalComponents(
+        {
+          all: allFlag,
+          components: options.components,
+          skipConfirmation: options.yes,
+          selectMessage: "Select components to upload"
+        }
       );
-      if (!componentsToUpload || componentsToUpload.length === 0) {
-        return;
-      }
       const apiService = await createApiService();
       const componentResults = await getBuildAndUploadResults(
         componentsToUpload,
         apiService
       );
       reportResults(componentResults, "Uploaded components", "Component");
+      if (componentResults.some((result) => !result.success)) {
+        process.exit(1);
+      }
       if (skipTailwind) {
-        p9.log.info("Skipping Tailwind CSS build");
+        p.log.info("Skipping Tailwind CSS build");
       } else {
-        const s2 = p9.spinner();
+        const s2 = p.spinner();
         s2.start("Building Tailwind CSS");
         const tailwindResult = await buildTailwindForComponents(
           componentsToUpload
         );
-        const componentLabelPluralized = componentsToUpload.length === 1 ? "component" : "components";
+        const componentLabelPluralized = pluralizeComponent(
+          componentsToUpload.length
+        );
         s2.stop(
           chalk2.green(
             `Processed Tailwind CSS classes from ${componentsToUpload.length} selected local ${componentLabelPluralized} and all online components`
@@ -18486,7 +18635,7 @@ function uploadCommand(program2) {
         );
         if (!tailwindResult.success && tailwindResult.details) {
           reportResults([tailwindResult], "Built assets", "Asset");
-          p9.note(
+          p.note(
             chalk2.red(`Tailwind build failed, global assets upload aborted.`)
           );
         } else {
@@ -18497,12 +18646,12 @@ function uploadCommand(program2) {
           reportResults([globalCssResult], "Uploaded assets", "Asset");
         }
       }
-      p9.outro("\u2B06\uFE0F Upload command completed");
+      p.outro("\u2B06\uFE0F Upload command completed");
     } catch (error) {
       if (error instanceof Error) {
-        p9.note(chalk2.red(`Error: ${error.message}`));
+        p.note(chalk2.red(`Error: ${error.message}`));
       } else {
-        p9.note(chalk2.red(`Unknown error: ${String(error)}`));
+        p.note(chalk2.red(`Unknown error: ${String(error)}`));
       }
       process.exit(1);
     }
@@ -18534,7 +18683,7 @@ async function prepareComponentsForUpload(successfulBuilds, componentsToUpload)
         importedJsComponents = getImportsFromAst(ast, scope);
         dataDependencies = getDataDependenciesFromAst(ast);
       } catch (error) {
-        p9.note(chalk2.red(`Error: ${error}`));
+        p.note(chalk2.red(`Error: ${error}`));
       }
       const componentPayloadArg = {
         metadata,
@@ -18572,30 +18721,30 @@ async function prepareComponentsForUpload(successfulBuilds, componentsToUpload)
 }
 async function getBuildAndUploadResults(componentsToUpload, apiService) {
   const results = [];
-  const spinner5 = p9.spinner();
-  spinner5.start("Building components");
+  const spinner6 = p.spinner();
+  spinner6.start("Building components");
   const buildResults = await buildSelectedComponents(componentsToUpload);
   const successfulBuilds = buildResults.filter((build) => build.success);
   const failedBuilds = buildResults.filter((build) => !build.success);
   if (successfulBuilds.length === 0) {
     const message = "All component builds failed.";
-    spinner5.stop(chalk2.red(message));
+    spinner6.stop(chalk2.red(message));
     return failedBuilds;
   }
-  spinner5.message("Preparing components for upload");
+  spinner6.message("Preparing components for upload");
   const { prepared: preparedComponents, failed: preparationFailures } = await prepareComponentsForUpload(successfulBuilds, componentsToUpload);
   results.push(...preparationFailures);
   if (preparedComponents.length === 0) {
-    spinner5.stop(chalk2.red("All component preparations failed"));
+    spinner6.stop(chalk2.red("All component preparations failed"));
     return [...results, ...failedBuilds];
   }
   const machineNames = preparedComponents.map((c) => c.machineName);
   const existenceProgress = createProgressCallback(
-    spinner5,
+    spinner6,
     "Checking component existence",
     machineNames.length
   );
-  spinner5.message("Checking component existence");
+  spinner6.message("Checking component existence");
   const existenceResults = await checkComponentsExist(
     machineNames,
     apiService,
@@ -18607,11 +18756,11 @@ async function getBuildAndUploadResults(componentsToUpload, apiService) {
     shouldUpdate: existenceResults[index]?.exists || false
   }));
   const uploadProgress = createProgressCallback(
-    spinner5,
+    spinner6,
     "Uploading components",
     uploadTasks.length
   );
-  spinner5.message("Uploading components");
+  spinner6.message("Uploading components");
   const uploadResults = await uploadComponents(
     uploadTasks,
     apiService,
@@ -18644,7 +18793,7 @@ async function getBuildAndUploadResults(componentsToUpload, apiService) {
   }
   results.push(...failedBuilds);
   const componentLabelPluralized = results.length === 1 ? "component" : "components";
-  spinner5.stop(
+  spinner6.stop(
     chalk2.green(`Processed ${results.length} ${componentLabelPluralized}`)
   );
   return results;
@@ -18714,33 +18863,54 @@ function validateCommand(program2) {
   program2.command("validate").description("validate local components").option(
     "-d, --dir <directory>",
     "Component directory to validate the components in"
-  ).option("--all", "Validate all components").option("--verbose", "Enable verbose output").option(
+  ).option(
+    "-c, --components <names>",
+    "Specific component(s) to validate (comma-separated)"
+  ).option("--all", "Validate all components").option("-y, --yes", "Skip confirmation prompts").option("--verbose", "Enable verbose output").option(
     "--fix",
     "Apply available automatic fixes for linting issues",
     false
   ).action(async (options) => {
-    p9.intro(chalk2.bold("Drupal Canvas CLI: validate"));
-    const allFlag = options.all || false;
-    if (options.dir) setConfig({ componentDir: options.dir });
-    if (options.verbose) setConfig({ verbose: true });
-    const selectedComponents = await selectLocalComponents(
-      allFlag,
-      "Select components to validate"
-    );
-    if (!selectedComponents || selectedComponents.length === 0) {
-      return;
-    }
-    const results = [];
-    for (const componentDir of selectedComponents) {
-      results.push(await validateComponent(componentDir, options.fix));
-    }
-    reportResults(results, "Validation results");
-    const hasErrors = results.some((r) => !r.success);
-    if (hasErrors) {
-      p9.outro(`\u274C Validation completed with errors`);
+    try {
+      p.intro(chalk2.bold("Drupal Canvas CLI: validate"));
+      validateComponentOptions(options);
+      const allFlag = options.all || options.yes && !options.components || false;
+      updateConfigFromOptions(options);
+      const { directories: componentsToValidate } = await selectLocalComponents({
+        all: allFlag,
+        components: options.components,
+        skipConfirmation: options.yes,
+        selectMessage: "Select components to validate"
+      });
+      const componentPluralized = pluralizeComponent(
+        componentsToValidate.length
+      );
+      const s = p.spinner();
+      s.start(`Validating ${componentPluralized}`);
+      const results = [];
+      for (const componentDir of componentsToValidate) {
+        results.push(await validateComponent(componentDir, options.fix));
+      }
+      s.stop(
+        chalk2.green(
+          `Processed ${componentsToValidate.length} ${componentPluralized}`
+        )
+      );
+      reportResults(results, "Validation results", "Component");
+      const hasErrors = results.some((r) => !r.success);
+      if (hasErrors) {
+        p.outro(`\u274C Validation completed with errors`);
+        process.exit(1);
+      }
+      p.outro(`\u2705 Validation completed`);
+    } catch (error) {
+      if (error instanceof Error) {
+        p.note(chalk2.red(`Error: ${error.message}`));
+      } else {
+        p.note(chalk2.red(`Unknown error: ${String(error)}`));
+      }
       process.exit(1);
     }
-    p9.outro(`\u2705 Validation completed`);
   });
 }