From 1f5eefd9c40285eb99e57764ac8fca1f9519e2c6 Mon Sep 17 00:00:00 2001 From: Chris F <5827964+cshfang@users.noreply.github.com> Date: Fri, 17 Nov 2023 10:41:02 -0800 Subject: [PATCH] chore: Upgrade Prettier (#12582) --- .../workflows/callable-canary-e2e-runner.yml | 2 +- package.json | 2 +- ...torageAdapterFromNextServerContext.test.ts | 6 +- .../src/api/generateServerClient.ts | 4 +- packages/analytics/src/types/inputs.ts | 2 +- packages/analytics/src/utils/groupBy.ts | 11 +- packages/analytics/tsconfig.json | 14 +- .../src/internals/server/generateClient.ts | 2 +- .../server/generateModelsProperty.ts | 2 +- packages/api-graphql/src/internals/v6.ts | 2 +- packages/api-graphql/src/types/index.ts | 53 +- packages/api/src/internals/InternalAPI.ts | 10 +- .../providers/cognito/signInWithSRP.test.ts | 5 +- .../providers/cognito/testUtils/data.ts | 1 - .../__tests__/utils/openAuthSession.test.ts | 2 +- packages/auth/jest.setup.js | 6 +- .../apis/internal/fetchUserAttributes.ts | 6 +- .../src/providers/cognito/types/models.ts | 2 +- .../providers/cognito/utils/signInHelpers.ts | 2 +- .../cognito/utils/signInWithRedirectStore.ts | 5 +- packages/auth/src/types/inputs.ts | 27 +- packages/auth/src/types/models.ts | 20 +- packages/auth/src/types/options.ts | 2 +- packages/auth/src/types/outputs.ts | 10 +- packages/core/__mocks__/SessionStorage.js | 2 +- .../pinpoint/utils/EventBuffer.test.ts | 6 +- .../pinpoint/utils/getEventBuffer.test.ts | 17 +- packages/core/src/Cache/types/index.ts | 8 +- packages/core/src/Hub/index.ts | 8 +- packages/core/src/Hub/types/HubTypes.ts | 6 +- .../src/clients/internal/composeServiceApi.ts | 2 +- .../internal/composeTransferHandler.ts | 30 +- .../signing/signer/signatureV4/signRequest.ts | 5 +- packages/core/src/clients/types/core.ts | 4 +- packages/core/src/global.d.ts | 2 +- packages/datastore-storage-adapter/.npmignore | 1 - .../datastore-storage-adapter/jest.setup.js | 4 +- .../src/common/CommonSQLiteAdapter.ts | 4 +- packages/datastore/.npmignore | 1 - packages/datastore/__tests__/AsyncStorage.ts | 2 +- packages/datastore/__tests__/DataStore.ts | 5 +- packages/datastore/__tests__/Predicate.ts | 540 +++++++----------- .../__tests__/connectivityHandling.test.ts | 5 +- packages/datastore/jest.setup.js | 4 +- packages/datastore/src/datastore/datastore.ts | 6 +- .../storage/adapter/AsyncStorageDatabase.ts | 5 +- packages/datastore/src/sync/index.ts | 5 +- .../src/sync/processors/subscription.ts | 2 +- packages/datastore/src/sync/utils.ts | 2 +- packages/datastore/src/types.ts | 96 ++-- .../AmazonLocationServiceProvider.test.ts | 5 +- .../utils/processInAppMessages.test.ts | 2 +- .../providers/pinpoint/utils/helpers.ts | 4 +- .../utils/messageProcessingHelpers.ts | 10 +- .../src/inAppMessaging/types/inputs.ts | 3 +- .../src/pushNotifications/types/inputs.ts | 3 +- .../AmazonAIIdentifyPredictionsProvider.ts | 7 +- packages/pubsub/src/vendor/paho-mqtt.js | 8 +- .../s3/utils/client/testUtils/types.ts | 4 +- .../s3/utils/client/utils/parsePayload.ts | 4 +- packages/storage/src/types/inputs.ts | 4 +- .prettierrc.js => prettier.config.js | 1 + yarn.lock | 8 +- 63 files changed, 459 insertions(+), 574 deletions(-) rename .prettierrc.js => prettier.config.js (71%) diff --git a/.github/workflows/callable-canary-e2e-runner.yml b/.github/workflows/callable-canary-e2e-runner.yml index ecde3811698..073192758e2 100644 --- a/.github/workflows/callable-canary-e2e-runner.yml +++ b/.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 }} \ No newline at end of file + retry_count: ${{ matrix.canary-config.retry_count || 3 }} diff --git a/package.json b/package.json index 33583c5c8db..3178f685717 100644 --- a/package.json +++ b/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", diff --git a/packages/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts b/packages/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts index b1ae7366d1c..3094472548f 100644 --- a/packages/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts +++ b/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 = { diff --git a/packages/adapter-nextjs/src/api/generateServerClient.ts b/packages/adapter-nextjs/src/api/generateServerClient.ts index 22490a5e2ab..841e4c4ee9e 100644 --- a/packages/adapter-nextjs/src/api/generateServerClient.ts +++ b/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 = never + T extends Record = never, >({ config, cookies, @@ -99,7 +99,7 @@ export function generateServerClientUsingCookies< * }); */ export function generateServerClientUsingReqRes< - T extends Record = never + T extends Record = never, >({ config, authMode, authToken }: ReqClientParams): V6ClientSSRRequest { const amplifyConfig = getAmplifyConfig(config); // passing `null` instance because each (future model) method must retrieve a valid instance diff --git a/packages/analytics/src/types/inputs.ts b/packages/analytics/src/types/inputs.ts index 7eedad05a6c..2d7f2a8fcde 100644 --- a/packages/analytics/src/types/inputs.ts +++ b/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. diff --git a/packages/analytics/src/utils/groupBy.ts b/packages/analytics/src/utils/groupBy.ts index 014483a195f..c11dd6f225d 100644 --- a/packages/analytics/src/utils/groupBy.ts +++ b/packages/analytics/src/utils/groupBy.ts @@ -5,8 +5,11 @@ export const groupBy = ( getGroupId: (x: T) => string, list: T[] ): Record => { - return list.reduce((result, current) => { - const groupId = getGroupId(current); - return { ...result, [groupId]: [...(result[groupId] ?? []), current] }; - }, {} as Record); + return list.reduce( + (result, current) => { + const groupId = getGroupId(current); + return { ...result, [groupId]: [...(result[groupId] ?? []), current] }; + }, + {} as Record + ); }; diff --git a/packages/analytics/tsconfig.json b/packages/analytics/tsconfig.json index 5f6d8cbfa41..f907c964821 100644 --- a/packages/analytics/tsconfig.json +++ b/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"] } diff --git a/packages/api-graphql/src/internals/server/generateClient.ts b/packages/api-graphql/src/internals/server/generateClient.ts index c1860c703be..9ea530b8f75 100644 --- a/packages/api-graphql/src/internals/server/generateClient.ts +++ b/packages/api-graphql/src/internals/server/generateClient.ts @@ -26,7 +26,7 @@ export function generateClient< T extends Record = never, ClientType extends | V6ClientSSRRequest - | V6ClientSSRCookies = V6ClientSSRCookies + | V6ClientSSRCookies = V6ClientSSRCookies, >( params: ServerClientGenerationParams & CommonPublicClientOptions ): ClientType { diff --git a/packages/api-graphql/src/internals/server/generateModelsProperty.ts b/packages/api-graphql/src/internals/server/generateModelsProperty.ts index c8e7a128672..a4cd25a8f5d 100644 --- a/packages/api-graphql/src/internals/server/generateModelsProperty.ts +++ b/packages/api-graphql/src/internals/server/generateModelsProperty.ts @@ -15,7 +15,7 @@ export function generateModelsProperty< | V6ClientSSRRequest> | V6ClientSSRCookies> = V6ClientSSRCookies< Record - > + >, >(client: ClientType, params: ServerClientGenerationParams): ClientType { const models = {} as any; const config = params.config; diff --git a/packages/api-graphql/src/internals/v6.ts b/packages/api-graphql/src/internals/v6.ts index 291adb0f779..dd830f1f775 100644 --- a/packages/api-graphql/src/internals/v6.ts +++ b/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, diff --git a/packages/api-graphql/src/types/index.ts b/packages/api-graphql/src/types/index.ts index e15ad853fd6..ff4c1a98b95 100644 --- a/packages/api-graphql/src/types/index.ts +++ b/packages/api-graphql/src/types/index.ts @@ -96,10 +96,10 @@ type PagedList = { type WithListsFixed = T extends PagedList ? PagedList, NAME> : T extends {} - ? { - [K in keyof T]: WithListsFixed; - } - : T; + ? { + [K in keyof T]: WithListsFixed; + } + : 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; @@ -234,16 +234,16 @@ 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 ? IN : TYPED_GQL_STRING extends GeneratedMutation - ? IN - : TYPED_GQL_STRING extends GeneratedSubscription - ? IN - : FALLBACK_TYPES extends GraphQLOperationType - ? IN - : any; + ? IN + : TYPED_GQL_STRING extends GeneratedSubscription + ? IN + : FALLBACK_TYPES extends GraphQLOperationType + ? IN + : any; /** * The expected return type with respect to the given `FALLBACK_TYPE` @@ -251,20 +251,23 @@ export type GraphQLVariablesV6< */ export type GraphQLResponseV6< FALLBACK_TYPE = unknown, - TYPED_GQL_STRING extends string = string + TYPED_GQL_STRING extends string = string, > = TYPED_GQL_STRING extends GeneratedQuery ? Promise>> : TYPED_GQL_STRING extends GeneratedMutation - ? Promise>> - : TYPED_GQL_STRING extends GeneratedSubscription - ? GraphqlSubscriptionResult> - : FALLBACK_TYPE extends GraphQLQuery - ? Promise> - : FALLBACK_TYPE extends GraphQLSubscription - ? GraphqlSubscriptionResult - : FALLBACK_TYPE extends GraphQLOperationType - ? CUSTOM_OUT - : UnknownGraphQLResponse; + ? Promise>> + : TYPED_GQL_STRING extends GeneratedSubscription + ? GraphqlSubscriptionResult> + : FALLBACK_TYPE extends GraphQLQuery + ? Promise> + : FALLBACK_TYPE extends GraphQLSubscription + ? GraphqlSubscriptionResult + : FALLBACK_TYPE extends GraphQLOperationType< + infer IN, + infer CUSTOM_OUT + > + ? CUSTOM_OUT + : UnknownGraphQLResponse; /** * The shape customers can use to provide `T` to `graphql()` to specify both @@ -407,7 +410,7 @@ export type V6ClientSSRCookies = never> = export type GraphQLMethod = < FALLBACK_TYPES = unknown, - TYPED_GQL_STRING extends string = string + TYPED_GQL_STRING extends string = string, >( options: GraphQLOptionsV6, additionalHeaders?: CustomHeaders | undefined @@ -415,7 +418,7 @@ export type GraphQLMethod = < export type GraphQLMethodSSR = < FALLBACK_TYPES = unknown, - TYPED_GQL_STRING extends string = string + TYPED_GQL_STRING extends string = string, >( contextSpec: AmplifyServer.ContextSpec, options: GraphQLOptionsV6, diff --git a/packages/api/src/internals/InternalAPI.ts b/packages/api/src/internals/InternalAPI.ts index 5e5662a5fc0..d9d7aa56281 100644 --- a/packages/api/src/internals/InternalAPI.ts +++ b/packages/api/src/internals/InternalAPI.ts @@ -72,11 +72,11 @@ export class InternalAPIClass { ): T extends GraphQLQuery ? Promise> : T extends GraphQLSubscription - ? Observable<{ - provider: AWSAppSyncRealTimeProvider; - value: GraphQLResult; - }> - : Promise> | Observable; + ? Observable<{ + provider: AWSAppSyncRealTimeProvider; + value: GraphQLResult; + }> + : Promise> | Observable; graphql( options: GraphQLOptions, additionalHeaders?: CustomHeaders, diff --git a/packages/auth/__tests__/providers/cognito/signInWithSRP.test.ts b/packages/auth/__tests__/providers/cognito/signInWithSRP.test.ts index 200f1659164..11d1a30812e 100644 --- a/packages/auth/__tests__/providers/cognito/signInWithSRP.test.ts +++ b/packages/auth/__tests__/providers/cognito/signInWithSRP.test.ts @@ -73,9 +73,8 @@ describe('signIn API happy path cases', () => { .spyOn(initiateAuthHelpers, 'handleUserPasswordAuthFlow') .mockImplementation( async (): Promise => { - const deviceKeys = await tokenOrchestrator.getDeviceMetadata( - lastAuthUser - ); + const deviceKeys = + await tokenOrchestrator.getDeviceMetadata(lastAuthUser); if (deviceKeys) { throw new AuthError({ name: 'ResourceNotFoundException', diff --git a/packages/auth/__tests__/providers/cognito/testUtils/data.ts b/packages/auth/__tests__/providers/cognito/testUtils/data.ts index 1df7d043c1f..9a7dfb0a0ed 100644 --- a/packages/auth/__tests__/providers/cognito/testUtils/data.ts +++ b/packages/auth/__tests__/providers/cognito/testUtils/data.ts @@ -78,4 +78,3 @@ export function buildMockErrorResponse(errorName: string): { }, }; } - diff --git a/packages/auth/__tests__/utils/openAuthSession.test.ts b/packages/auth/__tests__/utils/openAuthSession.test.ts index b0dd69c3a7a..6dc046d1312 100644 --- a/packages/auth/__tests__/utils/openAuthSession.test.ts +++ b/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(() => { diff --git a/packages/auth/jest.setup.js b/packages/auth/jest.setup.js index 82b8d276385..961fd1f6625 100644 --- a/packages/auth/jest.setup.js +++ b/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), + }, }); diff --git a/packages/auth/src/providers/cognito/apis/internal/fetchUserAttributes.ts b/packages/auth/src/providers/cognito/apis/internal/fetchUserAttributes.ts index b19dcc1ecf1..718e8ca6ca0 100644 --- a/packages/auth/src/providers/cognito/apis/internal/fetchUserAttributes.ts +++ b/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(), diff --git a/packages/auth/src/providers/cognito/types/models.ts b/packages/auth/src/providers/cognito/types/models.ts index f763b494a0c..ae9dbc90acd 100644 --- a/packages/auth/src/providers/cognito/types/models.ts +++ b/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; diff --git a/packages/auth/src/providers/cognito/utils/signInHelpers.ts b/packages/auth/src/providers/cognito/utils/signInHelpers.ts index d12ec03682c..372ed25e700 100644 --- a/packages/auth/src/providers/cognito/utils/signInHelpers.ts +++ b/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, diff --git a/packages/auth/src/providers/cognito/utils/signInWithRedirectStore.ts b/packages/auth/src/providers/cognito/utils/signInWithRedirectStore.ts index c31892a562d..79b5df9acf7 100644 --- a/packages/auth/src/providers/cognito/utils/signInWithRedirectStore.ts +++ b/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(',') ?? diff --git a/packages/auth/src/types/inputs.ts b/packages/auth/src/types/inputs.ts index 1f8aa0ddb3e..2e326686ef4 100644 --- a/packages/auth/src/types/inputs.ts +++ b/packages/auth/src/types/inputs.ts @@ -10,7 +10,7 @@ import { import { AuthServiceOptions, AuthSignUpOptions } from './options'; export type AuthConfirmResetPasswordInput< - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { username: string; newPassword: string; @@ -25,21 +25,21 @@ export type AuthConfirmResetPasswordInput< * @param options - optional parameters for the Sign Up process such as the plugin options */ export type AuthResendSignUpCodeInput< - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { username: string; options?: ServiceOptions; }; export type AuthResetPasswordInput< - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { username: string; options?: ServiceOptions; }; export type AuthSignInInput< - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { username: string; password?: string; @@ -76,7 +76,8 @@ export type AuthSignInWithRedirectInput = { * @param options - optional parameters for the Sign Up process, including user attributes */ export type AuthSignUpInput< - ServiceOptions extends AuthSignUpOptions = AuthSignUpOptions + ServiceOptions extends + AuthSignUpOptions = AuthSignUpOptions, > = { username: string; password: string; @@ -91,7 +92,7 @@ export type AuthSignUpInput< * @param options - optional parameters for the Sign Up process, including user attributes */ export type AuthConfirmSignUpInput< - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { username: string; confirmationCode: string; @@ -105,7 +106,7 @@ export type AuthConfirmSignUpInput< * @param options - optional parameters for the Confirm Sign In process such as the service options */ export type AuthConfirmSignInInput< - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { challengeResponse: string; options?: ServiceOptions; @@ -118,7 +119,7 @@ export type AuthConfirmSignInInput< * @param options - optional parameters for the Verify TOTP Setup process such as the service options. */ export type AuthVerifyTOTPSetupInput< - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { code: string; options?: ServiceOptions; @@ -143,7 +144,7 @@ export type AuthUpdatePasswordInput = { */ export type AuthUpdateUserAttributesInput< UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { userAttributes: AuthUserAttributes; options?: ServiceOptions; @@ -156,7 +157,7 @@ export type AuthUpdateUserAttributesInput< */ export type AuthUpdateUserAttributeInput< UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { userAttribute: AuthUserAttribute; options?: ServiceOptions; @@ -170,7 +171,7 @@ export type AuthUpdateUserAttributeInput< * */ export type AuthConfirmUserAttributeInput< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { userAttributeKey: UserAttributeKey; confirmationCode: string }; /** @@ -181,7 +182,7 @@ export type AuthConfirmUserAttributeInput< */ export type AuthSendUserAttributeVerificationCodeInput< UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, - ServiceOptions extends AuthServiceOptions = AuthServiceOptions + ServiceOptions extends AuthServiceOptions = AuthServiceOptions, > = { userAttributeKey: UserAttributeKey; options?: ServiceOptions; @@ -193,7 +194,7 @@ export type AuthSendUserAttributeVerificationCodeInput< * @param userAttributeKeys - the user attribute keys to be deleted */ export type AuthDeleteUserAttributesInput< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { userAttributeKeys: [UserAttributeKey, ...UserAttributeKey[]] }; /** diff --git a/packages/auth/src/types/models.ts b/packages/auth/src/types/models.ts index 10259c042e3..08ff0c4f016 100644 --- a/packages/auth/src/types/models.ts +++ b/packages/auth/src/types/models.ts @@ -20,7 +20,7 @@ export type AuthDeliveryMedium = 'EMAIL' | 'SMS' | 'PHONE' | 'UNKNOWN'; * Data describing the dispatch of a confirmation code. */ export type AuthCodeDeliveryDetails< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { destination?: string; deliveryMedium?: AuthDeliveryMedium; @@ -31,7 +31,7 @@ export type AuthCodeDeliveryDetails< */ export type AuthResetPasswordStep = 'CONFIRM_RESET_PASSWORD_WITH_CODE' | 'DONE'; export type AuthNextResetPasswordStep< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { resetPasswordStep: AuthResetPasswordStep; additionalInfo?: AuthAdditionalInfo; @@ -106,7 +106,7 @@ export type ConfirmSignInWithCustomChallenge = { }; export type ConfirmSignInWithNewPasswordRequired< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { /** * Auth step requires user to change their password with any required attributes. @@ -173,7 +173,7 @@ export type DoneSignInStep = { }; export type AuthNextSignInStep< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = | ConfirmSignInWithCustomChallenge | ContinueSignInWithMFASelection @@ -189,7 +189,7 @@ export type AuthNextSignInStep< * Key/value pairs describing a user attributes. */ export type AuthUserAttributes< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { [Attribute in UserAttributeKey]?: string; }; @@ -198,7 +198,7 @@ export type AuthUserAttributes< * The interface of a user attribute. */ export type AuthUserAttribute< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { attributeKey: UserAttributeKey; value: string; @@ -226,7 +226,7 @@ export type AuthUpdateAttributeStep = * Data encapsulating the next step in the Sign Up process */ export type AuthNextSignUpStep< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = | ConfirmSignUpSignUpStep | AutoSignInSignUpStep @@ -238,21 +238,21 @@ export type DoneSignUpStep = { }; export type ConfirmSignUpSignUpStep< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { signUpStep: 'CONFIRM_SIGN_UP'; codeDeliveryDetails: AuthCodeDeliveryDetails; }; export type AutoSignInSignUpStep< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { signUpStep: 'COMPLETE_AUTO_SIGN_IN'; codeDeliveryDetails?: AuthCodeDeliveryDetails; }; export type AuthNextUpdateAttributeStep< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { updateAttributeStep: AuthUpdateAttributeStep; codeDeliveryDetails?: AuthCodeDeliveryDetails; diff --git a/packages/auth/src/types/options.ts b/packages/auth/src/types/options.ts index fcf13f839c3..d026ef3bfb6 100644 --- a/packages/auth/src/types/options.ts +++ b/packages/auth/src/types/options.ts @@ -15,7 +15,7 @@ export type AuthServiceOptions = Record; * Particular services may require some of these parameters. */ export type AuthSignUpOptions< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { userAttributes: AuthUserAttributes; }; diff --git a/packages/auth/src/types/outputs.ts b/packages/auth/src/types/outputs.ts index aa6a49c7546..5e1d65cd3be 100644 --- a/packages/auth/src/types/outputs.ts +++ b/packages/auth/src/types/outputs.ts @@ -10,14 +10,14 @@ import { } from './models'; export type AuthSignInOutput< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { isSignedIn: boolean; nextStep: AuthNextSignInStep; }; export type AuthSignUpOutput< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { isSignUpComplete: boolean; userId?: string; @@ -25,21 +25,21 @@ export type AuthSignUpOutput< }; export type AuthResetPasswordOutput< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { isPasswordReset: boolean; nextStep: AuthNextResetPasswordStep; }; export type AuthUpdateUserAttributeOutput< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { isUpdated: boolean; nextStep: AuthNextUpdateAttributeStep; }; export type AuthUpdateUserAttributesOutput< - UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey + UserAttributeKey extends AuthUserAttributeKey = AuthUserAttributeKey, > = { [authKey in UserAttributeKey]: AuthUpdateUserAttributeOutput; }; diff --git a/packages/core/__mocks__/SessionStorage.js b/packages/core/__mocks__/SessionStorage.js index 356f1f19433..54a0f228dd7 100644 --- a/packages/core/__mocks__/SessionStorage.js +++ b/packages/core/__mocks__/SessionStorage.js @@ -75,6 +75,6 @@ class SessionStorageMock { } } -if (typeof window !== 'undefined') { +if (typeof window !== 'undefined') { window.sessionStorage = new SessionStorageMock(); } diff --git a/packages/core/__tests__/providers/pinpoint/utils/EventBuffer.test.ts b/packages/core/__tests__/providers/pinpoint/utils/EventBuffer.test.ts index d2c1349e62b..52cc67ff816 100644 --- a/packages/core/__tests__/providers/pinpoint/utils/EventBuffer.test.ts +++ b/packages/core/__tests__/providers/pinpoint/utils/EventBuffer.test.ts @@ -6,14 +6,14 @@ const DEFAULT_CONFIG = { appId: 'app-id', credentials: { accessKeyId: 'access-key-id', - secretAccessKey: 'secret-access-key' + secretAccessKey: 'secret-access-key', }, identityId: 'identity-id', bufferSize: 1000, flushSize: 100, flushInterval: 5 * 1000, // 5s resendLimit: 5, - region: 'region' + region: 'region', }; const EVENT_OBJECT = { @@ -34,7 +34,7 @@ const EVENT_OBJECT = { credentials: {}, session: { Id: 'session-id', - StartTimestamp: 'start-timestamp' + StartTimestamp: 'start-timestamp', }, resendLimit: 5, }; diff --git a/packages/core/__tests__/providers/pinpoint/utils/getEventBuffer.test.ts b/packages/core/__tests__/providers/pinpoint/utils/getEventBuffer.test.ts index 7192da1964e..fe2347a0259 100644 --- a/packages/core/__tests__/providers/pinpoint/utils/getEventBuffer.test.ts +++ b/packages/core/__tests__/providers/pinpoint/utils/getEventBuffer.test.ts @@ -1,12 +1,7 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -import { - appId, - credentials, - identityId, - region, -} from '../testUtils/data'; +import { appId, credentials, identityId, region } from '../testUtils/data'; import { getEventBuffer } from '../../../../src/providers/pinpoint/utils/getEventBuffer'; import { PinpointEventBuffer } from '../../../../src/providers/pinpoint/utils/PinpointEventBuffer'; @@ -21,8 +16,8 @@ const mockConfig = { flushSize: 50, identityId, region, - resendLimit: 5 -} + resendLimit: 5, +}; describe('Pinpoint Provider Util: bufferManager', () => { const mockPinpointEventBuffer = PinpointEventBuffer as jest.Mock; @@ -35,11 +30,11 @@ describe('Pinpoint Provider Util: bufferManager', () => { mockPinpointEventBuffer.mockReset(); mockPinpointEventBuffer.mockImplementation(() => ({ identityHasChanged: mockIdentityHasChanged, - flush: mockFlush - })) + flush: mockFlush, + })); }); - it('creates a buffer if one doesn\'t exist', async () => { + it("creates a buffer if one doesn't exist", async () => { const testBuffer = getEventBuffer(mockConfig); expect(mockPinpointEventBuffer).toBeCalledWith(mockConfig); diff --git a/packages/core/src/Cache/types/index.ts b/packages/core/src/Cache/types/index.ts index 5ca15b25bd6..c2c1db22a6f 100644 --- a/packages/core/src/Cache/types/index.ts +++ b/packages/core/src/Cache/types/index.ts @@ -1,4 +1,4 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -export * from './cache'; +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +export * from './cache'; diff --git a/packages/core/src/Hub/index.ts b/packages/core/src/Hub/index.ts index e1808a345d9..e80b42ab0fb 100644 --- a/packages/core/src/Hub/index.ts +++ b/packages/core/src/Hub/index.ts @@ -51,7 +51,7 @@ export class HubClass { */ private _remove< Channel extends AmplifyChannel | string = string, - EventData extends EventDataMap = EventDataMap + EventData extends EventDataMap = EventDataMap, >(channel: Channel, listener: HubCallback) { const holder = this.listeners.get(channel); if (!holder) { @@ -89,7 +89,7 @@ export class HubClass { dispatch< Channel extends AmplifyChannel | string, - EventData extends EventDataMap = EventDataMap + EventData extends EventDataMap = EventDataMap, >( channel: Channel | string, payload: HubPayload, @@ -134,7 +134,7 @@ export class HubClass { */ listen< Channel extends AmplifyChannel, - EventData extends EventDataMap = EventDataMap + EventData extends EventDataMap = EventDataMap, >( channel: Channel, callback: HubCallback, @@ -149,7 +149,7 @@ export class HubClass { listen< Channel extends AmplifyChannel | string = string, - EventData extends EventDataMap = EventDataMap + EventData extends EventDataMap = EventDataMap, >( channel: Channel, callback: HubCallback, diff --git a/packages/core/src/Hub/types/HubTypes.ts b/packages/core/src/Hub/types/HubTypes.ts index 88b90bd5d59..2f4d59a589b 100644 --- a/packages/core/src/Hub/types/HubTypes.ts +++ b/packages/core/src/Hub/types/HubTypes.ts @@ -5,7 +5,7 @@ import { AuthHubEventData } from './AuthTypes'; export type IListener< Channel extends string = AmplifyChannel | string, - EventData extends EventDataMap = EventDataMap + EventData extends EventDataMap = EventDataMap, > = { name: string; callback: HubCallback; @@ -23,7 +23,7 @@ export type StopListenerCallback = () => void; export type HubCapsule< Channel extends string, - EventData extends EventDataMap + EventData extends EventDataMap, > = { channel: Channel; payload: HubPayload; @@ -33,7 +33,7 @@ export type HubCapsule< export type HubCallback< Channel extends string = string, - EventData extends EventDataMap = EventDataMap + EventData extends EventDataMap = EventDataMap, > = (capsule: HubCapsule) => void; export type HubPayload = diff --git a/packages/core/src/clients/internal/composeServiceApi.ts b/packages/core/src/clients/internal/composeServiceApi.ts index b7f861a5bc3..650c59fb1e5 100644 --- a/packages/core/src/clients/internal/composeServiceApi.ts +++ b/packages/core/src/clients/internal/composeServiceApi.ts @@ -9,7 +9,7 @@ export const composeServiceApi = < TransferHandlerOptions, Input, Output, - DefaultConfig + DefaultConfig, >( transferHandler: TransferHandler< HttpRequest, diff --git a/packages/core/src/clients/internal/composeTransferHandler.ts b/packages/core/src/clients/internal/composeTransferHandler.ts index fd9deeddbd4..edb0137c1bd 100644 --- a/packages/core/src/clients/internal/composeTransferHandler.ts +++ b/packages/core/src/clients/internal/composeTransferHandler.ts @@ -26,7 +26,7 @@ export const composeTransferHandler = Request, Response, any - > = TransferHandler + > = TransferHandler, >( coreHandler: CoreHandler, middleware: OptionToMiddleware @@ -56,34 +56,34 @@ export const composeTransferHandler = type OptionToMiddleware< Request extends RequestBase, Response extends ResponseBase, - Options extends any[] + Options extends any[], > = Options extends [] ? [] : Options extends [infer LastOption] - ? [Middleware] - : Options extends [infer FirstOption, ...infer RestOptions] - ? [ - Middleware, - ...OptionToMiddleware - ] - : never; + ? [Middleware] + : Options extends [infer FirstOption, ...infer RestOptions] + ? [ + Middleware, + ...OptionToMiddleware, + ] + : never; /** * Type to intersect multiple types if they have no conflict keys. */ type MergeNoConflictKeys = Options extends [ - infer OnlyOption + infer OnlyOption, ] ? OnlyOption : Options extends [infer FirstOption, infer SecondOption] - ? FirstOption & SecondOption - : Options extends [infer FirstOption, ...infer RestOptions] - ? FirstOption & MergeNoConflictKeys - : never; + ? FirstOption & SecondOption + : Options extends [infer FirstOption, ...infer RestOptions] + ? FirstOption & MergeNoConflictKeys + : never; /** * Type to infer the option type of a transfer handler type. */ type InferOptionTypeFromTransferHandler< - T extends TransferHandler + T extends TransferHandler, > = Parameters[1]; diff --git a/packages/core/src/clients/middleware/signing/signer/signatureV4/signRequest.ts b/packages/core/src/clients/middleware/signing/signer/signatureV4/signRequest.ts index 132236fe4b4..4e19be6b431 100644 --- a/packages/core/src/clients/middleware/signing/signer/signatureV4/signRequest.ts +++ b/packages/core/src/clients/middleware/signing/signer/signatureV4/signRequest.ts @@ -43,9 +43,8 @@ export const signRequest = ( const credentialEntry = `Credential=${accessKeyId}/${credentialScope}`; const signedHeadersEntry = `SignedHeaders=${getSignedHeaders(headers)}`; const signatureEntry = `Signature=${signature}`; - headers[ - AUTH_HEADER - ] = `${SHA256_ALGORITHM_IDENTIFIER} ${credentialEntry}, ${signedHeadersEntry}, ${signatureEntry}`; + headers[AUTH_HEADER] = + `${SHA256_ALGORITHM_IDENTIFIER} ${credentialEntry}, ${signedHeadersEntry}, ${signatureEntry}`; return requestToSign; }; diff --git a/packages/core/src/clients/types/core.ts b/packages/core/src/clients/types/core.ts index d369312cd40..c510b2eed73 100644 --- a/packages/core/src/clients/types/core.ts +++ b/packages/core/src/clients/types/core.ts @@ -16,7 +16,7 @@ export interface Response { export interface TransferHandler< Input extends Request, Output extends Response, - TransferOptions + TransferOptions, > { (request: Input, options: TransferOptions): Promise; } @@ -49,7 +49,7 @@ type ConfiguredMiddleware = ( export type Middleware< Input extends Request, Output extends Response, - MiddlewareOptions + MiddlewareOptions, > = (options: MiddlewareOptions) => ConfiguredMiddleware; export interface Endpoint { diff --git a/packages/core/src/global.d.ts b/packages/core/src/global.d.ts index d2e571148d5..2f78bef6184 100644 --- a/packages/core/src/global.d.ts +++ b/packages/core/src/global.d.ts @@ -4,7 +4,7 @@ declare global { interface Window { FB: any; - gapi: any; + gapi: any; } } diff --git a/packages/datastore-storage-adapter/.npmignore b/packages/datastore-storage-adapter/.npmignore index 329f5cdc2dd..92866a5d2e7 100644 --- a/packages/datastore-storage-adapter/.npmignore +++ b/packages/datastore-storage-adapter/.npmignore @@ -6,7 +6,6 @@ node_modules/** .vscode/** .DS_Store *.log -prettier.config.json tsconfig.json tsfmt.json tslint.json diff --git a/packages/datastore-storage-adapter/jest.setup.js b/packages/datastore-storage-adapter/jest.setup.js index c8e9543debe..a0f3d5370fa 100644 --- a/packages/datastore-storage-adapter/jest.setup.js +++ b/packages/datastore-storage-adapter/jest.setup.js @@ -2,6 +2,6 @@ const crypto = require('crypto'); Object.defineProperty(globalThis, 'crypto', { value: { - getRandomValues: arr => crypto.randomBytes(arr.length) - } + getRandomValues: arr => crypto.randomBytes(arr.length), + }, }); diff --git a/packages/datastore-storage-adapter/src/common/CommonSQLiteAdapter.ts b/packages/datastore-storage-adapter/src/common/CommonSQLiteAdapter.ts index 395c34ca2e1..a6ccf3a97c2 100644 --- a/packages/datastore-storage-adapter/src/common/CommonSQLiteAdapter.ts +++ b/packages/datastore-storage-adapter/src/common/CommonSQLiteAdapter.ts @@ -85,8 +85,8 @@ export class CommonSQLiteAdapter implements StorageAdapter { const usesCPKCodegen = Object.values( this.schema.namespaces.user.models ).some(model => - Object.values(model.fields).some(field => - field.association?.hasOwnProperty('targetNames') + Object.values(model.fields).some( + field => field.association?.hasOwnProperty('targetNames') ) ); if (usesCPKCodegen) { diff --git a/packages/datastore/.npmignore b/packages/datastore/.npmignore index 329f5cdc2dd..92866a5d2e7 100644 --- a/packages/datastore/.npmignore +++ b/packages/datastore/.npmignore @@ -6,7 +6,6 @@ node_modules/** .vscode/** .DS_Store *.log -prettier.config.json tsconfig.json tsfmt.json tslint.json diff --git a/packages/datastore/__tests__/AsyncStorage.ts b/packages/datastore/__tests__/AsyncStorage.ts index b73378542f4..3887ff7fe9d 100644 --- a/packages/datastore/__tests__/AsyncStorage.ts +++ b/packages/datastore/__tests__/AsyncStorage.ts @@ -593,7 +593,7 @@ describe('AsyncStorage tests', () => { const oldData: [ string, - string[] + string[], ] = require('./AsyncStorage.migration.data.json'); inmemoryMap.clear(); diff --git a/packages/datastore/__tests__/DataStore.ts b/packages/datastore/__tests__/DataStore.ts index 636972153a3..e90ae98bb9d 100644 --- a/packages/datastore/__tests__/DataStore.ts +++ b/packages/datastore/__tests__/DataStore.ts @@ -4729,9 +4729,8 @@ describe('DataStore tests', () => { describe('Query with generic type', () => { test('all', async () => { - const allPostCustomPKs = await DataStore.query( - PostCustomPK - ); + const allPostCustomPKs = + await DataStore.query(PostCustomPK); expectType(allPostCustomPKs); diff --git a/packages/datastore/__tests__/Predicate.ts b/packages/datastore/__tests__/Predicate.ts index d8167452dba..6c24e9950da 100644 --- a/packages/datastore/__tests__/Predicate.ts +++ b/packages/datastore/__tests__/Predicate.ts @@ -221,9 +221,8 @@ describe('Predicates', () => { test('match on eq', async () => { const query = recursivePredicateFor(AuthorMeta).name.eq('Adam West'); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -238,9 +237,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.eq('Adam West') ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -254,9 +252,8 @@ describe('Predicates', () => { test('match on ne', async () => { const query = recursivePredicateFor(AuthorMeta).name.ne('Adam West'); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -271,9 +268,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.ne('Adam West') ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -287,9 +283,8 @@ describe('Predicates', () => { test('match on gt', async () => { const query = recursivePredicateFor(AuthorMeta).name.gt('Clarice Starling'); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -304,9 +299,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.gt('Clarice Starling') ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -320,9 +314,8 @@ describe('Predicates', () => { test('match on ge', async () => { const query = recursivePredicateFor(AuthorMeta).name.ge('Clarice Starling'); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -337,9 +330,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.ge('Clarice Starling') ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -353,9 +345,8 @@ describe('Predicates', () => { test('match on lt', async () => { const query = recursivePredicateFor(AuthorMeta).name.lt('Clarice Starling'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -370,9 +361,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.lt('Clarice Starling') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -386,9 +376,8 @@ describe('Predicates', () => { test('match on le', async () => { const query = recursivePredicateFor(AuthorMeta).name.le('Clarice Starling'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -403,9 +392,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.le('Clarice Starling') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -419,9 +407,8 @@ describe('Predicates', () => { test('match beginsWith', async () => { const query = recursivePredicateFor(AuthorMeta).name.beginsWith('Debbie'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -436,9 +423,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.beginsWith('Debbie') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -456,9 +442,8 @@ describe('Predicates', () => { '0', '{' ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(m => m.name)).toEqual([ 'Adam West', @@ -475,9 +460,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.between('0', '{') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(0); }); @@ -487,9 +471,8 @@ describe('Predicates', () => { 'Bob Jones', 'Debbie Donut' ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -504,9 +487,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.between('Bob Jones', 'Debbie Donut') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -522,9 +504,8 @@ describe('Predicates', () => { 'Az', 'E' ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -539,9 +520,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.between('Az', 'E') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -557,9 +537,8 @@ describe('Predicates', () => { '{', '}' ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(0); }); @@ -568,9 +547,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.between('{', '}') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(5); }); @@ -578,9 +556,8 @@ describe('Predicates', () => { test('match contains', async () => { const query = recursivePredicateFor(AuthorMeta).name.contains('Jones'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -595,9 +572,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.contains('Jones') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -611,9 +587,8 @@ describe('Predicates', () => { test('match notContains', async () => { const query = recursivePredicateFor(AuthorMeta).name.notContains('Jones'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -628,9 +603,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.notContains('Jones') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -645,9 +619,8 @@ describe('Predicates', () => { describe('on boolean fields', () => { test('match on eq', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.eq(true); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -662,9 +635,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.eq(true) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -677,9 +649,8 @@ describe('Predicates', () => { test('match on ne', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.ne(true); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -694,9 +665,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.ne(true) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -709,9 +679,8 @@ describe('Predicates', () => { test('match on gt true', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.gt(true); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.length).toBe(0); }); @@ -720,18 +689,16 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.gt(true) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.length).toBe(5); }); test('match on gt false', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.gt(false); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -746,9 +713,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.gt(false) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -763,9 +729,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.ge(true) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -778,9 +743,8 @@ describe('Predicates', () => { test('match on ge false', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.ge(false); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.length).toBe(5); }); @@ -789,18 +753,16 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.ge(false) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.length).toBe(0); }); test('match on lt true', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.lt(true); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -815,9 +777,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.lt(true) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -830,9 +791,8 @@ describe('Predicates', () => { test('match on lt false', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.lt(false); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.length).toBe(0); }); @@ -841,18 +801,16 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.lt(false) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.length).toBe(5); }); test('match on le true', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.le(true); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.length).toBe(5); }); @@ -861,18 +819,16 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.le(true) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.length).toBe(0); }); test('match on le false', async () => { const query = recursivePredicateFor(AuthorMeta).isActive.le(false); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -887,9 +843,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.isActive.le(false) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -904,9 +859,8 @@ describe('Predicates', () => { describe('on int fields', () => { test('match on eq', async () => { const query = recursivePredicateFor(AuthorMeta).karma.eq(3); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -921,9 +875,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.karma.eq(3) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -936,9 +889,8 @@ describe('Predicates', () => { test('match on ne', async () => { const query = recursivePredicateFor(AuthorMeta).karma.ne(3); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -953,9 +905,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.karma.ne(3) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -968,9 +919,8 @@ describe('Predicates', () => { test('match on gt', async () => { const query = recursivePredicateFor(AuthorMeta).karma.gt(3); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -985,9 +935,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.karma.gt(3) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1000,9 +949,8 @@ describe('Predicates', () => { test('match on ge', async () => { const query = recursivePredicateFor(AuthorMeta).karma.ge(3); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1017,9 +965,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.karma.ge(3) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1032,9 +979,8 @@ describe('Predicates', () => { test('match on lt', async () => { const query = recursivePredicateFor(AuthorMeta).karma.lt(3); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1049,9 +995,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.karma.lt(3) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1064,9 +1009,8 @@ describe('Predicates', () => { test('match on le', async () => { const query = recursivePredicateFor(AuthorMeta).karma.le(3); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1081,9 +1025,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.karma.le(3) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1096,9 +1039,8 @@ describe('Predicates', () => { test('match on between', async () => { const query = recursivePredicateFor(AuthorMeta).karma.between(1, 3); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1113,9 +1055,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.karma.between(1, 3) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1130,9 +1071,8 @@ describe('Predicates', () => { describe('on float fields', () => { test('match on eq', async () => { const query = recursivePredicateFor(AuthorMeta).rating.eq(0.75); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1147,9 +1087,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.rating.eq(0.75) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1162,9 +1101,8 @@ describe('Predicates', () => { test('match on ne', async () => { const query = recursivePredicateFor(AuthorMeta).rating.ne(0.75); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1179,9 +1117,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.rating.ne(0.75) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1194,9 +1131,8 @@ describe('Predicates', () => { test('match on gt', async () => { const query = recursivePredicateFor(AuthorMeta).rating.gt(0.75); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1211,9 +1147,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.rating.gt(0.75) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1226,9 +1161,8 @@ describe('Predicates', () => { test('match on ge', async () => { const query = recursivePredicateFor(AuthorMeta).rating.ge(0.75); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1243,9 +1177,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.rating.ge(0.75) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1258,9 +1191,8 @@ describe('Predicates', () => { test('match on lt', async () => { const query = recursivePredicateFor(AuthorMeta).rating.lt(0.75); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1275,9 +1207,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.rating.lt(0.75) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1290,9 +1221,8 @@ describe('Predicates', () => { test('match on le', async () => { const query = recursivePredicateFor(AuthorMeta).rating.le(0.75); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1307,9 +1237,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.rating.le(0.75) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1325,9 +1254,8 @@ describe('Predicates', () => { 0.25, 0.75 ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ // 'Adam West', @@ -1342,9 +1270,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.rating.between(0.25, 0.75) ); - const matches = await mechanism.execute< - ModelOf> - >(query); + const matches = + await mechanism.execute>>(query); expect(matches.map(n => n.name)).toEqual([ 'Adam West', @@ -1426,9 +1353,8 @@ describe('Predicates', () => { a.name.contains('Bob'), a.name.contains('Jones'), ]); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches[0].name).toBe('Bob Jones'); @@ -1441,9 +1367,8 @@ describe('Predicates', () => { a.name.contains('Jones'), ]) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(4); expect(matches.map(n => n.name)).not.toContain('Bob Jones'); @@ -1454,9 +1379,8 @@ describe('Predicates', () => { a.name.contains('Adam'), a.name.contains('Donut'), ]); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(0); }); @@ -1468,9 +1392,8 @@ describe('Predicates', () => { a.name.contains('Donut'), ]) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(5); }); @@ -1480,9 +1403,8 @@ describe('Predicates', () => { a.name.contains('Bob'), a.name.contains('Donut'), ]); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(2); expect(matches.map(m => m.name)).toEqual([ @@ -1498,9 +1420,8 @@ describe('Predicates', () => { a.name.contains('Donut'), ]) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(3); expect(matches.map(m => m.name)).not.toContain('Bob Jones'); @@ -1512,9 +1433,8 @@ describe('Predicates', () => { a.name.contains('Bob'), a.name.contains('Jones'), ]); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches[0].name).toEqual('Bob Jones'); @@ -1527,9 +1447,8 @@ describe('Predicates', () => { a.name.contains('Jones'), ]) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(4); expect(matches.map(n => n.name)).not.toContain('Bob Jones'); @@ -1540,9 +1459,8 @@ describe('Predicates', () => { a.name.contains('Bob'), a.name.contains('Thanos'), ]); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches[0].name).toEqual('Bob Jones'); @@ -1553,9 +1471,8 @@ describe('Predicates', () => { a.name.contains('Thanos'), a.name.contains('Thor (God of Thunder, as it just so happens)'), ]); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(0); }); @@ -1571,9 +1488,8 @@ describe('Predicates', () => { a.name.contains('from the Legend of Zelda'), ]), ]); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches.map(m => m.name)).toEqual(['Bob Jones']); @@ -1590,9 +1506,8 @@ describe('Predicates', () => { a.name.contains('from the Legend of Zelda'), ]), ]); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches.map(m => m.name)).toEqual(['Debbie Donut']); @@ -1611,9 +1526,8 @@ describe('Predicates', () => { ]), ]) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(4); expect(matches.map(m => m.name)).not.toContain('Debbie Donut'); @@ -1623,9 +1537,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.eq('Bob Jones') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(4); expect(matches.map(m => m.name)).toEqual([ @@ -1640,9 +1553,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a => a.name.gt('0') ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(0); }); @@ -1655,9 +1567,8 @@ describe('Predicates', () => { a.name.between('C', 'D'), ]) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(2); expect(matches.map(m => m.name)).toEqual([ @@ -1670,9 +1581,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a1 => a1.not(a2 => a2.name.eq('Bob Jones')) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches.map(m => m.name)).toEqual(['Bob Jones']); @@ -1682,9 +1592,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a1 => a1.not(a2 => a2.not(a3 => a3.name.eq('Bob Jones'))) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(4); expect(matches.map(m => m.name)).toEqual([ @@ -1699,9 +1608,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(AuthorMeta).not(a1 => a1.not(a2 => a2.not(a3 => a3.not(a4 => a4.name.eq('Bob Jones')))) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches.map(m => m.name)).toEqual(['Bob Jones']); @@ -1719,9 +1627,8 @@ describe('Predicates', () => { const query = (V1Predicates.ALL as any)( recursivePredicateFor(AuthorMeta) ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(5); expect(matches.map(m => m.name)).toEqual([ @@ -1772,9 +1679,8 @@ describe('Predicates', () => { test('can select non-null values by their defined values', async () => { const query = recursivePredicateFor(PersonMeta).username.eq('defined 01'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches.map(n => n.username)).toEqual(['defined 01']); @@ -1784,9 +1690,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(PersonMeta).username.ne( null as any ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(2); expect(matches.map(n => n.username)).toEqual([ @@ -1798,9 +1703,8 @@ describe('Predicates', () => { test('can select non-null values by searching for != undefined', async () => { const query = recursivePredicateFor(PersonMeta).username.ne(undefined); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(2); expect(matches.map(n => n.username)).toEqual([ @@ -1813,9 +1717,8 @@ describe('Predicates', () => { const query = recursivePredicateFor(PersonMeta).username.eq( null as any ); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(3); expect(matches.map(n => n.username)).toEqual([null, null, null]); @@ -1824,9 +1727,8 @@ describe('Predicates', () => { test('can select null values by searching for == undefined', async () => { const query = recursivePredicateFor(PersonMeta).username.eq(undefined); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(3); expect(matches.map(n => n.username)).toEqual([null, null, null]); @@ -1837,9 +1739,8 @@ describe('Predicates', () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).username.eq('defined 01'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches.map(n => n.username)).toEqual(['defined 01']); }); @@ -1848,9 +1749,8 @@ describe('Predicates', () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).username.ne('defined 01'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(4); expect(matches.map(n => n.username)).toEqual([ null, @@ -1863,9 +1763,8 @@ describe('Predicates', () => { test('gt', async () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).age.gt(1); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(1); expect(matches.map(n => n.username)).toEqual(['defined 02']); }); @@ -1873,9 +1772,8 @@ describe('Predicates', () => { test('ge', async () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).age.ge(1); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(2); expect(matches.map(n => n.username)).toEqual([ 'defined 01', @@ -1886,9 +1784,8 @@ describe('Predicates', () => { test('lt', async () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).age.lt(2); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(4); expect(matches.map(n => n.username)).toEqual([ null, @@ -1901,9 +1798,8 @@ describe('Predicates', () => { test('le', async () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).age.le(2); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(5); expect(matches.map(n => n.username)).toEqual([ null, @@ -1918,9 +1814,8 @@ describe('Predicates', () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).username.contains('defined'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(2); expect(matches.map(n => n.username)).toEqual([ 'defined 01', @@ -1932,9 +1827,8 @@ describe('Predicates', () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).username.notContains('defined'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(3); expect(matches.map(n => n.username)).toEqual([null, null, null]); }); @@ -1943,9 +1837,8 @@ describe('Predicates', () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).username.beginsWith('defined'); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(2); expect(matches.map(n => n.username)).toEqual([ 'defined 01', @@ -1956,9 +1849,8 @@ describe('Predicates', () => { test('between', async () => { expect.assertions(2); const query = recursivePredicateFor(PersonMeta).age.between(1, 2); - const matches = await mechanism.execute>( - query - ); + const matches = + await mechanism.execute>(query); expect(matches.length).toBe(2); expect(matches.map(n => n.username)).toEqual([ 'defined 01', diff --git a/packages/datastore/__tests__/connectivityHandling.test.ts b/packages/datastore/__tests__/connectivityHandling.test.ts index 0a8cd7b7406..de2281b996f 100644 --- a/packages/datastore/__tests__/connectivityHandling.test.ts +++ b/packages/datastore/__tests__/connectivityHandling.test.ts @@ -2187,8 +2187,9 @@ describe('DataStore sync engine', () => { }; await resyncWith([ - syncExpression(LegacyJSONPost, p => - p?.title.eq("whatever, it doesn't matter.") + syncExpression( + LegacyJSONPost, + p => p?.title.eq("whatever, it doesn't matter.") ), ]); diff --git a/packages/datastore/jest.setup.js b/packages/datastore/jest.setup.js index c8e9543debe..a0f3d5370fa 100644 --- a/packages/datastore/jest.setup.js +++ b/packages/datastore/jest.setup.js @@ -2,6 +2,6 @@ const crypto = require('crypto'); Object.defineProperty(globalThis, 'crypto', { value: { - getRandomValues: arr => crypto.randomBytes(arr.length) - } + getRandomValues: arr => crypto.randomBytes(arr.length), + }, }); diff --git a/packages/datastore/src/datastore/datastore.ts b/packages/datastore/src/datastore/datastore.ts index 8ccbac67bad..ebd29d1c73c 100644 --- a/packages/datastore/src/datastore/datastore.ts +++ b/packages/datastore/src/datastore/datastore.ts @@ -835,8 +835,8 @@ const createModelClass = ( const id = isInternalModel ? _id : modelDefinition.syncable - ? amplifyUuid() - : ulid(); + ? amplifyUuid() + : ulid(); ((draft)).id = id; } else if (isIdOptionallyManaged(modelDefinition)) { @@ -1740,7 +1740,7 @@ class DataStore { const initPatchesTuple = initPatches.has(model) ? ([initPatches.get(model)!, {}] as [ Patch[], - Readonly> + Readonly>, ]) : undefined; diff --git a/packages/datastore/src/storage/adapter/AsyncStorageDatabase.ts b/packages/datastore/src/storage/adapter/AsyncStorageDatabase.ts index 2a50e232b83..99fc190c4e1 100644 --- a/packages/datastore/src/storage/adapter/AsyncStorageDatabase.ts +++ b/packages/datastore/src/storage/adapter/AsyncStorageDatabase.ts @@ -170,9 +170,8 @@ class AsyncStorageDatabase { } } - const existingRecordsMap: [string, string][] = await this.storage.multiGet( - allItemsKeys - ); + const existingRecordsMap: [string, string][] = + await this.storage.multiGet(allItemsKeys); const existingRecordsKeys = existingRecordsMap .filter(([, v]) => !!v) .reduce((set, [k]) => set.add(k), new Set()); diff --git a/packages/datastore/src/sync/index.ts b/packages/datastore/src/sync/index.ts index a8274dcbae3..e3b72b8cc1d 100644 --- a/packages/datastore/src/sync/index.ts +++ b/packages/datastore/src/sync/index.ts @@ -598,9 +598,8 @@ export class SyncEngine { * merged individually. Otherwise, we can merge them in batches. */ await this.storage.runExclusive(async storage => { - const idsInOutbox = await this.outbox.getModelIds( - storage - ); + const idsInOutbox = + await this.outbox.getModelIds(storage); const oneByOne: ModelInstanceMetadata[] = []; const page = items.filter(item => { diff --git a/packages/datastore/src/sync/processors/subscription.ts b/packages/datastore/src/sync/processors/subscription.ts index 025d5abf1d4..36ddaeb8513 100644 --- a/packages/datastore/src/sync/processors/subscription.ts +++ b/packages/datastore/src/sync/processors/subscription.ts @@ -247,7 +247,7 @@ class SubscriptionProcessor { start(): [ Observable, - Observable<[TransformerMutationType, SchemaModel, PersistentModel]> + Observable<[TransformerMutationType, SchemaModel, PersistentModel]>, ] { this.runningProcesses = this.runningProcesses || new BackgroundProcessManager(); diff --git a/packages/datastore/src/sync/utils.ts b/packages/datastore/src/sync/utils.ts index 0904151230d..bc1c42f99ea 100644 --- a/packages/datastore/src/sync/utils.ts +++ b/packages/datastore/src/sync/utils.ts @@ -411,7 +411,7 @@ export function buildGraphQLOperation( } export function createMutationInstanceFromModelOperation< - T extends PersistentModel + T extends PersistentModel, >( relationships: RelationshipType, modelDefinition: SchemaModel, diff --git a/packages/datastore/src/types.ts b/packages/datastore/src/types.ts index 9d8ceb1d899..a39c83864de 100644 --- a/packages/datastore/src/types.ts +++ b/packages/datastore/src/types.ts @@ -454,34 +454,34 @@ export type Identifier = export type IdentifierFields< T extends PersistentModel, - M extends PersistentModelMetaData = never + M extends PersistentModelMetaData = never, > = (MetadataOrDefault['identifier'] extends | ManagedIdentifier | OptionallyManagedIdentifier ? MetadataOrDefault['identifier']['field'] : MetadataOrDefault['identifier'] extends CompositeIdentifier< - T, - infer B - > - ? B[number] // B[number] - : MetadataOrDefault['identifier']['field']) & + T, + infer B + > + ? B[number] // B[number] + : MetadataOrDefault['identifier']['field']) & string; export type IdentifierFieldsForInit< T extends PersistentModel, - M extends PersistentModelMetaData + M extends PersistentModelMetaData, > = MetadataOrDefault['identifier'] extends | DefaultPersistentModelMetaData | ManagedIdentifier ? never : MetadataOrDefault['identifier'] extends OptionallyManagedIdentifier< - T, - any - > - ? IdentifierFields - : MetadataOrDefault['identifier'] extends CompositeIdentifier - ? IdentifierFields - : never; + T, + any + > + ? IdentifierFields + : MetadataOrDefault['identifier'] extends CompositeIdentifier + ? IdentifierFields + : never; // Instance of model export declare const __modelMeta__: unique symbol; @@ -500,18 +500,18 @@ export type SettableFieldType = T extends Promise ? InnerPromiseType | null : InnerPromiseType : T extends AsyncCollection - ? InnerCollectionType[] | undefined - : undefined extends T - ? T | null - : T; + ? InnerCollectionType[] | undefined + : undefined extends T + ? T | null + : T; export type PredicateFieldType = NonNullable< Scalar< T extends Promise ? InnerPromiseType : T extends AsyncCollection - ? InnerCollectionType - : T + ? InnerCollectionType + : T > >; @@ -545,7 +545,7 @@ export type DefaultPersistentModelMetaData = { export type MetadataOrDefault< T extends PersistentModel, - _ extends PersistentModelMetaData = never + _ extends PersistentModelMetaData = never, > = T extends { [__modelMeta__]: PersistentModelMetaData; } @@ -556,7 +556,7 @@ export type PersistentModel = Readonly>; export type MetadataReadOnlyFields< T extends PersistentModel, - M extends PersistentModelMetaData + M extends PersistentModelMetaData, > = Extract< MetadataOrDefault['readOnlyFields'] | M['readOnlyFields'], keyof T @@ -569,7 +569,7 @@ export type MetadataReadOnlyFields< // This type makes optional some identifiers in the constructor init object (e.g. OptionallyManagedIdentifier) export type ModelInitBase< T extends PersistentModel, - M extends PersistentModelMetaData = {} + M extends PersistentModelMetaData = {}, > = Omit< T, typeof __modelMeta__ | IdentifierFields | MetadataReadOnlyFields @@ -583,7 +583,7 @@ export type ModelInitBase< export type ModelInit< T extends PersistentModel, - M extends PersistentModelMetaData = {} + M extends PersistentModelMetaData = {}, > = { [P in keyof OmitOptionalRelatives>]: SettableFieldType< ModelInitBase[P] @@ -598,17 +598,17 @@ type DeepWritable = { -readonly [P in keyof T]: T[P] extends TypeName ? T[P] : T[P] extends Promise - ? undefined extends InnerPromiseType - ? InnerPromiseType | null - : InnerPromiseType - : T[P] extends AsyncCollection - ? InnerCollectionType[] | undefined | null - : DeepWritable; + ? undefined extends InnerPromiseType + ? InnerPromiseType | null + : InnerPromiseType + : T[P] extends AsyncCollection + ? InnerCollectionType[] | undefined | null + : DeepWritable; }; export type MutableModel< T extends PersistentModel, - M extends PersistentModelMetaData = {} + M extends PersistentModelMetaData = {}, // This provides Intellisense with ALL of the properties, regardless of read-only // but will throw a linting error if trying to overwrite a read-only property > = DeepWritable< @@ -624,7 +624,7 @@ export type ModelInstanceMetadata = { export type IdentifierFieldValue< T extends PersistentModel, - M extends PersistentModelMetaData + M extends PersistentModelMetaData, > = MetadataOrDefault['identifier'] extends CompositeIdentifier ? MetadataOrDefault['identifier']['fields'] extends [any] ? T[MetadataOrDefault['identifier']['fields'][0]] @@ -633,7 +633,7 @@ export type IdentifierFieldValue< export type IdentifierFieldOrIdentifierObject< T extends PersistentModel, - M extends PersistentModelMetaData + M extends PersistentModelMetaData, > = Pick> | IdentifierFieldValue; export function isIdentifierObject( @@ -678,7 +678,7 @@ export type DataStoreSnapshot = { export type PredicateExpression< M extends PersistentModel, - FT + FT, > = TypeName extends keyof MapTypeToOperands ? ( operator: keyof MapTypeToOperands[TypeName], @@ -726,16 +726,16 @@ type MapTypeToOperands = { type TypeName = T extends string ? 'string' : T extends number - ? 'number' - : T extends boolean - ? 'boolean' - : T extends string[] - ? 'string[]' - : T extends number[] - ? 'number[]' - : T extends boolean[] - ? 'boolean[]' - : never; + ? 'number' + : T extends boolean + ? 'boolean' + : T extends string[] + ? 'string[]' + : T extends number[] + ? 'number[]' + : T extends boolean[] + ? 'boolean[]' + : never; export type PredicateGroups = { and: ( @@ -843,7 +843,7 @@ export type SortPredicate = { export type SortPredicateExpression< M extends PersistentModel, - FT + FT, > = TypeName extends keyof MapTypeToOperands ? (sortDirection: keyof typeof SortDirection) => SortPredicate : never; @@ -1028,7 +1028,7 @@ type ConditionProducer> = ( export async function syncExpression< T extends PersistentModel, - A extends Option + A extends Option, >( modelConstructor: PersistentModelConstructor, conditionProducer: ConditionProducer @@ -1149,7 +1149,7 @@ export type RecursiveModelPredicateExtender = ( ) => PredicateInternalsKey; export type RecursiveModelPredicateAggregateExtender< - RT extends PersistentModel + RT extends PersistentModel, > = (lambda: RecursiveModelPredicate) => PredicateInternalsKey[]; export type RecursiveModelPredicateOperator = ( @@ -1201,7 +1201,7 @@ export type ModelPredicateAggregateExtender = ( export type ValuePredicate< RT extends PersistentModel, - MT extends MatchableTypes + MT extends MatchableTypes, > = { [K in AllFieldOperators]: K extends 'between' ? ( diff --git a/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts b/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts index 49bc2093ee4..c44e391b21a 100644 --- a/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts +++ b/packages/geo/__tests__/Providers/AmazonLocationServiceProvider.test.ts @@ -601,9 +601,8 @@ describe('AmazonLocationServiceProvider', () => { awsConfigGeoV4 ); - const results = await locationProvider.searchByCoordinates( - testCoordinates - ); + const results = + await locationProvider.searchByCoordinates(testCoordinates); expect(results).toEqual(testPlaceCamelCase); const spyon = jest.spyOn(LocationClient.prototype, 'send'); diff --git a/packages/notifications/__tests__/inAppMessaging/utils/processInAppMessages.test.ts b/packages/notifications/__tests__/inAppMessaging/utils/processInAppMessages.test.ts index de8c6112467..ef764ec2d77 100644 --- a/packages/notifications/__tests__/inAppMessaging/utils/processInAppMessages.test.ts +++ b/packages/notifications/__tests__/inAppMessaging/utils/processInAppMessages.test.ts @@ -3,7 +3,7 @@ import { pinpointInAppMessage, - simpleInAppMessagingEvent + simpleInAppMessagingEvent, } from '../../testUtils/data'; import { incrementMessageCounts, diff --git a/packages/notifications/src/inAppMessaging/providers/pinpoint/utils/helpers.ts b/packages/notifications/src/inAppMessaging/providers/pinpoint/utils/helpers.ts index 8b596b43a1d..be0a1bb5b24 100644 --- a/packages/notifications/src/inAppMessaging/providers/pinpoint/utils/helpers.ts +++ b/packages/notifications/src/inAppMessaging/providers/pinpoint/utils/helpers.ts @@ -98,8 +98,8 @@ export const matchesAttributes = ( if (!eventAttributesMemo.hasOwnProperty(memoKey)) { eventAttributesMemo[memoKey] = !Attributes || - Object.entries(Attributes).every(([key, { Values }]) => - Values?.includes(attributes[key]) + Object.entries(Attributes).every( + ([key, { Values }]) => Values?.includes(attributes[key]) ); } return eventAttributesMemo[memoKey]; diff --git a/packages/notifications/src/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.ts b/packages/notifications/src/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.ts index 960ae44828c..fe22b139b87 100644 --- a/packages/notifications/src/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.ts +++ b/packages/notifications/src/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.ts @@ -76,9 +76,8 @@ export function sessionStateChangeHandler(state: SessionState): void { } export async function incrementMessageCounts(messageId: string): Promise { - const { sessionCount, dailyCount, totalCount } = await getMessageCounts( - messageId - ); + const { sessionCount, dailyCount, totalCount } = + await getMessageCounts(messageId); setSessionCount(messageId, sessionCount + 1); setDailyCount(dailyCount + 1); await setTotalCount(messageId, totalCount + 1); @@ -106,9 +105,8 @@ async function isBelowCap({ DailyCap, TotalCap, }: PinpointInAppMessage): Promise { - const { sessionCount, dailyCount, totalCount } = await getMessageCounts( - CampaignId - ); + const { sessionCount, dailyCount, totalCount } = + await getMessageCounts(CampaignId); return ( (!SessionCap || sessionCount < SessionCap) && diff --git a/packages/notifications/src/inAppMessaging/types/inputs.ts b/packages/notifications/src/inAppMessaging/types/inputs.ts index ee0666eff16..75e653cdb9f 100644 --- a/packages/notifications/src/inAppMessaging/types/inputs.ts +++ b/packages/notifications/src/inAppMessaging/types/inputs.ts @@ -8,7 +8,8 @@ import { InAppMessagingServiceOptions } from '.'; * Input type for `identifyUser`. */ export type InAppMessagingIdentifyUserInput< - ServiceOptions extends InAppMessagingServiceOptions = InAppMessagingServiceOptions + ServiceOptions extends + InAppMessagingServiceOptions = InAppMessagingServiceOptions, > = { /** * A User ID associated to the current device. diff --git a/packages/notifications/src/pushNotifications/types/inputs.ts b/packages/notifications/src/pushNotifications/types/inputs.ts index 0c0c0d8019c..994c345e658 100644 --- a/packages/notifications/src/pushNotifications/types/inputs.ts +++ b/packages/notifications/src/pushNotifications/types/inputs.ts @@ -10,7 +10,8 @@ import { } from './pushNotifications'; export type PushNotificationIdentifyUserInput< - ServiceOptions extends PushNotificationServiceOptions = PushNotificationServiceOptions + ServiceOptions extends + PushNotificationServiceOptions = PushNotificationServiceOptions, > = { /** * A User ID associated to the current device. diff --git a/packages/predictions/src/providers/AmazonAIIdentifyPredictionsProvider.ts b/packages/predictions/src/providers/AmazonAIIdentifyPredictionsProvider.ts index 006f68a1d7a..5c749eb465d 100644 --- a/packages/predictions/src/providers/AmazonAIIdentifyPredictionsProvider.ts +++ b/packages/predictions/src/providers/AmazonAIIdentifyPredictionsProvider.ts @@ -203,9 +203,8 @@ export class AmazonAIIdentifyPredictionsProvider { }; const detectTextCommand = new DetectTextCommand(rekognitionParam); - const rekognitionData = await this.rekognitionClient.send( - detectTextCommand - ); + const rekognitionData = + await this.rekognitionClient.send(detectTextCommand); const rekognitionResponse = categorizeRekognitionBlocks( rekognitionData.TextDetections as TextDetectionList @@ -400,7 +399,7 @@ export class AmazonAIIdentifyPredictionsProvider { ...makeCamelCase(celebrity, ['Id', 'Name', 'Urls']), pose: makeCamelCase(celebrity.Face?.Pose), }, - } as IdentifyEntity) + }) as IdentifyEntity ) ?? []; return { entities: faces }; } else if ( diff --git a/packages/pubsub/src/vendor/paho-mqtt.js b/packages/pubsub/src/vendor/paho-mqtt.js index dd467e5f623..d5899c55c01 100644 --- a/packages/pubsub/src/vendor/paho-mqtt.js +++ b/packages/pubsub/src/vendor/paho-mqtt.js @@ -2819,10 +2819,10 @@ function onMessageArrived(message) { typeof global !== 'undefined' ? global : typeof self !== 'undefined' - ? self - : typeof window !== 'undefined' - ? window - : {} + ? self + : typeof window !== 'undefined' + ? window + : {} ); return PahoMQTT; }); diff --git a/packages/storage/__tests__/providers/s3/utils/client/testUtils/types.ts b/packages/storage/__tests__/providers/s3/utils/client/testUtils/types.ts index 88e89ec4071..237508ee9af 100644 --- a/packages/storage/__tests__/providers/s3/utils/client/testUtils/types.ts +++ b/packages/storage/__tests__/providers/s3/utils/client/testUtils/types.ts @@ -20,7 +20,7 @@ type ApiFunctionalTestHappyCase any> = [ Parameters[1], // input HttpRequest, // expected request MockFetchResponse, // response - Awaited> // expected output + Awaited>, // expected output ]; type ApiFunctionalTestErrorCase any> = [ @@ -31,7 +31,7 @@ type ApiFunctionalTestErrorCase any> = [ Parameters[1], // input HttpRequest, // expected request MockFetchResponse, // response - {} // error + {}, // error ]; /** diff --git a/packages/storage/src/providers/s3/utils/client/utils/parsePayload.ts b/packages/storage/src/providers/s3/utils/client/utils/parsePayload.ts index 4dd5e2f8178..7ac7029a8d1 100644 --- a/packages/storage/src/providers/s3/utils/client/utils/parsePayload.ts +++ b/packages/storage/src/providers/s3/utils/client/utils/parsePayload.ts @@ -18,8 +18,8 @@ export const parseXmlError: ErrorParser = async (response?: HttpResponse) => { const code = body?.['Code'] ? (body.Code as string) : statusCode === 404 - ? 'NotFound' - : statusCode.toString(); + ? 'NotFound' + : statusCode.toString(); const message = body?.['message'] ?? body?.['Message'] ?? code; const error = new Error(message); return Object.assign(error, { diff --git a/packages/storage/src/types/inputs.ts b/packages/storage/src/types/inputs.ts index a8602bf5bfd..0a8e709137d 100644 --- a/packages/storage/src/types/inputs.ts +++ b/packages/storage/src/types/inputs.ts @@ -21,7 +21,7 @@ export type StorageRemoveInput = { }; export type StorageListInput< - Options extends StorageListAllOptions | StorageListPaginateOptions + Options extends StorageListAllOptions | StorageListPaginateOptions, > = { prefix?: string; options?: Options; @@ -40,7 +40,7 @@ export type StorageUploadDataInput = export type StorageCopyInput< SourceOptions extends StorageOptions, - DestinationOptions extends StorageOptions + DestinationOptions extends StorageOptions, > = { source: SourceOptions; destination: DestinationOptions; diff --git a/.prettierrc.js b/prettier.config.js similarity index 71% rename from .prettierrc.js rename to prettier.config.js index 1ddacd85aeb..e2b1a6a467c 100644 --- a/.prettierrc.js +++ b/prettier.config.js @@ -1,3 +1,4 @@ +/** @type {import('prettier').Config} */ module.exports = { trailingComma: 'es5', singleQuote: true, diff --git a/yarn.lock b/yarn.lock index 839e61fde97..8d964a720a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12959,10 +12959,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier@^2.4.1: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e" + integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw== pretty-format@29.4.3: version "29.4.3"