@reventlessdev/reventless-local 3.0.0-alpha.226 → 3.0.0-alpha.228

package/tests/BakedManifestFilesTest.res

@@ -16,7 +16,6 @@ let keysOf = (config: ReventlessInfra.Platform.bakedManifest) =>
   BakedManifest.files(~config)->Array.map(((key, _)) => key)
 
 describe("BakedManifest.files", () => {
-  open Expect
 
   // The regression line: one declaration, one file, under the name every
   // existing deployment's config.json already points at.

package/tests/PluginEventDecodeTest.res

@@ -16,7 +16,7 @@ let envelopeOf = (event: ReventlessCore.PluginSpec.event) =>
     "Catalog",
     meta,
     ~recordedAt="2024-01-01T00:00:00Z",
-    event->S.reverseConvertToJsonOrThrow(ReventlessCore.PluginSpec.eventSchema),
+    event->Reventless.Util_Sury.toJson(ReventlessCore.PluginSpec.eventSchema),
   )
 
 describe("Platform.decodePluginEventEnvelope", () => {
@@ -38,7 +38,7 @@ describe("Platform.decodePluginEventEnvelope", () => {
   testSync("returns None for a bare event JSON (no envelope) and malformed input", () => {
     // The old bug class: input that is not the {id, meta, event} envelope.
     let bare =
-      ReventlessCore.PluginSpec.VersionDetected("2.0.0")->S.reverseConvertToJsonOrThrow(
+      ReventlessCore.PluginSpec.VersionDetected("2.0.0")->Reventless.Util_Sury.toJson(
         ReventlessCore.PluginSpec.eventSchema,
       )
     expect(Platform.decodePluginEventEnvelope(bare))->toEqual(None)
@@ -64,7 +64,7 @@ describe("Platform.decodeUiFragmentRegistryEventEnvelope", () => {
   }
 
   let dcbEnvelopeOf = (event: ReventlessCore.UiFragmentRegistry.event) => {
-    let json = event->S.reverseConvertToJsonOrThrow(ReventlessCore.UiFragmentRegistry.eventSchema)
+    let json = event->Reventless.Util_Sury.toJson(ReventlessCore.UiFragmentRegistry.eventSchema)
     let (eventType, data) = json->ReventlessCore.Message.splitMessage
     ReventlessCore.Message.composeEventJson'(
       "Catalog",

package/tests/PluginEventDecodeTest.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Util_Sury$Reventless from "@reventlessdev/reventless-spec/src/util/Util_Sury.res.mjs";
 import * as Message$ReventlessCore from "@reventlessdev/reventless-core/src/Message.res.mjs";
 import * as Platform$ReventlessLocal from "../src/Platform.res.mjs";
 import * as PluginSpec$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/lifecycle/PluginSpec.res.mjs";
@@ -15,7 +15,7 @@ TestRunner$ReventlessLocal.setup();
 let meta = Message$ReventlessCore.generateMeta(PluginSpec$ReventlessCore.name, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
 
 function envelopeOf(event) {
-  return Message$ReventlessCore.composeEventJson$p("Catalog", meta, "2024-01-01T00:00:00Z", S.reverseConvertToJsonOrThrow(event, PluginSpec$ReventlessCore.eventSchema));
+  return Message$ReventlessCore.composeEventJson$p("Catalog", meta, "2024-01-01T00:00:00Z", Util_Sury$Reventless.toJson(event, PluginSpec$ReventlessCore.eventSchema));
 }
 
 globalThis.describe("Platform.decodePluginEventEnvelope", () => {
@@ -46,7 +46,7 @@ globalThis.describe("Platform.decodePluginEventEnvelope", () => {
     });
   });
   globalThis.test("returns None for a bare event JSON (no envelope) and malformed input", () => {
-    let bare = S.reverseConvertToJsonOrThrow({
+    let bare = Util_Sury$Reventless.toJson({
       TAG: "VersionDetected",
       _0: "2.0.0"
     }, PluginSpec$ReventlessCore.eventSchema);
@@ -62,7 +62,7 @@ globalThis.describe("Platform.decodePluginEventEnvelope", () => {
 globalThis.describe("Platform.decodeUiFragmentRegistryEventEnvelope", () => {
   let dcbMeta = Message$ReventlessCore.generateMeta(ComponentType$ReventlessCore.name(Platform_Admin_Structure$ReventlessCore.pluginId, "DcbEventLog"), undefined, undefined, undefined, undefined, undefined, undefined, undefined);
   let dcbEnvelopeOf = event => {
-    let json = S.reverseConvertToJsonOrThrow(event, UiFragmentRegistry$ReventlessCore.eventSchema);
+    let json = Util_Sury$Reventless.toJson(event, UiFragmentRegistry$ReventlessCore.eventSchema);
     let match = Message$ReventlessCore.splitMessage(json);
     return Message$ReventlessCore.composeEventJson$p("Catalog", dcbMeta, "2024-01-01T00:00:00Z", Message$ReventlessCore.combineMessage(match[0], match[1]));
   };

package/tests/ShellConfigTest.res

@@ -167,7 +167,6 @@ let fulfilment: ReventlessInfra.Platform.bakedJourney = {
 }
 
 describe("ShellConfig.overlay — journeys", () => {
-  open Expect
 
   // The regression line. A shell that has never heard of journeys must not
   // suddenly find a key it does not know.

package/tests/UiHintsTest.res

@@ -103,30 +103,54 @@ describe("UiHints.emit", () => {
 // point, while mid-session it is almost always an editor mid-save, and killing a
 // running dev server over a keystroke is worse than the restart this replaces.
 
-// Both exits close the watcher AND clear the deadline. A watcher is `unref`ed
+// The edit is repeated, and that is not belt-and-braces.
+//
+// `fs.watch` does not promise that a write landing near the watcher's creation
+// is reported. The FSEvents stream behind it on macOS is armed asynchronously,
+// and a write that gets there first is not reported late — it is not reported at
+// all. Measured against this very module: once the stream is up the edit is seen
+// in about 10ms, and when it is not, the same edit produces no event in four
+// seconds, with which of the two happens varying by how many watchers the
+// process has already opened rather than by anything the test does.
+//
+// So a single edit tests the arming, not the reload. Repeating it on an interval
+// far longer than a reload takes — 50ms of debounce plus a file copy — leaves the
+// case where the first write lands identical to what it always was, and lets the
+// case where it is dropped recover on the next one instead of reporting that hot
+// reload is broken. Re-writing the same bytes is what a developer saving twice
+// does, so nothing here asserts less than it did.
+let retryEvery = 1000
+
+// All three exits close the watcher AND clear both timers. A watcher is `unref`ed
 // and would not hold the run open on its own, but a live 4-second timer would —
 // and "Jest did not exit" on a suite that passed is exactly the noise that
 // teaches a reader to ignore it.
-let waitForReload = (~timeoutMs: int=4000, ~afterWatching: unit => unit, ~uiHintsFile, ~dir) =>
+let waitForReload = (~timeoutMs: int=4000, ~edit: unit => unit, ~uiHintsFile, ~dir) =>
   Promise.make((resolve, _) => {
     let fired = ref(0)
     let watcher = ref(None)
     let deadline = ref(None)
+    let retry = ref(None)
     // Resolves with a count rather than rejecting on the deadline: "nothing was
     // re-served" is the expected answer in half these cases, and a rejection
     // would make the assertion read as an infrastructure failure.
     let finish = () => {
       watcher.contents->Option.forEach(NodeFs.watcherClose)
       deadline.contents->Option.forEach(clearTimeout)
+      retry.contents->Option.forEach(clearTimeout)
       resolve(fired.contents)
     }
+    let rec editUntilSeen = () => {
+      edit()
+      retry := Some(setTimeout(editUntilSeen, retryEvery))
+    }
     watcher :=
       UiHints.watch(~uiHintsFile, ~dir, ~onReload=() => {
         fired := fired.contents + 1
         finish()
       })
     deadline := Some(setTimeout(finish, timeoutMs))
-    afterWatching()
+    editUntilSeen()
   })
 
 describe("UiHints.watch", () => {
@@ -147,7 +171,7 @@ describe("UiHints.watch", () => {
     let fired = await waitForReload(
       ~uiHintsFile=Some(path),
       ~dir,
-      ~afterWatching=() => NodeFs.writeFileSync(path, edited),
+      ~edit=() => NodeFs.writeFileSync(path, edited),
     )
     expect((fired > 0, served(dir)))->toEqual((true, edited))
   })
@@ -163,7 +187,7 @@ describe("UiHints.watch", () => {
       ~timeoutMs=1500,
       ~uiHintsFile=Some(path),
       ~dir,
-      ~afterWatching=() => NodeFs.writeFileSync(path, `{"Catalog": {"views":`),
+      ~edit=() => NodeFs.writeFileSync(path, `{"Catalog": {"views":`),
     )
     expect((fired, served(dir)))->toEqual((0, declared))
   })
@@ -178,7 +202,10 @@ describe("UiHints.watch", () => {
     let fired = await waitForReload(
       ~uiHintsFile=Some(path),
       ~dir,
-      ~afterWatching=() => {
+      // Both halves of the save, so a repeat of this edit is the same story told
+      // again and still ends on the whole file — never a truncated write left
+      // standing after a complete one.
+      ~edit=() => {
         NodeFs.writeFileSync(path, `{"Catalog": {"views":`)
         let _ = setTimeout(() => NodeFs.writeFileSync(path, whole), 200)
       },

package/tests/UiHintsTest.res.mjs

@@ -88,7 +88,7 @@ globalThis.describe("UiHints.emit", () => {
   });
 });
 
-function waitForReload(timeoutMsOpt, afterWatching, uiHintsFile, dir) {
+function waitForReload(timeoutMsOpt, edit, uiHintsFile, dir) {
   let timeoutMs = timeoutMsOpt !== undefined ? timeoutMsOpt : 4000;
   return new Promise((resolve, param) => {
     let fired = {
@@ -100,6 +100,9 @@ function waitForReload(timeoutMsOpt, afterWatching, uiHintsFile, dir) {
     let deadline = {
       contents: undefined
     };
+    let retry = {
+      contents: undefined
+    };
     let finish = () => {
       Stdlib_Option.forEach(watcher.contents, prim => {
         prim.close();
@@ -107,14 +110,21 @@ function waitForReload(timeoutMsOpt, afterWatching, uiHintsFile, dir) {
       Stdlib_Option.forEach(deadline.contents, prim => {
         clearTimeout(prim);
       });
+      Stdlib_Option.forEach(retry.contents, prim => {
+        clearTimeout(prim);
+      });
       resolve(fired.contents);
     };
+    let editUntilSeen = () => {
+      edit();
+      retry.contents = Primitive_option.some(setTimeout(editUntilSeen, 1000));
+    };
     watcher.contents = UiHints$ReventlessLocal.watch(uiHintsFile, dir, () => {
       fired.contents = fired.contents + 1 | 0;
       finish();
     });
     deadline.contents = Primitive_option.some(setTimeout(finish, timeoutMs));
-    afterWatching();
+    editUntilSeen();
   });
 }
 
@@ -178,6 +188,8 @@ globalThis.describe("UiHints.watch", () => {
   });
 });
 
+let retryEvery = 1000;
+
 export {
   shipped,
   declared,
@@ -187,6 +199,7 @@ export {
   served,
   baselinePath,
   threw,
+  retryEvery,
   waitForReload,
 }
 /*  Not a pure module */

package/tests/adapter/CommandAuthorizationTest.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -15,16 +15,16 @@ import * as CommandGeneratorResolvers_GraphQL$ReventlessLocal from "../../src/ad
 
 TestRunner$ReventlessLocal.setup();
 
-let commandSchema = S.union([
-  S.schema(s => ({
+let commandSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "Add",
-    name: s.m(S.string)
+    name: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Rename",
-    name: s.m(S.string)
+    name: s.m(Sury.string)
   })),
-  S.literal("Archive")
+  Sury.literal("Archive")
 ]);
 
 function commandAuthorization(cmd) {

package/tests/adapter/GraphQL_SchemaInspectorTest.res

@@ -271,7 +271,7 @@ describe("GraphQL_SchemaInspector", () => {
       expect(result.typeDef->Option.isSome)->toBe(true)
       let typeDef = result.typeDef->Option.getOrThrow
       expect(typeDef->String.includes("type CatalogProduct"))->toBe(true)
-      expect(result.singleQuery->String.includes("Catalog_Product(id: ID!)"))->toBe(true)
+      expect(result.singleQuery->String.includes("Catalog_Product(id: ID!, includeRetired: Boolean)"))->toBe(true)
       expect(result.singleQuery->String.includes("CatalogProduct"))->toBe(true)
       expect(result.listQuery->Option.isSome)->toBe(true)
       let listQ = result.listQuery->Option.getOrThrow
@@ -298,7 +298,7 @@ describe("GraphQL_SchemaInspector", () => {
       )
       let inspection = ReventlessCore.GraphQL_SchemaInspector.inspectFragment(fragment)
       let sdl = inspection.sdlPreview
-      expect(sdl->String.includes("RM_Product(id: ID!): RMProduct"))->toBe(true)
+      expect(sdl->String.includes("RM_Product(id: ID!, includeRetired: Boolean): RMProduct"))->toBe(true)
       expect(sdl->String.includes("type RMProduct"))->toBe(true)
       // The type should have an injected id: ID! field (first field in the type)
       let typeLines = sdl->String.split("\n")
@@ -357,7 +357,7 @@ describe("GraphQL_SchemaInspector", () => {
       )
       let inspection = ReventlessCore.GraphQL_SchemaInspector.inspectFragment(fragment)
       let sdl = inspection.sdlPreview
-      expect(sdl->String.includes("Default_Thing(id: ID!): DefaultThing"))->toBe(true)
+      expect(sdl->String.includes("Default_Thing(id: ID!, includeRetired: Boolean): DefaultThing"))->toBe(true)
     })
   })
 
@@ -542,13 +542,15 @@ describe("GraphQL_SchemaInspector", () => {
         ],
       )
       let inspection = ReventlessCore.GraphQL_SchemaInspector.inspectFragment(fragment)
-      // TestState, TestStateEdge, TestStateConnection, TestStateFilter (Phase 4 connection filter)
+      // TestState, TestStateEdge, TestStateConnection, TestStateFilter (connection filter)
+      // + TestStateRef (the reference door's projection)
       // + CommandResult union + CommandAccepted + CommandRejected + CommandPending
       // (auto-injected whenever the fragment emits any mutation field).
-      expect(inspection.types->Array.length)->toBe(8)
+      expect(inspection.types->Array.length)->toBe(9)
       expect(inspection.mutations->Array.length)->toBe(1)
-      // single Test_State(id), list Test_States(...), and Test_StatesByIds(ids: [String!]!)
-      expect(inspection.queries->Array.length)->toBe(3)
+      // single Test_State(id), list Test_States(...), Test_StatesByIds(ids: [String!]!)
+      // and Test_StatesRefs(ids: [ID!]!) — the by-ids read projected to a reference.
+      expect(inspection.queries->Array.length)->toBe(4)
       expect(inspection.sdlPreview->String.includes("type TestState"))->toBe(true)
       expect(inspection.sdlPreview->String.includes("type TestStateEdge"))->toBe(true)
       expect(inspection.sdlPreview->String.includes("type TestStateConnection"))->toBe(true)

package/tests/adapter/GraphQL_SchemaInspectorTest.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as DcbTag$Reventless from "@reventlessdev/reventless-spec/src/components/DcbTag.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
@@ -16,87 +16,93 @@ import * as Plugin_SubscriptionSchema$ReventlessCore from "@reventlessdev/revent
 
 TestRunner$ReventlessLocal.setup();
 
-let testStateSchema = S.schema(s => ({
+let stringSchema = Sury.string;
+
+let numberSchema = Sury.float;
+
+let boolSchema = Sury.bool;
+
+let testStateSchema = Sury.$schema(s => ({
   id: s.m(DcbTag$Reventless.string),
-  name: s.m(S.string),
-  price: s.m(S.float),
-  active: s.m(S.bool)
+  name: s.m(Sury.string),
+  price: s.m(Sury.float),
+  active: s.m(Sury.bool)
 }));
 
-let svStateSchema = S.schema(s => ({
+let svStateSchema = Sury.$schema(s => ({
   productId: s.m(DcbTag$Reventless.string),
-  name: s.m(S.string),
-  price: s.m(S.float)
+  name: s.m(Sury.string),
+  price: s.m(Sury.float)
 }));
 
-let sourceKindSchema = S.union([
-  S.literal("tagged"),
-  S.literal("ancestry"),
-  S.literal("substrate")
+let sourceKindSchema = Sury.union([
+  Sury.literal("tagged"),
+  Sury.literal("ancestry"),
+  Sury.literal("substrate")
 ]);
 
-let enumStateSchema = S.schema(s => ({
+let enumStateSchema = Sury.$schema(s => ({
   productId: s.m(DcbTag$Reventless.string),
   requiredSource: s.m(sourceKindSchema),
-  optionalSource: s.m(S.option(sourceKindSchema))
+  optionalSource: s.m(Sury.$option(sourceKindSchema))
 }));
 
-let addCommandSchema = S.schema(s => ({
+let addCommandSchema = Sury.$schema(s => ({
   productId: s.m(DcbTag$Reventless.string),
-  name: s.m(S.string)
+  name: s.m(Sury.string)
 }));
 
-let unionCommandSchema = S.union([
-  S.schema(s => ({
+let unionCommandSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "Create",
     itemId: s.m(DcbTag$Reventless.string),
-    name: s.m(S.string)
+    name: s.m(Sury.string)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Rename",
     itemId: s.m(DcbTag$Reventless.string),
-    newName: s.m(S.string)
+    newName: s.m(Sury.string)
   }))
 ]);
 
-let dcbSingleCommandSchema = S.schema(s => ({
+let dcbSingleCommandSchema = Sury.$schema(s => ({
   TAG: "AddCategory",
   categoryId: s.m(DcbTag$Reventless.string),
-  name: s.m(S.string)
+  name: s.m(Sury.string)
 }));
 
-let dcbMultiCommandSchema = S.union([
-  S.schema(s => ({
+let dcbMultiCommandSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "SyncNewProduct",
     productId: s.m(DcbTag$Reventless.string),
-    name: s.m(S.string),
-    price: s.m(S.float)
+    name: s.m(Sury.string),
+    price: s.m(Sury.float)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "ChangeSyncedPrice",
     productId: s.m(DcbTag$Reventless.string),
-    price: s.m(S.float)
+    price: s.m(Sury.float)
   }))
 ]);
 
-let plainStateSchema = S.schema(s => ({
+let plainStateSchema = Sury.$schema(s => ({
   productId: s.m(DcbTag$Reventless.string),
-  name: s.m(S.string)
+  name: s.m(Sury.string)
 }));
 
-let keylessStateSchema = S.schema(s => ({
-  name: s.m(S.string),
-  note: s.m(S.string)
+let keylessStateSchema = Sury.$schema(s => ({
+  name: s.m(Sury.string),
+  note: s.m(Sury.string)
 }));
 
-let indexedStateSchema = S.schema(s => ({
+let indexedStateSchema = Sury.$schema(s => ({
   productId: s.m(DcbTag$Reventless.string),
-  ownerId: s.m(S.string),
-  status: s.m(S.string),
-  name: s.m(S.string)
+  ownerId: s.m(Sury.string),
+  status: s.m(Sury.string),
+  name: s.m(Sury.string)
 }));
 
-let indexedStateSchemaWithAnnotations = S.Metadata.set(indexedStateSchema, StateAnnotations$Reventless.stateAnnotationsId, {
+let indexedStateSchemaWithAnnotations = Sury.$Metadata_set(indexedStateSchema, StateAnnotations$Reventless.stateAnnotationsId, {
   ids: ["productId"],
   compositeIds: [],
   subIds: [],
@@ -121,13 +127,13 @@ let indexedStateSchemaWithAnnotations = S.Metadata.set(indexedStateSchema, State
   retired: undefined
 });
 
-let orderedStateSchema = S.schema(s => ({
+let orderedStateSchema = Sury.$schema(s => ({
   productId: s.m(DcbTag$Reventless.string),
-  createdAt: s.m(S.string),
-  name: s.m(S.string)
+  createdAt: s.m(Sury.string),
+  name: s.m(Sury.string)
 }));
 
-let orderedStateSchemaWithAnnotations = S.Metadata.set(orderedStateSchema, StateAnnotations$Reventless.stateAnnotationsId, {
+let orderedStateSchemaWithAnnotations = Sury.$Metadata_set(orderedStateSchema, StateAnnotations$Reventless.stateAnnotationsId, {
   ids: ["productId"],
   compositeIds: [],
   subIds: ["createdAt"],
@@ -149,14 +155,14 @@ let orderedStateSchemaWithAnnotations = S.Metadata.set(orderedStateSchema, State
   retired: undefined
 });
 
-let scanStateSchema = S.schema(s => ({
+let scanStateSchema = Sury.$schema(s => ({
   productId: s.m(DcbTag$Reventless.string),
-  status: s.m(S.string),
-  name: s.m(S.string),
-  description: s.m(S.string)
+  status: s.m(Sury.string),
+  name: s.m(Sury.string),
+  description: s.m(Sury.string)
 }));
 
-let scanStateSchemaWithAnnotations = S.Metadata.set(scanStateSchema, StateAnnotations$Reventless.stateAnnotationsId, {
+let scanStateSchemaWithAnnotations = Sury.$Metadata_set(scanStateSchema, StateAnnotations$Reventless.stateAnnotationsId, {
   ids: ["productId"],
   compositeIds: [],
   subIds: [],
@@ -181,16 +187,16 @@ let scanStateSchemaWithAnnotations = S.Metadata.set(scanStateSchema, StateAnnota
 globalThis.describe("GraphQL_SchemaInspector", () => {
   globalThis.describe("inspectScalar", () => {
     globalThis.test("plain string derives to String", async () => {
-      globalThis.expect(GraphQL_SchemaInspector$ReventlessCore.inspectScalar(S.string)).toBe("String");
+      globalThis.expect(GraphQL_SchemaInspector$ReventlessCore.inspectScalar(stringSchema)).toBe("String");
     });
     globalThis.test("tagged string derives to ID", async () => {
       globalThis.expect(GraphQL_SchemaInspector$ReventlessCore.inspectScalar(DcbTag$Reventless.string)).toBe("ID");
     });
     globalThis.test("float derives to Float", async () => {
-      globalThis.expect(GraphQL_SchemaInspector$ReventlessCore.inspectScalar(S.float)).toBe("Float");
+      globalThis.expect(GraphQL_SchemaInspector$ReventlessCore.inspectScalar(numberSchema)).toBe("Float");
     });
     globalThis.test("bool derives to Boolean", async () => {
-      globalThis.expect(GraphQL_SchemaInspector$ReventlessCore.inspectScalar(S.bool)).toBe("Boolean");
+      globalThis.expect(GraphQL_SchemaInspector$ReventlessCore.inspectScalar(boolSchema)).toBe("Boolean");
     });
   });
   globalThis.describe("inspectObjectType", () => {
@@ -205,7 +211,7 @@ globalThis.describe("GraphQL_SchemaInspector", () => {
       globalThis.expect(sdl.includes("active: Boolean")).toBe(true);
     });
     globalThis.test("returns None for non-object schema", async () => {
-      let result = GraphQL_SchemaInspector$ReventlessCore.inspectObjectType("Foo", S.string);
+      let result = GraphQL_SchemaInspector$ReventlessCore.inspectObjectType("Foo", stringSchema);
       globalThis.expect(Stdlib_Option.isNone(result)).toBe(true);
     });
   });
@@ -229,7 +235,7 @@ globalThis.describe("GraphQL_SchemaInspector", () => {
       globalThis.expect(renameField.includes("newName: String")).toBe(true);
     });
     globalThis.test("returns empty for non-object/non-union schema", async () => {
-      let fields = GraphQL_SchemaInspector$ReventlessCore.inspectMutationFields("Foo", S.string);
+      let fields = GraphQL_SchemaInspector$ReventlessCore.inspectMutationFields("Foo", stringSchema);
       globalThis.expect(fields.length).toBe(0);
     });
   });
@@ -239,7 +245,7 @@ globalThis.describe("GraphQL_SchemaInspector", () => {
       globalThis.expect(Stdlib_Option.isSome(result.typeDef)).toBe(true);
       let typeDef = Stdlib_Option.getOrThrow(result.typeDef, undefined);
       globalThis.expect(typeDef.includes("type CatalogProduct")).toBe(true);
-      globalThis.expect(result.singleQuery.includes("Catalog_Product(id: ID!)")).toBe(true);
+      globalThis.expect(result.singleQuery.includes("Catalog_Product(id: ID!, includeRetired: Boolean)")).toBe(true);
       globalThis.expect(result.singleQuery.includes("CatalogProduct")).toBe(true);
       globalThis.expect(Stdlib_Option.isSome(result.listQuery)).toBe(true);
       let listQ = Stdlib_Option.getOrThrow(result.listQuery, undefined);
@@ -258,7 +264,7 @@ globalThis.describe("GraphQL_SchemaInspector", () => {
         }]);
       let inspection = GraphQL_SchemaInspector$ReventlessCore.inspectFragment(fragment);
       let sdl = inspection.sdlPreview;
-      globalThis.expect(sdl.includes("RM_Product(id: ID!): RMProduct")).toBe(true);
+      globalThis.expect(sdl.includes("RM_Product(id: ID!, includeRetired: Boolean): RMProduct")).toBe(true);
       globalThis.expect(sdl.includes("type RMProduct")).toBe(true);
       let typeLines = sdl.split("\n");
       let idFieldInType = typeLines.some(line => {
@@ -302,7 +308,7 @@ globalThis.describe("GraphQL_SchemaInspector", () => {
         }]);
       let inspection = GraphQL_SchemaInspector$ReventlessCore.inspectFragment(fragment);
       let sdl = inspection.sdlPreview;
-      globalThis.expect(sdl.includes("Default_Thing(id: ID!): DefaultThing")).toBe(true);
+      globalThis.expect(sdl.includes("Default_Thing(id: ID!, includeRetired: Boolean): DefaultThing")).toBe(true);
     });
   });
   globalThis.describe("Relay compliance", () => {
@@ -424,9 +430,9 @@ globalThis.describe("GraphQL_SchemaInspector", () => {
           authorization: undefined
         }]);
       let inspection = GraphQL_SchemaInspector$ReventlessCore.inspectFragment(fragment);
-      globalThis.expect(inspection.types.length).toBe(8);
+      globalThis.expect(inspection.types.length).toBe(9);
       globalThis.expect(inspection.mutations.length).toBe(1);
-      globalThis.expect(inspection.queries.length).toBe(3);
+      globalThis.expect(inspection.queries.length).toBe(4);
       globalThis.expect(inspection.sdlPreview.includes("type TestState")).toBe(true);
       globalThis.expect(inspection.sdlPreview.includes("type TestStateEdge")).toBe(true);
       globalThis.expect(inspection.sdlPreview.includes("type TestStateConnection")).toBe(true);
@@ -707,14 +713,8 @@ globalThis.describe("optional enum fields preserve GraphQL nullability", () => {
   });
 });
 
-let stringSchema = S.string;
-
 let taggedSchema = DcbTag$Reventless.string;
 
-let numberSchema = S.float;
-
-let boolSchema = S.bool;
-
 export {
   stringSchema,
   taggedSchema,

package/tests/adapter/LocalAuthHttpTest.res

@@ -163,7 +163,7 @@ testPromise("POST /__inmemory/login returns {token, identity} for valid credenti
   // The echoed identity matches what LocalAuth.lookupUser returns.
   switch getJsonField(body, "identity") {
   | Some(idJson) =>
-    let id = idJson->S.parseJsonOrThrow(Reventless.Identity.schema)
+    let id = idJson->Reventless.Util_Sury.fromJson(Reventless.Identity.schema)
     expect(id.username)->toEqual("alice")
     expect(id.groups)->toEqual(["Editor"])
   | None => JsError.throwWithMessage("response missing identity field")

package/tests/adapter/LocalAuthHttpTest.res.mjs

@@ -1,11 +1,11 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
 import * as Nodehttp from "node:http";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Identity$Reventless from "@reventlessdev/reventless-spec/src/types/Identity.res.mjs";
+import * as Util_Sury$Reventless from "@reventlessdev/reventless-spec/src/util/Util_Sury.res.mjs";
 import * as LocalAuth$ReventlessLocal from "../../src/adapter/Auth/LocalAuth.res.mjs";
 import * as TestRunner$ReventlessLocal from "../../src/test/TestRunner.res.mjs";
 import * as DomainGraphQL_Server$ReventlessLocal from "../../src/adapter/DomainGraphQL_Server.res.mjs";
@@ -151,7 +151,7 @@ globalThis.test("POST /__inmemory/login returns {token, identity} for valid cred
   if (idJson === undefined) {
     return Stdlib_JsError.throwWithMessage("response missing identity field");
   }
-  let id = S.parseJsonOrThrow(idJson, Identity$Reventless.schema);
+  let id = Util_Sury$Reventless.fromJson(idJson, Identity$Reventless.schema);
   globalThis.expect(id.username).toEqual("alice");
   globalThis.expect(id.groups).toEqual(["Editor"]);
 });