@reventlessdev/rescript-pulumi-aws 2.4.0-alpha.79 → 3.0.0-alpha.0

package/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 3.0.0-alpha.0 (2026-08-18)
+
+* feat(sury)!: migrate to sury 11.0.0-rc.1 ([2cf8969](https://github.com/ReventlessDev/reventless-core/commit/2cf8969a222ce1b775563668a4126cb20611966c))
+### Features
+
+* **pulumi-aws:** expose recovery actions and M-of-N on metric alarms ([0062155](https://github.com/ReventlessDev/reventless-core/commit/00621553ffc56f29a2395d444e898175ec409cbc))
+
+### BREAKING CHANGES
+
+* sury is a direct dependency of the published packages and
+its schema and serialization surface changed; consumers must migrate to
+sury 11.
+
+
+
+# 2.4.0-alpha.80 (2026-08-18)
+
+### Bug Fixes
+
+* **aws:** make the unowned stub callable on the doors that call it ([931aa39](https://github.com/ReventlessDev/reventless-core/commit/931aa3968ae0e29befab7183125ed2453d4765cb))
+### Features
+
+* **aws:** compile every resolver against AppSync before the deploy attaches one ([635bc26](https://github.com/ReventlessDev/reventless-core/commit/635bc265c63e19f1a69f31dfefe116b523b1c39b))
+
+
 # 2.4.0-alpha.79 (2026-08-18)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/rescript-pulumi-aws",
-  "version": "2.4.0-alpha.79",
+  "version": "3.0.0-alpha.0",
   "description": "ReScript bindings for @pulumi/aws",
   "license": "Apache-2.0",
   "jest": {
@@ -21,14 +21,14 @@
   "dependencies": {
     "@pulumi/aws": "~7.19.0",
     "@pulumi/aws-native": "^1.62.0",
-    "sury": "11.0.0-alpha.4",
+    "sury": "11.0.0-rc.1",
     "@reventlessdev/rescript-aws-sdk": "3.0.0-alpha.12",
     "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.19"
   },
   "devDependencies": {
     "esbuild": "^0.25.12",
     "rescript": "12.3.0",
-    "sury-ppx": "11.0.0-alpha.2"
+    "sury-ppx": "11.0.0-rc.1"
   },
   "peerDependencies": {
     "rescript": "12.3.0"

package/src/AppSync/AppSync_Resolver_Functions.res

@@ -225,7 +225,13 @@ let ownerScopedResultResponse = (
   | (None, None) => resultResponseCode
   | _ =>
     let ownerPart = switch ownerField {
-    | None => "\n  const _owns = () => true;"
+    // Takes the row it ignores: APPSYNC_JS type-checks the resolver, so a
+  // zero-parameter stub called as `_owns(row)` is TS2554 ("Expected 0
+  // arguments, but got 1") and AppSync rejects the whole resolver at create
+  // time with "The code contains one or more errors". Only a door that emits
+  // the call conditionally is safe with a bare `() => true`, and that is not a
+  // property worth relying on across three templates.
+  | None => "\n  const _owns = (row) => true;"
     | Some(field) =>
       `
   // ── owner scoping (generated) ──${ownerGuardPreamble(~ownerField=field, ~elevatedGroups)}`
@@ -254,7 +260,13 @@ let ownerScopedFirstResultResponse = (
   | (None, None) => firstResultResponseCode
   | _ =>
     let ownerPart = switch ownerField {
-    | None => "\n  const _owns = () => true;"
+    // Takes the row it ignores: APPSYNC_JS type-checks the resolver, so a
+  // zero-parameter stub called as `_owns(row)` is TS2554 ("Expected 0
+  // arguments, but got 1") and AppSync rejects the whole resolver at create
+  // time with "The code contains one or more errors". Only a door that emits
+  // the call conditionally is safe with a bare `() => true`, and that is not a
+  // property worth relying on across three templates.
+  | None => "\n  const _owns = (row) => true;"
     | Some(field) =>
       `
   // ── owner scoping (generated) ──${ownerGuardPreamble(~ownerField=field, ~elevatedGroups)}`
@@ -288,22 +300,23 @@ ${resultResponseCode}
 // Relay Node resolver — pipeline functions for node(id: ID!) query
 // ---------------------------------------------------------------------------
 
-/** Pipeline function (NONE datasource): decodes global ID and stashes typeName + localId. */
+/** Pipeline function (NONE datasource): decodes global ID and stashes typeName + localId.
+
+    Written without a `try`: APPSYNC_JS rejects try statements outright
+    (`@aws-appsync/no-try`), so a guarded version of this cannot be deployed at
+    all. Nothing is lost by dropping it — `util.base64Decode` does not throw on
+    malformed input, it returns the bytes it made of it, so the catch could never
+    run. An id that decodes to no `type:localId` pair therefore fails the one way
+    that is left: both halves stash as null, which is also what the guarded
+    version reported for a decode it could not parse. */
 let nodeDecodeGlobalId =
   `${importUtil}
 export function request(ctx) {
-  const globalId = ctx.args.id;
-  try {
-    const decoded = util.base64Decode(globalId);
-    const colonIdx = decoded.indexOf(':');
-    if (colonIdx > 0) {
-      ctx.stash.typeName = decoded.substring(0, colonIdx);
-      ctx.stash.localId = decoded.substring(colonIdx + 1);
-    }
-  } catch (e) {
-    ctx.stash.typeName = null;
-    ctx.stash.localId = null;
-  }
+  const decoded = util.base64Decode(ctx.args.id);
+  const colonIdx = decoded.indexOf(':');
+  const parsed = colonIdx > 0;
+  ctx.stash.typeName = parsed ? decoded.substring(0, colonIdx) : null;
+  ctx.stash.localId = parsed ? decoded.substring(colonIdx + 1) : null;
   return { payload: null };
 }
 export function response(ctx) {
@@ -1335,7 +1348,13 @@ let refsByIds = (
   ~elevatedGroups: array<string>=[],
 ) => (tableName: string) => {
   let ownerGuard = switch ownerField {
-  | None => "\n  const _owns = () => true;"
+  // Takes the row it ignores: APPSYNC_JS type-checks the resolver, so a
+  // zero-parameter stub called as `_owns(row)` is TS2554 ("Expected 0
+  // arguments, but got 1") and AppSync rejects the whole resolver at create
+  // time with "The code contains one or more errors". Only a door that emits
+  // the call conditionally is safe with a bare `() => true`, and that is not a
+  // property worth relying on across three templates.
+  | None => "\n  const _owns = (row) => true;"
   | Some(field) => ownerGuardPreamble(~ownerField=field, ~elevatedGroups)
   }
   // Retirement, in the vocabulary the row itself uses: a member test for the

package/src/AppSync/AppSync_Resolver_Functions.res.mjs

@@ -113,7 +113,7 @@ function ownerScopedResultResponse(ownerField, elevatedGroups, retiredField, ret
     return resultResponseCode;
   }
   let ownerPart = ownerField !== undefined ? `
-  // ── owner scoping (generated) ──` + ownerGuardPreamble(ownerField, elevatedGroups) : "\n  const _owns = () => true;";
+  // ── owner scoping (generated) ──` + ownerGuardPreamble(ownerField, elevatedGroups) : "\n  const _owns = (row) => true;";
   let retiredPart = retiredGuardPreamble(retiredField, retiredValues, elevatedGroups, Stdlib_Option.isSome(ownerField));
   return `
 export function response(ctx) {
@@ -129,7 +129,7 @@ function ownerScopedFirstResultResponse(ownerField, elevatedGroups, retiredField
     return firstResultResponseCode;
   }
   let ownerPart = ownerField !== undefined ? `
-  // ── owner scoping (generated) ──` + ownerGuardPreamble(ownerField, elevatedGroups) : "\n  const _owns = () => true;";
+  // ── owner scoping (generated) ──` + ownerGuardPreamble(ownerField, elevatedGroups) : "\n  const _owns = (row) => true;";
   let retiredPart = retiredGuardPreamble(retiredField, retiredValues, elevatedGroups, Stdlib_Option.isSome(ownerField));
   return `
 export function response(ctx) {
@@ -148,18 +148,11 @@ export function request(ctx) { return {}; }
 
 let nodeDecodeGlobalId = importUtil + `
 export function request(ctx) {
-  const globalId = ctx.args.id;
-  try {
-    const decoded = util.base64Decode(globalId);
-    const colonIdx = decoded.indexOf(':');
-    if (colonIdx > 0) {
-      ctx.stash.typeName = decoded.substring(0, colonIdx);
-      ctx.stash.localId = decoded.substring(colonIdx + 1);
-    }
-  } catch (e) {
-    ctx.stash.typeName = null;
-    ctx.stash.localId = null;
-  }
+  const decoded = util.base64Decode(ctx.args.id);
+  const colonIdx = decoded.indexOf(':');
+  const parsed = colonIdx > 0;
+  ctx.stash.typeName = parsed ? decoded.substring(0, colonIdx) : null;
+  ctx.stash.localId = parsed ? decoded.substring(colonIdx + 1) : null;
   return { payload: null };
 }
 export function response(ctx) {
@@ -948,7 +941,7 @@ export function response(ctx) {
 function refsByIds(labelField, retiredField, retiredValues, namedWhenRetired, ownerField, $staropt$star) {
   return tableName => {
     let elevatedGroups = $staropt$star !== undefined ? $staropt$star : [];
-    let ownerGuard = ownerField !== undefined ? ownerGuardPreamble(ownerField, elevatedGroups) : "\n  const _owns = () => true;";
+    let ownerGuard = ownerField !== undefined ? ownerGuardPreamble(ownerField, elevatedGroups) : "\n  const _owns = (row) => true;";
     let retiredExpr;
     if (retiredField !== undefined) {
       if (retiredValues !== undefined) {

package/src/Cloudwatch/Cloudwatch_MetricAlarm.res

@@ -13,6 +13,11 @@ type args = {
   name?: Pulumi.Input.t<string>,
   comparisonOperator: Pulumi.Input.t<string>,
   evaluationPeriods: Pulumi.Input.t<int>,
+  /** How many of the last `evaluationPeriods` datapoints must breach to alarm
+    ("M out of N"). Defaults to `evaluationPeriods` when omitted, which is the
+    all-or-nothing behaviour. Setting it below `evaluationPeriods` is how an
+    alarm rides out an isolated blip without going blind to a sustained one. */
+  datapointsToAlarm?: Pulumi.Input.t<int>,
   metricName: Pulumi.Input.t<string>,
   namespace: Pulumi.Input.t<string>,
   /** Metric period in seconds. */
@@ -23,6 +28,12 @@ type args = {
   dimensions?: Pulumi.Input.t<Dict.t<string>>,
   treatMissingData?: Pulumi.Input.t<string>,
   alarmActions?: Pulumi.Input.t<array<Pulumi.Input.t<string>>>,
+  /** ARNs fired when the alarm returns to OK. Without these a notification
+    channel reports every incident and no recovery, so a reader of an ALARM
+    message cannot tell an ongoing outage from one that cleared minutes later. */
+  okActions?: Pulumi.Input.t<array<Pulumi.Input.t<string>>>,
+  /** ARNs fired when the alarm enters INSUFFICIENT_DATA. */
+  insufficientDataActions?: Pulumi.Input.t<array<Pulumi.Input.t<string>>>,
   alarmDescription?: Pulumi.Input.t<string>,
   tags?: Pulumi.Input.t<Aws.tags>,
 }

package/src/IAM/PolicyDocument.res

@@ -124,12 +124,12 @@ type t = policy
 
 let toJsonString: t => string = t => {
   t
-  ->S.reverseConvertToJsonOrThrow(policySchema)
+  ->S.decodeOrThrow(~from=policySchema, ~to=S.json)
   ->JSON.stringify(~space=1)
 }
 
 let fromJsonString: string => t = (policyString: string) =>
-  policyString->S.parseJsonStringOrThrow(policySchema)
+  policyString->S.decodeOrThrow(~from=S.jsonString, ~to=policySchema)
 
 let make = (~version=Version2012, ~id=?, ~statements) => {
   version,

package/src/IAM/PolicyDocument.res.mjs

@@ -1,130 +1,131 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
 import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Aws from "@pulumi/aws";
 
-let versionSchema = S.union([
-  S.literal("2008-10-17"),
-  S.literal("2012-10-17")
+let versionSchema = Sury.union([
+  Sury.literal("2008-10-17"),
+  Sury.literal("2012-10-17")
 ]);
 
-let effectSchema = S.union([
-  S.literal("Allow"),
-  S.literal("Deny")
+let effectSchema = Sury.union([
+  Sury.literal("Allow"),
+  Sury.literal("Deny")
 ]);
 
-let principalEntrySchema = S.union([
-  S.schema(s => (s.m(S.string))),
-  S.schema(s => (s.m(S.array(S.string))))
+let principalEntrySchema = Sury.union([
+  Sury.$schema(s => (s.m(Sury.string))),
+  Sury.$schema(s => (s.m(Sury.array(Sury.string))))
 ]);
 
-let principalSchema = S.schema(s => ({
-  AWS: s.m(S.option(principalEntrySchema)),
-  Federated: s.m(S.option(principalEntrySchema)),
-  Service: s.m(S.option(principalEntrySchema)),
-  CanonicalUser: s.m(S.option(principalEntrySchema))
+let principalSchema = Sury.$schema(s => ({
+  AWS: s.m(Sury.$option(principalEntrySchema)),
+  Federated: s.m(Sury.$option(principalEntrySchema)),
+  Service: s.m(Sury.$option(principalEntrySchema)),
+  CanonicalUser: s.m(Sury.$option(principalEntrySchema))
 }));
 
-let principalsSchema = S.union([
-  S.literal("*"),
-  S.schema(s => (s.m(principalSchema)))
+let principalsSchema = Sury.union([
+  Sury.literal("*"),
+  Sury.$schema(s => (s.m(principalSchema)))
 ]);
 
-let actionsSchema = S.union([
-  S.literal("*"),
-  S.schema(s => (s.m(S.string))),
-  S.schema(s => (s.m(S.array(S.string))))
+let actionsSchema = Sury.union([
+  Sury.literal("*"),
+  Sury.$schema(s => (s.m(Sury.string))),
+  Sury.$schema(s => (s.m(Sury.array(Sury.string))))
 ]);
 
-let resourcesSchema = S.union([
-  S.literal("*"),
-  S.schema(s => (s.m(S.string))),
-  S.schema(s => (s.m(S.array(S.string))))
+let resourcesSchema = Sury.union([
+  Sury.literal("*"),
+  Sury.$schema(s => (s.m(Sury.string))),
+  Sury.$schema(s => (s.m(Sury.array(Sury.string))))
 ]);
 
-let conditionEntrySchema = S.union([
-  S.schema(s => (s.m(S.string))),
-  S.schema(s => (s.m(S.array(S.string))))
+let conditionEntrySchema = Sury.union([
+  Sury.$schema(s => (s.m(Sury.string))),
+  Sury.$schema(s => (s.m(Sury.array(Sury.string))))
 ]);
 
-let conditionMapSchema = S.dict(conditionEntrySchema);
-
-let conditionSchema = S.schema(s => ({
-  StringEquals: s.m(S.option(conditionMapSchema)),
-  StringNotEquals: s.m(S.option(conditionMapSchema)),
-  StringEqualsIgnoreCase: s.m(S.option(conditionMapSchema)),
-  StringNotEqualsIgnoreCase: s.m(S.option(conditionMapSchema)),
-  StringLike: s.m(S.option(conditionMapSchema)),
-  StringNotLike: s.m(S.option(conditionMapSchema)),
-  NumericEquals: s.m(S.option(conditionMapSchema)),
-  NumericNotEquals: s.m(S.option(conditionMapSchema)),
-  NumericLessThan: s.m(S.option(conditionMapSchema)),
-  NumericLessThanEquals: s.m(S.option(conditionMapSchema)),
-  NumericGreaterThan: s.m(S.option(conditionMapSchema)),
-  NumericGreaterThanEquals: s.m(S.option(conditionMapSchema)),
-  DateEquals: s.m(S.option(conditionMapSchema)),
-  DateNotEquals: s.m(S.option(conditionMapSchema)),
-  DateLessThan: s.m(S.option(conditionMapSchema)),
-  DateLessThanEquals: s.m(S.option(conditionMapSchema)),
-  DateGreaterThan: s.m(S.option(conditionMapSchema)),
-  DateGreaterThanEquals: s.m(S.option(conditionMapSchema)),
-  Bool: s.m(S.option(conditionMapSchema)),
-  Binary: s.m(S.option(conditionMapSchema)),
-  ArnEquals: s.m(S.option(conditionMapSchema)),
-  ArnLike: s.m(S.option(conditionMapSchema)),
-  ArnNotEquals: s.m(S.option(conditionMapSchema)),
-  ArnNotLike: s.m(S.option(conditionMapSchema)),
-  StringEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  StringNotEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  StringEqualsIgnoreCaseIfExists: s.m(S.option(conditionMapSchema)),
-  StringNotEqualsIgnoreCaseIfExists: s.m(S.option(conditionMapSchema)),
-  StringLikeIfExists: s.m(S.option(conditionMapSchema)),
-  StringNotLikeIfExists: s.m(S.option(conditionMapSchema)),
-  NumericEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  NumericNotEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  NumericLessThanIfExists: s.m(S.option(conditionMapSchema)),
-  NumericLessThanEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  NumericGreaterThanIfExists: s.m(S.option(conditionMapSchema)),
-  NumericGreaterThanEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  DateEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  DateNotEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  DateLessThanIfExists: s.m(S.option(conditionMapSchema)),
-  DateLessThanEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  DateGreaterThanIfExists: s.m(S.option(conditionMapSchema)),
-  DateGreaterThanEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  BoolIfExists: s.m(S.option(conditionMapSchema)),
-  BinaryIfExists: s.m(S.option(conditionMapSchema)),
-  ArnEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  ArnLikeIfExists: s.m(S.option(conditionMapSchema)),
-  ArnNotEqualsIfExists: s.m(S.option(conditionMapSchema)),
-  ArnNotLikeIfExists: s.m(S.option(conditionMapSchema)),
-  Null: s.m(S.option(conditionMapSchema))
+let conditionMapSchema = Sury.dict(conditionEntrySchema);
+
+let conditionSchema = Sury.$schema(s => ({
+  StringEquals: s.m(Sury.$option(conditionMapSchema)),
+  StringNotEquals: s.m(Sury.$option(conditionMapSchema)),
+  StringEqualsIgnoreCase: s.m(Sury.$option(conditionMapSchema)),
+  StringNotEqualsIgnoreCase: s.m(Sury.$option(conditionMapSchema)),
+  StringLike: s.m(Sury.$option(conditionMapSchema)),
+  StringNotLike: s.m(Sury.$option(conditionMapSchema)),
+  NumericEquals: s.m(Sury.$option(conditionMapSchema)),
+  NumericNotEquals: s.m(Sury.$option(conditionMapSchema)),
+  NumericLessThan: s.m(Sury.$option(conditionMapSchema)),
+  NumericLessThanEquals: s.m(Sury.$option(conditionMapSchema)),
+  NumericGreaterThan: s.m(Sury.$option(conditionMapSchema)),
+  NumericGreaterThanEquals: s.m(Sury.$option(conditionMapSchema)),
+  DateEquals: s.m(Sury.$option(conditionMapSchema)),
+  DateNotEquals: s.m(Sury.$option(conditionMapSchema)),
+  DateLessThan: s.m(Sury.$option(conditionMapSchema)),
+  DateLessThanEquals: s.m(Sury.$option(conditionMapSchema)),
+  DateGreaterThan: s.m(Sury.$option(conditionMapSchema)),
+  DateGreaterThanEquals: s.m(Sury.$option(conditionMapSchema)),
+  Bool: s.m(Sury.$option(conditionMapSchema)),
+  Binary: s.m(Sury.$option(conditionMapSchema)),
+  ArnEquals: s.m(Sury.$option(conditionMapSchema)),
+  ArnLike: s.m(Sury.$option(conditionMapSchema)),
+  ArnNotEquals: s.m(Sury.$option(conditionMapSchema)),
+  ArnNotLike: s.m(Sury.$option(conditionMapSchema)),
+  StringEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  StringNotEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  StringEqualsIgnoreCaseIfExists: s.m(Sury.$option(conditionMapSchema)),
+  StringNotEqualsIgnoreCaseIfExists: s.m(Sury.$option(conditionMapSchema)),
+  StringLikeIfExists: s.m(Sury.$option(conditionMapSchema)),
+  StringNotLikeIfExists: s.m(Sury.$option(conditionMapSchema)),
+  NumericEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  NumericNotEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  NumericLessThanIfExists: s.m(Sury.$option(conditionMapSchema)),
+  NumericLessThanEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  NumericGreaterThanIfExists: s.m(Sury.$option(conditionMapSchema)),
+  NumericGreaterThanEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  DateEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  DateNotEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  DateLessThanIfExists: s.m(Sury.$option(conditionMapSchema)),
+  DateLessThanEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  DateGreaterThanIfExists: s.m(Sury.$option(conditionMapSchema)),
+  DateGreaterThanEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  BoolIfExists: s.m(Sury.$option(conditionMapSchema)),
+  BinaryIfExists: s.m(Sury.$option(conditionMapSchema)),
+  ArnEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  ArnLikeIfExists: s.m(Sury.$option(conditionMapSchema)),
+  ArnNotEqualsIfExists: s.m(Sury.$option(conditionMapSchema)),
+  ArnNotLikeIfExists: s.m(Sury.$option(conditionMapSchema)),
+  Null: s.m(Sury.$option(conditionMapSchema))
 }));
 
-let statementSchema = S.schema(s => ({
-  Sid: s.m(S.option(S.string)),
-  Principal: s.m(S.option(principalsSchema)),
-  NotPrincipal: s.m(S.option(principalsSchema)),
+let statementSchema = Sury.$schema(s => ({
+  Sid: s.m(Sury.$option(Sury.string)),
+  Principal: s.m(Sury.$option(principalsSchema)),
+  NotPrincipal: s.m(Sury.$option(principalsSchema)),
   Effect: s.m(effectSchema),
-  Action: s.m(S.option(actionsSchema)),
-  NotAction: s.m(S.option(actionsSchema)),
-  Resource: s.m(S.option(resourcesSchema)),
-  NotResource: s.m(S.option(resourcesSchema)),
-  Condition: s.m(S.option(conditionSchema))
+  Action: s.m(Sury.$option(actionsSchema)),
+  NotAction: s.m(Sury.$option(actionsSchema)),
+  Resource: s.m(Sury.$option(resourcesSchema)),
+  NotResource: s.m(Sury.$option(resourcesSchema)),
+  Condition: s.m(Sury.$option(conditionSchema))
 }));
 
-let policySchema = S.schema(s => ({
+let policySchema = Sury.$schema(s => ({
   Version: s.m(versionSchema),
-  Id: s.m(S.option(S.string)),
-  Statement: s.m(S.array(statementSchema))
+  Id: s.m(Sury.$option(Sury.string)),
+  Statement: s.m(Sury.array(statementSchema))
 }));
 
 function toJsonString(t) {
-  return JSON.stringify(S.reverseConvertToJsonOrThrow(t, policySchema), undefined, 1);
+  return JSON.stringify(S.decodeOrThrow(t, policySchema, Sury.json), undefined, 1);
 }
 
 function fromJsonString(policyString) {
-  return S.parseJsonStringOrThrow(policyString, policySchema);
+  return S.decodeOrThrow(policyString, Sury.jsonString, policySchema);
 }
 
 function make(versionOpt, id, statements) {