@reventlessdev/reventless-aws 3.0.0-alpha.346 → 3.0.0-alpha.348

package/src/Platform.res.mjs

@@ -873,7 +873,7 @@ function MakeWithConfig(Config) {
       }
     });
     PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, Config.cloner, undefined);
-    let offloadProtection = Util_StoreLayout$ReventlessAws.protectionFor(Pulumi.getStack(), undefined);
+    let offloadProtection = Util_StoreLayout$ReventlessAws.protectionOfDeployedStack();
     let offloadBucket = new (Aws.s3.Bucket)("reventless-offload", {
       forceDestroy: offloadProtection === "Unprotected",
       tags: AWS_Tags$ReventlessAws.make("reventless-offload", "Platform", {
@@ -892,6 +892,7 @@ function MakeWithConfig(Config) {
       restrictPublicBuckets: true
     });
     Pulumi$Pulumi.$$export("offloadBucket", offloadBucketName);
+    Pulumi$Pulumi.$$export("platformStack", Pulumi.output(Pulumi.getOrganization() + `/` + Pulumi.getProject() + `/` + Pulumi.getStack()));
     let componentDefinitions = pluginReadModelTableName !== undefined ? (AggregateRuntime_Builder_Single$ReventlessAws.setPluginReadModelTable(pluginReadModelTableName), Platform_ComponentDefinitions_Lambda$ReventlessAws.make(platformApi, pluginReadModelTableName, offloadBucketName, admin.adminSchemaPushed, Stdlib_Option.flatMap(hostUiBundle, cfg => cfg.bakedManifest), {})) : undefined;
     let rm = admin.stateViewSlicesOutputs["UiFragments"];
     if (rm !== undefined) {
@@ -969,7 +970,7 @@ function MakeWithConfig(Config) {
     });
     let stackName = Pulumi.getStack();
     let storeLayout = Util_StoreLayout$ReventlessAws.layoutFor(stackName, Util_HostUiDomain$ReventlessAws.resolveProdStacks());
-    let storeProtection = Util_StoreLayout$ReventlessAws.protectionFor(stackName, undefined);
+    let storeProtection = Util_StoreLayout$ReventlessAws.protectionOfDeployedStack();
     let declaredStores = Stdlib_Array.reduce(Stdlib_Array.filterMap(capabilities, c => {
       if (typeof c !== "object") {
         return;
@@ -1327,6 +1328,9 @@ function MakeWithConfig(Config) {
   let startServers = () => {};
   let deployPlugin = (plugin, apiTargetOpt) => {
     let apiTarget = apiTargetOpt !== undefined ? apiTargetOpt : "Domain";
+    if (Stdlib_Option.isNone(platformStackRef)) {
+      Stdlib_JsError.throwWithMessage(`This plugin stack has no platform:stack setting, so it cannot find its platform. Set it to the platform's stack: pulumi config set platform:stack ` + (Pulumi.getOrganization() + `/<platform project>/` + Pulumi.getStack()));
+    }
     let tmp;
     tmp = apiTarget === "Domain" ? "Domain" : "Platform";
     log.info("Platform:deployPlugin", undefined, `target=` + tmp);
@@ -2260,7 +2264,7 @@ function Make($star) {
       }
     });
     PluginRuntime_Builder$ReventlessAws.registerConfig(pluginEpEventTopicArn, pluginReadModelTableName, hooks_schedulerRoleUrn.contents, undefined, undefined, domainApiId, false, undefined);
-    let offloadProtection = Util_StoreLayout$ReventlessAws.protectionFor(Pulumi.getStack(), undefined);
+    let offloadProtection = Util_StoreLayout$ReventlessAws.protectionOfDeployedStack();
     let offloadBucket = new (Aws.s3.Bucket)("reventless-offload", {
       forceDestroy: offloadProtection === "Unprotected",
       tags: AWS_Tags$ReventlessAws.make("reventless-offload", "Platform", {
@@ -2279,6 +2283,7 @@ function Make($star) {
       restrictPublicBuckets: true
     });
     Pulumi$Pulumi.$$export("offloadBucket", offloadBucketName);
+    Pulumi$Pulumi.$$export("platformStack", Pulumi.output(Pulumi.getOrganization() + `/` + Pulumi.getProject() + `/` + Pulumi.getStack()));
     let componentDefinitions = pluginReadModelTableName !== undefined ? (AggregateRuntime_Builder_Single$ReventlessAws.setPluginReadModelTable(pluginReadModelTableName), Platform_ComponentDefinitions_Lambda$ReventlessAws.make(platformApi, pluginReadModelTableName, offloadBucketName, admin.adminSchemaPushed, Stdlib_Option.flatMap(hostUiBundle, cfg => cfg.bakedManifest), {})) : undefined;
     let rm = admin.stateViewSlicesOutputs["UiFragments"];
     if (rm !== undefined) {
@@ -2350,7 +2355,7 @@ function Make($star) {
     });
     let stackName = Pulumi.getStack();
     let storeLayout = Util_StoreLayout$ReventlessAws.layoutFor(stackName, Util_HostUiDomain$ReventlessAws.resolveProdStacks());
-    let storeProtection = Util_StoreLayout$ReventlessAws.protectionFor(stackName, undefined);
+    let storeProtection = Util_StoreLayout$ReventlessAws.protectionOfDeployedStack();
     let declaredStores = Stdlib_Array.reduce(Stdlib_Array.filterMap(capabilities, c => {
       if (typeof c !== "object") {
         return;
@@ -2706,6 +2711,9 @@ function Make($star) {
   let startServers = () => {};
   let deployPlugin = (plugin, apiTargetOpt) => {
     let apiTarget = apiTargetOpt !== undefined ? apiTargetOpt : "Domain";
+    if (Stdlib_Option.isNone(platformStackRef)) {
+      Stdlib_JsError.throwWithMessage(`This plugin stack has no platform:stack setting, so it cannot find its platform. Set it to the platform's stack: pulumi config set platform:stack ` + (Pulumi.getOrganization() + `/<platform project>/` + Pulumi.getStack()));
+    }
     let tmp;
     tmp = apiTarget === "Domain" ? "Domain" : "Platform";
     log.info("Platform:deployPlugin", undefined, `target=` + tmp);

package/src/adapter/Api/Platform_ComponentDefinitions_Lambda.res

@@ -217,11 +217,7 @@ let make = (
     ~bundleRuntimeExtensions=false,
   )
 
-  let layers =
-    Lambda.reventlessLayerArn
-    ->Option.map(arn => [arn->Pulumi.Input.make])
-    ->Option.getOr([])
-    ->Pulumi.Input.make
+  let layers = Lambda.reventlessLayers()
 
   // Created before the function that writes to it — see
   // `Util_LambdaLogging.makeManagedLogGroup` for why the ordering matters.

package/src/adapter/Api/Platform_ComponentDefinitions_Lambda.res.mjs

@@ -116,7 +116,7 @@ function make(api, pluginReadModelTableName, offloadBucketName, schemaReady, bak
       "adminEntry.json",
       adminEntryJson
     ]]), false);
-  let layers = Stdlib_Option.getOr(Stdlib_Option.map(Lambda$PulumiAws.reventlessLayerArn, arn => [arn]), []);
+  let layers = Lambda$PulumiAws.reventlessLayers();
   let logGroup = Util_LambdaLogging$ReventlessAws.makeManagedLogGroup(name + "Lambda", undefined, AWS_Tags$ReventlessAws.make(name + "LambdaLogGroup", "Platform", "Logs", "Platform", undefined, undefined, undefined, undefined), opts$1, undefined);
   let lambda = new (Aws.lambda.Function)(name + "Lambda", {
     handler: "index.handler",

package/src/adapter/Api/Platform_UIFragments_Lambda.res

@@ -89,11 +89,7 @@ let make = (
     ~bundleRuntimeExtensions=false,
   )
 
-  let layers =
-    Lambda.reventlessLayerArn
-    ->Option.map(arn => [arn->Pulumi.Input.make])
-    ->Option.getOr([])
-    ->Pulumi.Input.make
+  let layers = Lambda.reventlessLayers()
 
   // Created before the function that writes to it — see
   // `Util_LambdaLogging.makeManagedLogGroup` for why the ordering matters.

package/src/adapter/Api/Platform_UIFragments_Lambda.res.mjs

@@ -3,7 +3,6 @@
 import * as Aws from "@pulumi/aws";
 import * as IAM$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/IAM.res.mjs";
 import * as Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output.res.mjs";
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
 import * as AWS$ReventlessAws from "../AWS.res.mjs";
@@ -53,7 +52,7 @@ function make(api, uiFragmentRegistryTableName, schemaReady, opts) {
       Util_Bundle$ReventlessAws.resolvePackageRoot(undefined, "@reventlessdev/reventless-aws")
     ]]);
   let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Api/Platform_UIFragments_Lambda_Ops.res.mjs", packageDirs, undefined, false);
-  let layers = Stdlib_Option.getOr(Stdlib_Option.map(Lambda$PulumiAws.reventlessLayerArn, arn => [arn]), []);
+  let layers = Lambda$PulumiAws.reventlessLayers();
   let logGroup = Util_LambdaLogging$ReventlessAws.makeManagedLogGroup(name + "Lambda", undefined, AWS_Tags$ReventlessAws.make(name + "LambdaLogGroup", "Platform", "Logs", "Platform", undefined, undefined, undefined, undefined), opts$1, undefined);
   let lambda = new (Aws.lambda.Function)(name + "Lambda", {
     handler: "index.handler",

package/src/adapter/Auth/Auth_ActiveRoleStore.res

@@ -261,11 +261,7 @@ let makeWriteDoor = (
     ~bundleRuntimeExtensions=false,
   )
 
-  let layers =
-    Lambda.reventlessLayerArn
-    ->Option.map(arn => [arn->Pulumi.Input.make])
-    ->Option.getOr([])
-    ->Pulumi.Input.make
+  let layers = Lambda.reventlessLayers()
 
   let logGroup = Util_LambdaLogging.makeManagedLogGroup(
     ~name=name ++ "Lambda",

package/src/adapter/Auth/Auth_ActiveRoleStore.res.mjs

@@ -3,7 +3,6 @@
 import * as Aws from "@pulumi/aws";
 import * as IAM$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/IAM.res.mjs";
 import * as Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output.res.mjs";
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
 import * as AWS$ReventlessAws from "../AWS.res.mjs";
@@ -136,7 +135,7 @@ function makeWriteDoor(api, table, cognitoUserPoolId, cognitoUserPoolArn, nameOp
       Util_Bundle$ReventlessAws.resolvePackageRoot(undefined, "@reventlessdev/reventless-aws")
     ]]);
   let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Auth/Auth_ActiveRoleStore_Ops.res.mjs", packageDirs, undefined, false);
-  let layers = Stdlib_Option.getOr(Stdlib_Option.map(Lambda$PulumiAws.reventlessLayerArn, arn => [arn]), []);
+  let layers = Lambda$PulumiAws.reventlessLayers();
   let logGroup = Util_LambdaLogging$ReventlessAws.makeManagedLogGroup(name + "Lambda", undefined, AWS_Tags$ReventlessAws.make(name + "LambdaLogGroup", "Platform", "Logs", "Platform", undefined, undefined, undefined, undefined), opts$1, undefined);
   let lambda = new (Aws.lambda.Function)(name + "Lambda", {
     handler: "index.handler",

package/src/adapter/Auth/Auth_ActiveRoleTrigger.res

@@ -99,11 +99,7 @@ let make = (
     ~bundleRuntimeExtensions=false,
   )
 
-  let layers =
-    Lambda.reventlessLayerArn
-    ->Option.map(arn => [arn->Pulumi.Input.make])
-    ->Option.getOr([])
-    ->Pulumi.Input.make
+  let layers = Lambda.reventlessLayers()
 
   let logGroup = Util_LambdaLogging.makeManagedLogGroup(
     ~name,

package/src/adapter/Auth/Auth_ActiveRoleTrigger.res.mjs

@@ -2,7 +2,6 @@
 
 import * as Aws from "@pulumi/aws";
 import * as IAM$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/IAM.res.mjs";
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
 import * as AWS$ReventlessAws from "../AWS.res.mjs";
@@ -45,7 +44,7 @@ function make(activeRoleTableName, activeRoleTableArn, nameOpt, opts) {
     ]]);
   let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Auth/Auth_ActiveRoleTrigger_Ops.res.mjs", packageDirs, undefined, false);
   let sourceCodeHash = match.sourceCodeHash;
-  let layers = Stdlib_Option.getOr(Stdlib_Option.map(Lambda$PulumiAws.reventlessLayerArn, arn => [arn]), []);
+  let layers = Lambda$PulumiAws.reventlessLayers();
   let logGroup = Util_LambdaLogging$ReventlessAws.makeManagedLogGroup(name, undefined, AWS_Tags$ReventlessAws.make(name + "LogGroup", "Platform", "Logs", "Platform", undefined, undefined, undefined, undefined), opts$1, undefined);
   let lambda = new (Aws.lambda.Function)(name, {
     handler: "index.handler",

package/src/adapter/DcbEventLog/DcbEventLogStorage_DynamoDb_Runtime.res

@@ -61,28 +61,55 @@ let compositeTagKey = (tags: array<Reventless.DcbTag.tag>) =>
 
 // --- Partition Key Derivation ---
 
-let derivePartitionKey = (
-  ~partitionTag: option<Reventless.DcbTag.derivedPartitionTag>=?,
+// The tag an event is filed under: the one named by its partition key. An event
+// that lacks it throws — filing it under another tag would put it where no
+// decision read of its entity looks. With no partition configured at all (a
+// single-tag log), the event's only tag.
+let partitionTagOfEvent = (
+  ~partitionTag: option<Reventless.DcbTag.derivedPartitionTag>,
+  ~eventType: string,
   tags: array<Reventless.DcbTag.tag>,
-): string => {
-  if tags->Array.length == 0 {
-    "dcb"
-  } else {
-    switch partitionTag {
+): option<Reventless.DcbTag.tag> => {
+  let byKey = key =>
+    switch tags->Array.find(t => t.key == key) {
+    | Some(t) => Some(t)
     | None =>
-      let tag = tags->Array.getUnsafe(0)
-      `${tag.key}:${tag.value}`
-    | Some(Simple(pt)) =>
-      let tag = switch tags->Array.find(t => t.key == pt.key) {
-      | Some(t) => t
-      | None => tags->Array.getUnsafe(0)
-      }
-      `${tag.key}:${tag.value}`
-    | Some(Composite(spec)) => Reventless.DcbTag.getCompositePartitionKeyValue(tags, spec)
+      JsError.throwWithMessage(
+        `DCB event ${eventType} carries no ${key} tag (tags: ${tags
+          ->Array.map(t => t.key)
+          ->Array.join(", ")}) — it cannot be filed under its partition`,
+      )
+    }
+  switch (tags, partitionTag) {
+  | ([], _) | (_, Some(Composite(_))) => None
+  | (_, None) => tags->Array.get(0)
+  | (_, Some(Simple({key}))) => byKey(key)
+  | (_, Some(ByEventType(keys))) =>
+    switch keys->Dict.get(eventType) {
+    | Some(key) => byKey(key)
+    | None =>
+      JsError.throwWithMessage(
+        `DCB event ${eventType} has no partition key — no slice of this boundary writes it`,
+      )
     }
   }
 }
 
+let derivePartitionKey = (
+  ~partitionTag: option<Reventless.DcbTag.derivedPartitionTag>=?,
+  ~eventType: string,
+  tags: array<Reventless.DcbTag.tag>,
+): string =>
+  switch (tags, partitionTag) {
+  | ([], _) => "dcb"
+  | (_, Some(Composite(spec))) => Reventless.DcbTag.getCompositePartitionKeyValue(tags, spec)
+  | _ =>
+    switch partitionTagOfEvent(~partitionTag, ~eventType, tags) {
+    | Some(tag) => `${tag.key}:${tag.value}`
+    | None => "dcb"
+    }
+  }
+
 // --- Item Conversion ---
 
 let toItem = (
@@ -93,7 +120,10 @@ let toItem = (
 ): JSON.t => {
   // Create base item
   let item = Dict.make()
-  item->Dict.set("id", derivePartitionKey(~partitionTag?, event.tags)->JSON.Encode.string)
+  item->Dict.set(
+    "id",
+    derivePartitionKey(~partitionTag?, ~eventType=event.eventType, event.tags)->JSON.Encode.string,
+  )
   item->Dict.set("position", position->JSON.Encode.string)
   item->Dict.set("event", event.eventType->JSON.Encode.string)
   item->Dict.set("data", event.data)
@@ -985,20 +1015,11 @@ let eventPartitionTags = (
 ): array<Reventless.DcbTag.tag> =>
   switch partitionTag {
   | Some(Composite(spec)) => [makeCompositeFenceTag(event.tags, spec)]
-  | Some(Simple(pt)) =>
-    switch event.tags->Array.find(t => t.key == pt.key) {
-    | Some(t) => [t]
-    | None =>
-      switch event.tags->Array.get(0) {
-      | Some(t) => [t]
-      | None => []
-      }
-    }
-  | None =>
-    switch event.tags->Array.get(0) {
-    | Some(t) => [t]
-    | None => []
-    }
+  | _ =>
+    partitionTagOfEvent(~partitionTag, ~eventType=event.eventType, event.tags)->Option.mapOr(
+      [],
+      t => [t],
+    )
   }
 
 let collectEventPartitionTags = (

package/src/adapter/DcbEventLog/DcbEventLogStorage_DynamoDb_Runtime.res.mjs

@@ -64,26 +64,60 @@ function compositeTagKey(tags) {
   return tags.toSorted((a, b) => Primitive_string.compare(a.key, b.key)).map(t => t.key + `:` + t.value).join("#");
 }
 
-function derivePartitionKey(partitionTag, tags) {
+function partitionTagOfEvent(partitionTag, eventType, tags) {
+  let byKey = key => {
+    let t = tags.find(t => t.key === key);
+    if (t !== undefined) {
+      return t;
+    } else {
+      return Stdlib_JsError.throwWithMessage(`DCB event ` + eventType + ` carries no ` + key + ` tag (tags: ` + tags.map(t => t.key).join(", ") + `) — it cannot be filed under its partition`);
+    }
+  };
+  if (tags.length === 0) {
+    return;
+  }
+  if (partitionTag === undefined) {
+    return tags[0];
+  }
+  switch (partitionTag.TAG) {
+    case "Simple" :
+      return byKey(partitionTag._0.key);
+    case "Composite" :
+      return;
+    case "ByEventType" :
+      let key = partitionTag._0[eventType];
+      if (key !== undefined) {
+        return byKey(key);
+      } else {
+        return Stdlib_JsError.throwWithMessage(`DCB event ` + eventType + ` has no partition key — no slice of this boundary writes it`);
+      }
+  }
+}
+
+function derivePartitionKey(partitionTag, eventType, tags) {
   if (tags.length === 0) {
     return "dcb";
   }
   if (partitionTag !== undefined) {
-    if (partitionTag.TAG !== "Simple") {
-      return DcbTag$Reventless.getCompositePartitionKeyValue(tags, partitionTag._0);
+    switch (partitionTag.TAG) {
+      case "Composite" :
+        return DcbTag$Reventless.getCompositePartitionKeyValue(tags, partitionTag._0);
+      case "Simple" :
+      case "ByEventType" :
+        break;
     }
-    let pt = partitionTag._0;
-    let t = tags.find(t => t.key === pt.key);
-    let tag = t !== undefined ? t : tags[0];
+  }
+  let tag = partitionTagOfEvent(partitionTag, eventType, tags);
+  if (tag !== undefined) {
     return tag.key + `:` + tag.value;
+  } else {
+    return "dcb";
   }
-  let tag$1 = tags[0];
-  return tag$1.key + `:` + tag$1.value;
 }
 
 function toItem(position, event, partitionTag, recordedAt) {
   let item = {};
-  item["id"] = derivePartitionKey(partitionTag, event.tags);
+  item["id"] = derivePartitionKey(partitionTag, event.eventType, event.tags);
   item["position"] = position;
   item["event"] = event.eventType;
   item["data"] = event.data;
@@ -733,27 +767,15 @@ function makeCompositeFenceTag(tags, spec) {
 
 function eventPartitionTags(event, partitionTag) {
   if (partitionTag !== undefined) {
-    if (partitionTag.TAG !== "Simple") {
-      return [makeCompositeFenceTag(event.tags, partitionTag._0)];
-    }
-    let pt = partitionTag._0;
-    let t = event.tags.find(t => t.key === pt.key);
-    if (t !== undefined) {
-      return [t];
-    }
-    let t$1 = event.tags[0];
-    if (t$1 !== undefined) {
-      return [t$1];
-    } else {
-      return [];
+    switch (partitionTag.TAG) {
+      case "Composite" :
+        return [makeCompositeFenceTag(event.tags, partitionTag._0)];
+      case "Simple" :
+      case "ByEventType" :
+        break;
     }
   }
-  let t$2 = event.tags[0];
-  if (t$2 !== undefined) {
-    return [t$2];
-  } else {
-    return [];
-  }
+  return Stdlib_Option.mapOr(partitionTagOfEvent(partitionTag, event.eventType, event.tags), [], t => [t]);
 }
 
 function collectEventPartitionTags(events, partitionTag) {
@@ -790,22 +812,30 @@ function partitionTypesByTag(events, partitionTag) {
 function buildConditionalTransactItems(table, events, cond, basePosition, partitionTag, crossPartitionTagKeysOpt) {
   let crossPartitionTagKeys = crossPartitionTagKeysOpt !== undefined ? crossPartitionTagKeysOpt : [];
   let cond$1;
-  if (partitionTag !== undefined && partitionTag.TAG !== "Simple") {
-    let spec = partitionTag._0;
-    let newrecord = {...cond};
-    newrecord.query = cond.query.map(qi => {
-      let clauseTags = qi.tags;
-      if (clauseTags === undefined) {
-        return qi;
-      }
-      if (clauseTags.length <= 1) {
-        return qi;
-      }
-      let newrecord = {...qi};
-      newrecord.tags = [makeCompositeFenceTag(clauseTags, spec)];
-      return newrecord;
-    });
-    cond$1 = newrecord;
+  if (partitionTag !== undefined) {
+    switch (partitionTag.TAG) {
+      case "Composite" :
+        let spec = partitionTag._0;
+        let newrecord = {...cond};
+        newrecord.query = cond.query.map(qi => {
+          let clauseTags = qi.tags;
+          if (clauseTags === undefined) {
+            return qi;
+          }
+          if (clauseTags.length <= 1) {
+            return qi;
+          }
+          let newrecord = {...qi};
+          newrecord.tags = [makeCompositeFenceTag(clauseTags, spec)];
+          return newrecord;
+        });
+        cond$1 = newrecord;
+        break;
+      case "Simple" :
+      case "ByEventType" :
+        cond$1 = cond;
+        break;
+    }
   } else {
     cond$1 = cond;
   }
@@ -1166,6 +1196,7 @@ export {
   compositeIndexName,
   indexKeepsFullProjection,
   compositeTagKey,
+  partitionTagOfEvent,
   derivePartitionKey,
   toItem,
   fromItem,

package/src/adapter/EventLogSubscription/EventLogSubscription_AppSync.res

@@ -173,11 +173,7 @@ let make = (
     ~bundleRuntimeExtensions=false,
   )
 
-  let layers =
-    Lambda.reventlessLayerArn
-    ->Option.map(arn => [arn->Pulumi.Input.make])
-    ->Option.getOr([])
-    ->Pulumi.Input.make
+  let layers = Lambda.reventlessLayers()
 
   let appsyncEndpoint = AppSync_EventsApi.httpEndpoint(eventsApi)
 

package/src/adapter/EventLogSubscription/EventLogSubscription_AppSync.res.mjs

@@ -2,7 +2,6 @@
 
 import * as Aws from "@pulumi/aws";
 import * as IAM$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/IAM.res.mjs";
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
 import * as AWS$ReventlessAws from "../AWS.res.mjs";
@@ -90,7 +89,7 @@ function make(name, topicName, eventTopicOutputs, eventsApi, opts) {
       Util_Bundle$ReventlessAws.resolvePackageRoot(undefined, "@reventlessdev/reventless-aws")
     ]]);
   let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/EventLogSubscription/EventLogSubscription_AppSync_Ops.res.mjs", packageDirs, undefined, false);
-  let layers = Stdlib_Option.getOr(Stdlib_Option.map(Lambda$PulumiAws.reventlessLayerArn, arn => [arn]), []);
+  let layers = Lambda$PulumiAws.reventlessLayers();
   let appsyncEndpoint = AppSync_EventsApi$ReventlessAws.httpEndpoint(eventsApi);
   let lambda = new (Aws.lambda.Function)(name + "EventLogSubscriber", {
     handler: "index.handler",

package/src/adapter/Geocoder/Geocoder_AwsLocation_Resolver.res

@@ -115,11 +115,7 @@ let make = (
     ~bundleRuntimeExtensions=false,
   )
 
-  let layers =
-    Lambda.reventlessLayerArn
-    ->Option.map(arn => [arn->Pulumi.Input.make])
-    ->Option.getOr([])
-    ->Pulumi.Input.make
+  let layers = Lambda.reventlessLayers()
 
   // Created before the function that writes to it — see
   // `Util_LambdaLogging.makeManagedLogGroup` for why the ordering matters.

package/src/adapter/Geocoder/Geocoder_AwsLocation_Resolver.res.mjs

@@ -3,7 +3,6 @@
 import * as Aws from "@pulumi/aws";
 import * as IAM$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/IAM/IAM.res.mjs";
 import * as Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output.res.mjs";
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
 import * as AWS$ReventlessAws from "../AWS.res.mjs";
@@ -57,7 +56,7 @@ function make(api, placeIndexName, nameOpt, opts) {
       Util_Bundle$ReventlessAws.resolvePackageRoot(undefined, "@reventlessdev/reventless-aws")
     ]]);
   let match = Util_Bundle$ReventlessAws.buildCodeArchive("@reventlessdev/reventless-aws/src/adapter/Geocoder/Geocoder_AwsLocation_Resolver_Ops.res.mjs", packageDirs, undefined, false);
-  let layers = Stdlib_Option.getOr(Stdlib_Option.map(Lambda$PulumiAws.reventlessLayerArn, arn => [arn]), []);
+  let layers = Lambda$PulumiAws.reventlessLayers();
   let logGroup = Util_LambdaLogging$ReventlessAws.makeManagedLogGroup(name + "Lambda", undefined, AWS_Tags$ReventlessAws.make(name + "LambdaLogGroup", "Platform", "Logs", "Platform", undefined, undefined, undefined, undefined), opts$1, undefined);
   let lambda = new (Aws.lambda.Function)(name + "Lambda", {
     handler: "index.handler",

package/src/adapter/Postgres/PgChangeFeedRelay_Runtime.res

@@ -27,6 +27,7 @@ let toEventCollectorJson = (
     "id",
     DcbEventLogStorage_DynamoDb_Runtime.derivePartitionKey(
       ~partitionTag?,
+      ~eventType=event.eventType,
       event.tags,
     )->JSON.Encode.string,
   )
@@ -55,10 +56,10 @@ let relayWithPool = async (
   ~pool: ReventlessPostgres.PgDriver.pool,
   ~logName: string,
   ~subscriber: string,
-  // ~partitionTagJson: the DCB log's partition tag, sury-encoded into HANDLER_CONFIG
-  // by the relay builder (B2.3d). Parsed once via the shared derivedPartitionTagSchema
-  // so the `id` the relay emits matches the DynamoDB-stream path. Absent → None (a
-  // single-tag log derives the same id without it).
+  // ~partitionTagJson: the DCB log's partition (the per-event-type key map, or a
+  // composite), sury-encoded into HANDLER_CONFIG by the relay builder (B2.3d). Parsed
+  // once via the shared derivedPartitionTagSchema so the `id` the relay emits matches
+  // the DynamoDB-stream path. Absent → None (a single-tag log derives the same id).
   ~partitionTagJson: option<JSON.t>=?,
   ~sendBatch: array<JSON.t> => promise<unit>,
 ): int => {

package/src/adapter/Postgres/PgChangeFeedRelay_Runtime.res.mjs

@@ -14,7 +14,7 @@ import * as DcbEventLogStorage_DynamoDb_Runtime$ReventlessAws from "../DcbEventL
 
 function toEventCollectorJson(event, partitionTag) {
   let item = {};
-  item["id"] = DcbEventLogStorage_DynamoDb_Runtime$ReventlessAws.derivePartitionKey(partitionTag, event.tags);
+  item["id"] = DcbEventLogStorage_DynamoDb_Runtime$ReventlessAws.derivePartitionKey(partitionTag, event.eventType, event.tags);
   item["position"] = event.position;
   item["event"] = event.eventType;
   item["data"] = event.data;

package/src/adapter/Postgres/PgMigration_Builder.res

@@ -88,7 +88,7 @@ let make = (
 
   // Re-invoke whenever the migration code or the Reventless layer (which ships
   // PgSchema's DDL) changes; idempotent DDL makes an unchanged re-run a no-op.
-  let layerArn = PulumiAws.Lambda.reventlessLayerArn->Option.getOr("no-layer")
+  let layerArn = PulumiAws.Lambda.reventlessLayerArn()
   let inputJson =
     [("trigger", `${sourceCodeHash}:${layerArn}`->JSON.Encode.string)]
     ->Dict.fromArray

package/src/adapter/Postgres/PgMigration_Builder.res.mjs

@@ -2,7 +2,6 @@
 
 import * as Aws from "@pulumi/aws";
 import * as Output$Pulumi from "@reventlessdev/rescript-pulumi-pulumi/src/Output.res.mjs";
-import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Lambda$PulumiAws from "@reventlessdev/rescript-pulumi-aws/src/Lambda/Lambda.res.mjs";
 import * as Adapter$ReventlessInfra from "@reventlessdev/reventless-infra/src/adapter/Adapter.res.mjs";
@@ -34,7 +33,7 @@ function make(name, handlerConfig, secretArn, securityGroupId, subnetIds, opts)
       }]))),
     role: runtime.parts.lambdaRole.id
   });
-  let layerArn = Stdlib_Option.getOr(Lambda$PulumiAws.reventlessLayerArn, "no-layer");
+  let layerArn = Lambda$PulumiAws.reventlessLayerArn();
   let inputJson = JSON.stringify(Object.fromEntries([[
       "trigger",
       sourceCodeHash + `:` + layerArn

package/src/adapter/Runtime/CommandGeneratorEntryPoint_Ops.res

@@ -22,6 +22,7 @@ let makeCommandGenerator = (
   ~commandSchema,
   ~componentKind: ReventlessCore.CommandGenerator_Callback.commandComponentKind,
   ~stripIdFromParams: bool,
+  ~partitionTag: option<Reventless.DcbTag.derivedPartitionTag>=?,
 ): ReventlessCore.CommandGenerator.commandGenerator =>
   ReventlessCore.CommandGenerator_Callback.makeGenerateCommand(
     ~publishJsons,
@@ -30,4 +31,5 @@ let makeCommandGenerator = (
     ~commandSchema,
     ~componentKind,
     ~stripIdFromParams,
+    ~partitionTag?,
   )

package/src/adapter/Runtime/CommandGeneratorEntryPoint_Ops.res.mjs

@@ -2,8 +2,8 @@
 
 import * as CommandGenerator_Callback$ReventlessCore from "@reventlessdev/reventless-core/src/components/CommandGenerator/CommandGenerator_Callback.res.mjs";
 
-function makeCommandGenerator(publishJsons, publishJsonsAndWait, serviceName, commandSchema, componentKind, stripIdFromParams) {
-  return CommandGenerator_Callback$ReventlessCore.makeGenerateCommand(publishJsons, publishJsonsAndWait, serviceName, commandSchema, componentKind, stripIdFromParams);
+function makeCommandGenerator(publishJsons, publishJsonsAndWait, serviceName, commandSchema, componentKind, stripIdFromParams, partitionTag) {
+  return CommandGenerator_Callback$ReventlessCore.makeGenerateCommand(publishJsons, publishJsonsAndWait, serviceName, commandSchema, componentKind, stripIdFromParams, partitionTag);
 }
 
 export {