pm-auto 1.0.5 → 1.0.7

package/src/config_reader.ts

@@ -1,131 +1,111 @@
 import fs from "fs/promises";
 import { getConfigPath } from "./config_path.js";
-
-import * as fsd from "fs";
-import * as path from "path";
 import type { CommandResult, ConfigType } from "./types/index.js";
 import { display } from "./display.js";
 import { confirm, isCancel, cancel } from "@clack/prompts";
 
-type PackageManager = "npm" | "yarn" | "pnpm";
-
 /**
- * Detect the package manager used in the project.
+ * Gets the required packages from the config file, transforms into a js object and with the options given
+ * it modifies the object and returns it
  */
 
-export function detectPackageManager(
-  projectPath: string = process.cwd(),
-): PackageManager | void {
-  // Check for lock files in order of specificity
-  if (fsd.existsSync(path.join(projectPath, "pnpm-lock.yaml"))) {
-    return "pnpm";
-  }
-
-  if (fsd.existsSync(path.join(projectPath, "yarn.lock"))) {
-    return "yarn";
-  }
-
-  if (fsd.existsSync(path.join(projectPath, "package-lock.json"))) {
-    return "npm";
-  }
-
-  // Default to npm if no lock file found
-  display("No Lock File Found", "error");
+//Check if the value is an array of ConfigType objects
+function isConfigTypeArray(value: unknown): value is ConfigType[] {
+  return (
+    Array.isArray(value) &&
+    value.every(
+      (item) =>
+        typeof item === "object" &&
+        item !== null &&
+        "packages" in item &&
+        Array.isArray((item as any).packages),
+    )
+  );
 }
 
-/**
- * Gets the required packages from the config file, transforms into a js object and with the options given
- * it modifies the object and returns it
- */
 export const getConfigObject = async (
   packages: string[],
   options?: any,
-): Promise<ConfigType[] | CommandResult[]> => {
-  if (!options.pkgJson) {
-    const configPath = getConfigPath();
-
-    //read config file content
-    let configContent = "";
-    try {
-      configContent = await fs.readFile(configPath as string, "utf8");
-    } catch (error) {
-      display(
-        `File not found ${error} Try updating the config file path`,
-        "error",
-      );
-    }
-
-    const configObject = JSON.parse(configContent);
-    let result: ConfigType[] = Object.values(configObject);
-
-    //filter the packages the user wants to install
-    if (packages.length > 0) {
-      result = packages
-        .map((pkgName) => {
-          const found = result.find((pkg) => pkg.name === pkgName);
-          if (!found) {
-            display(`Package '${pkgName}' not found in config`, "warning");
-          }
-          return found;
-        })
-        .filter((pkg) => pkg !== undefined);
-    }
-
-    /*
-     * Config object modification with the options given
-     */
-    //Add command to previous configured commands (-A/-add-command)
-    if (options.addCommand) {
-      result.forEach((config) => {
-        config.packages.forEach((pkg) => {
-          pkg.command = pkg.interactive
-            ? pkg.command
-            : pkg.command + " " + options.addCommand;
-        });
-      });
-    }
+): Promise<ConfigType[]> => {
+  const configPath = getConfigPath();
 
-    //Dry run - Display commands before execution
-    if (options.dryRun) {
-      display("Dry Run:", "info");
-      result.forEach((config) => {
-        display(`Package name -> ${config.name}`, "info");
-        config.packages.forEach((pkg) => {
-          display(`add ${pkg.command}`, "info");
-        });
-      });
-      const continueWithInstall = await confirm({
-        message: "Continue with installation?",
-        initialValue: true,
-      });
+  //read config file content
+  let configContent = "";
+  try {
+    configContent = await fs.readFile(configPath as string, "utf8");
+  } catch (error) {
+    display(
+      `File not found ${error} Try updating the config file path`,
+      "error",
+    );
+  }
 
-      if (isCancel(continueWithInstall)) {
-        cancel("Operation cancelled.");
-        process.exit(0);
-      }
+  const configObject = JSON.parse(configContent);
 
-      if (!continueWithInstall) {
-        display("Installation cancelled ", "success");
-      }
-    }
+  let result: ConfigType[] = [];
 
-    return result;
+  if (isConfigTypeArray(Object.values(configObject))) {
+    result = Object.values(configObject);
   } else {
-    //generate command for package.json
-    const pm = detectPackageManager();
+    display("Invalid config file format", "error");
+  }
 
-    const command = pm + " install";
+  //filter the packages the user wants to install
+  if (packages.length > 0 && result.length > 0) {
+    result = packages
+      .map((pkgName) => {
+        const found = result.find((pkg) => pkg.presetName === pkgName);
+        if (!found) {
+          display(`Package '${pkgName}' not found in config`, "warning");
+        }
+        return found;
+      })
+      .filter((pkg) => pkg !== undefined);
+  }
+
+  /*
+   * Config object modification with the options given
+   */
+
+  //Add flags to previous configured flags (-A/-add-flags)
+  if (options.addFlags) {
+    result.forEach((config) => {
+      config.packages.forEach((pkg) => {
+        if (pkg.flags) {
+          pkg.flags.push(pkg.interactive ? "" : options.addFlags);
+        } else {
+          pkg.flags = [pkg.interactive ? "" : options.addFlags];
+        }
+      });
+    });
+  }
 
-    const result: CommandResult[] = [
-      {
-        name: "package.json",
-        interactive: [],
-        nonInteractive: [command],
-      },
-    ];
+  //Dry run - Display commands before execution
+  if (options.dryRun) {
+    display("Dry Run:", "info");
+    result.forEach((config) => {
+      display(`Package name -> ${config.presetName}`, "info");
+      config.packages.forEach((pkg) => {
+        display(`running ${pkg.command}`, "info");
+      });
+    });
+    const continuation = await confirm({
+      message: "Continue?",
+      initialValue: true,
+    });
+
+    if (isCancel(continuation)) {
+      cancel("Operation cancelled.");
+      process.exit(0);
+    }
 
-    return result;
+    if (!continuation) {
+      display("Operation cancelled. ", "success");
+      process.exit(0);
+    }
   }
+
+  return result;
 };
 
 export const getConfigKeys = async (options: any) => {
@@ -172,13 +152,13 @@ export const getPackageDescription = async (packageName: string) => {
   }
 
   const configObject = JSON.parse(configContent);
-  let keys = Object.keys(configObject);
+  const configObjectArray: ConfigType[] = Object.values(configObject);
 
-  keys.forEach((key) => {
-    if (key === packageName) {
-      const description = !configObject[key].description
+  configObjectArray.forEach((configObject) => {
+    if (configObject.presetName === packageName) {
+      const description = !configObject.description
         ? "No description"
-        : configObject[key].description;
+        : configObject.description;
       display(`${packageName} - ${description}`, "info");
     }
   });

package/src/display.ts

@@ -2,7 +2,7 @@ import { log, spinner } from "@clack/prompts";
 import chalk from "chalk";
 
 type DisplayType = "error" | "success" | "warning" | "info" | "loading" | "";
-
+export const s = spinner();
 export const display = (text: string, type: DisplayType) => {
   switch (type) {
     case "error":
@@ -22,7 +22,7 @@ export const display = (text: string, type: DisplayType) => {
       break;
 
     case "loading":
-      const s = spinner();
+      log.info(chalk.blue(text));
       s.start(text);
       return s; // Return spinner so it can be stopped later
 

package/src/index.ts

@@ -14,10 +14,8 @@ const program = new Command();
 
 program
   .name("pm-auto")
-  .version("1.0.5")
-  .description(
-    "A CLI tool to define and install your tech stack presets with one command.",
-  );
+  .version("1.0.7")
+  .description("Automate your project setup with one command");
 
 program
   .command("config <path>")
@@ -33,10 +31,9 @@ program
   .description(
     "Install packages using the detected package manager (Aliases: add, i)",
   )
-  .option("-p, --pkg-json", "Install packages from package.json")
   .option(
-    "-A, --add-command <command>",
-    "Add a custom command to all installation commands from config file",
+    "-A, --add-flags <flags>",
+    "Add custom flags to already defined flags from config file",
   )
   .option("-D, --dry-run", "Dry run - Display commands before execution")
   .action((packages, options) => {
@@ -51,10 +48,8 @@ program
   .description(
     "Remove packages using the detected package manager (Aliases: remove, u, un)",
   )
-  .option(
-    "-A, --add-command <command>",
-    "Add a custom command to all installation commands from config file",
-  )
+  .option("-D, --dry-run", "Dry run - Display commands before execution")
+
   .action((packages, options) => {
     orchestrator("uninstall", packages, options);
   });
@@ -64,12 +59,12 @@ program
   .command("list")
   .alias("ls")
   .description("List all packages from the config file")
-  .option("-D, --desc", "Display packages description", false)
+  .option("--desc", "Display packages description", false)
   .action((options) => {
     getConfigKeys(options);
   });
 
-//Displaying config details
+//Display a config description
 program
   .command("describe <package>")
   .alias("desc")

package/src/orchestrator.ts

@@ -1,24 +1,14 @@
-import { buildCommands, buildUninstallCommands } from "./build_command.js";
+import {
+  buildInstallCommands,
+  buildUninstallCommands,
+} from "./build_command.js";
 import { getConfigObject } from "./config_reader.js";
 import { display } from "./display.js";
-import { install } from "./install.js";
+import { runCommands } from "./run_commands.js";
 import type { ConfigType } from "./types/index.js";
 import { outro } from "@clack/prompts";
 
-//Check if the value is an array of ConfigType objects
-function isConfigTypeArray(value: unknown): value is ConfigType[] {
-  return (
-    Array.isArray(value) &&
-    value.every(
-      (item) =>
-        typeof item === "object" &&
-        item !== null &&
-        "packages" in item &&
-        Array.isArray((item as any).packages),
-    )
-  );
-}
-
+//Controls installation and uninstallation of packages
 export const orchestrator = (
   command: string,
   packages: string[],
@@ -26,27 +16,23 @@ export const orchestrator = (
 ) => {
   if (command === "install") {
     display(
-      `Installing packages... ${options.pkgJson ? "from package.json" : (packages as string[]).join(", ")}`,
+      `Installing packages... ${(packages as string[]).join(", ")}`,
       "info",
     );
-
+    const start = performance.now();
     getConfigObject(packages, options).then(async (config) => {
       if (config.length === 0) {
         display("No configuration found", "error");
         return;
       }
 
-      if (isConfigTypeArray(config)) {
-        const commands = buildCommands(config);
+      const commands = buildInstallCommands(config);
 
-        await install(commands);
-        display("Packages installed successfully", "success");
-        outro("Done!");
-      } else {
-        await install(config);
-        display("Packages from package.json installed successfully", "success");
-        outro("Done!");
-      }
+      await runCommands(commands);
+      outro("Done!");
+      const end = performance.now();
+      display(`Installation took ${Math.round((end - start) / 1000)}s`, "info");
+      display("Packages installed successfully", "success");
     });
   } else {
     display(
@@ -54,18 +40,19 @@ export const orchestrator = (
       "info",
     );
 
+    const start = performance.now();
     getConfigObject(packages, options).then(async (config) => {
       if (config.length === 0) {
         display("No configuration found", "error");
         return;
       }
 
-      if (isConfigTypeArray(config)) {
-        const commands = buildUninstallCommands(config);
-        await install(commands);
-        display("Packages uninstalled successfully", "success");
-        outro("Done!");
-      }
+      const commands = buildUninstallCommands(config);
+      await runCommands(commands);
+      outro("Done!");
+      const end = performance.now();
+      display(`Uninstallation took ${end - start}ms`, "info");
+      display("Packages uninstalled successfully", "success");
     });
   }
 };

package/src/{install.ts → run_commands.ts}

@@ -1,6 +1,6 @@
 import { execa } from "execa";
 import type { CommandResult } from "./types/index.js";
-import { display } from "./display.js";
+import { display, s } from "./display.js";
 
 async function runCommand(command: string, interactive: boolean = false) {
   try {
@@ -11,6 +11,8 @@ async function runCommand(command: string, interactive: boolean = false) {
         stdio: "inherit",
       });
     } else {
+      s.stop();
+
       await execa(commandName as string, args, {
         stdio: "inherit",
       });
@@ -24,13 +26,13 @@ async function runCommand(command: string, interactive: boolean = false) {
 }
 
 /**
- * Install all commands
+ * Run all commands
  */
-export async function install(commands: CommandResult[]) {
+export async function runCommands(commands: CommandResult[]) {
   try {
     for (const command of commands) {
       // Wait for all interactive commands to finish first
-      if (command.interactive) {
+      if (command.interactive.length > 0) {
         for (const interactiveCommand of command.interactive) {
           display(`Running interactive command: ${interactiveCommand}`, "info");
           await runCommand(interactiveCommand, true);
@@ -40,8 +42,10 @@ export async function install(commands: CommandResult[]) {
       // Then run non-interactive
       if (command.nonInteractive.length > 0) {
         // For non-interactive, we show a spinner
-        display(`Running command: ${command.nonInteractive[0]}`, "loading");
-        await runCommand(command.nonInteractive[0] as string, false);
+        for (let i = 0; i < command.nonInteractive.length; i++) {
+          display(`Running command: ${command.nonInteractive[i]}`, "loading");
+          await runCommand(command.nonInteractive[i] as string, false);
+        }
       }
     }
   } catch (error: any) {

package/src/types/index.ts

@@ -1,17 +1,26 @@
 export interface ConfigType {
-  name: string;
+  presetName: string;
   description?: string;
   packageManager: string;
-  packages: { command: string; interactive: boolean }[];
+  packages: {
+    command: string;
+    interactive: boolean;
+    dev?: boolean;
+    flags?: string[];
+    version?: string;
+  }[];
 }
 
 export interface PackageType {
   command: string;
   interactive: boolean;
+  dev?: boolean;
+  flags?: string[];
+  version?: string;
 }
 
 export interface CommandResult {
-  name: string;
+  presetName: string;
   interactive: string[];
   nonInteractive: string[];
 }