vela 0.18.0 → 0.19.0

package/dist/bin.js

@@ -20,7 +20,7 @@ import dotenv2 from "dotenv";
 // package.json
 var package_default = {
   name: "vela",
-  version: "0.18.0",
+  version: "0.19.0",
   type: "module",
   description: "A CLI for creating and updating SvelteKit projects",
   license: "MIT",
@@ -57,7 +57,7 @@ var package_default = {
   dependencies: {
     "@clack/prompts": "^1.7.0",
     "@faker-js/faker": "^10.6.0",
-    "@velastack/patterns": "^0.7.0",
+    "@velastack/patterns": "^0.8.0",
     "@velastack/pocketbase-codegen": "^0.1.0",
     "@velastack/schema": "^0.3.0",
     "@velastack/schema-ui": "^0.3.1",
@@ -372,6 +372,19 @@ function raiseFloor(pkg, name, range) {
   }
   return changed;
 }
+function dropFormsnapOverride(pkg) {
+  const overrides = pkg.overrides;
+  const entry = overrides?.formsnap;
+  if (typeof entry !== "object" || entry === null || !("sveltekit-superforms" in entry)) {
+    return false;
+  }
+  const { "sveltekit-superforms": _, ...rest } = entry;
+  const { formsnap: __, ...others } = overrides;
+  const next = Object.keys(rest).length > 0 ? { ...others, formsnap: rest } : others;
+  if (Object.keys(next).length > 0) pkg.overrides = next;
+  else delete pkg.overrides;
+  return true;
+}
 var VERSION_PART = /^v?(\d+|[xX*])(?:\.(\d+|[xX*]))?(?:\.(\d+|[xX*]))?(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/;
 function minVersion(range) {
   const alternatives = range.split("||").map((alt) => alt.trim());
@@ -406,9 +419,9 @@ function minOfComparatorSet(set) {
   if (upperOnly) return { major: 0, minor: 0, patch: 0, prerelease: [] };
   return floor;
 }
-function parseVersionPart(text18) {
-  if (text18 === "" || text18 === "*" || text18 === "x" || text18 === "X") return null;
-  const match = text18.match(VERSION_PART);
+function parseVersionPart(text19) {
+  if (text19 === "" || text19 === "*" || text19 === "x" || text19 === "X") return null;
+  const match = text19.match(VERSION_PART);
   if (!match) return null;
   const nums = [match[1], match[2], match[3]];
   const firstWild = nums.findIndex((n) => n === void 0 || /^[xX*]$/.test(n));
@@ -901,10 +914,10 @@ function writeCachedIndex(cached2) {
   fs6.mkdirSync(cacheRoot(), { recursive: true });
   fs6.writeFileSync(indexCachePath(), JSON.stringify(cached2, null, 2));
 }
-function parseTemplateIndex(text18, url) {
+function parseTemplateIndex(text19, url) {
   let parsed;
   try {
-    parsed = JSON.parse(text18);
+    parsed = JSON.parse(text19);
   } catch (e) {
     throw new Error(`Template index at ${url} is not valid JSON: ${e.message}`);
   }
@@ -1854,8 +1867,8 @@ async function readSite(root) {
     if (!property || !Node6.isPropertyAssignment(property)) continue;
     const value = property.getInitializer();
     if (Node6.isStringLiteral(value) || Node6.isNoSubstitutionTemplateLiteral(value)) {
-      const text18 = value.getLiteralValue().trim();
-      if (text18) info[key] = text18;
+      const text19 = value.getLiteralValue().trim();
+      if (text19) info[key] = text19;
     }
   }
   return info;
@@ -2194,11 +2207,11 @@ function mergeOriginConfig(root, options = {}) {
     if (target) setOriginComment(target);
   }
   if (orphaned.length > 0) {
-    let text18 = vite.sourceFile.getFullText();
+    let text19 = vite.sourceFile.getFullText();
     for (const comment of orphaned) {
-      text18 = text18.replace(new RegExp(String.raw`\n[\t ]*${escapeRegExp2(comment)}[\t ]*(?=\n)`), "");
+      text19 = text19.replace(new RegExp(String.raw`\n[\t ]*${escapeRegExp2(comment)}[\t ]*(?=\n)`), "");
     }
-    vite.sourceFile.replaceWithText(text18);
+    vite.sourceFile.replaceWithText(text19);
   }
   vite.sourceFile.saveSync();
   const moved = hasPathsOrigin ? "removed prerender.origin, which SvelteKit 3 no longer accepts; kept the existing paths.origin" : "moved prerender.origin to paths.origin";
@@ -2230,8 +2243,8 @@ var ORIGIN_COMMENT = [
   "baked in at build time. It is left unset for a deploy that serves more",
   "than one host, where each request's own origin is used instead."
 ];
-function escapeRegExp2(text18) {
-  return text18.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function escapeRegExp2(text19) {
+  return text19.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function mentionsPrerender(node) {
   return node.getLeadingCommentRanges().some((c) => /prerender/i.test(c.getText()));
@@ -2528,7 +2541,7 @@ function detectJsonIndent(source) {
 var PRINT_WIDTH = 100;
 function stringifyJson(value, indent, level = 0, prefix = 0) {
   const pad2 = (n) => indent.repeat(n);
-  const width = (text18) => text18.replaceAll("	", "  ").length;
+  const width = (text19) => text19.replaceAll("	", "  ").length;
   if (Array.isArray(value)) {
     if (value.length === 0) return "[]";
     const scalars = value.every((v14) => v14 === null || typeof v14 !== "object");
@@ -2888,8 +2901,10 @@ function mergeDependencies(projectPath, templateDir) {
   if (ensureLibImports(merged)) p6.log.info("package.json: added the #lib imports.");
   writePackageJson(userPkgPath, merged);
   if (pinned.length > 0) {
-    p6.log.info(`Pinned what SvelteKit 3 needs exactly:
-${pinned.map((l) => `  ${l}`).join("\n")}`);
+    p6.log.info(
+      `Set what SvelteKit 3's form libraries need:
+${pinned.map((l) => `  ${l}`).join("\n")}`
+    );
   }
   if (added.length > 0) {
     p6.log.info(
@@ -2926,16 +2941,15 @@ function applyTemplatePins(merged, template, conflicts) {
     const index = conflicts.findIndex((c) => c.name === name);
     if (index !== -1) conflicts.splice(index, 1);
   }
-  const overrides = template.overrides;
-  const hasFormsnap = Boolean(merged.dependencies?.formsnap ?? merged.devDependencies?.formsnap);
-  if (overrides?.formsnap && hasFormsnap) {
-    const existing = merged.overrides ?? {};
-    const current = existing.formsnap;
-    const next = typeof current === "object" && current !== null ? { ...current, ...overrides.formsnap } : overrides.formsnap;
-    if (JSON.stringify(current) !== JSON.stringify(next)) {
-      merged.overrides = { ...existing, formsnap: next };
-      lines.push(`overrides.formsnap: ${JSON.stringify(next)}`);
-    }
+  const formsnapRange = template.devDependencies?.formsnap ?? template.dependencies?.formsnap;
+  const formsnapBefore = merged.devDependencies?.formsnap ?? merged.dependencies?.formsnap;
+  if (formsnapRange && raiseFloor(merged, "formsnap", formsnapRange)) {
+    lines.push(`formsnap: ${formsnapBefore} \u2192 ${formsnapRange}`);
+    const index = conflicts.findIndex((c) => c.name === "formsnap");
+    if (index !== -1) conflicts.splice(index, 1);
+  }
+  if (dropFormsnapOverride(merged)) {
+    lines.push("overrides.formsnap: dropped the sveltekit-superforms entry formsnap 2.0 needed");
   }
   const engines = template.engines;
   const userEngines = merged.engines ?? {};
@@ -3931,6 +3945,7 @@ import {
   ADAPTER_STATIC as ADAPTER_STATIC2,
   ensurePackageOverrides,
   FLASH,
+  FORMSNAP,
   SUPERFORMS_VERSION,
   VELASTACK_CMS,
   VELASTACK_KIT,
@@ -4382,10 +4397,10 @@ var npmViewLookup = (name, range, cwd) => new Promise((resolve2, reject) => {
     (error, stdout, stderr) => {
       if (error && /\bE404\b/.test(`${stderr}${error.message}`)) return resolve2(null);
       if (error) return reject(error);
-      const text18 = stdout.trim();
-      if (!text18) return resolve2(null);
+      const text19 = stdout.trim();
+      if (!text19) return resolve2(null);
       try {
-        resolve2(newest(JSON.parse(text18)));
+        resolve2(newest(JSON.parse(text19)));
       } catch (e) {
         reject(e);
       }
@@ -4842,14 +4857,14 @@ function skipString(source, start) {
   }
   return -1;
 }
-function splitTopLevel(text18) {
+function splitTopLevel(text19) {
   const parts = [];
   let depth = 0;
   let partStart = 0;
-  for (let i = 0; i < text18.length; i++) {
-    const c = text18[i];
+  for (let i = 0; i < text19.length; i++) {
+    const c = text19[i];
     if (c === '"' || c === "'" || c === "`") {
-      const end = skipString(text18, i);
+      const end = skipString(text19, i);
       if (end === -1) break;
       i = end;
       continue;
@@ -4857,12 +4872,12 @@ function splitTopLevel(text18) {
     if (c === "(" || c === "{" || c === "[") depth++;
     else if (c === ")" || c === "}" || c === "]") depth--;
     else if (c === "," && depth === 0) {
-      parts.push({ start: partStart, end: i, text: text18.slice(partStart, i) });
+      parts.push({ start: partStart, end: i, text: text19.slice(partStart, i) });
       partStart = i + 1;
     }
   }
-  if (text18.slice(partStart).trim()) {
-    parts.push({ start: partStart, end: text18.length, text: text18.slice(partStart) });
+  if (text19.slice(partStart).trim()) {
+    parts.push({ start: partStart, end: text19.length, text: text19.slice(partStart) });
   }
   return parts;
 }
@@ -4979,8 +4994,8 @@ function rewriteGotoOptions(inner) {
   if (!joined.startsWith(lead)) joined = lead + joined.trimStart();
   return { inner: joined + tail, summary: summary.join("; ") };
 }
-function escapeRegExp3(text18) {
-  return text18.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function escapeRegExp3(text19) {
+  return text19.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function rewriteInvalidateAll(source) {
   const outcome = { edits: [], changes: [], tasks: [] };
@@ -5065,9 +5080,9 @@ function addTaskComments(source, file, tasks) {
       const lineStart2 = code2.lastIndexOf("\n", index - 1) + 1;
       const lineEnd = code2.indexOf("\n", index);
       const excerpt = code2.slice(lineStart2, lineEnd === -1 ? void 0 : lineEnd).trim().replace(/--/g, "- -").slice(0, 80);
-      const text18 = `${MIGRATION_TASK_MARKER} \`${excerpt}\`: ${message}`;
-      if (code2.includes(text18)) continue;
-      code2 = `<!-- ${text18} -->
+      const text19 = `${MIGRATION_TASK_MARKER} \`${excerpt}\`: ${message}`;
+      if (code2.includes(text19)) continue;
+      code2 = `<!-- ${text19} -->
 ${code2}`;
       added.push(`line ${line}: ${message}`);
       continue;
@@ -5461,8 +5476,8 @@ function svArgs(root, tasks, exclude) {
 }
 var ANSI = /\u001b\[[0-9;?]*[A-Za-z]/g;
 function parseSvFailure(output) {
-  const text18 = output.replace(ANSI, "");
-  const match = text18.match(/Task '([^']+)' failed: ([^\n]*)/);
+  const text19 = output.replace(ANSI, "");
+  const match = text19.match(/Task '([^']+)' failed: ([^\n]*)/);
   if (!match) return null;
   const message = match[2].trim();
   const file = message.match(/Unable to process '([^']+)'/)?.[1];
@@ -5552,9 +5567,9 @@ function originFixup(root, capture, sv) {
 ${outcome.snippet}`);
   }
   const lost = Boolean(carry && !outcome.applied && outcome.snippet);
-  for (const text18 of capture?.spreads ?? []) {
-    if (carry && !lost && carry.text.endsWith(text18)) continue;
-    sv.dropped.push({ file: capture.file, text: text18 });
+  for (const text19 of capture?.spreads ?? []) {
+    if (carry && !lost && carry.text.endsWith(text19)) continue;
+    sv.dropped.push({ file: capture.file, text: text19 });
   }
   return f;
 }
@@ -5670,6 +5685,8 @@ var FLOORS = [
   ["svelte-check", "^4.7.6"],
   ["typescript", "^6.0.0"],
   ["shadcn-svelte", "^1.7.0"],
+  // 2.1 is the first formsnap whose superforms peer admits 3.x.
+  splitSpec(FORMSNAP),
   splitSpec(VELASTACK_KIT),
   splitSpec(VELASTACK_POCKETBASE),
   splitSpec(VELASTACK_CMS),
@@ -5706,23 +5723,10 @@ function packageFixup(root, cliVersion) {
     changed.push(`engines.node ${engines.node ?? "(unset)"} \u2192 ${ENGINES_FLOOR}`);
     data.engines = { ...engines, node: ENGINES_FLOOR };
   }
-  if (depRange(data, "formsnap") !== void 0) {
-    const overrides = data.overrides ?? {};
-    const current = overrides.formsnap;
-    if (current !== void 0 && (typeof current !== "object" || current === null)) {
-      f.warnings.push(
-        `overrides.formsnap is not an object; set "formsnap": { "sveltekit-superforms": "${SUPERFORMS_VERSION}" } by hand`
-      );
-    } else {
-      const formsnap = current ?? {};
-      if (formsnap["sveltekit-superforms"] !== SUPERFORMS_VERSION) {
-        data.overrides = {
-          ...overrides,
-          formsnap: { ...formsnap, "sveltekit-superforms": SUPERFORMS_VERSION }
-        };
-        changed.push(`overrides formsnap \u2192 sveltekit-superforms ${SUPERFORMS_VERSION}`);
-      }
-    }
+  if (dropFormsnapOverride(data)) {
+    changed.push(
+      "overrides formsnap \u2192 sveltekit-superforms dropped (formsnap 2.1 peers superforms 3)"
+    );
   }
   if (changed.length > 0) {
     writeJson(pkgPath, data, indent);
@@ -5865,10 +5869,10 @@ function belowFloor(project, key, entry) {
   return Boolean(floor && locked && compareVersions(locked, floor) < 0);
 }
 function readJson(file) {
-  const text18 = fs29.readFileSync(file, "utf8");
+  const text19 = fs29.readFileSync(file, "utf8");
   return {
-    data: JSON.parse(text18),
-    indent: text18.match(/^[{[]\s*\n([\t ]+)/)?.[1] ?? "	"
+    data: JSON.parse(text19),
+    indent: text19.match(/^[{[]\s*\n([\t ]+)/)?.[1] ?? "	"
   };
 }
 function writeJson(file, data, indent) {
@@ -5975,13 +5979,13 @@ function previousFollowUps(root, pattern) {
   const end = content.indexOf("\n## ", start + FOLLOW_UPS_HEADING.length);
   return content.slice(start, end === -1 ? void 0 : end).split("\n").filter((line) => line.startsWith("- [") && pattern.test(line)).map((line) => line.replace(/^- \[[ x]\] /, ""));
 }
-function code(text18) {
-  const fence = text18.includes("`") ? "``" : "`";
-  const pad2 = text18.startsWith("`") || text18.endsWith("`") ? " " : "";
-  return `${fence}${pad2}${text18}${pad2}${fence}`;
+function code(text19) {
+  const fence = text19.includes("`") ? "``" : "`";
+  const pad2 = text19.startsWith("`") || text19.endsWith("`") ? " " : "";
+  return `${fence}${pad2}${text19}${pad2}${fence}`;
 }
-function escape(text18) {
-  return text18.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function escape(text19) {
+  return text19.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function writeFollowUps(root, items, generic) {
   const file = path28.join(root, MIGRATION_TASKS_FILE);
@@ -6123,8 +6127,8 @@ function findRepeaterImport(dir) {
   for (const entry of entries) {
     if (!entry.isFile() || !SOURCE_FILE.test(entry.name)) continue;
     const file = path29.join(entry.parentPath, entry.name);
-    const text18 = fs30.readFileSync(file, "utf8");
-    if (text18.includes("CmsRepeater") && REPEATER_IMPORT.test(text18)) {
+    const text19 = fs30.readFileSync(file, "utf8");
+    if (text19.includes("CmsRepeater") && REPEATER_IMPORT.test(text19)) {
       return path29.relative(dir, file);
     }
   }
@@ -7720,14 +7724,20 @@ async function ensureOrderForm(root, deps = { readApiKey, createForms: createPro
 // src/commands/enable/payments.ts
 var payments = new Command20("payments").description("enable payments (Stripe, Shopify or WhatsApp)").option("--provider <provider>", "payment provider: stripe, shopify or whatsapp").option(
   "--currency <code>",
-  "WhatsApp: the business's currency, an ISO 4217 code such as MXN (kept in src/lib/site.ts)"
+  "the currency the business prices in, an ISO 4217 code such as MXN (kept in src/lib/site.ts; WhatsApp needs it)"
+).option(
+  "--country <code>",
+  "the country the business is in, ISO 3166-1 such as MX; prices format for it"
+).option(
+  "--currencies <codes>",
+  "other currencies to show prices in, as estimates, comma-separated (USD,EUR); blank for none"
 ).allowExcessArguments(true).configureHelp(helpConfig).action(
   (opts, cmd) => runCommand(async () => {
     const provider = await resolveProvider("enable-payments", opts.provider);
     await assertPatternRequires("enable-payments", provider.id);
     if (provider.id === "stripe") assertBackendReady("vela enable payments");
     if (provider.id === "stripe") noteWebhookSecret();
-    const currency = provider.id === "whatsapp" ? await askCurrency(opts.currency) : void 0;
+    const business = await askBusiness(opts, provider.id === "whatsapp");
     const orderForm = provider.id === "whatsapp" ? await prepareOrderForm() : [];
     const providerEnv = await collectProviderEnv(provider);
     const demoId = provider.id === "whatsapp" ? "" : await askDemoId(provider);
@@ -7737,12 +7747,15 @@ var payments = new Command20("payments").description("enable payments (Stripe, S
     await runPattern(
       "enable-payments",
       cmd.args,
-      { provider: provider.id, providerEnv, demoId, currency },
+      { provider: provider.id, providerEnv, demoId, ...business },
       {
         summary: `Enabled ${provider.label} payments.`,
         nextSteps: [
           ...blank.map((key) => `Set ${key} in .env.`),
           ...orderForm,
+          ...business.currencies ? [
+            "Visitors can pick a currency in the navbar; the others are estimates at the day's rate from velastack.dev. Edit `currencies` in src/lib/site.ts to change the list."
+          ] : [],
           ...NEXT_STEPS2[provider.id],
           "Set the same variables on each deploy target with `vela env set`."
         ],
@@ -7774,24 +7787,65 @@ var NEXT_STEPS2 = {
 function isCurrency(code2) {
   return Intl.supportedValuesOf("currency").includes(code2.trim().toUpperCase());
 }
-async function askCurrency(flag) {
-  if (flag) return flag.trim().toUpperCase();
+function isCountry(code2) {
+  const upper = code2.trim().toUpperCase();
+  return /^[A-Z]{2}$/.test(upper) && new Intl.DisplayNames(["en"], { type: "region" }).of(upper) !== upper;
+}
+function declaredBusiness() {
   const root = findWorkspaceRoot();
   const site = root ? path35.join(root, "src", "lib", "site.ts") : null;
-  if (site && fs35.existsSync(site) && /^\s*currency\s*:/m.test(fs35.readFileSync(site, "utf8"))) {
-    return void 0;
+  if (!site || !fs35.existsSync(site)) return {};
+  const source = fs35.readFileSync(site, "utf8");
+  return {
+    currency: /^\s*currency\s*:\s*['"]([A-Za-z]{3})['"]/m.exec(source)?.[1],
+    country: /^\s*country\s*:\s*['"]([A-Za-z]{2})['"]/m.exec(source)?.[1],
+    currencies: /^\s*currencies\s*:\s*\[([^\]]*)\]/m.exec(source)?.[1]
+  };
+}
+async function askBusiness(flags, currencyRequired) {
+  const declared = declaredBusiness();
+  const business = {
+    currency: flags.currency?.trim().toUpperCase(),
+    country: flags.country?.trim().toUpperCase(),
+    currencies: flags.currencies
+  };
+  const ask = isInteractive();
+  if (!business.currency && !declared.currency) {
+    if (!ask) return business;
+    business.currency = await text7({
+      message: "The currency the business prices in (ISO 4217)",
+      placeholder: "MXN, EUR, USD...",
+      validate: (value) => value && isCurrency(value) ? void 0 : currencyRequired || value ? "An ISO 4217 code, such as MXN or EUR" : void 0
+    });
   }
-  if (!isInteractive()) return void 0;
-  const value = await p21.text({
-    message: "The business's currency, which every price is in (ISO 4217)",
-    placeholder: "MXN, EUR, USD...",
-    validate: (value2) => value2 && isCurrency(value2) ? void 0 : "An ISO 4217 code, such as MXN or EUR"
-  });
+  const home = (business.currency ?? declared.currency ?? "").toUpperCase();
+  if (!business.country && !declared.country && ask) {
+    business.country = await text7({
+      message: "The country the business is in (ISO 3166-1, two letters), so prices format for it",
+      placeholder: "MX, ES, US...",
+      validate: (value) => !value || isCountry(value) ? void 0 : "A two-letter country code, such as MX"
+    });
+  }
+  if (business.currencies === void 0 && declared.currencies === void 0 && ask && home) {
+    business.currencies = await text7({
+      message: `Other currencies to show prices in, as estimates (comma-separated, blank for ${home} only)`,
+      placeholder: "USD, EUR",
+      validate: (value) => value && value.split(/[,\s]+/).some((code2) => code2 && !isCurrency(code2)) ? "ISO 4217 codes, comma-separated" : void 0
+    });
+  }
+  return {
+    currency: business.currency?.toUpperCase() || void 0,
+    country: business.country?.toUpperCase() || void 0,
+    currencies: business.currencies ?? void 0
+  };
+}
+async function text7(options) {
+  const value = await p21.text(options);
   if (p21.isCancel(value)) {
     p21.cancel("Operation cancelled.");
     process19.exit(0);
   }
-  return value.trim().toUpperCase();
+  return (value ?? "").trim() || void 0;
 }
 async function prepareOrderForm() {
   if (process19.env.PUBLIC_WHATSAPP_ORDER_FORM) return [];
@@ -9485,8 +9539,8 @@ function describeTarget(target) {
       return target.name;
   }
 }
-function bold(text18) {
-  return `\`${text18}\``;
+function bold(text19) {
+  return `\`${text19}\``;
 }
 
 // src/lib/server-command.ts
@@ -14463,8 +14517,8 @@ function matrixCell(key, columns, index, states) {
   return pc23.dim("\u2014");
 }
 var ANSI3 = /\u001b\[[0-9;]*m/g;
-function plain(text18) {
-  return text18.replace(ANSI3, "");
+function plain(text19) {
+  return text19.replace(ANSI3, "");
 }
 
 // src/commands/env/set.ts