@reventlessdev/reventless-core 3.0.0-alpha.267 → 3.0.0-alpha.269

package/tests/api/GraphQL_FragmentGeneratorTest.res.mjs

@@ -234,7 +234,7 @@ globalThis.describe("deriveServerCapability — inferred keys reach the SDL surf
   globalThis.test("an inferred key yields an eq filter and a sort field", () => {
     let schema = Sury.$schema(s => ({
       orderId: s.m(Sury.string),
-      total: s.m(Sury.float)
+      total: s.m(Sury.number)
     }));
     let c = GraphQL_FragmentGenerator$ReventlessCore.deriveServerCapability("Orders", schema);
     globalThis.expect(c.filterFields.map(f => f.name)).toEqual(["orderId"]);
@@ -387,7 +387,7 @@ let schema = Sury.$schema(s => ({
   shippingMethod: s.m(shippingMethodSchema),
   total: s.m(Money$Reventless.schema),
   tip: s.m(Sury.$option(Money$Reventless.schema)),
-  itemCount: s.m(Sury.int)
+  itemCount: s.m(Sury.int32)
 }));
 
 let PlaceOrder = {

package/tests/api/SuryToJsonSchemaTest.res

@@ -1012,10 +1012,10 @@ describe("SuryToJsonSchema:", () => {
     )
   })
 
-  // Parity sanity-check: deriveObjectSchema and the legacy S.toJSONSchema must
+  // Parity sanity-check: deriveObjectSchema and the legacy S.toInputJSONSchemaOrThrow must
   // agree on `properties` keyset and `required` array for unannotated objects,
   // so swapping the encoder at Plugin_Structure.res:261/280 doesn't drop fields.
-  describe("parity with S.toJSONSchema for unannotated objects:", () => {
+  describe("parity with S.toInputJSONSchemaOrThrow for unannotated objects:", () => {
     let getKeys = (schema: JSON.t): array<string> =>
       switch getProperty(schema, "properties")->Option.flatMap(JSON.Decode.object) {
       | Some(obj) => obj->Dict.keysToArray
@@ -1031,7 +1031,7 @@ describe("SuryToJsonSchema:", () => {
     let sortStrings = (xs: array<string>): array<string> => xs->Array.toSorted(String.compare)
 
     testSync(
-      "properties keyset matches between deriveObjectSchema and S.toJSONSchema",
+      "properties keyset matches between deriveObjectSchema and S.toInputJSONSchemaOrThrow",
       () => {
         let schema = S.schema(
           s =>
@@ -1042,13 +1042,13 @@ describe("SuryToJsonSchema:", () => {
             },
         )->S.castToUnknown
         let derived = SuryToJsonSchema.deriveObjectSchema(schema)
-        let native = (schema->S.toJSONSchema->Obj.magic: JSON.t)
+        let native = (schema->S.toInputJSONSchemaOrThrow->Obj.magic: JSON.t)
         expect(derived->getKeys->sortStrings)->toEqual(native->getKeys->sortStrings)
       },
     )
 
     testSync(
-      "required array matches between deriveObjectSchema and S.toJSONSchema",
+      "required array matches between deriveObjectSchema and S.toInputJSONSchemaOrThrow",
       () => {
         let schema = S.schema(
           s =>
@@ -1058,13 +1058,13 @@ describe("SuryToJsonSchema:", () => {
             },
         )->S.castToUnknown
         let derived = SuryToJsonSchema.deriveObjectSchema(schema)
-        let native = (schema->S.toJSONSchema->Obj.magic: JSON.t)
+        let native = (schema->S.toInputJSONSchemaOrThrow->Obj.magic: JSON.t)
         expect(derived->getRequired->sortStrings)->toEqual(native->getRequired->sortStrings)
       },
     )
 
     testSync(
-      "S.toJSONSchema does NOT emit x-reventless-* keys even when metadata is set",
+      "S.toInputJSONSchemaOrThrow does NOT emit x-reventless-* keys even when metadata is set",
       () => {
         let withSpec = (schema, spec) =>
           schema->S.Metadata.set(~id=Reventless.StateAnnotations.stateAnnotationsId, spec)
@@ -1076,7 +1076,7 @@ describe("SuryToJsonSchema:", () => {
             },
         )->S.castToUnknown
         let schema' = schema->withSpec({...emptySpec, ids: ["entityId"]})
-        let native = (schema'->S.toJSONSchema->Obj.magic: JSON.t)
+        let native = (schema'->S.toInputJSONSchemaOrThrow->Obj.magic: JSON.t)
         let entityIdSchema = getPropertyOf(native, "entityId")
         expect(entityIdSchema->Option.flatMap(s => getProperty(s, "x-reventless-id")))->toBe(None)
       },

package/tests/api/SuryToJsonSchemaTest.res.mjs

@@ -471,7 +471,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("emits x-reventless-semantic on the field listed in semantic", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
-        total: s.m(Sury.float)
+        total: s.m(Sury.number)
       }));
       let newrecord = {...emptySpec};
       newrecord.semantic = [[
@@ -494,7 +494,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("emits x-reventless-metric {aggregate,label} on the field listed in metric", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
-        total: s.m(Sury.float)
+        total: s.m(Sury.number)
       }));
       let newrecord = {...emptySpec};
       newrecord.metric = [[
@@ -518,7 +518,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("omits the metric label when empty (UI derives one from the field name)", () => {
       let schema = Sury.$schema(s => ({
-        total: s.m(Sury.float)
+        total: s.m(Sury.number)
       }));
       let newrecord = {...emptySpec};
       newrecord.metric = [[
@@ -543,7 +543,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("emits x-reventless-retired {label,showWhenFalse} on the retired field", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       let newrecord = {...emptySpec};
       newrecord.retired = {
@@ -612,7 +612,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("omits both value and values entirely on the boolean form", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       let newrecord = {...emptySpec};
       newrecord.retired = {
@@ -637,7 +637,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("carries namedWhenRetired only when the record opted in", () => {
       let build = named => {
         let schema = Sury.$schema(s => ({
-          archived: s.m(Sury.bool)
+          archived: s.m(Sury.boolean)
         }));
         let newrecord = {...emptySpec};
         newrecord.retired = {
@@ -660,7 +660,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("omits the retired label when empty but always states showWhenFalse", () => {
       let schema = Sury.$schema(s => ({
-        deactivated: s.m(Sury.bool)
+        deactivated: s.m(Sury.boolean)
       }));
       let newrecord = {...emptySpec};
       newrecord.retired = {
@@ -684,7 +684,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("emits nothing for a schema with no retired annotation", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, emptySpec));
       globalThis.expect(Stdlib_Option.flatMap(getPropertyOf(json, "archived"), s => getProperty(s, "x-reventless-retired"))).toBe(undefined);
@@ -801,7 +801,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
   });
-  globalThis.describe("parity with S.toJSONSchema for unannotated objects:", () => {
+  globalThis.describe("parity with S.toInputJSONSchemaOrThrow for unannotated objects:", () => {
     let getKeys = schema => {
       let obj = Stdlib_Option.flatMap(getProperty(schema, "properties"), Stdlib_JSON.Decode.object);
       if (obj !== undefined) {
@@ -819,26 +819,26 @@ globalThis.describe("SuryToJsonSchema:", () => {
       }
     };
     let sortStrings = xs => xs.toSorted(Primitive_string.compare);
-    globalThis.test("properties keyset matches between deriveObjectSchema and S.toJSONSchema", () => {
+    globalThis.test("properties keyset matches between deriveObjectSchema and S.toInputJSONSchemaOrThrow", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
         name: s.m(Sury.string),
-        count: s.m(Sury.int)
+        count: s.m(Sury.int32)
       }));
       let derived = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, schema);
-      let native = Sury.toJSONSchema(schema);
+      let native = Sury.toInputJSONSchemaOrThrow(schema);
       globalThis.expect(sortStrings(getKeys(derived))).toEqual(sortStrings(getKeys(native)));
     });
-    globalThis.test("required array matches between deriveObjectSchema and S.toJSONSchema", () => {
+    globalThis.test("required array matches between deriveObjectSchema and S.toInputJSONSchemaOrThrow", () => {
       let schema = Sury.$schema(s => ({
         id: s.m(Sury.string),
         name: s.m(Sury.string)
       }));
       let derived = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, schema);
-      let native = Sury.toJSONSchema(schema);
+      let native = Sury.toInputJSONSchemaOrThrow(schema);
       globalThis.expect(sortStrings(getRequired(derived))).toEqual(sortStrings(getRequired(native)));
     });
-    globalThis.test("S.toJSONSchema does NOT emit x-reventless-* keys even when metadata is set", () => {
+    globalThis.test("S.toInputJSONSchemaOrThrow does NOT emit x-reventless-* keys even when metadata is set", () => {
       let schema = Sury.$schema(s => ({
         entityId: s.m(Sury.string),
         name: s.m(Sury.string)
@@ -847,7 +847,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
       newrecord.ids = ["entityId"];
       let spec = newrecord;
       let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
-      let native = Sury.toJSONSchema(schema$p);
+      let native = Sury.toInputJSONSchemaOrThrow(schema$p);
       let entityIdSchema = getPropertyOf(native, "entityId");
       globalThis.expect(Stdlib_Option.flatMap(entityIdSchema, s => getProperty(s, "x-reventless-id"))).toBe(undefined);
     });
@@ -932,15 +932,15 @@ globalThis.describe("SuryToJsonSchema:", () => {
       globalThis.expect(Stdlib_Option.isSome(Stdlib_Option.flatMap(getPropertyOf(json, "imageUrl"), s => getProperty(s, "oneOf")))).toBe(true);
     });
     globalThis.test("a type-carried semantic beats an annotation naming the same field", () => {
+      let schema = Sury.$schema(s => ({
+        imageUrl: s.m(StorageRef$Reventless.forStore(undefined, "productImages"))
+      }));
       let newrecord = {...emptySpec};
       newrecord.semantic = [[
           "imageUrl",
           "image"
         ]];
       let spec = newrecord;
-      let schema = Sury.$schema(s => ({
-        imageUrl: s.m(StorageRef$Reventless.forStore(undefined, "productImages"))
-      }));
       let schema$1 = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, schema$1);
       globalThis.expect(semanticOf(json, "imageUrl")).toEqual("storageRef");
@@ -1022,7 +1022,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("Money changes the field's shape, and says so:", () => {
     let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$schema(s => ({
       price: s.m(Money$Reventless.schema),
-      quantity: s.m(Sury.float)
+      quantity: s.m(Sury.number)
     })));
     let keyOf = (name, key) => Stdlib_Option.flatMap(getPropertyOf(json, name), s => getProperty(s, key));
     globalThis.test("the field is an object, not a number", () => {
@@ -1112,7 +1112,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("GeoPoint is an object carrying the geoPoint marker:", () => {
     let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$schema(s => ({
       location: s.m(GeoPoint$Reventless.schema),
-      lat: s.m(Sury.float)
+      lat: s.m(Sury.number)
     })));
     let keyOf = (name, key) => Stdlib_Option.flatMap(getPropertyOf(json, name), s => getProperty(s, key));
     globalThis.test("the field is an object, not a pair of numbers", () => {
@@ -1167,9 +1167,9 @@ globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("a field declaring a default:", () => {
     let defaultOf = (json, field) => Stdlib_Option.flatMap(getPropertyOf(json, field), s => getProperty(s, "default"));
     let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$schema(s => ({
-      quantity: s.m(FieldDefault$Reventless.int(Sury.int, 1)),
+      quantity: s.m(FieldDefault$Reventless.int(Sury.int32, 1)),
       shippingMethod: s.m(FieldDefault$Reventless.string(Sury.string, "Standard")),
-      plain: s.m(Sury.int)
+      plain: s.m(Sury.int32)
     })));
     globalThis.test("carries it as `default`", () => {
       globalThis.expect(defaultOf(json, "quantity")).toEqual(1);
@@ -1186,7 +1186,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     globalThis.test("and reaches a field of a nested record", () => {
       let lineItem = Sury.$schema(s => ({
         productId: s.m(Sury.string),
-        quantity: s.m(FieldDefault$Reventless.int(Sury.int, 1))
+        quantity: s.m(FieldDefault$Reventless.int(Sury.int32, 1))
       }));
       let nested = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(undefined, undefined, Sury.$schema(s => ({
         lineItems: s.m(Sury.array(lineItem))

package/tests/dcb/DcbFixtures.res.mjs

@@ -38,7 +38,7 @@ let eventSchema$1 = Sury.union([
   Sury.$schema(s => ({
     TAG: "PlainEvent",
     name: s.m(Sury.string),
-    value: s.m(Sury.int)
+    value: s.m(Sury.int32)
   })),
   Sury.literal("EmptyEvent")
 ]);
@@ -325,7 +325,7 @@ function makeMockStorage() {
 
 let plainRecordSchema = Sury.$schema(s => ({
   name: s.m(Sury.string),
-  value: s.m(Sury.int)
+  value: s.m(Sury.int32)
 }));
 
 let multiTagRecordSchema = Sury.$schema(s => ({
@@ -350,7 +350,7 @@ let mixedEventSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "EventB",
     id: s.m(DcbTag$Reventless.string),
-    count: s.m(Sury.int)
+    count: s.m(Sury.int32)
   })),
   Sury.$schema(s => ({
     TAG: "EventC",
@@ -373,7 +373,7 @@ let complexEventSchema = Sury.union([
     TAG: "OrderPlaced",
     orderId: s.m(DcbTag$Reventless.string),
     userId: s.m(DcbTag$Reventless.string),
-    amount: s.m(Sury.float)
+    amount: s.m(Sury.number)
   })),
   Sury.$schema(s => ({
     TAG: "OrderShipped",
@@ -383,7 +383,7 @@ let complexEventSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "PaymentProcessed",
     paymentId: s.m(DcbTag$Reventless.string),
-    amount: s.m(Sury.float)
+    amount: s.m(Sury.number)
   }))
 ]);
 
@@ -463,7 +463,7 @@ let compositeMultiVariantSchema = Sury.union([
     TAG: "VariantB",
     env: s.m(DcbTag$Reventless.compositePartitionMember(0, undefined)),
     name: s.m(DcbTag$Reventless.compositePartitionMember(1, undefined)),
-    count: s.m(Sury.int)
+    count: s.m(Sury.int32)
   }))
 ]);
 

package/tests/dcb/DcbValidationTest.res.mjs

@@ -43,7 +43,7 @@ let producedAMismatchTagsSchema = Sury.$schema(s => ({
 let producedAMismatchTypeSchema = Sury.$schema(s => ({
   TAG: "ItemCreated",
   itemId: s.m(DcbTag$Reventless.string),
-  name: s.m(Sury.float)
+  name: s.m(Sury.number)
 }));
 
 let consumedFullSchema = Sury.union([
@@ -77,13 +77,13 @@ let consumedDanglingSchema = Sury.$schema(s => ({
 let consumedBadFieldSchema = Sury.$schema(s => ({
   TAG: "ItemCreated",
   itemId: s.m(Sury.string),
-  rating: s.m(Sury.float)
+  rating: s.m(Sury.number)
 }));
 
 let consumedBadTypeSchema = Sury.$schema(s => ({
   TAG: "ItemCreated",
   itemId: s.m(Sury.string),
-  name: s.m(Sury.float)
+  name: s.m(Sury.number)
 }));
 
 let recordDemandCommandSchema = Sury.$schema(s => ({

package/tests/eventmapper/EventMapperFixtures.res.mjs

@@ -14,11 +14,11 @@ let eventSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "ItemCreated",
     name: s.m(Sury.string),
-    price: s.m(Sury.float)
+    price: s.m(Sury.number)
   })),
   Sury.$schema(s => ({
     TAG: "ItemPriceUpdated",
-    newPrice: s.m(Sury.float)
+    newPrice: s.m(Sury.number)
   })),
   Sury.literal("ItemRemoved")
 ]);
@@ -36,7 +36,7 @@ let name$1 = "ItemCatalog";
 
 let stateSchema = Sury.$schema(s => ({
   name: s.m(Sury.string),
-  price: s.m(Sury.float)
+  price: s.m(Sury.number)
 }));
 
 let config = ReadModel$Reventless.config(undefined, undefined, undefined);
@@ -128,7 +128,7 @@ let eventSchema$1 = Sury.union([
   Sury.$schema(s => ({
     TAG: "OrderPlaced",
     orderId: s.m(Sury.string),
-    amount: s.m(Sury.float)
+    amount: s.m(Sury.number)
   })),
   Sury.$schema(s => ({
     TAG: "OrderShipped",
@@ -151,7 +151,7 @@ let commandSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "ProcessOrder",
     orderId: s.m(Sury.string),
-    amount: s.m(Sury.float)
+    amount: s.m(Sury.number)
   })),
   Sury.$schema(s => ({
     TAG: "ShipOrder",

package/tests/plugin/IdentityReferenceTest.res

@@ -11,7 +11,7 @@ module CustomerId = Reventless.Id.Make({
   let key = "customerId"
 })
 
-let refsOf = (~viewsByKey, schema: S.t<'a>) => {
+let refsOf = (~viewsByKey, ~minted=?, schema: S.t<'a>) => {
   let reports = []
   let identityViews: Plugin_Structure.identityViews = {
     viewsByKey: Dict.fromArray(viewsByKey),
@@ -23,7 +23,7 @@ let refsOf = (~viewsByKey, schema: S.t<'a>) => {
   | _ => Dict.make()
   }
   let refs =
-    Plugin_Structure.extractReferences(~identityViews, properties)->Array.map(r => (
+    Plugin_Structure.extractReferences(~identityViews, ~minted?, properties)->Array.map(r => (
       r.fieldName,
       r.entity,
     ))
@@ -63,6 +63,17 @@ describe("a reference derived from the type", () => {
     expect(reports->Array.some(r => r->String.includes("no view in this plugin")))->toBe(true)
   })
 
+  // A create form mints this id; a list of the rows that already exist is the
+  // wrong control for it.
+  testSync("the id a creating command mints references nothing", () => {
+    let (refs, reports) = refsOf(
+      ~viewsByKey=[("customerId", ["Customers"]), ("productId", ["AvailableProducts"])],
+      ~minted="buyer",
+      order,
+    )
+    expect((refs, reports))->toEqual(([("productIds", "AvailableProducts")], []))
+  })
+
   testSync("an untyped field is left to its name, as before", () => {
     let (refs, reports) = refsOf(
       ~viewsByKey=[("customerId", ["Customers"])],
@@ -96,4 +107,12 @@ describe("a declared @ref on a typed id", () => {
     )
     expect((refs, reports))->toEqual(([("buyer", "Customers")], []))
   })
+
+  testSync("stands on a minted id: only the derived one steps aside", () => {
+    let chosen = S.schema(
+      s => {"buyer": s.matches(CustomerId.schema->Reventless.Reference.mark("Customers"))},
+    )
+    let (refs, _) = refsOf(~viewsByKey=[("customerId", ["Customers"])], ~minted="buyer", chosen)
+    expect(refs)->toEqual([("buyer", "Customers")])
+  })
 })

package/tests/plugin/IdentityReferenceTest.res.mjs

@@ -13,7 +13,7 @@ let CustomerId = Id$Reventless.Make({
   key: "customerId"
 });
 
-function refsOf(viewsByKey, schema) {
+function refsOf(viewsByKey, minted, schema) {
   let reports = [];
   let identityViews_viewsByKey = Object.fromEntries(viewsByKey);
   let identityViews_viewNames = viewsByKey.flatMap(param => param[1]);
@@ -27,7 +27,7 @@ function refsOf(viewsByKey, schema) {
   };
   let properties;
   properties = schema.type === "object" ? schema.properties : ({});
-  let refs = Plugin_Structure$ReventlessCore.extractReferences(identityViews, properties).map(r => [
+  let refs = Plugin_Structure$ReventlessCore.extractReferences(identityViews, minted, properties).map(r => [
     r.fieldName,
     r.entity
   ]);
@@ -54,7 +54,7 @@ globalThis.describe("a reference derived from the type", () => {
         "productId",
         ["AvailableProducts"]
       ]
-    ], order);
+    ], undefined, order);
     globalThis.expect(match[0]).toEqual([
       [
         "buyer",
@@ -80,7 +80,7 @@ globalThis.describe("a reference derived from the type", () => {
           "ProductDemand"
         ]
       ]
-    ], order);
+    ], undefined, order);
     globalThis.expect(match[0]).toEqual([[
         "buyer",
         "Customers"
@@ -91,18 +91,40 @@ globalThis.describe("a reference derived from the type", () => {
     let match = refsOf([[
         "productId",
         ["AvailableProducts"]
-      ]], order);
+      ]], undefined, order);
     globalThis.expect(match[0]).toEqual([[
         "productIds",
         "AvailableProducts"
       ]]);
     globalThis.expect(match[1].some(r => r.includes("no view in this plugin"))).toBe(true);
   });
+  globalThis.test("the id a creating command mints references nothing", () => {
+    let match = refsOf([
+      [
+        "customerId",
+        ["Customers"]
+      ],
+      [
+        "productId",
+        ["AvailableProducts"]
+      ]
+    ], "buyer", order);
+    globalThis.expect([
+      match[0],
+      match[1]
+    ]).toEqual([
+      [[
+          "productIds",
+          "AvailableProducts"
+        ]],
+      []
+    ]);
+  });
   globalThis.test("an untyped field is left to its name, as before", () => {
     let match = refsOf([[
         "customerId",
         ["Customers"]
-      ]], Sury.$schema(s => ({
+      ]], undefined, Sury.$schema(s => ({
       customerId: s.m(Sury.string)
     })));
     globalThis.expect([
@@ -129,7 +151,7 @@ globalThis.describe("a declared @ref on a typed id", () => {
         "productId",
         ["Products"]
       ]
-    ], referenced);
+    ], undefined, referenced);
     globalThis.expect(match[0]).toEqual([[
         "buyer",
         "Products"
@@ -146,7 +168,7 @@ globalThis.describe("a declared @ref on a typed id", () => {
           "Customers",
           "VipCustomers"
         ]
-      ]], chosen);
+      ]], undefined, chosen);
     globalThis.expect([
       match[0],
       match[1]
@@ -158,6 +180,19 @@ globalThis.describe("a declared @ref on a typed id", () => {
       []
     ]);
   });
+  globalThis.test("stands on a minted id: only the derived one steps aside", () => {
+    let chosen = Sury.$schema(s => ({
+      buyer: s.m(Reference$Reventless.mark(CustomerId.schema, undefined, undefined, "Customers"))
+    }));
+    let match = refsOf([[
+        "customerId",
+        ["Customers"]
+      ]], "buyer", chosen);
+    globalThis.expect(match[0]).toEqual([[
+        "buyer",
+        "Customers"
+      ]]);
+  });
 });
 
 export {

package/tests/plugin/PluginSpecExperiment.res

@@ -7,5 +7,5 @@ type record = {
 @schema
 type variant = | @s.meta({description: "QQQ"}) Q(int) | @s.meta({description: "XXX"}) X | Y
 
-Console.log2("Record:", recordSchema->S.toJSONSchema->JSON.stringifyAny(~space=2))
-Console.log2("Variant:", variantSchema->S.toJSONSchema->JSON.stringifyAny(~space=2))
+Console.log2("Record:", recordSchema->S.toInputJSONSchemaOrThrow->JSON.stringifyAny(~space=2))
+Console.log2("Variant:", variantSchema->S.toInputJSONSchemaOrThrow->JSON.stringifyAny(~space=2))

package/tests/plugin/PluginSpecExperiment.res.mjs

@@ -12,15 +12,15 @@ let recordSchema = Sury.$schema(s => ({
 let variantSchema = Sury.union([
   Sury.$schema(s => ({
     TAG: "Q",
-    _0: s.m(Sury.int)
+    _0: s.m(Sury.int32)
   })),
   Sury.literal("X"),
   Sury.literal("Y")
 ]);
 
-console.log("Record:", JSON.stringify(Sury.toJSONSchema(recordSchema), undefined, 2));
+console.log("Record:", JSON.stringify(Sury.toInputJSONSchemaOrThrow(recordSchema), undefined, 2));
 
-console.log("Variant:", JSON.stringify(Sury.toJSONSchema(variantSchema), undefined, 2));
+console.log("Variant:", JSON.stringify(Sury.toInputJSONSchemaOrThrow(variantSchema), undefined, 2));
 
 export {
   recordSchema,

package/tests/plugin/PluginStructureTest.res

@@ -1740,7 +1740,7 @@ describe("Plugin_Structure.make — Phase 2 graph fields", () => {
 
   // Phase 4: queryableDef.schema must carry x-reventless-* extension keys for
   // annotated state types. Plugin_Structure now uses SuryToJsonSchema.deriveObjectSchema
-  // (annotation-aware) instead of S.toJSONSchema (metadata-blind).
+  // (annotation-aware) instead of S.toInputJSONSchemaOrThrow (metadata-blind).
   describe("queryableDef.schema propagates x-reventless-* annotations", () => {
     let parseSchema = (svs: Reventless.Plugin.queryableDef): JSON.t => svs.schema->JSON.parseOrThrow
 

package/tests/plugin/PluginStructureTest.res.mjs

@@ -1417,20 +1417,20 @@ globalThis.describe("Plugin_Structure.make — Phase 2 graph fields", () => {
     });
     globalThis.test("publishes no states on the boolean form", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       globalThis.expect(Plugin_Structure$ReventlessCore.retiredValuesFromStateSchema(withRetired(schema, "archived"))).toEqual(undefined);
     });
     globalThis.test("names the annotated field", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       }));
       globalThis.expect(Plugin_Structure$ReventlessCore.retiredFieldFromStateSchema(withRetired(schema, "archived"))).toEqual("archived");
     });
     globalThis.test("declines a conventionally-named boolean nobody annotated", () => {
       let schema = Sury.$schema(s => ({
-        archived: s.m(Sury.bool),
-        deactivated: s.m(Sury.bool)
+        archived: s.m(Sury.boolean),
+        deactivated: s.m(Sury.boolean)
       }));
       globalThis.expect(Plugin_Structure$ReventlessCore.retiredFieldFromStateSchema(schema)).toEqual(undefined);
     });
@@ -1530,7 +1530,7 @@ globalThis.describe("Plugin_Structure.make — Phase 2 graph fields", () => {
     });
     globalThis.test("the boolean form is not a skip", () => {
       let schema = withRetiredStates(Sury.$schema(s => ({
-        archived: s.m(Sury.bool)
+        archived: s.m(Sury.boolean)
       })), "archived", undefined, undefined);
       globalThis.expect(Plugin_Structure$ReventlessCore.checkRetiredValue("Products", schema)).toEqual("NotDeclared");
     });

package/tests/plugin/SchemaWalkerTest.res.mjs

@@ -7,8 +7,8 @@ import * as SchemaWalker$ReventlessCore from "../../src/plugin/component/SchemaW
 
 let simpleRecordSchema = Sury.$schema(s => ({
   label: s.m(Sury.string),
-  count: s.m(Sury.int),
-  rating: s.m(Sury.$option(Sury.float))
+  count: s.m(Sury.int32),
+  rating: s.m(Sury.$option(Sury.number))
 }));
 
 let simpleVariantSchema = Sury.union([

package/tests/plugin/StateChange/PsReserveStock.res.mjs

@@ -15,7 +15,7 @@ function evolve(_state, _event) {
 
 let lineItemSchema = Sury.$schema(s => ({
   productId: s.m(Reference$Reventless.to_(undefined, undefined, "AvailableProducts")),
-  quantity: s.m(Sury.int)
+  quantity: s.m(Sury.int32)
 }));
 
 let commandSchema = Sury.$schema(s => ({

package/tests/plugin/StateView/PsAnnotatedView.res

@@ -1,6 +1,6 @@
 // Phase 4 fixture: state-view slice with structural annotations.
 // Used to verify Plugin_Structure.make ships x-reventless-* extension
-// properties through queryableDef.schema after swapping S.toJSONSchema
+// properties through queryableDef.schema after swapping S.toInputJSONSchemaOrThrow
 // for SuryToJsonSchema.deriveObjectSchema.
 
 @@reventless.spec("AnnotatedView")