[Fix] Update API overload types

packages/aws-amplify/package.json

@@ -473,7 +473,7 @@
 			"name": "[Storage] getProperties (S3)",
 			"path": "./dist/esm/storage/index.mjs",
 			"import": "{ getProperties }",
-			"limit": "13.55 kB"
+			"limit": "13.56 kB"
 		},
 		{
 			"name": "[Storage] getUrl (S3)",

packages/storage/src/providers/s3/apis/copy.ts

@@ -5,10 +5,10 @@
 
 import {
 	CopyInput,
 	CopyInputWithKey,
 	CopyInputWithPath,
 	CopyOutput,
 	CopyOutputWithKey,
 	CopyOutputWithPath,
 } from '../types';
 
@@ -38,7 +38,8 @@
 	 * @throws validation: `StorageValidationErrorCode` - Thrown when
 	 * source or destination key is not defined.
 	 */
 	(input: CopyInputWithKey): Promise<CopyOutputWithKey>;
+	(input: CopyInput): Promise<CopyOutput>;
 }
 
 export const copy: Copy = <Output extends CopyOutput>(

packages/storage/src/providers/s3/apis/downloadData.ts

@@ -6,10 +6,10 @@
 
 import {
 	DownloadDataInput,
 	DownloadDataInputWithKey,
 	DownloadDataInputWithPath,
 	DownloadDataOutput,
 	DownloadDataOutputWithKey,
 	DownloadDataOutputWithPath,
 } from '../types';
 import { resolveS3ConfigAndInput } from '../utils/resolveS3ConfigAndInput';
@@ -19,7 +19,7 @@
 import { logger } from '../../../utils';
 import {
 	StorageDownloadDataOutput,
 	StorageItemWithKey,
 	StorageItemWithPath,
 } from '../../../types';
 import { STORAGE_INPUT_KEY } from '../utils/constants';
@@ -89,7 +89,8 @@
 	 * }
 	 *```
 	 */
 	(input: DownloadDataInputWithKey): DownloadDataOutputWithKey;
+	(input: DownloadDataInput): DownloadDataOutput;
 }
 
 export const downloadData: DownloadData = <Output extends DownloadDataOutput>(
@@ -110,7 +111,7 @@
 const downloadDataJob =
 	(downloadDataInput: DownloadDataInput, abortSignal: AbortSignal) =>
 	async (): Promise<
 		StorageDownloadDataOutput<StorageItemWithKey | StorageItemWithPath>
 	> => {
 		const { options: downloadDataOptions } = downloadDataInput;
 		const { bucket, keyPrefix, s3Config, identityId } =

packages/storage/src/providers/s3/apis/getProperties.ts

@@ -38,6 +38,7 @@ interface GetProperties {
 	 * @throws A `StorageValidationErrorCode` when API call parameters are invalid.
 	 */
 	(input: GetPropertiesInputWithKey): Promise<GetPropertiesOutputWithKey>;
+	(input: GetPropertiesInput): Promise<GetPropertiesOutput>;
 }
 
 export const getProperties: GetProperties = <

packages/storage/src/providers/s3/apis/getUrl.ts

@@ -50,6 +50,7 @@ interface GetUrl {
 	 *
 	 */
 	(input: GetUrlInputWithKey): Promise<GetUrlOutput>;
+	(input: GetUrlInput): Promise<GetUrlOutput>;
 }
 
 export const getUrl: GetUrl = (input: GetUrlInput): Promise<GetUrlOutput> =>

packages/storage/src/providers/s3/apis/list.ts

@@ -58,6 +58,8 @@ interface ListApi {
 	 * @throws validation: `StorageValidationErrorCode`  - thrown when there are issues with credentials
 	 */
 	(input?: ListAllInputWithPrefix): Promise<ListAllOutputWithPrefix>;
+	(input?: ListAllInput): Promise<ListAllOutput>;
+	(input?: ListPaginateInput): Promise<ListPaginateOutput>;
 }
 
 export const list: ListApi = <

packages/storage/src/providers/s3/apis/remove.ts

@@ -36,6 +36,7 @@ interface RemoveApi {
 	 * when there is no key or its empty.
 	 */
 	(input: RemoveInputWithKey): Promise<RemoveOutputWithKey>;
+	(input: RemoveInput): Promise<RemoveOutput>;
 }
 
 export const remove: RemoveApi = <Output extends RemoveOutput>(

packages/storage/src/providers/s3/apis/server/copy.ts

@@ -48,6 +48,11 @@ interface Copy {
 		contextSpec: AmplifyServer.ContextSpec,
 		input: CopyInputWithKey,
 	): Promise<CopyOutputWithKey>;
+
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input: CopyInput,
+	): Promise<CopyOutput>;
 }
 
 export const copy: Copy = <Output extends CopyOutput>(

packages/storage/src/providers/s3/apis/server/getProperties.ts

@@ -48,6 +48,10 @@ interface GetProperties {
 		contextSpec: AmplifyServer.ContextSpec,
 		input: GetPropertiesInputWithKey,
 	): Promise<GetPropertiesOutputWithKey>;
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input: GetPropertiesInput,
+	): Promise<GetPropertiesOutput>;
 }
 
 export const getProperties: GetProperties = <

packages/storage/src/providers/s3/apis/server/getUrl.ts

@@ -60,6 +60,10 @@ interface GetUrl {
 		contextSpec: AmplifyServer.ContextSpec,
 		input: GetUrlInputWithKey,
 	): Promise<GetUrlOutput>;
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input: GetUrlInput,
+	): Promise<GetUrlOutput>;
 }
 export const getUrl: GetUrl = async (
 	contextSpec: AmplifyServer.ContextSpec,

packages/storage/src/providers/s3/apis/server/list.ts

@@ -74,6 +74,14 @@ interface ListApi {
 		contextSpec: AmplifyServer.ContextSpec,
 		input?: ListAllInputWithPrefix,
 	): Promise<ListAllOutputWithPrefix>;
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input?: ListPaginateInput,
+	): Promise<ListPaginateOutput>;
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input?: ListAllInput,
+	): Promise<ListAllOutput>;
 }
 
 export const list: ListApi = <

packages/storage/src/providers/s3/apis/server/remove.ts

@@ -46,6 +46,10 @@ interface RemoveApi {
 		contextSpec: AmplifyServer.ContextSpec,
 		input: RemoveInputWithKey,
 	): Promise<RemoveOutputWithKey>;
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input: RemoveInput,
+	): Promise<RemoveOutput>;
 }
 
 export const remove: RemoveApi = <Output extends RemoveOutput>(

packages/storage/src/providers/s3/apis/uploadData/index.ts

@@ -126,6 +126,7 @@ interface UploadData {
 	 * ```
 	 */
 	(input: UploadDataInputWithKey): UploadDataOutputWithKey;
+	(input: UploadDataInput): UploadDataOutput;
 }
 
 export const uploadData: UploadData = <Output extends UploadDataOutput>(

packages/storage/src/providers/s3/utils/isInputWithPath.ts

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {
-	StorageOperationInputType,
+	StorageOperationInput,
 	StorageOperationInputWithPath,
 } from '../../../types/inputs';
 
 export const isInputWithPath = (
-	input: StorageOperationInputType,
+	input: StorageOperationInput,
 ): input is StorageOperationInputWithPath => {
 	return input.path !== undefined;
 };

packages/storage/src/providers/s3/utils/validateStorageOperationInput.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { StorageOperationInputType as Input } from '../../../types/inputs';
+import { StorageOperationInput as Input } from '../../../types/inputs';
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { StorageValidationErrorCode } from '../../../errors/types/validation';
 

packages/storage/src/types/index.ts

@@ -8,7 +8,6 @@ export {
 	UploadTask,
 } from './common';
 export {
-	StorageOperationInput,
 	StorageGetPropertiesInputWithKey,
 	StorageGetPropertiesInputWithPath,
 	StorageListInputWithPrefix,

packages/storage/src/types/inputs.ts

@@ -9,9 +9,7 @@ import {
 	StorageOptions,
 } from './options';
 
-// TODO: rename to StorageOperationInput once the other type with
-// the same named is removed
-export type StorageOperationInputType = StrictUnion<
+export type StorageOperationInput = StrictUnion<
 	StorageOperationInputWithKey | StorageOperationInputWithPath
 >;
 export type StorageOperationInputWithPrefixPath = StrictUnion<
@@ -43,15 +41,9 @@ export type StorageDownloadDataInputWithKey<Options extends StorageOptions> =
 export type StorageDownloadDataInputWithPath<Options> =
 	StorageOperationInputWithPath & StorageOperationOptionsInput<Options>;
 
-// TODO: This needs to be removed after refactor of all storage APIs
-export interface StorageOperationInput<Options extends StorageOptions> {
-	key: string;
-	options?: Options;
-}
-
 /** @deprecated Use {@link StorageGetPropertiesInputWithPath} instead. */
 export type StorageGetPropertiesInputWithKey<Options extends StorageOptions> =
-	StorageOperationInputWithKey & StorageOperationInput<Options>;
+	StorageOperationInputWithKey & StorageOperationOptionsInput<Options>;
 
 export type StorageGetPropertiesInputWithPath<Options> =
 	StorageOperationInputWithPath & StorageOperationOptionsInput<Options>;
@@ -73,7 +65,7 @@ export type StorageListInputWithPath<
 
 /** @deprecated Use {@link StorageGetUrlInputWithPath} instead. */
 export type StorageGetUrlInputWithKey<Options extends StorageOptions> =
-	StorageOperationInputWithKey & StorageOperationInput<Options>;
+	StorageOperationInputWithKey & StorageOperationOptionsInput<Options>;
 
 export type StorageGetUrlInputWithPath<Options> =
 	StorageOperationInputWithPath & StorageOperationOptionsInput<Options>;