chore: Upgrade Prettier (aws-amplify#12582)

.github/workflows/callable-canary-e2e-runner.yml

@@ -37,4 +37,4 @@ jobs:
       sample_name: ${{ toJSON(matrix.canary-config.sample_name) || '[""]' }}
       browser: ${{ toJSON(matrix.canary-config.browser) || '[""]' }}
       timeout_minutes: ${{ matrix.canary-config.timeout_minutes || 35 }}
-      retry_count: ${{ matrix.canary-config.retry_count || 3 }}
+      retry_count: ${{ matrix.canary-config.retry_count || 3 }}

package.json

@@ -102,7 +102,7 @@
 		"json-loader": "^0.5.7",
 		"lerna": "^6.6.1",
 		"license-check-and-add": "^4.0.5",
-		"prettier": "^2.4.1",
+		"prettier": "^3.1.0",
 		"pretty-quick": "^1.11.1",
 		"rimraf": "^2.6.2",
 		"rollup": "^0.67.4",

packages/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts

@@ -49,7 +49,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 				({
 					get: mockGetFunc,
 					getAll: mockGetAllFunc,
-				} as any)
+				}) as any
 		);
 
 		jest.spyOn(response, 'cookies', 'get').mockImplementation(() => ({
@@ -124,13 +124,13 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
 				({
 					get: mockGetFunc,
 					getAll: mockGetAllFunc,
-				} as any)
+				}) as any
 		);
 		jest.spyOn(response, 'headers', 'get').mockImplementation(
 			() =>
 				({
 					append: mockAppend,
-				} as any)
+				}) as any
 		);
 
 		const mockContext = {

packages/adapter-nextjs/src/api/generateServerClient.ts

@@ -44,7 +44,7 @@ type ReqClientParams = {
  * const result = await client.graphql({ query: listPosts });
  */
 export function generateServerClientUsingCookies<
-	T extends Record<any, any> = never
+	T extends Record<any, any> = never,
 >({
 	config,
 	cookies,
@@ -99,7 +99,7 @@ export function generateServerClientUsingCookies<
  * });
  */
 export function generateServerClientUsingReqRes<
-	T extends Record<any, any> = never
+	T extends Record<any, any> = never,
 >({ config, authMode, authToken }: ReqClientParams): V6ClientSSRRequest<T> {
 	const amplifyConfig = getAmplifyConfig(config);
 	// passing `null` instance because each (future model) method must retrieve a valid instance

packages/analytics/src/types/inputs.ts

@@ -13,7 +13,7 @@ import {
  * Input type for `identifyUser`.
  */
 export type AnalyticsIdentifyUserInput<
-	ServiceOptions extends AnalyticsServiceOptions = AnalyticsServiceOptions
+	ServiceOptions extends AnalyticsServiceOptions = AnalyticsServiceOptions,
 > = {
 	/**
 	 * A User ID associated to the current device.

packages/analytics/src/utils/groupBy.ts

@@ -5,8 +5,11 @@ export const groupBy = <T>(
 	getGroupId: (x: T) => string,
 	list: T[]
 ): Record<string, T[]> => {
-	return list.reduce((result, current) => {
-		const groupId = getGroupId(current);
-		return { ...result, [groupId]: [...(result[groupId] ?? []), current] };
-	}, {} as Record<string, T[]>);
+	return list.reduce(
+		(result, current) => {
+			const groupId = getGroupId(current);
+			return { ...result, [groupId]: [...(result[groupId] ?? []), current] };
+		},
+		{} as Record<string, T[]>
+	);
 };

packages/analytics/tsconfig.json

@@ -1,9 +1,9 @@
 {
-  "extends": "../tsconfig.base.json",
-  "compilerOptions": {
-    "importHelpers": true,
-    "strict": true,
-    "noImplicitAny": true
-  },
-  "include": ["./src"],
+	"extends": "../tsconfig.base.json",
+	"compilerOptions": {
+		"importHelpers": true,
+		"strict": true,
+		"noImplicitAny": true
+	},
+	"include": ["./src"]
 }

packages/api-graphql/src/internals/server/generateClient.ts

@@ -26,7 +26,7 @@ export function generateClient<
 	T extends Record<any, any> = never,
 	ClientType extends
 		| V6ClientSSRRequest<T>
-		| V6ClientSSRCookies<T> = V6ClientSSRCookies<T>
+		| V6ClientSSRCookies<T> = V6ClientSSRCookies<T>,
 >(
 	params: ServerClientGenerationParams & CommonPublicClientOptions
 ): ClientType {

packages/api-graphql/src/internals/server/generateModelsProperty.ts

@@ -15,7 +15,7 @@ export function generateModelsProperty<
 		| V6ClientSSRRequest<Record<string, any>>
 		| V6ClientSSRCookies<Record<string, any>> = V6ClientSSRCookies<
 		Record<string, any>
-	>
+	>,
 >(client: ClientType, params: ServerClientGenerationParams): ClientType {
 	const models = {} as any;
 	const config = params.config;

packages/api-graphql/src/internals/v6.ts

@@ -95,7 +95,7 @@ import { CustomHeaders } from '@aws-amplify/data-schema-types';
  */
 export function graphql<
 	FALLBACK_TYPES = unknown,
-	TYPED_GQL_STRING extends string = string
+	TYPED_GQL_STRING extends string = string,
 >(
 	this: V6Client,
 	options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,

packages/api-graphql/src/types/index.ts

@@ -96,10 +96,10 @@ type PagedList<T, TYPENAME> = {
 type WithListsFixed<T> = T extends PagedList<infer IT, infer NAME>
 	? PagedList<Exclude<IT, null | undefined>, NAME>
 	: T extends {}
-	? {
-			[K in keyof T]: WithListsFixed<T[K]>;
-	  }
-	: T;
+	  ? {
+				[K in keyof T]: WithListsFixed<T[K]>;
+	    }
+	  : T;
 
 /**
  * Returns an updated response type to always return a value.
@@ -205,7 +205,7 @@ export type GraphQLOperation = Source | string;
  */
 export interface GraphQLOptionsV6<
 	FALLBACK_TYPES = unknown,
-	TYPED_GQL_STRING extends string = string
+	TYPED_GQL_STRING extends string = string,
 > {
 	query: TYPED_GQL_STRING | DocumentNode;
 	variables?: GraphQLVariablesV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
@@ -234,37 +234,40 @@ export type UnknownGraphQLResponse =
  */
 export type GraphQLVariablesV6<
 	FALLBACK_TYPES = unknown,
-	TYPED_GQL_STRING extends string = string
+	TYPED_GQL_STRING extends string = string,
 > = TYPED_GQL_STRING extends GeneratedQuery<infer IN, any>
 	? IN
 	: TYPED_GQL_STRING extends GeneratedMutation<infer IN, any>
-	? IN
-	: TYPED_GQL_STRING extends GeneratedSubscription<infer IN, any>
-	? IN
-	: FALLBACK_TYPES extends GraphQLOperationType<infer IN, any>
-	? IN
-	: any;
+	  ? IN
+	  : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, any>
+	    ? IN
+	    : FALLBACK_TYPES extends GraphQLOperationType<infer IN, any>
+	      ? IN
+	      : any;
 
 /**
  * The expected return type with respect to the given `FALLBACK_TYPE`
  * and `TYPED_GQL_STRING`.
  */
 export type GraphQLResponseV6<
 	FALLBACK_TYPE = unknown,
-	TYPED_GQL_STRING extends string = string
+	TYPED_GQL_STRING extends string = string,
 > = TYPED_GQL_STRING extends GeneratedQuery<infer IN, infer QUERY_OUT>
 	? Promise<GraphQLResult<FixedQueryResult<QUERY_OUT>>>
 	: TYPED_GQL_STRING extends GeneratedMutation<infer IN, infer MUTATION_OUT>
-	? Promise<GraphQLResult<NeverEmpty<MUTATION_OUT>>>
-	: TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT>
-	? GraphqlSubscriptionResult<NeverEmpty<SUB_OUT>>
-	: FALLBACK_TYPE extends GraphQLQuery<infer T>
-	? Promise<GraphQLResult<FALLBACK_TYPE>>
-	: FALLBACK_TYPE extends GraphQLSubscription<infer T>
-	? GraphqlSubscriptionResult<FALLBACK_TYPE>
-	: FALLBACK_TYPE extends GraphQLOperationType<infer IN, infer CUSTOM_OUT>
-	? CUSTOM_OUT
-	: UnknownGraphQLResponse;
+	  ? Promise<GraphQLResult<NeverEmpty<MUTATION_OUT>>>
+	  : TYPED_GQL_STRING extends GeneratedSubscription<infer IN, infer SUB_OUT>
+	    ? GraphqlSubscriptionResult<NeverEmpty<SUB_OUT>>
+	    : FALLBACK_TYPE extends GraphQLQuery<infer T>
+	      ? Promise<GraphQLResult<FALLBACK_TYPE>>
+	      : FALLBACK_TYPE extends GraphQLSubscription<infer T>
+	        ? GraphqlSubscriptionResult<FALLBACK_TYPE>
+	        : FALLBACK_TYPE extends GraphQLOperationType<
+								infer IN,
+								infer CUSTOM_OUT
+	            >
+	          ? CUSTOM_OUT
+	          : UnknownGraphQLResponse;
 
 /**
  * The shape customers can use to provide `T` to `graphql<T>()` to specify both
@@ -407,15 +410,15 @@ export type V6ClientSSRCookies<T extends Record<any, any> = never> =
 
 export type GraphQLMethod = <
 	FALLBACK_TYPES = unknown,
-	TYPED_GQL_STRING extends string = string
+	TYPED_GQL_STRING extends string = string,
 >(
 	options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,
 	additionalHeaders?: CustomHeaders | undefined
 ) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
 
 export type GraphQLMethodSSR = <
 	FALLBACK_TYPES = unknown,
-	TYPED_GQL_STRING extends string = string
+	TYPED_GQL_STRING extends string = string,
 >(
 	contextSpec: AmplifyServer.ContextSpec,
 	options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,

packages/api/src/internals/InternalAPI.ts

@@ -72,11 +72,11 @@ export class InternalAPIClass {
 	): T extends GraphQLQuery<T>
 		? Promise<GraphQLResult<T>>
 		: T extends GraphQLSubscription<T>
-		? Observable<{
-				provider: AWSAppSyncRealTimeProvider;
-				value: GraphQLResult<T>;
-		  }>
-		: Promise<GraphQLResult<any>> | Observable<object>;
+		  ? Observable<{
+					provider: AWSAppSyncRealTimeProvider;
+					value: GraphQLResult<T>;
+		    }>
+		  : Promise<GraphQLResult<any>> | Observable<object>;
 	graphql<T = any>(
 		options: GraphQLOptions,
 		additionalHeaders?: CustomHeaders,

packages/auth/__tests__/providers/cognito/signInWithSRP.test.ts

@@ -73,9 +73,8 @@ describe('signIn API happy path cases', () => {
 			.spyOn(initiateAuthHelpers, 'handleUserPasswordAuthFlow')
 			.mockImplementation(
 				async (): Promise<RespondToAuthChallengeCommandOutput> => {
-					const deviceKeys = await tokenOrchestrator.getDeviceMetadata(
-						lastAuthUser
-					);
+					const deviceKeys =
+						await tokenOrchestrator.getDeviceMetadata(lastAuthUser);
 					if (deviceKeys) {
 						throw new AuthError({
 							name: 'ResourceNotFoundException',

packages/auth/__tests__/providers/cognito/testUtils/data.ts

@@ -78,4 +78,3 @@ export function buildMockErrorResponse(errorName: string): {
 		},
 	};
 }
-

packages/auth/__tests__/utils/openAuthSession.test.ts

@@ -12,7 +12,7 @@ describe('openAuthSession', () => {
 	// create mocks
 
 	beforeAll(() => {
-		windowSpy.mockImplementation(() => ({ location } as any));
+		windowSpy.mockImplementation(() => ({ location }) as any);
 	});
 
 	beforeEach(() => {

packages/auth/jest.setup.js

@@ -10,7 +10,7 @@ if (
 const crypto = require('crypto');
 
 Object.defineProperty(globalThis, 'crypto', {
-  value: {
-    getRandomValues: arr => crypto.randomBytes(arr.length)
-  }
+	value: {
+		getRandomValues: arr => crypto.randomBytes(arr.length),
+	},
 });

packages/auth/src/providers/cognito/apis/internal/fetchUserAttributes.ts

@@ -25,9 +25,9 @@ export const fetchUserAttributes = async (
 	assertAuthTokens(tokens);
 
 	const { UserAttributes } = await getUser(
-		{ 
-			region: getRegion(authConfig.userPoolId), 
-			userAgentValue: getAuthUserAgentValue(AuthAction.FetchUserAttributes) 
+		{
+			region: getRegion(authConfig.userPoolId),
+			userAgentValue: getAuthUserAgentValue(AuthAction.FetchUserAttributes),
 		},
 		{
 			AccessToken: tokens.accessToken.toString(),

packages/auth/src/providers/cognito/types/models.ts

@@ -107,5 +107,5 @@ export interface AuthUser extends AWSAuthUser {
  * Holds data describing the dispatch of a confirmation code.
  */
 export type CodeDeliveryDetails<
-	CognitoUserAttributeKey extends UserAttributeKey = UserAttributeKey
+	CognitoUserAttributeKey extends UserAttributeKey = UserAttributeKey,
 > = AuthCodeDeliveryDetails<CognitoUserAttributeKey>;

packages/auth/src/providers/cognito/utils/signInHelpers.ts

@@ -1082,7 +1082,7 @@ export async function getNewDeviceMetatada(
  *
  */
 export async function retryOnResourceNotFoundException<
-	F extends (...args: any[]) => any
+	F extends (...args: any[]) => any,
 >(
 	func: F,
 	args: Parameters<F>,

packages/auth/src/providers/cognito/utils/signInWithRedirectStore.ts

@@ -123,9 +123,8 @@ export class DefaultOAuthStore implements OAuthStore {
 			this.cognitoConfig.userPoolClientId
 		);
 
-		const isLegacyHostedUISignIn = await this.keyValueStorage.getItem(
-			V5_HOSTED_UI_KEY
-		);
+		const isLegacyHostedUISignIn =
+			await this.keyValueStorage.getItem(V5_HOSTED_UI_KEY);
 
 		const [isOAuthSignIn, preferPrivateSession] =
 			(await this.keyValueStorage.getItem(authKeys.oauthSignIn))?.split(',') ??