@aws-amplify/core 6.0.17-unstable.e316a2e.0 → 6.0.17

package/src/I18n/I18n.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ConsoleLogger } from '../Logger';
+
 import { I18nConfig } from './types';
 
 const logger = new ConsoleLogger('I18n');
@@ -25,13 +26,6 @@ export class I18n {
 	 */
 	_dict: Record<string, any> = {};
 
-	/**
-	 * @constructor
-	 * Initialize with configurations
-	 * @param {Object} options
-	 */
-	constructor() {}
-
 	/**
 	 * Sets the default language from the configuration when required.
 	 */
@@ -99,12 +93,12 @@ export class I18n {
 			return defVal;
 		}
 
-		const lang_dict = this._dict[language];
-		if (!lang_dict) {
+		const langDict = this._dict[language];
+		if (!langDict) {
 			return defVal;
 		}
 
-		return lang_dict[key];
+		return langDict[key];
 	}
 
 	/**
@@ -115,13 +109,13 @@ export class I18n {
 	 */
 	putVocabulariesForLanguage(
 		language: string,
-		vocabularies: Record<string, any>
+		vocabularies: Record<string, any>,
 	) {
-		let lang_dict = this._dict[language];
-		if (!lang_dict) {
-			lang_dict = this._dict[language] = {};
+		let langDict = this._dict[language];
+		if (!langDict) {
+			langDict = this._dict[language] = {};
 		}
-		this._dict[language] = { ...lang_dict, ...vocabularies };
+		this._dict[language] = { ...langDict, ...vocabularies };
 	}
 
 	/**
@@ -131,7 +125,7 @@ export class I18n {
 	 *                                vocabularies of each language as value
 	 */
 	putVocabularies(vocabularies: Record<string, Record<string, string>>) {
-		Object.keys(vocabularies).map(key => {
+		Object.keys(vocabularies).forEach(key => {
 			this.putVocabulariesForLanguage(key, vocabularies[key]);
 		});
 	}

package/src/I18n/index.ts

@@ -1,11 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { I18n as I18nClass } from './I18n';
-
 import { ConsoleLogger } from '../Logger';
+
+import { I18n as I18nClass } from './I18n';
 import { I18nConfig } from './types';
-import { assert, I18nErrorCode } from './errorHelpers';
+import { I18nErrorCode, assert } from './errorHelpers';
 
 const logger = new ConsoleLogger('I18n');
 
@@ -61,7 +61,7 @@ export class I18n {
 		I18n.checkConfig();
 		assert(!!_i18n, I18nErrorCode.NotConfigured);
 
-		return _i18n.setLanguage(lang);
+		_i18n.setLanguage(lang);
 	}
 
 	/**
@@ -88,12 +88,12 @@ export class I18n {
 	 */
 	static putVocabulariesForLanguage(
 		language: string,
-		vocabularies: Record<string, string>
+		vocabularies: Record<string, string>,
 	) {
 		I18n.checkConfig();
 		assert(!!_i18n, I18nErrorCode.NotConfigured);
 
-		return _i18n.putVocabulariesForLanguage(language, vocabularies);
+		_i18n.putVocabulariesForLanguage(language, vocabularies);
 	}
 
 	/**
@@ -107,7 +107,7 @@ export class I18n {
 		I18n.checkConfig();
 		assert(!!_i18n, I18nErrorCode.NotConfigured);
 
-		return _i18n.putVocabularies(vocabularies);
+		_i18n.putVocabularies(vocabularies);
 	}
 
 	public static checkConfig() {

package/src/Logger/ConsoleLogger.ts

@@ -1,9 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { InputLogEvent, Logger, LoggingProvider, LogType } from './types';
 import { AWS_CLOUDWATCH_CATEGORY } from '../constants';
 
+import { InputLogEvent, LogType, Logger, LoggingProvider } from './types';
+
 const LOG_LEVELS: Record<string, number> = {
 	VERBOSE: 1,
 	DEBUG: 2,
@@ -41,9 +42,10 @@ export class ConsoleLogger implements Logger {
 
 	_ts() {
 		const dt = new Date();
+
 		return (
 			[this._padding(dt.getMinutes()), this._padding(dt.getSeconds())].join(
-				':'
+				':',
 			) +
 			'.' +
 			dt.getMilliseconds()
@@ -66,16 +68,16 @@ export class ConsoleLogger implements Logger {
 	 * @param {string|object} msg - Logging message or object
 	 */
 	_log(type: LogType | string, ...msg: any) {
-		let logger_level_name = this.level;
+		let loggerLevelName = this.level;
 		if (ConsoleLogger.LOG_LEVEL) {
-			logger_level_name = ConsoleLogger.LOG_LEVEL;
+			loggerLevelName = ConsoleLogger.LOG_LEVEL;
 		}
-		if (typeof (<any>window) !== 'undefined' && (<any>window).LOG_LEVEL) {
-			logger_level_name = (<any>window).LOG_LEVEL;
+		if (typeof (window as any) !== 'undefined' && (window as any).LOG_LEVEL) {
+			loggerLevelName = (window as any).LOG_LEVEL;
 		}
-		const logger_level = LOG_LEVELS[logger_level_name];
-		const type_level = LOG_LEVELS[type];
-		if (!(type_level >= logger_level)) {
+		const loggerLevel = LOG_LEVELS[loggerLevelName];
+		const typeLevel = LOG_LEVELS[type];
+		if (!(typeLevel >= loggerLevel)) {
 			// Do nothing if type is not greater than or equal to logger level (handle undefined)
 			return;
 		}

package/src/Logger/types.ts

@@ -37,5 +37,5 @@ export enum LogType {
 	INFO = 'INFO',
 	WARN = 'WARN',
 	VERBOSE = 'VERBOSE',
-	NONE = 'NONE'
+	NONE = 'NONE',
 }

package/src/Mutex/Mutex.ts

@@ -33,7 +33,7 @@ export class Mutex implements MutexInterface {
 
 	acquire(): Promise<MutexInterface.Releaser> {
 		const ticket = new Promise<MutexInterface.Releaser>(resolve =>
-			this._queue.push(resolve)
+			this._queue.push(resolve),
 		);
 
 		if (!this._pending) {
@@ -55,11 +55,15 @@ export class Mutex implements MutexInterface {
 			}
 
 			return Promise.resolve(result).then(
-				(x: T) => (release(), x),
+				(x: T) => {
+					release();
+
+					return x;
+				},
 				e => {
 					release();
 					throw e;
-				}
+				},
 			);
 		});
 	}
@@ -73,6 +77,6 @@ export class Mutex implements MutexInterface {
 		}
 	}
 
-	private _queue: Array<(release: MutexInterface.Releaser) => void> = [];
+	private _queue: ((release: MutexInterface.Releaser) => void)[] = [];
 	private _pending = false;
 }

package/src/Mutex/types.ts

@@ -9,12 +9,8 @@ export interface MutexInterface {
 	isLocked(): boolean;
 }
 
-export namespace MutexInterface {
-	export interface Releaser {
-		(): void;
-	}
+export declare namespace MutexInterface {
+	export type Releaser = () => void;
 
-	export interface Worker<T> {
-		(): Promise<T> | T;
-	}
+	export type Worker<T> = () => Promise<T> | T;
 }

package/src/Platform/customUserAgent.ts

@@ -25,7 +25,7 @@ const customUserAgentState: CustomUserAgentStateMap = {};
  * @param input - SetCustomUserAgentInput that defines custom state to apply to the specified APIs.
  */
 export const setCustomUserAgent = (
-	input: SetCustomUserAgentInput
+	input: SetCustomUserAgentInput,
 ): (() => void) => {
 	// Save custom user-agent state & increment reference counter
 	// TODO Remove `any` when we upgrade to TypeScript 5.2, see: https://github.com/microsoft/TypeScript/issues/44373
@@ -37,7 +37,7 @@ export const setCustomUserAgent = (
 				additionalDetails: input.additionalDetails,
 			},
 		}),
-		customUserAgentState[input.category] ?? {}
+		customUserAgentState[input.category] ?? {},
 	);
 
 	// Callback that cleans up state for APIs recorded by this call
@@ -70,6 +70,6 @@ export const setCustomUserAgent = (
 
 export const getCustomUserAgent = (
 	category: string,
-	api: string
+	api: string,
 ): AdditionalDetails | undefined =>
 	customUserAgentState[category]?.[api]?.additionalDetails;

package/src/Platform/detectFramework.ts

@@ -30,13 +30,16 @@ export const detectFramework = (): Framework => {
 		} else {
 			// The first run of detectFramework:
 			// Every time we update the cache, call each observer function
-			frameworkChangeObservers.forEach(fcn => fcn());
+			frameworkChangeObservers.forEach(fcn => {
+				fcn();
+			});
 		}
 
 		// Retry once for either Unknown type after a delay (explained below)
 		resetTimeout(Framework.ServerSideUnknown, SSR_RESET_TIMEOUT);
 		resetTimeout(Framework.WebUnknown, WEB_RESET_TIMEOUT);
 	}
+
 	return frameworkCache;
 };
 

package/src/Platform/detection/Angular.ts

@@ -7,12 +7,12 @@ import { documentExists, processExists, windowExists } from './helpers';
 
 export function angularWebDetect() {
 	const angularVersionSetInDocument = Boolean(
-		documentExists() && document.querySelector('[ng-version]')
+		documentExists() && document.querySelector('[ng-version]'),
 	);
 	const angularContentSetInWindow = Boolean(
-		// @ts-ignore
-		windowExists() && typeof window['ng'] !== 'undefined'
+		windowExists() && typeof (window as any).ng !== 'undefined',
 	);
+
 	return angularVersionSetInDocument || angularContentSetInWindow;
 }
 
@@ -20,7 +20,7 @@ export function angularSSRDetect() {
 	return (
 		(processExists() &&
 			typeof process.env === 'object' &&
-			process.env['npm_lifecycle_script']?.startsWith('ng ')) ||
+			process.env.npm_lifecycle_script?.startsWith('ng ')) ||
 		false
 	);
 }

package/src/Platform/detection/Expo.ts

@@ -6,6 +6,5 @@ import { globalExists } from './helpers';
 // Tested with expo 48 / react-native 0.71.3
 
 export function expoDetect() {
-	// @ts-ignore
-	return globalExists() && typeof global['expo'] !== 'undefined';
+	return globalExists() && typeof (global as any).expo !== 'undefined';
 }

package/src/Platform/detection/Next.ts

@@ -6,8 +6,11 @@ import { globalExists, keyPrefixMatch, windowExists } from './helpers';
 // Tested with next 13.4 / react 18.2
 
 export function nextWebDetect() {
-	// @ts-ignore
-	return windowExists() && window['next'] && typeof window['next'] === 'object';
+	return (
+		windowExists() &&
+		(window as any).next &&
+		typeof (window as any).next === 'object'
+	);
 }
 
 export function nextSSRDetect() {

package/src/Platform/detection/Nuxt.ts

@@ -8,12 +8,13 @@ import { globalExists, windowExists } from './helpers';
 export function nuxtWebDetect() {
 	return (
 		windowExists() &&
-		// @ts-ignore
-		(window['__NUXT__'] !== undefined || window['$nuxt'] !== undefined)
+		((window as any).__NUXT__ !== undefined ||
+			(window as any).$nuxt !== undefined)
 	);
 }
 
 export function nuxtSSRDetect() {
-	// @ts-ignore
-	return globalExists() && typeof global['__NUXT_PATHS__'] !== 'undefined';
+	return (
+		globalExists() && typeof (global as any).__NUXT_PATHS__ !== 'undefined'
+	);
 }

package/src/Platform/detection/index.ts

@@ -3,20 +3,20 @@
 
 import { Framework } from '../types';
 
-import { reactWebDetect, reactSSRDetect } from './React';
-import { vueWebDetect, vueSSRDetect } from './Vue';
-import { svelteWebDetect, svelteSSRDetect } from './Svelte';
-import { nextWebDetect, nextSSRDetect } from './Next';
-import { nuxtWebDetect, nuxtSSRDetect } from './Nuxt';
-import { angularWebDetect, angularSSRDetect } from './Angular';
+import { reactSSRDetect, reactWebDetect } from './React';
+import { vueSSRDetect, vueWebDetect } from './Vue';
+import { svelteSSRDetect, svelteWebDetect } from './Svelte';
+import { nextSSRDetect, nextWebDetect } from './Next';
+import { nuxtSSRDetect, nuxtWebDetect } from './Nuxt';
+import { angularSSRDetect, angularWebDetect } from './Angular';
 import { reactNativeDetect } from './ReactNative';
 import { expoDetect } from './Expo';
 import { webDetect } from './Web';
 
-type PlatformDetectionEntry = {
+interface PlatformDetectionEntry {
 	platform: Framework;
-	detectionMethod: () => boolean;
-};
+	detectionMethod(): boolean;
+}
 
 // These are in the order of detection where when both are detectable, the early Framework will be reported
 const detectionMap: PlatformDetectionEntry[] = [

package/src/Platform/index.ts

@@ -1,10 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { UserAgent as AWSUserAgent } from '@aws-sdk/types';
+
 import { CustomUserAgentDetails, Framework } from './types';
 import { version } from './version';
 import { detectFramework, observeFrameworkChanges } from './detectFramework';
-import { UserAgent as AWSUserAgent } from '@aws-sdk/types';
 import { getCustomUserAgent } from './customUserAgent';
 
 const BASE_USER_AGENT = `aws-amplify`;
@@ -32,7 +33,6 @@ export const Platform = new PlatformBuilder();
 export const getAmplifyUserAgentObject = ({
 	category,
 	action,
-	framework,
 }: CustomUserAgentDetails = {}): AWSUserAgent => {
 	const userAgent: AWSUserAgent = [[BASE_USER_AGENT, version]];
 	if (category) {
@@ -54,12 +54,12 @@ export const getAmplifyUserAgentObject = ({
 };
 
 export const getAmplifyUserAgent = (
-	customUserAgentDetails?: CustomUserAgentDetails
+	customUserAgentDetails?: CustomUserAgentDetails,
 ): string => {
 	const userAgent = getAmplifyUserAgentObject(customUserAgentDetails);
 	const userAgentString = userAgent
 		.map(([agentKey, agentValue]) =>
-			agentKey && agentValue ? `${agentKey}/${agentValue}` : agentKey
+			agentKey && agentValue ? `${agentKey}/${agentValue}` : agentKey,
 		)
 		.join(' ');
 

package/src/Platform/types.ts

@@ -122,7 +122,7 @@ export enum StorageAction {
 	GetUrl = '7',
 }
 
-type ActionMap = {
+interface ActionMap {
 	[Category.Auth]: AuthAction;
 	[Category.API]: ApiAction;
 	[Category.Analytics]: AnalyticsAction;
@@ -134,7 +134,7 @@ type ActionMap = {
 	[Category.PubSub]: PubSubAction;
 	[Category.PushNotification]: PushNotificationAction;
 	[Category.Storage]: StorageAction;
-};
+}
 
 type UserAgentDetailsWithCategory<T extends Category> =
 	CustomUserAgentDetailsBase & {
@@ -142,9 +142,9 @@ type UserAgentDetailsWithCategory<T extends Category> =
 		action: T extends keyof ActionMap ? ActionMap[T] : never;
 	};
 
-type CustomUserAgentDetailsBase = {
+interface CustomUserAgentDetailsBase {
 	framework?: Framework;
-};
+}
 
 export type CustomUserAgentDetails =
 	| (CustomUserAgentDetailsBase & { category?: never; action?: never })
@@ -174,29 +174,29 @@ export type CustomUserAgentStateMap = Record<string, CategoryUserAgentStateMap>;
 
 export type AdditionalDetails = [string, string?][];
 
-export type StorageUserAgentInput = {
+export interface StorageUserAgentInput {
 	category: Category.Storage;
 	apis: StorageAction[];
 	additionalDetails: AdditionalDetails;
-};
+}
 
-export type AuthUserAgentInput = {
+export interface AuthUserAgentInput {
 	category: Category.Auth;
 	apis: AuthAction[];
 	additionalDetails: AdditionalDetails;
-};
+}
 
-export type InAppMessagingUserAgentInput = {
+export interface InAppMessagingUserAgentInput {
 	category: Category.InAppMessaging;
 	apis: InAppMessagingAction[];
 	additionalDetails: AdditionalDetails;
-};
+}
 
-export type GeoUserAgentInput = {
+export interface GeoUserAgentInput {
 	category: Category.Geo;
 	apis: GeoAction[];
 	additionalDetails: AdditionalDetails;
-};
+}
 
 export type SetCustomUserAgentInput =
 	| StorageUserAgentInput

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.17-unstable.e316a2e.0+e316a2e';
+export const version = '6.0.17';

package/src/Reachability/Reachability.native.ts

@@ -2,14 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Observable } from 'rxjs';
 import { loadNetInfo } from '@aws-amplify/react-native';
+
 import { ConsoleLogger } from '../Logger';
+
 import { NetworkStatus } from './types';
 
 const logger = new ConsoleLogger('Reachability', 'DEBUG');
 
 export class Reachability {
 	networkMonitor(
-		netInfo?: ReturnType<typeof loadNetInfo>
+		netInfo?: ReturnType<typeof loadNetInfo>,
 	): Observable<NetworkStatus> {
 		/**
 		 * Here netinfo refers to @react-native-community/netinfo
@@ -20,9 +22,10 @@ export class Reachability {
 		 */
 		if (!(netInfo && netInfo.addEventListener)) {
 			throw new Error(
-				'NetInfo must be passed to networkMonitor to enable reachability in React Native'
+				'NetInfo must be passed to networkMonitor to enable reachability in React Native',
 			);
 		}
+
 		return new Observable(observer => {
 			logger.log('subscribing to reachability in React Native');
 
@@ -35,7 +38,7 @@ export class Reachability {
 						logger.log('Notifying reachability change', online);
 						observer.next({ online });
 					}
-				}
+				},
 			);
 
 			return () => {

package/src/Reachability/Reachability.ts

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CompletionObserver, Observable, from } from 'rxjs';
-import { NetworkStatus } from './types';
+
 import { isWebWorker } from '../utils';
 
+import { NetworkStatus } from './types';
+
 export class Reachability {
-	private static _observers: Array<CompletionObserver<NetworkStatus>> = [];
+	private static _observers: CompletionObserver<NetworkStatus>[] = [];
 
 	networkMonitor(_?: unknown): Observable<NetworkStatus> {
 		const globalObj = isWebWorker()
@@ -20,8 +22,12 @@ export class Reachability {
 		return new Observable(observer => {
 			observer.next({ online: globalObj.navigator.onLine });
 
-			const notifyOnline = () => observer.next({ online: true });
-			const notifyOffline = () => observer.next({ online: false });
+			const notifyOnline = () => {
+				observer.next({ online: true });
+			};
+			const notifyOffline = () => {
+				observer.next({ online: false });
+			};
 
 			globalObj.addEventListener('online', notifyOnline);
 			globalObj.addEventListener('offline', notifyOffline);
@@ -33,7 +39,7 @@ export class Reachability {
 				globalObj.removeEventListener('offline', notifyOffline);
 
 				Reachability._observers = Reachability._observers.filter(
-					_observer => _observer !== observer
+					_observer => _observer !== observer,
 				);
 			};
 		});
@@ -44,7 +50,7 @@ export class Reachability {
 		for (const observer of this._observers) {
 			if (observer.closed) {
 				this._observers = this._observers.filter(
-					_observer => _observer !== observer
+					_observer => _observer !== observer,
 				);
 				continue;
 			}

package/src/Reachability/types.ts

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export type NetworkStatus = {
+export interface NetworkStatus {
 	online: boolean;
-};
+}