@teamscala/service-boot 0.23.525 → 0.23.527

package/package.json

@@ -17,7 +17,6 @@
     "@teamscala/event-log": "*",
     "@teamscala/file-lock": "*",
     "@teamscala/formatters": "*",
-    "@teamscala/generic-registry": "*",
     "@teamscala/hono-boundary": "*",
     "@teamscala/http": "*",
     "@teamscala/logger": "*",
@@ -27,6 +26,7 @@
     "@teamscala/os": "*",
     "@teamscala/publish-registry": "*",
     "@teamscala/puck-boundary": "*",
+    "@teamscala/puck-tree": "*",
     "@teamscala/resolver-engine": "*",
     "@teamscala/timing": "*",
     "@teamscala/tool-executor": "*",
@@ -160,8 +160,6 @@
     "./page-server-loader-graph.ts": "./src/page-server-loader-graph.ts",
     "./page-server-orpc/server-client": "./src/page-server-orpc/server-client.ts",
     "./page-server-orpc/server-client.ts": "./src/page-server-orpc/server-client.ts",
-    "./pg-boss-handler-registry": "./src/pg-boss-handler-registry.ts",
-    "./pg-boss-handler-registry.ts": "./src/pg-boss-handler-registry.ts",
     "./pg-boss-mount": "./src/pg-boss-mount.ts",
     "./pg-boss-mount.ts": "./src/pg-boss-mount.ts",
     "./proposal-authorized-emails": "./src/proposal-authorized-emails.ts",
@@ -190,8 +188,6 @@
     "./register-registry-page-route/apply-page-branding.ts": "./src/register-registry-page-route/apply-page-branding.ts",
     "./register-registry-page-route/captured-loader-config": "./src/register-registry-page-route/captured-loader-config.ts",
     "./register-registry-page-route/captured-loader-config.ts": "./src/register-registry-page-route/captured-loader-config.ts",
-    "./register-registry-page-route/graph-cache": "./src/register-registry-page-route/graph-cache.ts",
-    "./register-registry-page-route/graph-cache.ts": "./src/register-registry-page-route/graph-cache.ts",
     "./register-registry-page-route/live-loader-config": "./src/register-registry-page-route/live-loader-config.ts",
     "./register-registry-page-route/live-loader-config.ts": "./src/register-registry-page-route/live-loader-config.ts",
     "./register-registry-page-route/meta-title": "./src/register-registry-page-route/meta-title.ts",
@@ -294,5 +290,5 @@
   "repository": "https://github.com/teamgbg/service-boot",
   "sideEffects": false,
   "type": "module",
-  "version": "0.23.525"
+  "version": "0.23.527"
 }

package/src/agreement-gate/signing-session.ts

@@ -13,6 +13,7 @@ import {
 	buildCertificateData,
 	type CertificateData,
 } from "@teamscala/agreement-generation/agreement-certificate";
+import { collectBlocks, forEachContent, type PuckData } from "@teamscala/puck-tree/collect-blocks";
 import { findFirstAgreement } from "./agreement-lookup.ts";
 import { resolveAgreementViewerDirectory } from "./resolution-caches.ts";
 
@@ -38,24 +39,15 @@ export interface SigningSession {
 	certificate: CertificateData | null;
 }
 
-/** Every resolved region's content[] array, paired with its puck_data holder. */
-export function* regionContents(
+export function* regionTrees(
 	resolved: Record<string, unknown>,
-): Generator<{ pd: { content?: unknown[] }; content: ContentBlock[] }> {
+): Generator<{ content?: unknown[] } & PuckData> {
 	for (const value of Object.values(resolved)) {
 		const pd = (value as { puck_data?: { content?: unknown[] } } | null)?.puck_data;
-		const content = pd?.content;
-		if (pd && Array.isArray(content)) {
-			yield { pd, content: content as ContentBlock[] };
-		}
+		if (pd && Array.isArray(pd.content)) yield pd as { content?: unknown[] } & PuckData;
 	}
 }
 
-/**
- * Locate the agreement gate block(s) across regions. A gate is the SignIn block
- * in `gate` mode whose field is NOT "proposalId" (that field marks a proposal
- * gate); the agreement id lives in `gateContextValue`.
- */
 export function findAgreementGate(resolved: Record<string, unknown>): {
 	agreementUuid: string;
 	gateRegions: { pd: { content?: unknown[] }; content: ContentBlock[]; gateIdx: number }[];
@@ -66,17 +58,19 @@ export function findAgreementGate(resolved: Record<string, unknown>): {
 		content: ContentBlock[];
 		gateIdx: number;
 	}[] = [];
-	for (const { pd, content } of regionContents(resolved)) {
-		const gateIdx = content.findIndex(
-			(b) =>
-				b?.type === "SignIn" &&
-				b?.props?.mode === "gate" &&
-				b?.props?.gateContextField !== "proposalId",
-		);
-		if (gateIdx < 0) continue;
-		const uuid = content[gateIdx].props?.gateContextValue;
-		if (typeof uuid === "string" && uuid) agreementUuid = uuid;
-		gateRegions.push({ pd, content, gateIdx });
+	for (const pd of regionTrees(resolved)) {
+		forEachContent(pd, (content) => {
+			const gateIdx = (content as ContentBlock[]).findIndex(
+				(b) =>
+					b?.type === "SignIn" &&
+					b?.props?.mode === "gate" &&
+					b?.props?.gateContextField !== "proposalId",
+			);
+			if (gateIdx < 0) return;
+			const uuid = (content as ContentBlock[])[gateIdx].props?.gateContextValue;
+			if (typeof uuid === "string" && uuid) agreementUuid = uuid;
+			gateRegions.push({ pd, content: content as ContentBlock[], gateIdx });
+		});
 	}
 	return { agreementUuid, gateRegions };
 }
@@ -219,21 +213,12 @@ export function seedSigningBlocks(
 		orgName: session.orgName,
 		certificate: session.certificate,
 	};
-	const seedBlock = (block: ContentBlock): void => {
-		if (block?.type && SIGNING_BLOCK_TYPES.has(block.type)) {
-			block.props = { ...(block.props ?? {}), ...seed };
-		}
-		const props = block?.props;
-		if (!props) return;
-		for (const propVal of Object.values(props)) {
-			if (!Array.isArray(propVal)) continue;
-			for (const child of propVal) {
-				if (child && typeof child === "object") seedBlock(child as ContentBlock);
+	for (const pd of regionTrees(resolved)) {
+		for (const block of collectBlocks(pd)) {
+			if (SIGNING_BLOCK_TYPES.has(block.type)) {
+				(block as ContentBlock).props = { ...((block.props as Record<string, unknown>) ?? {}), ...seed };
 			}
 		}
-	};
-	for (const { content } of regionContents(resolved)) {
-		for (const block of content) seedBlock(block);
 	}
 }
 

package/src/agreement-gate.ts

@@ -132,8 +132,8 @@ export const agreementGateConfig: ContentGateConfig = {
 
 		if (hasPrePlacedGate(resolved)) {
 			const { gateRegions } = findAgreementGate(resolved);
-			for (const { pd, content, gateIdx } of gateRegions) {
-				pd.content = content.filter((_, i) => i !== gateIdx);
+			for (const { content, gateIdx } of gateRegions) {
+				content.splice(gateIdx, 1);
 			}
 		}
 	},

package/src/expand-roster.ts

@@ -3,6 +3,8 @@
  * @status handwritten
  */
 
+import { forEachContent, type PuckData } from "@teamscala/puck-tree/collect-blocks";
+
 export interface RosterItem {
 	key: string;
 	role: string;
@@ -64,17 +66,6 @@ function substitute(
 	);
 }
 
-function slotArrays(block: Block): unknown[][] {
-	const out: unknown[][] = [];
-	const props = block.props;
-	if (!props) return out;
-	for (const v of Object.values(props)) {
-		if (Array.isArray(v) && v.every((e) => e && typeof e === "object")) {
-			out.push(v as unknown[]);
-		}
-	}
-	return out;
-}
 
 function cloneForItem(template: Block, item: RosterItem): Block {
 	const labels = {
@@ -119,23 +110,22 @@ function isPartyTemplate(block: Block): boolean {
 	return false;
 }
 
-function expandArray(content: unknown[], parties: RosterItem[]): unknown[] {
-	const out: unknown[] = [];
-	for (const raw of content) {
-		const block = raw as Block;
-		// Recurse into this block's own slots first.
-		for (const slot of slotArrays(block)) {
-			const expanded = expandArray(slot, parties);
-			slot.length = 0;
-			slot.push(...expanded);
-		}
-		if (isPartyTemplate(block)) {
-			for (const party of parties) out.push(cloneForItem(block, party));
-		} else {
-			out.push(block);
+function expandTree(tree: PuckData, parties: RosterItem[]): void {
+	const arrays: unknown[][] = [];
+	forEachContent(tree, (content) => arrays.push(content));
+	for (const content of arrays.reverse()) {
+		const expanded: unknown[] = [];
+		for (const raw of content) {
+			const block = raw as Block;
+			if (isPartyTemplate(block)) {
+				for (const party of parties) expanded.push(cloneForItem(block, party));
+			} else {
+				expanded.push(block);
+			}
 		}
+		content.length = 0;
+		content.push(...expanded);
 	}
-	return out;
 }
 
 export interface RosterMeta {
@@ -167,7 +157,7 @@ export function expandRosterTemplates(
 		const pd = (value as { puck_data?: { content?: unknown[] } } | null)
 			?.puck_data;
 		if (!pd || !Array.isArray(pd.content)) continue;
-		if (parties.length > 0) pd.content = expandArray(pd.content, parties);
+		if (parties.length > 0) expandTree(pd as PuckData, parties);
 		if (meta) substituteMeta(pd.content, meta);
 	}
 }