@reventlessdev/reventless-core 3.0.0-alpha.239 → 3.0.0-alpha.241

package/tests/api/SuryToJsonSchemaTest.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_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
@@ -90,18 +90,18 @@ let emptySpec = {
 globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("deriveObjectSchema with no annotations:", () => {
     globalThis.test("emits plain JSON Schema when no metadata is attached", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        name: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        name: s.m(Sury.string)
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
       let idSchema = getPropertyOf(json, "id");
       globalThis.expect(Stdlib_Option.flatMap(idSchema, s => getProperty(s, "x-reventless-id"))).toBe(undefined);
     });
     globalThis.test("emits format:\"date-time\" for a DateTime-marked string field", () => {
-      let schema = S.schema(s => ({
+      let schema = Sury.$schema(s => ({
         placedAt: s.m(DateTime$Reventless.string),
-        name: s.m(S.string)
+        name: s.m(Sury.string)
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
       globalThis.expect(Stdlib_Option.flatMap(Stdlib_Option.flatMap(getPropertyOf(json, "placedAt"), s => getProperty(s, "format")), Stdlib_JSON.Decode.string)).toBe("date-time");
@@ -110,9 +110,9 @@ globalThis.describe("SuryToJsonSchema:", () => {
   });
   globalThis.describe("deriveObjectSchema with an owner field:", () => {
     let ownerOf = (json, name) => Stdlib_Option.flatMap(getPropertyOf(json, name), s => getProperty(s, "x-reventless-owner"));
-    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(S.schema(s => ({
+    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$schema(s => ({
       customerId: s.m(Owner$Reventless.string),
-      note: s.m(S.string)
+      note: s.m(Sury.string)
     })));
     globalThis.test("the marked field carries x-reventless-owner", () => {
       globalThis.expect(ownerOf(json, "customerId")).toEqual(true);
@@ -124,74 +124,39 @@ globalThis.describe("SuryToJsonSchema:", () => {
       globalThis.expect(Stdlib_Option.flatMap(getPropertyOf(json, "customerId"), s => getProperty(s, "type"))).toEqual("string");
     });
     globalThis.test("an optional owner field is still recognised", () => {
-      let optJson = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(S.schema(s => ({
-        customerId: s.m(S.option(Owner$Reventless.string))
+      let optJson = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$schema(s => ({
+        customerId: s.m(Sury.$option(Owner$Reventless.string))
       })));
       globalThis.expect(ownerOf(optJson, "customerId")).toEqual(true);
     });
   });
   globalThis.describe("deriveObjectSchema with stateAnnotations metadata:", () => {
-    let withSpec = (schema, spec) => S.Metadata.set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
     globalThis.test("emits x-reventless-id on field listed in ids", () => {
-      let schema = S.schema(s => ({
-        entityId: s.m(S.string),
-        name: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        entityId: s.m(Sury.string),
+        name: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: ["entityId"],
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.ids = ["entityId"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let entityIdSchema = getPropertyOf(json, "entityId");
       globalThis.expect(Stdlib_Option.flatMap(Stdlib_Option.flatMap(entityIdSchema, s => getProperty(s, "x-reventless-id")), Stdlib_JSON.Decode.bool)).toBe(true);
     });
     globalThis.test("emits x-reventless-compositeId on each compositeId field", () => {
-      let schema = S.schema(s => ({
-        environment: s.m(S.string),
-        platformName: s.m(S.string),
-        name: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        environment: s.m(Sury.string),
+        platformName: s.m(Sury.string),
+        name: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: [
-          "environment",
-          "platformName"
-        ],
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.compositeIds = [
+        "environment",
+        "platformName"
+      ];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let envSchema = getPropertyOf(json, "environment");
       let platformSchema = getPropertyOf(json, "platformName");
@@ -204,157 +169,72 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-subId on field listed in subIds", () => {
-      let schema = S.schema(s => ({
-        itemId: s.m(S.string),
-        version: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        itemId: s.m(Sury.string),
+        version: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: ["version"],
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.subIds = ["version"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let versionSchema = getPropertyOf(json, "version");
       globalThis.expect(Stdlib_Option.flatMap(Stdlib_Option.flatMap(versionSchema, s => getProperty(s, "x-reventless-subId")), Stdlib_JSON.Decode.bool)).toBe(true);
     });
     globalThis.test("emits x-reventless-index as the index name when named", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        ownerId: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        ownerId: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: [[
-            "ownerId",
-            "byOwner"
-          ]],
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.indexes = [[
+          "ownerId",
+          "byOwner"
+        ]];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let ownerIdSchema = getPropertyOf(json, "ownerId");
       globalThis.expect(Stdlib_Option.flatMap(Stdlib_Option.flatMap(ownerIdSchema, s => getProperty(s, "x-reventless-index")), Stdlib_JSON.Decode.string)).toBe("byOwner");
     });
     globalThis.test("emits x-reventless-index as true for unnamed @index", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        category: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        category: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: [[
-            "category",
-            ""
-          ]],
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.indexes = [[
+          "category",
+          ""
+        ]];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let categorySchema = getPropertyOf(json, "category");
       globalThis.expect(Stdlib_Option.flatMap(Stdlib_Option.flatMap(categorySchema, s => getProperty(s, "x-reventless-index")), Stdlib_JSON.Decode.bool)).toBe(true);
     });
     globalThis.test("does not emit x-reventless-* on unannotated fields", () => {
-      let schema = S.schema(s => ({
-        entityId: s.m(S.string),
-        name: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        entityId: s.m(Sury.string),
+        name: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: ["entityId"],
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.ids = ["entityId"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let nameSchema = getPropertyOf(json, "name");
       globalThis.expect(Stdlib_Option.flatMap(nameSchema, s => getProperty(s, "x-reventless-id"))).toBe(undefined);
     });
     globalThis.test("emits x-reventless-hidden on field listed in hidden", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        deploymentId: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        deploymentId: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: ["deploymentId"],
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.hidden = ["deploymentId"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let deploymentIdSchema = getPropertyOf(json, "deploymentId");
       let idSchema = getPropertyOf(json, "id");
@@ -366,32 +246,44 @@ globalThis.describe("SuryToJsonSchema:", () => {
         undefined
       ]);
     });
+    globalThis.test("drops a field listed in internal rather than annotating it", () => {
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        eventCollector: s.m(Sury.string)
+      }));
+      let newrecord = {...emptySpec};
+      newrecord.internal = ["eventCollector"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
+      let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
+      globalThis.expect([
+        Stdlib_Option.isNone(getPropertyOf(json, "eventCollector")),
+        Stdlib_Option.isSome(getPropertyOf(json, "id"))
+      ]).toEqual([
+        true,
+        true
+      ]);
+    });
+    globalThis.test("keeps a dropped field out of required", () => {
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        eventCollector: s.m(Sury.string)
+      }));
+      let newrecord = {...emptySpec};
+      newrecord.internal = ["eventCollector"];
+      let spec = newrecord;
+      let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec));
+      globalThis.expect(Stdlib_Array.filterMap(Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_Option.flatMap(Stdlib_JSON.Decode.object(json), o => o["required"]), Stdlib_JSON.Decode.array), []), Stdlib_JSON.Decode.string)).toEqual(["id"]);
+    });
     globalThis.test("emits x-reventless-summary on field listed in summary", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        pluginName: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        pluginName: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: ["pluginName"],
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.summary = ["pluginName"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let pluginNameSchema = getPropertyOf(json, "pluginName");
       let idSchema = getPropertyOf(json, "id");
@@ -404,34 +296,17 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-drillTarget as the slice name", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        components: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        components: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: [[
-            "components",
-            "ResourceInventory"
-          ]],
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.drillTargets = [[
+          "components",
+          "ResourceInventory"
+        ]];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let componentsSchema = getPropertyOf(json, "components");
       let idSchema = getPropertyOf(json, "id");
@@ -444,100 +319,50 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-drillTargetKey as the key path", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        components: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        components: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: [[
-            "components",
-            "ResourceInventory"
-          ]],
-        drillTargetKeys: [[
-            "components",
-            "kind/name"
-          ]],
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.drillTargetKeys = [[
+          "components",
+          "kind/name"
+        ]];
+      newrecord.drillTargets = [[
+          "components",
+          "ResourceInventory"
+        ]];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let componentsSchema = getPropertyOf(json, "components");
       globalThis.expect(Stdlib_Option.flatMap(Stdlib_Option.flatMap(componentsSchema, s => getProperty(s, "x-reventless-drillTargetKey")), Stdlib_JSON.Decode.string)).toBe("kind/name");
     });
     globalThis.test("does not emit x-reventless-drillTargetKey when no key was supplied", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        components: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        components: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: [[
-            "components",
-            "ResourceInventory"
-          ]],
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.drillTargets = [[
+          "components",
+          "ResourceInventory"
+        ]];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let componentsSchema = getPropertyOf(json, "components");
       globalThis.expect(Stdlib_Option.flatMap(componentsSchema, s => getProperty(s, "x-reventless-drillTargetKey"))).toBe(undefined);
     });
     globalThis.test("emits x-reventless-scan on field listed in scan", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        status: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        status: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: ["status"],
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.scan = ["status"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let statusSchema = getPropertyOf(json, "status");
       let idSchema = getPropertyOf(json, "id");
@@ -550,31 +375,14 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-scanSort on field listed in scanSort", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        name: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        name: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: ["name"],
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.scanSort = ["name"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let nameSchema = getPropertyOf(json, "name");
       let idSchema = getPropertyOf(json, "id");
@@ -587,34 +395,17 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-semantic on the field listed in semantic", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        total: s.m(S.float)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        total: s.m(Sury.float)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: [[
-            "total",
-            "currency"
-          ]],
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.semantic = [[
+          "total",
+          "currency"
+        ]];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let totalSchema = getPropertyOf(json, "total");
       let idSchema = getPropertyOf(json, "id");
@@ -627,37 +418,20 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-metric {aggregate,label} on the field listed in metric", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        total: s.m(S.float)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        total: s.m(Sury.float)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: [[
-            "total",
-            {
-              aggregate: "sum",
-              label: "Revenue"
-            }
-          ]],
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.metric = [[
+          "total",
+          {
+            aggregate: "sum",
+            label: "Revenue"
+          }
+        ]];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let metricObj = Stdlib_Option.flatMap(getPropertyOf(json, "total"), s => getProperty(s, "x-reventless-metric"));
       globalThis.expect([
@@ -669,36 +443,19 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("omits the metric label when empty (UI derives one from the field name)", () => {
-      let schema = S.schema(s => ({
-        total: s.m(S.float)
+      let schema = Sury.$schema(s => ({
+        total: s.m(Sury.float)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: [[
-            "total",
-            {
-              aggregate: "sum",
-              label: ""
-            }
-          ]],
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.metric = [[
+          "total",
+          {
+            aggregate: "sum",
+            label: ""
+          }
+        ]];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let metricObj = Stdlib_Option.flatMap(getPropertyOf(json, "total"), s => getProperty(s, "x-reventless-metric"));
       globalThis.expect([
@@ -710,37 +467,20 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-retired {label,showWhenFalse} on the retired field", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        archived: s.m(S.bool)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        archived: s.m(Sury.bool)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: {
-          field: "archived",
-          label: "Archived",
-          showWhenFalse: true,
-          values: undefined,
-          namedWhenRetired: false
-        }
-      });
+      let newrecord = {...emptySpec};
+      newrecord.retired = {
+        field: "archived",
+        label: "Archived",
+        showWhenFalse: true,
+        values: undefined,
+        namedWhenRetired: false
+      };
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let retiredObj = Stdlib_Option.flatMap(getPropertyOf(json, "archived"), s => getProperty(s, "x-reventless-retired"));
       globalThis.expect([
@@ -754,40 +494,24 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     let stateFormJson = values => {
-      let schema = S.schema(s => ({
-        customerId: s.m(S.string),
-        accountStatus: s.m(S.union([
-          S.literal("Active"),
-          S.literal("Deactivated")
+      let schema = Sury.$schema(s => ({
+        customerId: s.m(Sury.string),
+        accountStatus: s.m(Sury.union([
+          Sury.literal("Active"),
+          Sury.literal("Deactivated")
         ]))
       }));
-      return SuryToJsonSchema$ReventlessCore.deriveObjectSchema(withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: "accountStatus",
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: {
-          field: "accountStatus",
-          label: "",
-          showWhenFalse: false,
-          values: values,
-          namedWhenRetired: false
-        }
-      }));
+      let newrecord = {...emptySpec};
+      newrecord.retired = {
+        field: "accountStatus",
+        label: "",
+        showWhenFalse: false,
+        values: values,
+        namedWhenRetired: false
+      };
+      newrecord.lifecycle = "accountStatus";
+      let spec = newrecord;
+      return SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec));
     };
     let retiredOn = (json, field) => Stdlib_Option.flatMap(getPropertyOf(json, field), s => getProperty(s, "x-reventless-retired"));
     let stringsAt = (retiredObj, key) => Stdlib_Option.map(Stdlib_Option.flatMap(Stdlib_Option.flatMap(retiredObj, r => getProperty(r, key)), Stdlib_JSON.Decode.array), a => Stdlib_Array.filterMap(a, Stdlib_JSON.Decode.string));
@@ -813,36 +537,19 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]), "accountStatus"), r => getProperty(r, "value"))).toEqual(undefined);
     });
     globalThis.test("omits both value and values entirely on the boolean form", () => {
-      let schema = S.schema(s => ({
-        archived: s.m(S.bool)
+      let schema = Sury.$schema(s => ({
+        archived: s.m(Sury.bool)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: {
-          field: "archived",
-          label: "",
-          showWhenFalse: false,
-          values: undefined,
-          namedWhenRetired: false
-        }
-      });
+      let newrecord = {...emptySpec};
+      newrecord.retired = {
+        field: "archived",
+        label: "",
+        showWhenFalse: false,
+        values: undefined,
+        namedWhenRetired: false
+      };
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let retiredObj = retiredOn(json, "archived");
       globalThis.expect([
@@ -855,36 +562,19 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("carries namedWhenRetired only when the record opted in", () => {
       let build = named => {
-        let schema = S.schema(s => ({
-          archived: s.m(S.bool)
+        let schema = Sury.$schema(s => ({
+          archived: s.m(Sury.bool)
         }));
-        return Stdlib_Option.flatMap(Stdlib_Option.flatMap(retiredOn(SuryToJsonSchema$ReventlessCore.deriveObjectSchema(withSpec(schema, {
-          ids: emptySpec_ids,
-          compositeIds: emptySpec_compositeIds,
-          subIds: emptySpec_subIds,
-          compositeSubIds: emptySpec_compositeSubIds,
-          indexes: emptySpec_indexes,
-          hidden: emptySpec_hidden,
-          summary: emptySpec_summary,
-          drillTargets: emptySpec_drillTargets,
-          drillTargetKeys: emptySpec_drillTargetKeys,
-          collapsed: emptySpec_collapsed,
-          scan: emptySpec_scan,
-          scanSort: emptySpec_scanSort,
-          semantic: emptySpec_semantic,
-          metric: emptySpec_metric,
-          lifecycle: undefined,
-          groupBy: undefined,
-          visibility: undefined,
-          live: undefined,
-          retired: {
-            field: "archived",
-            label: "",
-            showWhenFalse: false,
-            values: undefined,
-            namedWhenRetired: named
-          }
-        })), "archived"), r => getProperty(r, "namedWhenRetired")), Stdlib_JSON.Decode.bool);
+        let newrecord = {...emptySpec};
+        newrecord.retired = {
+          field: "archived",
+          label: "",
+          showWhenFalse: false,
+          values: undefined,
+          namedWhenRetired: named
+        };
+        let spec = newrecord;
+        return Stdlib_Option.flatMap(Stdlib_Option.flatMap(retiredOn(SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec)), "archived"), r => getProperty(r, "namedWhenRetired")), Stdlib_JSON.Decode.bool);
       };
       globalThis.expect([
         build(true),
@@ -895,36 +585,19 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("omits the retired label when empty but always states showWhenFalse", () => {
-      let schema = S.schema(s => ({
-        deactivated: s.m(S.bool)
+      let schema = Sury.$schema(s => ({
+        deactivated: s.m(Sury.bool)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: {
-          field: "deactivated",
-          label: "",
-          showWhenFalse: false,
-          values: undefined,
-          namedWhenRetired: false
-        }
-      });
+      let newrecord = {...emptySpec};
+      newrecord.retired = {
+        field: "deactivated",
+        label: "",
+        showWhenFalse: false,
+        values: undefined,
+        namedWhenRetired: false
+      };
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let retiredObj = Stdlib_Option.flatMap(getPropertyOf(json, "deactivated"), s => getProperty(s, "x-reventless-retired"));
       globalThis.expect([
@@ -936,38 +609,21 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits nothing for a schema with no retired annotation", () => {
-      let schema = S.schema(s => ({
-        archived: s.m(S.bool)
+      let schema = Sury.$schema(s => ({
+        archived: s.m(Sury.bool)
       }));
-      let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(withSpec(schema, emptySpec));
+      let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, emptySpec));
       globalThis.expect(Stdlib_Option.flatMap(getPropertyOf(json, "archived"), s => getProperty(s, "x-reventless-retired"))).toBe(undefined);
     });
     globalThis.test("emits x-reventless-group-by on the field named by groupBy", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        kind: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        kind: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: "kind",
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.groupBy = "kind";
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let kindSchema = getPropertyOf(json, "kind");
       let idSchema = getPropertyOf(json, "id");
@@ -980,31 +636,14 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-collapsed on field listed in collapsed", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        primaryResource: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        primaryResource: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: ["primaryResource"],
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.collapsed = ["primaryResource"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       let primarySchema = getPropertyOf(json, "primaryResource");
       let idSchema = getPropertyOf(json, "id");
@@ -1017,107 +656,39 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("emits x-reventless-visibility at top level when visibility is Internal", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: "Internal",
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.visibility = "Internal";
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       globalThis.expect(Stdlib_Option.flatMap(getProperty(json, "x-reventless-visibility"), Stdlib_JSON.Decode.string)).toBe("Internal");
     });
     globalThis.test("omits x-reventless-visibility when visibility is None (default Public)", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.visibility = undefined;
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       globalThis.expect(getProperty(json, "x-reventless-visibility")).toBe(undefined);
     });
     globalThis.test("emits x-reventless-live at top level when live is declared", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string)
-      }));
-      let offJson = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: false,
-        retired: undefined
-      }));
-      let onJson = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: true,
-        retired: undefined
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string)
       }));
+      let newrecord = {...emptySpec};
+      newrecord.live = false;
+      let spec = newrecord;
+      let offJson = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec));
+      let newrecord$1 = {...emptySpec};
+      newrecord$1.live = true;
+      let spec$1 = newrecord$1;
+      let onJson = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec$1));
       globalThis.expect([
         Stdlib_Option.flatMap(getProperty(offJson, "x-reventless-live"), Stdlib_JSON.Decode.bool),
         Stdlib_Option.flatMap(getProperty(onJson, "x-reventless-live"), Stdlib_JSON.Decode.bool)
@@ -1127,58 +698,25 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]);
     });
     globalThis.test("omits x-reventless-live when live is None (no annotation)", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.live = undefined;
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       globalThis.expect(getProperty(json, "x-reventless-live")).toBe(undefined);
     });
     globalThis.test("emits x-reventless-live and x-reventless-visibility together", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: "Internal",
-        live: false,
-        retired: undefined
-      });
+      let newrecord = {...emptySpec};
+      newrecord.live = false;
+      newrecord.visibility = "Internal";
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$p);
       globalThis.expect([
         Stdlib_Option.flatMap(getProperty(json, "x-reventless-visibility"), Stdlib_JSON.Decode.string),
@@ -1208,52 +746,34 @@ globalThis.describe("SuryToJsonSchema:", () => {
     };
     let sortStrings = xs => xs.toSorted(Primitive_string.compare);
     globalThis.test("properties keyset matches between deriveObjectSchema and S.toJSONSchema", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        name: s.m(S.string),
-        count: s.m(S.int)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        name: s.m(Sury.string),
+        count: s.m(Sury.int)
       }));
       let derived = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
-      let native = S.toJSONSchema(schema);
+      let native = Sury.toJSONSchema(schema);
       globalThis.expect(sortStrings(getKeys(derived))).toEqual(sortStrings(getKeys(native)));
     });
     globalThis.test("required array matches between deriveObjectSchema and S.toJSONSchema", () => {
-      let schema = S.schema(s => ({
-        id: s.m(S.string),
-        name: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        id: s.m(Sury.string),
+        name: s.m(Sury.string)
       }));
       let derived = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
-      let native = S.toJSONSchema(schema);
+      let native = Sury.toJSONSchema(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", () => {
-      let withSpec = (schema, spec) => S.Metadata.set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
-      let schema = S.schema(s => ({
-        entityId: s.m(S.string),
-        name: s.m(S.string)
+      let schema = Sury.$schema(s => ({
+        entityId: s.m(Sury.string),
+        name: s.m(Sury.string)
       }));
-      let schema$p = withSpec(schema, {
-        ids: ["entityId"],
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: emptySpec_semantic,
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
-      let native = S.toJSONSchema(schema$p);
+      let newrecord = {...emptySpec};
+      newrecord.ids = ["entityId"];
+      let spec = newrecord;
+      let schema$p = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
+      let native = Sury.toJSONSchema(schema$p);
       let entityIdSchema = getPropertyOf(native, "entityId");
       globalThis.expect(Stdlib_Option.flatMap(entityIdSchema, s => getProperty(s, "x-reventless-id"))).toBe(undefined);
     });
@@ -1261,7 +781,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("reference / DCB-tag decoupling:", () => {
     let formatOf = (schema, fieldName) => Stdlib_Option.flatMap(getPropertyOf(schema, fieldName), s => getProperty(s, "format"));
     globalThis.test("a DCB-tagged field with no reference is still an entity id", () => {
-      let schema = S.schema(s => ({
+      let schema = Sury.$schema(s => ({
         orderId: s.m(DcbTag$Reventless.string)
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
@@ -1270,7 +790,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
     globalThis.test("a reference without a DCB tag is still an entity id", () => {
       let field = Reference$Reventless.toWithoutDcbTag(undefined, "Customer");
-      let schema = S.schema(s => ({
+      let schema = Sury.$schema(s => ({
         customerId: s.m(field)
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
@@ -1283,7 +803,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
       globalThis.expect(Stdlib_Option.map(Reference$Reventless.getTarget(field), t => t.entity)).toEqual("Customer");
     });
     globalThis.test("neither reference nor tag emits x-reventless-semantic on the wire", () => {
-      let schema = S.schema(s => ({
+      let schema = Sury.$schema(s => ({
         customerId: s.m(Reference$Reventless.to_(undefined, undefined, "Customer")),
         placedAt: s.m(DateTime$Reventless.string)
       }));
@@ -1296,8 +816,8 @@ globalThis.describe("SuryToJsonSchema:", () => {
   globalThis.describe("type-carried semantics on a command field:", () => {
     let semanticOf = (json, fieldName) => Stdlib_Option.flatMap(getPropertyOf(json, fieldName), s => getProperty(s, "x-reventless-semantic"));
     globalThis.test("a storage-ref command field emits the semantic id", () => {
-      let schema = S.schema(s => ({
-        productId: s.m(S.string),
+      let schema = Sury.$schema(s => ({
+        productId: s.m(Sury.string),
         imageUrl: s.m(StorageRef$Reventless.forStore(undefined, "productImages"))
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
@@ -1305,7 +825,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
       globalThis.expect(semanticOf(json, "productId")).toBe(undefined);
     });
     globalThis.test("it carries the store identity and marks the type as its source", () => {
-      let schema = S.schema(s => ({
+      let schema = Sury.$schema(s => ({
         imageUrl: s.m(StorageRef$Reventless.forStore("catalog", "productImages"))
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
@@ -1323,55 +843,38 @@ globalThis.describe("SuryToJsonSchema:", () => {
       ]));
     });
     globalThis.test("the underlying string shape is unchanged", () => {
-      let schema = S.schema(s => ({
+      let schema = Sury.$schema(s => ({
         imageUrl: s.m(StorageRef$Reventless.forStore(undefined, "productImages"))
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
       globalThis.expect(Stdlib_Option.flatMap(getPropertyOf(json, "imageUrl"), s => getProperty(s, "type"))).toEqual("string");
     });
     globalThis.test("an optional storage-ref field keeps both its semantic and its nullability", () => {
-      let schema = S.schema(s => ({
-        imageUrl: s.m(S.option(StorageRef$Reventless.forStore(undefined, "productImages")))
+      let schema = Sury.$schema(s => ({
+        imageUrl: s.m(Sury.$option(StorageRef$Reventless.forStore(undefined, "productImages")))
       }));
       let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
       globalThis.expect(semanticOf(json, "imageUrl")).toEqual("storageRef");
       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 withSpec = (schema, spec) => S.Metadata.set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
-      let schema = withSpec(S.schema(s => ({
+      let newrecord = {...emptySpec};
+      newrecord.semantic = [[
+          "imageUrl",
+          "image"
+        ]];
+      let spec = newrecord;
+      let schema = Sury.$schema(s => ({
         imageUrl: s.m(StorageRef$Reventless.forStore(undefined, "productImages"))
-      })), {
-        ids: emptySpec_ids,
-        compositeIds: emptySpec_compositeIds,
-        subIds: emptySpec_subIds,
-        compositeSubIds: emptySpec_compositeSubIds,
-        indexes: emptySpec_indexes,
-        hidden: emptySpec_hidden,
-        summary: emptySpec_summary,
-        drillTargets: emptySpec_drillTargets,
-        drillTargetKeys: emptySpec_drillTargetKeys,
-        collapsed: emptySpec_collapsed,
-        scan: emptySpec_scan,
-        scanSort: emptySpec_scanSort,
-        semantic: [[
-            "imageUrl",
-            "image"
-          ]],
-        metric: emptySpec_metric,
-        lifecycle: undefined,
-        groupBy: undefined,
-        visibility: undefined,
-        live: undefined,
-        retired: undefined
-      });
-      let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema);
+      }));
+      let schema$1 = Sury.$Metadata_set(schema, StateAnnotations$Reventless.stateAnnotationsId, spec);
+      let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(schema$1);
       globalThis.expect(semanticOf(json, "imageUrl")).toEqual("storageRef");
     });
   });
   globalThis.describe("branded scalars keep their underlying shape:", () => {
     let keyOf = (json, name, key) => Stdlib_Option.flatMap(getPropertyOf(json, name), s => getProperty(s, key));
-    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(S.schema(s => ({
+    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$schema(s => ({
       contactEmail: s.m(Email$Reventless.schema),
       taxRate: s.m(Percent$Reventless.schema)
     })));
@@ -1404,9 +907,9 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
   });
   globalThis.describe("Money changes the field's shape, and says so:", () => {
-    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(S.schema(s => ({
+    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$schema(s => ({
       price: s.m(Money$Reventless.schema),
-      quantity: s.m(S.float)
+      quantity: s.m(Sury.float)
     })));
     let keyOf = (name, key) => Stdlib_Option.flatMap(getPropertyOf(json, name), s => getProperty(s, key));
     globalThis.test("the field is an object, not a number", () => {
@@ -1456,7 +959,7 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
   });
   globalThis.describe("DateRange is an object whose parts stay date-times:", () => {
-    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(S.schema(s => ({
+    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$schema(s => ({
       deliveryWindow: s.m(DateRange$Reventless.schema),
       orderedAt: s.m(DateTime$Reventless.string)
     })));
@@ -1494,9 +997,9 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
   });
   globalThis.describe("GeoPoint is an object carrying the geoPoint marker:", () => {
-    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(S.schema(s => ({
+    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$schema(s => ({
       location: s.m(GeoPoint$Reventless.schema),
-      lat: s.m(S.float)
+      lat: s.m(Sury.float)
     })));
     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", () => {
@@ -1532,12 +1035,12 @@ globalThis.describe("SuryToJsonSchema:", () => {
     });
   });
   globalThis.describe("an optional field inside a nested record:", () => {
-    let inner = S.schema(s => ({
-      street: s.m(S.string),
-      unit: s.m(S.option(S.string))
+    let inner = Sury.$schema(s => ({
+      street: s.m(Sury.string),
+      unit: s.m(Sury.$option(Sury.string))
     }));
-    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(S.schema(s => ({
-      id: s.m(S.string),
+    let json = SuryToJsonSchema$ReventlessCore.deriveObjectSchema(Sury.$schema(s => ({
+      id: s.m(Sury.string),
       address: s.m(inner)
     })));
     let nestedRequired = Stdlib_Array.filterMap(Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_Option.flatMap(getPropertyOf(json, "address"), a => getProperty(a, "required")), Stdlib_JSON.Decode.array), []), Stdlib_JSON.Decode.string);