@stacksjs/buddy 0.70.161 → 0.70.162

package/README.md

@@ -35,7 +35,7 @@ curl -Ssf stacksjs.com/install | sh # wip
 
 # alternatively, if Bun >= v1.1.11 is installed already
 # you may also get started via
-bunx stacks new my-project
+panx @stacksjs/buddy new my-project
 ```
 
 ## Usage
@@ -79,7 +79,7 @@ buddy --help # view help menu
 # `command --help` flag to review the help menu
 
 buddy install # installs dependencies
-buddy add # adds a stack or dependency
+buddy add calendar # pulls a registered project-shaped stack into this project
 buddy fresh # fresh reinstall of all deps
 buddy clean # removes all deps
 buddy setup # sets up the project initially
@@ -154,7 +154,7 @@ buddy make:factory cars # creates a Car factory file
 buddy make:table cars # bootstraps a cars data table
 buddy make:notification welcome-email # bootstraps a welcome-email notification
 buddy make:lang de # bootstraps a lang/de.yml language file
-buddy make:stack my-project # shares logic with `bunx stacks new my-project`
+buddy make:stack my-project # scaffolds a project-shaped registry stack
 
 buddy migrate # runs database migrations
 buddy migrate:dns # sets the ./config/dns.ts file

package/dist/commands/add.js

@@ -1,33 +1,25 @@
 import process from "node:process";
-import { runAdd } from "@stacksjs/actions";
-import { log } from "@stacksjs/logging";
+import { installStack } from "@stacksjs/actions";
+import { intro, italic, log, onUnknownSubcommand, outro } from "@stacksjs/cli";
 import { ExitCode } from "@stacksjs/types";
-import { onUnknownSubcommand } from "@stacksjs/cli";
 export function add(buddy) {
-  const descriptions = {
-    add: "Add a stack to your project (table and calendar available, more coming soon)",
-    table: "Add the Table Stack to your project",
-    calendar: "Add the Calendar Stack to your project",
-    all: "Add all stacks",
-    select: "Which stack/s are you trying to add?",
-    project: "Target a specific project",
-    verbose: "Enable verbose output"
-  };
-  buddy.command("add", descriptions.add).option("-t, --table", descriptions.table, { default: !1 }).option("-c, --calendar", descriptions.calendar, { default: !1 }).option("-a, --all", descriptions.all, { default: !1 }).option("-p, --project [project]", descriptions.project, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).action(async (options) => {
-    log.debug("Running `buddy add`...", options);
-    if (hasNoOptions(options))
-      ;
-    await runAdd(options);
+  buddy.command("add <stack>", "Pull a registered stack and merge its project files into this Stacks application").option("--force", "Overwrite existing files", { default: !1 }).option("--dry-run", "Show which files would be installed without changing the project", { default: !1 }).option("--conflict <strategy>", "Resolve existing files with skip, overwrite, or backup", { default: "skip" }).option("-p, --project <path>", "Target a specific Stacks project").option("--verbose", "Show every file copied or skipped", { default: !1 }).example("buddy add calendar").example("buddy add table --dry-run").example("buddy add calendar --conflict backup").action(async (stack, options) => {
+    const perf = await intro("buddy add");
+    if (!await installStack({
+      name: stack,
+      force: options.force,
+      dryRun: options.dryRun,
+      conflict: options.conflict,
+      project: options.project,
+      verbose: options.verbose
+    })) {
+      await outro(`Could not add stack ${italic(stack)}.`, { startTime: perf, useSeconds: !0 });
+      process.exit(ExitCode.FatalError);
+    }
+    if (options.dryRun)
+      log.info("Dry run complete. No project files were changed.");
+    await outro(`Stack ${italic(stack)} added.`, { startTime: perf, useSeconds: !0 });
     process.exit(ExitCode.Success);
   });
-  buddy.command("add:table", descriptions.table).option("-t, --table", descriptions.table, { default: !0 }).option("-p, --project [project]", descriptions.project, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).action(async (options) => {
-    await runAdd(options);
-  });
-  buddy.command("add:calendar", descriptions.calendar).option("-t, --calendar", descriptions.calendar, { default: !0 }).option("-p, --project [project]", descriptions.project, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).action(async (options) => {
-    await runAdd(options);
-  });
   onUnknownSubcommand(buddy, "add");
 }
-function hasNoOptions(options) {
-  return !options.all && !options.table && !options.calendar;
-}

package/dist/commands/create.js

@@ -103,14 +103,8 @@ async function ensureEnv(path, _options) {
 }
 async function install(path, options) {
   log.info("Installing & setting up Stacks");
-  log.info("Running bun install...");
-  let result = await runCommand("bun install", { ...options, cwd: path });
-  if (result?.isErr) {
-    log.error(result.error);
-    process.exit(ExitCode.FatalError);
-  }
   log.info("Copying .env.example \u2192 .env");
-  result = await runCommand("cp .env.example .env", { ...options, cwd: path });
+  let result = await runCommand("cp .env.example .env", { ...options, cwd: path });
   if (result?.isErr) {
     log.error(result.error);
     process.exit(ExitCode.FatalError);

package/dist/commands/mail.js

@@ -17,7 +17,7 @@ export function sanitizeLineCount(value) {
   const count = Number.parseInt(value || "50", 10);
   return String(Number.isFinite(count) ? Math.min(5000, Math.max(1, count)) : 50);
 }
-function shellQuote(value) {
+function shellQuote(_value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
 }
 async function resolveOperationalMailHost() {

package/dist/commands/setup.d.ts

@@ -2,7 +2,6 @@ import type { CLI, CliOptions } from '@stacksjs/types';
 export declare function setup(buddy: CLI): void;
 export declare function ensurePantryInstalled(): Promise<void>;
 export declare function ensurePantryDependencies(cwd: string): Promise<void>;
-export declare function ensureNodeDependencies(cwd: string): Promise<void>;
 export declare function ensureAppKey(cwd: string): Promise<void>;
 export declare function ensureIdeSettings(cwd: string): void;
 export declare function pantryDatabasePackage(connection: string): DatabasePackage | undefined;

package/dist/commands/setup.js

@@ -1,4 +1,5 @@
 import { cpSync, existsSync, readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
 import { join } from "node:path";
 import process from "node:process";
 import { runAction } from "@stacksjs/actions";
@@ -15,7 +16,7 @@ function getTimeoutMs(envVar, fallbackMs) {
     return value;
   return fallbackMs;
 }
-const PANTRY_CHECK_TIMEOUT_MS = getTimeoutMs("PANTRY_CHECK_TIMEOUT_MS", 15000), PANTRY_INSTALL_TIMEOUT_MS = getTimeoutMs("PANTRY_INSTALL_TIMEOUT_MS", 600000), PANTRY_DEPENDENCIES_TIMEOUT_MS = getTimeoutMs("PANTRY_DEPENDENCIES_TIMEOUT_MS", 1200000), BUN_INSTALL_TIMEOUT_MS = getTimeoutMs("BUN_INSTALL_TIMEOUT_MS", 600000), KEYGEN_TIMEOUT_MS = getTimeoutMs("KEYGEN_TIMEOUT_MS", 120000), AWS_CONFIG_TIMEOUT_MS = getTimeoutMs("AWS_CONFIG_TIMEOUT_MS", 900000);
+const PANTRY_CHECK_TIMEOUT_MS = getTimeoutMs("PANTRY_CHECK_TIMEOUT_MS", 15000), PANTRY_INSTALL_TIMEOUT_MS = getTimeoutMs("PANTRY_INSTALL_TIMEOUT_MS", 600000), PANTRY_DEPENDENCIES_TIMEOUT_MS = getTimeoutMs("PANTRY_DEPENDENCIES_TIMEOUT_MS", 1200000), KEYGEN_TIMEOUT_MS = getTimeoutMs("KEYGEN_TIMEOUT_MS", 120000), AWS_CONFIG_TIMEOUT_MS = getTimeoutMs("AWS_CONFIG_TIMEOUT_MS", 900000);
 export function setup(buddy) {
   const descriptions = {
     setup: "This command ensures your project is setup correctly",
@@ -69,59 +70,41 @@ async function isPantryInstalled() {
   }
 }
 async function installPantry() {
-  const result = await runCommand(p.frameworkPath("scripts/pantry-install"), {
+  const bundledInstaller = p.frameworkPath("scripts/pantry-install"), command = existsSync(bundledInstaller) ? [bundledInstaller] : ["sh", "-c", "curl -fsSL https://pantry.dev | bash"], result = await runCommand(command, {
     timeoutMs: PANTRY_INSTALL_TIMEOUT_MS
-  });
-  if (result.isOk)
+  }), localBin = join(homedir(), ".local", "bin");
+  if (!process.env.PATH?.split(":").includes(localBin))
+    process.env.PATH = `${localBin}:${process.env.PATH || ""}`;
+  if (result.isOk && await isPantryInstalled())
     return;
-  handleError(result.error);
+  if (result.isErr)
+    handleError(result.error);
+  else
+    log.error("Pantry installed but is not available on PATH. Open a new shell and run `buddy setup` again.");
   process.exit(ExitCode.FatalError);
 }
 export async function ensurePantryInstalled() {
   if (await isPantryInstalled())
     return;
-  const installer = p.frameworkPath("scripts/pantry-install");
-  if (!existsSync(installer)) {
-    log.debug("Pantry is not installed and no bundled installer is present; continuing without it.");
-    return;
-  }
+  log.info("Pantry is required. Installing it from https://pantry.dev...");
   await installPantry();
 }
 export async function ensurePantryDependencies(cwd) {
-  if (!await isPantryInstalled()) {
-    log.debug("Pantry not installed; skipping pantry dependency install (deps come from node_modules).");
-    return;
-  }
-  log.info("Installing Pantry dependencies...");
+  await ensurePantryInstalled();
+  log.info("Installing project dependencies with Pantry...");
   const result = await runCommand("pantry install", {
     cwd,
     timeoutMs: PANTRY_DEPENDENCIES_TIMEOUT_MS
   });
-  if (result.isOk) {
-    log.success("Installed Pantry dependencies");
-    return;
-  }
-  handleError(result.error);
-  process.exit(ExitCode.FatalError);
-}
-export async function ensureNodeDependencies(cwd) {
-  if (existsSync(join(cwd, "node_modules"))) {
-    log.success("node_modules existed, skipping bun install");
-    return;
-  }
-  log.info("Running bun install...");
-  const result = await runCommand("bun install", {
-    cwd,
-    timeoutMs: BUN_INSTALL_TIMEOUT_MS
-  }).catch((error) => {
-    handleError(error);
-    process.exit(ExitCode.FatalError);
-  });
   if (result.isErr) {
     handleError(result.error);
     process.exit(ExitCode.FatalError);
   }
-  log.success("Installed node dependencies");
+  if (existsSync(join(cwd, "package.json")) && !existsSync(join(cwd, "node_modules"))) {
+    log.error("Pantry completed without installing the project JavaScript dependencies.");
+    process.exit(ExitCode.FatalError);
+  }
+  log.success("Installed project dependencies with Pantry");
 }
 function hasAppKey(cwd) {
   const envPath = join(cwd, ".env");
@@ -167,7 +150,6 @@ async function runInitialMigration(cwd) {
 async function initializeProject(options) {
   const cwd = options.cwd || p.projectPath();
   await ensurePantryDependencies(cwd);
-  await ensureNodeDependencies(cwd);
   await ensureEnvIsSet(options);
   if (!options.skipKeygen)
     await ensureAppKey(cwd);

package/dist/commands/stacks.js

@@ -11,13 +11,14 @@ export function stacks(buddy) {
     force: "Force overwrite existing files",
     dryRun: "Show what would be installed without making changes",
     conflict: "Conflict resolution strategy: skip, overwrite, or backup",
-    verbose: "Enable verbose output"
+    verbose: "Enable verbose output",
+    project: "Target a specific Stacks project"
   };
-  buddy.command("stack:install <name>", descriptions.install).option("--force", descriptions.force, { default: !1 }).option("--dry-run", descriptions.dryRun, { default: !1 }).option("--conflict <strategy>", descriptions.conflict, { default: "skip" }).option("--verbose", descriptions.verbose, { default: !1 }).example("buddy stack:install @stacksjs/blog").example("buddy stack:install blog --force").example("buddy stack:install blog --conflict backup --verbose").example("buddy stack:install blog --dry-run").action(async (name, options) => {
+  buddy.command("stack:install <name>", descriptions.install).option("--force", descriptions.force, { default: !1 }).option("--dry-run", descriptions.dryRun, { default: !1 }).option("--conflict <strategy>", descriptions.conflict, { default: "skip" }).option("-p, --project <path>", descriptions.project).option("--verbose", descriptions.verbose, { default: !1 }).example("buddy add calendar").example("buddy add table --force").example("buddy add calendar --conflict backup --verbose").example("buddy add table --dry-run").action(async (name, options) => {
     const perf = await intro("buddy stack:install");
     if (!name) {
       log.error("You need to specify a stack name.");
-      log.info("Example: buddy stack:install @stacksjs/blog");
+      log.info("Example: buddy add calendar");
       process.exit(ExitCode.FatalError);
     }
     if (!await installStack({
@@ -25,6 +26,7 @@ export function stacks(buddy) {
       force: options.force,
       dryRun: options.dryRun,
       conflict: options.conflict || "skip",
+      project: options.project,
       verbose: options.verbose
     }) && !options.dryRun) {
       await outro("Failed to install stack", { startTime: perf, useSeconds: !0 });
@@ -33,7 +35,7 @@ export function stacks(buddy) {
     await outro(`Stack ${italic(name)} installed.`, { startTime: perf, useSeconds: !0 });
     process.exit(ExitCode.Success);
   });
-  buddy.command("stack:uninstall <name>", descriptions.uninstall).option("--force", descriptions.force, { default: !1 }).option("--verbose", descriptions.verbose, { default: !1 }).example("buddy stack:uninstall blog").example("buddy stack:uninstall blog --force").action(async (name, options) => {
+  buddy.command("stack:uninstall <name>", descriptions.uninstall).option("--force", descriptions.force, { default: !1 }).option("-p, --project <path>", descriptions.project).option("--verbose", descriptions.verbose, { default: !1 }).example("buddy stack:uninstall blog").example("buddy stack:uninstall blog --force").action(async (name, options) => {
     const perf = await intro("buddy stack:uninstall");
     if (!name) {
       log.error("You need to specify a stack name.");
@@ -42,6 +44,7 @@ export function stacks(buddy) {
     if (!await uninstallStack({
       name,
       force: options.force,
+      project: options.project,
       verbose: options.verbose
     })) {
       await outro("Failed to uninstall stack", { startTime: perf, useSeconds: !0 });
@@ -50,10 +53,10 @@ export function stacks(buddy) {
     await outro(`Stack ${italic(name)} uninstalled.`, { startTime: perf, useSeconds: !0 });
     process.exit(ExitCode.Success);
   });
-  buddy.command("stack:list", descriptions.list).alias("stack:ls").example("buddy stack:list").action(async () => {
-    const perf = await intro("buddy stack:list"), entries = await listStacks();
+  buddy.command("stack:list", descriptions.list).alias("stack:ls").option("-p, --project <path>", descriptions.project).example("buddy stack:list").action(async (options) => {
+    const perf = await intro("buddy stack:list"), entries = await listStacks(options.project);
     if (entries.length === 0)
-      log.info("No stacks found. Install one with: buddy stack:install <name>");
+      log.info("No stacks found. Install one with: buddy add <name>");
     else {
       log.info(`Found ${entries.length} stack(s):`);
       log.info("");

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/buddy",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.161",
+  "version": "0.70.162",
   "description": "Meet Buddy. The Stacks runtime.",
   "author": "Chris Breuer",
   "contributors": [
@@ -92,52 +92,52 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@stacksjs/actions": "^0.70.161",
-    "@stacksjs/ai": "^0.70.161",
-    "@stacksjs/alias": "^0.70.161",
-    "@stacksjs/arrays": "^0.70.161",
-    "@stacksjs/auth": "^0.70.161",
-    "@stacksjs/build": "^0.70.161",
-    "@stacksjs/cache": "^0.70.161",
-    "@stacksjs/cli": "^0.70.161",
+    "@stacksjs/actions": "^0.70.162",
+    "@stacksjs/ai": "^0.70.162",
+    "@stacksjs/alias": "^0.70.162",
+    "@stacksjs/arrays": "^0.70.162",
+    "@stacksjs/auth": "^0.70.162",
+    "@stacksjs/build": "^0.70.162",
+    "@stacksjs/cache": "^0.70.162",
+    "@stacksjs/cli": "^0.70.162",
     "@stacksjs/clapp": "^0.2.12",
-    "@stacksjs/cloud": "^0.70.161",
-    "@stacksjs/collections": "^0.70.161",
-    "@stacksjs/config": "^0.70.161",
-    "@stacksjs/database": "^0.70.161",
-    "@stacksjs/desktop": "^0.70.161",
-    "@stacksjs/dns": "^0.70.161",
-    "@stacksjs/email": "^0.70.161",
-    "@stacksjs/enums": "^0.70.161",
-    "@stacksjs/error-handling": "^0.70.161",
-    "@stacksjs/events": "^0.70.161",
-    "@stacksjs/git": "^0.70.161",
+    "@stacksjs/cloud": "^0.70.162",
+    "@stacksjs/collections": "^0.70.162",
+    "@stacksjs/config": "^0.70.162",
+    "@stacksjs/database": "^0.70.162",
+    "@stacksjs/desktop": "^0.70.162",
+    "@stacksjs/dns": "^0.70.162",
+    "@stacksjs/email": "^0.70.162",
+    "@stacksjs/enums": "^0.70.162",
+    "@stacksjs/error-handling": "^0.70.162",
+    "@stacksjs/events": "^0.70.162",
+    "@stacksjs/git": "^0.70.162",
     "@stacksjs/gitit": "^0.2.5",
-    "@stacksjs/health": "^0.70.161",
+    "@stacksjs/health": "^0.70.162",
     "@stacksjs/dnsx": "^0.2.3",
     "@stacksjs/httx": "^0.1.10",
-    "@stacksjs/lint": "^0.70.161",
-    "@stacksjs/logging": "^0.70.161",
-    "@stacksjs/notifications": "^0.70.161",
-    "@stacksjs/objects": "^0.70.161",
-    "@stacksjs/orm": "^0.70.161",
-    "@stacksjs/path": "^0.70.161",
-    "@stacksjs/payments": "^0.70.161",
-    "@stacksjs/realtime": "^0.70.161",
-    "@stacksjs/router": "^0.70.161",
+    "@stacksjs/lint": "^0.70.162",
+    "@stacksjs/logging": "^0.70.162",
+    "@stacksjs/notifications": "^0.70.162",
+    "@stacksjs/objects": "^0.70.162",
+    "@stacksjs/orm": "^0.70.162",
+    "@stacksjs/path": "^0.70.162",
+    "@stacksjs/payments": "^0.70.162",
+    "@stacksjs/realtime": "^0.70.162",
+    "@stacksjs/router": "^0.70.162",
     "@stacksjs/rpx": "^0.11.31",
-    "@stacksjs/search-engine": "^0.70.161",
-    "@stacksjs/security": "^0.70.161",
-    "@stacksjs/server": "^0.70.161",
-    "@stacksjs/storage": "^0.70.161",
-    "@stacksjs/strings": "^0.70.161",
-    "@stacksjs/testing": "^0.70.161",
-    "@stacksjs/tunnel": "^0.70.161",
-    "@stacksjs/types": "^0.70.161",
-    "@stacksjs/ui": "^0.70.161",
-    "@stacksjs/utils": "^0.70.161",
-    "@stacksjs/validation": "^0.70.161",
-    "@stacksjs/ts-cloud": "^0.7.49"
+    "@stacksjs/search-engine": "^0.70.162",
+    "@stacksjs/security": "^0.70.162",
+    "@stacksjs/server": "^0.70.162",
+    "@stacksjs/storage": "^0.70.162",
+    "@stacksjs/strings": "^0.70.162",
+    "@stacksjs/testing": "^0.70.162",
+    "@stacksjs/tunnel": "^0.70.162",
+    "@stacksjs/types": "^0.70.162",
+    "@stacksjs/ui": "^0.70.162",
+    "@stacksjs/utils": "^0.70.162",
+    "@stacksjs/validation": "^0.70.162",
+    "@stacksjs/ts-cloud": "^0.7.56"
   },
   "devDependencies": {
     "better-dx": "^0.2.17"