@cosmicdrift/kumiko-bundled-features 0.366.0 → 0.368.0

package/dist/template-resolver/compile-document-body.js

@@ -1,8 +1,8 @@
 import { isOneOf } from "@cosmicdrift/kumiko-types/type-guards";
 import { isResourceImageContentType } from "../shared/index.js";
 import { rewriteStepsBlock } from "./compile-steps-block.js";
-import { withParsedDocument } from "./document-sanitizer.js";
-import { DOCUMENT_TEXT_ALIGNMENTS, isAllowedDocumentLinkHref, isDocumentPlaceholderHref, isDocumentReferenceName, isDocumentResourceKey, } from "./document-schema.js";
+import { conditionScopeElement, withParsedDocument } from "./document-sanitizer.js";
+import { DOCUMENT_CONDITION_ATTRIBUTE, DOCUMENT_TEXT_ALIGNMENTS, isAllowedDocumentLinkHref, isDocumentPlaceholderHref, isDocumentReferenceName, isDocumentResourceKey, } from "./document-schema.js";
 // Private-use characters mark where a Handlebars expression goes. Author text
 // is scrubbed of them first and every `{`/`}` is entity-encoded before the
 // markers are swapped for real expressions, so the only Handlebars syntax in
@@ -34,19 +34,24 @@ function resolveReference(name, scope, variables) {
     }
     return { path: scope === null ? name : `@root.${name}`, def: ownVariable(variables, name) };
 }
-function valueExpression(path, def) {
+// The sanitized rich text value always consists of blocks; inside a line of
+// other text it renders inline so no paragraph ends up inside a paragraph.
+function valueExpression(path, def, isWholeBlock) {
     if (def?.type === "money")
         return `{{money ${path}}}`;
     if (def?.type === "date")
         return `{{date ${path}}}`;
-    if (def?.type === "richText")
-        return `{{richText ${path}}}`;
+    if (def?.type === "percent")
+        return `{{percent ${path}}}`;
+    if (def?.type === "richText") {
+        return isWholeBlock ? `{{richText ${path}}}` : `{{richText ${path} inline=true}}`;
+    }
     return `{{${path}}}`;
 }
 function rewriteVariable(element, state) {
     const name = element.getAttribute("data-variable") ?? "";
     const replacement = element.ownerDocument.createTextNode(isDocumentReferenceName(name)
-        ? marker(state, valueExpression(...pathAndDef(name, element, state)))
+        ? marker(state, valueExpression(...pathAndDef(name, element, state), state.blockRichTextSpans.has(element)))
         : "");
     element.replaceWith(replacement);
 }
@@ -76,10 +81,25 @@ function wrapVariableOnlyBlock(block, state) {
     // skip: a line with static content or several placeholders stays as it is
     if (name === null)
         return;
-    const [path] = pathAndDef(name, block, state);
-    const document = block.ownerDocument;
-    block.before(document.createTextNode(marker(state, `{{#if ${path} includeZero=true}}`)));
-    block.after(document.createTextNode(marker(state, "{{/if}}")));
+    const [path, def] = pathAndDef(name, block, state);
+    const host = def?.type === "richText" && block.tagName === "P" ? richTextBlockHost(block, state) : block;
+    const document = host.ownerDocument;
+    host.before(document.createTextNode(marker(state, `{{#if ${path} includeZero=true}}`)));
+    host.after(document.createTextNode(marker(state, "{{/if}}")));
+}
+// A paragraph cannot hold the paragraphs of a rich text value, a div can; it
+// keeps the paragraph's attributes so alignment and size still apply.
+function richTextBlockHost(paragraph, state) {
+    const host = paragraph.ownerDocument.createElement("div");
+    for (const attribute of Array.from(paragraph.attributes)) {
+        host.setAttribute(attribute.name, attribute.value ?? "");
+    }
+    for (const span of Array.from(paragraph.querySelectorAll("span[data-variable]"))) {
+        state.blockRichTextSpans.add(span);
+    }
+    host.append(...Array.from(paragraph.childNodes));
+    paragraph.replaceWith(host);
+    return host;
 }
 function rewriteLink(element, state) {
     const href = element.getAttribute("href") ?? "";
@@ -110,6 +130,19 @@ function rewriteRepeatRow(row, state) {
         row.removeAttribute("data-repeat-header");
     }
 }
+function rewriteConditionalBlock(block, state) {
+    const name = block.getAttribute(DOCUMENT_CONDITION_ATTRIBUTE) ?? "";
+    block.removeAttribute(DOCUMENT_CONDITION_ATTRIBUTE);
+    if (!isDocumentReferenceName(name)) {
+        block.remove();
+        // skip: a condition on a name that cannot be a variable never shows
+        return;
+    }
+    const [path] = pathAndDef(name, conditionScopeElement(block), state);
+    const document = block.ownerDocument;
+    block.before(document.createTextNode(marker(state, `{{#if ${path} includeZero=true}}`)));
+    block.after(document.createTextNode(marker(state, "{{/if}}")));
+}
 function stripActiveContent(element) {
     for (const attribute of Array.from(element.attributes)) {
         if (/^on/i.test(attribute.name))
@@ -223,7 +256,7 @@ function rewriteLinks(root, state, options) {
 // rewritten in document order; list rows last so their placeholders still see
 // the `tr[data-each]` ancestor.
 export function compileDocumentBodyToHandlebars(html, variables, options = {}) {
-    const state = { variables, expressions: [] };
+    const state = { variables, expressions: [], blockRichTextSpans: new Set() };
     const scrubbed = html.replaceAll(EXPRESSION_OPEN, "").replaceAll(EXPRESSION_CLOSE, "");
     const compiled = withParsedDocument(scrubbed, (root) => {
         stripScriptsAndActiveContent(root, options);
@@ -240,6 +273,9 @@ export function compileDocumentBodyToHandlebars(html, variables, options = {}) {
                 color: options.stepsColor,
             });
         }
+        for (const block of Array.from(root.querySelectorAll(`[${DOCUMENT_CONDITION_ATTRIBUTE}]`))) {
+            rewriteConditionalBlock(block, state);
+        }
         for (const block of Array.from(root.querySelectorAll(VARIABLE_ONLY_BLOCK_SELECTOR))) {
             wrapVariableOnlyBlock(block, state);
         }

package/dist/template-resolver/document-sanitizer.d.ts

@@ -24,9 +24,11 @@ export type SanitizeBodyResult = {
 export declare function violation(code: DocumentViolationCode, detail: string, message: string): DocumentViolation;
 export declare function withParsedDocument<T>(html: string, read: (body: ScanElement) => T): T;
 export declare function sanitizeDocumentHtml(html: string): SanitizeHtmlResult;
+export declare function flattenParagraphsToLineBreaks(sanitizedHtml: string): string;
 export declare function sanitizeTemplateBody(input: {
     readonly kind: string;
     readonly contentFormat: ContentFormat;
     readonly content: string | null;
 }): SanitizeBodyResult;
 export declare function documentViolationsToFieldIssues(violations: readonly DocumentViolation[]): FieldIssue[];
+export declare function conditionScopeElement(block: ScanElement): ScanElement;

package/dist/template-resolver/document-sanitizer.js

@@ -2,7 +2,7 @@ import { isOneOf } from "@cosmicdrift/kumiko-types/type-guards";
 import { generateHTML, generateJSON } from "@tiptap/html/server";
 import { Window } from "happy-dom";
 import { DOCUMENT_HTML_KINDS } from "./constants.js";
-import { documentExtensions, isAllowedDocumentLinkHref, isDocumentPlaceholderHref, isDocumentReferenceName, isDocumentResourceKey, } from "./document-schema.js";
+import { DOCUMENT_CONDITION_ATTRIBUTE, documentExtensions, isAllowedDocumentLinkHref, isDocumentPlaceholderHref, isDocumentReferenceName, isDocumentResourceKey, } from "./document-schema.js";
 import { isDocumentStepKey } from "./document-steps.js";
 export function violation(code, detail, message) {
     return { code, detail, message };
@@ -56,6 +56,7 @@ function scanImage(element, out) {
 const REFERENCE_ATTRIBUTES = [
     ["data-variable", isDocumentReferenceName],
     ["data-each", isDocumentReferenceName],
+    [DOCUMENT_CONDITION_ATTRIBUTE, isDocumentReferenceName],
     ["data-resource", isDocumentResourceKey],
     ["data-steps", isDocumentReferenceName],
     ["data-step", isDocumentStepKey],
@@ -155,6 +156,15 @@ export function sanitizeDocumentHtml(html) {
         html: generateHTML(generateJSON(html, documentExtensions), documentExtensions),
     };
 }
+// For a sanitized value placed inside a line of text: paragraphs become line
+// breaks. Other blocks (lists, headings) cannot be made inline and stay as they are.
+export function flattenParagraphsToLineBreaks(sanitizedHtml) {
+    return withParsedDocument(sanitizedHtml, (body) => {
+        const blocks = Array.from(body.children);
+        const isParagraphsOnly = blocks.length === body.childNodes.length && blocks.every((block) => block.tagName === "P");
+        return isParagraphsOnly ? blocks.map((block) => block.innerHTML).join("<br>") : sanitizedHtml;
+    });
+}
 // Snippets accept any format, but their html is as untrusted as a mail body.
 function isSanitizedHtmlKind(kind) {
     return kind === "snippet" || isOneOf(DOCUMENT_HTML_KINDS, kind);
@@ -202,3 +212,8 @@ export function documentViolationsToFieldIssues(violations) {
         params: { detail: item.detail },
     }));
 }
+// A repeat row's own data-if is decided per list, outside the row's item scope,
+// because the compiled {{#if}} lands outside its {{#each}}.
+export function conditionScopeElement(block) {
+    return block.matches("tr[data-each]") ? (block.parentElement ?? block) : block;
+}

package/dist/template-resolver/document-schema.d.ts

@@ -19,4 +19,6 @@ export declare const DOCUMENT_TEXT_ALIGNMENTS: readonly ["left", "center", "righ
 export type DocumentTextAlignment = (typeof DOCUMENT_TEXT_ALIGNMENTS)[number];
 export declare const DocumentTextAlign: Extension<any, any>;
 export declare const DocumentTextSize: Extension<any, any>;
+export declare const DOCUMENT_CONDITION_ATTRIBUTE = "data-if";
+export declare const DocumentCondition: Extension<any, any>;
 export declare const documentExtensions: Extensions;

package/dist/template-resolver/document-schema.js

@@ -284,6 +284,36 @@ export const DocumentTextSize = Extension.create({
         ];
     },
 });
+// A block shown only when the named variable has a value (data-if, the
+// conditional counterpart of data-each). Table rows qualify so an invoice can
+// drop a discount line; tiptap merges the attribute into paragraph, heading
+// and row markup only.
+export const DOCUMENT_CONDITION_ATTRIBUTE = "data-if";
+export const DocumentCondition = Extension.create({
+    name: "documentCondition",
+    addGlobalAttributes() {
+        return [
+            {
+                types: ["paragraph", "heading", "tableRow"],
+                attributes: {
+                    showIf: {
+                        default: null,
+                        parseHTML: (element) => {
+                            const name = element.getAttribute(DOCUMENT_CONDITION_ATTRIBUTE);
+                            return name !== null && isDocumentReferenceName(name) ? name : null;
+                        },
+                        renderHTML: (attributes) => {
+                            const name = attributes["showIf"];
+                            return typeof name === "string" && isDocumentReferenceName(name)
+                                ? { [DOCUMENT_CONDITION_ATTRIBUTE]: name }
+                                : {};
+                        },
+                    },
+                },
+            },
+        ];
+    },
+});
 export const documentExtensions = [
     StarterKit.configure({
         blockquote: false,
@@ -318,4 +348,5 @@ export const documentExtensions = [
     DocumentSteps,
     DocumentTextAlign,
     DocumentTextSize,
+    DocumentCondition,
 ];

package/dist/template-resolver/handlers/bundle-import.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { ValidationError, writeFailure, } from "@cosmicdrift/kumiko-framework/errors";
 import { requireForTenant } from "../../shared/index.js";
 import { attachmentLimitFailure, attachmentNeedsMailTemplate, createPreparedBundleResourceEntry, prepareTemplateAttachmentBeforeTransaction, prepareTemplateResourceBeforeTransaction, readTemplateResourceMaxBytes, releaseAll, } from "../store-template-resource.js";
@@ -7,7 +7,7 @@ import { attachTemplateResources } from "../template-resources.js";
 import { resolveTemplateVariables } from "../template-validation.js";
 import { MAX_FILE_ATTACHMENTS_PER_TEMPLATE } from "./resource-shared.js";
 import { evaluateTemplateWrite } from "./template-gates.js";
-import { refuseTenantScopeUnderSystemTenant, writeTemplateRow, } from "./template-write.js";
+import { refuseSystemOnlyTenantOverride, refuseTenantScopeUnderSystemTenant, writeTemplateRow, } from "./template-write.js";
 export function targetExistsIssue(locale) {
     return {
         path: "locale",
@@ -61,7 +61,8 @@ function checkBundleAttachments(bundle) {
 // beforeTransaction half: validates the bundle and uploads every resource file to the target
 // tenant's storage. A failed or throwing upload releases the ones before it.
 export async function prepareTemplateBundleBeforeTransaction(args) {
-    const refused = refuseTenantScopeUnderSystemTenant(args.scope, args.tenantId);
+    const refused = refuseTenantScopeUnderSystemTenant(args.scope, args.tenantId) ??
+        refuseSystemOnlyTenantOverride(args.ctx.registry, args.scope, args.bundle.slug, args.bundle.kind);
     if (refused !== null)
         return refused;
     const issues = await collectBundleIssues(args, args.status);

package/dist/template-resolver/handlers/by-slug.query.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TEXT_BLOCK_KIND } from "../constants.js";

package/dist/template-resolver/handlers/by-tenant.query.js

@@ -1,5 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
-import { castTenantRows } from "@cosmicdrift/kumiko-framework/db";
+import { castTenantRows, selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TEXT_BLOCK_KIND } from "../constants.js";

package/dist/template-resolver/handlers/collection-item.query.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { collectionStore, DEFAULT_COLLECTION_ACCESS, toCollectionEntry, } from "./collection-shared.js";

package/dist/template-resolver/handlers/collection-list.query.js

@@ -1,5 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
-import { castTenantRows } from "@cosmicdrift/kumiko-framework/db";
+import { castTenantRows, selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { collectionStore, DEFAULT_COLLECTION_ACCESS, toCollectionEntry, } from "./collection-shared.js";

package/dist/template-resolver/handlers/collection-set.write.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler, } from "@cosmicdrift/kumiko-framework/engine";
 import { ValidationError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

package/dist/template-resolver/handlers/copy-locale.write.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
 import { AccessDeniedError, NotFoundError, ValidationError, writeFailure, } from "@cosmicdrift/kumiko-framework/errors";
 import { isOneOf } from "@cosmicdrift/kumiko-types/type-guards";
@@ -15,7 +15,7 @@ import { resolveTemplateVariables } from "../template-validation.js";
 import { targetExistsIssue } from "./bundle-import.js";
 import { kindSchema, localeSchema, templateSlugSchema } from "./shared.js";
 import { parseStoredJson, storedRecord } from "./template-gates.js";
-import { refuseTenantScopeUnderSystemTenant, writeTemplateRow } from "./template-write.js";
+import { refuseSystemOnlyTenantOverride, refuseTenantScopeUnderSystemTenant, writeTemplateRow, } from "./template-write.js";
 function readDbFor(ctx, scope) {
     return scope === "system" ? requireForTenant(ctx, SYSTEM_TENANT_ID).db : ctx.db;
 }
@@ -59,7 +59,8 @@ async function checkCopyRequest(ctx, event) {
         }));
     }
     const tenantId = scope === "system" ? SYSTEM_TENANT_ID : event.user.tenantId;
-    const refused = refuseTenantScopeUnderSystemTenant(scope, tenantId);
+    const refused = refuseTenantScopeUnderSystemTenant(scope, tenantId) ??
+        refuseSystemOnlyTenantOverride(ctx.registry, scope, slug, kind);
     if (refused !== null)
         return refused;
     const readDb = readDbFor(ctx, scope);

package/dist/template-resolver/handlers/diff-to-system.query.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

package/dist/template-resolver/handlers/export-bundle.query.js

@@ -1,5 +1,5 @@
 import { isDeepStrictEqual } from "node:util";
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, ValidationError } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

package/dist/template-resolver/handlers/find-by-id.query.js

@@ -1,8 +1,9 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { templateResourcesTable } from "../table.js";
 import { draftViewerTenantId, isHiddenSystemDraft, toWorkingRow } from "../template-draft.js";
+import { isSystemOnlyTemplateHiddenFrom } from "../template-system-only.js";
 // Admin-Lookup für UI-Edit-Flow. Returnt das raw Template inkl. draft/
 // archived Status. Tenant-Isolation: User sieht nur Templates des
 // eigenen Tenants oder SYSTEM_TENANT (system-defaults sind public-
@@ -17,8 +18,11 @@ export const findByIdQuery = defineQueryHandler({
         const stored = await fetchOne(ctx.db, templateResourcesTable, {
             id: query.payload.id,
         });
-        if (!stored || isHiddenSystemDraft(query.user, stored))
+        if (!stored ||
+            isHiddenSystemDraft(query.user, stored) ||
+            isSystemOnlyTemplateHiddenFrom(query.user, ctx.registry, stored)) {
             return null;
+        }
         const row = toWorkingRow(stored, draftViewerTenantId(query.user, stored));
         const isOwnTenant = row.tenantId === query.user.tenantId;
         const isSystemTemplate = row.scope === "system";

package/dist/template-resolver/handlers/layout-source.query.js

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { FALLBACK_LOCALE } from "../constants.js";

package/dist/template-resolver/handlers/list.query.js

@@ -1,9 +1,10 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TEMPLATE_KINDS, TEMPLATE_STATUSES } from "../constants.js";
 import { templateResourcesTable } from "../table.js";
 import { isHiddenSystemDraft } from "../template-draft.js";
+import { isSystemOnlyTemplateHiddenFrom } from "../template-system-only.js";
 // ctx.db is tenant-scoped even for SystemAdmin: every caller sees its own
 // tenant's rows plus the system defaults, never another tenant's rows.
 export const listQuery = defineQueryHandler({
@@ -39,7 +40,8 @@ export const listQuery = defineQueryHandler({
             limit: 500,
         }));
         return rows
-            .filter((row) => !isHiddenSystemDraft(query.user, row))
+            .filter((row) => !isHiddenSystemDraft(query.user, row) &&
+            !isSystemOnlyTemplateHiddenFrom(query.user, ctx.registry, row))
             .map((row) => ({
             id: String(row.id),
             tenantId: row.tenantId,

package/dist/template-resolver/handlers/overview.query.js

@@ -1,9 +1,10 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { DEFAULT_MAIL_LAYOUT_SLUG, FALLBACK_LOCALE } from "../constants.js";
 import { templateResourcesTable } from "../table.js";
 import { activeSinceOf, activeVersionOf, draftViewerTenantId, isHiddenSystemDraft, parseTemplateDraft, servedVersionOf, } from "../template-draft.js";
+import { isSystemOnlyTemplateHiddenFrom } from "../template-system-only.js";
 import { collectTemplateUsage } from "../template-usage.js";
 import { storedRecord } from "./template-gates.js";
 const OVERVIEW_KINDS = ["mail", "document-pdf", "mail-layout", "pdf-layout"];
@@ -183,7 +184,7 @@ export const overviewQuery = defineQueryHandler({
         totalCount: z.boolean().optional(),
     }),
     access: { roles: ["TenantAdmin", "SystemAdmin"] },
-    description: "Lists mail, PDF and layout templates as one row per slug and kind for the caller's tenant (optionally only the mails and PDFs using one layout slug): where the effective version comes from (own override or system), its locales, status and version (the served one; `draftVersion` is set when an unpublished draft waits beside it, `activeSince` says since when the served version applies), the system version it overrides, the layout it uses and which notifications or templates use it; use it to browse and filter all templates at a glance.",
+    description: "Lists mail, PDF and layout templates as one row per slug and kind for the caller's tenant (optionally only the mails and PDFs using one layout slug): where the effective version comes from (own override or system), its locales, status and version (the served one; `draftVersion` is set when an unpublished draft waits beside it, `activeSince` says since when the served version applies), the system version it overrides, the layout it uses and which notifications or templates use it; templates of notifications registered with `systemOnly` are listed for SystemAdmins only; use it to browse and filter all templates at a glance.",
     handler: async (query, ctx) => {
         const payload = query.payload;
         const fetchedRows = await selectMany(ctx.db, templateResourcesTable, { kind: { in: [...OVERVIEW_KINDS] } }, { orderBy: { col: "id", direction: "asc" }, limit: OVERVIEW_ROW_LIMIT + 1 });
@@ -194,7 +195,8 @@ export const overviewQuery = defineQueryHandler({
                 limit: OVERVIEW_ROW_LIMIT,
             });
         }
-        const visibleRows = rows.filter((row) => !isHiddenSystemDraft(query.user, row));
+        const visibleRows = rows.filter((row) => !isHiddenSystemDraft(query.user, row) &&
+            !isSystemOnlyTemplateHiddenFrom(query.user, ctx.registry, row));
         const { drafts, layoutSlugByDocument } = buildDrafts(groupBySlugAndKind(visibleRows), query.user);
         const effectiveLayouts = effectiveMailLayoutSlugs(visibleRows);
         const overviewRows = drafts.map((draft) => withUsage(draft, layoutSlugByDocument, ctx.registry, effectiveLayouts));

package/dist/template-resolver/handlers/reset-to-system.write.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, ValidationError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

package/dist/template-resolver/handlers/resource-remove.write.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

package/dist/template-resolver/handlers/set.write.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
 import { isOneOf } from "@cosmicdrift/kumiko-types/type-guards";
 import * as z from "zod";

package/dist/template-resolver/handlers/template-write.d.ts

@@ -1,4 +1,4 @@
-import { type HandlerContext, type SessionUser, type TemplateVariables, type TenantId, type WriteResult } from "@cosmicdrift/kumiko-framework/engine";
+import { type HandlerContext, type Registry, type SessionUser, type TemplateVariables, type TenantId, type WriteResult } from "@cosmicdrift/kumiko-framework/engine";
 import { type WriteFailure } from "@cosmicdrift/kumiko-framework/errors";
 import type { ContentFormat, TemplateKind } from "../constants.js";
 import type { TemplateWriteScope } from "../layout-regions.js";
@@ -32,6 +32,7 @@ export type TemplateRowWrite = {
     readonly payload: TemplateRowPayload;
 };
 export declare function refuseTenantScopeUnderSystemTenant(scope: TemplateWriteScope, tenantId: string): WriteResult<never> | null;
+export declare function refuseSystemOnlyTenantOverride(registry: Registry, scope: TemplateWriteScope, slug: string, kind: string): WriteFailure | null;
 export type GatedTemplateWrite = {
     readonly ok: true;
     readonly evaluated: Extract<TemplateWriteResult, {

package/dist/template-resolver/handlers/template-write.js

@@ -1,9 +1,11 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
 import { AccessDeniedError, ValidationError, writeFailure, } from "@cosmicdrift/kumiko-framework/errors";
 import { requireForTenant } from "../../shared/index.js";
+import { TemplateResolverErrors } from "../qualified-names.js";
 import { templateResourcesTable } from "../table.js";
 import { activationChanges, serializeTemplateDraft } from "../template-draft.js";
+import { isSystemOnlyTemplate } from "../template-system-only.js";
 import { executor } from "./shared.js";
 import { evaluateTemplateWrite, } from "./template-gates.js";
 // The tenant-scope-under-system-tenant ban lives here so no write path can
@@ -16,6 +18,14 @@ export function refuseTenantScopeUnderSystemTenant(scope, tenantId) {
         details: { reason: "system_tenant_override_not_allowed_use_upsert_system" },
     }));
 }
+export function refuseSystemOnlyTenantOverride(registry, scope, slug, kind) {
+    if (scope !== "tenant" || !isSystemOnlyTemplate(registry, slug, kind))
+        return null;
+    return writeFailure(new AccessDeniedError({
+        i18nKey: "templateResolver.errors.systemOnlyTemplate",
+        details: { reason: TemplateResolverErrors.systemOnlyTemplate },
+    }));
+}
 // Evaluation plus the publish rule: a row that goes active must not carry
 // publish issues, a draft may.
 export function gateTemplateWrite(input, status) {
@@ -63,7 +73,8 @@ function updateChanges(existing, status, fields) {
 // separately.
 export async function writeTemplateRow(args) {
     const { ctx, user, tenantId, scope, status, payload } = args;
-    const refused = refuseTenantScopeUnderSystemTenant(scope, tenantId);
+    const refused = refuseTenantScopeUnderSystemTenant(scope, tenantId) ??
+        refuseSystemOnlyTenantOverride(ctx.registry, scope, payload.slug, payload.kind);
     if (refused !== null)
         return refused;
     const { db, streamTenantId } = requireForTenant(ctx, tenantId);

package/dist/template-resolver/handlers/tenant-overrides.query.js

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TenantQueries } from "../../tenant/index.js";

package/dist/template-resolver/handlers/toggle-status.write.js

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, ValidationError, writeFailure, } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

package/dist/template-resolver/handlers/usage.query.js

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TEMPLATE_KINDS } from "../constants.js";

package/dist/template-resolver/handlers/validate.query.js

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { imageResourceKeysOf } from "../linked-resources.js";

package/dist/template-resolver/index.d.ts

@@ -1,8 +1,8 @@
 export { createTemplateResolverApi, type ResolveRequest, requireTemplateResolver, TemplateNotFoundError, type TemplateResolverApi, type TemplateResource, } from "./api.js";
 export { type CompileDocumentBodyOptions, collectDocumentResourceKeys, compileDocumentBodyToHandlebars, toResourceDataUri, } from "./compile-document-body.js";
 export { CONTENT_FORMATS, type ContentFormat, DEFAULT_MAIL_LAYOUT_SLUG, DEFAULT_PDF_LAYOUT_SLUG, DOCUMENT_HTML_KINDS, type DocumentHtmlKind, FALLBACK_LOCALE, NON_RENDER_KINDS, type NonRenderKind, PDF_DEFAULT_MARGIN_MM, PDF_FOOTER_MARGIN_MM, PDF_HEADER_MARGIN_MM, PDF_ORIENTATIONS, PDF_PAGE_FORMATS, type PdfOrientation, type PdfPageFormat, RENDER_KINDS, type RenderKind, SYSTEM_TENANT_ID, TEMPLATE_KINDS, TEMPLATE_SCOPES, TEMPLATE_STATUSES, TEXT_BLOCK_KIND, type TemplateKind, type TemplateScope, type TemplateStatus, UPSERT_KINDS, type UpsertKind, } from "./constants.js";
-export { type DocumentViolation, type DocumentViolationCode, documentViolationsToFieldIssues, type SanitizeBodyResult, type SanitizeHtmlResult, sanitizeDocumentHtml, sanitizeTemplateBody, } from "./document-sanitizer.js";
-export { DOCUMENT_NODE_NAMES, DOCUMENT_TEXT_ALIGNMENTS, DocumentButton, DocumentDivider, DocumentLink, DocumentPageBreak, DocumentResource, DocumentTable, DocumentTableCell, DocumentTableHeader, DocumentTableRow, DocumentTextAlign, type DocumentTextAlignment, DocumentVariable, documentExtensions, isAllowedDocumentLinkHref, isDocumentPlaceholderHref, isDocumentReferenceName, isDocumentResourceKey, } from "./document-schema.js";
+export { type DocumentViolation, type DocumentViolationCode, documentViolationsToFieldIssues, flattenParagraphsToLineBreaks, type SanitizeBodyResult, type SanitizeHtmlResult, sanitizeDocumentHtml, sanitizeTemplateBody, } from "./document-sanitizer.js";
+export { DOCUMENT_CONDITION_ATTRIBUTE, DOCUMENT_NODE_NAMES, DOCUMENT_TEXT_ALIGNMENTS, DocumentButton, DocumentCondition, DocumentDivider, DocumentLink, DocumentPageBreak, DocumentResource, DocumentTable, DocumentTableCell, DocumentTableHeader, DocumentTableRow, DocumentTextAlign, type DocumentTextAlignment, DocumentVariable, documentExtensions, isAllowedDocumentLinkHref, isDocumentPlaceholderHref, isDocumentReferenceName, isDocumentResourceKey, } from "./document-schema.js";
 export { createTemplateResolverFeature } from "./feature.js";
 export type { LayoutSourceResponse, LayoutSourceRow } from "./handlers/layout-source.query.js";
 export type { OverviewKindGroup, OverviewOrigin, OverviewResponse, OverviewRow, OverviewUsage, } from "./handlers/overview.query.js";
@@ -19,6 +19,7 @@ export { type TemplateBundle, templateBundleSchema } from "./template-bundle.js"
 export { isMailTemplateMeta, type LayoutTemplateMeta, MAIL_CATEGORIES, MAIL_TONES, type MailCategory, type MailLayoutMeta, type MailTemplateMeta, type MailTone, type PdfTemplateMeta, parseTemplateMeta, pdfAttachmentFileNamePatternSchema, readMailLayoutMeta, readPdfTemplateMeta, type TemplateMeta, type TemplateMetaIssue, type TemplateMetaResult, templateSlugSchema, } from "./template-meta.js";
 export { type DocumentDraftOutcome, evaluateDocumentDraft } from "./template-preview.js";
 export { readTemplateResource, type TemplateResourceFile } from "./template-resources.js";
+export { isSystemOnlyTemplate } from "./template-system-only.js";
 export { collectTemplateUsage, type TemplateUsageEntry } from "./template-usage.js";
 export { hasPlaceholderProblems, resolveTemplateVariables, SYSTEM_PLACEHOLDERS, systemPlaceholdersFor, type TemplateValidation, validateTemplatePlaceholders, } from "./template-validation.js";
 export { type UserContentEntryRow, userContentEntriesTable, userContentEntryEntity, } from "./user-content-table.js";

package/dist/template-resolver/index.js

@@ -1,8 +1,8 @@
 export { createTemplateResolverApi, requireTemplateResolver, TemplateNotFoundError, } from "./api.js";
 export { collectDocumentResourceKeys, compileDocumentBodyToHandlebars, toResourceDataUri, } from "./compile-document-body.js";
 export { CONTENT_FORMATS, DEFAULT_MAIL_LAYOUT_SLUG, DEFAULT_PDF_LAYOUT_SLUG, DOCUMENT_HTML_KINDS, FALLBACK_LOCALE, NON_RENDER_KINDS, PDF_DEFAULT_MARGIN_MM, PDF_FOOTER_MARGIN_MM, PDF_HEADER_MARGIN_MM, PDF_ORIENTATIONS, PDF_PAGE_FORMATS, RENDER_KINDS, SYSTEM_TENANT_ID, TEMPLATE_KINDS, TEMPLATE_SCOPES, TEMPLATE_STATUSES, TEXT_BLOCK_KIND, UPSERT_KINDS, } from "./constants.js";
-export { documentViolationsToFieldIssues, sanitizeDocumentHtml, sanitizeTemplateBody, } from "./document-sanitizer.js";
-export { DOCUMENT_NODE_NAMES, DOCUMENT_TEXT_ALIGNMENTS, DocumentButton, DocumentDivider, DocumentLink, DocumentPageBreak, DocumentResource, DocumentTable, DocumentTableCell, DocumentTableHeader, DocumentTableRow, DocumentTextAlign, DocumentVariable, documentExtensions, isAllowedDocumentLinkHref, isDocumentPlaceholderHref, isDocumentReferenceName, isDocumentResourceKey, } from "./document-schema.js";
+export { documentViolationsToFieldIssues, flattenParagraphsToLineBreaks, sanitizeDocumentHtml, sanitizeTemplateBody, } from "./document-sanitizer.js";
+export { DOCUMENT_CONDITION_ATTRIBUTE, DOCUMENT_NODE_NAMES, DOCUMENT_TEXT_ALIGNMENTS, DocumentButton, DocumentCondition, DocumentDivider, DocumentLink, DocumentPageBreak, DocumentResource, DocumentTable, DocumentTableCell, DocumentTableHeader, DocumentTableRow, DocumentTextAlign, DocumentVariable, documentExtensions, isAllowedDocumentLinkHref, isDocumentPlaceholderHref, isDocumentReferenceName, isDocumentResourceKey, } from "./document-schema.js";
 export { createTemplateResolverFeature } from "./feature.js";
 export { localeSchema } from "./handlers/shared.js";
 export { isHexColor, mailLayoutAppearance, } from "./layout-appearance.js";
@@ -17,6 +17,7 @@ export { templateBundleSchema } from "./template-bundle.js";
 export { isMailTemplateMeta, MAIL_CATEGORIES, MAIL_TONES, parseTemplateMeta, pdfAttachmentFileNamePatternSchema, readMailLayoutMeta, readPdfTemplateMeta, templateSlugSchema, } from "./template-meta.js";
 export { evaluateDocumentDraft } from "./template-preview.js";
 export { readTemplateResource } from "./template-resources.js";
+export { isSystemOnlyTemplate } from "./template-system-only.js";
 export { collectTemplateUsage } from "./template-usage.js";
 export { hasPlaceholderProblems, resolveTemplateVariables, SYSTEM_PLACEHOLDERS, systemPlaceholdersFor, validateTemplatePlaceholders, } from "./template-validation.js";
 export { userContentEntriesTable, userContentEntryEntity, } from "./user-content-table.js";

package/dist/template-resolver/qualified-names.d.ts

@@ -44,6 +44,7 @@ export declare const TemplateResolverErrors: {
     readonly alreadyArchived: "template_already_archived";
     readonly targetExists: "target_exists";
     readonly systemResourcesNeedSystemTenant: "system_resources_need_system_tenant";
+    readonly systemOnlyTemplate: "system_only_template";
     readonly bundleLocalesDiffer: "bundle_locales_differ";
     readonly resourceTooLarge: "template_resource_too_large";
     readonly resourceUnsupportedImage: "template_resource_unsupported_image";

package/dist/template-resolver/qualified-names.js

@@ -55,6 +55,7 @@ export const TemplateResolverErrors = {
     alreadyArchived: "template_already_archived",
     targetExists: "target_exists",
     systemResourcesNeedSystemTenant: "system_resources_need_system_tenant",
+    systemOnlyTemplate: "system_only_template",
     bundleLocalesDiffer: "bundle_locales_differ",
     resourceTooLarge: "template_resource_too_large",
     resourceUnsupportedImage: "template_resource_unsupported_image",

package/dist/template-resolver/seeding.d.ts

@@ -1,5 +1,6 @@
 import { type DbConnection } from "@cosmicdrift/kumiko-framework/db";
 import { type Registry, type SessionUser, type TenantId } from "@cosmicdrift/kumiko-framework/engine";
+import type { Dispatcher } from "@cosmicdrift/kumiko-framework/pipeline";
 import { type SeedIfExists } from "@cosmicdrift/kumiko-framework/seeding";
 import { type ContentFormat, type UpsertKind } from "./constants.js";
 import type { TemplateBundle } from "./template-bundle.js";
@@ -24,6 +25,9 @@ export declare function seedSystemTemplate(db: DbConnection, opts: SeedSystemTem
 export type SeedSystemTemplateBundleOptions = {
     readonly by?: SessionUser;
     readonly ifExists?: SeedIfExists;
+    /** Required for bundles with resources (e.g. a `logo`): the files go through the
+     *  import-bundle-system write, which needs the file provider of the system tenant. */
+    readonly dispatcher?: Dispatcher;
 };
 export declare function seedSystemTemplateBundle(db: DbConnection, bundle: TemplateBundle, opts?: SeedSystemTemplateBundleOptions): Promise<{
     ids: Record<string, string>;