@aws-amplify/core 6.0.1-preview-testing.be90020.0 → 6.0.1-ssr-api.df60e41.0

package/src/ServiceWorker/ServiceWorker.ts

@@ -1,23 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-/**
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
+
 import { ConsoleLogger as Logger } from '../Logger';
-import { isBrowser } from '../Util/JS';
-import { Amplify } from '../Amplify';
-import { asserts } from '../Util/errors/AssertError';
-import { AmplifyError } from '../Util/Errors';
-import { SERVICE_WORKER_EXCEPTION } from '../Util/Constants';
+import { isBrowser } from '../utils';
+import { AmplifyError } from '../errors';
+import { assert, ServiceWorkerErrorCode } from './errorHelpers';
+import { record } from '../providers/pinpoint';
+import { Amplify, fetchAuthSession } from '../singleton';
+
 /**
  * Provides a means to registering a service worker in the browser
  * and communicating with it via postMessage events.
@@ -53,10 +43,10 @@ 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',
-		});
+		assert(
+			this._serviceWorker !== undefined,
+			ServiceWorkerErrorCode.UndefinedInstance
+		);
 
 		return this._serviceWorker;
 	}
@@ -101,7 +91,7 @@ export class ServiceWorkerClass {
 						this._logger.debug(`Service Worker Registration Failed ${error}`);
 						return reject(
 							new AmplifyError({
-								name: SERVICE_WORKER_EXCEPTION,
+								name: ServiceWorkerErrorCode.Unavailable,
 								message: 'Service Worker not available',
 								underlyingError: error,
 							})
@@ -110,7 +100,7 @@ export class ServiceWorkerClass {
 			} else {
 				return reject(
 					new AmplifyError({
-						name: SERVICE_WORKER_EXCEPTION,
+						name: ServiceWorkerErrorCode.Unavailable,
 						message: 'Service Worker not available',
 					})
 				);
@@ -130,17 +120,17 @@ export class ServiceWorkerClass {
 	 *  - reject(Error)
 	 */
 	enablePush(publicKey: string) {
-		asserts(this._registration !== undefined, {
-			name: SERVICE_WORKER_EXCEPTION,
-			message: 'Service Worker registration is undefined',
-		});
+		assert(
+			this._registration !== undefined,
+			ServiceWorkerErrorCode.UndefinedRegistration
+		);
 		this._publicKey = publicKey;
 		return new Promise((resolve, reject) => {
 			if (isBrowser()) {
-				asserts(this._registration !== undefined, {
-					name: SERVICE_WORKER_EXCEPTION,
-					message: 'Service Worker registration is undefined',
-				});
+				assert(
+					this._registration !== undefined,
+					ServiceWorkerErrorCode.UndefinedRegistration
+				);
 				this._registration.pushManager.getSubscription().then(subscription => {
 					if (subscription) {
 						this._subscription = subscription;
@@ -169,7 +159,7 @@ export class ServiceWorkerClass {
 			} else {
 				return reject(
 					new AmplifyError({
-						name: SERVICE_WORKER_EXCEPTION,
+						name: ServiceWorkerErrorCode.Unavailable,
 						message: 'Service Worker not available',
 					})
 				);
@@ -217,15 +207,25 @@ export class ServiceWorkerClass {
 	 * https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker/state
 	 **/
 	_setupListeners() {
-		this.serviceWorker.addEventListener('statechange', event => {
+		this.serviceWorker.addEventListener('statechange', async event => {
 			const currentState = this.serviceWorker.state;
 			this._logger.debug(`ServiceWorker statechange: ${currentState}`);
-			Amplify.Analytics;
-			if (isAmplifyWithAnalytics(Amplify)) {
-				(Amplify as AmplifyWithAnalytics).Analytics.record({
-					name: 'ServiceWorker',
-					attributes: {
-						state: currentState,
+
+			const { appId, region } = Amplify.getConfig().Analytics?.Pinpoint ?? {};
+			const { credentials } = await fetchAuthSession();
+
+			if (appId && region && credentials) {
+				// Pinpoint is configured, record an event
+				record({
+					appId,
+					region,
+					category: 'Core',
+					credentials,
+					event: {
+						name: 'ServiceWorker',
+						attributes: {
+							state: currentState,
+						},
 					},
 				});
 			}
@@ -235,12 +235,3 @@ export class ServiceWorkerClass {
 		});
 	}
 }
-
-type AmplifyWithAnalytics = {
-	Analytics: {
-		record: Function;
-	};
-};
-function isAmplifyWithAnalytics(amplify: any): amplify is AmplifyWithAnalytics {
-	return amplify.Analytics && typeof amplify.Analytics.record === 'function';
-}

package/src/ServiceWorker/errorHelpers.ts

@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { createAssertionFunction } from '../errors';
+import { AmplifyErrorMap, AssertionFunction } from '../types';
+
+export enum ServiceWorkerErrorCode {
+	UndefinedInstance = 'UndefinedInstance',
+	UndefinedRegistration = 'UndefinedRegistration',
+	Unavailable = 'Unavailable',
+}
+
+const serviceWorkerErrorMap: AmplifyErrorMap<ServiceWorkerErrorCode> = {
+	[ServiceWorkerErrorCode.UndefinedInstance]: {
+		message: 'Service Worker instance is undefined.',
+	},
+	[ServiceWorkerErrorCode.UndefinedRegistration]: {
+		message: 'Service Worker registration is undefined.',
+	},
+	[ServiceWorkerErrorCode.Unavailable]: {
+		message: 'Service Worker not available.',
+	},
+};
+
+export const assert: AssertionFunction<ServiceWorkerErrorCode> =
+	createAssertionFunction(serviceWorkerErrorMap);

package/src/ServiceWorker/index.ts

@@ -1,16 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-/**
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
 
 export { ServiceWorkerClass as ServiceWorker } from './ServiceWorker';

package/src/{Util → Signer}/DateUtils.ts

@@ -46,7 +46,7 @@ export const DateUtils: DateUtils = {
 	},
 
 	getDateFromHeaderString(header: string) {
-		const [,year, month, day, hour, minute, second] = header.match(
+		const [, year, month, day, hour, minute, second] = header.match(
 			/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2}).+/
 		) as any[];
 

package/src/{Signer.ts → Signer/Signer.ts}

@@ -1,12 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { DateUtils } from './Util';
+import { DateUtils } from './DateUtils';
 import {
 	presignUrl,
 	signRequest,
 	TOKEN_QUERY_PARAM,
-} from './clients/middleware/signing/signer/signatureV4';
+} from '../clients/middleware/signing/signer/signatureV4';
+import { AmplifyUrl } from '../utils/amplifyUrl';
 
 const IOT_SERVICE_NAME = 'iotdevicegateway';
 // Best practice regex to parse the service and region from an AWS endpoint
@@ -75,7 +76,7 @@ export class Signer {
 		const requestToSign = {
 			...request,
 			body: request.data,
-			url: new URL(request.url),
+			url: new AmplifyUrl(request.url),
 		};
 
 		const options = getOptions(requestToSign, accessInfo, serviceInfo);
@@ -121,7 +122,7 @@ export class Signer {
 		const presignable = {
 			body,
 			method,
-			url: new URL(urlToSign),
+			url: new AmplifyUrl(urlToSign),
 		};
 
 		const options = getOptions(

package/src/Signer/index.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { Signer } from './Signer';

package/src/adapterCore/error/AmplifyServerContextError.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { AmplifyError } from '../../libraryUtils';
+import { AmplifyError } from '../../errors';
 
 export class AmplifyServerContextError extends AmplifyError {
 	constructor({

package/src/{AwsClients/CognitoIdentity → awsClients/cognitoIdentity}/base.ts

@@ -19,6 +19,7 @@ import {
 } from '../../clients/middleware/retry';
 import { getAmplifyUserAgent } from '../../Platform';
 import { observeFrameworkChanges } from '../../Platform/detectFramework';
+import { AmplifyUrl } from '../../utils/amplifyUrl';
 
 /**
  * The service name used to sign requests if the API requires authentication.
@@ -29,7 +30,9 @@ const SERVICE_NAME = 'cognito-identity';
  * The endpoint resolver function that returns the endpoint URL for a given region.
  */
 const endpointResolver = ({ region }: EndpointResolverOptions) => ({
-	url: new URL(`https://cognito-identity.${region}.${getDnsSuffix(region)}`),
+	url: new AmplifyUrl(
+		`https://cognito-identity.${region}.${getDnsSuffix(region)}`
+	),
 });
 
 /**

package/src/{AwsClients/Pinpoint → awsClients/pinpoint}/base.ts

@@ -9,6 +9,7 @@ import {
 import { parseJsonError } from '../../clients/serde/json';
 import type { EndpointResolverOptions, Headers } from '../../clients/types';
 import { getAmplifyUserAgent } from '../../Platform';
+import { AmplifyUrl } from '../../utils/amplifyUrl';
 
 /**
  * The service name used to sign requests if the API requires authentication.
@@ -19,7 +20,7 @@ const SERVICE_NAME = 'mobiletargeting';
  * The endpoint resolver function that returns the endpoint URL for a given region.
  */
 const endpointResolver = ({ region }: EndpointResolverOptions) => ({
-	url: new URL(`https://pinpoint.${region}.${getDnsSuffix(region)}`),
+	url: new AmplifyUrl(`https://pinpoint.${region}.${getDnsSuffix(region)}`),
 });
 
 /**

package/src/awsClients/pinpoint/errorHelpers.ts

@@ -0,0 +1,19 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { createAssertionFunction } from '../../errors';
+import { AmplifyErrorMap, AssertionFunction } from '../../types';
+
+export enum PinpointValidationErrorCode {
+	NoAppId = 'NoAppId',
+}
+
+const pinpointValidationErrorMap: AmplifyErrorMap<PinpointValidationErrorCode> =
+	{
+		[PinpointValidationErrorCode.NoAppId]: {
+			message: 'Missing application id.',
+		},
+	};
+
+export const assert: AssertionFunction<PinpointValidationErrorCode> =
+	createAssertionFunction(pinpointValidationErrorMap);

package/src/{AwsClients/Pinpoint → awsClients/pinpoint}/getInAppMessages.ts

@@ -15,6 +15,7 @@ import type {
 	GetInAppMessagesCommandInput as GetInAppMessagesInput,
 	GetInAppMessagesCommandOutput as GetInAppMessagesOutput,
 } from './types';
+import { AmplifyUrl } from '../../utils/amplifyUrl';
 
 export type { GetInAppMessagesInput, GetInAppMessagesOutput };
 
@@ -23,7 +24,7 @@ const getInAppMessagesSerializer = (
 	endpoint: Endpoint
 ): HttpRequest => {
 	const headers = getSharedHeaders();
-	const url = new URL(endpoint.url);
+	const url = new AmplifyUrl(endpoint.url);
 	url.pathname = `v1/apps/${extendedEncodeURIComponent(
 		ApplicationId
 	)}/endpoints/${extendedEncodeURIComponent(EndpointId)}/inappmessages`;

package/src/{AwsClients/Pinpoint → awsClients/pinpoint}/putEvents.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { asserts } from '../../Util/errors/AssertError';
 import { authenticatedHandler } from '../../clients/handlers/authenticated';
 import { composeServiceApi } from '../../clients/internal/composeServiceApi';
 import { extendedEncodeURIComponent } from '../../clients/middleware/signing/utils/extendedEncodeURIComponent';
@@ -11,12 +10,13 @@ import {
 	parseMetadata,
 } from '../../clients/serde';
 import { Endpoint, HttpRequest, HttpResponse } from '../../clients/types';
-import { APPLICATION_ID_EXCEPTION } from '../../Util/Constants';
 import { defaultConfig, getSharedHeaders } from './base';
+import { assert, PinpointValidationErrorCode } from './errorHelpers';
 import type {
 	PutEventsCommandInput as PutEventsInput,
 	PutEventsCommandOutput as PutEventsOutput,
 } from './types';
+import { AmplifyUrl } from '../../utils/amplifyUrl';
 
 export type { PutEventsInput, PutEventsOutput };
 
@@ -24,12 +24,9 @@ const putEventsSerializer = (
 	{ ApplicationId, EventsRequest }: PutEventsInput,
 	endpoint: Endpoint
 ): HttpRequest => {
-	asserts(!!ApplicationId, {
-		name: APPLICATION_ID_EXCEPTION,
-		message: 'ApplicationId is required for putEvents',
-	});
+	assert(!!ApplicationId, PinpointValidationErrorCode.NoAppId);
 	const headers = getSharedHeaders();
-	const url = new URL(endpoint.url);
+	const url = new AmplifyUrl(endpoint.url);
 	url.pathname = `v1/apps/${extendedEncodeURIComponent(ApplicationId)}/events`;
 	const body = JSON.stringify(EventsRequest ?? {});
 	return { method: 'POST', headers, url, body };

package/src/{AwsClients/Pinpoint → awsClients/pinpoint}/updateEndpoint.ts

@@ -15,6 +15,7 @@ import type {
 	UpdateEndpointCommandInput as UpdateEndpointInput,
 	UpdateEndpointCommandOutput as UpdateEndpointOutput,
 } from './types';
+import { AmplifyUrl } from '../../utils/amplifyUrl';
 
 export type { UpdateEndpointInput, UpdateEndpointOutput };
 
@@ -23,7 +24,7 @@ const updateEndpointSerializer = (
 	endpoint: Endpoint
 ): HttpRequest => {
 	const headers = getSharedHeaders();
-	const url = new URL(endpoint.url);
+	const url = new AmplifyUrl(endpoint.url);
 	url.pathname = `v1/apps/${extendedEncodeURIComponent(
 		ApplicationId
 	)}/endpoints/${extendedEncodeURIComponent(EndpointId)}`;

package/src/clients/handlers/fetch.ts

@@ -13,7 +13,10 @@ export const fetchTransferHandler: TransferHandler<
 	HttpRequest,
 	HttpResponse,
 	HttpTransferOptions
-> = async ({ url, method, headers, body }, { abortSignal, cache }) => {
+> = async (
+	{ url, method, headers, body },
+	{ abortSignal, cache, withCrossDomainCredentials }
+) => {
 	let resp: Response;
 	try {
 		resp = await fetch(url, {
@@ -22,6 +25,7 @@ export const fetchTransferHandler: TransferHandler<
 			body: shouldSendBody(method) ? body : undefined,
 			signal: abortSignal,
 			cache,
+			credentials: withCrossDomainCredentials ? 'include' : 'same-origin',
 		});
 	} catch (e) {
 		// TODO: needs to revise error handling in v6

package/src/clients/middleware/retry/jitteredBackoff.ts

@@ -3,7 +3,7 @@
 
 import type { RetryOptions } from './middleware';
 // TODO: [v6] The separate retry utility is used by Data packages now and will replaced by retry middleware.
-import { jitteredBackoff as jitteredBackoffUtil } from '../../../Util/Retry';
+import { jitteredBackoff as jitteredBackoffUtil } from '../../../utils';
 
 const DEFAULT_MAX_DELAY_MS = 5 * 60 * 1000;
 

package/src/clients/middleware/signing/signer/signatureV4/presignUrl.ts

@@ -15,6 +15,7 @@ import {
 } from './constants';
 import { getSigningValues } from './utils/getSigningValues';
 import { getSignature } from './utils/getSignature';
+import { AmplifyUrl } from '../../../../../utils/amplifyUrl';
 
 /**
  * Given a `Presignable` object, returns a Signature Version 4 presigned `URL` object.
@@ -33,7 +34,7 @@ export const presignUrl = (
 
 	// create the request to sign
 	// @ts-ignore URL constructor accepts a URL object
-	const presignedUrl = new URL(url);
+	const presignedUrl = new AmplifyUrl(url);
 	Object.entries({
 		[ALGORITHM_QUERY_PARAM]: SHA256_ALGORITHM_IDENTIFIER,
 		[CREDENTIAL_QUERY_PARAM]: `${accessKeyId}/${credentialScope}`,

package/src/clients/types/http.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Request, Response, TransferHandler } from './core';
+import type { fetchTransferHandler } from '../handlers/fetch';
 
 /**
  * Use basic Record interface to workaround fetch Header class not available in Node.js
@@ -24,7 +25,7 @@ export interface HttpRequest extends Request {
 export type ResponseBodyMixin = Pick<Body, 'blob' | 'json' | 'text'>;
 
 export interface HttpResponse extends Response {
-	body: (ResponseBodyMixin & ReadableStream) | ResponseBodyMixin | null;
+	body: (ResponseBodyMixin & ReadableStream) | ResponseBodyMixin;
 	statusCode: number;
 	/**
 	 * @see {@link HttpRequest.headers}
@@ -42,6 +43,23 @@ export interface HttpTransferOptions {
 	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/cache}
 	 */
 	cache?: RequestCache;
+
+	/**
+	 * Internal-only option controls whether or not cross-site Access-Control requests should be made using credentials
+	 * such as cookies, authorization headers or TLS client certificates. It has no effect on same-origin requests.
+	 * If set to `true`, the request will include credentials such as cookies, authorization headers, TLS
+	 * client certificates, and so on. Moreover the response cookies will also be set.
+	 * If set to `false`, the cross-site request will not include credentials, and the response cookies from a different
+	 * domain will be ignored.
+	 *
+	 * This option is only conformed by {@link fetchTransferHandler | fetchTransferHandler	}
+	 *
+	 * @default 'same-origin'
+	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/withCredentials}
+	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials}
+	 * @internal
+	 */
+	withCrossDomainCredentials?: boolean;
 }
 
 export type HttpTransferHandler = TransferHandler<

package/src/{Util/Constants.ts → constants.ts}

@@ -3,11 +3,6 @@
 
 // Logging constants
 export const AWS_CLOUDWATCH_CATEGORY = 'Logging';
-export const NO_CREDS_ERROR_STRING = 'No credentials';
-export const RETRY_ERROR_CODES = [
-	'ResourceNotFoundException',
-	'InvalidSequenceTokenException',
-];
 
 /**
  * This Symbol is used to reference an internal-only PubSub provider that
@@ -23,11 +18,5 @@ export const INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER = hasSymbol
 export const USER_AGENT_HEADER = 'x-amz-user-agent';
 
 // Error exception code constants
-export const AUTH_CONFING_EXCEPTION = 'AuthConfigException';
-export const CACHE_LIST_EXCEPTION = 'CacheListException';
-export const I18N_EXCEPTION = 'I18NException';
-export const SERVICE_WORKER_EXCEPTION = 'ServiceWorkerException';
-export const STORAGE_CACHE_EXCEPTION = 'StorageCacheException';
-export const APPLICATION_ID_EXCEPTION = 'ApplicationIdException';
 export const NO_HUBCALLBACK_PROVIDED_EXCEPTION =
 	'NoHubcallbackProvidedException';

package/src/{Util/Errors.ts → errors/AmplifyError.ts}

@@ -1,19 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ErrorParams } from '../types/errors';
+import { AmplifyErrorParams } from '../types/errors';
 
-export function missingConfig(name: string) {
-	return new Error('Missing config value of ' + name);
-}
-export function invalidParameter(name: string) {
-	return new Error('Invalid parameter value of ' + name);
-}
-
-export enum AmplifyErrorString {
-	UNKNOWN = 'UnknownError',
-	PLATFORM_NOT_SUPPORTED_ERROR = 'PlatformNotSupportedError',
-}
 export class AmplifyError extends Error {
 	underlyingError?: Error | unknown;
 	recoverySuggestion?: string;
@@ -30,7 +19,7 @@ export class AmplifyError extends Error {
 		name,
 		recoverySuggestion,
 		underlyingError,
-	}: ErrorParams) {
+	}: AmplifyErrorParams) {
 		super(message);
 
 		this.name = name;
@@ -43,8 +32,3 @@ export class AmplifyError extends Error {
 		Object.setPrototypeOf(this, AmplifyError.prototype);
 	}
 }
-
-export const PlatformNotSupportedError = new AmplifyError({
-	name: AmplifyErrorString.PLATFORM_NOT_SUPPORTED_ERROR,
-	message: 'Function not supported on current platform',
-});

package/src/errors/PlatformNotSupportedError.ts

@@ -0,0 +1,14 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyErrorCode } from '../types';
+import { AmplifyError } from './AmplifyError';
+
+export class PlatformNotSupportedError extends AmplifyError {
+	constructor() {
+		super({
+			name: AmplifyErrorCode.PlatformNotSupported,
+			message: 'Function not supported on current platform',
+		});
+	}
+}

package/src/errors/createAssertionFunction.ts

@@ -0,0 +1,23 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyErrorMap, AssertionFunction } from '../types';
+import { AmplifyError } from './AmplifyError';
+
+export const createAssertionFunction =
+	(
+		errorMap: AmplifyErrorMap,
+		AssertionError = AmplifyError
+	): AssertionFunction =>
+	(assertion, name, additionalContext) => {
+		const { message, recoverySuggestion } = errorMap[name];
+		if (!assertion) {
+			throw new AssertionError({
+				name,
+				message: additionalContext
+					? `${message} ${additionalContext}`
+					: message,
+				recoverySuggestion,
+			});
+		}
+	};

package/src/errors/errorHelpers.ts

@@ -0,0 +1,20 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { createAssertionFunction } from './createAssertionFunction';
+import { AmplifyErrorCode, AmplifyErrorMap, AssertionFunction } from '../types';
+
+const amplifyErrorMap: AmplifyErrorMap<AmplifyErrorCode> = {
+	[AmplifyErrorCode.NoEndpointId]: {
+		message: 'Endpoint ID was not found and was unable to be created.',
+	},
+	[AmplifyErrorCode.PlatformNotSupported]: {
+		message: 'Function not supported on current platform.',
+	},
+	[AmplifyErrorCode.Unknown]: {
+		message: 'An unknown error occurred.',
+	},
+};
+
+export const assert: AssertionFunction<AmplifyErrorCode> =
+	createAssertionFunction(amplifyErrorMap);

package/src/errors/index.ts

@@ -0,0 +1,7 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export { AmplifyError } from './AmplifyError';
+export { createAssertionFunction } from './createAssertionFunction';
+export { PlatformNotSupportedError } from './PlatformNotSupportedError';
+export { assert } from './errorHelpers';

package/src/index.ts

@@ -23,12 +23,15 @@ export {
 	AuthConfig,
 	AuthUserPoolConfig,
 	AuthUserPoolAndIdentityPoolConfig,
+	APIConfig,
+	PredictionsConfig,
 	StorageAccessLevel,
 	StorageConfig,
 	GetCredentialsOptions,
 	ResourcesConfig,
 	LibraryOptions,
 	AnalyticsConfig,
+	GeoConfig,
 } from './singleton/types';
 export {
 	Amplify,
@@ -43,27 +46,29 @@ export {
 	getId,
 	GetCredentialsForIdentityInput,
 	GetCredentialsForIdentityOutput,
-} from './AwsClients/CognitoIdentity';
+} from './awsClients/cognitoIdentity';
 
 // Amplify-wide constructs
 export { UserProfile } from './types';
 
 // Storage helpers
 export {
-	StorageHelper,
-	MemoryStorage,
-	LocalStorage,
 	CookieStorage,
-	SessionStorage,
-	MemoryKeyValueStorage,
-} from './StorageHelper';
+	defaultStorage,
+	sessionStorage,
+	sharedInMemoryStorage,
+} from './storage';
 export { KeyValueStorageInterface } from './types';
 
 // Cache exports
-import { BrowserStorageCache } from './Cache/BrowserStorageCache';
-export { InMemoryCache } from './Cache/InMemoryCache';
-export { BrowserStorageCache };
-export { BrowserStorageCache as Cache }; // Maintain interoperability with React Native
+export { Cache } from './Cache';
+export { CacheConfig } from './Cache/types';
 
 // Internationalization utilities
 export { I18n } from './I18n';
+
+// Logging utilities
+export { ConsoleLogger } from './Logger';
+
+// Service worker
+export { ServiceWorker } from './ServiceWorker';