feat: merge resolved value into context

Author: 3mcd

core/actions/_lib/interpolationContext.ts

@@ -25,13 +25,23 @@ export type InterpolationContextBase = {
 
 export type InterpolationContextWithPub = InterpolationContextBase & {
 	pub: ReturnType<typeof createPubProxy>
+	json?: Json
 }
 
 export type InterpolationContextWithJson = InterpolationContextBase & {
 	json: Json
+	pub?: ReturnType<typeof createPubProxy>
 }
 
-export type InterpolationContext = InterpolationContextWithPub | InterpolationContextWithJson
+export type InterpolationContextWithBoth = InterpolationContextBase & {
+	pub: ReturnType<typeof createPubProxy>
+	json: Json
+}
+
+export type InterpolationContext =
+	| InterpolationContextWithPub
+	| InterpolationContextWithJson
+	| InterpolationContextWithBoth
 
 type InterpolationCommunity = Pick<Communities, "id" | "name" | "slug" | "avatar">
 
@@ -67,7 +77,7 @@ type BuildInterpolationContextArgs =
 			} & (
 				| {
 						pub: ProcessedPub
-						json?: never
+						json?: Json
 				  }
 				| {
 						pub?: never
@@ -82,7 +92,7 @@ type BuildInterpolationContextArgs =
 			} & (
 				| {
 						pub: ProcessedPub
-						json?: never
+						json?: Json
 				  }
 				| {
 						pub?: never
@@ -144,6 +154,15 @@ export function buildInterpolationContext(
 			: null,
 	}
 
+	if (args.pub && args.json !== undefined) {
+		// Both pub and json provided
+		return {
+			...baseContext,
+			pub: createPubProxy(args.pub, args.community.slug),
+			json: args.json,
+		}
+	}
+
 	if (args.pub) {
 		return {
 			...baseContext,

core/actions/_lib/resolveAutomationInput.ts

@@ -1,14 +1,14 @@
 import type { ProcessedPub } from "contracts"
 import type { CommunitiesId, PubsId } from "db/public"
 import type { FullAutomation, Json } from "db/types"
+import type { InterpolationContext } from "./interpolationContext"
 
 import { interpolate } from "@pubpub/json-interpolate"
 import { logger } from "logger"
 import { tryCatch } from "utils/try-catch"
 
 import { db } from "~/kysely/database"
 import { getPubsWithRelatedValues } from "~/lib/server"
-import type { InterpolationContext } from "./interpolationContext"
 
 type ResolvedPub = ProcessedPub<{
 	withPubType: true
@@ -158,13 +158,7 @@ async function findPubByFieldValue(
 	return pub as ResolvedPub
 }
 
-/**
- * Finds a pub by its ID.
- */
-async function findPubById(
-	communityId: CommunitiesId,
-	pubId: PubsId
-): Promise<ResolvedPub | null> {
+async function findPubById(communityId: CommunitiesId, pubId: PubsId): Promise<ResolvedPub | null> {
 	const [error, pub] = await tryCatch(
 		getPubsWithRelatedValues(
 			{ pubId, communityId },

core/actions/_lib/runAutomation.ts

@@ -422,7 +422,7 @@ const runActionInstance = async (args: RunActionInstanceArgs): Promise<ActionIns
 		},
 		automationRun: args.automationRun,
 		user: args.user ?? null,
-		...(pub ? { pub } : { json: args.json ?? ({} as Json) }),
+		...(pub ? { pub, json: args.json } : { json: args.json ?? ({} as Json) }),
 	})
 
 	const interpolated = await actionConfigBuilder.interpolate(interpolationData)
@@ -579,6 +579,9 @@ export async function runAutomation(
 
 	// resolve automation input if a resolver is configured
 	// this allows the automation to operate on a different pub or transformed json
+	// resolved values are additive - they add to or overwrite existing context:
+	// - JSON resolved: adds json to context (or overwrites existing json)
+	// - Pub resolved: adds pub to context (or overwrites existing pub)
 	let resolvedPub = pub
 	let resolvedJson = args.json
 
@@ -593,7 +596,7 @@ export async function runAutomation(
 				id: args.scheduledAutomationRunId ?? ("pending-resolver" as AutomationRunsId),
 			},
 			user: args.user ?? null,
-			...(pub ? { pub } : { json: args.json ?? ({} as Json) }),
+			...(pub ? { pub, json: args.json } : { json: args.json ?? ({} as Json) }),
 		})
 
 		const resolved = await resolveAutomationInput(
@@ -604,18 +607,20 @@ export async function runAutomation(
 		)
 
 		if (resolved.type === "pub") {
+			// Pub resolved: overwrites existing pub, keeps existing json
 			resolvedPub = resolved.pub
-			resolvedJson = undefined
-			logger.debug("Resolver resolved to a different pub", {
+			logger.debug("Resolver resolved to a pub", {
 				automationId: automation.id,
 				originalPubId: pub?.id,
 				resolvedPubId: resolved.pub.id,
+				hasExistingJson: resolvedJson !== undefined,
 			})
 		} else if (resolved.type === "json") {
+			// JSON resolved: overwrites existing json, keeps existing pub
 			resolvedJson = resolved.json
-			resolvedPub = null
 			logger.debug("Resolver resolved to JSON", {
 				automationId: automation.id,
+				hasExistingPub: resolvedPub !== null,
 			})
 		}
 		// if type is "unchanged", keep the original pub/json