@drawnagency/primitives 0.1.109 → 0.1.111

package/src/lib/pages.ts

@@ -71,8 +71,14 @@ export function setHomePage(index: SiteIndex, pageId: string): SiteIndex {
   const current = homePage(index);
   if (current.id === pageId) return index;
   if (!pageById(index, pageId)) return index;
-  const existingSlugs = index.pages.map((p) => p.slug);
-  const demotedSlug = uniquePageSlug(slugifyPageSlug(current.title) || "home", existingSlugs.filter((s) => s !== ""));
+  // Neither side of the swap counts against the other: the promoted page's slug
+  // is about to become "" and the demoted one's is about to be replaced, so
+  // leaving them in gave the demoted page a "-2" suffix it did not need.
+  const takenSlugs = index.pages
+    .filter((p) => p.id !== pageId && p.id !== current.id)
+    .map((p) => p.slug)
+    .filter((s) => s !== "");
+  const demotedSlug = uniquePageSlug(slugifyPageSlug(current.title) || "home", takenSlugs);
   return mapPages(index, (p) => {
     if (p.id === pageId) return { ...p, isHome: true, slug: "" };
     if (p.id === current.id) return { ...p, isHome: false, slug: demotedSlug };
@@ -167,10 +173,15 @@ export function addSectionToPage(
   meta: SectionMeta,
   insertIndex: number,
 ): SiteIndex {
+  // Strip any existing occurrence first. page.order and sections{} must
+  // partition exactly, and re-adding an id that already sits in some page's
+  // order produced a duplicate that IndexSchema rejects at save time — far from
+  // the call that caused it.
   const pages = index.pages.map((p) => {
-    if (p.id !== pageId) return p;
-    const order = [...p.order];
-    order.splice(insertIndex, 0, sectionId);
+    const without = p.order.includes(sectionId) ? p.order.filter((id) => id !== sectionId) : p.order;
+    if (p.id !== pageId) return without === p.order ? p : { ...p, order: without };
+    const order = [...without];
+    order.splice(Math.min(insertIndex, order.length), 0, sectionId);
     return { ...p, order };
   });
   return { ...index, pages, sections: { ...index.sections, [sectionId]: meta } };
@@ -239,6 +250,7 @@ export function reorderVisibleSectionInPage(
   const fromId = visibleIds[fromIndex];
   if (fromId === undefined) return index;
   const withoutFrom = visibleIds.filter((id) => id !== fromId);
+  let changed = false;
   const pages = index.pages.map((p) => {
     if (p.id !== pageId) return p;
     const fromPos = p.order.indexOf(fromId);
@@ -246,9 +258,15 @@ export function reorderVisibleSectionInPage(
     const order = [...p.order];
     order.splice(fromPos, 1);
     order.splice(visibleInsertPosition(order, withoutFrom, toIndex), 0, fromId);
+    // A drop back onto the section's own slot resolves to the position it
+    // already held. Handing back a fresh object anyway defeated the caller's
+    // reference-based no-op check (applyBlockMove), so an inert drop armed a
+    // dirty index and a save.
+    if (order.length === p.order.length && order.every((id, i) => id === p.order[i])) return p;
+    changed = true;
     return { ...p, order };
   });
-  return { ...index, pages };
+  return changed ? { ...index, pages } : index;
 }
 
 export function moveSection(

package/src/lib/registry.ts

@@ -260,7 +260,10 @@ export function createRegistry(): SectionRegistry {
   return {
     registerSection(def) {
       sections.set(def.type, def);
+      // Clear on re-registration without the field: a stale entry would keep
+      // telling the server-side sanitizer to treat a plain field as rich text.
       if (def.richTextFields) richText.set(def.type, def.richTextFields);
+      else richText.delete(def.type);
     },
     registerSchema(type, schema) {
       schemas.set(type, schema);

package/src/lib/sanitize.ts

@@ -40,6 +40,15 @@ export function sanitizeHtml(html: string): string {
   return clean;
 }
 
+/**
+ * True when `sanitizeHtml` will actually sanitize. On the server DOMPurify never
+ * loads and never will, so callers there are on their own (core's sanitize-server
+ * covers the SSR viewer path); this reports ready so SSR output is unchanged.
+ */
+export function isSanitizerReady(): boolean {
+  return typeof window === "undefined" || purifier !== null;
+}
+
 /**
  * Await this during component mount (e.g. useEffect) to guarantee
  * DOMPurify is loaded before `sanitizeHtml` is called.

package/src/lib/timestamp.ts

@@ -12,15 +12,20 @@ export function formatDate(iso: string): string {
 
 export function formatDateTime(iso: string): string {
   const date = new Date(iso);
+  // UTC-pinned like its two siblings: without it the server (UTC) and the client
+  // (local) render different values for the same timestamp, which is a hydration
+  // mismatch wherever this reaches SSR output.
   const datePart = date.toLocaleDateString("en-US", {
     month: "short",
     day: "numeric",
     year: "numeric",
+    timeZone: "UTC",
   });
   const timePart = date.toLocaleTimeString("en-US", {
     hour: "numeric",
     minute: "2-digit",
     hour12: true,
+    timeZone: "UTC",
   });
   return `${datePart} | ${timePart}`;
 }

package/src/media/queue.ts

@@ -118,6 +118,10 @@ export class ProcessingQueue {
           height: msg.height,
         };
         this.options.onEvent({ type: "complete", item: { ...item } });
+        // The event above carries the only reference anyone reads. Holding ours
+        // pinned every variant Blob of every completed upload — the full decoded
+        // output of the whole session — for the queue's lifetime.
+        delete item.result;
         this.cleanupWorker(id, worker);
         this.processNext();
       } else if (msg.type === "error") {

package/src/media/resolve.ts

@@ -37,6 +37,19 @@ export function resolveManifestReferences(
     if (typeof obj.imageId === "string") {
       const manifestItem = manifest.images[obj.imageId];
       const resolved = resolveMedia({ imageId: obj.imageId }, manifest, sizes, provider);
+      // Recurse into this object's own values first. Returning straight from
+      // here left any ref nested INSIDE a ref-carrying object unresolved.
+      const base: Record<string, unknown> = {};
+      for (const [key, value] of Object.entries(obj)) {
+        base[key] = resolveManifestReferences(value, manifest, sizes, provider);
+      }
+      if (!resolved) {
+        // The item is gone from the manifest. Drop the baked fields instead of
+        // leaving the previous item's `src` pointing at an asset that no longer
+        // exists — a deleted image kept rendering until someone hit the 404.
+        for (const key of BAKED_MEDIA_KEYS) delete base[key];
+        return { ...base, alt: manifestItem?.alt ?? "" };
+      }
       const patch: Record<string, unknown> = {
         alt: manifestItem?.alt ?? "",
       };
@@ -55,7 +68,7 @@ export function resolveManifestReferences(
         patch.width = resolved.width;
         patch.height = resolved.height;
       }
-      return { ...obj, ...patch };
+      return { ...base, ...patch };
     }
 
     // Recurse into all values

package/src/media/utils.ts

@@ -57,7 +57,9 @@ export function displayFilename(originalName: string, mimeType: string): string
   const ext = MIME_TO_EXT[mimeType];
   if (!ext) return originalName;
   const suffix = `.${ext}`;
-  if (originalName.endsWith(suffix)) return originalName;
+  // Case-insensitively: extensions come off the user's filesystem, so a
+  // case-sensitive check rendered "Logo.PNG" as "Logo.PNG.png".
+  if (originalName.toLowerCase().endsWith(suffix)) return originalName;
   return `${originalName}${suffix}`;
 }
 

package/src/media/videoPoster.ts

@@ -34,7 +34,7 @@ export function generateVideoPoster(
     video.src = url;
 
     video.addEventListener("loadeddata", () => {
-      video.addEventListener("seeked", () => {
+      const capture = () => {
         if (settled) return;
         try {
           const w = video.videoWidth;
@@ -67,8 +67,19 @@ export function generateVideoPoster(
         } catch (err) {
           safeReject(err instanceof Error ? err : new Error(String(err)));
         }
-      }, { once: true });
-      video.currentTime = isFinite(video.duration) ? Math.min(0.1, video.duration / 2) : 0;
+      };
+
+      const target = isFinite(video.duration) ? Math.min(0.1, video.duration / 2) : 0;
+      // Assigning currentTime a value it ALREADY holds fires no `seeked` — the
+      // common case for a 0-duration or already-at-0 decode. Waiting for the
+      // event then stalled the full 10s timeout, and the rejection that followed
+      // is what produced a 0x0 media item.
+      if (video.currentTime === target) {
+        capture();
+        return;
+      }
+      video.addEventListener("seeked", capture, { once: true });
+      video.currentTime = target;
     }, { once: true });
   });
 }

package/src/schemas/audience.ts

@@ -70,11 +70,19 @@ export type ViewerCredential = z.infer<typeof ViewerCredentialSchema>;
 /**
  * Convert a friendly display string into an audience slug.
  * Lowercases, replaces non-alphanumeric runs with single dashes,
- * strips leading/trailing dashes. Result must pass AudienceNameSchema.
+ * strips leading/trailing dashes, truncates to the schema's 32-char max.
+ * Result must pass AudienceNameSchema.
+ *
+ * Kept byte-for-byte equivalent to @drawnagency/platform's copy
+ * (src/slugify.ts) — change both together.
  */
 export function slugifyAudienceName(input: string): string {
   return input
     .toLowerCase()
     .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+|-+$/g, "");
+    .replace(/^-+|-+$/g, "")
+    // Trim the trailing separator again: slicing can land mid-word and leave
+    // one, which AudienceNameSchema forbids as a final character.
+    .slice(0, 32)
+    .replace(/-+$/g, "");
 }

package/src/schemas/sections.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { getAllSchemas } from "../lib/registry";
+import { getAllSchemas, getSchema } from "../lib/registry";
 import { LayoutEnvelopeSchema, type LayoutEnvelope } from "./block";
 
 export interface SectionContent<C = Record<string, unknown>> {
@@ -26,3 +26,25 @@ export function getSectionSchema(): z.ZodType<Section> {
     .object({ id: z.string(), layout: LayoutEnvelopeSchema.optional() })
     .and(getSectionContentSchema()) as z.ZodType<Section>;
 }
+
+/**
+ * The single-type equivalent of `getSectionSchema()`, for callers that already
+ * know a section's `type`. Returns null for an unregistered type — the same
+ * outcome the union produces, since no member would match.
+ *
+ * Prefer this in loops. The union in `getSectionContentSchema()` validates its
+ * members in order and fully validates every miss, so parsing N sections
+ * against M registered types costs O(N x M) object validations; every section
+ * schema pins `type: z.literal(...)`, so a registry lookup selects exactly the
+ * member the union would have matched.
+ */
+export function getSectionSchemaForType(type: string): z.ZodType<Section> | null {
+  const schema = getSchema(type);
+  if (!schema) return null;
+  // `getSchema` is typed as a bare ZodType, so the intersection doesn't overlap
+  // Section structurally — same widening `getSectionSchema` gets for free from
+  // getSectionContentSchema's annotated return.
+  return z
+    .object({ id: z.string(), layout: LayoutEnvelopeSchema.optional() })
+    .and(schema) as unknown as z.ZodType<Section>;
+}

package/src/storage/index.ts

@@ -1,2 +1,2 @@
 export type { StorageProvider, FileWrite, AssetStore, DocumentStore } from "./types";
-export { StorageConflictError, IdempotencyLookupUnavailableError, ASSET_CACHE_CONTROL, DOCUMENT_CACHE_CONTROL, IDEMPOTENCY_TRAILER, IDEMPOTENCY_KEY_RE, withIdempotencyTrailer } from "./types";
+export { StorageConflictError, NothingToPublishError, IdempotencyLookupUnavailableError, ASSET_CACHE_CONTROL, DOCUMENT_CACHE_CONTROL, IDEMPOTENCY_TRAILER, IDEMPOTENCY_KEY_RE, withIdempotencyTrailer } from "./types";

package/src/storage/types.ts

@@ -11,6 +11,19 @@ export class StorageConflictError extends Error {
   }
 }
 
+/**
+ * Thrown by `promoteDraft` when there is no draft to publish. Typed rather than
+ * a bare Error because it is the ordinary outcome of publishing twice, and a
+ * caller that cannot tell it apart from a real failure reports "publish failed"
+ * for a site that is already fully published.
+ */
+export class NothingToPublishError extends Error {
+  constructor() {
+    super("No saved branch to publish");
+    this.name = "NothingToPublishError";
+  }
+}
+
 export interface StorageProvider {
   writeFiles(
     files: FileWrite[],

package/src/types/database.ts

@@ -674,7 +674,6 @@ export type Database = {
           id: string
           is_default: boolean
           name: string
-          password_hash: string
           site_id: string
         }
         Insert: {
@@ -684,7 +683,6 @@ export type Database = {
           id?: string
           is_default?: boolean
           name: string
-          password_hash: string
           site_id: string
         }
         Update: {
@@ -694,7 +692,6 @@ export type Database = {
           id?: string
           is_default?: boolean
           name?: string
-          password_hash?: string
           site_id?: string
         }
         Relationships: [