@aws/nx-plugin 0.77.0 → 0.78.0

package/src/trpc/backend/files/src/router.ts.template

@@ -1,10 +1,5 @@
-import {
-  awsLambdaRequestHandler,
-  CreateAWSLambdaContextOptions,
-} from '@trpc/server/adapters/aws-lambda';
 import { echo } from './procedures/echo.js';
 import { t } from './init.js';
-import type { <%- apiGatewayEventType %> } from 'aws-lambda';
 
 export const router = t.router;
 
@@ -12,37 +7,4 @@ export const appRouter = router({
   echo,
 });
 
-export const handler = awsLambdaRequestHandler({
-  router: appRouter,
-  createContext: (ctx: CreateAWSLambdaContextOptions<<%- apiGatewayEventType %>>) => ctx,
-  <%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
-  responseMeta: ({ ctx }) => ({
-    headers: {
-      'Access-Control-Allow-Origin': getAllowedOrigin(ctx?.event),
-      'Access-Control-Allow-Methods': '*',
-    },
-  }),
-  <%_ } _%>
-});
-
-<%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
-/**
- * Restricts CORS origins to localhost and the domains specified in
- * the ALLOWED_ORIGINS environment variable if set, or * otherwise.
- * Customise using `restrictCorsTo` in your API CDK construct
- */
-const getAllowedOrigin = (event: <%- apiGatewayEventType %> | undefined) => {
-  const origin = event?.headers?.origin ?? event?.headers?.Origin;
-  const allowedOrigins = process.env.ALLOWED_ORIGINS?.split(',') ?? [];
-  const isLocalHost =
-    origin && new Set(['localhost', '127.0.0.1']).has(new URL(origin).hostname);
-  const isAllowedOrigin = origin && allowedOrigins.includes(origin);
-  let corsOrigin = '*';
-  if (allowedOrigins.length > 0 && !isLocalHost) {
-    corsOrigin = isAllowedOrigin ? origin : allowedOrigins[0];
-  }
-  return corsOrigin;
-};
-<%_ } _%>
-
 export type AppRouter = typeof appRouter;

package/src/trpc/backend/files/src/schema/z-async-iterable.ts.template

@@ -0,0 +1,115 @@
+import { isTrackedEnvelope, tracked, type TrackedEnvelope } from '@trpc/server';
+import { z } from 'zod';
+
+function isAsyncIterable<TValue, TReturn = unknown>(
+  value: unknown,
+): value is AsyncIterable<TValue, TReturn> {
+  return !!value && typeof value === 'object' && Symbol.asyncIterator in value;
+}
+
+/**
+ * A Zod schema helper designed specifically for validating async iterables. This schema ensures that:
+ * 1. The value being validated is an async iterable.
+ * 2. Each item yielded by the async iterable conforms to a specified type.
+ * 3. The return value of the async iterable, if any, also conforms to a specified type.
+ */
+
+// Non-tracked overload
+export function ZodAsyncIterable<
+  TYieldIn,
+  TYieldOut,
+  TReturnIn = void,
+  TReturnOut = void,
+>(opts: {
+  yield: z.ZodType<TYieldOut, TYieldIn>;
+  return?: z.ZodType<TReturnOut, TReturnIn>;
+  tracked?: false;
+}): z.ZodPipe<
+  z.ZodCustom<
+    AsyncIterable<TYieldIn, TReturnIn>,
+    AsyncIterable<TYieldIn, TReturnIn>
+  >,
+  z.ZodTransform<
+    AsyncGenerator<
+      Awaited<TYieldOut>,
+      Awaited<TReturnOut> | undefined,
+      unknown
+    >,
+    AsyncIterable<TYieldIn, TReturnIn>
+  >
+>;
+
+// Tracked overload
+export function ZodAsyncIterable<
+  TYieldIn,
+  TYieldOut,
+  TReturnIn = void,
+  TReturnOut = void,
+>(opts: {
+  yield: z.ZodType<TYieldOut, TYieldIn>;
+  return?: z.ZodType<TReturnOut, TReturnIn>;
+  tracked: true;
+}): z.ZodPipe<
+  z.ZodCustom<
+    AsyncIterable<TrackedEnvelope<TYieldIn>, TReturnIn>,
+    AsyncIterable<TrackedEnvelope<TYieldIn>, TReturnIn>
+  >,
+  z.ZodTransform<
+    AsyncGenerator<
+      TrackedEnvelope<Awaited<TYieldOut>>,
+      Awaited<TReturnOut> | undefined,
+      unknown
+    >,
+    AsyncIterable<TrackedEnvelope<TYieldIn>, TReturnIn>
+  >
+>;
+
+// Implementation
+export function ZodAsyncIterable<
+  TYieldIn,
+  TYieldOut,
+  TReturnIn = void,
+  TReturnOut = void,
+>(opts: {
+  /**
+   * Validate the value yielded by the async generator
+   */
+  yield: z.ZodType<TYieldOut, TYieldIn>;
+  /**
+   * Validate the return value of the async generator
+   * @remark not applicable for subscriptions
+   */
+  return?: z.ZodType<TReturnOut, TReturnIn>;
+  /**
+   * Whether if the yielded values are tracked
+   * @remark only applicable for subscriptions
+   */
+  tracked?: boolean;
+}) {
+  return z
+    .custom<AsyncIterable<TYieldIn | TrackedEnvelope<TYieldIn>, TReturnIn>>(
+      (val) => isAsyncIterable(val),
+    )
+    .transform(async function* (iter) {
+      const iterator = iter[Symbol.asyncIterator]();
+      try {
+        let next;
+        while ((next = await iterator.next()) && !next.done) {
+          if (opts.tracked) {
+            const [id, data] = z
+              .custom<TrackedEnvelope<unknown>>(isTrackedEnvelope)
+              .parse(next.value);
+            yield tracked(id, await opts.yield.parseAsync(data));
+            continue;
+          }
+          yield opts.yield.parseAsync(next.value);
+        }
+        if (opts.return) {
+          return await opts.return.parseAsync(next.value);
+        }
+        return;
+      } finally {
+        await iterator.return?.();
+      }
+    });
+}

package/src/trpc/backend/generator.js

@@ -56,7 +56,7 @@ function tsTrpcApiGenerator(tree, options) {
             auth: options.auth,
             iacProvider,
         });
-        projectConfig.metadata = Object.assign(Object.assign({}, projectConfig.metadata), { apiName: options.name, apiType: 'trpc', auth: options.auth });
+        projectConfig.metadata = Object.assign(Object.assign({}, projectConfig.metadata), { apiName: options.name, apiType: 'trpc', auth: options.auth, computeType: options.computeType });
         projectConfig.targets.serve = {
             executor: 'nx:run-commands',
             options: {
@@ -66,7 +66,7 @@ function tsTrpcApiGenerator(tree, options) {
             continuous: true,
         };
         (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
-            targetFilePath: 'src/router.ts',
+            targetFilePath: 'src/handler.ts',
             external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
         });
         (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
@@ -76,6 +76,10 @@ function tsTrpcApiGenerator(tree, options) {
             overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
         });
         tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'lib'));
+        // Remove streaming schema helper for HTTP APIs (API Gateway HTTP API doesn't support streaming)
+        if (options.computeType !== 'ServerlessApiGatewayRestApi') {
+            tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'schema', 'z-async-iterable.ts'));
+        }
         (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
             'aws-xray-sdk-core',
             'zod',

package/src/trpc/backend/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"names":[],"mappings":"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"}

package/src/trpc/react/__snapshots__/generator.spec.ts.snap

@@ -1,5 +1,224 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`trpc react generator > REST API (ServerlessApiGatewayRestApi) > should generate REST API client provider with splitLink for Cognito auth > TestApiClientProvider-REST-Cognito.tsx 1`] = `
+"import { AppRouter } from 'backend';
+import { useQueryClient } from '@tanstack/react-query';
+import { createTRPCOptionsProxy } from '@trpc/tanstack-react-query';
+import { createContext, FC, PropsWithChildren, useMemo } from 'react';
+import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
+import {
+  TRPCClient,
+  createTRPCClient,
+  httpLink,
+  httpSubscriptionLink,
+  splitLink,
+} from '@trpc/client';
+import { EventSourcePolyfill } from 'event-source-polyfill';
+import { useAuth } from 'react-oidc-context';
+
+interface TestApiTRPCContextValue {
+  optionsProxy: ReturnType<typeof createTRPCOptionsProxy<AppRouter>>;
+  client: TRPCClient<AppRouter>;
+}
+
+export const TestApiTRPCContext = createContext<TestApiTRPCContextValue | null>(
+  null,
+);
+
+export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
+  const queryClient = useQueryClient();
+  const runtimeConfig = useRuntimeConfig();
+  const apiUrl = runtimeConfig.apis.TestApi;
+  const auth = useAuth();
+  const user = auth?.user;
+
+  const container = useMemo<TestApiTRPCContextValue>(() => {
+    const client = createTRPCClient<AppRouter>({
+      links: [
+        splitLink({
+          condition: (op) => op.type === 'subscription',
+          true: httpSubscriptionLink({
+            url: apiUrl,
+            EventSource: EventSourcePolyfill,
+            eventSourceOptions: async ({ op }) => {
+              return {
+                headers: {
+                  Authorization: \`Bearer \${user?.id_token}\`,
+                },
+              };
+            },
+          }),
+          false: httpLink({
+            url: apiUrl,
+            headers: {
+              Authorization: \`Bearer \${user?.id_token}\`,
+            },
+          }),
+        }),
+      ],
+    });
+
+    const optionsProxy = createTRPCOptionsProxy<AppRouter>({
+      client,
+      queryClient,
+    });
+
+    return { optionsProxy, client };
+  }, [apiUrl, queryClient, user]);
+
+  return (
+    <TestApiTRPCContext.Provider value={container}>
+      {children}
+    </TestApiTRPCContext.Provider>
+  );
+};
+
+export default TestApiClientProvider;
+"
+`;
+
+exports[`trpc react generator > REST API (ServerlessApiGatewayRestApi) > should generate REST API client provider with splitLink for IAM auth > TestApiClientProvider-REST-IAM.tsx 1`] = `
+"import { AppRouter } from 'backend';
+import { useQueryClient } from '@tanstack/react-query';
+import { createTRPCOptionsProxy } from '@trpc/tanstack-react-query';
+import { createContext, FC, PropsWithChildren, useMemo } from 'react';
+import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
+import {
+  TRPCClient,
+  createTRPCClient,
+  httpLink,
+  httpSubscriptionLink,
+  splitLink,
+} from '@trpc/client';
+import { EventSourcePolyfill } from 'event-source-polyfill';
+import { useSigV4 } from '../hooks/useSigV4';
+
+interface TestApiTRPCContextValue {
+  optionsProxy: ReturnType<typeof createTRPCOptionsProxy<AppRouter>>;
+  client: TRPCClient<AppRouter>;
+}
+
+export const TestApiTRPCContext = createContext<TestApiTRPCContextValue | null>(
+  null,
+);
+
+export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
+  const queryClient = useQueryClient();
+  const runtimeConfig = useRuntimeConfig();
+  const apiUrl = runtimeConfig.apis.TestApi;
+  const sigv4Client = useSigV4();
+
+  const container = useMemo<TestApiTRPCContextValue>(() => {
+    const client = createTRPCClient<AppRouter>({
+      links: [
+        splitLink({
+          condition: (op) => op.type === 'subscription',
+          true: httpSubscriptionLink({
+            url: apiUrl,
+            EventSource: EventSourcePolyfill,
+            eventSourceOptions: async ({ op }) => {
+              const url =
+                \`\${apiUrl.replace(/\\/$/, '')}/\${op.path}\` +
+                (op.input !== undefined
+                  ? \`?input=\${encodeURIComponent(JSON.stringify(op.input))}\`
+                  : '');
+              const signed = await sigv4Client.sign(url, { method: 'GET' });
+              const headers: Record<string, string> = {};
+              signed.headers.forEach((v, k) => {
+                headers[k] = v;
+              });
+              return { headers };
+            },
+          }),
+          false: httpLink({
+            url: apiUrl,
+            fetch: sigv4Client.fetch,
+          }),
+        }),
+      ],
+    });
+
+    const optionsProxy = createTRPCOptionsProxy<AppRouter>({
+      client,
+      queryClient,
+    });
+
+    return { optionsProxy, client };
+  }, [apiUrl, queryClient, sigv4Client]);
+
+  return (
+    <TestApiTRPCContext.Provider value={container}>
+      {children}
+    </TestApiTRPCContext.Provider>
+  );
+};
+
+export default TestApiClientProvider;
+"
+`;
+
+exports[`trpc react generator > REST API (ServerlessApiGatewayRestApi) > should generate REST API client provider with splitLink for None auth > TestApiClientProvider-REST-None.tsx 1`] = `
+"import { AppRouter } from 'backend';
+import { useQueryClient } from '@tanstack/react-query';
+import { createTRPCOptionsProxy } from '@trpc/tanstack-react-query';
+import { createContext, FC, PropsWithChildren, useMemo } from 'react';
+import { useRuntimeConfig } from '../hooks/useRuntimeConfig';
+import {
+  TRPCClient,
+  createTRPCClient,
+  httpLink,
+  httpSubscriptionLink,
+  splitLink,
+} from '@trpc/client';
+
+interface TestApiTRPCContextValue {
+  optionsProxy: ReturnType<typeof createTRPCOptionsProxy<AppRouter>>;
+  client: TRPCClient<AppRouter>;
+}
+
+export const TestApiTRPCContext = createContext<TestApiTRPCContextValue | null>(
+  null,
+);
+
+export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
+  const queryClient = useQueryClient();
+  const runtimeConfig = useRuntimeConfig();
+  const apiUrl = runtimeConfig.apis.TestApi;
+
+  const container = useMemo<TestApiTRPCContextValue>(() => {
+    const client = createTRPCClient<AppRouter>({
+      links: [
+        splitLink({
+          condition: (op) => op.type === 'subscription',
+          true: httpSubscriptionLink({
+            url: apiUrl,
+          }),
+          false: httpLink({
+            url: apiUrl,
+          }),
+        }),
+      ],
+    });
+
+    const optionsProxy = createTRPCOptionsProxy<AppRouter>({
+      client,
+      queryClient,
+    });
+
+    return { optionsProxy, client };
+  }, [apiUrl, queryClient]);
+
+  return (
+    <TestApiTRPCContext.Provider value={container}>
+      {children}
+    </TestApiTRPCContext.Provider>
+  );
+};
+
+export default TestApiClientProvider;
+"
+`;
+
 exports[`trpc react generator > should generate trpc react files > TestApiClientProvider.tsx 1`] = `
 "import { AppRouter } from 'backend';
 import { useQueryClient } from '@tanstack/react-query';
@@ -172,7 +391,7 @@ export const TestApiClientProvider: FC<PropsWithChildren> = ({ children }) => {
   const container = useMemo<TestApiTRPCContextValue>(() => {
     const linkOptions: HTTPLinkOptions<any> = {
       url: apiUrl,
-      fetch: sigv4Client,
+      fetch: sigv4Client.fetch,
     };
 
     const client = createTRPCClient<AppRouter>({
@@ -213,7 +432,17 @@ import {
 // Credential expiration grace time before considering credentials as expired
 const CREDENTIAL_EXPIRY_OFFSET_MILLIS = 30 * 1000;
 
-export const useSigV4 = () => {
+type AwsSignInput = Parameters<AwsClient['sign']>[0];
+type AwsSignInit = Parameters<AwsClient['sign']>[1];
+
+export interface SigV4Client {
+  /** A SigV4-signing fetch drop-in replacement. */
+  fetch: typeof globalThis.fetch;
+  /** Signs a request. Same parameters as AwsClient.sign(). Returns an unsigned Request when signing is skipped. */
+  sign: AwsClient['sign'];
+}
+
+export const useSigV4 = (): SigV4Client => {
   const { cognitoProps } = useRuntimeConfig();
   const auth = useAuth();
   const user = auth?.user;
@@ -222,6 +451,8 @@ export const useSigV4 = () => {
     {},
   );
 
+  const skipSigning = !cognitoProps && import.meta.env.MODE === 'serve-local';
+
   const withCachedCredentials = useCallback(
     async (
       provider: AwsCredentialIdentityProvider,
@@ -244,37 +475,53 @@ export const useSigV4 = () => {
     [],
   );
 
-  return useCallback(
+  const getAwsClient = useCallback(async (): Promise<AwsClient> => {
+    if (!cognitoProps) {
+      throw new Error('cognitoProps is undefined!');
+    }
+    if (!user?.id_token) {
+      throw new Error('user.id_token is undefined!');
+    }
+
+    const credentialsFromCognitoIdentityPool = fromCognitoIdentityPool({
+      client: new CognitoIdentityClient({ region: cognitoProps.region }),
+      identityPoolId: cognitoProps.identityPoolId,
+      logins: {
+        [\`cognito-idp.\${cognitoProps.region}.amazonaws.com/\${cognitoProps.userPoolId}\`]:
+          user.id_token,
+      },
+    });
+    const credential = await withCachedCredentials(
+      credentialsFromCognitoIdentityPool,
+      cognitoProps.identityPoolId,
+      user.profile.sub,
+    );
+    return new AwsClient(credential);
+  }, [cognitoProps, user?.id_token, user?.profile.sub, withCachedCredentials]);
+
+  const sigv4Fetch: typeof globalThis.fetch = useCallback(
     async (input: RequestInfo | URL, init?: RequestInit | undefined) => {
-      if (!cognitoProps && import.meta.env.MODE === 'serve-local') {
-        // Skip request signing in serve-local mode when cognitoProps are not set
+      if (skipSigning) {
         return fetch(input, init);
       }
-      if (!cognitoProps) {
-        throw new Error('cognitoProps is undefined!');
-      }
-      if (!user?.id_token) {
-        throw new Error('user.id_token is undefined!');
-      }
-
-      const credentialsFromCognitoIdentityPool = fromCognitoIdentityPool({
-        client: new CognitoIdentityClient({ region: cognitoProps.region }),
-        identityPoolId: cognitoProps.identityPoolId,
-        logins: {
-          [\`cognito-idp.\${cognitoProps.region}.amazonaws.com/\${cognitoProps.userPoolId}\`]:
-            user.id_token,
-        },
-      });
-      const credential = await withCachedCredentials(
-        credentialsFromCognitoIdentityPool,
-        cognitoProps.identityPoolId,
-        user.profile.sub,
-      );
-      const awsClient = new AwsClient(credential);
+      const awsClient = await getAwsClient();
       return awsClient.fetch(input, init);
     },
-    [cognitoProps, user?.id_token, user?.profile.sub, withCachedCredentials],
+    [skipSigning, getAwsClient],
   );
+
+  const sign = useCallback(
+    async (input: AwsSignInput, init?: AwsSignInit): Promise<Request> => {
+      if (skipSigning) {
+        return new Request(input.toString(), init ?? undefined);
+      }
+      const awsClient = await getAwsClient();
+      return awsClient.sign(input, init);
+    },
+    [skipSigning, getAwsClient],
+  );
+
+  return { fetch: sigv4Fetch, sign };
 };
 "
 `;

package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template

@@ -3,7 +3,14 @@ import { useQueryClient } from "@tanstack/react-query";
 import { createTRPCOptionsProxy } from "@trpc/tanstack-react-query";
 import { createContext, FC, PropsWithChildren, useMemo } from "react";
 import { useRuntimeConfig } from "../hooks/useRuntimeConfig";
+<%_ if (isRestApi) { _%>
+import { TRPCClient, createTRPCClient, httpLink, httpSubscriptionLink, splitLink } from "@trpc/client";
+<%_ if (auth !== 'None') { _%>
+import { EventSourcePolyfill } from "event-source-polyfill";
+<%_ } _%>
+<%_ } else { _%>
 import { HTTPLinkOptions, TRPCClient, createTRPCClient, httpLink } from "@trpc/client";
+<%_ } _%>
 <%_ if (auth === 'IAM') { _%>
 import { useSigV4 } from "../hooks/useSigV4";
 <%_ } else if (auth === 'Cognito') { _%>
@@ -31,10 +38,58 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
   <%_ } _%>
 
   const container = useMemo<<%= apiNameClassName %>TRPCContextValue>(() => {
+    <%_ if (isRestApi) { _%>
+    const client = createTRPCClient<AppRouter>({
+      links: [
+        splitLink({
+          condition: (op) => op.type === 'subscription',
+          true: httpSubscriptionLink({
+            url: apiUrl,
+            <%_ if (auth !== 'None') { _%>
+            EventSource: EventSourcePolyfill,
+            eventSourceOptions: async ({ op }) => {
+              <%_ if (auth === 'IAM') { _%>
+              const url =
+                `${apiUrl.replace(/\/$/, '')}/${op.path}` +
+                (op.input !== undefined
+                  ? `?input=${encodeURIComponent(JSON.stringify(op.input))}`
+                  : '');
+              const signed = await sigv4Client.sign(url, { method: 'GET' });
+              const headers: Record<string, string> = {};
+              signed.headers.forEach((v, k) => {
+                headers[k] = v;
+              });
+              return { headers };
+              <%_ } else if (auth === 'Cognito') { _%>
+              return {
+                headers: {
+                  Authorization: `Bearer ${user?.id_token}`,
+                },
+              };
+              <%_ } else { _%>
+              return {};
+              <%_ } _%>
+            },
+            <%_ } _%>
+          }),
+          false: httpLink({
+            url: apiUrl,
+            <%_ if (auth === 'IAM') { _%>
+            fetch: sigv4Client.fetch,
+            <%_ } else if (auth === 'Cognito') { _%>
+            headers: {
+              Authorization: `Bearer ${user?.id_token}`,
+            },
+            <%_ } _%>
+          }),
+        }),
+      ],
+    });
+    <%_ } else { _%>
     const linkOptions: HTTPLinkOptions<any> = {
       url: apiUrl,
       <%_ if (auth === 'IAM') { _%>
-      fetch: sigv4Client,
+      fetch: sigv4Client.fetch,
       <%_ } else if (auth === 'Cognito') { _%>
       headers: {
         Authorization: `Bearer ${user?.id_token}`,
@@ -45,6 +100,7 @@ export const <%= apiNameClassName %>ClientProvider: FC<PropsWithChildren> = ({
     const client = createTRPCClient<AppRouter>({
       links: [httpLink(linkOptions)],
     });
+    <%_ } _%>
 
     const optionsProxy = createTRPCOptionsProxy<AppRouter>({
       client,

package/src/trpc/react/generator.js

@@ -28,9 +28,11 @@ function reactGenerator(tree, options) {
         const apiName = metadata.apiName;
         const auth = (_a = metadata.auth) !== null && _a !== void 0 ? _a : 'IAM';
         const port = (_d = (_b = metadata.port) !== null && _b !== void 0 ? _b : (_c = metadata.ports) === null || _c === void 0 ? void 0 : _c[0]) !== null && _d !== void 0 ? _d : 2022;
+        const isRestApi = metadata.computeType === 'ServerlessApiGatewayRestApi';
         const apiNameClassName = (0, names_1.toClassName)(apiName);
         const backendProjectAlias = (0, npm_scope_1.toScopeAlias)(backendProjectConfig.name);
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), frontendProjectConfig.root, Object.assign(Object.assign({ apiName, apiNameClassName: (0, names_1.toClassName)(apiName) }, options), { auth,
+            isRestApi,
             backendProjectAlias }), {
             overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
         });
@@ -70,6 +72,9 @@ function reactGenerator(tree, options) {
             '@trpc/tanstack-react-query',
             '@tanstack/react-query',
             '@tanstack/react-query-devtools',
+            ...(isRestApi && auth !== 'None'
+                ? ['event-source-polyfill']
+                : []),
             ...(auth === 'IAM'
                 ? [
                     'oidc-client-ts',
@@ -80,7 +85,12 @@ function reactGenerator(tree, options) {
                 ]
                 : []),
             ...(auth === 'Cognito' ? ['react-oidc-context'] : []),
-        ]), (0, versions_1.withVersions)(['@smithy/types']));
+        ]), (0, versions_1.withVersions)([
+            '@smithy/types',
+            ...(isRestApi && auth !== 'None'
+                ? ['@types/event-source-polyfill']
+                : []),
+        ]));
         yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TRPC_REACT_GENERATOR_INFO]);
         yield (0, format_1.formatFilesInSubtree)(tree);
         return () => {