@reventlessdev/online-shop-aggregates-ordering 3.0.0-alpha.237 → 3.0.0-alpha.239

package/lib/ocaml/Customer_GWT.res

@@ -14,10 +14,7 @@ describe("Customer Behavior", () => {
   )
 
   test("Register on deactivated aggregate returns CustomerAlreadyDeactivated", () =>
-    givenEvents([
-      Registered({email: "alice@example.com", address: "123 Main St"}),
-      Deactivated,
-    ])
+    givenEvents([Registered({email: "alice@example.com", address: "123 Main St"}), Deactivated])
     ->whenCmd(Register({email: "bob@example.com", address: "456 Oak Ave"}))
     ->thenError(CustomerAlreadyDeactivated)
   )
@@ -41,10 +38,7 @@ describe("Customer Behavior", () => {
   )
 
   test("UpdateEmail on deactivated customer returns CustomerAlreadyDeactivated", () =>
-    givenEvents([
-      Registered({email: "alice@example.com", address: "123 Main St"}),
-      Deactivated,
-    ])
+    givenEvents([Registered({email: "alice@example.com", address: "123 Main St"}), Deactivated])
     ->whenCmd(UpdateEmail({email: "bob@example.com"}))
     ->thenError(CustomerAlreadyDeactivated)
   )
@@ -80,10 +74,7 @@ describe("Customer Behavior", () => {
   )
 
   test("Deactivate on deactivated customer produces no events (idempotent)", () =>
-    givenEvents([
-      Registered({email: "alice@example.com", address: "123 Main St"}),
-      Deactivated,
-    ])
+    givenEvents([Registered({email: "alice@example.com", address: "123 Main St"}), Deactivated])
     ->whenCmd(Deactivate)
     ->thenNoEvent
   )

package/lib/ocaml/Customers.res

@@ -12,4 +12,3 @@ type state = {
   address: string,
   deactivated: bool,
 }
-

package/lib/ocaml/Customers_Projections.res

@@ -9,8 +9,7 @@ module CustomerMapping = Mapping.Make(
     open Customer
     let project = ({event, id, _}) =>
       switch event {
-      | Registered({email, address}) =>
-        Set(id, {Customers.email: email, address, deactivated: false})
+      | Registered({email, address}) => Set(id, {Customers.email, address, deactivated: false})
       | EmailUpdated({email}) => Update(id, state => {...state, email})
       | AddressUpdated({address}) => Update(id, state => {...state, address})
       | Deactivated => Update(id, state => {...state, deactivated: true})

package/lib/ocaml/LifecycleModel.res

@@ -7,8 +7,32 @@
 // annotation where it is silent.
 
 let model: array<Reventless.Plugin.derivedEdge> = [
-  {component: "Order", command: "Cancel", level: Reventless.Plugin.Instance, allowedStates: ["Placed"], targets: ["Cancelled"]},
-  {component: "Order", command: "Place", level: Reventless.Plugin.Collection, allowedStates: [], targets: ["Placed"]},
-  {component: "Order", command: "Refund", level: Reventless.Plugin.Instance, allowedStates: ["Cancelled"], targets: ["Refunded"]},
-  {component: "Order", command: "Ship", level: Reventless.Plugin.Instance, allowedStates: ["Placed"], targets: ["Shipped"]},
+  {
+    component: "Order",
+    command: "Cancel",
+    level: Reventless.Plugin.Instance,
+    allowedStates: ["Placed"],
+    targets: ["Cancelled"],
+  },
+  {
+    component: "Order",
+    command: "Place",
+    level: Reventless.Plugin.Collection,
+    allowedStates: [],
+    targets: ["Placed"],
+  },
+  {
+    component: "Order",
+    command: "Refund",
+    level: Reventless.Plugin.Instance,
+    allowedStates: ["Cancelled"],
+    targets: ["Refunded"],
+  },
+  {
+    component: "Order",
+    command: "Ship",
+    level: Reventless.Plugin.Instance,
+    allowedStates: ["Placed"],
+    targets: ["Shipped"],
+  },
 ]

package/lib/ocaml/OrderMappings_GWT.res

@@ -43,9 +43,7 @@ describe("Order auto-ship mapping (Placed → Ship)", () => {
 
   test("Refund command does not fire the mapping (only Placed events do)", () =>
     givenSourceEvents([placedEvent, Order.Cancelled({productIds: ["prod-1"]})])
-    ->andTargetEvents([
-      ("order-1", [placedEvent, Order.Cancelled({productIds: ["prod-1"]})]),
-    ])
+    ->andTargetEvents([("order-1", [placedEvent, Order.Cancelled({productIds: ["prod-1"]})])])
     ->whenSourceCmd("order-1", Refund({reason: "customer-changed-mind"}))
     ->thenNoTargetEvent
   )

package/lib/ocaml/OrderNotifications.res

@@ -4,5 +4,5 @@
 @@reventless.task
 
 let setup = (_queryEngine, _queryBucketName, _opts) => {
-  Task.sideEffects: [module(Order_EmailNotification): module(SideEffect.T)],
+  Task.sideEffects: [module(Order_EmailNotification: SideEffect.T)],
 }

package/lib/ocaml/Order_Behavior.res

@@ -29,8 +29,7 @@ let evolve = (state, event) =>
 
 let decide = (state, command) =>
   switch (state, command) {
-  | (NotCreated, Place({customerId, productIds})) =>
-    Ok([Order.Placed({customerId, productIds})])
+  | (NotCreated, Place({customerId, productIds})) => Ok([Order.Placed({customerId, productIds})])
   | (NotCreated, Ship) => Error(OrderNotFound)
   | (NotCreated, Cancel) => Error(OrderNotFound)
   | (NotCreated, Refund(_)) => Error(OrderNotFound)

package/lib/ocaml/Order_EmailNotification.res

@@ -10,9 +10,6 @@ module Source = {
 let execute = async (orderId, _meta, event, _queryEngine) =>
   switch event {
   | Order.Placed({customerId}) =>
-    await EmailService.sendOrderConfirmation(
-      ~email=customerId,
-      ~orderId=orderId->Order.Id.toString,
-    )
+    await EmailService.sendOrderConfirmation(~email=customerId, ~orderId=orderId->Order.Id.toString)
   | _ => ()
   }

package/lib/ocaml/Orders.res

@@ -18,4 +18,3 @@ type state = {
   // records whose lifecycle field is honestly called something else.
   lifecycle: lifecycle,
 }
-

package/lib/ocaml/Orders_ExtensionPointMapping.res

@@ -7,22 +7,19 @@ module Delegate = Order
 
 let mapIncomingCommand = (_id, _command, _meta) => []
 
-let mapOutgoingEvent = Some((_id, event, _meta, _queryEngine) =>
-  switch event {
-  | Order.Placed({customerId, productIds}) =>
-    productIds->Array.map(productId =>
-      PublishEvent(
+let mapOutgoingEvent = Some(
+  (_id, event, _meta, _queryEngine) =>
+    switch event {
+    | Order.Placed({customerId, productIds}) =>
+      productIds->Array.map(productId => PublishEvent(
         productId,
         OrderingSpec.Orders_ExtensionPoint.ItemOrdered({productId, orderId: _id, customerId}),
-      )
-    )
-  | Order.Cancelled({productIds}) =>
-    productIds->Array.map(productId =>
-      PublishEvent(
+      ))
+    | Order.Cancelled({productIds}) =>
+      productIds->Array.map(productId => PublishEvent(
         productId,
         OrderingSpec.Orders_ExtensionPoint.ItemOrderCancelled({productId, orderId: _id}),
-      )
-    )
-  | _ => []
-  }
+      ))
+    | _ => []
+    },
 )

package/lib/ocaml/Orders_ExtensionPointMapping_GWT.res

@@ -13,21 +13,15 @@ describe("Orders ExtensionPoint mapping — per-product fan-out", () => {
   )
 
   test("Cancelled fans out to one ItemOrderCancelled per product", () =>
-    whenDelegateEvent(
-      Delegate.Cancelled({productIds: ["p1", "p2"]}),
-    )->thenPublishesEvents([
+    whenDelegateEvent(Delegate.Cancelled({productIds: ["p1", "p2"]}))->thenPublishesEvents([
       ("p1", ExtensionPoint.ItemOrderCancelled({productId: "p1", orderId: "gwt-id"})),
       ("p2", ExtensionPoint.ItemOrderCancelled({productId: "p2", orderId: "gwt-id"})),
     ])
   )
 
-  test("Shipped publishes nothing", () =>
-    whenDelegateEvent(Delegate.Shipped)->thenPublishesNothing
-  )
+  test("Shipped publishes nothing", () => whenDelegateEvent(Delegate.Shipped)->thenPublishesNothing)
 
   test("Refunded publishes nothing", () =>
-    whenDelegateEvent(
-      Delegate.Refunded({reason: "customer-changed-mind"}),
-    )->thenPublishesNothing
+    whenDelegateEvent(Delegate.Refunded({reason: "customer-changed-mind"}))->thenPublishesNothing
   )
 })

package/lib/ocaml/Orders_Projections.res

@@ -13,17 +13,14 @@ module OrderMapping = Mapping.Make(
         Set(
           id,
           {
-            Orders.customerId: customerId,
+            Orders.customerId,
             productIds,
             lifecycle: (Placed: Orders.lifecycle),
           },
         )
-      | Shipped =>
-        Update(id, state => {...state, lifecycle: (Shipped: Orders.lifecycle)})
-      | Cancelled(_) =>
-        Update(id, state => {...state, lifecycle: (Cancelled: Orders.lifecycle)})
-      | Refunded(_) =>
-        Update(id, state => {...state, lifecycle: (Refunded: Orders.lifecycle)})
+      | Shipped => Update(id, state => {...state, lifecycle: (Shipped: Orders.lifecycle)})
+      | Cancelled(_) => Update(id, state => {...state, lifecycle: (Cancelled: Orders.lifecycle)})
+      | Refunded(_) => Update(id, state => {...state, lifecycle: (Refunded: Orders.lifecycle)})
       }
   },
 )

package/lib/ocaml/Plugin.res

@@ -14,14 +14,13 @@ module Make = (Platform: ReventlessInfra.Platform.T) => {
     Customer_Behavior,
     ReventlessInfra.NoEventMappings.Make(Customer),
   )
-  module OrderAggregate = Platform.Aggregate.Make(
-    Order,
-    Order_Behavior,
-    Order_Mappings,
-  )
+  module OrderAggregate = Platform.Aggregate.Make(Order, Order_Behavior, Order_Mappings)
 
   // ReadModels
-  module AvailableProductsReadModel = Platform.ReadModel.Make(AvailableProducts, AvailableProducts_Projections)
+  module AvailableProductsReadModel = Platform.ReadModel.Make(
+    AvailableProducts,
+    AvailableProducts_Projections,
+  )
   module CustomersReadModel = Platform.ReadModel.Make(Customers, Customers_Projections)
   module OrdersReadModel = Platform.ReadModel.Make(Orders, Orders_Projections)
 
@@ -36,11 +35,26 @@ module Make = (Platform: ReventlessInfra.Platform.T) => {
 
   let pluginStructure = Platform.Plugin.makePluginDefinition(
     ~name="Ordering",
-    ~aggregates=[module(CatalogProductAggregate), module(CustomerAggregate), module(OrderAggregate)],
-    ~readModels=[module(AvailableProductsReadModel), module(CustomersReadModel), module(OrdersReadModel)],
+    ~aggregates=[
+      module(CatalogProductAggregate),
+      module(CustomerAggregate),
+      module(OrderAggregate),
+    ],
+    ~readModels=[
+      module(AvailableProductsReadModel),
+      module(CustomersReadModel),
+      module(OrdersReadModel),
+    ],
     ~extensions=[module(Products_Extension)],
     ~extensionPoints=[module(Orders_ExtensionPointMapping)],
-    ~componentChapters=Dict.fromArray([("AvailableProducts", "CatalogProduct"), ("CatalogProduct", "CatalogProduct"), ("Customer", "Customer"), ("Customers", "Customer"), ("Order", "Order"), ("Orders", "Order")]),
+    ~componentChapters=Dict.fromArray([
+      ("AvailableProducts", "CatalogProduct"),
+      ("CatalogProduct", "CatalogProduct"),
+      ("Customer", "Customer"),
+      ("Customers", "Customer"),
+      ("Order", "Order"),
+      ("Orders", "Order"),
+    ]),
     ~lifecycleModel=LifecycleModel.model,
   )
 
@@ -50,10 +64,18 @@ module Make = (Platform: ReventlessInfra.Platform.T) => {
       ~heartbeatInterval=5,
       ~extensionPoints=[module(Orders_ExtensionPoint)],
       ~extensions=[module(Products_Extension)],
-      ~aggregates=[module(CatalogProductAggregate), module(CustomerAggregate), module(OrderAggregate)],
-      ~readModels=[module(AvailableProductsReadModel), module(CustomersReadModel), module(OrdersReadModel)],
+      ~aggregates=[
+        module(CatalogProductAggregate),
+        module(CustomerAggregate),
+        module(OrderAggregate),
+      ],
+      ~readModels=[
+        module(AvailableProductsReadModel),
+        module(CustomersReadModel),
+        module(OrdersReadModel),
+      ],
       ~tasks=[module(OrderNotificationsTask)],
-      ~pluginStructure=pluginStructure,
+      ~pluginStructure,
       ~uiFragments=?uiBundleUrl->Option.map(url =>
         Platform.Plugin.makeAutoUIManifest(
           ~remoteEntryUrl=url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/online-shop-aggregates-ordering",
-  "version": "3.0.0-alpha.237",
+  "version": "3.0.0-alpha.239",
   "description": "Online Shop example — Ordering plugin (Customer & Order aggregates)",
   "license": "Apache-2.0",
   "jest": {
@@ -21,18 +21,18 @@
   },
   "dependencies": {
     "sury": "11.0.0-rc.2",
-    "@reventlessdev/online-shop-aggregates-catalog-spec": "3.0.0-alpha.131",
-    "@reventlessdev/online-shop-aggregates-ordering-spec": "3.0.0-alpha.131",
-    "@reventlessdev/reventless-gwt": "1.0.0-alpha.206",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.160",
-    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.19",
-    "@reventlessdev/reventless-local": "3.0.0-alpha.248",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.132"
+    "@reventlessdev/online-shop-aggregates-catalog-spec": "3.0.0-alpha.133",
+    "@reventlessdev/online-shop-aggregates-ordering-spec": "3.0.0-alpha.133",
+    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.20",
+    "@reventlessdev/reventless-gwt": "1.0.0-alpha.208",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.162",
+    "@reventlessdev/reventless-local": "3.0.0-alpha.250",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.134"
   },
   "devDependencies": {
     "rescript": "12.3.0",
     "sury-ppx": "11.0.0-rc.2",
-    "@reventlessdev/reventless-ppx": "1.0.0-alpha.78"
+    "@reventlessdev/reventless-ppx": "1.0.0-alpha.80"
   },
   "peerDependencies": {
     "rescript": "12.3.0"

package/src/CatalogProduct/ReadModel/AvailableProducts.res

@@ -10,4 +10,3 @@
 
 @schema
 type state = {name: string, price: float}
-

package/src/CatalogProduct/ReadModel/AvailableProducts_Projections.res

@@ -9,10 +9,8 @@ module CatalogProductMapping = Mapping.Make(
     open CatalogProduct
     let project = ({event, id, _}) =>
       switch event {
-      | Synced({name, price}) =>
-        Set(id, {AvailableProducts.name: name, price})
-      | PriceUpdated({price}) =>
-        Update(id, state => {...state, price})
+      | Synced({name, price}) => Set(id, {AvailableProducts.name, price})
+      | PriceUpdated({price}) => Update(id, state => {...state, price})
       }
   },
 )

package/src/Customer/ReadModel/Customers.res

@@ -12,4 +12,3 @@ type state = {
   address: string,
   deactivated: bool,
 }
-

package/src/Customer/ReadModel/Customers_Projections.res

@@ -9,8 +9,7 @@ module CustomerMapping = Mapping.Make(
     open Customer
     let project = ({event, id, _}) =>
       switch event {
-      | Registered({email, address}) =>
-        Set(id, {Customers.email: email, address, deactivated: false})
+      | Registered({email, address}) => Set(id, {Customers.email, address, deactivated: false})
       | EmailUpdated({email}) => Update(id, state => {...state, email})
       | AddressUpdated({address}) => Update(id, state => {...state, address})
       | Deactivated => Update(id, state => {...state, deactivated: true})

package/src/ExtensionPoint/Orders_ExtensionPointMapping.res

@@ -7,22 +7,19 @@ module Delegate = Order
 
 let mapIncomingCommand = (_id, _command, _meta) => []
 
-let mapOutgoingEvent = Some((_id, event, _meta, _queryEngine) =>
-  switch event {
-  | Order.Placed({customerId, productIds}) =>
-    productIds->Array.map(productId =>
-      PublishEvent(
+let mapOutgoingEvent = Some(
+  (_id, event, _meta, _queryEngine) =>
+    switch event {
+    | Order.Placed({customerId, productIds}) =>
+      productIds->Array.map(productId => PublishEvent(
         productId,
         OrderingSpec.Orders_ExtensionPoint.ItemOrdered({productId, orderId: _id, customerId}),
-      )
-    )
-  | Order.Cancelled({productIds}) =>
-    productIds->Array.map(productId =>
-      PublishEvent(
+      ))
+    | Order.Cancelled({productIds}) =>
+      productIds->Array.map(productId => PublishEvent(
         productId,
         OrderingSpec.Orders_ExtensionPoint.ItemOrderCancelled({productId, orderId: _id}),
-      )
-    )
-  | _ => []
-  }
+      ))
+    | _ => []
+    },
 )

package/src/LifecycleModel.res

@@ -7,8 +7,32 @@
 // annotation where it is silent.
 
 let model: array<Reventless.Plugin.derivedEdge> = [
-  {component: "Order", command: "Cancel", level: Reventless.Plugin.Instance, allowedStates: ["Placed"], targets: ["Cancelled"]},
-  {component: "Order", command: "Place", level: Reventless.Plugin.Collection, allowedStates: [], targets: ["Placed"]},
-  {component: "Order", command: "Refund", level: Reventless.Plugin.Instance, allowedStates: ["Cancelled"], targets: ["Refunded"]},
-  {component: "Order", command: "Ship", level: Reventless.Plugin.Instance, allowedStates: ["Placed"], targets: ["Shipped"]},
+  {
+    component: "Order",
+    command: "Cancel",
+    level: Reventless.Plugin.Instance,
+    allowedStates: ["Placed"],
+    targets: ["Cancelled"],
+  },
+  {
+    component: "Order",
+    command: "Place",
+    level: Reventless.Plugin.Collection,
+    allowedStates: [],
+    targets: ["Placed"],
+  },
+  {
+    component: "Order",
+    command: "Refund",
+    level: Reventless.Plugin.Instance,
+    allowedStates: ["Cancelled"],
+    targets: ["Refunded"],
+  },
+  {
+    component: "Order",
+    command: "Ship",
+    level: Reventless.Plugin.Instance,
+    allowedStates: ["Placed"],
+    targets: ["Shipped"],
+  },
 ]

package/src/Order/Aggregate/Order_Behavior.res

@@ -29,8 +29,7 @@ let evolve = (state, event) =>
 
 let decide = (state, command) =>
   switch (state, command) {
-  | (NotCreated, Place({customerId, productIds})) =>
-    Ok([Order.Placed({customerId, productIds})])
+  | (NotCreated, Place({customerId, productIds})) => Ok([Order.Placed({customerId, productIds})])
   | (NotCreated, Ship) => Error(OrderNotFound)
   | (NotCreated, Cancel) => Error(OrderNotFound)
   | (NotCreated, Refund(_)) => Error(OrderNotFound)

package/src/Order/ReadModel/Orders.res

@@ -18,4 +18,3 @@ type state = {
   // records whose lifecycle field is honestly called something else.
   lifecycle: lifecycle,
 }
-

package/src/Order/ReadModel/Orders_Projections.res

@@ -13,17 +13,14 @@ module OrderMapping = Mapping.Make(
         Set(
           id,
           {
-            Orders.customerId: customerId,
+            Orders.customerId,
             productIds,
             lifecycle: (Placed: Orders.lifecycle),
           },
         )
-      | Shipped =>
-        Update(id, state => {...state, lifecycle: (Shipped: Orders.lifecycle)})
-      | Cancelled(_) =>
-        Update(id, state => {...state, lifecycle: (Cancelled: Orders.lifecycle)})
-      | Refunded(_) =>
-        Update(id, state => {...state, lifecycle: (Refunded: Orders.lifecycle)})
+      | Shipped => Update(id, state => {...state, lifecycle: (Shipped: Orders.lifecycle)})
+      | Cancelled(_) => Update(id, state => {...state, lifecycle: (Cancelled: Orders.lifecycle)})
+      | Refunded(_) => Update(id, state => {...state, lifecycle: (Refunded: Orders.lifecycle)})
       }
   },
 )

package/src/Order/SideEffect/Order_EmailNotification.res

@@ -10,9 +10,6 @@ module Source = {
 let execute = async (orderId, _meta, event, _queryEngine) =>
   switch event {
   | Order.Placed({customerId}) =>
-    await EmailService.sendOrderConfirmation(
-      ~email=customerId,
-      ~orderId=orderId->Order.Id.toString,
-    )
+    await EmailService.sendOrderConfirmation(~email=customerId, ~orderId=orderId->Order.Id.toString)
   | _ => ()
   }