@vlandoss/run-run 0.0.7 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vlandoss/run-run",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "The CLI toolbox to fullstack common scripts in Variable Land",
   "homepage": "https://github.com/variableland/dx/tree/main/packages/run-run#readme",
   "bugs": {

package/src/main.ts

@@ -1,11 +1,12 @@
 import { isProcessOutput } from "@vlandoss/clibuddy";
 import { createProgram, type Options } from "./program";
+import { parseArgs } from "./program/parse-args";
 import { logger } from "./services/logger";
 
 export async function main(options: Options) {
   try {
-    const { cmd } = await createProgram(options);
-    await cmd.parseAsync();
+    const { program } = await createProgram(options);
+    await program.parseAsync(parseArgs(), { from: "user" });
   } catch (error) {
     if (!isProcessOutput(error)) {
       logger.error("Cannot run main successfully", error);

package/src/program/__tests__/__snapshots__/snapshots.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`should match command: "help" 1`] = `
 "🦊 R U N - R U N: The CLI toolbox to fullstack common scripts in Variable Land 👊
 
-Usage: rr|run-run [options] [command]
+Usage: rr|run-run [options] <command...>
 
 Options:
   -v, --version                output the version number
@@ -30,7 +30,7 @@ Acknowledgment:
 exports[`should match command: "--help" 1`] = `
 "🦊 R U N - R U N: The CLI toolbox to fullstack common scripts in Variable Land 👊
 
-Usage: rr|run-run [options] [command]
+Usage: rr|run-run [options] <command...>
 
 Options:
   -v, --version                output the version number
@@ -64,6 +64,17 @@ exports[`should match command: "-v" 1`] = `
 "
 `;
 
+exports[`should match help message for command "run" 1`] = `
+"Usage: rr run [options] <cmds...>
+
+Arguments:
+  cmds        commands to execute in sequence (e.g. 'check tsc')
+
+Options:
+  -h, --help  display help for command
+"
+`;
+
 exports[`should match help message for command "check" 1`] = `
 "Usage: rr check|test:static [options]
 
@@ -145,11 +156,3 @@ Commands:
   help [command]  display help for command
 "
 `;
-
-exports[`should match "check" command 1`] = `"biome check --colors=force"`;
-
-exports[`should match "lint" command 1`] = `"biome check --colors=force --formatter-enabled=false"`;
-
-exports[`should match "fmt" command 1`] = `"biome format --no-errors-on-unmatched --colors=force"`;
-
-exports[`should match "tsc" command 1`] = `"tsc --noEmit"`;

package/src/program/__tests__/snapshots.test.ts

@@ -1,7 +1,7 @@
 import { afterEach, expect, test } from "bun:test";
-import { createTestProgram, execCli, mocked, parseProgram } from "test/helpers";
+import { createTestProgram, execCli, mocked } from "test/helpers";
 
-const { cmd, ctx } = await createTestProgram();
+const { program, ctx } = await createTestProgram();
 const $ = ctx.shell.$;
 
 const rootCommands = ["help", "--help", "--version", "-v"];
@@ -18,7 +18,7 @@ for (const cmd of rootCommands) {
   });
 }
 
-for (const command of cmd.commands) {
+for (const command of program.commands) {
   const cmd = command.name();
 
   test(`should match help message for command "${cmd}"`, async () => {
@@ -27,21 +27,3 @@ for (const command of cmd.commands) {
     expect(stdout).toMatchSnapshot();
   });
 }
-
-const hardCommands = ["info:pkg", "clean", "tools"];
-
-const easyTesteableCommands = cmd.commands.filter((command) => {
-  const isHard = hardCommands.some((cmd) => command.name() === cmd);
-  return !isHard;
-});
-
-for (const command of easyTesteableCommands) {
-  const cmd = command.name();
-
-  test(`should match "${cmd}" command`, async () => {
-    await parseProgram([cmd]);
-
-    expect($).toHaveBeenCalledTimes(1);
-    expect(mocked($).mock.results[0]?.value).toMatchSnapshot();
-  });
-}

package/src/program/commands/run.ts

@@ -0,0 +1,14 @@
+import { createCommand } from "commander";
+import type { Context } from "~/services/ctx";
+
+export function createRunCommand(ctx: Context) {
+  const program = createCommand("run")
+    .argument("<cmds...>", "commands to execute in sequence (e.g. 'check tsc')")
+    .action(async function runRunAction(cmds: string[]) {
+      const { $ } = ctx.shell;
+      const commands = cmds.map((cmd) => $`rr ${cmd}`);
+      await Promise.all(commands);
+    });
+
+  return program;
+}

package/src/program/commands/typecheck.ts

@@ -10,9 +10,11 @@ export function createTypecheckCommand(ctx: Context) {
     .action(async function typecheckAction() {
       const { appPkg, shell } = ctx;
 
-      async function singleTypecheck(dir?: string): Promise<boolean | undefined> {
+      async function singleTypecheck(dir?: string, options?: { logger?: typeof logger }): Promise<boolean | undefined> {
+        const log = options?.logger ?? logger;
+
         if (!appPkg.hasFile("tsconfig.json", dir)) {
-          logger.info("No tsconfig.json found, skipping typecheck");
+          log.info("No tsconfig.json found, skipping typecheck");
           return;
         }
 
@@ -34,7 +36,9 @@ export function createTypecheckCommand(ctx: Context) {
         try {
           childLogger.start("Type checking started");
 
-          const success = await singleTypecheck(project.rootDir);
+          const success = await singleTypecheck(project.rootDir, {
+            logger: childLogger,
+          });
 
           if (success) {
             childLogger.success("Typecheck completed");

package/src/program/index.ts

@@ -1,10 +1,11 @@
 import { getVersion } from "@vlandoss/clibuddy";
-import { Command } from "commander";
+import { createCommand } from "commander";
 import { createContext } from "~/services/ctx";
 import { createCheckCommand } from "./commands/check";
 import { createCleanCommand } from "./commands/clean";
 import { createFormatCommand } from "./commands/format";
 import { createLintCommand } from "./commands/lint";
+import { createRunCommand } from "./commands/run";
 import { createToolsCommand } from "./commands/tools";
 import { createTypecheckCommand } from "./commands/typecheck";
 import { BANNER_TEXT, CREDITS_TEXT } from "./ui";
@@ -16,11 +17,15 @@ export type Options = {
 export async function createProgram(options: Options) {
   const ctx = await createContext(options.binDir);
 
-  const cmd = new Command("rr")
+  const program = createCommand("rr")
     .alias("run-run")
+    .usage("[options] <command...>")
     .version(getVersion(ctx.binPkg), "-v, --version")
     .addHelpText("before", BANNER_TEXT)
     .addHelpText("after", CREDITS_TEXT)
+    .addCommand(createRunCommand(ctx), {
+      hidden: true,
+    })
     .addCommand(createCheckCommand(ctx))
     .addCommand(createLintCommand(ctx))
     .addCommand(createFormatCommand(ctx))
@@ -30,5 +35,5 @@ export async function createProgram(options: Options) {
       hidden: true,
     });
 
-  return { cmd, ctx };
+  return { program, ctx };
 }

package/src/program/parse-args.ts

@@ -0,0 +1,10 @@
+export function parseArgs(argv = process.argv) {
+  const args = argv.slice(2);
+  const allArgsAreCommands = args.every((arg) => !arg.startsWith("-"));
+
+  if (allArgsAreCommands && args.length > 1) {
+    return ["run", ...args];
+  }
+
+  return args;
+}