vela 0.14.3 → 0.14.5

package/README.md

@@ -110,12 +110,13 @@ keeps deploying to the same instance, now with a database.
 Much of `vela` needs neither. In a plain `npx sv create` project, with no setup:
 
 - `vela generate schema` and `vela generate form`, the form in plain HTML
+- `vela generate scaffold` once there is a backend: a plain HTML table, detail page and forms
 - `vela enable i18n`, `ai`, `analytics`, `content-negotiation` and `cms`
 - `vela legal` and `vela routes`
 - `vela deploy`, `env`, `status`, `logs` and `rollback`
 
 `vela ui`, `vela enable blog`, `vela enable auth` and what builds on it, and
-`vela generate scaffold` write shadcn-svelte markup. Without it they refuse before
+`vela generate scaffold --remote` write shadcn-svelte markup. Without it they refuse before
 changing anything and name the setup: `npx sv add tailwindcss`, then
 `npx shadcn-svelte@latest init`.
 

package/dist/bin.js

@@ -21,7 +21,7 @@ import pc43 from "picocolors";
 // package.json
 var package_default = {
   name: "vela",
-  version: "0.14.3",
+  version: "0.14.5",
   type: "module",
   description: "A CLI for creating and updating SvelteKit projects",
   license: "MIT",
@@ -57,9 +57,9 @@ var package_default = {
   dependencies: {
     "@clack/prompts": "^1.7.0",
     "@faker-js/faker": "^10.6.0",
-    "@velastack/patterns": "^0.3.2",
+    "@velastack/patterns": "^0.3.4",
     "@velastack/pocketbase-codegen": "^0.1.0",
-    "annotate-json-schema": "^0.1.0",
+    "annotate-json-schema": "^0.1.1",
     commander: "^13.1.0",
     "cross-spawn": "^7.0.6",
     dedent: "^1.7.2",
@@ -71,7 +71,7 @@ var package_default = {
     picocolors: "^1.1.1",
     pocketbase: "^0.28.0",
     "pocketbase-server": "^0.40.5-beta.2",
-    stripe: "^19.3.0",
+    stripe: "^22.6.2",
     svelte: "^5.56.10",
     tar: "^7.5.22",
     tinyexec: "^1.3.0",
@@ -903,7 +903,7 @@ function optionalStringArray(value) {
 import fs8 from "node:fs";
 import path7 from "node:path";
 import process5 from "node:process";
-import { exec } from "tinyexec";
+import { exec, execSync } from "tinyexec";
 import { Option } from "commander";
 import * as p2 from "@clack/prompts";
 import {
@@ -931,10 +931,10 @@ async function packageManagerPrompt(cwd) {
   if (!process5.stdout.isTTY) return agent;
   const options = [
     { label: "None", value: void 0 },
-    ...AGENT_NAMES.map((pm2) => ({ value: pm2, label: pm2 }))
+    ...AGENT_NAMES.filter(isInstalled).map((pm2) => ({ value: pm2, label: pm2 }))
   ];
   const pm = await p2.select({
-    message: "Which package manager do you want to install dependencies with?",
+    message: "Detected package managers. Which one should we use to install dependencies?",
     options,
     initialValue: agent
   });
@@ -944,7 +944,25 @@ async function packageManagerPrompt(cwd) {
   }
   return pm;
 }
+var installedCache = /* @__PURE__ */ new Map();
+function isInstalled(agent) {
+  let installed = installedCache.get(agent);
+  if (installed === void 0) {
+    try {
+      execSync(agent, ["--version"], { nodeOptions: { stdio: "ignore" } });
+      installed = true;
+    } catch {
+      installed = false;
+    }
+    installedCache.set(agent, installed);
+  }
+  return installed;
+}
 async function installDependencies(agent, cwd, { exitOnFailure = true } = {}) {
+  if (!isInstalled(agent)) {
+    p2.log.warn(`${agent} is not installed, skipping dependency installation.`);
+    return false;
+  }
   const task = p2.taskLog({
     title: `Installing dependencies with ${agent}...`,
     limit: Math.ceil(process5.stdout.rows / 2),
@@ -2572,7 +2590,7 @@ var create = new Command3("create").description("scaffold a new velastack projec
   return runCommand(async () => {
     const listing = await listAllTemplates();
     const options = parseOptions(optionsSchema2(listing), rawOpts);
-    const { directory, packageManager: packageManager2, name, template, link: link2 } = await createProject2(
+    const { directory, packageManager: packageManager2, installed, name, template, link: link2 } = await createProject2(
       projectPath,
       options,
       listing
@@ -2584,7 +2602,7 @@ var create = new Command3("create").description("scaffold a new velastack projec
       const hasSpaces = relative.includes(" ");
       nextSteps.push(`\`cd ${hasSpaces ? `"${relative}"` : relative}\``);
     }
-    if (!packageManager2) {
+    if (!installed) {
       const resolved = resolveCommand3(pm, "install", []);
       if (resolved) {
         nextSteps.push(
@@ -2681,12 +2699,13 @@ async function createProject2(cwdArg, options, listing) {
   }
   p9.log.success("Project created");
   let packageManager2;
+  let installed = false;
   if (options.install !== false) {
     const pm = typeof options.install === "string" ? options.install : await packageManagerPrompt(projectPath);
     if (pm) {
       const builds = template.backend ? ["esbuild", "pocketbase-server"] : ["esbuild"];
       addPnpmBuildDependencies(projectPath, pm, builds);
-      await installDependencies(pm, projectPath);
+      installed = await installDependencies(pm, projectPath);
       packageManager2 = pm;
     }
   }
@@ -2713,7 +2732,7 @@ async function createProject2(cwdArg, options, listing) {
     );
     p9.log.success("PocketBase initialized");
   }
-  return { directory: projectPath, packageManager: packageManager2, name, template, link: link2 };
+  return { directory: projectPath, packageManager: packageManager2, installed, name, template, link: link2 };
 }
 async function linkOnCreate(name, template, options, onCancel2) {
   const templateCms = template.cms === true;
@@ -2839,7 +2858,7 @@ async function runPattern(slug2, argv, input, report4, after) {
   if (pattern.requires.ui === "shadcn" && features.ui !== "shadcn") {
     assertShadcn(`vela ${pattern.command.base.replace(/^vela /, "")}`, workspaceRootDir);
   }
-  const log51 = p10.taskLog({ title: report4.task.title });
+  const log53 = p10.taskLog({ title: report4.task.title });
   let result;
   try {
     result = await pattern.generate({
@@ -2860,11 +2879,11 @@ async function runPattern(slug2, argv, input, report4, after) {
         });
         return collections2;
       },
-      logger: { info: (message) => log51.message(message) }
+      logger: { info: (message) => log53.message(message) }
     });
-    log51.success(report4.task.success);
+    log53.success(report4.task.success);
   } catch (e) {
-    log51.error(report4.task.error);
+    log53.error(report4.task.error);
     throw e;
   }
   let afterError;
@@ -3367,12 +3386,20 @@ import * as p17 from "@clack/prompts";
 var scaffold = new Command7("scaffold").description("generate a full CRUD scaffold (model, forms, list, detail)").argument("[model]", "model name").argument("[fields...]", "field definitions").option("--remote", "generate create/update forms with SvelteKit remote functions").option(
   "--route <route>",
   'place the scaffold at a custom route (e.g. "(app)/[team_id]/projects"). Defaults to the pluralized model name under the (app) or (public) group, or src/routes when it has neither.'
+).option(
+  "--ui <ui>",
+  'markup to generate: "shadcn" components or "plain" HTML. Defaults to shadcn when the project has shadcn-svelte, plain otherwise. --remote needs shadcn.'
 ).option(
   "--ai <description>",
   "design the scaffold with AI from a natural-language description (two stages: schema \u2192 layout)"
 ).allowUnknownOption(true).allowExcessArguments(true).configureHelp(helpConfig).action(
   (model, fields, options) => runCommand(async () => {
-    assertShadcn("vela generate scaffold");
+    if (options.remote) {
+      if (options.ui === "plain") {
+        throw new Error("--remote has no plain variant; drop --ui plain or --remote.");
+      }
+      assertShadcn("vela generate scaffold --remote");
+    }
     let argv;
     let modelName;
     let sidecarPath = null;
@@ -3400,6 +3427,11 @@ var scaffold = new Command7("scaffold").description("generate a full CRUD scaffo
       argv = [model, ...fields];
       modelName = model;
     }
+    const { workspaceRootDir, features } = await getWorkspace();
+    const formInput = resolveFormInput(workspaceRootDir, features.ui, options.ui);
+    if (features.ui === "plain" && !options.ui) {
+      p17.log.info("shadcn-svelte not detected: generating plain HTML pages.");
+    }
     const slug2 = options.remote ? "generate-scaffold-remote" : "generate-scaffold";
     const nextSteps = [
       `Run \`vela fixtures generate\` to create 10 ${modelName} records for development.`,
@@ -3414,7 +3446,7 @@ var scaffold = new Command7("scaffold").description("generate a full CRUD scaffo
     await runPattern(
       slug2,
       argv,
-      { route: options.route },
+      { route: options.route, ...formInput },
       {
         summary: `Created ${modelName} scaffold.`,
         nextSteps,
@@ -3672,9 +3704,9 @@ function backendNextSteps(ui2) {
   }
   return [
     dev2,
-    "Run `vela generate form <model> <fields...>` to add a collection with a form in plain HTML.",
+    "Run `vela generate scaffold <model> <fields...>` to add a collection with CRUD pages in plain HTML.",
     "Run `vela test:server` to run the server tests that come with it.",
-    "`vela enable auth` and `vela generate scaffold` need shadcn-svelte: `npx sv add tailwindcss`, then `npx shadcn-svelte@latest init`."
+    "`vela enable auth` needs shadcn-svelte: `npx sv add tailwindcss`, then `npx shadcn-svelte@latest init`."
   ];
 }
 async function initPocketbase(root, { email: email2, password: password11 }) {
@@ -5574,6 +5606,14 @@ vela deploy runs the app as a Node server, which needs ${ADAPTER_NODE}:`
 }
 async function installAdapterDependencies(root) {
   const agent = await packageManager(root);
+  if (!isInstalled(agent)) {
+    throw new AdapterError(
+      `${agent} is not installed, so ${ADAPTER_NODE} couldn't be installed.
+
+The config and package.json are already updated: install ${agent}, run \`${agent} install\`, then deploy again.`,
+      ""
+    );
+  }
   const ok = await installDependencies(agent, root, { exitOnFailure: false });
   if (!ok) {
     throw new AdapterError(
@@ -6613,18 +6653,18 @@ var add = new Command50("add").description("add ui components (shadcn-svelte ite
   (components, options) => runCommand(async () => {
     const { workspaceRootDir } = await getWorkspace();
     assertShadcn("vela ui add", workspaceRootDir);
-    const log51 = p31.taskLog({ title: "Adding UI components..." });
+    const log53 = p31.taskLog({ title: "Adding UI components..." });
     let outcome;
     try {
       outcome = await installComponents({
         root: workspaceRootDir,
         components,
         overwrite: options.overwrite,
-        logger: { info: (message) => log51.message(message) }
+        logger: { info: (message) => log53.message(message) }
       });
-      log51.success("UI components ready");
+      log53.success("UI components ready");
     } catch (e) {
-      log51.error("Could not add UI components");
+      log53.error("Could not add UI components");
       throw e;
     }
     reportResult(uiAddReport(components, outcome));
@@ -6639,13 +6679,13 @@ var base = new Command51("base").description("change the base (gray) palette").a
   (color) => runCommand(async () => {
     const { workspaceRootDir } = await getWorkspace();
     assertShadcn("vela ui base", workspaceRootDir);
-    const log51 = p32.taskLog({ title: `Applying the ${color} palette...` });
+    const log53 = p32.taskLog({ title: `Applying the ${color} palette...` });
     let outcome;
     try {
       outcome = await applyBaseColor({ root: workspaceRootDir, color });
-      log51.success("Palette applied");
+      log53.success("Palette applied");
     } catch (e) {
-      log51.error("Could not change the base color");
+      log53.error("Could not change the base color");
       throw e;
     }
     reportResult({
@@ -6754,14 +6794,14 @@ var style = new Command53("style").description("switch the shadcn-svelte style,
     assertShadcn("vela ui style", workspaceRootDir);
     const spinner8 = p34.spinner();
     spinner8.start(`Reading the ${name} registry...`);
-    let log51;
+    let log53;
     let outcome;
     try {
       outcome = await switchStyle({
         root: workspaceRootDir,
         style: name,
         font: options.font,
-        logger: { info: (message) => log51?.message(message) },
+        logger: { info: (message) => log53?.message(message) },
         confirm: async (components) => {
           spinner8.stop(`Read the ${name} registry`);
           if (components.length > 0) {
@@ -6778,13 +6818,13 @@ ${components.map((c) => `- ${c}`).join("\n")}`
             const ok = await p34.confirm({ message: `Switch to ${name}?`, initialValue: false });
             if (p34.isCancel(ok) || !ok) return false;
           }
-          log51 = p34.taskLog({ title: `Switching to the ${name} style...` });
+          log53 = p34.taskLog({ title: `Switching to the ${name} style...` });
           return true;
         }
       });
     } catch (e) {
       spinner8.stop(`Could not switch to ${name}`);
-      log51?.error("Could not switch style");
+      log53?.error("Could not switch style");
       throw e;
     }
     spinner8.stop(`Read the ${name} registry`);
@@ -6796,7 +6836,7 @@ ${components.map((c) => `- ${c}`).join("\n")}`
       p34.cancel("Operation cancelled.");
       return;
     }
-    log51?.success("Style switched");
+    log53?.success("Style switched");
     reportResult(uiStyleReport(outcome));
   }, "Failed to switch style.")
 );
@@ -6809,13 +6849,13 @@ var theme = new Command54("theme").description("change the accent color, keeping
   (accent) => runCommand(async () => {
     const { workspaceRootDir } = await getWorkspace();
     assertShadcn("vela ui theme", workspaceRootDir);
-    const log51 = p35.taskLog({ title: `Applying the ${accent} accent...` });
+    const log53 = p35.taskLog({ title: `Applying the ${accent} accent...` });
     let outcome;
     try {
       outcome = await applyTheme({ root: workspaceRootDir, theme: accent });
-      log51.success("Accent applied");
+      log53.success("Accent applied");
     } catch (e) {
-      log51.error("Could not change the accent");
+      log53.error("Could not change the accent");
       throw e;
     }
     reportResult({