@stelstone/server 0.29.0 → 0.30.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stelstone/server",
-  "version": "0.29.0",
+  "version": "0.30.1",
   "description": "Runtime-agnostic CMS server built on the Web Fetch API, with pluggable adapters for content, media, auth, and build.",
   "license": "MIT",
   "repository": {

package/src/adapters/github-content.mjs

@@ -408,13 +408,15 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
       ? { deferredPublish: true, perEntryPublish: true }
       : { deferredPublish: false, perEntryPublish: false },
 
-    async pendingChanges() {
+    /** @param {string} [target] branch to compare against; defaults to the deploy branch */
+    async pendingChanges(target) {
       if (!draftMode) return { hasChanges: false, changedFiles: 0, files: [] };
       await ensureDraftBranch();
+      const against = target || branch;
       // One compare call: which files differ between published and draft?
       // (GitHub caps the file list at 300 — orders of magnitude above any
       // real collection here; still, say so rather than rely on it silently.)
-      const cmp = await apiGet(`/compare/${branch}...${draftBranch}`);
+      const cmp = await apiGet(`/compare/${against}...${draftBranch}`);
       const files = (cmp?.files ?? [])
         .filter((f) => f.filename.startsWith(`${pagesDir}/`))
         // Index manifests live on the draft branch only — the site build
@@ -437,16 +439,22 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
      * references them by SHA — nothing is re-uploaded. A `removed` status
      * becomes a tree entry with `sha: null`, which is how git-data deletes.
      *
+     * `target` names the branch to land on, so one panel can push the same
+     * drafts to a preview site first and to the live site after. The caller
+     * resolves it from the configured list — an arbitrary branch name must
+     * never reach here from a request.
+     *
      * @param {string} [message]
-     * @param {{ entries?: {collection: string, file: string}[] }} [opts]
+     * @param {{ entries?: {collection: string, file: string}[], target?: string }} [opts]
      */
-    async publish(message, { entries } = {}) {
+    async publish(message, { entries, target } = {}) {
+      const toBranch = target || branch;
       if (!draftMode) {
         // Writes are committed instantly; trigger is external (Netlify webhook on push)
         return { ok: true, message: "All changes are already committed to GitHub" };
       }
       await ensureDraftBranch();
-      const pending = await this.pendingChanges();
+      const pending = await this.pendingChanges(toBranch);
       if (!pending.hasChanges) return { ok: false, message: "No changes to publish" };
 
       const scoped = Array.isArray(entries) && entries.length > 0;
@@ -472,7 +480,7 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
       let lastErr;
       for (let attempt = 0; attempt < 2; attempt++) {
         try {
-          const refData = await apiGet(`/git/ref/heads/${branch}`);
+          const refData = await apiGet(`/git/ref/heads/${toBranch}`);
           const baseCommitSha = refData.object.sha;
           const baseCommit = await apiGet(`/git/commits/${baseCommitSha}`);
           const timestamp = new Date().toISOString().replace("T", " ").slice(0, 19);
@@ -483,11 +491,11 @@ export function createGitHubContent({ token, owner, repo, branch, draftBranch, p
             tree: newTree.sha,
             parents: [baseCommitSha],
           });
-          await apiPatch(`/git/refs/heads/${branch}`, { sha: newCommit.sha });
+          await apiPatch(`/git/refs/heads/${toBranch}`, { sha: newCommit.sha });
           const shortSha = newCommit.sha.slice(0, 7);
           return {
             ok: true,
-            message: `Published ${targets.length} file(s) to ${branch} (${shortSha})`,
+            message: `Published ${targets.length} file(s) to ${toBranch} (${shortSha})`,
             sha: newCommit.sha,
             shortSha,
             branch,

package/src/core/config-schema.mjs

@@ -86,6 +86,39 @@ function checkContent(config, report, { runtime }) {
   }
 }
 
+/**
+ * `content.publishTargets` gives one panel more than one place to land the
+ * drafts — a preview site first, the live site after. Each id is what a
+ * request may ask for; the branch is never taken from the request.
+ */
+function checkPublishTargets(config, report) {
+  const targets = config.content?.publishTargets;
+  if (targets === undefined) return;
+  if (!Array.isArray(targets) || targets.length === 0) {
+    report.error("content.publishTargets", "must be a non-empty array");
+    return;
+  }
+  if (!config.content?.draftBranch) {
+    report.error(
+      "content.publishTargets",
+      "needs content.draftBranch — without a draft branch saving already publishes, so there is nothing to send anywhere",
+    );
+  }
+  const seen = new Set();
+  targets.forEach((t, i) => {
+    const at = `content.publishTargets[${i}]`;
+    if (!t || typeof t !== "object") return report.error(at, "must be an object");
+    if (!t.id) report.error(`${at}.id`, "is required — this is what the panel sends");
+    if (!t.branch) report.error(`${at}.branch`, "is required — the branch this target lands on");
+    if (!t.label) report.warn(`${at}.label`, "is missing — the button will show the id");
+    if (t.id && seen.has(t.id)) report.error(`${at}.id`, `duplicate target id "${t.id}"`);
+    if (t.id) seen.add(t.id);
+    if (t.branch && t.branch === config.content?.draftBranch) {
+      report.error(`${at}.branch`, "is the draft branch — publishing onto it would be a no-op");
+    }
+  });
+}
+
 function checkAuth(config, report, { getSecret }) {
   const auth = config.auth;
   if (!isPlainObject(auth)) {
@@ -435,6 +468,7 @@ export function validateConfig(config, { runtime = "node", getSecret } = {}) {
   checkCollections(config, report);
   checkForms(config, report, { getSecret: lookup });
   checkBuild(config, report, { getSecret: lookup });
+  checkPublishTargets(config, report);
   checkMisc(config, report);
 
   return { errors: report.errors, warnings: report.warnings };

package/src/default-public-config.mjs

@@ -22,6 +22,11 @@ export function defaultPublicConfig(config, overrides = {}) {
     blocks:            config.blocks,
     content: {
       provider: config.content?.provider || "fs",
+      // Ids and labels only — the branch each maps to stays server-side.
+      publishTargets: (config.content?.publishTargets ?? []).map((t) => ({
+        id: t.id,
+        label: t.label || t.id,
+      })),
       // Whether saving and publishing are separate steps. False only on the
       // github backend without a draft branch — the admin hides Publish there,
       // because saving already published.

package/src/routes.mjs

@@ -87,7 +87,12 @@ export const apiRoutes = [
     handler: ({ env, runtime, adminUiVersion }) =>
       ok({
         serverVersion: SERVER_VERSION,
-        adminUiVersion: adminUiVersion ?? null,
+        // The Node server reads this off the package it resolved. A Worker
+        // cannot: the SPA is served by the assets binding and its package.json
+        // is not in the bundle. The deployment composed that directory, so it
+        // can state the version the way it states the commit below — a stated
+        // version beats a null on the About screen.
+        adminUiVersion: adminUiVersion ?? env("CMS_ADMIN_UI_VERSION") ?? null,
         // Declared by whoever constructed the handler, not sniffed: with
         // nodejs_compat enabled a Worker also exposes process.versions.node,
         // so feature detection reported "node" from inside a Worker.
@@ -580,9 +585,11 @@ export const apiRoutes = [
     method: "POST",
     path: "/api/publish",
     auth: "admin",
-    handler: async ({ adapters }) => {
+    handler: async ({ adapters, config, body }) => {
+      const target = resolveTarget(config, body?.target);
+      if (target.error) return { status: 400, json: { ok: false, message: target.error } };
       try {
-        return ok(await adapters.content.publish());
+        return ok(await adapters.content.publish(null, { target: target.branch }));
       } catch (err) {
         return { status: 500, json: { ok: false, message: err.message } };
       }
@@ -596,7 +603,9 @@ export const apiRoutes = [
     method: "POST",
     path: "/api/collections/:collection/:file/publish",
     auth: "admin",
-    handler: async ({ adapters, params }) => {
+    handler: async ({ adapters, params, config, body }) => {
+      const target = resolveTarget(config, body?.target);
+      if (target.error) return { status: 400, json: { ok: false, message: target.error } };
       if (!adapters.content.capabilities?.perEntryPublish) {
         return {
           status: 501,
@@ -607,6 +616,7 @@ export const apiRoutes = [
         return ok(
           await adapters.content.publish(null, {
             entries: [{ collection: params.collection, file: params.file }],
+            target: target.branch,
           }),
         );
       } catch (err) {
@@ -619,10 +629,12 @@ export const apiRoutes = [
     method: "GET",
     path: "/api/publish/status",
     auth: "any",
-    handler: async ({ adapters }) => {
+    handler: async ({ adapters, config, query }) => {
+      const target = resolveTarget(config, query?.target);
+      if (target.error) return { status: 400, json: { error: target.error } };
       try {
         return ok({
-          ...(await adapters.content.pendingChanges()),
+          ...(await adapters.content.pendingChanges(target.branch)),
           perEntryPublish: !!adapters.content.capabilities?.perEntryPublish,
         });
       } catch (err) {
@@ -636,11 +648,20 @@ export const apiRoutes = [
     method: "GET",
     path: "/api/deploy/status",
     auth: "any",
-    handler: async ({ adapters, query }) => {
+    handler: async ({ adapters, config, query }) => {
       if (!adapters.build.configured) return ok({ configured: false });
+      // Which branch's build to watch. After publishing to a target the new
+      // commit exists only on that target's branch, so without this the run
+      // is looked for on the deploy branch and never found — the pill then
+      // spins until it gives up, for a build that actually succeeded.
+      const target = resolveTarget(config, query.target);
+      if (target.error) return { status: 400, json: { error: target.error } };
       try {
         return ok(
-          await adapters.build.getDeployStatus({ branch: query.branch, sha: query.sha }),
+          await adapters.build.getDeployStatus({
+            branch: target.branch ?? query.branch,
+            sha: query.sha,
+          }),
         );
       } catch (err) {
         if (err.upstreamStatus) {
@@ -652,6 +673,27 @@ export const apiRoutes = [
   },
 ];
 
+/**
+ * Turns a target id from a request into a branch name.
+ *
+ * The id is matched against `content.publishTargets`; a branch name is never
+ * taken from the request itself, or an admin could push the drafts onto any
+ * ref in the repo. No id, or no targets configured, means the deploy branch —
+ * which is what every existing config does.
+ */
+function resolveTarget(config, id) {
+  const targets = config?.content?.publishTargets;
+  if (!id) return { branch: undefined };
+  if (!Array.isArray(targets) || targets.length === 0) {
+    return { error: `Unknown publish target "${id}" — content.publishTargets is not configured` };
+  }
+  const hit = targets.find((t) => t.id === id);
+  if (!hit) {
+    return { error: `Unknown publish target "${id}" — expected one of: ${targets.map((t) => t.id).join(", ")}` };
+  }
+  return { branch: hit.branch };
+}
+
 /**
  * Media endpoints need the auth adapter to mint a CDN token. Ask the port
  * whether it can, instead of calling and handling the exception as a 500.

package/src/version.mjs

@@ -5,4 +5,4 @@
  * require() and no import.meta.url, so reading the manifest at runtime yields
  * "unknown" there.
  */
-export const SERVER_VERSION = "0.29.0";
+export const SERVER_VERSION = "0.30.1";