@reventlessdev/online-shop-aggregates-ordering 3.0.0-alpha.244 → 3.0.0-alpha.246

package/lib/bs/src/Order/ReadModel/Orders.res

@@ -3,6 +3,8 @@
 
 @@reventless.spec
 
+module Id = OrderId
+
 @schema
 type lifecycle =
   | Placed
@@ -12,8 +14,8 @@ type lifecycle =
 
 @schema
 type state = {
-  customerId: string,
-  productIds: array<string>,
+  customerId: CustomerId.t,
+  productIds: array<CatalogSpec.ProductId.t>,
   // No annotation: the field name is the declaration. `@lifecycle` exists for
   // records whose lifecycle field is honestly called something else.
   lifecycle: lifecycle,

package/lib/bs/src/Order/ReadModel/Orders.res.mjs

@@ -2,6 +2,8 @@
 
 import * as Sury from "sury";
 import * as ReadModel$Reventless from "@reventlessdev/reventless-spec/src/components/ReadModel.res.mjs";
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-aggregates-catalog-spec/src/ProductId.res.mjs";
+import * as CustomerId$OrderingPlugin from "../../Customer/CustomerId.res.mjs";
 
 let lifecycleSchema = Sury.union([
   Sury.literal("Placed"),
@@ -11,8 +13,8 @@ let lifecycleSchema = Sury.union([
 ]);
 
 let stateSchema = Sury.$schema(s => ({
-  customerId: s.m(Sury.string),
-  productIds: s.m(Sury.array(Sury.string)),
+  customerId: s.m(CustomerId$OrderingPlugin.schema),
+  productIds: s.m(Sury.array(ProductId$CatalogSpec.schema)),
   lifecycle: s.m(lifecycleSchema)
 }));
 

package/lib/bs/src/Order/ReadModel/Orders_Projections.res.mjs

@@ -1,12 +1,12 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Order$OrderingPlugin from "../Aggregate/Order.res.mjs";
 import * as Orders$OrderingPlugin from "./Orders.res.mjs";
 import * as Projection$Reventless from "@reventlessdev/reventless-spec/src/types/Projection.res.mjs";
+import * as OrderId$OrderingPlugin from "../OrderId.res.mjs";
 
 let M = Projection$Reventless.Mappings.Make({
-  Id: Id$Reventless.$$String,
+  Id: OrderId$OrderingPlugin,
   name: Orders$OrderingPlugin.name,
   stateSchema: Orders$OrderingPlugin.stateSchema,
   subIdConfig: undefined
@@ -61,11 +61,11 @@ function project(param) {
 }
 
 let OrderMapping = Projection$Reventless.Mapping.Make({
-  Id: Id$Reventless.$$String,
+  Id: OrderId$OrderingPlugin,
   name: Order$OrderingPlugin.name,
   eventSchema: Order$OrderingPlugin.eventSchema
 })({
-  Id: Id$Reventless.$$String,
+  Id: OrderId$OrderingPlugin,
   name: Orders$OrderingPlugin.name,
   stateSchema: Orders$OrderingPlugin.stateSchema,
   subIdConfig: undefined

package/lib/bs/src/Order/SideEffect/Order_EmailNotification.res

@@ -10,6 +10,9 @@ 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->CustomerId.toString,
+      ~orderId=orderId->Order.Id.toString,
+    )
   | _ => ()
   }

package/lib/bs/src/Order/SideEffect/Order_EmailNotification.res.mjs

@@ -1,7 +1,8 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Order$OrderingPlugin from "../Aggregate/Order.res.mjs";
+import * as OrderId$OrderingPlugin from "../OrderId.res.mjs";
+import * as CustomerId$OrderingPlugin from "../../Customer/CustomerId.res.mjs";
 import * as EmailService$OrderingPlugin from "../../Service/EmailService.res.mjs";
 
 let Source = {
@@ -14,7 +15,7 @@ async function execute(orderId, _meta, event, _queryEngine) {
   if (typeof event !== "object" || event.TAG !== "Placed") {
     return;
   } else {
-    return await EmailService$OrderingPlugin.sendOrderConfirmation(event.customerId, Id$Reventless.$$String.toString(orderId));
+    return await EmailService$OrderingPlugin.sendOrderConfirmation(CustomerId$OrderingPlugin.toString(event.customerId), OrderId$OrderingPlugin.toString(orderId));
   }
 }
 
@@ -31,4 +32,4 @@ export {
   execute,
   moduleUrl,
 }
-/* Id-Reventless Not a pure module */
+/* Order-OrderingPlugin Not a pure module */

package/lib/bs/src/Plugin.res.mjs

@@ -1,11 +1,13 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Order$OrderingPlugin from "./Order/Aggregate/Order.res.mjs";
 import * as Orders$OrderingPlugin from "./Order/ReadModel/Orders.res.mjs";
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-aggregates-catalog-spec/src/ProductId.res.mjs";
+import * as OrderId$OrderingPlugin from "./Order/OrderId.res.mjs";
 import * as Customer$OrderingPlugin from "./Customer/Aggregate/Customer.res.mjs";
 import * as Customers$OrderingPlugin from "./Customer/ReadModel/Customers.res.mjs";
+import * as CustomerId$OrderingPlugin from "./Customer/CustomerId.res.mjs";
 import * as CatalogProduct$OrderingPlugin from "./CatalogProduct/Aggregate/CatalogProduct.res.mjs";
 import * as LifecycleModel$OrderingPlugin from "./LifecycleModel.res.mjs";
 import * as Order_Behavior$OrderingPlugin from "./Order/Aggregate/Order_Behavior.res.mjs";
@@ -25,7 +27,7 @@ import * as AvailableProducts_Projections$OrderingPlugin from "./CatalogProduct/
 
 function Make(Platform) {
   let CatalogProductAggregate = Platform.Aggregate.Make({
-    Id: Id$Reventless.$$String,
+    Id: ProductId$CatalogSpec,
     name: CatalogProduct$OrderingPlugin.name,
     eventSchema: CatalogProduct$OrderingPlugin.eventSchema,
     errorSchema: CatalogProduct$OrderingPlugin.errorSchema,
@@ -42,11 +44,11 @@ function Make(Platform) {
     moduleUrl: CatalogProduct_Behavior$OrderingPlugin.moduleUrl
   })(NoEventMappings$ReventlessInfra.Make({
     name: CatalogProduct$OrderingPlugin.name,
-    Id: Id$Reventless.$$String,
+    Id: ProductId$CatalogSpec,
     commandSchema: CatalogProduct$OrderingPlugin.commandSchema
   }));
   let CustomerAggregate = Platform.Aggregate.Make({
-    Id: Id$Reventless.$$String,
+    Id: CustomerId$OrderingPlugin,
     name: Customer$OrderingPlugin.name,
     eventSchema: Customer$OrderingPlugin.eventSchema,
     errorSchema: Customer$OrderingPlugin.errorSchema,
@@ -63,11 +65,11 @@ function Make(Platform) {
     moduleUrl: Customer_Behavior$OrderingPlugin.moduleUrl
   })(NoEventMappings$ReventlessInfra.Make({
     name: Customer$OrderingPlugin.name,
-    Id: Id$Reventless.$$String,
+    Id: CustomerId$OrderingPlugin,
     commandSchema: Customer$OrderingPlugin.commandSchema
   }));
   let OrderAggregate = Platform.Aggregate.Make({
-    Id: Id$Reventless.$$String,
+    Id: OrderId$OrderingPlugin,
     name: Order$OrderingPlugin.name,
     eventSchema: Order$OrderingPlugin.eventSchema,
     errorSchema: Order$OrderingPlugin.errorSchema,
@@ -88,7 +90,7 @@ function Make(Platform) {
     counter: undefined
   });
   let AvailableProductsReadModel = Platform.ReadModel.Make({
-    Id: Id$Reventless.$$String,
+    Id: ProductId$CatalogSpec,
     name: AvailableProducts$OrderingPlugin.name,
     moduleUrl: AvailableProducts$OrderingPlugin.moduleUrl,
     stateSchema: AvailableProducts$OrderingPlugin.stateSchema,
@@ -101,7 +103,7 @@ function Make(Platform) {
     mappings: AvailableProducts_Projections$OrderingPlugin.mappings
   });
   let CustomersReadModel = Platform.ReadModel.Make({
-    Id: Id$Reventless.$$String,
+    Id: CustomerId$OrderingPlugin,
     name: Customers$OrderingPlugin.name,
     moduleUrl: Customers$OrderingPlugin.moduleUrl,
     stateSchema: Customers$OrderingPlugin.stateSchema,
@@ -114,7 +116,7 @@ function Make(Platform) {
     mappings: Customers_Projections$OrderingPlugin.mappings
   });
   let OrdersReadModel = Platform.ReadModel.Make({
-    Id: Id$Reventless.$$String,
+    Id: OrderId$OrderingPlugin,
     name: Orders$OrderingPlugin.name,
     moduleUrl: Orders$OrderingPlugin.moduleUrl,
     stateSchema: Orders$OrderingPlugin.stateSchema,
@@ -140,7 +142,7 @@ function Make(Platform) {
       directiveSchema: Orders_ExtensionPoint$OrderingSpec.directiveSchema
     },
     Delegate: {
-      Id: Id$Reventless.$$String,
+      Id: OrderId$OrderingPlugin,
       name: Order$OrderingPlugin.name,
       eventSchema: Order$OrderingPlugin.eventSchema,
       errorSchema: Order$OrderingPlugin.errorSchema,
@@ -165,7 +167,7 @@ function Make(Platform) {
       directiveSchema: Products_ExtensionPoint$CatalogSpec.directiveSchema
     },
     Delegate: {
-      Id: Id$Reventless.$$String,
+      Id: ProductId$CatalogSpec,
       name: CatalogProduct$OrderingPlugin.name,
       eventSchema: CatalogProduct$OrderingPlugin.eventSchema,
       errorSchema: CatalogProduct$OrderingPlugin.errorSchema,
@@ -199,7 +201,7 @@ function Make(Platform) {
         directiveSchema: Orders_ExtensionPoint$OrderingSpec.directiveSchema
       },
       Delegate: {
-        Id: Id$Reventless.$$String,
+        Id: OrderId$OrderingPlugin,
         name: Order$OrderingPlugin.name,
         eventSchema: Order$OrderingPlugin.eventSchema,
         errorSchema: Order$OrderingPlugin.errorSchema,
@@ -267,4 +269,4 @@ function Make(Platform) {
 export {
   Make,
 }
-/* Id-Reventless Not a pure module */
+/* Order-OrderingPlugin Not a pure module */

package/lib/bs/src/Task/OrderNotifications.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
+import * as OrderId$OrderingPlugin from "../Order/OrderId.res.mjs";
 import * as Order_EmailNotification$OrderingPlugin from "../Order/SideEffect/Order_EmailNotification.res.mjs";
 
 function setup(_queryEngine, _queryBucketName, _opts) {
@@ -8,7 +8,7 @@ function setup(_queryEngine, _queryBucketName, _opts) {
     sideEffects: [{
         Source: {
           name: Order_EmailNotification$OrderingPlugin.Source.name,
-          Id: Id$Reventless.$$String,
+          Id: OrderId$OrderingPlugin,
           eventSchema: Order_EmailNotification$OrderingPlugin.Source.eventSchema
         },
         moduleUrl: Order_EmailNotification$OrderingPlugin.moduleUrl,
@@ -26,4 +26,4 @@ export {
   setup,
   moduleUrl,
 }
-/* Id-Reventless Not a pure module */
+/* OrderId-OrderingPlugin Not a pure module */

package/lib/bs/tests/Extension/Products_Extension_GWT.res

@@ -6,16 +6,18 @@
 // it surfaces the extension point's events and the delegate's commands.
 open Mapping
 
+let p1 = CatalogSpec.ProductId.make("p1")
+
 describe("Products Extension delegate", () => {
   test("ProductBecameAvailable issues Sync", () =>
     whenIncomingEvent(
-      ExtensionPoint.ProductBecameAvailable({productId: "p1", name: "Book", price: 9.99}),
+      ExtensionPoint.ProductBecameAvailable({productId: p1, name: "Book", price: 9.99}),
     )->thenPublishesAggregateCommand("p1", Delegate.Sync({name: "Book", price: 9.99}))
   )
 
   test("ProductPriceChanged issues UpdatePrice", () =>
     whenIncomingEvent(
-      ExtensionPoint.ProductPriceChanged({productId: "p1", price: 7.5}),
+      ExtensionPoint.ProductPriceChanged({productId: p1, price: 7.5}),
     )->thenPublishesAggregateCommand("p1", Delegate.UpdatePrice({price: 7.5}))
   )
 })

package/lib/bs/tests/Extension/Products_Extension_GWT.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-aggregates-catalog-spec/src/ProductId.res.mjs";
 import * as Delegate_GWT$ReventlessGwt from "@reventlessdev/reventless-gwt/src/Delegate_GWT.res.mjs";
 import * as CatalogProduct$OrderingPlugin from "../../src/CatalogProduct/Aggregate/CatalogProduct.res.mjs";
 import * as Products_Extension$OrderingPlugin from "../../src/Extension/Products_Extension.res.mjs";
@@ -15,7 +15,7 @@ let include = Delegate_GWT$ReventlessGwt.FromExtension({
     directiveSchema: Products_ExtensionPoint$CatalogSpec.directiveSchema
   },
   Delegate: {
-    Id: Id$Reventless.$$String,
+    Id: ProductId$CatalogSpec,
     name: CatalogProduct$OrderingPlugin.name,
     eventSchema: CatalogProduct$OrderingPlugin.eventSchema,
     errorSchema: CatalogProduct$OrderingPlugin.errorSchema,
@@ -41,10 +41,12 @@ let whenIncomingEvent = include.whenIncomingEvent;
 
 let thenPublishesAggregateCommand = include.thenPublishesAggregateCommand;
 
+let p1 = ProductId$CatalogSpec.make("p1");
+
 describe("Products Extension delegate", () => {
   test("ProductBecameAvailable issues Sync", undefined, () => thenPublishesAggregateCommand(whenIncomingEvent({
     TAG: "ProductBecameAvailable",
-    productId: "p1",
+    productId: p1,
     name: "Book",
     price: 9.99
   }), "p1", {
@@ -54,7 +56,7 @@ describe("Products Extension delegate", () => {
   }));
   test("ProductPriceChanged issues UpdatePrice", undefined, () => thenPublishesAggregateCommand(whenIncomingEvent({
     TAG: "ProductPriceChanged",
-    productId: "p1",
+    productId: p1,
     price: 7.5
   }), "p1", {
     TAG: "UpdatePrice",
@@ -106,5 +108,6 @@ export {
   thenHandlesDirective,
   thenHandlesDirectives,
   thenHandlesNoDirective,
+  p1,
 }
 /* include Not a pure module */

package/lib/bs/tests/ExtensionPoint/Orders_ExtensionPointMapping_GWT.res

@@ -2,10 +2,14 @@
 // into one public per-product event each (one-to-many fan-out).
 @@reventless.gwt
 
+let c1 = CustomerId.make("c1")
+let p1 = CatalogSpec.ProductId.make("p1")
+let p2 = CatalogSpec.ProductId.make("p2")
+
 describe("Orders ExtensionPoint mapping — per-product fan-out", () => {
   test("Placed fans out to one ItemOrdered per product", () =>
     whenDelegateEvent(
-      Delegate.Placed({customerId: "c1", productIds: ["p1", "p2"]}),
+      Delegate.Placed({customerId: c1, productIds: [p1, p2]}),
     )->thenPublishesEvents([
       ("p1", ExtensionPoint.ItemOrdered({productId: "p1", orderId: "gwt-id", customerId: "c1"})),
       ("p2", ExtensionPoint.ItemOrdered({productId: "p2", orderId: "gwt-id", customerId: "c1"})),
@@ -13,7 +17,7 @@ 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"})),
     ])

package/lib/bs/tests/ExtensionPoint/Orders_ExtensionPointMapping_GWT.res.mjs

@@ -1,7 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Order$OrderingPlugin from "../../src/Order/Aggregate/Order.res.mjs";
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-aggregates-catalog-spec/src/ProductId.res.mjs";
+import * as OrderId$OrderingPlugin from "../../src/Order/OrderId.res.mjs";
+import * as CustomerId$OrderingPlugin from "../../src/Customer/CustomerId.res.mjs";
 import * as Delegate_GWT$ReventlessGwt from "@reventlessdev/reventless-gwt/src/Delegate_GWT.res.mjs";
 import * as Orders_ExtensionPoint$OrderingSpec from "@reventlessdev/online-shop-aggregates-ordering-spec/src/Orders_ExtensionPoint.res.mjs";
 import * as Orders_ExtensionPointMapping$OrderingPlugin from "../../src/ExtensionPoint/Orders_ExtensionPointMapping.res.mjs";
@@ -15,7 +17,7 @@ let include = Delegate_GWT$ReventlessGwt.FromExtensionPoint({
     directiveSchema: Orders_ExtensionPoint$OrderingSpec.directiveSchema
   },
   Delegate: {
-    Id: Id$Reventless.$$String,
+    Id: OrderId$OrderingPlugin,
     name: Order$OrderingPlugin.name,
     eventSchema: Order$OrderingPlugin.eventSchema,
     errorSchema: Order$OrderingPlugin.errorSchema,
@@ -42,13 +44,19 @@ let whenDelegateEvent = include.whenDelegateEvent;
 
 let thenPublishesEvents = include.thenPublishesEvents;
 
+let c1 = CustomerId$OrderingPlugin.make("c1");
+
+let p1 = ProductId$CatalogSpec.make("p1");
+
+let p2 = ProductId$CatalogSpec.make("p2");
+
 describe("Orders ExtensionPoint mapping — per-product fan-out", () => {
   test("Placed fans out to one ItemOrdered per product", undefined, () => thenPublishesEvents(whenDelegateEvent({
     TAG: "Placed",
-    customerId: "c1",
+    customerId: c1,
     productIds: [
-      "p1",
-      "p2"
+      p1,
+      p2
     ]
   }), [
     [
@@ -73,8 +81,8 @@ describe("Orders ExtensionPoint mapping — per-product fan-out", () => {
   test("Cancelled fans out to one ItemOrderCancelled per product", undefined, () => thenPublishesEvents(whenDelegateEvent({
     TAG: "Cancelled",
     productIds: [
-      "p1",
-      "p2"
+      p1,
+      p2
     ]
   }), [
     [
@@ -143,5 +151,8 @@ export {
   thenHandlesDirective,
   thenHandlesDirectives,
   thenHandlesNoDirective,
+  c1,
+  p1,
+  p2,
 }
 /* include Not a pure module */

package/lib/bs/tests/Order/Aggregate/OrderMappings_GWT.res

@@ -17,13 +17,15 @@ module AutoShipGwtMapping = {
 
 include ReventlessGwt.Mapping_GWT.Make(AutoShipGwtMapping)
 
-let placedEvent = Order.Placed({customerId: "cust-1", productIds: ["prod-1"]})
+let cust1 = CustomerId.make("cust-1")
+let prod1 = CatalogSpec.ProductId.make("prod-1")
+let placedEvent = Order.Placed({customerId: cust1, productIds: [prod1]})
 
 describe("Order auto-ship mapping (Placed → Ship)", () => {
   test("Place → AutoShipMapping issues Ship → target emits Shipped", () =>
     givenSourceEvents([])
     ->andTargetEvents([("order-1", [placedEvent])])
-    ->whenSourceCmd("order-1", Place({customerId: "cust-1", productIds: ["prod-1"]}))
+    ->whenSourceCmd("order-1", Place({customerId: cust1, productIds: [prod1]}))
     ->thenTargetEvent("order-1", Order.Shipped)
   )
 
@@ -42,8 +44,8 @@ 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"]})])])
+    givenSourceEvents([placedEvent, Order.Cancelled({productIds: [prod1]})])
+    ->andTargetEvents([("order-1", [placedEvent, Order.Cancelled({productIds: [prod1]})])])
     ->whenSourceCmd("order-1", Refund({reason: "customer-changed-mind"}))
     ->thenNoTargetEvent
   )

package/lib/bs/tests/Order/Aggregate/OrderMappings_GWT.res.mjs

@@ -1,13 +1,15 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Order$OrderingPlugin from "../../../src/Order/Aggregate/Order.res.mjs";
+import * as ProductId$CatalogSpec from "@reventlessdev/online-shop-aggregates-catalog-spec/src/ProductId.res.mjs";
+import * as OrderId$OrderingPlugin from "../../../src/Order/OrderId.res.mjs";
+import * as CustomerId$OrderingPlugin from "../../../src/Customer/CustomerId.res.mjs";
 import * as Mapping_GWT$ReventlessGwt from "@reventlessdev/reventless-gwt/src/Mapping_GWT.res.mjs";
 import * as Order_Behavior$OrderingPlugin from "../../../src/Order/Aggregate/Order_Behavior.res.mjs";
 import * as Order_Mappings$OrderingPlugin from "../../../src/Order/Aggregate/Order_Mappings.res.mjs";
 
 let OrderSource = Mapping_GWT$ReventlessGwt.FromBehavior({
-  Id: Id$Reventless.$$String,
+  Id: OrderId$OrderingPlugin,
   name: Order$OrderingPlugin.name,
   eventSchema: Order$OrderingPlugin.eventSchema,
   errorSchema: Order$OrderingPlugin.errorSchema,
@@ -18,7 +20,7 @@ let OrderSource = Mapping_GWT$ReventlessGwt.FromBehavior({
   traits: Order$OrderingPlugin.traits
 })({
   Spec: {
-    Id: Id$Reventless.$$String,
+    Id: OrderId$OrderingPlugin,
     name: Order$OrderingPlugin.name,
     eventSchema: Order$OrderingPlugin.eventSchema,
     errorSchema: Order$OrderingPlugin.errorSchema,
@@ -36,7 +38,7 @@ let OrderSource = Mapping_GWT$ReventlessGwt.FromBehavior({
 });
 
 let OrderTarget = Mapping_GWT$ReventlessGwt.FromBehavior({
-  Id: Id$Reventless.$$String,
+  Id: OrderId$OrderingPlugin,
   name: Order$OrderingPlugin.name,
   eventSchema: Order$OrderingPlugin.eventSchema,
   errorSchema: Order$OrderingPlugin.errorSchema,
@@ -47,7 +49,7 @@ let OrderTarget = Mapping_GWT$ReventlessGwt.FromBehavior({
   traits: Order$OrderingPlugin.traits
 })({
   Spec: {
-    Id: Id$Reventless.$$String,
+    Id: OrderId$OrderingPlugin,
     name: Order$OrderingPlugin.name,
     eventSchema: Order$OrderingPlugin.eventSchema,
     errorSchema: Order$OrderingPlugin.errorSchema,
@@ -92,11 +94,15 @@ let thenTargetEvent = include.thenTargetEvent;
 
 let thenNoTargetEvent = include.thenNoTargetEvent;
 
-let placedEvent_1 = ["prod-1"];
+let cust1 = CustomerId$OrderingPlugin.make("cust-1");
+
+let prod1 = ProductId$CatalogSpec.make("prod-1");
+
+let placedEvent_1 = [prod1];
 
 let placedEvent = {
   TAG: "Placed",
-  customerId: "cust-1",
+  customerId: cust1,
   productIds: placedEvent_1
 };
 
@@ -106,8 +112,8 @@ describe("Order auto-ship mapping (Placed → Ship)", () => {
       [placedEvent]
     ]]), "order-1", {
     TAG: "Place",
-    customerId: "cust-1",
-    productIds: ["prod-1"]
+    customerId: cust1,
+    productIds: [prod1]
   }), "order-1", "Shipped"));
   test("Ship command does not fire the mapping (only Placed events do)", undefined, () => thenNoTargetEvent(whenSourceCmd(andTargetEvents(givenSourceEvents([placedEvent]), [[
       "order-1",
@@ -121,7 +127,7 @@ describe("Order auto-ship mapping (Placed → Ship)", () => {
     placedEvent,
     {
       TAG: "Cancelled",
-      productIds: ["prod-1"]
+      productIds: [prod1]
     }
   ]), [[
       "order-1",
@@ -129,7 +135,7 @@ describe("Order auto-ship mapping (Placed → Ship)", () => {
         placedEvent,
         {
           TAG: "Cancelled",
-          productIds: ["prod-1"]
+          productIds: [prod1]
         }
       ]
     ]]), "order-1", {
@@ -167,6 +173,8 @@ export {
   thenSourceError,
   thenTargetError,
   thenTargetEventsWithError,
+  cust1,
+  prod1,
   placedEvent,
 }
 /* OrderSource Not a pure module */