@vlandoss/vland 0.1.1 → 0.1.2-git-87ebfca.0

package/dist/cli.usage.kdl

@@ -1,7 +1,7 @@
 // @generated by @usage-spec/commander from Commander.js metadata
 name vland
 bin vland
-version "0.1.1"
+version "0.1.2-git-87ebfca.0"
 usage "[options] [command]"
 flag --usage help="print KDL spec for this CLI (https://kdl.dev)"
 cmd completion help="print shell completion script 🐚 (usage)" {
@@ -25,7 +25,9 @@ cmd init help="init a new project 🚀 (giget)" {
 			choices npm pnpm yarn bun
 		}
 	}
+	flag --install help="install dependencies (skip prompt)"
 	flag --no-install help="skip dependency installation" negate=--install
+	flag --git help="initialise git repository (skip prompt)"
 	flag --no-git help="skip git init" negate=--git
 	flag "-f --force" help="overwrite existing directory"
 	arg "[name]" help="project name (also used as the target directory)" required=#false

package/dist/run.mjs

@@ -4,7 +4,7 @@ import { Argument, Command, Option, createCommand } from "commander";
 import fs from "node:fs";
 import { createLoggy } from "@vlandoss/loggy";
 import { cp, readFile, readdir, stat, writeFile } from "node:fs/promises";
-import { cancel, intro, isCancel, log, outro, select, spinner, text as text$1 } from "@clack/prompts";
+import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text as text$1 } from "@clack/prompts";
 import { detectPackageManager, installDependencies } from "nypm";
 import { downloadTemplate } from "giget";
 import { generateToStdout } from "@usage-spec/commander";
@@ -19,7 +19,7 @@ async function createContext(binDir) {
 	const binPkg = await createPkg(binPath);
 	if (!binPkg) throw new Error("Could not find bin package.json");
 	debug("bin pkg info: %O", binPkg.info());
-	const shell = createShellService({ localBaseBinPath: [binDir] });
+	const shell = createShellService();
 	debug("shell service options: %O", shell.options);
 	return {
 		binPkg,
@@ -230,7 +230,15 @@ async function isDirEmpty(dir) {
 }
 async function readGitAuthor(shell) {
 	try {
-		const [name, email] = await Promise.all([shell.$`git config --get user.name`.nothrow(), shell.$`git config --get user.email`.nothrow()]);
+		const [name, email] = await Promise.all([shell.runCaptured("git", [
+			"config",
+			"--get",
+			"user.name"
+		], { throwOnError: false }), shell.runCaptured("git", [
+			"config",
+			"--get",
+			"user.email"
+		], { throwOnError: false })]);
 		const trimmedName = name.stdout.trim();
 		const trimmedEmail = email.stdout.trim();
 		if (!trimmedName) return void 0;
@@ -246,7 +254,7 @@ function abort(message) {
 async function runInit(ctx, options) {
 	const debug = logger.subdebug("init");
 	debug("options: %O", options);
-	const shell = ctx.shell.mute();
+	const shell = ctx.shell;
 	intro(`${palette.label(" vland init ")}`);
 	let template = options.template;
 	if (!template) {
@@ -311,7 +319,9 @@ async function runInit(ctx, options) {
 	});
 	await updateRootPackageName(dir, name);
 	placeholderSpin.stop("Placeholders applied");
-	if (options.install) {
+	const shouldInstall = await resolveYesNo(options.install, "Install dependencies?");
+	const shouldGit = await resolveYesNo(options.git, "Initialise a git repository?");
+	if (shouldInstall) {
 		const detected = options.pm ?? (await detectPackageManager(dir, { ignorePackageJSON: false }))?.name ?? "pnpm";
 		const installSpin = spinner();
 		installSpin.start(`Installing dependencies with ${palette.highlight(detected)}`);
@@ -329,36 +339,49 @@ async function runInit(ctx, options) {
 			log.warn("You can install manually later with `cd <dir> && <pm> install`.");
 			debug("install error: %O", error);
 		}
-	} else log.info(`Skipping ${palette.highlight("install")} (--no-install).`);
-	if (options.git) {
+	} else log.info(`Skipping ${palette.highlight("install")}.`);
+	if (shouldGit) {
 		const gitSpin = spinner();
 		gitSpin.start("Initialising git repository");
 		try {
 			const gitShell = shell.at(dir).child({ env: {
-				...process.env,
 				GIT_AUTHOR_NAME: process.env.GIT_AUTHOR_NAME ?? "vland",
 				GIT_AUTHOR_EMAIL: process.env.GIT_AUTHOR_EMAIL ?? "noreply@variable.land",
 				GIT_COMMITTER_NAME: process.env.GIT_COMMITTER_NAME ?? "vland",
 				GIT_COMMITTER_EMAIL: process.env.GIT_COMMITTER_EMAIL ?? "noreply@variable.land"
 			} });
-			await gitShell.$`git init`;
-			await gitShell.$`git add -A`;
-			await gitShell.$`git commit -m ${"chore: initial commit from vland"}`;
+			await gitShell.runCaptured("git", ["init"]);
+			await gitShell.runCaptured("git", ["add", "-A"]);
+			await gitShell.runCaptured("git", [
+				"commit",
+				"-m",
+				"chore: initial commit from vland"
+			]);
 			gitSpin.stop("Initialised git repository");
 		} catch (error) {
 			gitSpin.stop("Failed to initialise git", 1);
 			debug("git error: %O", error);
 		}
-	} else log.info(`Skipping ${palette.highlight("git init")} (--no-git).`);
+	} else log.info(`Skipping ${palette.highlight("git init")}.`);
 	const detectedPm = options.pm ?? (await detectPackageManager(dir, { ignorePackageJSON: false }))?.name ?? "pnpm";
 	outro([
 		palette.success("Done!"),
 		"",
 		palette.muted("Next steps:"),
 		`  cd ${name}`,
-		options.install ? `  ${detectedPm} dev` : `  ${detectedPm} install && ${detectedPm} dev`
+		shouldInstall ? `  ${detectedPm} dev` : `  ${detectedPm} install && ${detectedPm} dev`
 	].join("\n"));
 }
+async function resolveYesNo(explicit, message) {
+	if (typeof explicit === "boolean") return explicit;
+	if (!hasTTY) return true;
+	const value = await confirm({
+		message,
+		initialValue: true
+	});
+	if (isCancel(value)) abort("Cancelled.");
+	return value;
+}
 //#endregion
 //#region src/program/commands/init.ts
 function createInitCommand(ctx) {
@@ -367,11 +390,15 @@ function createInitCommand(ctx) {
 		"pnpm",
 		"yarn",
 		"bun"
-	])).addOption(new Option("--no-install", "skip dependency installation")).addOption(new Option("--no-git", "skip git init")).addOption(new Option("-f, --force", "overwrite existing directory").default(false)).action(async (name, options) => {
+	])).addOption(new Option("--install", "install dependencies (skip prompt)")).addOption(new Option("--no-install", "skip dependency installation")).addOption(new Option("--git", "initialise git repository (skip prompt)")).addOption(new Option("--no-git", "skip git init")).addOption(new Option("-f, --force", "overwrite existing directory").default(false)).action(async function(name, options) {
 		console.log(getBannerText(ctx.binPkg.version));
+		const installSource = this.getOptionValueSource("install");
+		const gitSource = this.getOptionValueSource("git");
 		await runInit(ctx, {
 			name,
-			...options
+			...options,
+			install: installSource === "cli" ? options.install : void 0,
+			git: gitSource === "cli" ? options.git : void 0
 		});
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vlandoss/vland",
-  "version": "0.1.1",
+  "version": "0.1.2-git-87ebfca.0",
   "description": "The CLI to init a new project in Variable Land",
   "homepage": "https://github.com/variableland/dx/tree/main/packages/vland#readme",
   "bugs": {
@@ -35,8 +35,8 @@
     "commander": "14.0.3",
     "giget": "2.0.0",
     "nypm": "0.6.0",
-    "@vlandoss/clibuddy": "0.5.0",
-    "@vlandoss/loggy": "0.2.0"
+    "@vlandoss/loggy": "0.2.0",
+    "@vlandoss/clibuddy": "0.5.1-git-87ebfca.0"
   },
   "publishConfig": {
     "access": "public"

package/src/actions/init.ts

@@ -1,6 +1,6 @@
 import { readdir } from "node:fs/promises";
 import { isAbsolute, resolve } from "node:path";
-import { cancel, intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
+import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
 import { hasTTY, palette } from "@vlandoss/clibuddy";
 import { detectPackageManager, installDependencies } from "nypm";
 import type { Context } from "#src/services/ctx.ts";
@@ -13,8 +13,8 @@ export type InitOptions = {
   template?: TemplateName;
   dir?: string;
   pm?: "npm" | "pnpm" | "yarn" | "bun";
-  install: boolean;
-  git: boolean;
+  install?: boolean;
+  git?: boolean;
   force: boolean;
 };
 
@@ -46,8 +46,8 @@ async function isDirEmpty(dir: string): Promise<boolean> {
 async function readGitAuthor(shell: Context["shell"]): Promise<string | undefined> {
   try {
     const [name, email] = await Promise.all([
-      shell.$`git config --get user.name`.nothrow(),
-      shell.$`git config --get user.email`.nothrow(),
+      shell.runCaptured("git", ["config", "--get", "user.name"], { throwOnError: false }),
+      shell.runCaptured("git", ["config", "--get", "user.email"], { throwOnError: false }),
     ]);
     const trimmedName = name.stdout.trim();
     const trimmedEmail = email.stdout.trim();
@@ -67,8 +67,7 @@ export async function runInit(ctx: Context, options: InitOptions) {
   const debug = logger.subdebug("init");
   debug("options: %O", options);
 
-  // Mute zx so the @clack/prompts UI stays clean while git output is captured.
-  const shell = ctx.shell.mute();
+  const shell = ctx.shell;
 
   intro(`${palette.label(" vland init ")}`);
 
@@ -153,8 +152,12 @@ export async function runInit(ctx: Context, options: InitOptions) {
   await updateRootPackageName(dir, name);
   placeholderSpin.stop("Placeholders applied");
 
-  // 7. Install deps
-  if (options.install) {
+  // 7. Resolve install / git decisions (prompt with default-yes when not set on CLI)
+  const shouldInstall = await resolveYesNo(options.install, "Install dependencies?");
+  const shouldGit = await resolveYesNo(options.git, "Initialise a git repository?");
+
+  // 8. Install deps
+  if (shouldInstall) {
     const detected = options.pm ?? (await detectPackageManager(dir, { ignorePackageJSON: false }))?.name ?? "pnpm";
     const installSpin = spinner();
     installSpin.start(`Installing dependencies with ${palette.highlight(detected)}`);
@@ -167,36 +170,35 @@ export async function runInit(ctx: Context, options: InitOptions) {
       debug("install error: %O", error);
     }
   } else {
-    log.info(`Skipping ${palette.highlight("install")} (--no-install).`);
+    log.info(`Skipping ${palette.highlight("install")}.`);
   }
 
-  // 8. Git init
-  if (options.git) {
+  // 9. Git init
+  if (shouldGit) {
     const gitSpin = spinner();
     gitSpin.start("Initialising git repository");
     try {
       const gitShell = shell.at(dir).child({
         env: {
-          ...process.env,
           GIT_AUTHOR_NAME: process.env.GIT_AUTHOR_NAME ?? "vland",
           GIT_AUTHOR_EMAIL: process.env.GIT_AUTHOR_EMAIL ?? "noreply@variable.land",
           GIT_COMMITTER_NAME: process.env.GIT_COMMITTER_NAME ?? "vland",
           GIT_COMMITTER_EMAIL: process.env.GIT_COMMITTER_EMAIL ?? "noreply@variable.land",
         },
       });
-      await gitShell.$`git init`;
-      await gitShell.$`git add -A`;
-      await gitShell.$`git commit -m ${"chore: initial commit from vland"}`;
+      await gitShell.runCaptured("git", ["init"]);
+      await gitShell.runCaptured("git", ["add", "-A"]);
+      await gitShell.runCaptured("git", ["commit", "-m", "chore: initial commit from vland"]);
       gitSpin.stop("Initialised git repository");
     } catch (error) {
       gitSpin.stop("Failed to initialise git", 1);
       debug("git error: %O", error);
     }
   } else {
-    log.info(`Skipping ${palette.highlight("git init")} (--no-git).`);
+    log.info(`Skipping ${palette.highlight("git init")}.`);
   }
 
-  // 9. Outro with next steps
+  // 10. Outro with next steps
   const detectedPm = options.pm ?? (await detectPackageManager(dir, { ignorePackageJSON: false }))?.name ?? "pnpm";
   outro(
     [
@@ -204,7 +206,15 @@ export async function runInit(ctx: Context, options: InitOptions) {
       "",
       palette.muted("Next steps:"),
       `  cd ${name}`,
-      options.install ? `  ${detectedPm} dev` : `  ${detectedPm} install && ${detectedPm} dev`,
+      shouldInstall ? `  ${detectedPm} dev` : `  ${detectedPm} install && ${detectedPm} dev`,
     ].join("\n"),
   );
 }
+
+async function resolveYesNo(explicit: boolean | undefined, message: string): Promise<boolean> {
+  if (typeof explicit === "boolean") return explicit;
+  if (!hasTTY) return true;
+  const value = await confirm({ message, initialValue: true });
+  if (isCancel(value)) abort("Cancelled.");
+  return value as boolean;
+}

package/src/program/commands/init.ts

@@ -21,14 +21,20 @@ export function createInitCommand(ctx: Context) {
     .addOption(new Option("-t, --template <name>", "template to use").choices([...TEMPLATES]))
     .addOption(new Option("-d, --dir <path>", "target directory (default: ./<name>)"))
     .addOption(new Option("--pm <manager>", "package manager to use").choices(["npm", "pnpm", "yarn", "bun"]))
+    .addOption(new Option("--install", "install dependencies (skip prompt)"))
     .addOption(new Option("--no-install", "skip dependency installation"))
+    .addOption(new Option("--git", "initialise git repository (skip prompt)"))
     .addOption(new Option("--no-git", "skip git init"))
     .addOption(new Option("-f, --force", "overwrite existing directory").default(false))
-    .action(async (name: string | undefined, options: InitOptions) => {
+    .action(async function (this: import("commander").Command, name: string | undefined, options: InitOptions) {
       console.log(getBannerText(ctx.binPkg.version));
+      const installSource = this.getOptionValueSource("install");
+      const gitSource = this.getOptionValueSource("git");
       await runInit(ctx, {
         name,
         ...options,
+        install: installSource === "cli" ? options.install : undefined,
+        git: gitSource === "cli" ? options.git : undefined,
       });
     });
 }

package/src/services/ctx.ts

@@ -22,9 +22,7 @@ export async function createContext(binDir: string): Promise<Context> {
 
   debug("bin pkg info: %O", binPkg.info());
 
-  const shell = createShellService({
-    localBaseBinPath: [binDir],
-  });
+  const shell = createShellService();
 
   debug("shell service options: %O", shell.options);