@cosmicdrift/kumiko-samples 0.364.0 → 0.365.1

package/packages/bundled-features/src/template-resolver/handlers/validate.query.ts

@@ -10,6 +10,7 @@ import type { ContentFormat, UpsertKind } from "../constants.js";
 import type { TemplateWriteScope } from "../layout-regions.js";
 import { imageResourceKeysOf } from "../linked-resources.js";
 import { type TemplateResourceRow, templateResourcesTable } from "../table.js";
+import { isSystemAdmin } from "../template-draft.js";
 import { resolveTemplateVariables, systemPlaceholdersFor } from "../template-validation.js";
 import { contentFormatSchema, kindSchema, localeSchema, templateSlugSchema } from "./shared.js";
 import { evaluateTemplateWrite } from "./template-gates.js";
@@ -53,7 +54,9 @@ export async function validateTemplateDraft(
   payload: TemplateDraftInput,
 ) {
   const variables = resolveTemplateVariables(ctx.registry, payload.slug, payload.variableSchema);
-  const { slug, kind, scope, locale } = payload;
+  const { slug, kind, locale } = payload;
+  // The dry run must not promise what the caller's write handlers would refuse.
+  const scope: TemplateWriteScope = isSystemAdmin(user) ? payload.scope : "tenant";
   const known = [
     ...(await knownResourceKeys(ctx.db, {
       tenantId: SYSTEM_TENANT_ID,

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

@@ -16,6 +16,7 @@ export {
   CONTENT_FORMATS,
   type ContentFormat,
   DEFAULT_MAIL_LAYOUT_SLUG,
+  DEFAULT_PDF_LAYOUT_SLUG,
   DOCUMENT_HTML_KINDS,
   type DocumentHtmlKind,
   FALLBACK_LOCALE,
@@ -110,9 +111,11 @@ export {
 } from "./qualified-names.js";
 export { mapRecordToVariables } from "./record-mapping.js";
 export {
+  type PreparedTemplateImage,
+  prepareTemplateResourceBeforeTransaction,
   readTemplateResourceMaxBytes,
   type StoredTemplateResource,
-  storeTemplateResource,
+  storePreparedTemplateResource,
 } from "./store-template-resource.js";
 export {
   type TemplateResourceRow,
@@ -124,9 +127,11 @@ export {
   isMailTemplateMeta,
   type LayoutTemplateMeta,
   MAIL_CATEGORIES,
+  MAIL_TONES,
   type MailCategory,
   type MailLayoutMeta,
   type MailTemplateMeta,
+  type MailTone,
   type PdfTemplateMeta,
   parseTemplateMeta,
   pdfAttachmentFileNamePatternSchema,

package/packages/bundled-features/src/template-resolver/layout-appearance.ts

@@ -15,26 +15,42 @@ const FONT_FAMILIES = {
   serif: "Georgia, 'Times New Roman', serif",
 } as const;
 
-const BUTTON_COLOR = "#1f5468";
+const DEFAULT_BUTTON_COLOR = "#1f5468";
 const BUTTON_BASE = "display:inline-block;padding:10px 20px;font-weight:600;text-decoration:none";
 
-const BUTTON_STYLES = {
-  "filled-rounded": `${BUTTON_BASE};border-radius:6px;background-color:${BUTTON_COLOR};color:#ffffff`,
-  "filled-square": `${BUTTON_BASE};background-color:${BUTTON_COLOR};color:#ffffff`,
-  outline: `${BUTTON_BASE};border:2px solid ${BUTTON_COLOR};border-radius:6px;color:${BUTTON_COLOR}`,
-} as const;
+type ButtonStyle = NonNullable<MailLayoutMeta["buttonStyle"]>;
+
+function buttonStyleCss(style: ButtonStyle, color: string): string {
+  switch (style) {
+    case "filled-rounded":
+      return `${BUTTON_BASE};border-radius:6px;background-color:${color};color:#ffffff`;
+    case "filled-square":
+      return `${BUTTON_BASE};background-color:${color};color:#ffffff`;
+    case "outline":
+      return `${BUTTON_BASE};border:2px solid ${color};border-radius:6px;color:${color}`;
+  }
+}
 
 export function isHexColor(value: string): boolean {
   return HEX_COLOR_PATTERN.test(value);
 }
 
-export function mailLayoutAppearance(meta: MailLayoutMeta | unknown): MailLayoutAppearance {
+// The branding accent colors the buttons only where the layout opted into the branding accent line.
+export function mailLayoutAppearance(
+  meta: MailLayoutMeta | unknown,
+  brandingAccentColor?: string,
+): MailLayoutAppearance {
   const parsed = readMailLayoutMeta(meta);
+  const accentLine = (parsed.accentLine ?? "none") === "branding";
+  const buttonColor =
+    accentLine && brandingAccentColor !== undefined && isHexColor(brandingAccentColor)
+      ? brandingAccentColor
+      : DEFAULT_BUTTON_COLOR;
   return {
     width: parsed.width ?? 600,
     fontFamily: FONT_FAMILIES[parsed.font ?? "sans"],
     outerBackground: parsed.outerBackground ?? "#f5f5f5",
-    accentLine: (parsed.accentLine ?? "none") === "branding",
-    buttonStyle: BUTTON_STYLES[parsed.buttonStyle ?? "filled-rounded"],
+    accentLine,
+    buttonStyle: buttonStyleCss(parsed.buttonStyle ?? "filled-rounded", buttonColor),
   };
 }

package/packages/bundled-features/src/template-resolver/mail-constants.ts

@@ -0,0 +1,4 @@
+// @runtime client
+// No imports: web/ re-exports these, and template-meta.ts pulls in zod and the framework engine.
+export const MAIL_TONES = ["accent", "info", "success", "warning", "danger", "neutral"] as const;
+export type MailTone = (typeof MAIL_TONES)[number];

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

@@ -155,6 +155,8 @@ 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) };