@reventlessdev/online-shop-hybrid-ordering 1.0.0-alpha.239 → 1.0.0-alpha.241

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 1.0.0-alpha.241 (2026-09-20)
+
+**Note:** Version bump only for package @reventlessdev/online-shop-hybrid-ordering
+
+
+
+
+
+# 1.0.0-alpha.240 (2026-09-17)
+
+### Features
+
+* **examples:** refuse a delivery window that cannot describe a delivery ([4f36ec3](https://github.com/ReventlessDev/reventless-core/commit/4f36ec39b3b73910edce1ca2ad0108efb06aa9de))
+
+
 # 1.0.0-alpha.239 (2026-09-16)
 
 * feat(spec)!: infer the DCB partition key per slice, and drop @partitionTag where inference agrees ([6c10161](https://github.com/ReventlessDev/reventless-core/commit/6c101611d438beea4bc9175ae8ea0ea1f6f7493b))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/online-shop-hybrid-ordering",
-  "version": "1.0.0-alpha.239",
+  "version": "1.0.0-alpha.241",
   "description": "Online Shop Hybrid example — Ordering plugin (Customer aggregate + Order/CatalogProduct DCB)",
   "license": "Apache-2.0",
   "jest": {
@@ -21,15 +21,15 @@
   },
   "dependencies": {
     "sury": "11.0.0-rc.2",
-    "@reventlessdev/online-shop-hybrid-ordering-spec": "1.0.0-alpha.132",
+    "@reventlessdev/online-shop-hybrid-catalog-spec": "1.0.0-alpha.133",
     "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.21",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.164",
-    "@reventlessdev/reventless-gwt": "1.0.0-alpha.210",
-    "@reventlessdev/online-shop-hybrid-catalog-spec": "1.0.0-alpha.132",
-    "@reventlessdev/reventless-local": "3.0.0-alpha.252",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.136",
-    "@reventlessdev/trait-notification": "1.0.0-alpha.12",
-    "@reventlessdev/trait-address-geocoding": "1.0.0-alpha.12"
+    "@reventlessdev/reventless-gwt": "1.0.0-alpha.211",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.165",
+    "@reventlessdev/online-shop-hybrid-ordering-spec": "1.0.0-alpha.133",
+    "@reventlessdev/reventless-local": "3.0.0-alpha.254",
+    "@reventlessdev/trait-address-geocoding": "1.0.0-alpha.13",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.137",
+    "@reventlessdev/trait-notification": "1.0.0-alpha.13"
   },
   "devDependencies": {
     "rescript": "12.3.0",

package/src/Order/StateChange/PlaceOrder.res

@@ -85,6 +85,11 @@ type error =
   // currency happened to come first. Naming the codes says which shelf entries
   // disagree, the way `ProductsNotAvailable` names the products.
   | MixedCurrencies({currencies: array<string>})
+  // A pickup is collected in store, so a delivery slot on one describes a
+  // delivery that will never happen.
+  | DeliveryWindowOnPickup
+  // The window ends before it starts. `reason` is `DateRange.validate`'s wording.
+  | InvalidDeliveryWindow({reason: string})
 
 // One priced line of a placed order, frozen at placement.
 //

package/src/Order/StateChange/PlaceOrder.res.mjs

@@ -77,6 +77,11 @@ let errorSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "MixedCurrencies",
     currencies: s.m(Sury.array(Sury.string))
+  })),
+  Sury.literal("DeliveryWindowOnPickup"),
+  Sury.$schema(s => ({
+    TAG: "InvalidDeliveryWindow",
+    reason: s.m(Sury.string)
   }))
 ]);
 

package/src/Order/StateChange/PlaceOrder_Behavior.res

@@ -114,6 +114,19 @@ let priceLines = (state, lineItems: array<lineItem>): result<array<orderLine>, e
     }
   )
 
+// The window is display data — nothing ships by it — but a window that cannot
+// describe a delivery is refused rather than shown.
+let deliveryWindowError = (~shippingMethod, ~deliveryWindow) =>
+  switch (shippingMethod, deliveryWindow) {
+  | (_, None) => None
+  | (Pickup, Some(_)) => Some(DeliveryWindowOnPickup)
+  | (_, Some(window)) =>
+    switch Reventless.DateRange.validate(window) {
+    | Ok(_) => None
+    | Error(reason) => Some(InvalidDeliveryWindow({reason: reason}))
+    }
+  }
+
 let decide = (state, command) =>
   switch command {
   | PlaceOrder({orderId, customerId, lineItems, shippingMethod, ?deliveryWindow}) =>
@@ -122,9 +135,13 @@ let decide = (state, command) =>
     } else if lineItems->Array.length == 0 {
       Error(OrderIsEmpty)
     } else {
-      switch lineItems->Array.find(({quantity}) => quantity <= 0) {
-      | Some({productId, quantity}) => Error(InvalidQuantity({productId, quantity}))
-      | None =>
+      switch (
+        lineItems->Array.find(({quantity}) => quantity <= 0),
+        deliveryWindowError(~shippingMethod, ~deliveryWindow),
+      ) {
+      | (Some({productId, quantity}), _) => Error(InvalidQuantity({productId, quantity}))
+      | (None, Some(error)) => Error(error)
+      | (None, None) =>
         let merged = mergeLines(lineItems)
         let missing =
           merged->Array.filterMap(({productId}) =>

package/src/Order/StateChange/PlaceOrder_Behavior.res.mjs

@@ -5,6 +5,7 @@ import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Money$Reventless from "@reventlessdev/reventless-spec/src/semantic/Money.res.mjs";
 import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
 import * as Currency$Reventless from "@reventlessdev/reventless-spec/src/semantic/Currency.res.mjs";
+import * as DateRange$Reventless from "@reventlessdev/reventless-spec/src/semantic/DateRange.res.mjs";
 
 let initialState_placedOrderIds = [];
 
@@ -175,6 +176,28 @@ function priceLines(state, lineItems) {
   });
 }
 
+function deliveryWindowError(shippingMethod, deliveryWindow) {
+  if (deliveryWindow === undefined) {
+    return;
+  }
+  switch (shippingMethod) {
+    case "Standard" :
+    case "Express" :
+      break;
+    case "Pickup" :
+      return "DeliveryWindowOnPickup";
+  }
+  let reason = DateRange$Reventless.validate(deliveryWindow);
+  if (reason.TAG === "Ok") {
+    return;
+  } else {
+    return {
+      TAG: "InvalidDeliveryWindow",
+      reason: reason._0
+    };
+  }
+}
+
 function decide(state, command) {
   let orderId = command.orderId;
   if (state.placedOrderIds.includes(orderId)) {
@@ -190,7 +213,10 @@ function decide(state, command) {
       _0: "OrderIsEmpty"
     };
   }
+  let deliveryWindow = command.deliveryWindow;
+  let shippingMethod = command.shippingMethod;
   let match = lineItems.find(param => param.quantity <= 0);
+  let match$1 = deliveryWindowError(shippingMethod, deliveryWindow);
   if (match !== undefined) {
     return {
       TAG: "Error",
@@ -201,6 +227,12 @@ function decide(state, command) {
       }
     };
   }
+  if (match$1 !== undefined) {
+    return {
+      TAG: "Error",
+      _0: match$1
+    };
+  }
   let merged = mergeLines(lineItems);
   let missing = Stdlib_Array.filterMap(merged, param => {
     let productId = param.productId;
@@ -224,14 +256,14 @@ function decide(state, command) {
     return failed;
   }
   let lines = failed._0;
-  let match$1 = Money$Reventless.sum(lines.map(line => line.lineTotal));
-  if (match$1 === undefined) {
+  let match$2 = Money$Reventless.sum(lines.map(line => line.lineTotal));
+  if (match$2 === undefined) {
     return {
       TAG: "Error",
       _0: "OrderIsEmpty"
     };
   }
-  if (match$1.TAG !== "Ok") {
+  if (match$2.TAG !== "Ok") {
     return {
       TAG: "Error",
       _0: {
@@ -258,9 +290,9 @@ function decide(state, command) {
         customerId: command.customerId,
         productIds: lines.map(line => line.productId),
         lines: lines,
-        total: match$1._0,
-        shippingMethod: command.shippingMethod,
-        deliveryWindow: command.deliveryWindow,
+        total: match$2._0,
+        shippingMethod: shippingMethod,
+        deliveryWindow: deliveryWindow,
         firstProductName: firstProductName,
         firstProductImage: firstProductImage
       }]
@@ -281,6 +313,7 @@ export {
   mergeLines,
   priceLine,
   priceLines,
+  deliveryWindowError,
   decide,
   moduleUrl,
 }

package/tests/Order/StateChange/PlaceOrder_GWT.res

@@ -262,6 +262,52 @@ describe("PlaceOrder StateChangeSlice", () => {
     )
   })
 
+  test("a delivery window on a pickup order is refused", () => {
+    let window =
+      Reventless.DateRange.make(
+        ~start="2026-03-02T09:00:00Z",
+        ~end_="2026-03-02T11:00:00Z",
+      )->Result.getOrThrow
+    givenEvents([synced(~id="p1", ~name="Fathom Dock")])
+    ->whenCmd(
+      PlaceOrder({
+        orderId: "o1",
+        customerId: "c1",
+        lineItems: [line(~id="p1")],
+        shippingMethod: Pickup,
+        deliveryWindow: window,
+      }),
+    )
+    ->thenError(DeliveryWindowOnPickup)
+  })
+
+  // Built as a record rather than through `DateRange.make`, which would refuse
+  // it: a client sends JSON, and decoding does not apply the ordering rule.
+  test("a delivery window that ends before it starts is refused", () => {
+    let reversed = {
+      Reventless.DateRange.start: "2026-03-02T11:00:00Z",
+      end_: "2026-03-02T09:00:00Z",
+    }
+    givenEvents([synced(~id="p1", ~name="Fathom Dock")])
+    ->whenCmd(
+      PlaceOrder({
+        orderId: "o1",
+        customerId: "c1",
+        lineItems: [line(~id="p1")],
+        shippingMethod: Standard,
+        deliveryWindow: reversed,
+      }),
+    )
+    ->thenError(
+      InvalidDeliveryWindow({
+        reason: switch Reventless.DateRange.validate(reversed) {
+        | Error(reason) => reason
+        | Ok(_) => "expected the ordering rule to refuse this range"
+        },
+      }),
+    )
+  })
+
   test("partial product availability returns ProductsNotAvailable with missing list", () =>
     givenEvents([synced(~id="p1", ~name="Fathom Dock")])
     ->whenCmd(

package/tests/Order/StateChange/PlaceOrder_GWT.res.mjs

@@ -336,6 +336,45 @@ describe("PlaceOrder StateChangeSlice", () => {
       firstProductName: "Fathom Dock"
     });
   });
+  test("a delivery window on a pickup order is refused", () => {
+    let window = Stdlib_Result.getOrThrow(DateRange$Reventless.make("2026-03-02T09:00:00Z", "2026-03-02T11:00:00Z"), undefined);
+    let qty = 1;
+    return thenError(whenCmd(givenEvents([synced("p1", "Fathom Dock", undefined)]), {
+      TAG: "PlaceOrder",
+      orderId: "o1",
+      customerId: "c1",
+      lineItems: [{
+          productId: "p1",
+          quantity: qty
+        }],
+      shippingMethod: "Pickup",
+      deliveryWindow: window
+    }), "DeliveryWindowOnPickup");
+  });
+  test("a delivery window that ends before it starts is refused", () => {
+    let reversed = {
+      start: "2026-03-02T11:00:00Z",
+      end: "2026-03-02T09:00:00Z"
+    };
+    let qty = 1;
+    let reason = DateRange$Reventless.validate(reversed);
+    let tmp;
+    tmp = reason.TAG === "Ok" ? "expected the ordering rule to refuse this range" : reason._0;
+    return thenError(whenCmd(givenEvents([synced("p1", "Fathom Dock", undefined)]), {
+      TAG: "PlaceOrder",
+      orderId: "o1",
+      customerId: "c1",
+      lineItems: [{
+          productId: "p1",
+          quantity: qty
+        }],
+      shippingMethod: "Standard",
+      deliveryWindow: reversed
+    }), {
+      TAG: "InvalidDeliveryWindow",
+      reason: tmp
+    });
+  });
   test("partial product availability returns ProductsNotAvailable with missing list", () => {
     let qty = 1;
     let qty$1 = 1;