@aws-amplify/storage 4.5.2-next.20 → 4.5.2-next.32

package/src/Storage.ts

@@ -11,7 +11,11 @@
  * and limitations under the License.
  */
 
-import { Amplify, ConsoleLogger as Logger, Parser } from '@aws-amplify/core';
+import {
+	Amplify,
+	ConsoleLogger as Logger,
+	parseAWSExports,
+} from '@aws-amplify/core';
 import { AWSS3Provider } from './providers';
 import {
 	StorageCopySource,
@@ -130,11 +134,11 @@ export class Storage {
 		logger.debug('configure Storage');
 		if (!config) return this._config;
 
-		const amplifyConfig = Parser.parseMobilehubConfig(config);
+		const amplifyConfig = parseAWSExports(config);
 
-		const storageKeysFromConfig = Object.keys(amplifyConfig.Storage);
+		const storageConfig = amplifyConfig.Storage ?? {};
 
-		const storageArrayKeys = [
+		const defaultProviderConfigKeys = [
 			'bucket',
 			'region',
 			'level',
@@ -147,32 +151,33 @@ export class Storage {
 			'SSEKMSKeyId',
 		];
 
-		const isInStorageArrayKeys = (k: string) =>
-			storageArrayKeys.some(x => x === k);
-		const checkConfigKeysFromArray = (k: string[]) =>
-			k.find(k => isInStorageArrayKeys(k));
+		const hasDefaultProviderConfigKeys = (config: object) =>
+			Object.keys(config).find(key => defaultProviderConfigKeys.includes(key));
 
 		if (
-			storageKeysFromConfig &&
-			checkConfigKeysFromArray(storageKeysFromConfig) &&
-			!amplifyConfig.Storage[DEFAULT_PROVIDER]
+			hasDefaultProviderConfigKeys(storageConfig) &&
+			!storageConfig[DEFAULT_PROVIDER]
 		) {
-			amplifyConfig.Storage[DEFAULT_PROVIDER] = {};
+			storageConfig[DEFAULT_PROVIDER] = {};
 		}
 
-		Object.entries(amplifyConfig.Storage).map(([key, value]) => {
-			if (key && isInStorageArrayKeys(key) && value !== undefined) {
-				amplifyConfig.Storage[DEFAULT_PROVIDER][key] = value;
-				delete amplifyConfig.Storage[key];
+		Object.entries(storageConfig).forEach(([key, value]) => {
+			if (
+				key &&
+				defaultProviderConfigKeys.includes(key) &&
+				value !== undefined
+			) {
+				storageConfig[DEFAULT_PROVIDER][key] = value;
+				delete storageConfig[key];
 			}
 		});
 
 		// only update new values for each provider
-		Object.keys(amplifyConfig.Storage).forEach(providerName => {
-			if (typeof amplifyConfig.Storage[providerName] !== 'string') {
+		Object.keys(storageConfig).forEach(providerName => {
+			if (typeof storageConfig[providerName] !== 'string') {
 				this._config[providerName] = {
 					...this._config[providerName],
-					...amplifyConfig.Storage[providerName],
+					...storageConfig[providerName],
 				};
 			}
 		});
@@ -440,8 +445,3 @@ const getInstance = () => {
 
 export const StorageInstance: Storage = getInstance();
 Amplify.register(StorageInstance);
-
-/**
- * @deprecated use named import
- */
-export default Storage;

package/src/index.ts

@@ -13,11 +13,6 @@
 
 import { Storage, StorageInstance } from './Storage';
 
-/**
- * @deprecated use named import
- */
-export default StorageInstance;
-
 export { Storage as StorageClass, StorageInstance as Storage };
 export * from './providers';
 export * from './types';

package/src/providers/AWSS3Provider.ts

@@ -13,10 +13,10 @@
 import {
 	ConsoleLogger as Logger,
 	Credentials,
-	Parser,
 	ICredentials,
 	StorageHelper,
 	Hub,
+	parseAWSExports,
 } from '@aws-amplify/core';
 import {
 	S3Client,
@@ -137,7 +137,7 @@ export class AWSS3Provider implements StorageProvider {
 	public configure(config?): object {
 		logger.debug('configure Storage', config);
 		if (!config) return this._config;
-		const amplifyConfig = Parser.parseMobilehubConfig(config);
+		const amplifyConfig = parseAWSExports(config);
 		this._config = Object.assign({}, this._config, amplifyConfig.Storage);
 		if (!this._config.bucket) {
 			logger.debug('Do not have bucket yet');
@@ -857,8 +857,3 @@ export class AWSS3Provider implements StorageProvider {
 		return s3client;
 	}
 }
-
-/**
- * @deprecated use named import
- */
-export default AWSS3Provider;

package/build.js

@@ -1,5 +0,0 @@
-'use strict';
-
-const build = require('../../scripts/build');
-
-build(process.argv[2], process.argv[3]);