@micacms/runtime 0.6.0-rc.2 → 0.7.0

package/dist/routes/admin-media.js

@@ -1,17 +1,80 @@
 /**
- * Admin media routes. Media is files in the content repository, and there is no delete endpoint.
- * An upload is written on its own, before the entry save, because the editor needs its path first.
+ * Admin media routes. Media is files in the content repository. An upload is
+ * written on its own, before the entry save, because the editor needs its path
+ * first. A delete is a pending change like any other, and is refused while
+ * something uses the file.
  */
+import { contentPath, ContentPathError, MEDIA_DIR } from "@micacms/core";
 import { Hono } from "hono";
+import { z } from "zod";
 import { ApiError, badRequest, notFound } from "../lib/errors.js";
 import { isImageType } from "../lib/file-type.js";
 import { MAX_FILES_PER_UPLOAD } from "../middleware/index.js";
+import { editorOf } from "../http.js";
+const deleteSchema = z.object({ paths: z.array(z.string().min(1)).min(1).max(500) });
+/** Content paths, or a 400 for one that leaves the content root. */
+function cleanPaths(paths) {
+    try {
+        return [...new Set(paths.map((path) => contentPath(path)))];
+    }
+    catch (error) {
+        if (error instanceof ContentPathError)
+            throw badRequest(error.message);
+        throw error;
+    }
+}
+/** A file in a `media/` folder, as an upload writes it. Nothing else is deleted here. */
+function mediaFilesOnly(paths) {
+    for (const path of paths) {
+        if (path.split("/").at(-2) !== MEDIA_DIR)
+            throw badRequest(`"${path}" is not a media file.`);
+    }
+    return paths;
+}
+function describeUses(path, referrers) {
+    const names = referrers.map((item) => item.title);
+    const listed = names.slice(0, 3).join(", ") + (names.length > 3 ? ` and ${names.length - 3} more` : "");
+    return `"${path.split("/").at(-1)}" is still used by ${listed}. Remove it there first.`;
+}
 export function adminMediaRoutes() {
     const app = new Hono();
     app.get("/", async (c) => {
         const { media } = c.get("ctx").services;
         return c.json({ items: await media.list() });
     });
+    /** Where files are used, before a delete: `?path=a&path=b`. */
+    app.get("/usage", async (c) => {
+        const { content } = c.get("ctx").services;
+        const paths = cleanPaths(c.req.queries("path") ?? []);
+        if (paths.length === 0)
+            throw badRequest("Name at least one file.");
+        return c.json(await content.mediaUses(paths));
+    });
+    app.post("/delete", async (c) => {
+        const ctx = c.get("ctx");
+        const parsed = deleteSchema.safeParse(await c.req.json().catch(() => null));
+        if (!parsed.success)
+            throw badRequest("Expected a list of file paths.");
+        const paths = mediaFilesOnly(cleanPaths(parsed.data.paths));
+        for (const path of paths) {
+            const owner = path.split("/")[0] ?? "";
+            const readOnly = ctx.site.readOnly.get(`collections.${owner}`) ?? ctx.site.readOnly.get(`singletons.${owner}`);
+            if (readOnly)
+                throw new ApiError("conflict", readOnly);
+            if ((await ctx.services.media.read(path)) === null)
+                throw notFound(`There is no file "${path}".`);
+        }
+        const { uses, unreadable } = await ctx.services.content.mediaUses(paths);
+        if (unreadable.length > 0) {
+            throw new ApiError("conflict", `Mica cannot read ${unreadable.join(", ")}, so it cannot tell whether these files are used.`);
+        }
+        const used = paths.filter((path) => (uses[path] ?? []).length > 0);
+        if (used.length > 0)
+            throw new ApiError("conflict", used.map((path) => describeUses(path, uses[path])).join(" "));
+        await ctx.site.contentRepository.apply({ changes: paths.map((path) => ({ type: "delete", path })) });
+        ctx.logger.info("Deleted media", { paths, editor: editorOf(c) });
+        return c.json({ deleted: paths });
+    });
     app.post("/", async (c) => {
         const ctx = c.get("ctx");
         const form = await c.req.formData().catch(() => {
@@ -34,6 +97,13 @@ export function adminMediaRoutes() {
         const readOnly = ctx.site.readOnly.get(`collections.${owner}`) ?? ctx.site.readOnly.get(`singletons.${owner}`);
         if (readOnly)
             throw new ApiError("conflict", readOnly);
+        // A new entry uploads into the folder of the URL in its form; never into a saved entry's.
+        const folder = /^([^/]+)\/([^/]+)\/media$/.exec((directory ?? "").replace(/^\/+/, ""));
+        if (form.get("newEntry") === "true" && folder && ctx.site.model.collections[folder[1]]) {
+            if ((await ctx.services.content.revisionOf(folder[1], folder[2])) !== null) {
+                throw new ApiError("conflict", `Another entry already has the URL “${folder[2]}”. Change the URL, then upload.`);
+            }
+        }
         const prepared = await Promise.all(files.map((file) => ctx.services.media.prepare({
             file,
             directory,

package/dist/routes/admin-media.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin-media.js","sourceRoot":"","sources":["../../src/routes/admin-media.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Admin media routes. Media is files in the content repository, and there is no delete endpoint.\n * An upload is written on its own, before the entry save, because the editor needs its path first.\n */\n\nimport { Hono } from \"hono\";\n\nimport { ApiError, badRequest, notFound } from \"../lib/errors.js\";\nimport { isImageType } from \"../lib/file-type.js\";\nimport { MAX_FILES_PER_UPLOAD } from \"../middleware/index.js\";\nimport type { Env } from \"../http.js\";\n\nexport function adminMediaRoutes(): Hono<Env> {\n  const app = new Hono<Env>();\n\n  app.get(\"/\", async (c) => {\n    const { media } = c.get(\"ctx\").services;\n    return c.json({ items: await media.list() });\n  });\n\n  app.post(\"/\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const form = await c.req.formData().catch(() => {\n      throw badRequest(\"Expected a multipart upload.\");\n    });\n\n    // The cast picks one of the two structurally different `File` types (Node's and undici's).\n    const files = form\n      .getAll(\"file\")\n      .filter((value) => typeof value !== \"string\") as unknown as File[];\n\n    if (files.length === 0) throw badRequest(\"No file was uploaded.\");\n    if (files.length > MAX_FILES_PER_UPLOAD) {\n      throw badRequest(`Upload at most ${MAX_FILES_PER_UPLOAD} files at a time.`);\n    }\n\n    const accept = form.get(\"accept\");\n    // An entry's own `media/` directory or the shared one; the media service refuses anything else.\n    const directory = typeof form.get(\"directory\") === \"string\" ? String(form.get(\"directory\")) : undefined;\n    // The media service accepts `/gallery/x/media` too; take the owner from the path it will write to.\n    const owner = (directory ?? \"\").replace(/^[/\\\\]+/, \"\").split(/[/\\\\]/)[0] ?? \"\";\n    const readOnly = ctx.site.readOnly.get(`collections.${owner}`) ?? ctx.site.readOnly.get(`singletons.${owner}`);\n    if (readOnly) throw new ApiError(\"conflict\", readOnly);\n\n    const prepared = await Promise.all(\n      files.map((file) =>\n        ctx.services.media.prepare({\n          file,\n          directory,\n          accept: accept === \"image\" || accept === \"document\" ? accept : \"any\",\n        }),\n      ),\n    );\n\n    await ctx.site.contentRepository.apply({\n      changes: prepared.map((item) => ({\n        type: \"write\" as const,\n        path: item.file.path,\n        contents: item.contents,\n      })),\n    });\n\n    return c.json({ items: prepared.map((item) => item.file) }, 201);\n  });\n\n  /**\n   * Serves a file to the editor, behind the admin gate. The site build reads\n   * the repository, not this route.\n   */\n  app.get(\"/file/*\", async (c) => {\n    const { media } = c.get(\"ctx\").services;\n    const mediaPath = c.req.path.replace(/^.*\\/file\\//, \"\");\n\n    let decoded: string;\n    try {\n      decoded = decodeURIComponent(mediaPath);\n    } catch {\n      throw badRequest(\"The file path is not valid.\");\n    }\n\n    const found = await media.read(decoded);\n    if (!found) throw notFound(\"No such file.\");\n\n    return c.body(found.bytes as unknown as ArrayBuffer, 200, {\n      // Text without a charset is decoded by guessing; the repository's text is UTF-8.\n      \"content-type\": found.mimeType.startsWith(\"text/\") ? `${found.mimeType}; charset=utf-8` : found.mimeType,\n      \"cache-control\": \"private, max-age=60\",\n      // A file opened directly runs nothing and reaches nothing on this origin.\n      \"content-security-policy\": \"sandbox; default-src 'none'\",\n      // An image is shown as a preview; anything else is downloaded, never rendered here.\n      ...(isImageType(found.mimeType) ? {} : { \"content-disposition\": \"attachment\" }),\n    });\n  });\n\n  return app;\n}\n"]}
+{"version":3,"file":"admin-media.js","sourceRoot":"","sources":["../../src/routes/admin-media.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Admin media routes. Media is files in the content repository. An upload is\n * written on its own, before the entry save, because the editor needs its path\n * first. A delete is a pending change like any other, and is refused while\n * something uses the file.\n */\n\nimport { contentPath, ContentPathError, MEDIA_DIR } from \"@micacms/core\";\nimport { Hono } from \"hono\";\nimport { z } from \"zod\";\n\nimport { ApiError, badRequest, notFound } from \"../lib/errors.js\";\nimport { isImageType } from \"../lib/file-type.js\";\nimport { MAX_FILES_PER_UPLOAD } from \"../middleware/index.js\";\nimport { editorOf, type Env } from \"../http.js\";\nimport type { Referrer } from \"../services/content-store.js\";\n\nconst deleteSchema = z.object({ paths: z.array(z.string().min(1)).min(1).max(500) });\n\n/** Content paths, or a 400 for one that leaves the content root. */\nfunction cleanPaths(paths: string[]): string[] {\n  try {\n    return [...new Set(paths.map((path) => contentPath(path)))];\n  } catch (error) {\n    if (error instanceof ContentPathError) throw badRequest(error.message);\n    throw error;\n  }\n}\n\n/** A file in a `media/` folder, as an upload writes it. Nothing else is deleted here. */\nfunction mediaFilesOnly(paths: string[]): string[] {\n  for (const path of paths) {\n    if (path.split(\"/\").at(-2) !== MEDIA_DIR) throw badRequest(`\"${path}\" is not a media file.`);\n  }\n  return paths;\n}\n\nfunction describeUses(path: string, referrers: Referrer[]): string {\n  const names = referrers.map((item) => item.title);\n  const listed = names.slice(0, 3).join(\", \") + (names.length > 3 ? ` and ${names.length - 3} more` : \"\");\n  return `\"${path.split(\"/\").at(-1)}\" is still used by ${listed}. Remove it there first.`;\n}\n\nexport function adminMediaRoutes(): Hono<Env> {\n  const app = new Hono<Env>();\n\n  app.get(\"/\", async (c) => {\n    const { media } = c.get(\"ctx\").services;\n    return c.json({ items: await media.list() });\n  });\n\n  /** Where files are used, before a delete: `?path=a&path=b`. */\n  app.get(\"/usage\", async (c) => {\n    const { content } = c.get(\"ctx\").services;\n    const paths = cleanPaths(c.req.queries(\"path\") ?? []);\n    if (paths.length === 0) throw badRequest(\"Name at least one file.\");\n    return c.json(await content.mediaUses(paths));\n  });\n\n  app.post(\"/delete\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const parsed = deleteSchema.safeParse(await c.req.json().catch(() => null));\n    if (!parsed.success) throw badRequest(\"Expected a list of file paths.\");\n    const paths = mediaFilesOnly(cleanPaths(parsed.data.paths));\n\n    for (const path of paths) {\n      const owner = path.split(\"/\")[0] ?? \"\";\n      const readOnly = ctx.site.readOnly.get(`collections.${owner}`) ?? ctx.site.readOnly.get(`singletons.${owner}`);\n      if (readOnly) throw new ApiError(\"conflict\", readOnly);\n      if ((await ctx.services.media.read(path)) === null) throw notFound(`There is no file \"${path}\".`);\n    }\n\n    const { uses, unreadable } = await ctx.services.content.mediaUses(paths);\n    if (unreadable.length > 0) {\n      throw new ApiError(\"conflict\", `Mica cannot read ${unreadable.join(\", \")}, so it cannot tell whether these files are used.`);\n    }\n    const used = paths.filter((path) => (uses[path] ?? []).length > 0);\n    if (used.length > 0) throw new ApiError(\"conflict\", used.map((path) => describeUses(path, uses[path]!)).join(\" \"));\n\n    await ctx.site.contentRepository.apply({ changes: paths.map((path) => ({ type: \"delete\" as const, path })) });\n    ctx.logger.info(\"Deleted media\", { paths, editor: editorOf(c) });\n    return c.json({ deleted: paths });\n  });\n\n  app.post(\"/\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const form = await c.req.formData().catch(() => {\n      throw badRequest(\"Expected a multipart upload.\");\n    });\n\n    // The cast picks one of the two structurally different `File` types (Node's and undici's).\n    const files = form\n      .getAll(\"file\")\n      .filter((value) => typeof value !== \"string\") as unknown as File[];\n\n    if (files.length === 0) throw badRequest(\"No file was uploaded.\");\n    if (files.length > MAX_FILES_PER_UPLOAD) {\n      throw badRequest(`Upload at most ${MAX_FILES_PER_UPLOAD} files at a time.`);\n    }\n\n    const accept = form.get(\"accept\");\n    // An entry's own `media/` directory or the shared one; the media service refuses anything else.\n    const directory = typeof form.get(\"directory\") === \"string\" ? String(form.get(\"directory\")) : undefined;\n    // The media service accepts `/gallery/x/media` too; take the owner from the path it will write to.\n    const owner = (directory ?? \"\").replace(/^[/\\\\]+/, \"\").split(/[/\\\\]/)[0] ?? \"\";\n    const readOnly = ctx.site.readOnly.get(`collections.${owner}`) ?? ctx.site.readOnly.get(`singletons.${owner}`);\n    if (readOnly) throw new ApiError(\"conflict\", readOnly);\n    // A new entry uploads into the folder of the URL in its form; never into a saved entry's.\n    const folder = /^([^/]+)\\/([^/]+)\\/media$/.exec((directory ?? \"\").replace(/^\\/+/, \"\"));\n    if (form.get(\"newEntry\") === \"true\" && folder && ctx.site.model.collections[folder[1]!]) {\n      if ((await ctx.services.content.revisionOf(folder[1]!, folder[2]!)) !== null) {\n        throw new ApiError(\"conflict\", `Another entry already has the URL “${folder[2]}”. Change the URL, then upload.`);\n      }\n    }\n\n    const prepared = await Promise.all(\n      files.map((file) =>\n        ctx.services.media.prepare({\n          file,\n          directory,\n          accept: accept === \"image\" || accept === \"document\" ? accept : \"any\",\n        }),\n      ),\n    );\n\n    await ctx.site.contentRepository.apply({\n      changes: prepared.map((item) => ({\n        type: \"write\" as const,\n        path: item.file.path,\n        contents: item.contents,\n      })),\n    });\n\n    return c.json({ items: prepared.map((item) => item.file) }, 201);\n  });\n\n  /**\n   * Serves a file to the editor, behind the admin gate. The site build reads\n   * the repository, not this route.\n   */\n  app.get(\"/file/*\", async (c) => {\n    const { media } = c.get(\"ctx\").services;\n    const mediaPath = c.req.path.replace(/^.*\\/file\\//, \"\");\n\n    let decoded: string;\n    try {\n      decoded = decodeURIComponent(mediaPath);\n    } catch {\n      throw badRequest(\"The file path is not valid.\");\n    }\n\n    const found = await media.read(decoded);\n    if (!found) throw notFound(\"No such file.\");\n\n    return c.body(found.bytes as unknown as ArrayBuffer, 200, {\n      // Text without a charset is decoded by guessing; the repository's text is UTF-8.\n      \"content-type\": found.mimeType.startsWith(\"text/\") ? `${found.mimeType}; charset=utf-8` : found.mimeType,\n      \"cache-control\": \"private, max-age=60\",\n      // A file opened directly runs nothing and reaches nothing on this origin.\n      \"content-security-policy\": \"sandbox; default-src 'none'\",\n      // An image is shown as a preview; anything else is downloaded, never rendered here.\n      ...(isImageType(found.mimeType) ? {} : { \"content-disposition\": \"attachment\" }),\n    });\n  });\n\n  return app;\n}\n"]}

package/dist/routes/admin-staging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin-staging.d.ts","sourceRoot":"","sources":["../../src/routes/admin-staging.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAW,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AA4C/C,wBAAgB,kBAAkB,IAAI,IAAI,CAAC,GAAG,CAAC,CAuE9C"}
+{"version":3,"file":"admin-staging.d.ts","sourceRoot":"","sources":["../../src/routes/admin-staging.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAqB,KAAK,GAAG,EAAE,MAAM,YAAY,CAAC;AAiDzD,wBAAgB,kBAAkB,IAAI,IAAI,CAAC,GAAG,CAAC,CAiF9C"}

package/dist/routes/admin-staging.js

@@ -6,7 +6,7 @@
  */
 import { Hono } from "hono";
 import { z } from "zod";
-import { actorOf } from "../http.js";
+import { actorOf, editorOf } from "../http.js";
 import { ApiError, badRequest } from "../lib/errors.js";
 import { ConflictError } from "../workspace/files.js";
 const publishSchema = z.object({
@@ -45,11 +45,15 @@ async function handled(run) {
         throw error;
     }
 }
+/** Which model is in use, so that the editor can tell a stale form, and why a newer one is not. */
+function modelState(ctx) {
+    return { revision: ctx.site.schemaRevision, warning: ctx.site.modelWarning?.message ?? null };
+}
 export function adminStagingRoutes() {
     const app = new Hono();
     app.get("/changes", async (c) => {
-        const { staging } = c.get("ctx").services;
-        return c.json(await staging.status());
+        const ctx = c.get("ctx");
+        return c.json({ ...(await ctx.services.staging.status()), model: modelState(ctx) });
     });
     // Raw data before and after one pending change; the editor renders the comparison.
     app.get("/changes/compare", async (c) => {
@@ -67,6 +71,12 @@ export function adminStagingRoutes() {
         return c.json(await staging.compare(parsed.data, against));
     });
     app.post("/publish", async (c) => {
+        // Publish validates with the newest model, so a model change never needs a restart first.
+        await c.get("ctx").refreshModel({ force: true });
+        const warning = c.get("ctx").site.modelWarning;
+        if (warning) {
+            throw new ApiError("conflict", `The website's new content model cannot be read, so Mica cannot publish yet. Tell the developer: ${warning.message}`);
+        }
         const { staging } = c.get("ctx").services;
         const parsed = publishSchema.safeParse(await jsonBody(c));
         if (!parsed.success)
@@ -76,6 +86,7 @@ export function adminStagingRoutes() {
             message: parsed.data.message,
             paths: parsed.data.paths,
             author: actor ? { name: actor.name || actor.email, email: actor.email } : undefined,
+            editor: editorOf(c),
         }));
         return c.json(result);
     });
@@ -87,22 +98,22 @@ export function adminStagingRoutes() {
     app.post("/sync", async (c) => {
         const { staging } = c.get("ctx").services;
         await staging.sync();
-        return c.json(await staging.status());
+        return c.json({ ...(await staging.status()), model: modelState(c.get("ctx")) });
     });
     app.post("/changes/resolve", async (c) => {
         const { staging } = c.get("ctx").services;
         const parsed = resolveSchema.safeParse(await jsonBody(c));
         if (!parsed.success)
             throw badRequest("Expected a group and a choice: mine or website.");
-        await handled(() => staging.resolve(parsed.data.group, parsed.data.choice));
-        return c.json(await staging.status());
+        await handled(() => staging.resolve(parsed.data.group, parsed.data.choice, editorOf(c)));
+        return c.json({ ...(await staging.status()), model: modelState(c.get("ctx")) });
     });
     app.post("/changes/discard", async (c) => {
         const { staging } = c.get("ctx").services;
         const parsed = discardSchema.safeParse(await jsonBody(c));
         if (!parsed.success)
             throw badRequest("Expected a list of change paths.");
-        return c.json(await handled(() => staging.discard(parsed.data.paths)));
+        return c.json(await handled(() => staging.discard(parsed.data.paths, editorOf(c))));
     });
     return app;
 }

package/dist/routes/admin-staging.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin-staging.js","sourceRoot":"","sources":["../../src/routes/admin-staging.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Admin routes for the pending changes and Publish. Sync and conflict\n * resolution exist only for a clone that Mica keeps. `committed-pending-push`\n * is a 200: the commit is real, and an error status would tell the editor that\n * nothing happened.\n */\n\nimport { Hono } from \"hono\";\nimport { z } from \"zod\";\n\nimport { actorOf, type Env } from \"../http.js\";\nimport { ApiError, badRequest } from \"../lib/errors.js\";\nimport { ConflictError } from \"../workspace/files.js\";\n\nconst publishSchema = z.object({\n  message: z.string().max(500),\n  /** The reviewed paths, with the revision each had in the review. */\n  paths: z.record(z.string().min(1), z.string().nullable()),\n});\n\nconst resolveSchema = z.object({\n  group: z.string().min(1),\n  choice: z.enum([\"mine\", \"website\"]),\n});\n\nconst discardSchema = z.object({ paths: z.array(z.string().min(1)).min(1).max(2000) });\n\nconst compareSchema = z.discriminatedUnion(\"kind\", [\n  z.object({\n    kind: z.literal(\"entry\"),\n    collection: z.string().min(1),\n    slug: z.string().min(1),\n    from: z.string().min(1).optional(),\n  }),\n  z.object({ kind: z.literal(\"singleton\"), name: z.string().min(1) }),\n  z.object({ kind: z.literal(\"order\"), collection: z.string().min(1) }),\n]);\n\nasync function jsonBody(c: { req: { json(): Promise<unknown> } }): Promise<unknown> {\n  return c.req.json().catch(() => {\n    throw badRequest(\"The request body must be valid JSON.\");\n  });\n}\n\n/** A repository conflict is 409 and recoverable — refresh, review, retry. */\nasync function handled<T>(run: () => Promise<T>): Promise<T> {\n  try {\n    return await run();\n  } catch (error) {\n    if (error instanceof ConflictError) throw new ApiError(\"conflict\", error.message);\n    throw error;\n  }\n}\n\nexport function adminStagingRoutes(): Hono<Env> {\n  const app = new Hono<Env>();\n\n  app.get(\"/changes\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    return c.json(await staging.status());\n  });\n\n  // Raw data before and after one pending change; the editor renders the comparison.\n  app.get(\"/changes/compare\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = compareSchema.safeParse({\n      kind: c.req.query(\"kind\"),\n      collection: c.req.query(\"collection\"),\n      slug: c.req.query(\"slug\"),\n      from: c.req.query(\"from\"),\n      name: c.req.query(\"name\"),\n    });\n    if (!parsed.success) throw badRequest(\"The compare target is malformed.\");\n    const against = c.req.query(\"against\") === \"origin\" ? \"origin\" : \"head\";\n\n    return c.json(await staging.compare(parsed.data, against));\n  });\n\n  app.post(\"/publish\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = publishSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"The publish payload is malformed.\");\n\n    const actor = actorOf(c);\n    const result = await handled(() =>\n      staging.publish({\n        message: parsed.data.message,\n        paths: parsed.data.paths,\n        author: actor ? { name: actor.name || actor.email, email: actor.email } : undefined,\n      }),\n    );\n\n    return c.json(result);\n  });\n\n  app.post(\"/publish/push\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    return c.json(await handled(() => staging.push()));\n  });\n\n  // \"Try again\" after a sync error.\n  app.post(\"/sync\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    await staging.sync();\n    return c.json(await staging.status());\n  });\n\n  app.post(\"/changes/resolve\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = resolveSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"Expected a group and a choice: mine or website.\");\n\n    await handled(() => staging.resolve(parsed.data.group, parsed.data.choice));\n    return c.json(await staging.status());\n  });\n\n  app.post(\"/changes/discard\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = discardSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"Expected a list of change paths.\");\n\n    return c.json(await handled(() => staging.discard(parsed.data.paths)));\n  });\n\n  return app;\n}\n"]}
+{"version":3,"file":"admin-staging.js","sourceRoot":"","sources":["../../src/routes/admin-staging.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Admin routes for the pending changes and Publish. Sync and conflict\n * resolution exist only for a clone that Mica keeps. `committed-pending-push`\n * is a 200: the commit is real, and an error status would tell the editor that\n * nothing happened.\n */\n\nimport { Hono } from \"hono\";\nimport { z } from \"zod\";\n\nimport { actorOf, editorOf, type Env } from \"../http.js\";\nimport { ApiError, badRequest } from \"../lib/errors.js\";\nimport { ConflictError } from \"../workspace/files.js\";\n\nconst publishSchema = z.object({\n  message: z.string().max(500),\n  /** The reviewed paths, with the revision each had in the review. */\n  paths: z.record(z.string().min(1), z.string().nullable()),\n});\n\nconst resolveSchema = z.object({\n  group: z.string().min(1),\n  choice: z.enum([\"mine\", \"website\"]),\n});\n\nconst discardSchema = z.object({ paths: z.array(z.string().min(1)).min(1).max(2000) });\n\nconst compareSchema = z.discriminatedUnion(\"kind\", [\n  z.object({\n    kind: z.literal(\"entry\"),\n    collection: z.string().min(1),\n    slug: z.string().min(1),\n    from: z.string().min(1).optional(),\n  }),\n  z.object({ kind: z.literal(\"singleton\"), name: z.string().min(1) }),\n  z.object({ kind: z.literal(\"order\"), collection: z.string().min(1) }),\n]);\n\nasync function jsonBody(c: { req: { json(): Promise<unknown> } }): Promise<unknown> {\n  return c.req.json().catch(() => {\n    throw badRequest(\"The request body must be valid JSON.\");\n  });\n}\n\n/** A repository conflict is 409 and recoverable — refresh, review, retry. */\nasync function handled<T>(run: () => Promise<T>): Promise<T> {\n  try {\n    return await run();\n  } catch (error) {\n    if (error instanceof ConflictError) throw new ApiError(\"conflict\", error.message);\n    throw error;\n  }\n}\n\n/** Which model is in use, so that the editor can tell a stale form, and why a newer one is not. */\nfunction modelState(ctx: Env[\"Variables\"][\"ctx\"]) {\n  return { revision: ctx.site.schemaRevision, warning: ctx.site.modelWarning?.message ?? null };\n}\n\nexport function adminStagingRoutes(): Hono<Env> {\n  const app = new Hono<Env>();\n\n  app.get(\"/changes\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    return c.json({ ...(await ctx.services.staging.status()), model: modelState(ctx) });\n  });\n\n  // Raw data before and after one pending change; the editor renders the comparison.\n  app.get(\"/changes/compare\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = compareSchema.safeParse({\n      kind: c.req.query(\"kind\"),\n      collection: c.req.query(\"collection\"),\n      slug: c.req.query(\"slug\"),\n      from: c.req.query(\"from\"),\n      name: c.req.query(\"name\"),\n    });\n    if (!parsed.success) throw badRequest(\"The compare target is malformed.\");\n    const against = c.req.query(\"against\") === \"origin\" ? \"origin\" : \"head\";\n\n    return c.json(await staging.compare(parsed.data, against));\n  });\n\n  app.post(\"/publish\", async (c) => {\n    // Publish validates with the newest model, so a model change never needs a restart first.\n    await c.get(\"ctx\").refreshModel({ force: true });\n    const warning = c.get(\"ctx\").site.modelWarning;\n    if (warning) {\n      throw new ApiError(\n        \"conflict\",\n        `The website's new content model cannot be read, so Mica cannot publish yet. Tell the developer: ${warning.message}`,\n      );\n    }\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = publishSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"The publish payload is malformed.\");\n\n    const actor = actorOf(c);\n    const result = await handled(() =>\n      staging.publish({\n        message: parsed.data.message,\n        paths: parsed.data.paths,\n        author: actor ? { name: actor.name || actor.email, email: actor.email } : undefined,\n        editor: editorOf(c),\n      }),\n    );\n\n    return c.json(result);\n  });\n\n  app.post(\"/publish/push\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    return c.json(await handled(() => staging.push()));\n  });\n\n  // \"Try again\" after a sync error.\n  app.post(\"/sync\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    await staging.sync();\n    return c.json({ ...(await staging.status()), model: modelState(c.get(\"ctx\")) });\n  });\n\n  app.post(\"/changes/resolve\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = resolveSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"Expected a group and a choice: mine or website.\");\n\n    await handled(() => staging.resolve(parsed.data.group, parsed.data.choice, editorOf(c)));\n    return c.json({ ...(await staging.status()), model: modelState(c.get(\"ctx\")) });\n  });\n\n  app.post(\"/changes/discard\", async (c) => {\n    const { staging } = c.get(\"ctx\").services;\n    const parsed = discardSchema.safeParse(await jsonBody(c));\n    if (!parsed.success) throw badRequest(\"Expected a list of change paths.\");\n\n    return c.json(await handled(() => staging.discard(parsed.data.paths, editorOf(c))));\n  });\n\n  return app;\n}\n"]}

package/dist/routes/admin-system.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin-system.d.ts","sourceRoot":"","sources":["../../src/routes/admin-system.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAMtC,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAAC,CAkI7C"}
+{"version":3,"file":"admin-system.d.ts","sourceRoot":"","sources":["../../src/routes/admin-system.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAMtC,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,GAAG,CAAC,CAsI7C"}

package/dist/routes/admin-system.js

@@ -34,6 +34,8 @@ export function adminSystemRoutes() {
                 fields: def.fields,
                 readOnly: site.readOnly.get(`singletons.${def.name}`) ?? null,
             })),
+            /** Which model this is, so that a page can tell that a newer one is in use. */
+            revision: site.schemaRevision,
         });
     });
     app.get("/overview", async (c) => {
@@ -87,6 +89,8 @@ export function adminSystemRoutes() {
                     entries: counts[item.name] ?? 0,
                 })),
                 singletons: stats.singletons,
+                /** Why a newer model in the working tree is not in use, or null. */
+                warning: ctx.site.modelWarning?.message ?? null,
             },
             repository: {
                 origin: ctx.site.contentRepository.origin,

package/dist/routes/admin-system.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin-system.js","sourceRoot":"","sources":["../../src/routes/admin-system.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGlF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,UAAU,iBAAiB;IAC/B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAO,CAAC;IAE5B,wFAAwF;IACxF,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;QACvB,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE9B,OAAO,CAAC,CAAC,IAAI,CAAC;YACZ,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC/D,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,aAAa,EAAE,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,KAAK;gBAC7C,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,IAAI;gBACpC,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,KAAK;gBAC/B,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,IAAI;gBACpC,UAAU,EAAE,iBAAiB,CAAC,GAAG,CAAC;gBAClC,SAAS,EAAE,gBAAgB,CAAC,GAAG,CAAC;gBAChC,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC;gBAC/B,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,eAAe,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,IAAI;aAC/D,CAAC,CAAC;YACH,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC7D,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,WAAW,EAAE,GAAG,CAAC,WAAW,IAAI,IAAI;gBACpC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,IAAI;aAC9D,CAAC,CAAC;SACJ,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC/B,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,QAAQ,CAAC;QAExC,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC5D,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,KAAK,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;SAC7C,CAAC,CAAC,CACJ,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QAEjC,OAAO,CAAC,CAAC,IAAI,CAAC;YACZ,WAAW;YACX,KAAK,EAAE;gBACL,KAAK,EAAE,KAAK,CAAC,MAAM;gBACnB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtD,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aACvE;YACD,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM;SAC9C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH;;;OAGG;IACH,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7B,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;QAEvB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAC/B,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,GAAG,CAC3C,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAU,CACvF,CACF,CACF,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAC9C,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAEnE,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QAE3D,OAAO,CAAC,CAAC,IAAI,CAAC;YACZ,GAAG,EAAE;gBACH,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,MAAM,CAAC,QAAQ;gBAC5B,IAAI,EAAE,OAAO,CAAC,OAAO;gBACrB,QAAQ,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE;gBAC/C,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE;gBACpE,aAAa;aACd;YACD,MAAM,EAAE;gBACN,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC5C,GAAG,IAAI;oBACP,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;iBAChC,CAAC,CAAC;gBACH,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B;YACD,UAAU,EAAE;gBACV,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM;gBACzC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,EAAE,CAAC,CAAC;gBACrE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,EAAE;gBACpF,GAAG,UAAU;aACd;YACD,UAAU,EAAE;gBACV,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACjB,OAAO,EAAE,MAAM,CAAC,eAAe;gBAC/B,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACtD,wEAAwE;gBACxE,WAAW,EAAE,UAAU,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;gBACzE,OAAO,EAAE,WAAW,CAAC,OAAO,IAAI,IAAI;gBACpC,QAAQ,EAAE,MAAM,CAAC,cAAc;gBAC/B,cAAc,EAAE,MAAM,CAAC,qBAAqB;gBAC5C,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,qBAAqB,CAAC;gBAC5D,eAAe,EAAE,WAAW,CAAC,eAAe,IAAI,IAAI;gBACpD,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,IAAI,IAAI;gBACtD,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,IAAI;gBACxC,UAAU,EAAE,MAAM,CAAC,gBAAgB;gBACnC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB,IAAI,EAAE;gBACpD,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG;aACvC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC","sourcesContent":["/**\n * Schema, dashboard and system information. The SPA knows no collection; it\n * renders what `/schema` returns.\n */\n\nimport { Hono } from \"hono\";\n\nimport { listedFields, resolveSlugField, resolveTitleField } from \"@micacms/core\";\n\nimport type { Env } from \"../http.js\";\nimport { schemaStats } from \"../lib/schema-stats.js\";\nimport { schemaOrigin } from \"../schema.js\";\nimport { VERSION } from \"../lib/version.js\";\nimport { formatBytes } from \"../services/media.js\";\n\nexport function adminSystemRoutes(): Hono<Env> {\n  const app = new Hono<Env>();\n\n  /** The content model, plus the derived values that the UI would otherwise recompute. */\n  app.get(\"/schema\", (c) => {\n    const { site } = c.get(\"ctx\");\n\n    return c.json({\n      collections: Object.values(site.model.collections).map((def) => ({\n        name: def.name,\n        label: def.label,\n        labelSingular: def.labelSingular ?? def.label,\n        description: def.description ?? null,\n        sortable: def.sortable ?? false,\n        defaultSort: def.defaultSort ?? null,\n        titleField: resolveTitleField(def),\n        slugField: resolveSlugField(def),\n        listedFields: listedFields(def),\n        fields: def.fields,\n        readOnly: site.readOnly.get(`collections.${def.name}`) ?? null,\n      })),\n      singletons: Object.values(site.model.singletons).map((def) => ({\n        name: def.name,\n        label: def.label,\n        description: def.description ?? null,\n        fields: def.fields,\n        readOnly: site.readOnly.get(`singletons.${def.name}`) ?? null,\n      })),\n    });\n  });\n\n  app.get(\"/overview\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const { content, media } = ctx.services;\n\n    const collections = await Promise.all(\n      Object.values(ctx.site.model.collections).map(async (def) => ({\n        name: def.name,\n        label: def.label,\n        total: (await content.list(def.name)).length,\n      })),\n    );\n\n    const files = await media.list();\n\n    return c.json({\n      collections,\n      media: {\n        files: files.length,\n        bytes: files.reduce((sum, file) => sum + file.size, 0),\n        readable: formatBytes(files.reduce((sum, file) => sum + file.size, 0)),\n      },\n      repository: ctx.site.contentRepository.origin,\n    });\n  });\n\n  /**\n   * What this deployment is and serves. Every admitted editor sees it, because\n   * there is no administrator role. It never returns a secret value.\n   */\n  app.get(\"/system\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const { config } = ctx;\n\n    const stats = schemaStats(ctx.site.model);\n\n    const counts = Object.fromEntries(\n      await Promise.all(\n        Object.values(ctx.site.model.collections).map(\n          async (def) => [def.name, (await ctx.services.content.list(def.name)).length] as const,\n        ),\n      ),\n    );\n\n    const files = await ctx.services.media.list();\n    const mediaBytes = files.reduce((sum, file) => sum + file.size, 0);\n\n    const uptimeSeconds = Math.floor(process.uptime());\n\n    const operational = ctx.operational();\n    const repository = await ctx.services.staging.repository();\n\n    return c.json({\n      cms: {\n        version: VERSION,\n        environment: config.NODE_ENV,\n        node: process.version,\n        platform: `${process.platform}/${process.arch}`,\n        startedAt: new Date(Date.now() - uptimeSeconds * 1000).toISOString(),\n        uptimeSeconds,\n      },\n      schema: {\n        totals: stats.totals,\n        kinds: stats.kinds,\n        relations: stats.relations,\n        collections: stats.collections.map((item) => ({\n          ...item,\n          entries: counts[item.name] ?? 0,\n        })),\n        singletons: stats.singletons,\n      },\n      repository: {\n        origin: ctx.site.contentRepository.origin,\n        entries: Object.values(counts).reduce((sum, count) => sum + count, 0),\n        media: { files: files.length, bytes: mediaBytes, readable: formatBytes(mediaBytes) },\n        ...repository,\n      },\n      deployment: {\n        site: ctx.site.id,\n        baseUrl: config.MICA_PUBLIC_URL,\n        schemaOrigin: schemaOrigin(ctx.site.contentRepository),\n        // A clone that Mica keeps names its remote in `repository.url` instead.\n        contentRoot: repository.owner === \"developer\" ? config.contentRoot : null,\n        dataDir: operational.dataDir ?? null,\n        logLevel: config.MICA_LOG_LEVEL,\n        maxUploadBytes: config.MICA_MAX_UPLOAD_BYTES,\n        maxUploadReadable: formatBytes(config.MICA_MAX_UPLOAD_BYTES),\n        sessionTtlHours: operational.sessionTtlHours ?? null,\n        sessionIdleHours: operational.sessionIdleHours ?? null,\n        auth: operational.auth,\n        admission: operational.admission ?? null,\n        trustProxy: config.MICA_TRUST_PROXY,\n        adminOrigins: config.adminOrigins,\n        generatedSecrets: operational.generatedSecrets ?? [],\n        memoryBytes: process.memoryUsage().rss,\n      },\n    });\n  });\n\n  return app;\n}\n"]}
+{"version":3,"file":"admin-system.js","sourceRoot":"","sources":["../../src/routes/admin-system.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Schema, dashboard and system information. The SPA knows no collection; it\n * renders what `/schema` returns.\n */\n\nimport { Hono } from \"hono\";\n\nimport { listedFields, resolveSlugField, resolveTitleField } from \"@micacms/core\";\n\nimport type { Env } from \"../http.js\";\nimport { schemaStats } from \"../lib/schema-stats.js\";\nimport { schemaOrigin } from \"../schema.js\";\nimport { VERSION } from \"../lib/version.js\";\nimport { formatBytes } from \"../services/media.js\";\n\nexport function adminSystemRoutes(): Hono<Env> {\n  const app = new Hono<Env>();\n\n  /** The content model, plus the derived values that the UI would otherwise recompute. */\n  app.get(\"/schema\", (c) => {\n    const { site } = c.get(\"ctx\");\n\n    return c.json({\n      collections: Object.values(site.model.collections).map((def) => ({\n        name: def.name,\n        label: def.label,\n        labelSingular: def.labelSingular ?? def.label,\n        description: def.description ?? null,\n        sortable: def.sortable ?? false,\n        defaultSort: def.defaultSort ?? null,\n        titleField: resolveTitleField(def),\n        slugField: resolveSlugField(def),\n        listedFields: listedFields(def),\n        fields: def.fields,\n        readOnly: site.readOnly.get(`collections.${def.name}`) ?? null,\n      })),\n      singletons: Object.values(site.model.singletons).map((def) => ({\n        name: def.name,\n        label: def.label,\n        description: def.description ?? null,\n        fields: def.fields,\n        readOnly: site.readOnly.get(`singletons.${def.name}`) ?? null,\n      })),\n      /** Which model this is, so that a page can tell that a newer one is in use. */\n      revision: site.schemaRevision,\n    });\n  });\n\n  app.get(\"/overview\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const { content, media } = ctx.services;\n\n    const collections = await Promise.all(\n      Object.values(ctx.site.model.collections).map(async (def) => ({\n        name: def.name,\n        label: def.label,\n        total: (await content.list(def.name)).length,\n      })),\n    );\n\n    const files = await media.list();\n\n    return c.json({\n      collections,\n      media: {\n        files: files.length,\n        bytes: files.reduce((sum, file) => sum + file.size, 0),\n        readable: formatBytes(files.reduce((sum, file) => sum + file.size, 0)),\n      },\n      repository: ctx.site.contentRepository.origin,\n    });\n  });\n\n  /**\n   * What this deployment is and serves. Every admitted editor sees it, because\n   * there is no administrator role. It never returns a secret value.\n   */\n  app.get(\"/system\", async (c) => {\n    const ctx = c.get(\"ctx\");\n    const { config } = ctx;\n\n    const stats = schemaStats(ctx.site.model);\n\n    const counts = Object.fromEntries(\n      await Promise.all(\n        Object.values(ctx.site.model.collections).map(\n          async (def) => [def.name, (await ctx.services.content.list(def.name)).length] as const,\n        ),\n      ),\n    );\n\n    const files = await ctx.services.media.list();\n    const mediaBytes = files.reduce((sum, file) => sum + file.size, 0);\n\n    const uptimeSeconds = Math.floor(process.uptime());\n\n    const operational = ctx.operational();\n    const repository = await ctx.services.staging.repository();\n\n    return c.json({\n      cms: {\n        version: VERSION,\n        environment: config.NODE_ENV,\n        node: process.version,\n        platform: `${process.platform}/${process.arch}`,\n        startedAt: new Date(Date.now() - uptimeSeconds * 1000).toISOString(),\n        uptimeSeconds,\n      },\n      schema: {\n        totals: stats.totals,\n        kinds: stats.kinds,\n        relations: stats.relations,\n        collections: stats.collections.map((item) => ({\n          ...item,\n          entries: counts[item.name] ?? 0,\n        })),\n        singletons: stats.singletons,\n        /** Why a newer model in the working tree is not in use, or null. */\n        warning: ctx.site.modelWarning?.message ?? null,\n      },\n      repository: {\n        origin: ctx.site.contentRepository.origin,\n        entries: Object.values(counts).reduce((sum, count) => sum + count, 0),\n        media: { files: files.length, bytes: mediaBytes, readable: formatBytes(mediaBytes) },\n        ...repository,\n      },\n      deployment: {\n        site: ctx.site.id,\n        baseUrl: config.MICA_PUBLIC_URL,\n        schemaOrigin: schemaOrigin(ctx.site.contentRepository),\n        // A clone that Mica keeps names its remote in `repository.url` instead.\n        contentRoot: repository.owner === \"developer\" ? config.contentRoot : null,\n        dataDir: operational.dataDir ?? null,\n        logLevel: config.MICA_LOG_LEVEL,\n        maxUploadBytes: config.MICA_MAX_UPLOAD_BYTES,\n        maxUploadReadable: formatBytes(config.MICA_MAX_UPLOAD_BYTES),\n        sessionTtlHours: operational.sessionTtlHours ?? null,\n        sessionIdleHours: operational.sessionIdleHours ?? null,\n        auth: operational.auth,\n        admission: operational.admission ?? null,\n        trustProxy: config.MICA_TRUST_PROXY,\n        adminOrigins: config.adminOrigins,\n        generatedSecrets: operational.generatedSecrets ?? [],\n        memoryBytes: process.memoryUsage().rss,\n      },\n    });\n  });\n\n  return app;\n}\n"]}

package/dist/services/changes.d.ts

@@ -2,6 +2,7 @@
 import type { Author } from "../workspace/files.js";
 import { type ContentChange, type ContentSource, type FieldIssue, type PublishResult, type Site } from "@micacms/core";
 import type { SyncStatus } from "../workspace/policy.js";
+import type { UnpushedCommits } from "../workspace/tree.js";
 /** Where the change happened, in words an editor recognises. */
 export type ChangeOwner = {
     kind: "entry";
@@ -32,6 +33,13 @@ export interface AnnotatedChange extends ContentChange {
      * saved after the review is not published unseen.
      */
     revision?: string | null;
+    /** When the file was last saved, for "changed 2 hours ago". Null for a deletion. */
+    savedAt?: string | null;
+    /**
+     * New pending files that this document uses (a linked entry, an image), so
+     * that it cannot be published without them. On the document's data file.
+     */
+    needs?: string[];
 }
 /** One thing that would make the staged result unpublishable. */
 export interface StagingProblem {
@@ -55,8 +63,12 @@ export interface StagingStatus {
     head: string | null;
     /** The branch a publication lands on, where the workspace knows it. */
     branch: string | null;
-    /** Commits created and not yet pushed. */
-    ahead: number | null;
+    /**
+     * Commits that no remote has, in the developer's checkout: Mica's waits for a
+     * retry, another one blocks Publish. Null for a clone that Mica keeps, or
+     * without a remote.
+     */
+    unpushed: UnpushedCommits | null;
     changes: AnnotatedChange[];
     validation: StagingValidation;
     /** Where a clone that Mica keeps stands against its remote. Null for the developer's checkout. */
@@ -72,6 +84,8 @@ export interface PublishInput {
      */
     paths: Record<string, string | null>;
     author?: Author;
+    /** Who published, for the log. */
+    editor?: string;
 }
 /** What the System page shows about the repository. */
 export interface RepositoryInfo {
@@ -86,7 +100,8 @@ export interface RepositoryInfo {
 export interface ContentStagingService {
     status(): Promise<StagingStatus>;
     publish(input: PublishInput): Promise<PublishResult>;
-    discard(paths: string[]): Promise<{
+    /** `editor` names who discarded, for the log. */
+    discard(paths: string[], editor?: string): Promise<{
         discarded: string[];
     }>;
     /** Retries the push after `committed-pending-push`. */
@@ -98,7 +113,7 @@ export interface ContentStagingService {
     compare(target: CompareTarget, against?: "head" | "origin"): Promise<Comparison>;
     /** Brings a clone that Mica keeps up to date now. Refused for the developer's checkout. */
     sync(): Promise<void>;
-    resolve(group: string, choice: "mine" | "website"): Promise<void>;
+    resolve(group: string, choice: "mine" | "website", editor?: string): Promise<void>;
     repository(): Promise<RepositoryInfo>;
 }
 /** What to compare on the Publish page. */

package/dist/services/changes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changes.d.ts","sourceRoot":"","sources":["../../src/services/changes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"changes.d.ts","sourceRoot":"","sources":["../../src/services/changes.ts"],"names":[],"mappings":"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"}

package/dist/services/changes.js

@@ -87,6 +87,21 @@ published) {
     if (published) {
         await detectRenames(model, published, source, changes, owners, entriesByCollection);
     }
+    const created = new Set(changes.filter((change) => change.kind === "create").map((change) => change.path));
+    const needsByPath = new Map();
+    /** How to read each changed document as the website has it, by its data file. */
+    const publishedOf = new Map();
+    const addNeeds = (dataPath, fields, data) => {
+        const needed = new Set();
+        for (const reference of collectReferences(fields, data)) {
+            const def = reference.kind === "relation" ? model.collections[reference.collection] : undefined;
+            const path = reference.kind === "media" ? reference.path : def ? entryDataPath(def, reference.collection, reference.slug) : null;
+            if (path && path !== dataPath && created.has(path))
+                needed.add(path);
+        }
+        if (needed.size > 0)
+            needsByPath.set(dataPath, [...needed]);
+    };
     const validated = new Set();
     const targets = createReferenceCheck(model, source, (name) => {
         const entries = entriesByCollection.get(name);
@@ -103,6 +118,11 @@ published) {
             const data = entriesByCollection.get(owner.collection)?.get(owner.slug);
             if (!data)
                 continue;
+            addNeeds(entryDataPath(def, owner.collection, owner.slug), def.fields, data);
+            if (published) {
+                const { collection, slug } = owner;
+                publishedOf.set(entryDataPath(def, collection, slug), () => readCollectionEntry(published, def, collection, slug).catch(() => null));
+            }
             const result = validateFields(def.fields, data);
             const issues = [...(result.ok ? [] : result.issues), ...(await targets.issues(def.fields, data))];
             if (issues.length > 0) {
@@ -121,6 +141,13 @@ published) {
                 const data = await readSingleton(source, def, owner.name);
                 if (data === null)
                     continue;
+                // The data file, not the folder: a folder-layout singleton's change is `<name>/index.json`.
+                const dataFile = entryLayout(def.fields) === "directory" ? `${dataPath}/index.json` : dataPath;
+                addNeeds(dataFile, def.fields, data);
+                if (published) {
+                    const name = owner.name;
+                    publishedOf.set(dataFile, () => readSingleton(published, def, name).catch(() => null));
+                }
                 const result = validateFields(def.fields, data);
                 const issues = [...(result.ok ? [] : result.issues), ...(await targets.issues(def.fields, data))];
                 if (issues.length > 0)
@@ -135,23 +162,55 @@ published) {
             }
         }
     }
+    // A URL change and the links that follow it are published together, both ways. A
+    // document follows when the website's version of it links to the old URL; a new
+    // draft that links to the new URL only needs the change, and does not hold it back.
+    const renamed = new Map(owners.flatMap((owner) => owner.kind === "entry" && owner.renamedFrom
+        ? [[entryDataPath(model.collections[owner.collection], owner.collection, owner.slug), owner]]
+        : []));
+    for (const [document, needed] of [...needsByPath]) {
+        for (const path of needed) {
+            const target = renamed.get(path);
+            if (!target || target.kind !== "entry")
+                continue;
+            const before = await publishedOf.get(document)?.();
+            const fields = before && fieldsOfDocument(model, document);
+            const linkedBefore = before &&
+                fields &&
+                collectReferences(fields, before).some((reference) => reference.kind === "relation" && reference.collection === target.collection && reference.slug === target.renamedFrom);
+            if (linkedBefore)
+                needsByPath.set(path, [...new Set([...(needsByPath.get(path) ?? []), document])]);
+        }
+    }
     problems.push(...(await brokenByRemoval(model, source, changes, owners, entriesByCollection, titles)));
     const annotated = changes.map((change, index) => {
         const owner = owners[index];
+        const needs = needsByPath.get(change.path);
+        const extra = needs ? { needs } : {};
         if (owner.kind === "entry") {
             const def = model.collections[owner.collection];
             return {
                 ...change,
+                ...extra,
                 owner: { ...owner, label: labelEntry(def, owner.slug, titles.get(`${owner.collection}/${owner.slug}`)) },
             };
         }
-        return { ...change, owner };
+        return { ...change, ...extra, owner };
     });
     return {
         changes: annotated,
         validation: { ok: problems.length === 0, problems },
     };
 }
+/** The fields of the entry or singleton whose data file is `path`. */
+function fieldsOfDocument(model, path) {
+    const owner = classifyPath(model, path);
+    if (owner.kind === "entry")
+        return model.collections[owner.collection]?.fields ?? null;
+    if (owner.kind === "singleton")
+        return model.singletons[owner.name]?.fields ?? null;
+    return null;
+}
 /** Which piece of content a file belongs to, read from the model's path layout. */
 export function classifyPath(model, path) {
     const segments = path.split("/");