@aws-amplify/core 5.8.2 → 6.0.1-console-preview.7919075.0

package/src/JS.ts

@@ -47,7 +47,11 @@ const MIME_MAP = [
 
 export const isEmpty = (obj = {}) => Object.keys(obj).length === 0;
 
-export const sortByField = (list, field, dir) => {
+export const sortByField = (
+	list: any[],
+	field: string | number,
+	dir: string
+) => {
 	if (!list || !list.sort) {
 		return false;
 	}
@@ -78,7 +82,10 @@ export const sortByField = (list, field, dir) => {
 	return true;
 };
 
-export const objectLessAttributes = (obj, less) => {
+export const objectLessAttributes = (
+	obj: Record<string, any>,
+	less: string | string[]
+) => {
 	const ret = Object.assign({}, obj);
 	if (less) {
 		if (typeof less === 'string') {
@@ -94,7 +101,7 @@ export const objectLessAttributes = (obj, less) => {
 };
 
 export const filenameToContentType = (
-	filename,
+	filename: string,
 	defVal = 'application/octet-stream'
 ) => {
 	const name = filename.toLowerCase();
@@ -103,7 +110,7 @@ export const filenameToContentType = (
 	return filtered.length > 0 ? filtered[0].type : defVal;
 };
 
-export const isTextFile = contentType => {
+export const isTextFile = (contentType: string) => {
 	const type = contentType.toLowerCase();
 	if (type.startsWith('text/')) {
 		return true;
@@ -125,7 +132,7 @@ export const generateRandomString = () => {
 	return result;
 };
 
-export const makeQuerablePromise = promise => {
+export const makeQuerablePromise = (promise: any) => {
 	if (promise.isResolved) return promise;
 
 	let isPending = true;
@@ -133,12 +140,12 @@ export const makeQuerablePromise = promise => {
 	let isFullfilled = false;
 
 	const result = promise.then(
-		data => {
+		(data: unknown) => {
 			isFullfilled = true;
 			isPending = false;
 			return data;
 		},
-		e => {
+		(e: unknown) => {
 			isRejected = true;
 			isPending = false;
 			throw e;
@@ -156,7 +163,7 @@ export const isWebWorker = () => {
 	if (typeof self === 'undefined') {
 		return false;
 	}
-	const selfContext = self as { WorkerGlobalScope? };
+	const selfContext = self as { WorkerGlobalScope?: any };
 	return (
 		typeof selfContext.WorkerGlobalScope !== 'undefined' &&
 		self instanceof selfContext.WorkerGlobalScope
@@ -184,12 +191,12 @@ export const browserOrNode = () => {
  * @param {Array} whiteListForChildren - whitelist its children keys from being transferred
  */
 export const transferKeyToLowerCase = (
-	obj,
-	whiteListForItself = [],
-	whiteListForChildren = []
+	obj: Record<string, any>,
+	whiteListForItself: string[] = [],
+	whiteListForChildren: string[] = []
 ) => {
 	if (!isStrictObject(obj)) return obj;
-	const ret = {};
+	const ret: Record<string, any> = {};
 
 	for (const key in obj) {
 		if (obj.hasOwnProperty(key)) {
@@ -217,12 +224,12 @@ export const transferKeyToLowerCase = (
  * @param {Array} whiteListForChildren - whitelist its children keys from being transferred
  */
 export const transferKeyToUpperCase = (
-	obj,
-	whiteListForItself = [],
-	whiteListForChildren = []
+	obj: Record<string, any>,
+	whiteListForItself: string[] = [],
+	whiteListForChildren: string[] = []
 ) => {
 	if (!isStrictObject(obj)) return obj;
-	const ret = {};
+	const ret: Record<string, any> = {};
 
 	for (const key in obj) {
 		if (obj.hasOwnProperty(key)) {
@@ -247,7 +254,7 @@ export const transferKeyToUpperCase = (
  * which means it's not Array, Function, Number, String, Boolean or Null
  * @param obj the Object
  */
-export const isStrictObject = obj => {
+export const isStrictObject = (obj: any) => {
 	return (
 		obj instanceof Object &&
 		!(obj instanceof Array) &&

package/src/Logger/ConsoleLogger.ts

@@ -6,7 +6,7 @@ import { LoggingProvider } from '../types';
 import { AWS_CLOUDWATCH_CATEGORY } from '../Util/Constants';
 import { Logger } from './logger-interface';
 
-const LOG_LEVELS = {
+const LOG_LEVELS: Record<string, number> = {
 	VERBOSE: 1,
 	DEBUG: 2,
 	INFO: 3,
@@ -30,7 +30,7 @@ export class ConsoleLogger implements Logger {
 	name: string;
 	level: LOG_TYPE | string;
 	private _pluggables: LoggingProvider[];
-	private _config: object;
+	private _config?: object;
 
 	/**
 	 * @constructor
@@ -44,7 +44,7 @@ export class ConsoleLogger implements Logger {
 
 	static LOG_LEVEL = null;
 
-	_padding(n) {
+	_padding(n: number) {
 		return n < 10 ? '0' + n : '' + n;
 	}
 
@@ -74,7 +74,7 @@ export class ConsoleLogger implements Logger {
 	 * @param {LOG_TYPE|string} type - log type, default INFO
 	 * @param {string|object} msg - Logging message or object
 	 */
-	_log(type: LOG_TYPE | string, ...msg) {
+	_log(type: LOG_TYPE | string, ...msg: any) {
 		let logger_level_name = this.level;
 		if (ConsoleLogger.LOG_LEVEL) {
 			logger_level_name = ConsoleLogger.LOG_LEVEL;
@@ -130,7 +130,7 @@ export class ConsoleLogger implements Logger {
 	 * @memeberof Logger
 	 * @param {string|object} msg - Logging message or object
 	 */
-	log(...msg) {
+	log(...msg: any) {
 		this._log(LOG_TYPE.INFO, ...msg);
 	}
 
@@ -140,7 +140,7 @@ export class ConsoleLogger implements Logger {
 	 * @memeberof Logger
 	 * @param {string|object} msg - Logging message or object
 	 */
-	info(...msg) {
+	info(...msg: any) {
 		this._log(LOG_TYPE.INFO, ...msg);
 	}
 
@@ -150,7 +150,7 @@ export class ConsoleLogger implements Logger {
 	 * @memeberof Logger
 	 * @param {string|object} msg - Logging message or object
 	 */
-	warn(...msg) {
+	warn(...msg: any) {
 		this._log(LOG_TYPE.WARN, ...msg);
 	}
 
@@ -160,7 +160,7 @@ export class ConsoleLogger implements Logger {
 	 * @memeberof Logger
 	 * @param {string|object} msg - Logging message or object
 	 */
-	error(...msg) {
+	error(...msg: any) {
 		this._log(LOG_TYPE.ERROR, ...msg);
 	}
 
@@ -170,7 +170,7 @@ export class ConsoleLogger implements Logger {
 	 * @memeberof Logger
 	 * @param {string|object} msg - Logging message or object
 	 */
-	debug(...msg) {
+	debug(...msg: any) {
 		this._log(LOG_TYPE.DEBUG, ...msg);
 	}
 
@@ -180,7 +180,7 @@ export class ConsoleLogger implements Logger {
 	 * @memeberof Logger
 	 * @param {string|object} msg - Logging message or object
 	 */
-	verbose(...msg) {
+	verbose(...msg: any) {
 		this._log(LOG_TYPE.VERBOSE, ...msg);
 	}
 

package/src/OAuthHelper/FacebookOAuth.ts

@@ -42,7 +42,7 @@ export class FacebookOAuth {
 	}
 
 	private _refreshFacebookTokenImpl() {
-		let fb = null;
+		let fb: any = null;
 		if (browserOrNode().isBrowser) fb = window['FB'];
 		if (!fb) {
 			const errorMessage = 'no fb sdk available';
@@ -52,7 +52,7 @@ export class FacebookOAuth {
 
 		return new Promise((res, rej) => {
 			fb.getLoginStatus(
-				fbResponse => {
+				(fbResponse: any) => {
 					if (!fbResponse || !fbResponse.authResponse) {
 						const errorMessage =
 							'no response from facebook when refreshing the jwt token';

package/src/OAuthHelper/GoogleOAuth.ts

@@ -43,7 +43,7 @@ export class GoogleOAuth {
 	}
 
 	private _refreshGoogleTokenImpl() {
-		let ga = null;
+		let ga: any = null;
 		if (browserOrNode().isBrowser)
 			ga = window['gapi'] && window['gapi'].auth2 ? window['gapi'].auth2 : null;
 		if (!ga) {
@@ -53,7 +53,7 @@ export class GoogleOAuth {
 
 		return new Promise((res, rej) => {
 			ga.getAuthInstance()
-				.then(googleAuth => {
+				.then((googleAuth: any) => {
 					if (!googleAuth) {
 						logger.debug('google Auth undefined');
 						rej(new NonRetryableError('google Auth undefined'));
@@ -65,12 +65,15 @@ export class GoogleOAuth {
 						logger.debug('refreshing the google access token');
 						googleUser
 							.reloadAuthResponse()
-							.then(authResponse => {
+							.then((authResponse: any) => {
 								const { id_token, expires_at } = authResponse;
 								res({ token: id_token, expires_at });
 							})
-							.catch(err => {
-								if (err && err.error === 'network_error') {
+							.catch((err: unknown) => {
+								if (
+									err &&
+									(err as { error: string }).error === 'network_error'
+								) {
 									// Not using NonRetryableError so handler will be retried
 									rej('Network error reloading google auth response');
 								} else {
@@ -85,7 +88,7 @@ export class GoogleOAuth {
 						rej(new NonRetryableError('User is not signed in with Google'));
 					}
 				})
-				.catch(err => {
+				.catch((err: unknown) => {
 					logger.debug('Failed to refresh google token', err);
 					rej(new NonRetryableError('Failed to refresh google token'));
 				});

package/src/Platform/detectFramework.ts

@@ -25,7 +25,7 @@ export const detectFramework = (): Framework => {
 			// So we don't need to notify the observers again so the observer
 			// can be removed after the final notice.
 			while (frameworkChangeObservers.length) {
-				frameworkChangeObservers.pop()();
+				frameworkChangeObservers.pop()?.();
 			}
 		} else {
 			// The first run of detectFramework:

package/src/Platform/detection/React.ts

@@ -1,15 +1,15 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { documentExists, processExists, windowExists } from './helpers';
+import { documentExists, processExists } from './helpers';
 
 // Tested with react 18.2 - built using Vite
 
 export function reactWebDetect() {
-	const elementKeyPrefixedWithReact = key => {
+	const elementKeyPrefixedWithReact = (key: string) => {
 		return key.startsWith('_react') || key.startsWith('__react');
 	};
-	const elementIsReactEnabled = element => {
+	const elementIsReactEnabled = (element: Element) => {
 		return Object.keys(element).find(elementKeyPrefixedWithReact);
 	};
 	const allElementsWithId = () => Array.from(document.querySelectorAll('[id]'));
@@ -24,3 +24,5 @@ export function reactSSRDetect() {
 		!!Object.keys(process.env).find(key => key.includes('react'))
 	);
 }
+
+// use the some

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '5.3.8';
+export const version = '6.0.1-console-preview.7919075.0+7919075';

package/src/Providers/AWSCloudWatchProvider.ts

@@ -30,7 +30,7 @@ import {
 	CloudWatchDataTracker,
 	LoggingProvider,
 } from '../types/types';
-import { Credentials } from '../..';
+import { Credentials } from '../Credentials';
 import { ConsoleLogger as Logger } from '../Logger';
 import { getAmplifyUserAgentObject } from '../Platform';
 import { parseAWSExports } from '../parseAWSExports';
@@ -43,6 +43,8 @@ import {
 	NO_CREDS_ERROR_STRING,
 	RETRY_ERROR_CODES,
 } from '../Util/Constants';
+import { asserts } from '../Util/errors/AssertError';
+import { AWS_CLOUD_WATCH_PROVIDER_OPTIONS_EXCEPTION } from '../constants';
 
 const logger = new Logger('AWSCloudWatch');
 
@@ -50,10 +52,10 @@ class AWSCloudWatchProvider implements LoggingProvider {
 	static readonly PROVIDER_NAME = AWS_CLOUDWATCH_PROVIDER_NAME;
 	static readonly CATEGORY = AWS_CLOUDWATCH_CATEGORY;
 
-	private _config: AWSCloudWatchProviderOptions;
+	private _config?: AWSCloudWatchProviderOptions;
 	private _dataTracker: CloudWatchDataTracker;
 	private _currentLogBatch: InputLogEvent[];
-	private _timer;
+	private _timer?: NodeJS.Timer;
 	private _nextSequenceToken: string | undefined;
 
 	constructor(config?: AWSCloudWatchProviderOptions) {
@@ -213,7 +215,7 @@ class AWSCloudWatchProvider implements LoggingProvider {
 
 	private async _validateLogGroupExistsAndCreate(
 		logGroupName: string
-	): Promise<LogGroup> {
+	): Promise<LogGroup | null> {
 		if (this._dataTracker.verifiedLogGroup) {
 			return this._dataTracker.verifiedLogGroup;
 		}
@@ -256,7 +258,7 @@ class AWSCloudWatchProvider implements LoggingProvider {
 	private async _validateLogStreamExists(
 		logGroupName: string,
 		logStreamName: string
-	): Promise<LogStream> {
+	): Promise<LogStream | null> {
 		try {
 			const credentialsOK = await this._ensureCredentials();
 			if (!credentialsOK) {
@@ -298,7 +300,7 @@ class AWSCloudWatchProvider implements LoggingProvider {
 
 	private async _sendLogEvents(
 		params: PutLogEventsCommandInput
-	): Promise<PutLogEventsCommandOutput> {
+	): Promise<PutLogEventsCommandOutput | undefined> {
 		try {
 			const credentialsOK = await this._ensureCredentials();
 			if (!credentialsOK) {
@@ -318,6 +320,7 @@ class AWSCloudWatchProvider implements LoggingProvider {
 	}
 
 	private _initCloudWatchLogs() {
+		assertsAWSClouldWatchOptions(this._config);
 		return new CloudWatchLogsClient({
 			region: this._config.region,
 			credentials: this._config.credentials,
@@ -328,7 +331,8 @@ class AWSCloudWatchProvider implements LoggingProvider {
 
 	private async _ensureCredentials() {
 		return await Credentials.get()
-			.then(credentials => {
+			.then((credentials: any) => {
+				assertsAWSClouldWatchOptions(this._config);
 				if (!credentials) return false;
 				const cred = Credentials.shear(credentials);
 				logger.debug('set credentials for logging', cred);
@@ -336,13 +340,14 @@ class AWSCloudWatchProvider implements LoggingProvider {
 
 				return true;
 			})
-			.catch(error => {
+			.catch((error: unknown) => {
 				logger.warn('ensure credentials error', error);
 				return false;
 			});
 	}
 
-	private async _getNextSequenceToken(): Promise<string> {
+	private async _getNextSequenceToken(): Promise<string | undefined> {
+		assertsAWSClouldWatchOptions(this._config);
 		if (this._nextSequenceToken && this._nextSequenceToken.length > 0) {
 			return this._nextSequenceToken;
 		}
@@ -354,6 +359,14 @@ class AWSCloudWatchProvider implements LoggingProvider {
 		 *   ...the log stream does exist but has no logs written to it yet
 		 */
 		try {
+			asserts(this._config.logGroupName !== undefined, {
+				name: AWS_CLOUD_WATCH_PROVIDER_OPTIONS_EXCEPTION,
+				message: ' log group name is undefined',
+			});
+			asserts(this._config.logStreamName !== undefined, {
+				name: AWS_CLOUD_WATCH_PROVIDER_OPTIONS_EXCEPTION,
+				message: ' log stream name is undefined',
+			});
 			await this._validateLogGroupExistsAndCreate(this._config.logGroupName);
 
 			this._nextSequenceToken = undefined;
@@ -374,7 +387,10 @@ class AWSCloudWatchProvider implements LoggingProvider {
 		}
 	}
 
-	private async _safeUploadLogEvents(): Promise<PutLogEventsCommandOutput> {
+	private async _safeUploadLogEvents(): Promise<
+		PutLogEventsCommandOutput | undefined
+	> {
+		assertsAWSClouldWatchOptions(this._config);
 		try {
 			/**
 			 * CloudWatch has restrictions on the size of the log events that get sent up.
@@ -400,7 +416,7 @@ class AWSCloudWatchProvider implements LoggingProvider {
 			this._dataTracker.eventUploadInProgress = true;
 			const sendLogEventsResponse = await this._sendLogEvents(putLogsPayload);
 
-			this._nextSequenceToken = sendLogEventsResponse.nextSequenceToken;
+			this._nextSequenceToken = sendLogEventsResponse?.nextSequenceToken;
 			this._dataTracker.eventUploadInProgress = false;
 			this._currentLogBatch = [];
 
@@ -408,7 +424,7 @@ class AWSCloudWatchProvider implements LoggingProvider {
 		} catch (err) {
 			logger.error(`error during _safeUploadLogEvents: ${err}`);
 
-			if (RETRY_ERROR_CODES.includes(err.name)) {
+			if (err instanceof Error && RETRY_ERROR_CODES.includes(err.name)) {
 				this._getNewSequenceTokenAndSubmit({
 					logEvents: this._currentLogBatch,
 					logGroupName: this._config.logGroupName,
@@ -443,7 +459,7 @@ class AWSCloudWatchProvider implements LoggingProvider {
 				const errString = `Log entry exceeds maximum size for CloudWatch logs. Log size: ${eventSize}. Truncating log message.`;
 				logger.warn(errString);
 
-				currentEvent.message = currentEvent.message.substring(0, eventSize);
+				currentEvent.message = currentEvent.message?.substring(0, eventSize);
 			}
 
 			if (totalByteSize + eventSize > AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE)
@@ -462,7 +478,7 @@ class AWSCloudWatchProvider implements LoggingProvider {
 
 	private async _getNewSequenceTokenAndSubmit(
 		payload: PutLogEventsCommandInput
-	): Promise<PutLogEventsCommandOutput> {
+	): Promise<PutLogEventsCommandOutput | undefined> {
 		try {
 			this._nextSequenceToken = undefined;
 			this._dataTracker.eventUploadInProgress = true;
@@ -512,4 +528,13 @@ class AWSCloudWatchProvider implements LoggingProvider {
 	}
 }
 
+function assertsAWSClouldWatchOptions(
+	options?: AWSCloudWatchProviderOptions
+): asserts options {
+	return asserts(options !== undefined, {
+		name: AWS_CLOUD_WATCH_PROVIDER_OPTIONS_EXCEPTION,
+		message: 'AWSCloudWatchProviderOptions cannot be undefined',
+	});
+}
+
 export { AWSCloudWatchProvider };

package/src/RNComponents/index.ts

@@ -6,7 +6,7 @@ import { StorageHelper } from '../StorageHelper';
 
 export const Linking = {};
 export const AppState = {
-	addEventListener: (action, handler) => undefined,
+	addEventListener: (action: any, handler: any) => undefined,
 };
 
 // if not in react native, just use local storage

package/src/RNComponents/reactnative.ts

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
+// @ts-ignore
 import { Linking, AppState } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 export { Linking, AppState, AsyncStorage };

package/src/ServiceWorker/ServiceWorker.ts

@@ -15,6 +15,9 @@
 import { ConsoleLogger as Logger } from '../Logger';
 import { browserOrNode } from '../JS';
 import { Amplify } from '../Amplify';
+import { asserts } from '../Util/errors/AssertError';
+import { AmplifyError } from '../Errors';
+import { SERVICE_WORKER_EXCEPTION } from '../constants';
 /**
  * Provides a means to registering a service worker in the browser
  * and communicating with it via postMessage events.
@@ -29,17 +32,17 @@ import { Amplify } from '../Amplify';
  */
 export class ServiceWorkerClass {
 	// The active service worker will be set once it is registered
-	private _serviceWorker: ServiceWorker;
+	private _serviceWorker?: ServiceWorker;
 
 	// The service worker registration object
-	private _registration: ServiceWorkerRegistration;
+	private _registration?: ServiceWorkerRegistration;
 
 	// The application server public key for Push
 	// https://web-push-codelab.glitch.me/
-	private _publicKey: string;
+	private _publicKey?: string;
 
 	// push subscription
-	private _subscription: PushSubscription;
+	private _subscription?: PushSubscription;
 
 	// The AWS Amplify logger
 	private _logger: Logger = new Logger('ServiceWorker');
@@ -50,6 +53,11 @@ export class ServiceWorkerClass {
 	 * Get the currently active service worker
 	 */
 	get serviceWorker(): ServiceWorker {
+		asserts(this._serviceWorker !== undefined, {
+			name: SERVICE_WORKER_EXCEPTION,
+			message: 'Service Worker instance is undefined',
+		});
+
 		return this._serviceWorker;
 	}
 
@@ -91,10 +99,21 @@ export class ServiceWorkerClass {
 					})
 					.catch(error => {
 						this._logger.debug(`Service Worker Registration Failed ${error}`);
-						return reject(error);
+						return reject(
+							new AmplifyError({
+								name: SERVICE_WORKER_EXCEPTION,
+								message: 'Service Worker not available',
+								underlyingError: error,
+							})
+						);
 					});
 			} else {
-				return reject(new Error('Service Worker not available'));
+				return reject(
+					new AmplifyError({
+						name: SERVICE_WORKER_EXCEPTION,
+						message: 'Service Worker not available',
+					})
+				);
 			}
 		});
 	}
@@ -111,10 +130,17 @@ export class ServiceWorkerClass {
 	 *  - reject(Error)
 	 */
 	enablePush(publicKey: string) {
-		if (!this._registration) throw new Error('Service Worker not registered');
+		asserts(this._registration !== undefined, {
+			name: SERVICE_WORKER_EXCEPTION,
+			message: 'Service Worker registration is undefined',
+		});
 		this._publicKey = publicKey;
 		return new Promise((resolve, reject) => {
 			if (browserOrNode().isBrowser) {
+				asserts(this._registration !== undefined, {
+					name: SERVICE_WORKER_EXCEPTION,
+					message: 'Service Worker registration is undefined',
+				});
 				this._registration.pushManager.getSubscription().then(subscription => {
 					if (subscription) {
 						this._subscription = subscription;
@@ -124,11 +150,10 @@ export class ServiceWorkerClass {
 						resolve(subscription);
 					} else {
 						this._logger.debug(`User is NOT subscribed to push`);
-						return this._registration.pushManager
-							.subscribe({
-								userVisibleOnly: true,
-								applicationServerKey: this._urlB64ToUint8Array(publicKey),
-							})
+						return this._registration!.pushManager.subscribe({
+							userVisibleOnly: true,
+							applicationServerKey: this._urlB64ToUint8Array(publicKey),
+						})
 							.then(subscription => {
 								this._subscription = subscription;
 								this._logger.debug(
@@ -142,7 +167,12 @@ export class ServiceWorkerClass {
 					}
 				});
 			} else {
-				return reject(new Error('Service Worker not available'));
+				return reject(
+					new AmplifyError({
+						name: SERVICE_WORKER_EXCEPTION,
+						message: 'Service Worker not available',
+					})
+				);
 			}
 		});
 	}
@@ -187,11 +217,12 @@ export class ServiceWorkerClass {
 	 * https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker/state
 	 **/
 	_setupListeners() {
-		this._serviceWorker.addEventListener('statechange', event => {
-			const currentState = this._serviceWorker.state;
+		this.serviceWorker.addEventListener('statechange', event => {
+			const currentState = this.serviceWorker.state;
 			this._logger.debug(`ServiceWorker statechange: ${currentState}`);
-			if (Amplify.Analytics && typeof Amplify.Analytics.record === 'function') {
-				Amplify.Analytics.record({
+			Amplify.Analytics;
+			if (isAmplifyWithAnalytics(Amplify)) {
+				(Amplify as AmplifyWithAnalytics).Analytics.record({
 					name: 'ServiceWorker',
 					attributes: {
 						state: currentState,
@@ -199,8 +230,17 @@ export class ServiceWorkerClass {
 				});
 			}
 		});
-		this._serviceWorker.addEventListener('message', event => {
+		this.serviceWorker.addEventListener('message', event => {
 			this._logger.debug(`ServiceWorker message event: ${event}`);
 		});
 	}
 }
+
+type AmplifyWithAnalytics = {
+	Analytics: {
+		record: Function;
+	};
+};
+function isAmplifyWithAnalytics(amplify: any): amplify is AmplifyWithAnalytics {
+	return amplify.Analytics && typeof amplify.Analytics.record === 'function';
+}

package/src/Signer.ts

@@ -49,7 +49,21 @@ export class Signer {
     *
     * @returns {object} Signed HTTP request
     */
-	static sign(request, accessInfo, serviceInfo) {
+	static sign(
+		request: {
+			headers: any;
+			body?: BodyInit;
+			data?: any;
+			url: string;
+			method: string;
+		},
+		accessInfo: {
+			access_key: string;
+			secret_key: string;
+			session_token: string;
+		},
+		serviceInfo: { service: string; region: string }
+	) {
 		request.headers = request.headers || {};
 
 		if (request.body && !request.data) {
@@ -61,7 +75,7 @@ export class Signer {
 		const requestToSign = {
 			...request,
 			body: request.data,
-			url: new URL(request.url as string),
+			url: new URL(request.url),
 		};
 
 		const options = getOptions(requestToSign, accessInfo, serviceInfo);
@@ -130,7 +144,12 @@ export class Signer {
 	}
 }
 
-const getOptions = (request, accessInfo, serviceInfo, expiration?) => {
+const getOptions = (
+	request: { url: URL } & Record<string, any>,
+	accessInfo: { access_key: string; secret_key: string; session_token: string },
+	serviceInfo: { service: string; region: string },
+	expiration?: number
+) => {
 	const { access_key, secret_key, session_token } = accessInfo ?? {};
 	const { region: urlRegion, service: urlService } = parseServiceInfo(
 		request.url