@anthusai/papyrus 1.0.0-next.39 → 1.0.0-next.40

package/amplify/resolver-waves.js

@@ -0,0 +1,26 @@
+import { NestedStack } from "aws-cdk-lib";
+export const DEFAULT_RESOLVER_WAVE_SIZE = 12;
+export function planResolverWaves(items, waveSize) {
+    if (!Number.isInteger(waveSize) || waveSize < 1) {
+        return [];
+    }
+    const waves = [];
+    for (let start = 0; start < items.length; start += waveSize) {
+        waves.push(items.slice(start, start + waveSize));
+    }
+    return waves;
+}
+export function orderModelStacksInWaves(graphqlApi, modelNames, waveSize) {
+    const modelStacks = modelNames
+        .map((modelName) => graphqlApi.node.tryFindChild(modelName))
+        .filter((child) => child instanceof NestedStack);
+    const waves = planResolverWaves(modelStacks, waveSize);
+    for (let waveIndex = 1; waveIndex < waves.length; waveIndex += 1) {
+        for (const stack of waves[waveIndex]) {
+            for (const previousStack of waves[waveIndex - 1]) {
+                stack.addDependency(previousStack);
+            }
+        }
+    }
+    return waves.length;
+}

package/amplify/resolver-waves.ts

@@ -0,0 +1,34 @@
+import { NestedStack } from "aws-cdk-lib";
+import type { IConstruct } from "constructs";
+
+export const DEFAULT_RESOLVER_WAVE_SIZE = 12;
+
+export function planResolverWaves<T>(items: T[], waveSize: number): T[][] {
+  if (!Number.isInteger(waveSize) || waveSize < 1) {
+    return [];
+  }
+  const waves: T[][] = [];
+  for (let start = 0; start < items.length; start += waveSize) {
+    waves.push(items.slice(start, start + waveSize));
+  }
+  return waves;
+}
+
+export function orderModelStacksInWaves(
+  graphqlApi: IConstruct,
+  modelNames: string[],
+  waveSize: number,
+): number {
+  const modelStacks = modelNames
+    .map((modelName) => graphqlApi.node.tryFindChild(modelName))
+    .filter((child): child is NestedStack => child instanceof NestedStack);
+  const waves = planResolverWaves(modelStacks, waveSize);
+  for (let waveIndex = 1; waveIndex < waves.length; waveIndex += 1) {
+    for (const stack of waves[waveIndex]) {
+      for (const previousStack of waves[waveIndex - 1]) {
+        stack.addDependency(previousStack);
+      }
+    }
+  }
+  return waves.length;
+}

package/amplify/site-backend-config.ts

@@ -32,6 +32,13 @@ export type PapyrusSiteBackendConfig = {
    */
   productionAppId?: string;
   auth?: PapyrusAuthConfig;
+  /**
+   * Maximum number of data model nested stacks CloudFormation creates at once.
+   * Stacks are chained in waves of this size so a new AWS account is not hit
+   * with every AppSync CreateResolver call in parallel (429). Only adds
+   * DependsOn ordering; no resource changes. Default 12; 0 turns it off.
+   */
+  resolverWaveSize?: number;
   /** Static reader app (Markus-static sites) that a publish rebuilds through IAM `amplify:StartJob`. */
   reader?: { amplifyAppId: string; branchName?: string };
   /** Lets the newsroom start the `staging` branch build of this CMS app. */

package/amplify/site-backend.js

@@ -6,6 +6,7 @@ import { CfnEventSourceMapping, FunctionUrlAuthType } from "aws-cdk-lib/aws-lamb
 import { CfnIndex, CfnVectorBucket, CfnVectorBucketPolicy } from "aws-cdk-lib/aws-s3vectors";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { DEFAULT_RESOLVER_WAVE_SIZE, orderModelStacksInWaves } from "./resolver-waves.js";
 import { rebuildTriggerSettings } from "./rebuild-trigger-settings.js";
 import { applyCognitoDomainPrefix, authConfigFromEnv, defineSiteAuth } from "./auth/resource.js";
 import { data } from "./data/resource.js";
@@ -78,6 +79,7 @@ export function defineSiteBackend(papyrusSite) {
         slackDelivery,
         storage,
     });
+    orderModelStacksInWaves(backend.data.resources.graphqlApi.node.scope, Object.keys(backend.data.resources.tables), site.resolverWaveSize ?? DEFAULT_RESOLVER_WAVE_SIZE);
     const requestedCognitoDomainPrefix = (authConfig.cognitoDomainPrefix ?? "").trim();
     if (authConfig.applyCognitoDomainPrefix === true
         && requestedCognitoDomainPrefix !== ""

package/amplify/site-backend.ts

@@ -6,8 +6,10 @@ import { Effect, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { CfnEventSourceMapping, Function as LambdaFunction, FunctionUrlAuthType } from "aws-cdk-lib/aws-lambda";
 import * as s3 from "aws-cdk-lib/aws-s3";
 import { CfnIndex, CfnVectorBucket, CfnVectorBucketPolicy } from "aws-cdk-lib/aws-s3vectors";
+import type { Construct } from "constructs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { DEFAULT_RESOLVER_WAVE_SIZE, orderModelStacksInWaves } from "./resolver-waves";
 import { rebuildTriggerSettings } from "./rebuild-trigger-settings";
 import { applyCognitoDomainPrefix, authConfigFromEnv, defineSiteAuth } from "./auth/resource";
 import { data } from "./data/resource";
@@ -96,6 +98,12 @@ export function defineSiteBackend(papyrusSite: PapyrusSite) {
     storage,
   });
 
+  orderModelStacksInWaves(
+    backend.data.resources.graphqlApi.node.scope as Construct,
+    Object.keys(backend.data.resources.tables),
+    site.resolverWaveSize ?? DEFAULT_RESOLVER_WAVE_SIZE,
+  );
+
   const requestedCognitoDomainPrefix = (authConfig.cognitoDomainPrefix ?? "").trim();
   if (
     authConfig.applyCognitoDomainPrefix === true

package/package.json

@@ -302,7 +302,7 @@
       "optional": true
     }
   },
-  "version": "1.0.0-next.39",
+  "version": "1.0.0-next.40",
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.3",
     "@aws-sdk/client-cognito-identity-provider": "3.1045.0",

package/routes.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-next.39",
+  "version": "1.0.0-next.40",
   "routes": [
     {
       "file": "app/%5F_preview/[[...path]]/route.ts",