@stacksjs/actions 0.70.113 → 0.70.114

package/dist/auth/setup.js

@@ -177,7 +177,10 @@ try {
       )
     `);
   try {
-    await db.unsafe("ALTER TABLE password_resets ADD COLUMN expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP");
+    if (isPostgres)
+      await db.unsafe("ALTER TABLE password_resets ADD COLUMN IF NOT EXISTS expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP");
+    else
+      await db.unsafe("ALTER TABLE password_resets ADD COLUMN expires_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP");
   } catch {}
   await db.unsafe(`
     CREATE UNIQUE INDEX IF NOT EXISTS idx_password_resets_email_unique ON password_resets(email)

package/dist/blog.js

@@ -193,11 +193,9 @@ async function blogChrome() {
     ${toggle}`;
 }
 async function blogFooter() {
-  return `<div class="blog-landscape" aria-hidden="true">
-      <span class="ridge"></span>
-      <span class="river"></span>
+  return `<footer class="blog-foot">
       <p class="colophon">${(await site()).colophon}</p>
-    </div>`;
+    </footer>`;
 }
 async function blogConfig(bp, fm) {
   const cfg = await site(), themeCss = existsSync(THEME_FILE) ? readFileSync(THEME_FILE, "utf-8") : "", baseCss = bp.defaultConfig.markdown?.css || "";
@@ -232,7 +230,7 @@ async function notFoundHtml(bp) {
   const body = `
     <a class="blog-back" href="/blog">\u2190 All posts</a>
     <div class="blog-404">
-      <span class="blog-404-art" aria-hidden="true"></span>
+      <p class="blog-kicker">404</p>
       <h1>Nothing here</h1>
       <p>This post doesn't exist (or it moved). Head back to <a href="/blog">all posts</a>.</p>
     </div>`;
@@ -248,13 +246,12 @@ async function postHtml(bp, slug, origin) {
   const author = fm.author || cfg.author, initial = escapeHtml(author.charAt(0).toUpperCase()), header = `
     <a class="blog-back" href="/blog">\u2190 All posts</a>
     <div class="blog-post-head">
-      <h1>${escapeHtml(fm.title || slug)}</h1>
       <p class="blog-post-meta">
-        <span class="author">${escapeHtml(author)}</span>
-        <span class="dot">\xB7</span>
         <time>${escapeHtml(formatDate(fm.date))}</time>
+        <span class="dot">\xB7</span>
+        <span class="author">${escapeHtml(author)}</span>
       </p>
-      ${fm.poster ? `<figure class="blog-post-poster"><img src="${escapeHtml(fm.poster)}" alt="${escapeHtml(fm.title || "")}"></figure>` : ""}
+      <h1>${escapeHtml(fm.title || slug)}</h1>
     </div>`, authorCard = fm.authorBio ? `<aside class="blog-author-card">
         <div class="avatar">${initial}</div>
         <div><span class="name">${escapeHtml(author)}</span><p class="bio">${escapeHtml(fm.authorBio)}</p></div>
@@ -270,19 +267,20 @@ async function postHtml(bp, slug, origin) {
   return bp.wrapInLayout(await blogChrome() + header + html + authorCard + share + more + await blogFooter(), await blogConfig(bp, fm), `/blog/${slug}`, "page");
 }
 async function indexHtml(bp) {
-  const cfg = await site(), cards = listPosts().map((p) => {
-    const featured = p.fm.featured === "true", media = p.fm.poster ? `<div class="blog-card-media"><img src="${escapeHtml(p.fm.poster)}" alt="" loading="lazy"></div>` : "";
-    return `<a class="blog-card${featured ? " is-featured" : ""}" href="/blog/${escapeHtml(p.slug)}">
-      ${media}
-      <div>
-        ${featured ? '<span class="blog-card-flag">Featured</span>' : ""}
-        <h2 class="blog-card-title">${escapeHtml(p.fm.title || p.slug)}</h2>
-        <p class="blog-card-excerpt">${escapeHtml((p.fm.description || "").slice(0, 180))}</p>
-        <div class="blog-card-meta">${escapeHtml(p.fm.author || cfg.author)} \xB7 ${escapeHtml(formatDate(p.fm.date))}</div>
+  const cfg = await site(), posts = listPosts(), [lead, ...rest] = posts, leadHtml = lead ? `<a class="blog-feature" href="/blog/${escapeHtml(lead.slug)}">
+        <p class="blog-feature-meta">${lead.fm.featured === "true" ? '<span class="chip">Featured</span>' : ""}<time>${escapeHtml(formatDate(lead.fm.date))}</time></p>
+        <h2>${escapeHtml(lead.fm.title || lead.slug)}</h2>
+        <p class="blog-feature-excerpt">${escapeHtml((lead.fm.description || "").slice(0, 200))}</p>
+        <span class="blog-read">Read the post <span class="arrow" aria-hidden="true">\u2192</span></span>
+      </a>` : "", rows = rest.map((p) => `<a class="blog-row" href="/blog/${escapeHtml(p.slug)}">
+      <time>${escapeHtml(formatDate(p.fm.date))}</time>
+      <div class="blog-row-main">
+        <h2>${escapeHtml(p.fm.title || p.slug)}</h2>
+        <p>${escapeHtml((p.fm.description || "").slice(0, 160))}</p>
       </div>
-    </a>`;
-  }).join(`
-`), emptyState = `
+      <span class="blog-row-arrow" aria-hidden="true">\u2192</span>
+    </a>`).join(`
+`), cards = leadHtml + (rest.length ? `<div class="blog-index">${rows}</div>` : ""), emptyState = `
     <div class="blog-empty">
       <h2>${escapeHtml(cfg.emptyTitle)}</h2>
       <p>${escapeHtml(cfg.emptyText)}</p>
@@ -329,12 +327,12 @@ async function indexHtml(bp) {
         })
       })()
     </script>`, body = `
-    <div class="blog-listing-head">
-      <span class="sign" aria-hidden="true"></span>
+    <div class="blog-head">
       <h1>${escapeHtml(cfg.title)}</h1>
-      <p>${escapeHtml(cfg.description)}</p>
+      <p class="blog-head-sub">${escapeHtml(cfg.description)}</p>
+      ${posts.length ? `<p class="blog-count">${posts.length} ${posts.length === 1 ? "post" : "posts"}</p>` : ""}
     </div>
-    <div class="blog-cards">${cards || emptyState}</div>`;
+    <div class="blog-list">${cards || emptyState}</div>`;
   return bp.wrapInLayout(await blogChrome() + body + await blogFooter(), await blogConfig(bp, { title: cfg.title, description: cfg.description }), "/blog", "page");
 }
 async function feedXml(baseUrl) {

package/dist/make.d.ts

@@ -15,7 +15,7 @@ export declare function createAction(options: MakeOptions): Promise<void>;
 export declare function createComponent(options: MakeOptions): Promise<void>;
 export declare function makeDatabase(options: MakeOptions): void;
 export declare function createDatabase(options: MakeOptions): void;
-export declare function factory(options: MakeOptions): void;
+export declare function factory(options: MakeOptions): Promise<void>;
 export declare function createFactory(options: MakeOptions): Promise<void>;
 export declare function makeNotification(options: MakeOptions): Promise<void>;
 /**

package/dist/make.js

@@ -6,9 +6,9 @@ import { localUrl } from "@stacksjs/config";
 import { Action } from "@stacksjs/enums";
 import { handleError } from "@stacksjs/error-handling";
 import { log } from "@stacksjs/logging";
-import { frameworkPath, path as p, resolve } from "@stacksjs/path";
+import { path as p, resolve } from "@stacksjs/path";
 import { createFolder, doesFolderExist, writeTextFile } from "@stacksjs/storage";
-import { kebabCase, pascalCase, template } from "@stacksjs/strings";
+import { camelCase, kebabCase, pascalCase, template } from "@stacksjs/strings";
 import { runAction } from "./helpers";
 import { CODE_TEMPLATES } from "./templates";
 let isDryRun = !1;
@@ -91,24 +91,30 @@ export async function createComponent(options) {
 }
 export function makeDatabase(options) {
   try {
-    const name = options.name;
-    log.info(`Creating your ${italic(name)} database...`);
     createDatabase(options);
-    log.success(`Created ${italic(name)} database`);
   } catch (error) {
     log.error("There was an error creating your database", error);
     process.exit(ExitCode.FatalError);
   }
 }
 export function createDatabase(options) {
-  log.debug("createDatabase options", options);
+  const name = pascalCase(options.name || "MyModel");
+  console.log(`
+  Stacks manages the database through models and migrations, so there is no separate database to create.
+
+  To add a "${name}" table:
+    1. buddy make:model ${name}
+    2. buddy generate:migrations
+    3. buddy migrate
+
+  To use a different database engine or file, edit the connections in \`config/database.ts\`.
+`);
 }
-export function factory(options) {
+export async function factory(options) {
   try {
     const name = options.name;
     log.info(`Creating your ${italic(name)} factory...`);
-    createDatabase(options);
-    log.success(`Created ${italic(name)} factory`);
+    await createFactory(options);
   } catch (error) {
     log.error("There was an error creating your factory", error);
     process.exit(ExitCode.FatalError);
@@ -220,7 +226,7 @@ export async function makeFunction(options) {
 }
 export async function createFunction(options) {
   const name = options.name;
-  await createFileWithTemplate(p.userFunctionsPath(`${name}.ts`), "function", name);
+  await createFileWithTemplate(p.userFunctionsPath(`${name}.ts`), "function", camelCase(name));
 }
 export async function makeLanguage(options) {
   try {
@@ -283,13 +289,13 @@ export async function createNotification(options) {
   }
 }
 export async function createMigration(options) {
-  const optionName = options.name, table = "dummy-name";
+  const optionName = options.name;
   if (!optionName[0])
     throw Error("options.name is required and cannot be empty");
-  const name = optionName[0].toUpperCase() + optionName.slice(1), path = frameworkPath(`database/migrations/${name}.ts`);
+  const fileName = `${Date.now()}-${kebabCase(optionName)}.ts`, path = p.userMigrationsPath(fileName), snake = kebabCase(optionName).replace(/-/g, "_"), table = /^create_(.+)_table$/.exec(snake)?.[1] ?? "table_name";
   try {
     await createFileWithTemplate(path, "migration", table);
-    log.success(`Successfully created your migration file at stacks/database/migrations/${name}.ts`);
+    log.success(`Migration created: ${italic(`database/migrations/${fileName}`)}`);
   } catch (error) {
     log.error(error);
   }

package/dist/upgrade/framework-utils.d.ts

@@ -108,6 +108,14 @@ export declare function snapshotTree(root: string, skip?: string[]): Promise<Map
  * inputs already carry their content hash, so this is just bookkeeping.
  */
 export declare function diffSnapshots(before: Map<string, SnapshotEntry>, after: Map<string, SnapshotEntry>): ChangeSummary;
+/**
+ * Like `diffSnapshots`, but also returns the sorted relative file lists behind
+ * the counts. Used by the `--dry-run` preview, which diffs the local target
+ * against the upgrade SOURCE (local checkout or temp-dir download) instead of
+ * against a post-sync tree, so it can show exactly which files a real sync
+ * would add or change without writing anything.
+ */
+export declare function diffSnapshotsDetailed(before: Map<string, SnapshotEntry>, after: Map<string, SnapshotEntry>): DetailedChangeSummary;
 export declare const MANAGED_PATHS: ManagedPath[];
 export declare interface UpgradeContext {
   channel: 'stable' | 'canary'
@@ -157,3 +165,8 @@ export declare interface ChangeSummary {
   removed: number
   unchanged: number
 }
+export declare interface DetailedChangeSummary extends ChangeSummary {
+  addedFiles: string[]
+  changedFiles: string[]
+  removedFiles: string[]
+}

package/dist/upgrade/framework-utils.js

@@ -186,6 +186,34 @@ export function diffSnapshots(before, after) {
       removed++;
   return { added, changed, removed, unchanged };
 }
+export function diffSnapshotsDetailed(before, after) {
+  const addedFiles = [], changedFiles = [], removedFiles = [];
+  let unchanged = 0;
+  for (const [rel, info] of after) {
+    const prev = before.get(rel);
+    if (!prev)
+      addedFiles.push(rel);
+    else if (prev.size !== info.size || prev.hash !== info.hash)
+      changedFiles.push(rel);
+    else
+      unchanged++;
+  }
+  for (const rel of before.keys())
+    if (!after.has(rel))
+      removedFiles.push(rel);
+  addedFiles.sort();
+  changedFiles.sort();
+  removedFiles.sort();
+  return {
+    added: addedFiles.length,
+    changed: changedFiles.length,
+    removed: removedFiles.length,
+    unchanged,
+    addedFiles,
+    changedFiles,
+    removedFiles
+  };
+}
 async function hashFile(absPath) {
   try {
     const buf = await Bun.file(absPath).arrayBuffer();

package/dist/upgrade/framework.js

@@ -1,4 +1,5 @@
-import { chmodSync, copyFileSync, cpSync, existsSync, mkdirSync, readFileSync, rmSync } from "node:fs";
+import { chmodSync, copyFileSync, cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import process from "node:process";
 import { parseOptions } from "@stacksjs/cli";
@@ -9,6 +10,7 @@ import {
   buildTemplateString,
   detectLocalStacks,
   diffSnapshots,
+  diffSnapshotsDetailed,
   MANAGED_PATHS,
   readChannel,
   readSyncedVersion,
@@ -37,6 +39,10 @@ if (!existsSync(p.projectPath("storage/framework/core"))) {
 const channelFile = join(projectRoot, ".stacks-channel"), versionFile = join(projectRoot, ".stacks-version"), currentChannel = readChannel(channelFile), ctx = resolveUpgradeContext(options, currentChannel), corePkgPath = p.projectPath("storage/framework/core/buddy/package.json"), currentVersion = readVersion(corePkgPath), explicitLocal = options.from ? p.projectPath(options.from) : null, detectedLocal = explicitLocal ?? (shouldAutoDetectLocalStacks(options) ? detectLocalStacks(projectRoot) : null), usingLocal = !!detectedLocal;
 console.log(resolveUpgradeMessage(ctx, currentChannel, !!options.stable));
 console.log(usingLocal ? `  source: local checkout at ${detectedLocal}` : `  source: github:stacksjs/stacks#${ctx.ref}`);
+if (options.dryRun) {
+  await runDryRunPreview();
+  process.exit(ExitCode.Success);
+}
 if (!options.force) {
   const dirty = await detectDirtyManagedPaths(projectRoot);
   if (dirty.length > 0) {
@@ -119,6 +125,135 @@ if (runHooks)
 if (ctx.channel === "canary" && !ctx.targetVersion)
   console.warn("\u26A0 Canary builds may contain bugs or breaking changes. Not recommended for production.");
 process.exit(ExitCode.Success);
+async function runDryRunPreview() {
+  console.log(`
+  DRY RUN - preview only. No files will be written, nothing will be installed, no migrations will run.
+`);
+  const dirty = await detectDirtyManagedPaths(projectRoot);
+  if (dirty.length > 0) {
+    console.warn("  Note: these framework-managed paths have uncommitted changes (a real run would abort without --force):");
+    for (const path of dirty)
+      console.warn(`    - ${path}`);
+    console.warn("");
+  }
+  let previewSha = null;
+  if (!options.force && !ctx.targetVersion) {
+    previewSha = await getRemoteSha(ctx, usingLocal, detectedLocal);
+    const synced = readSyncedVersion(versionFile);
+    if (shouldShortCircuit({ force: !!options.force, targetVersion: ctx.targetVersion, remoteSha: previewSha, synced, channel: ctx.channel })) {
+      console.log(`\u2714 Already on the latest ${ctx.channel} (${previewSha.slice(0, 7)}). A real run would change nothing.`);
+      return;
+    }
+  }
+  const aggregate = { added: 0, changed: 0, removed: 0, unchanged: 0 }, perPath = [];
+  let sawRemoved = 0, sourceVersion = null;
+  const tmpBase = mkdtempSync(join(tmpdir(), "stacks-upgrade-dry-run-"));
+  try {
+    let repoTmp = null;
+    for (const managed of MANAGED_PATHS) {
+      const localTarget = join(projectRoot, managed.localPath), before = managed.isFile ? await singleFileSnapshot(localTarget) : await snapshotTree(localTarget, managed.skip);
+      let after;
+      if (usingLocal && detectedLocal) {
+        const src = join(detectedLocal, managed.subPath);
+        if (!existsSync(src)) {
+          console.log(`  ${managed.label.padEnd(10)} skip: source missing at ${src}`);
+          continue;
+        }
+        after = managed.isFile ? await singleFileSnapshot(src) : await snapshotTree(src, managed.skip);
+      } else
+        try {
+          if (managed.isFile) {
+            if (!repoTmp) {
+              repoTmp = join(tmpBase, "repo");
+              await downloadTemplate(`github:stacksjs/stacks#${ctx.ref}`, {
+                dir: repoTmp,
+                force: !0,
+                forceClean: !0,
+                preferOffline: !0,
+                silent: !0
+              });
+            }
+            after = await singleFileSnapshot(join(repoTmp, managed.subPath));
+          } else {
+            const dir = join(tmpBase, managed.label);
+            await downloadTemplate(buildTemplateString(ctx.ref, managed.subPath), {
+              dir,
+              force: !0,
+              forceClean: !0,
+              preferOffline: !options.force,
+              silent: !0
+            });
+            after = await snapshotTree(dir, managed.skip);
+          }
+        } catch (err) {
+          console.log(`  ${managed.label.padEnd(10)} preview unavailable (${err?.message || err}); a real run would sync from github:stacksjs/stacks#${ctx.ref}`);
+          continue;
+        }
+      const summary = diffSnapshotsDetailed(before, after);
+      aggregate.added += summary.added;
+      aggregate.changed += summary.changed;
+      aggregate.removed += summary.removed;
+      aggregate.unchanged += summary.unchanged;
+      perPath.push({ managed, summary });
+      sawRemoved += summary.removed;
+      if (managed.isFile) {
+        const moved = summary.added + summary.changed > 0;
+        console.log(`  ${managed.label.padEnd(10)} ${moved ? "would update" : "unchanged"}`);
+      } else if (summary.added + summary.changed + summary.removed === 0)
+        console.log(`  ${managed.label.padEnd(10)} unchanged (${summary.unchanged} files)`);
+      else {
+        console.log(`  ${managed.label.padEnd(10)} +${summary.added} ~${summary.changed} -${summary.removed} (${summary.unchanged} unchanged)`);
+        const samples = [
+          ...summary.addedFiles.map((f) => `+ ${f}`),
+          ...summary.changedFiles.map((f) => `~ ${f}`)
+        ];
+        for (const line of samples.slice(0, 8))
+          console.log(`      ${line}`);
+        if (samples.length > 8)
+          console.log(`      ... and ${samples.length - 8} more`);
+      }
+    }
+    const sourcePkgPath = usingLocal && detectedLocal ? join(detectedLocal, "storage/framework/core/buddy/package.json") : repoTmp ? join(repoTmp, "storage/framework/core/buddy/package.json") : join(tmpBase, "core", "buddy", "package.json");
+    sourceVersion = readVersion(sourcePkgPath);
+  } finally {
+    rmSync(tmpBase, { recursive: !0, force: !0 });
+  }
+  console.log("");
+  if (currentVersion || sourceVersion)
+    console.log(currentVersion === sourceVersion ? `  version: unchanged (v${currentVersion ?? "unknown"})` : `  version: v${currentVersion ?? "unknown"} -> v${sourceVersion ?? "unknown"}`);
+  console.log(`
+  A real run would:`);
+  console.log("    - sync the managed paths above into place");
+  if (!ctx.targetVersion) {
+    console.log(`    - write channel "${ctx.channel}" to .stacks-channel`);
+    console.log(previewSha ? `    - record synced sha ${previewSha.slice(0, 7)} in .stacks-version` : "    - record the resolved commit sha in .stacks-version (unavailable in this preview)");
+  }
+  if (!(!options.noPostinstall && options.postinstall !== !1))
+    console.log("    - skip post-sync hooks (--no-postinstall)");
+  else if (aggregate.added + aggregate.changed + aggregate.removed === 0)
+    console.log("    - skip post-sync hooks (nothing changed)");
+  else {
+    console.log("    - regenerate the auto-import manifest");
+    if (perPath.some((entry) => {
+      const { managed, summary } = entry;
+      if (managed.isFile)
+        return !1;
+      if (managed.label !== "core" && managed.label !== "defaults")
+        return !1;
+      if (summary.added + summary.changed === 0)
+        return !1;
+      return pkgJsonInTree(join(projectRoot, managed.localPath));
+    }))
+      console.log("    - run `bun install` to refresh dependencies");
+    if (existsSync(join(projectRoot, "database", "migrations")))
+      console.log("    - run pending migrations");
+  }
+  if (sawRemoved > 0)
+    console.log(`
+  (-N counts files no longer shipped upstream; the sync leaves them in place.)`);
+  console.log(`
+\u2714 Dry run complete. No changes were made.`);
+}
 async function detectDirtyManagedPaths(root) {
   const gitDir = join(root, ".git");
   if (!existsSync(gitDir))

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/actions",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.113",
+  "version": "0.70.114",
   "description": "The Stacks actions.",
   "author": "Chris Breuer",
   "contributors": [
@@ -65,30 +65,30 @@
     "@stacksjs/bumpx": "^0.2.6",
     "@stacksjs/bunpress": "^0.1.12",
     "@stacksjs/logsmith": "^0.2.3",
-    "@stacksjs/ts-cloud": "^0.7.17",
+    "@stacksjs/ts-cloud": "catalog:",
     "@stacksjs/ts-md": "^0.1.1"
   },
   "devDependencies": {
-    "@stacksjs/api": "0.70.113",
-    "@stacksjs/cli": "0.70.113",
-    "@stacksjs/config": "0.70.113",
-    "@stacksjs/database": "0.70.113",
+    "@stacksjs/api": "0.70.114",
+    "@stacksjs/cli": "0.70.114",
+    "@stacksjs/config": "0.70.114",
+    "@stacksjs/database": "0.70.114",
     "@stacksjs/tlsx": "^0.13.2",
-    "better-dx": "^0.2.16",
-    "@stacksjs/dns": "0.70.113",
-    "@stacksjs/enums": "0.70.113",
-    "@stacksjs/env": "0.70.113",
-    "@stacksjs/error-handling": "0.70.113",
-    "@stacksjs/logging": "0.70.113",
-    "@stacksjs/path": "0.70.113",
-    "@stacksjs/security": "0.70.113",
-    "@stacksjs/storage": "0.70.113",
-    "@stacksjs/strings": "0.70.113",
-    "@stacksjs/utils": "0.70.113",
-    "@stacksjs/validation": "0.70.113"
+    "better-dx": "catalog:",
+    "@stacksjs/dns": "0.70.114",
+    "@stacksjs/enums": "0.70.114",
+    "@stacksjs/env": "0.70.114",
+    "@stacksjs/error-handling": "0.70.114",
+    "@stacksjs/logging": "0.70.114",
+    "@stacksjs/path": "0.70.114",
+    "@stacksjs/security": "0.70.114",
+    "@stacksjs/storage": "0.70.114",
+    "@stacksjs/strings": "0.70.114",
+    "@stacksjs/utils": "0.70.114",
+    "@stacksjs/validation": "0.70.114"
   },
   "peerDependencies": {
-    "pickier": "^0.1.28"
+    "pickier": "catalog:"
   },
   "peerDependenciesMeta": {
     "pickier": {