Merge branch 'main' into test/signout

.github/workflows/pr.yml

@@ -45,9 +45,29 @@ jobs:
       - github-actions-test
       - tsc-compliance-test
     runs-on: ubuntu-latest
-    # This is a bit of a hack - Branch protections depend upon selected
-    #   workflows that run on hardware, not parents of many callable workflows.
-    #   Adding this so that unit and bundle checks can be a single protection line.
+    if: success() # only run when all checks have passed
+    # store success output flag for ci job
+    outputs:
+      success: ${{ steps.setoutput.outputs.success }}
     steps:
-      - name: All tests passed
-        run: echo "All tests passed"
+      - id: setoutput
+        run: echo "::set-output name=success::true"
+  ci:
+    runs-on: ubuntu-latest
+    if: always() # always run, so we never skip the check
+    name: ci - Unit and Bundle tests have passed
+    needs: all-unit-tests-pass
+    env:
+      PASSED: ${{ needs.all-unit-tests-pass.outputs.success }}
+    steps:
+      # this job passes only when output of all-unit-tests-pass job is set
+      # in case at least one of the checks fails, all-unit-tests-pass is skipped
+      # and the output will not be set, which will then cause the ci job to fail
+      - run: |
+          if [[ $PASSED == "true" ]]; then
+          echo "All checks have passed"
+          exit 0
+          else
+          echo "One or more checks have failed"
+          exit 1
+          fi

.vscode/launch.json

@@ -15,7 +15,7 @@
 				"--inspect-brk",
 				"${workspaceRoot}/node_modules/.bin/jest",
 				// Optionally specify a single test file to run/debug:
-				"generateClient.test.ts",
+				"GraphQLAPI.test.ts",
 				"--runInBand",
 				"--testTimeout",
 				"600000", // 10 min timeout so jest doesn't error while we're stepping through code

packages/adapter-nextjs/__tests__/createServerRunner.test.ts

@@ -28,7 +28,7 @@ jest.mock(
 );
 
 describe('createServerRunner', () => {
-	let createServerRunner;
+	let createServerRunner: any;
 
 	const mockParseAWSExports = jest.fn();
 	const mockCreateAWSCredentialsAndIdentityIdProvider = jest.fn();

packages/adapter-nextjs/package.json

@@ -20,7 +20,7 @@
 		"jest-fetch-mock": "3.0.3",
 		"next": ">= 13.5.0 < 15.0.0",
 		"rollup": "3.29.4",
-		"typescript": "5.1.6"
+		"typescript": "5.0.2"
 	},
 	"publishConfig": {
 		"access": "public"

packages/adapter-nextjs/tsconfig.json

@@ -3,7 +3,7 @@
 	"compilerOptions": {
 		"allowSyntheticDefaultImports": true,
 		"target": "es2020",
-		"noImplicitAny": false,
+		"noImplicitAny": true,
 		"lib": ["dom", "es2019", "esnext.asynciterable"],
 		"module": "commonjs",
 		"moduleResolution": "node",

packages/api-graphql/__tests__/APIClient.test.ts

@@ -1,3 +1,7 @@
+import {
+	SchemaModel,
+	ModelIntrospectionSchema,
+} from '@aws-amplify/core/internals/utils';
 import {
 	normalizeMutationInput,
 	flattenItems,
@@ -6,8 +10,8 @@ import {
 } from '../src/internals/APIClient';
 
 import config from './fixtures/modeled/amplifyconfiguration';
-const modelIntroSchema = config.modelIntrospection;
-//
+const modelIntroSchema = config.modelIntrospection as ModelIntrospectionSchema;
+
 describe('APIClient', () => {
 	describe('normalizeMutationInput', () => {
 		// TODO: test all relationship combinations
@@ -29,7 +33,7 @@ describe('APIClient', () => {
 				todoNotesId: todo.id,
 			};
 
-			const noteModelDef = modelIntroSchema.models.Note;
+			const noteModelDef = modelIntroSchema.models.Note as SchemaModel;
 
 			const normalized = normalizeMutationInput(
 				note,

packages/api-graphql/__tests__/GraphQLAPI.test.ts

@@ -486,7 +486,7 @@ describe('API test', () => {
 				url: new URL('https://localhost/graphql'),
 				options: expect.objectContaining({
 					headers: expect.objectContaining({ 'X-Api-Key': 'FAKE-KEY' }),
-					signingServiceInfo: null,
+					signingServiceInfo: undefined,
 				}),
 			});
 		});
@@ -1066,7 +1066,7 @@ describe('API test', () => {
 						someHeaderSetAtConfigThatWillBeOverridden: 'expectedValue',
 						someOtherHeaderSetAtConfig: 'expectedValue',
 					}),
-					signingServiceInfo: null,
+					signingServiceInfo: undefined,
 				}),
 			});
 		});
@@ -1146,7 +1146,7 @@ describe('API test', () => {
 				url: new URL('https://localhost/graphql'),
 				options: expect.objectContaining({
 					headers: expect.objectContaining({ 'X-Api-Key': 'FAKE-KEY' }),
-					signingServiceInfo: null,
+					signingServiceInfo: undefined,
 					withCredentials: true,
 				}),
 			});

packages/api-graphql/__tests__/fixtures/modeled/schema.ts

@@ -1,4 +1,4 @@
-import { type ClientSchema, a } from '@aws-amplify/amplify-api-next-alpha';
+import { type ClientSchema, a } from '@aws-amplify/data-schema';
 
 const schema = a.schema({
 	Todo: a

packages/api-graphql/__tests__/resolveOwnerFields.test.ts

@@ -1,3 +1,7 @@
+import {
+	ModelIntrospectionSchema,
+	SchemaModel,
+} from '@aws-amplify/core/dist/esm/singleton/API/types';
 import { resolveOwnerFields } from '../src/utils/resolveOwnerFields';
 import configFixture from './fixtures/modeled/amplifyconfiguration';
 
@@ -14,7 +18,10 @@ describe('owner field resolution', () => {
 
 	for (const [modelName, expected] of Object.entries(expectedResolutions)) {
 		it(`identifes ${JSON.stringify(expected)} for ${modelName}`, () => {
-			const model = configFixture.modelIntrospection.models[modelName];
+			const modelIntroSchema =
+				configFixture.modelIntrospection as ModelIntrospectionSchema;
+			const model: SchemaModel = modelIntroSchema.models[modelName];
+
 			const resolvedField = resolveOwnerFields(model);
 			expect(resolvedField).toEqual(expected);
 		});

packages/api-graphql/__tests__/server/generateClient.test.ts

@@ -47,7 +47,7 @@ function mockApiResponse(value: any) {
 describe('server generateClient', () => {
 	describe('with cookies', () => {
 		test('subscriptions are disabled', () => {
-			const getAmplify = async fn => await fn(Amplify);
+			const getAmplify = async (fn: any) => await fn(Amplify);
 
 			const client = generateClient<Schema, V6ClientSSRCookies<Schema>>({
 				amplify: getAmplify,
@@ -79,7 +79,7 @@ describe('server generateClient', () => {
 				},
 			});
 
-			const getAmplify = async fn => await fn(Amplify);
+			const getAmplify = async (fn: any) => await fn(Amplify);
 
 			const client = generateClient<Schema, V6ClientSSRCookies<Schema>>({
 				amplify: getAmplify,
@@ -154,7 +154,7 @@ describe('server generateClient', () => {
 				},
 			});
 
-			const getAmplify = async fn => await fn(Amplify);
+			const getAmplify = async (fn: any) => await fn(Amplify);
 
 			const client = generateClient<Schema, V6ClientSSRCookies<Schema>>({
 				amplify: getAmplify,
@@ -220,7 +220,7 @@ describe('server generateClient', () => {
 				},
 			});
 
-			const getAmplify = async fn => await fn(Amplify);
+			const getAmplify = async (fn: any) => await fn(Amplify);
 
 			const client = generateClient<Schema, V6ClientSSRCookies<Schema>>({
 				amplify: getAmplify,

packages/api-graphql/package.json

@@ -67,9 +67,10 @@
 	},
 	"homepage": "https://aws-amplify.github.io/",
 	"devDependencies": {
-		"typescript": "5.1.6",
+		"typescript": "5.0.2",
 		"@rollup/plugin-typescript": "11.1.5",
-		"rollup": "3.29.4"
+		"rollup": "3.29.4",
+		"@aws-amplify/data-schema": "^0.11.0"
 	},
 	"files": [
 		"dist/cjs",
@@ -98,16 +99,11 @@
 	"jest": {
 		"globals": {
 			"ts-jest": {
-				"diagnostics": {
-					"pathRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$"
-				},
+				"diagnostics": false,
 				"tsConfig": {
 					"lib": [
-						"es5",
-						"es2015",
 						"dom",
-						"esnext.asynciterable",
-						"es2017.object"
+						"es2020"
 					],
 					"allowJs": true,
 					"noEmitOnError": false,

packages/api-graphql/src/GraphQLAPI.ts

@@ -7,7 +7,7 @@ import { InternalGraphQLAPIClass } from './internals/InternalGraphQLAPI';
 import { Observable } from 'rxjs';
 
 export const graphqlOperation = (
-	query,
+	query: any,
 	variables = {},
 	authToken?: string
 ) => ({
@@ -61,4 +61,4 @@ export class GraphQLAPIClass extends InternalGraphQLAPIClass {
 	}
 }
 
-export const GraphQLAPI = new GraphQLAPIClass(null);
+export const GraphQLAPI = new GraphQLAPIClass();

packages/api-graphql/src/Providers/AWSAppSyncRealTimeProvider/index.ts

@@ -2,7 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Observable, SubscriptionLike } from 'rxjs';
 import { GraphQLError } from 'graphql';
-import { Hub, fetchAuthSession, ConsoleLogger } from '@aws-amplify/core';
+import {
+	Hub,
+	fetchAuthSession,
+	ConsoleLogger,
+	HubPayload,
+} from '@aws-amplify/core';
 import { signRequest } from '@aws-amplify/core/internals/aws-client-utils';
 import {
 	base64Encoder,
@@ -48,7 +53,7 @@ import {
 
 const logger = new ConsoleLogger('AWSAppSyncRealTimeProvider');
 
-const dispatchApiEvent = payload => {
+const dispatchApiEvent = (payload: HubPayload) => {
 	Hub.dispatch('api', payload, 'PubSub', AMPLIFY_SYMBOL);
 };
 
@@ -111,7 +116,7 @@ export class AWSAppSyncRealTimeProvider {
 	private keepAliveAlertTimeoutId?: ReturnType<typeof setTimeout>;
 	private subscriptionObserverMap: Map<string, ObserverQuery> = new Map();
 	private promiseArray: Array<{ res: Function; rej: Function }> = [];
-	private connectionState: ConnectionState;
+	private connectionState: ConnectionState | undefined;
 	private readonly connectionStateMonitor = new ConnectionStateMonitor();
 	private readonly reconnectionMonitor = new ReconnectionMonitor();
 	private connectionStateMonitorSubscription: SubscriptionLike;
@@ -362,7 +367,7 @@ export class AWSAppSyncRealTimeProvider {
 				region,
 				additionalHeaders,
 			});
-		} catch (err) {
+		} catch (err: any) {
 			this._logStartSubscriptionError(subscriptionId, observer, err);
 			return;
 		}