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

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 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.2 (2026-08-21)
+
+### Bug Fixes
+
+* **core:** make @resolves/[@resolves](https://github.com/resolves)Many work end to end ([4c52957](https://github.com/ReventlessDev/reventless-core/commit/4c5295759dcb4b3eda4f0f4f2c1bc387fed88fcb))
+* **deps:** update sury to 11.0.0-rc.2 to fix unreachable union constructors ([fa5744f](https://github.com/ReventlessDev/reventless-core/commit/fa5744fed8de975e2f14725c856c6e5ce7d04a74))
+
+
+# 3.0.0-alpha.1 (2026-08-18)
+
+### Bug Fixes
+
+* **aws:** normalize the null a table without a sort key resolves to ([8fb15ac](https://github.com/ReventlessDev/reventless-core/commit/8fb15ac066679b6799f4287c2c8d332e2367f599))
+
+
 # 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))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/rescript-pulumi-aws",
-  "version": "3.0.0-alpha.0",
+  "version": "3.0.0-alpha.2",
   "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-rc.1",
+    "sury": "11.0.0-rc.2",
     "@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-rc.1"
+    "sury-ppx": "11.0.0-rc.2"
   },
   "peerDependencies": {
     "rescript": "12.3.0"

package/src/AppSync/AppSync_Resolver_Functions.res

@@ -1082,7 +1082,55 @@ export function response(ctx) {
 // DynamoDB nested resolvers — resolve linked item(s) by ID
 // ---------------------------------------------------------------------------
 
-let resolveId = (~sourceIdField: string) =>
+/**
+The response of a cross-table field (`@resolves`) over a Query-shaped read.
+
+The narrowing is the TARGET's, not the declaring view's: the row comes out of the
+target's table, so whether this caller may see it is the target's question — asked
+here with the same `_owns` / `_live` guards every by-key door on that table asks.
+
+A nested field takes no `includeRetired` argument, so `_wantsRetired` is never
+true and a retired row never travels through one. A reference that must keep
+reading as a name after the archive took it is what `{list}Refs` + `@namedWhenRetired`
+answers.
+*/
+let resolvedFieldResponse = (
+  ~multi: bool,
+  ~ownerField: option<string>,
+  ~elevatedGroups: array<string>,
+  ~retiredField: option<string>=?,
+  ~retiredValues: option<array<string>>=?,
+) =>
+  switch (ownerField, retiredField) {
+  | (None, None) => multi ? resultListResponseCode : firstResultResponseCode
+  | _ =>
+    let ownerPart = switch ownerField {
+    // Takes the row it ignores, for the reason `ownerScopedResponse` gives: a
+    // zero-parameter stub called with one argument is a TS2554 the APPSYNC_JS
+    // type-checker rejects at resolver-create time.
+    | None => "\n  const _owns = (row) => true;"
+    | Some(field) =>
+      `
+  // ── owner scoping (generated) ──${ownerGuardPreamble(~ownerField=field, ~elevatedGroups)}`
+    }
+    let retiredPart = retiredGuardPreamble(
+      ~retiredField,
+      ~retiredValues,
+      ~elevatedGroups,
+      ~ownerScoped=ownerField->Option.isSome,
+    )
+    let live = retiredField->Option.isSome ? " && _live(_row)" : ""
+    let body = multi
+      ? `  return (ctx.result.items ?? []).filter(_row => _owns(_row)${live});`
+      : `  const _row = ctx.result.items[0] ?? null;\n  return _owns(_row)${live} ? _row : null;`
+    `
+export function response(ctx) {
+  if (ctx.error) util.error(ctx.error.message, ctx.error.type);${ownerPart}${retiredPart}
+${body}
+}`
+  }
+
+let resolveId = (~sourceIdField: string, ~response: string=firstResultResponseCode) =>
   `${importUtil}
 export function request(ctx) {
   if (!ctx.source.${sourceIdField}) return runtime.earlyReturn(null);
@@ -1098,10 +1146,15 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-${firstResultResponseCode}
+${response}
 `->Pulumi.Input.make
 
-let resolveIdSort = (~sourceIdField: string, ~sourceSortField: string, ~targetSortField: string) =>
+let resolveIdSort = (
+  ~sourceIdField: string,
+  ~sourceSortField: string,
+  ~targetSortField: string,
+  ~response: string=firstResultResponseCode,
+) =>
   `${importUtil}
 export function request(ctx) {
   return {
@@ -1119,13 +1172,14 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-${firstResultResponseCode}
+${response}
 `->Pulumi.Input.make
 
 let resolveIdSortArgument = (
   ~sourceIdField: string,
   ~sourceSortArgument: string,
   ~targetSortField: string,
+  ~response: string=firstResultResponseCode,
 ) =>
   `${importUtil}
 export function request(ctx) {
@@ -1151,14 +1205,19 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-${firstResultResponseCode}
+${response}
 `->Pulumi.Input.make
 
 // ---------------------------------------------------------------------------
 // DynamoDB nested resolvers — resolve by index
 // ---------------------------------------------------------------------------
 
-let resolveIdByIndex = (~index: string, ~sourceIdField: string, ~targetIdField: string) =>
+let resolveIdByIndex = (
+  ~index: string,
+  ~sourceIdField: string,
+  ~targetIdField: string,
+  ~response: string=firstResultResponseCode,
+) =>
   `${importUtil}
 export function request(ctx) {
   return {
@@ -1174,7 +1233,7 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-${firstResultResponseCode}
+${response}
 `->Pulumi.Input.make
 
 let resolveIdByIndexSort = (
@@ -1183,6 +1242,7 @@ let resolveIdByIndexSort = (
   ~sourceSortField: string,
   ~targetIdField: string,
   ~targetSortField: string,
+  ~response: string=firstResultResponseCode,
 ) =>
   `${importUtil}
 export function request(ctx) {
@@ -1202,7 +1262,7 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-${firstResultResponseCode}
+${response}
 `->Pulumi.Input.make
 
 let resolveIdByIndexSortArgument = (
@@ -1211,6 +1271,7 @@ let resolveIdByIndexSortArgument = (
   ~sourceSortArgument: string,
   ~targetIdField: string,
   ~targetSortField: string,
+  ~response: string=firstResultResponseCode,
 ) =>
   `${importUtil}
 export function request(ctx) {
@@ -1237,12 +1298,27 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-${firstResultResponseCode}
+${response}
 `->Pulumi.Input.make
 
-// resolveIds — returns a plain string (table name is interpolated by the adapter
-// via Pulumi.Output.apply)
-let resolveIds = (tableName: string, ~idsField: string, ~sortField: option<string>) => {
+/** `@resolvesMany` — the parent's id array batch-read from the target's table.
+
+    Returns a plain string: the table name is interpolated by the adapter via
+    `Pulumi.Output.apply`, because BatchGetItem's `tables` map keys on the literal
+    name.
+
+    Same shape as `batchGetItemsByIds`, and narrowed by the same guards — the
+    target's, since the rows are the target's. Missing ids come back as nulls in
+    the result array (BatchGetItem preserves index correspondence) and are
+    dropped, so the field is shorter rather than null-holed. */
+let resolveIds = (
+  ~idsField: string,
+  ~sortField: option<string>,
+  ~ownerField: option<string>=?,
+  ~retiredField: option<string>=?,
+  ~retiredValues: option<array<string>>=?,
+  ~elevatedGroups: array<string>=[],
+) => (tableName: string) => {
   let keysCode = switch sortField {
   | Some(sf) =>
     `id => ({ id: util.dynamodb.toString(id.id), ${sf}: util.dynamodb.toString(id.${sf}) })`
@@ -1251,23 +1327,32 @@ let resolveIds = (tableName: string, ~idsField: string, ~sortField: option<strin
   `${importUtil}
 import { runtime } from '@aws-appsync/utils';
 export function request(ctx) {
-  const idList = ctx.source.${idsField};
-  if (idList && idList.length > 0) {
-    return {
-      operation: 'BatchGetItem',
-      tables: {
-        '${tableName}': {
-          keys: idList.map(${keysCode}),
-          consistentRead: true
-        }
+  const idList = ctx.source.${idsField} ?? [];
+  if (idList.length === 0) return runtime.earlyReturn([]);
+  return {
+    operation: 'BatchGetItem',
+    tables: {
+      '${tableName}': {
+        keys: idList.map(${keysCode}),
+        consistentRead: true
       }
-    };
-  }
-  return { operation: 'GetItem', key: { id: util.dynamodb.toString(ctx.source.id) } };
+    }
+  };
 }
 export function response(ctx) {
-  if (ctx.error) util.error(ctx.error.message, ctx.error.type);
-  return ctx.result;
+  if (ctx.error) util.error(ctx.error.message, ctx.error.type);${switch ownerField {
+    | None => ""
+    | Some(field) => ownerGuardPreamble(~ownerField=field, ~elevatedGroups)
+    }}${retiredGuardPreamble(
+      ~retiredField,
+      ~retiredValues,
+      ~elevatedGroups,
+      ~ownerScoped=ownerField->Option.isSome,
+    )}
+  return (ctx.result?.data?.['${tableName}'] ?? []).filter(item =>
+    item !== null${ownerField->Option.isSome ? " && _owns(item)" : ""}${retiredField->Option.isSome
+      ? " && _live(item)"
+      : ""});
 }
 `
 }

package/src/AppSync/AppSync_Resolver_Functions.res.mjs

@@ -724,7 +724,28 @@ export function response(ctx) {
 `;
 }
 
-function resolveId(sourceIdField) {
+function resolvedFieldResponse(multi, ownerField, elevatedGroups, retiredField, retiredValues) {
+  if (ownerField === undefined && retiredField === undefined) {
+    if (multi) {
+      return resultListResponseCode;
+    } else {
+      return firstResultResponseCode;
+    }
+  }
+  let ownerPart = ownerField !== undefined ? `
+  // ── owner scoping (generated) ──` + ownerGuardPreamble(ownerField, elevatedGroups) : "\n  const _owns = (row) => true;";
+  let retiredPart = retiredGuardPreamble(retiredField, retiredValues, elevatedGroups, Stdlib_Option.isSome(ownerField));
+  let live = Stdlib_Option.isSome(retiredField) ? " && _live(_row)" : "";
+  let body = multi ? `  return (ctx.result.items ?? []).filter(_row => _owns(_row)` + live + `);` : `  const _row = ctx.result.items[0] ?? null;\n  return _owns(_row)` + live + ` ? _row : null;`;
+  return `
+export function response(ctx) {
+  if (ctx.error) util.error(ctx.error.message, ctx.error.type);` + ownerPart + retiredPart + `
+` + body + `
+}`;
+}
+
+function resolveId(sourceIdField, responseOpt) {
+  let response = responseOpt !== undefined ? responseOpt : firstResultResponseCode;
   return importUtil + `
 export function request(ctx) {
   if (!ctx.source.` + sourceIdField + `) return runtime.earlyReturn(null);
@@ -740,11 +761,12 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-` + firstResultResponseCode + `
+` + response + `
 `;
 }
 
-function resolveIdSort(sourceIdField, sourceSortField, targetSortField) {
+function resolveIdSort(sourceIdField, sourceSortField, targetSortField, responseOpt) {
+  let response = responseOpt !== undefined ? responseOpt : firstResultResponseCode;
   return importUtil + `
 export function request(ctx) {
   return {
@@ -762,11 +784,12 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-` + firstResultResponseCode + `
+` + response + `
 `;
 }
 
-function resolveIdSortArgument(sourceIdField, sourceSortArgument, targetSortField) {
+function resolveIdSortArgument(sourceIdField, sourceSortArgument, targetSortField, responseOpt) {
+  let response = responseOpt !== undefined ? responseOpt : firstResultResponseCode;
   return importUtil + `
 export function request(ctx) {
   const query = ctx.args.` + sourceSortArgument + `
@@ -791,11 +814,12 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-` + firstResultResponseCode + `
+` + response + `
 `;
 }
 
-function resolveIdByIndex(index, sourceIdField, targetIdField) {
+function resolveIdByIndex(index, sourceIdField, targetIdField, responseOpt) {
+  let response = responseOpt !== undefined ? responseOpt : firstResultResponseCode;
   return importUtil + `
 export function request(ctx) {
   return {
@@ -811,11 +835,12 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-` + firstResultResponseCode + `
+` + response + `
 `;
 }
 
-function resolveIdByIndexSort(index, sourceIdField, sourceSortField, targetIdField, targetSortField) {
+function resolveIdByIndexSort(index, sourceIdField, sourceSortField, targetIdField, targetSortField, responseOpt) {
+  let response = responseOpt !== undefined ? responseOpt : firstResultResponseCode;
   return importUtil + `
 export function request(ctx) {
   return {
@@ -834,11 +859,12 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-` + firstResultResponseCode + `
+` + response + `
 `;
 }
 
-function resolveIdByIndexSortArgument(index, sourceIdField, sourceSortArgument, targetIdField, targetSortField) {
+function resolveIdByIndexSortArgument(index, sourceIdField, sourceSortArgument, targetIdField, targetSortField, responseOpt) {
+  let response = responseOpt !== undefined ? responseOpt : firstResultResponseCode;
   return importUtil + `
 export function request(ctx) {
   const query = ctx.args.` + sourceSortArgument + `
@@ -864,34 +890,42 @@ export function request(ctx) {
     scanIndexForward: (ctx.args.forward ?? true)
   };
 }
-` + firstResultResponseCode + `
+` + response + `
 `;
 }
 
-function resolveIds(tableName, idsField, sortField) {
-  let keysCode = sortField !== undefined ? `id => ({ id: util.dynamodb.toString(id.id), ` + sortField + `: util.dynamodb.toString(id.` + sortField + `) })` : `id => ({ id: util.dynamodb.toString(id) })`;
-  return importUtil + `
+function resolveIds(idsField, sortField, ownerField, retiredField, retiredValues, $staropt$star) {
+  return tableName => {
+    let elevatedGroups = $staropt$star !== undefined ? $staropt$star : [];
+    let keysCode = sortField !== undefined ? `id => ({ id: util.dynamodb.toString(id.id), ` + sortField + `: util.dynamodb.toString(id.` + sortField + `) })` : `id => ({ id: util.dynamodb.toString(id) })`;
+    return importUtil + `
 import { runtime } from '@aws-appsync/utils';
 export function request(ctx) {
-  const idList = ctx.source.` + idsField + `;
-  if (idList && idList.length > 0) {
-    return {
-      operation: 'BatchGetItem',
-      tables: {
-        '` + tableName + `': {
-          keys: idList.map(` + keysCode + `),
-          consistentRead: true
-        }
+  const idList = ctx.source.` + idsField + ` ?? [];
+  if (idList.length === 0) return runtime.earlyReturn([]);
+  return {
+    operation: 'BatchGetItem',
+    tables: {
+      '` + tableName + `': {
+        keys: idList.map(` + keysCode + `),
+        consistentRead: true
       }
-    };
-  }
-  return { operation: 'GetItem', key: { id: util.dynamodb.toString(ctx.source.id) } };
+    }
+  };
 }
 export function response(ctx) {
-  if (ctx.error) util.error(ctx.error.message, ctx.error.type);
-  return ctx.result;
+  if (ctx.error) util.error(ctx.error.message, ctx.error.type);` + (
+      ownerField !== undefined ? ownerGuardPreamble(ownerField, elevatedGroups) : ""
+    ) + retiredGuardPreamble(retiredField, retiredValues, elevatedGroups, Stdlib_Option.isSome(ownerField)) + `
+  return (ctx.result?.data?.['` + tableName + `'] ?? []).filter(item =>
+    item !== null` + (
+      Stdlib_Option.isSome(ownerField) ? " && _owns(item)" : ""
+    ) + (
+      Stdlib_Option.isSome(retiredField) ? " && _live(item)" : ""
+    ) + `);
 }
 `;
+  };
 }
 
 function batchGetItemsByIds(ownerField, retiredField, retiredValues, $staropt$star) {
@@ -1223,6 +1257,7 @@ export {
   queryByIndexSortFiltered,
   listAllItems,
   listAllItemsConnection,
+  resolvedFieldResponse,
   resolveId,
   resolveIdSort,
   resolveIdSortArgument,

package/src/DynamoDb/DynamoDb_Table.res

@@ -9,7 +9,9 @@ type t = {
   name: Pulumi.Output.t<string>,
   id: Pulumi.Output.t<string>,
   hashKey: Pulumi.Output.t<string>,
-  rangeKey: Pulumi.Output.t<option<string>>,
+  // Pulumi resolves an absent range key to `null`, which ReScript's `option`
+  // (None = undefined) does not accept. Nullable is the shape that arrives.
+  rangeKey: Pulumi.Output.t<Nullable.t<string>>,
   streamEnabled: Pulumi.Output.t<option<bool>>,
   streamArn: Pulumi.Output.t<string>,
   streamLabel: Pulumi.Output.t<string>,