@cosmicdrift/kumiko-samples 0.363.0 → 0.365.0

package/packages/bundled-features/src/template-resolver/resource-image.ts

@@ -1,27 +1,20 @@
-import { assertNotSvg, SHARP_INPUT_OPTIONS } from "../shared/index.js";
+import {
+  assertNotSvg,
+  isResourceImageFormat,
+  RESOURCE_IMAGE_FORMATS,
+  type ResourceImageContentType,
+  SHARP_INPUT_OPTIONS,
+} from "../shared/index.js";
 
 const MAX_RESOURCE_WIDTH = 1200;
 
-const CONTENT_TYPE_BY_FORMAT = {
-  png: "image/png",
-  jpeg: "image/jpeg",
-  gif: "image/gif",
-  webp: "image/webp",
-} as const;
-
-type ResourceImageFormat = keyof typeof CONTENT_TYPE_BY_FORMAT;
-
 export type NormalizedResourceImage = {
   readonly data: Uint8Array;
-  readonly contentType: (typeof CONTENT_TYPE_BY_FORMAT)[ResourceImageFormat];
+  readonly contentType: ResourceImageContentType;
   readonly width: number;
   readonly height: number;
 };
 
-function isResourceImageFormat(format: string | undefined): format is ResourceImageFormat {
-  return format !== undefined && Object.hasOwn(CONTENT_TYPE_BY_FORMAT, format);
-}
-
 // Re-encodes an uploaded image: the stored content type comes from the decoded format, never
 // from the client, and re-encoding drops metadata and anything appended to the file.
 // sharp is imported lazily because every app loads template-resolver, few of them need an image decoder.
@@ -40,7 +33,7 @@ export async function normalizeResourceImage(data: Uint8Array): Promise<Normaliz
   const { data: output, info } = await pipeline.toBuffer({ resolveWithObject: true });
   return {
     data: new Uint8Array(output),
-    contentType: CONTENT_TYPE_BY_FORMAT[format],
+    contentType: RESOURCE_IMAGE_FORMATS[format].contentType,
     width: info.width,
     height: info.height,
   };

package/packages/bundled-features/src/template-resolver/seeding.ts

@@ -35,6 +35,7 @@ import { evaluateTemplateWrite } from "./handlers/template-gates.js";
 import { TEMPLATE_RESOLVER_FEATURE } from "./qualified-names.js";
 import { type TemplateResourceRow, templateResourcesTable } from "./table.js";
 import type { TemplateBundle } from "./template-bundle.js";
+import { activeStampChanges, servedStampChanges } from "./template-draft.js";
 import { templateSlugSchema } from "./template-meta.js";
 import { variablesFromSchema } from "./template-validation.js";
 
@@ -154,12 +155,18 @@ export async function seedSystemTemplate(
       current?.title === rowFields.title &&
       current?.variableSchema === rowFields.variableSchema &&
       current?.meta === rowFields.meta &&
+      current?.status === rowFields.status &&
+      current?.parentTemplateId === rowFields.parentTemplateId &&
       (linkedResources === undefined || current?.linkedResources === linkedResources)
     ) {
       return { id: String(row.id) };
     }
     const result = await executor.update(
-      { id: row.id, version: row.version, changes: rowFields },
+      {
+        id: row.id,
+        version: row.version,
+        changes: { ...rowFields, ...activeStampChanges(row) },
+      },
       by,
       tdb,
     );
@@ -174,7 +181,13 @@ export async function seedSystemTemplate(
     ifExists: opts.ifExists,
     create: async () => {
       const result = await executor.create(
-        { ...rowFields, linkedResources: linkedResources ?? "{}", tenantId },
+        {
+          ...rowFields,
+          ...activeStampChanges(null),
+          draft: null,
+          linkedResources: linkedResources ?? "{}",
+          tenantId,
+        },
         by,
         tdb,
       );
@@ -366,7 +379,13 @@ export async function seedTextBlock(
       {
         id: row.id,
         version: row.version,
-        changes: { title: fields.title, content: fields.content, folder: fields.folder },
+        changes: {
+          title: fields.title,
+          content: fields.content,
+          folder: fields.folder,
+          // A re-seed must not revive an archived block; only a served one gets a new served version.
+          ...(current?.status === "active" && servedStampChanges(row)),
+        },
       },
       by,
       tdb,
@@ -381,7 +400,11 @@ export async function seedTextBlock(
     existing,
     ifExists: opts.ifExists,
     create: async () => {
-      const result = await executor.create({ ...fields, tenantId: opts.tenantId }, by, tdb);
+      const result = await executor.create(
+        { ...fields, ...activeStampChanges(null), draft: null, tenantId: opts.tenantId },
+        by,
+        tdb,
+      );
       if (!result.isSuccess) {
         if (result.error?.code === "unique_violation") {
           const again = await fetchOne<TemplateResourceRow>(db, templateResourcesTable, {