@reventlessdev/reventless-aws 3.0.0-alpha.174 → 3.0.0-alpha.176

package/src/components/ReadModel_Builder_Single.res

@@ -16,8 +16,8 @@ module Make = (
     Spec,
     Mappings,
     RuntimeEnvironment,
-    QueryDbStorage.DynamoDb,
-    QueryDbResolvers.AppSync,
+    QueryDbStorage.Selectable,
+    QueryDbResolvers.Selectable,
     EventCollectorChannel,
     EventCollectorRuntimeBuilder,
   )
@@ -31,15 +31,24 @@ module Make = (
   let make = (~api, ~apiRole, ~allEventTopics, ~opts=?): component => {
     let readModel = Inner.make(~api, ~apiRole, ~allEventTopics, ~opts?)
 
-    let queryDbOutputs = (readModel->Inner.outputs).queryDb
-    let tableResource = queryDbOutputs.resources->Array.getUnsafe(0)
-    let queryDbTableName = tableResource.name
+    // On the Postgres backend there is no DynamoDB table (resources is empty) —
+    // the read-model spec name is the stable `qdb_<name>` discriminator, both
+    // here and in the entry point's Postgres branch.
+    let pgBacked = QueryDbBackend.isPostgresFor(Spec.name)
+    let queryDbTableName = if pgBacked {
+      Pulumi.Output.make(Spec.name)
+    } else {
+      let queryDbOutputs = (readModel->Inner.outputs).queryDb
+      let tableResource = queryDbOutputs.resources->Array.getUnsafe(0)
+      tableResource.name
+    }
 
     EventCollectorRuntimeBuilder.registerReadModel(
       ~readModelName=Spec.name,
       ~specModulePath=Util_Bundle.getModuleSpecifier(Spec.moduleUrl),
       ~mappingsModulePath=Util_Bundle.getModuleSpecifier(Mappings.moduleUrl),
       ~queryDbTableName,
+      ~pgBacked,
     )
 
     readModel

package/src/components/ReadModel_Builder_Single.res.mjs

@@ -1,9 +1,11 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Pulumi from "@pulumi/pulumi";
 import * as Util_Bundle$ReventlessAws from "../util/Util_Bundle.res.mjs";
+import * as QueryDbBackend$ReventlessAws from "../adapter/QueryDb/QueryDbBackend.res.mjs";
+import * as QueryDbStorage$ReventlessAws from "../adapter/QueryDb/QueryDbStorage.res.mjs";
+import * as QueryDbResolvers$ReventlessAws from "../adapter/QueryDb/QueryDbResolvers.res.mjs";
 import * as ReadModel_Builder$ReventlessCore from "@reventlessdev/reventless-core/src/components/ReadModel/ReadModel_Builder.res.mjs";
-import * as QueryDbStorage_DynamoDb$ReventlessAws from "../adapter/QueryDb/QueryDbStorage_DynamoDb.res.mjs";
-import * as QueryDbResolvers_AppSync$ReventlessAws from "../adapter/QueryDb/QueryDbResolvers_AppSync.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "../adapter/Runtime/RuntimeEnvironment_Lambda.res.mjs";
 import * as EventCollectorChannel_DynamoDbStream$ReventlessAws from "../adapter/EventCollector/EventCollectorChannel_DynamoDbStream.res.mjs";
 import * as EventCollectorRuntime_Builder_Single$ReventlessAws from "../adapter/Runtime/EventCollectorRuntime_Builder_Single.res.mjs";
@@ -16,11 +18,7 @@ function Make(Spec) {
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
-    })({
-      make: QueryDbStorage_DynamoDb$ReventlessAws.make
-    })({
-      make: QueryDbResolvers_AppSync$ReventlessAws.make
-    })({
+    })(QueryDbStorage$ReventlessAws.Selectable)(QueryDbResolvers$ReventlessAws.Selectable)({
       make: EventCollectorChannel_DynamoDbStream$ReventlessAws.make,
       connect: EventCollectorChannel_DynamoDbStream$ReventlessAws.connect
     })({
@@ -33,10 +31,15 @@ function Make(Spec) {
     });
     let make = (api, apiRole, allEventTopics, opts) => {
       let readModel = Inner.make(api, apiRole, allEventTopics, opts);
-      let queryDbOutputs = Inner.outputs(readModel).queryDb;
-      let tableResource = queryDbOutputs.resources[0];
-      let queryDbTableName = tableResource.name;
-      EventCollectorRuntime_Builder_Single$ReventlessAws.registerReadModel(Inner.Spec.name, Util_Bundle$ReventlessAws.getModuleSpecifier(Inner.Spec.moduleUrl), Util_Bundle$ReventlessAws.getModuleSpecifier(Mappings.moduleUrl), queryDbTableName);
+      let pgBacked = QueryDbBackend$ReventlessAws.isPostgresFor(Inner.Spec.name);
+      let queryDbTableName;
+      if (pgBacked) {
+        queryDbTableName = Pulumi.output(Inner.Spec.name);
+      } else {
+        let queryDbOutputs = Inner.outputs(readModel).queryDb;
+        queryDbTableName = queryDbOutputs.resources[0].name;
+      }
+      EventCollectorRuntime_Builder_Single$ReventlessAws.registerReadModel(Inner.Spec.name, Util_Bundle$ReventlessAws.getModuleSpecifier(Inner.Spec.moduleUrl), Util_Bundle$ReventlessAws.getModuleSpecifier(Mappings.moduleUrl), queryDbTableName, pgBacked);
       return readModel;
     };
     let finish = () => EventCollectorRuntime_Builder_Single$ReventlessAws.finish();
@@ -64,4 +67,4 @@ export {
   EventCollectorRuntimeBuilder,
   Make,
 }
-/* Util_Bundle-ReventlessAws Not a pure module */
+/* @pulumi/pulumi Not a pure module */

package/src/components/ReadModel_Builder_Single_Stream.res

@@ -24,8 +24,8 @@ module Make = (
     Spec,
     Mappings,
     RuntimeEnvironment,
-    QueryDbStorage_DynamoDbStream,
-    QueryDbResolvers.AppSync,
+    QueryDbStorage.SelectableStream,
+    QueryDbResolvers.Selectable,
     EventCollectorChannel,
     EventCollectorRuntimeBuilder,
   )
@@ -39,15 +39,24 @@ module Make = (
   let make = (~api, ~apiRole, ~allEventTopics, ~opts=?): component => {
     let readModel = Inner.make(~api, ~apiRole, ~allEventTopics, ~opts?)
 
-    let queryDbOutputs = (readModel->Inner.outputs).queryDb
-    let tableResource = queryDbOutputs.resources->Array.getUnsafe(0)
-    let queryDbTableName = tableResource.name
+    // On the Postgres backend there is no DynamoDB table (resources is empty) —
+    // the read-model spec name is the stable `qdb_<name>` discriminator, both
+    // here and in the entry point's Postgres branch.
+    let pgBacked = QueryDbBackend.isPostgresFor(Spec.name)
+    let queryDbTableName = if pgBacked {
+      Pulumi.Output.make(Spec.name)
+    } else {
+      let queryDbOutputs = (readModel->Inner.outputs).queryDb
+      let tableResource = queryDbOutputs.resources->Array.getUnsafe(0)
+      tableResource.name
+    }
 
     EventCollectorRuntimeBuilder.registerReadModel(
       ~readModelName=Spec.name,
       ~specModulePath=Util_Bundle.getModuleSpecifier(Spec.moduleUrl),
       ~mappingsModulePath=Util_Bundle.getModuleSpecifier(Mappings.moduleUrl),
       ~queryDbTableName,
+      ~pgBacked,
     )
 
     readModel

package/src/components/ReadModel_Builder_Single_Stream.res.mjs

@@ -1,10 +1,12 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Pulumi from "@pulumi/pulumi";
 import * as Util_Bundle$ReventlessAws from "../util/Util_Bundle.res.mjs";
+import * as QueryDbBackend$ReventlessAws from "../adapter/QueryDb/QueryDbBackend.res.mjs";
+import * as QueryDbStorage$ReventlessAws from "../adapter/QueryDb/QueryDbStorage.res.mjs";
+import * as QueryDbResolvers$ReventlessAws from "../adapter/QueryDb/QueryDbResolvers.res.mjs";
 import * as ReadModel_Builder$ReventlessCore from "@reventlessdev/reventless-core/src/components/ReadModel/ReadModel_Builder.res.mjs";
-import * as QueryDbResolvers_AppSync$ReventlessAws from "../adapter/QueryDb/QueryDbResolvers_AppSync.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "../adapter/Runtime/RuntimeEnvironment_Lambda.res.mjs";
-import * as QueryDbStorage_DynamoDbStream$ReventlessAws from "../adapter/QueryDb/QueryDbStorage_DynamoDbStream.res.mjs";
 import * as EventCollectorChannel_DynamoDbStream$ReventlessAws from "../adapter/EventCollector/EventCollectorChannel_DynamoDbStream.res.mjs";
 import * as EventCollectorRuntime_Builder_Single$ReventlessAws from "../adapter/Runtime/EventCollectorRuntime_Builder_Single.res.mjs";
 
@@ -16,11 +18,7 @@ function Make(Spec) {
       extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
       asEventHandler: prim => prim,
       asEffectHandler: prim => prim
-    })({
-      make: QueryDbStorage_DynamoDbStream$ReventlessAws.make
-    })({
-      make: QueryDbResolvers_AppSync$ReventlessAws.make
-    })({
+    })(QueryDbStorage$ReventlessAws.SelectableStream)(QueryDbResolvers$ReventlessAws.Selectable)({
       make: EventCollectorChannel_DynamoDbStream$ReventlessAws.make,
       connect: EventCollectorChannel_DynamoDbStream$ReventlessAws.connect
     })({
@@ -33,10 +31,15 @@ function Make(Spec) {
     });
     let make = (api, apiRole, allEventTopics, opts) => {
       let readModel = Inner.make(api, apiRole, allEventTopics, opts);
-      let queryDbOutputs = Inner.outputs(readModel).queryDb;
-      let tableResource = queryDbOutputs.resources[0];
-      let queryDbTableName = tableResource.name;
-      EventCollectorRuntime_Builder_Single$ReventlessAws.registerReadModel(Inner.Spec.name, Util_Bundle$ReventlessAws.getModuleSpecifier(Inner.Spec.moduleUrl), Util_Bundle$ReventlessAws.getModuleSpecifier(Mappings.moduleUrl), queryDbTableName);
+      let pgBacked = QueryDbBackend$ReventlessAws.isPostgresFor(Inner.Spec.name);
+      let queryDbTableName;
+      if (pgBacked) {
+        queryDbTableName = Pulumi.output(Inner.Spec.name);
+      } else {
+        let queryDbOutputs = Inner.outputs(readModel).queryDb;
+        queryDbTableName = queryDbOutputs.resources[0].name;
+      }
+      EventCollectorRuntime_Builder_Single$ReventlessAws.registerReadModel(Inner.Spec.name, Util_Bundle$ReventlessAws.getModuleSpecifier(Inner.Spec.moduleUrl), Util_Bundle$ReventlessAws.getModuleSpecifier(Mappings.moduleUrl), queryDbTableName, pgBacked);
       return readModel;
     };
     let finish = () => EventCollectorRuntime_Builder_Single$ReventlessAws.finish();
@@ -64,4 +67,4 @@ export {
   EventCollectorRuntimeBuilder,
   Make,
 }
-/* Util_Bundle-ReventlessAws Not a pure module */
+/* @pulumi/pulumi Not a pure module */

package/src/components/StateViewSlice_Builder.res

@@ -11,8 +11,8 @@ module Make = (Api: {
 }) => {
   module Inner = ReventlessCore.StateViewSlice_Builder.Make(
     RuntimeEnvironment,
-    QueryDbStorage.DynamoDb,
-    QueryDbResolvers.AppSync,
+    QueryDbStorage.Selectable,
+    QueryDbResolvers.Selectable,
     EventCollectorChannel,
     EventCollectorRuntimeBuilder,
     Api,
@@ -32,12 +32,18 @@ module Make = (Api: {
     let make = (~dcbEventLog, ~opts=?): component => {
       let sv = InnerMake.make(~dcbEventLog, ~opts?)
       let queryDbOutputs = (sv->ReventlessCore.Component.outputs).queryDb
-      let tableResource = queryDbOutputs.resources->Array.getUnsafe(0)
+      // On the Postgres backend there is no DynamoDB table (resources is
+      // empty) — the slice spec name is the stable `qdb_<name>` discriminator.
+      let queryDbTableName = if QueryDbBackend.isPostgresFor(Spec.name) {
+        Pulumi.Output.make(Spec.name)
+      } else {
+        (queryDbOutputs.resources->Array.getUnsafe(0)).name
+      }
       EventCollectorRuntimeBuilder.registerStateViewSlice(
         ~name=Spec.name,
         ~specModulePath=Util_Bundle.getModuleSpecifier(Spec.moduleUrl),
         ~projectionModulePath=Util_Bundle.getModuleSpecifier(Projection.moduleUrl),
-        ~queryDbTableName=tableResource.name,
+        ~queryDbTableName,
         ~queryDbResources=queryDbOutputs.resources,
       )
       sv

package/src/components/StateViewSlice_Builder.res.mjs

@@ -1,10 +1,12 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Pulumi from "@pulumi/pulumi";
 import * as Component$ReventlessCore from "@reventlessdev/reventless-core/src/components/Component.res.mjs";
 import * as Util_Bundle$ReventlessAws from "../util/Util_Bundle.res.mjs";
-import * as QueryDbStorage_DynamoDb$ReventlessAws from "../adapter/QueryDb/QueryDbStorage_DynamoDb.res.mjs";
+import * as QueryDbBackend$ReventlessAws from "../adapter/QueryDb/QueryDbBackend.res.mjs";
+import * as QueryDbStorage$ReventlessAws from "../adapter/QueryDb/QueryDbStorage.res.mjs";
+import * as QueryDbResolvers$ReventlessAws from "../adapter/QueryDb/QueryDbResolvers.res.mjs";
 import * as StateViewSlice_Builder$ReventlessCore from "@reventlessdev/reventless-core/src/components/StateViewSlice/StateViewSlice_Builder.res.mjs";
-import * as QueryDbResolvers_AppSync$ReventlessAws from "../adapter/QueryDb/QueryDbResolvers_AppSync.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "../adapter/Runtime/RuntimeEnvironment_Lambda.res.mjs";
 import * as EventCollectorChannel_DynamoDbStream$ReventlessAws from "../adapter/EventCollector/EventCollectorChannel_DynamoDbStream.res.mjs";
 import * as StateViewSliceRuntime_Builder_Single$ReventlessAws from "../adapter/Runtime/StateViewSliceRuntime_Builder_Single.res.mjs";
@@ -16,11 +18,7 @@ function Make(Api) {
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
-  })({
-    make: QueryDbStorage_DynamoDb$ReventlessAws.make
-  })({
-    make: QueryDbResolvers_AppSync$ReventlessAws.make
-  })({
+  })(QueryDbStorage$ReventlessAws.Selectable)(QueryDbResolvers$ReventlessAws.Selectable)({
     make: EventCollectorChannel_DynamoDbStream$ReventlessAws.make,
     connect: EventCollectorChannel_DynamoDbStream$ReventlessAws.connect
   })({
@@ -36,8 +34,8 @@ function Make(Api) {
     let make = (dcbEventLog, opts) => {
       let sv = InnerMake.make(dcbEventLog, opts);
       let queryDbOutputs = Component$ReventlessCore.outputs(sv).queryDb;
-      let tableResource = queryDbOutputs.resources[0];
-      StateViewSliceRuntime_Builder_Single$ReventlessAws.registerStateViewSlice(Spec.name, Util_Bundle$ReventlessAws.getModuleSpecifier(Spec.moduleUrl), Util_Bundle$ReventlessAws.getModuleSpecifier(Projection.moduleUrl), tableResource.name, queryDbOutputs.resources);
+      let queryDbTableName = QueryDbBackend$ReventlessAws.isPostgresFor(Spec.name) ? Pulumi.output(Spec.name) : queryDbOutputs.resources[0].name;
+      StateViewSliceRuntime_Builder_Single$ReventlessAws.registerStateViewSlice(Spec.name, Util_Bundle$ReventlessAws.getModuleSpecifier(Spec.moduleUrl), Util_Bundle$ReventlessAws.getModuleSpecifier(Projection.moduleUrl), queryDbTableName, queryDbOutputs.resources);
       return sv;
     };
     return {
@@ -65,4 +63,4 @@ export {
   EventCollectorRuntimeBuilder,
   Make,
 }
-/* Component-ReventlessCore Not a pure module */
+/* @pulumi/pulumi Not a pure module */

package/src/components/StateViewSlice_Builder_Stream.res

@@ -15,8 +15,8 @@ module Make = (Api: {
 }) => {
   module Inner = ReventlessCore.StateViewSlice_Builder.Make(
     RuntimeEnvironment,
-    QueryDbStorage_DynamoDbStream,
-    QueryDbResolvers.AppSync,
+    QueryDbStorage.SelectableStream,
+    QueryDbResolvers.Selectable,
     EventCollectorChannel,
     EventCollectorRuntimeBuilder,
     Api,
@@ -36,12 +36,18 @@ module Make = (Api: {
     let make = (~dcbEventLog, ~opts=?): component => {
       let sv = InnerMake.make(~dcbEventLog, ~opts?)
       let queryDbOutputs = (sv->ReventlessCore.Component.outputs).queryDb
-      let tableResource = queryDbOutputs.resources->Array.getUnsafe(0)
+      // On the Postgres backend there is no DynamoDB table (resources is
+      // empty) — the slice spec name is the stable `qdb_<name>` discriminator.
+      let queryDbTableName = if QueryDbBackend.isPostgresFor(Spec.name) {
+        Pulumi.Output.make(Spec.name)
+      } else {
+        (queryDbOutputs.resources->Array.getUnsafe(0)).name
+      }
       EventCollectorRuntimeBuilder.registerStateViewSlice(
         ~name=Spec.name,
         ~specModulePath=Util_Bundle.getModuleSpecifier(Spec.moduleUrl),
         ~projectionModulePath=Util_Bundle.getModuleSpecifier(Projection.moduleUrl),
-        ~queryDbTableName=tableResource.name,
+        ~queryDbTableName,
         ~queryDbResources=queryDbOutputs.resources,
       )
       sv

package/src/components/StateViewSlice_Builder_Stream.res.mjs

@@ -1,11 +1,13 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Pulumi from "@pulumi/pulumi";
 import * as Component$ReventlessCore from "@reventlessdev/reventless-core/src/components/Component.res.mjs";
 import * as Util_Bundle$ReventlessAws from "../util/Util_Bundle.res.mjs";
+import * as QueryDbBackend$ReventlessAws from "../adapter/QueryDb/QueryDbBackend.res.mjs";
+import * as QueryDbStorage$ReventlessAws from "../adapter/QueryDb/QueryDbStorage.res.mjs";
+import * as QueryDbResolvers$ReventlessAws from "../adapter/QueryDb/QueryDbResolvers.res.mjs";
 import * as StateViewSlice_Builder$ReventlessCore from "@reventlessdev/reventless-core/src/components/StateViewSlice/StateViewSlice_Builder.res.mjs";
-import * as QueryDbResolvers_AppSync$ReventlessAws from "../adapter/QueryDb/QueryDbResolvers_AppSync.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "../adapter/Runtime/RuntimeEnvironment_Lambda.res.mjs";
-import * as QueryDbStorage_DynamoDbStream$ReventlessAws from "../adapter/QueryDb/QueryDbStorage_DynamoDbStream.res.mjs";
 import * as EventCollectorChannel_DynamoDbStream$ReventlessAws from "../adapter/EventCollector/EventCollectorChannel_DynamoDbStream.res.mjs";
 import * as StateViewSliceRuntime_Builder_Single$ReventlessAws from "../adapter/Runtime/StateViewSliceRuntime_Builder_Single.res.mjs";
 
@@ -16,11 +18,7 @@ function Make(Api) {
     extractCorrelationId: RuntimeEnvironment_Lambda$ReventlessAws.extractCorrelationId,
     asEventHandler: prim => prim,
     asEffectHandler: prim => prim
-  })({
-    make: QueryDbStorage_DynamoDbStream$ReventlessAws.make
-  })({
-    make: QueryDbResolvers_AppSync$ReventlessAws.make
-  })({
+  })(QueryDbStorage$ReventlessAws.SelectableStream)(QueryDbResolvers$ReventlessAws.Selectable)({
     make: EventCollectorChannel_DynamoDbStream$ReventlessAws.make,
     connect: EventCollectorChannel_DynamoDbStream$ReventlessAws.connect
   })({
@@ -36,8 +34,8 @@ function Make(Api) {
     let make = (dcbEventLog, opts) => {
       let sv = InnerMake.make(dcbEventLog, opts);
       let queryDbOutputs = Component$ReventlessCore.outputs(sv).queryDb;
-      let tableResource = queryDbOutputs.resources[0];
-      StateViewSliceRuntime_Builder_Single$ReventlessAws.registerStateViewSlice(Spec.name, Util_Bundle$ReventlessAws.getModuleSpecifier(Spec.moduleUrl), Util_Bundle$ReventlessAws.getModuleSpecifier(Projection.moduleUrl), tableResource.name, queryDbOutputs.resources);
+      let queryDbTableName = QueryDbBackend$ReventlessAws.isPostgresFor(Spec.name) ? Pulumi.output(Spec.name) : queryDbOutputs.resources[0].name;
+      StateViewSliceRuntime_Builder_Single$ReventlessAws.registerStateViewSlice(Spec.name, Util_Bundle$ReventlessAws.getModuleSpecifier(Spec.moduleUrl), Util_Bundle$ReventlessAws.getModuleSpecifier(Projection.moduleUrl), queryDbTableName, queryDbOutputs.resources);
       return sv;
     };
     return {
@@ -65,4 +63,4 @@ export {
   EventCollectorRuntimeBuilder,
   Make,
 }
-/* Component-ReventlessCore Not a pure module */
+/* @pulumi/pulumi Not a pure module */

package/src/plugin/runtime/PluginRuntime_Builder.res

@@ -216,6 +216,18 @@ module Make = (
       }
     }
 
+    // Classic Postgres logs: `~eventTopics` is keyed by aggregate name, so each key
+    // attaches this plugin's EventCollector queue to exactly the aggregates whose
+    // event-log DynamoDB stream the collector would have subscribed on the DynamoDB
+    // path (admin's extension-point filtering included).
+    if EventLogBackend.isPostgres() {
+      eventTopics
+      ->Dict.keysToArray
+      ->Array.forEach(aggregateName =>
+        EventLogBackend.attachCollectorQueue(~aggregateName, ~url=queue.id, ~arn=queue.arn)
+      )
+    }
+
     // Pull the per-EventCollector context registered by Plugin_Helpers.connect
     // (plugins) or synthesise an admin one if none registered.
     let context: ReventlessCore.Plugin_Helpers.eventCollectorContext =

package/src/plugin/runtime/PluginRuntime_Builder.res.mjs

@@ -14,6 +14,7 @@ import * as PluginSpec$ReventlessCore from "@reventlessdev/reventless-core/src/p
 import * as Util_Bundle$ReventlessAws from "../../util/Util_Bundle.res.mjs";
 import * as ComponentType$ReventlessCore from "@reventlessdev/reventless-core/src/ComponentType.res.mjs";
 import * as EventCollector$ReventlessCore from "@reventlessdev/reventless-core/src/components/EventCollector/EventCollector.res.mjs";
+import * as EventLogBackend$ReventlessAws from "../../adapter/EventLog/EventLogBackend.res.mjs";
 import * as Plugin_Helpers$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/component/Plugin_Helpers.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "../../adapter/Runtime/RuntimeEnvironment_Lambda.res.mjs";
 import * as StateChangeSliceRuntime_Builder_Single$ReventlessAws from "../../adapter/Runtime/StateChangeSliceRuntime_Builder_Single.res.mjs";
@@ -174,6 +175,9 @@ function Make(EventCollectorChannel) {
         DcbBackend$ReventlessAws.attachCollectorQueue(pluginName + "DcbEventLog", queue.id, queue.arn);
       }
     }
+    if (EventLogBackend$ReventlessAws.isPostgres()) {
+      Object.keys(eventTopics).forEach(aggregateName => EventLogBackend$ReventlessAws.attachCollectorQueue(aggregateName, queue.id, queue.arn));
+    }
     let ctx = Plugin_Helpers$ReventlessCore.eventCollectorContextRef.contents[name];
     let context = ctx !== undefined ? ctx : synthesizeAdminContext();
     let envVars = {};

package/tests/EventCollectorChannelStreamRuntimeTest.res

@@ -0,0 +1,55 @@
+// B3.0: the ReadModel/StateViewSlice record decoder must accept BOTH DynamoDB
+// stream records (DynamoDB backend) and SQS records (Postgres backend — bodies
+// injected by the PgChangeFeedRelay via the projection feed queue), in one batch.
+
+open JestGlobals
+
+let mkEvent = (records): PulumiAws.Lambda.CallbackFunction.event => Obj.magic({"Records": records})
+
+let sqsRecord = body =>
+  {
+    "eventSource": "aws:sqs",
+    "eventSourceARN": "arn:aws:sqs:eu-west-1:1:AllReadModelsFeed",
+    "body": body,
+  }
+
+let run = event => {
+  let seen: array<JSON.t> = []
+  let handler: ReventlessCore.EventCollector.jsonEventsHandler = stream =>
+    stream
+    ->Stream.runForEach(json => Effect.succeed(seen->Array.push(json)->ignore))
+    ->Effect.map(_ => ())
+  EventCollectorChannel_DynamoDbStream_Runtime.handleStreamEvent(handler, event, ())
+  ->Effect.runPromise
+  ->Promise.thenResolve(_ => seen)
+}
+
+describe("handleStreamEvent (ReadModel/SVS record decoder)", () => {
+  test("parses SQS feed-queue records into their JSON bodies", async () => {
+    let seen = await run(
+      mkEvent([
+        sqsRecord(`{"id":"agg-1","meta":{"service":"Product"},"event":{"type":"Added","data":{}}}`),
+        sqsRecord(`{"id":"agg-2","meta":{"service":"Product"},"event":{"type":"Added","data":{}}}`),
+      ]),
+    )
+    expect(seen->Array.length)->toBe(2)
+    let id0 =
+      seen
+      ->Array.getUnsafe(0)
+      ->JSON.Decode.object
+      ->Option.flatMap(o => o->Dict.get("id"))
+      ->Option.flatMap(JSON.Decode.string)
+    expect(id0)->toEqual(Some("agg-1"))
+  })
+
+  test("skips malformed SQS bodies and unknown sources without failing the batch", async () => {
+    let seen = await run(
+      mkEvent([
+        sqsRecord("not-json"),
+        {"eventSource": "aws:kinesis", "eventSourceARN": "arn:x", "body": "{}"},
+        sqsRecord(`{"ok":true}`),
+      ]),
+    )
+    expect(seen->Array.length)->toBe(1)
+  })
+})

package/tests/EventCollectorChannelStreamRuntimeTest.res.mjs

@@ -0,0 +1,78 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
+import * as Effect from "effect/Effect";
+import * as Stream from "effect/Stream";
+import * as EventCollectorChannel_DynamoDbStream_Runtime$ReventlessAws from "../src/adapter/EventCollector/EventCollectorChannel_DynamoDbStream_Runtime.res.mjs";
+
+function mkEvent(records) {
+  return {
+    Records: records
+  };
+}
+
+function sqsRecord(body) {
+  return {
+    eventSource: "aws:sqs",
+    eventSourceARN: "arn:aws:sqs:eu-west-1:1:AllReadModelsFeed",
+    body: body
+  };
+}
+
+function run(event) {
+  let seen = [];
+  let handler = stream => Effect.map(Stream.runForEach(stream, json => Effect.succeed((seen.push(json), undefined))), () => {});
+  return Effect.runPromise(EventCollectorChannel_DynamoDbStream_Runtime$ReventlessAws.handleStreamEvent(handler, event, undefined)).then(() => seen);
+}
+
+globalThis.describe("handleStreamEvent (ReadModel/SVS record decoder)", () => {
+  globalThis.test("parses SQS feed-queue records into their JSON bodies", async () => {
+    let seen = await run({
+      Records: [
+        {
+          eventSource: "aws:sqs",
+          eventSourceARN: "arn:aws:sqs:eu-west-1:1:AllReadModelsFeed",
+          body: `{"id":"agg-1","meta":{"service":"Product"},"event":{"type":"Added","data":{}}}`
+        },
+        {
+          eventSource: "aws:sqs",
+          eventSourceARN: "arn:aws:sqs:eu-west-1:1:AllReadModelsFeed",
+          body: `{"id":"agg-2","meta":{"service":"Product"},"event":{"type":"Added","data":{}}}`
+        }
+      ]
+    });
+    globalThis.expect(seen.length).toBe(2);
+    let id0 = Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_JSON.Decode.object(seen[0]), o => o["id"]), Stdlib_JSON.Decode.string);
+    globalThis.expect(id0).toEqual("agg-1");
+  });
+  globalThis.test("skips malformed SQS bodies and unknown sources without failing the batch", async () => {
+    let seen = await run({
+      Records: [
+        {
+          eventSource: "aws:sqs",
+          eventSourceARN: "arn:aws:sqs:eu-west-1:1:AllReadModelsFeed",
+          body: "not-json"
+        },
+        {
+          eventSource: "aws:kinesis",
+          eventSourceARN: "arn:x",
+          body: "{}"
+        },
+        {
+          eventSource: "aws:sqs",
+          eventSourceARN: "arn:aws:sqs:eu-west-1:1:AllReadModelsFeed",
+          body: `{"ok":true}`
+        }
+      ]
+    });
+    globalThis.expect(seen.length).toBe(1);
+  });
+});
+
+export {
+  mkEvent,
+  sqsRecord,
+  run,
+}
+/*  Not a pure module */