@aws-amplify/storage 6.0.20 → 6.0.21-gen2-storage.7da2b89.0

package/src/providers/s3/apis/server/getUrl.ts

@@ -6,12 +6,63 @@ import {
 	getAmplifyServerContext,
 } from '@aws-amplify/core/internals/adapter-core';
 
-import { GetUrlInput, GetUrlOutput } from '../../types';
+import {
+	GetUrlInput,
+	GetUrlInputKey,
+	GetUrlInputPath,
+	GetUrlOutput,
+} from '../../types';
 import { getUrl as getUrlInternal } from '../internal/getUrl';
 
-export const getUrl = async (
+interface GetUrl {
+	/**
+	 * Get a temporary presigned URL to download the specified S3 object.
+	 * The presigned URL expires when the associated role used to sign the request expires or
+	 * the option  `expiresIn` is reached. The `expiresAt` property in the output object indicates when the URL MAY expire.
+	 *
+	 * By default, it will not validate the object that exists in S3. If you set the `options.validateObjectExistence`
+	 * to true, this method will verify the given object already exists in S3 before returning a presigned
+	 * URL, and will throw `StorageError` if the object does not exist.
+	 *
+	 * @param contextSpec - The isolated server context.
+	 * @param input - The `GetUrlInputPath` object.
+	 * @returns Presigned URL and timestamp when the URL MAY expire.
+	 * @throws service: `S3Exception` - thrown when checking for existence of the object
+	 * @throws validation: `StorageValidationErrorCode` - Validation errors
+	 * thrown either username or key are not defined.
+	 *
+	 */
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input: GetUrlInputPath,
+	): Promise<GetUrlOutput>;
+	/**
+	 * @deprecated The `key` and `accessLevel` parameters are deprecated and may be removed in the next major version.
+	 * Please use {@link https://docs.amplify.aws/javascript/build-a-backend/storage/download/#generate-a-download-url | path} instead.
+	 *
+	 * Get a temporary presigned URL to download the specified S3 object.
+	 * The presigned URL expires when the associated role used to sign the request expires or
+	 * the option  `expiresIn` is reached. The `expiresAt` property in the output object indicates when the URL MAY expire.
+	 *
+	 * By default, it will not validate the object that exists in S3. If you set the `options.validateObjectExistence`
+	 * to true, this method will verify the given object already exists in S3 before returning a presigned
+	 * URL, and will throw `StorageError` if the object does not exist.
+	 *
+	 * @param contextSpec - The isolated server context.
+	 * @param input - The `GetUrlInputKey` object.
+	 * @returns Presigned URL and timestamp when the URL MAY expire.
+	 * @throws service: `S3Exception` - thrown when checking for existence of the object
+	 * @throws validation: `StorageValidationErrorCode` - Validation errors
+	 * thrown either username or key are not defined.
+	 *
+	 */
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input: GetUrlInputKey,
+	): Promise<GetUrlOutput>;
+}
+export const getUrl: GetUrl = async (
 	contextSpec: AmplifyServer.ContextSpec,
 	input: GetUrlInput,
-): Promise<GetUrlOutput> => {
-	return getUrlInternal(getAmplifyServerContext(contextSpec).amplify, input);
-};
+): Promise<GetUrlOutput> =>
+	getUrlInternal(getAmplifyServerContext(contextSpec).amplify, input);

package/src/providers/s3/apis/server/remove.ts

@@ -6,12 +6,53 @@ import {
 	getAmplifyServerContext,
 } from '@aws-amplify/core/internals/adapter-core';
 
-import { RemoveInput, RemoveOutput } from '../../types';
+import {
+	RemoveInput,
+	RemoveInputKey,
+	RemoveInputPath,
+	RemoveOutput,
+	RemoveOutputKey,
+	RemoveOutputPath,
+} from '../../types';
 import { remove as removeInternal } from '../internal/remove';
 
-export const remove = (
+interface RemoveApi {
+	/**
+	 * Remove a file from your S3 bucket.
+	 * @param input - The `RemoveInputPath` object.
+	 * @param contextSpec - The context spec used to get the Amplify server context.
+	 * @return Output containing the removed object path.
+	 * @throws service: `S3Exception` - S3 service errors thrown while while removing the object.
+	 * @throws validation: `StorageValidationErrorCode` - Validation errors thrown
+	 * when there is no path or path is empty or path has a leading slash.
+	 */
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input: RemoveInputPath,
+	): Promise<RemoveOutputPath>;
+	/**
+	 * @deprecated The `key` and `accessLevel` parameters are deprecated and may be removed in the next major version.
+	 * Please use {@link https://docs.amplify.aws/react/build-a-backend/storage/remove | path} instead.
+	 *
+	 * Remove a file from your S3 bucket.
+	 * @param input - The `RemoveInputKey` object.
+	 * @param contextSpec - The context spec used to get the Amplify server context.
+	 * @return Output containing the removed object key
+	 * @throws service: `S3Exception` - S3 service errors thrown while while removing the object
+	 * @throws validation: `StorageValidationErrorCode` - Validation errors thrown
+	 * when there is no key or its empty.
+	 */
+	(
+		contextSpec: AmplifyServer.ContextSpec,
+		input: RemoveInputKey,
+	): Promise<RemoveOutputKey>;
+}
+
+export const remove: RemoveApi = <Output extends RemoveOutput>(
 	contextSpec: AmplifyServer.ContextSpec,
 	input: RemoveInput,
-): Promise<RemoveOutput> => {
-	return removeInternal(getAmplifyServerContext(contextSpec).amplify, input);
-};
+): Promise<Output> =>
+	removeInternal(
+		getAmplifyServerContext(contextSpec).amplify,
+		input,
+	) as Promise<Output>;

package/src/providers/s3/apis/uploadData/multipart/uploadHandlers.ts

@@ -6,7 +6,7 @@ import { StorageAction } from '@aws-amplify/core/internals/utils';
 
 import { UploadDataInput } from '../../../types';
 import { resolveS3ConfigAndInput } from '../../../utils';
-import { Item as S3Item } from '../../../types/outputs';
+import { ItemKey as S3Item } from '../../../types/outputs';
 import {
 	DEFAULT_ACCESS_LEVEL,
 	DEFAULT_QUEUE_SIZE,

package/src/providers/s3/apis/uploadData/putObjectJob.ts

@@ -6,7 +6,7 @@ import { StorageAction } from '@aws-amplify/core/internals/utils';
 
 import { UploadDataInput } from '../../types';
 import { calculateContentMd5, resolveS3ConfigAndInput } from '../../utils';
-import { Item as S3Item } from '../../types/outputs';
+import { ItemKey as S3Item } from '../../types/outputs';
 import { putObject } from '../../utils/client';
 import { getStorageUserAgentValue } from '../../utils/userAgent';
 

package/src/providers/s3/types/index.ts

@@ -2,35 +2,56 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export {
-	GetUrlOptions,
+	GetUrlOptionsKey,
+	GetUrlOptionsPath,
 	UploadDataOptions,
-	GetPropertiesOptions,
+	GetPropertiesOptionsKey,
+	GetPropertiesOptionsPath,
 	ListAllOptions,
 	ListPaginateOptions,
 	RemoveOptions,
-	DownloadDataOptions,
-	CopyDestinationOptions,
-	CopySourceOptions,
+	DownloadDataOptionsPath,
+	DownloadDataOptionsKey,
+	CopyDestinationOptionsKey,
+	CopySourceOptionsKey,
 } from './options';
 export {
 	DownloadDataOutput,
+	DownloadDataOutputKey,
+	DownloadDataOutputPath,
 	GetUrlOutput,
 	UploadDataOutput,
 	ListOutputItem,
 	ListAllOutput,
 	ListPaginateOutput,
 	GetPropertiesOutput,
+	GetPropertiesOutputKey,
+	GetPropertiesOutputPath,
 	CopyOutput,
+	CopyOutputKey,
+	CopyOutputPath,
 	RemoveOutput,
+	RemoveOutputKey,
+	RemoveOutputPath,
 } from './outputs';
 export {
 	CopyInput,
+	CopyInputKey,
+	CopyInputPath,
 	GetPropertiesInput,
+	GetPropertiesInputKey,
+	GetPropertiesInputPath,
 	GetUrlInput,
+	GetUrlInputKey,
+	GetUrlInputPath,
 	ListAllInput,
 	ListPaginateInput,
+	RemoveInputKey,
+	RemoveInputPath,
 	RemoveInput,
 	DownloadDataInput,
+	DownloadDataInputKey,
+	DownloadDataInputPath,
 	UploadDataInput,
 } from './inputs';
 export { S3Exception } from './errors';

package/src/providers/s3/types/inputs.ts

@@ -1,21 +1,31 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { StrictUnion } from '@aws-amplify/core/internals/utils';
+
 import {
-	StorageCopyInput,
-	StorageDownloadDataInput,
-	StorageGetPropertiesInput,
-	StorageGetUrlInput,
+	StorageCopyInputKey,
+	StorageCopyInputPath,
+	StorageDownloadDataInputKey,
+	StorageDownloadDataInputPath,
+	StorageGetPropertiesInputKey,
+	StorageGetPropertiesInputPath,
+	StorageGetUrlInputKey,
+	StorageGetUrlInputPath,
 	StorageListInput,
-	StorageRemoveInput,
+	StorageRemoveInputKey,
+	StorageRemoveInputPath,
 	StorageUploadDataInput,
 } from '../../../types';
 import {
-	CopyDestinationOptions,
-	CopySourceOptions,
-	DownloadDataOptions,
-	GetPropertiesOptions,
-	GetUrlOptions,
+	CopyDestinationOptionsKey,
+	CopySourceOptionsKey,
+	DownloadDataOptionsKey,
+	DownloadDataOptionsPath,
+	GetPropertiesOptionsKey,
+	GetPropertiesOptionsPath,
+	GetUrlOptionsKey,
+	GetUrlOptionsPath,
 	ListAllOptions,
 	ListPaginateOptions,
 	RemoveOptions,
@@ -26,21 +36,36 @@ import {
 /**
  * Input type for S3 copy API.
  */
-export type CopyInput = StorageCopyInput<
-	CopySourceOptions,
-	CopyDestinationOptions
+export type CopyInput = CopyInputKey | CopyInputPath;
+
+/** @deprecated Use {@link CopyInputPath} instead. */
+export type CopyInputKey = StorageCopyInputKey<
+	CopySourceOptionsKey,
+	CopyDestinationOptionsKey
 >;
+export type CopyInputPath = StorageCopyInputPath;
 
 /**
  * Input type for S3 getProperties API.
  */
-export type GetPropertiesInput =
-	StorageGetPropertiesInput<GetPropertiesOptions>;
+export type GetPropertiesInput = StrictUnion<
+	GetPropertiesInputKey | GetPropertiesInputPath
+>;
+
+/** @deprecated Use {@link GetPropertiesInputPath} instead. */
+export type GetPropertiesInputKey =
+	StorageGetPropertiesInputKey<GetPropertiesOptionsKey>;
+export type GetPropertiesInputPath =
+	StorageGetPropertiesInputPath<GetPropertiesOptionsPath>;
 
 /**
  * Input type for S3 getUrl API.
  */
-export type GetUrlInput = StorageGetUrlInput<GetUrlOptions>;
+export type GetUrlInput = StrictUnion<GetUrlInputKey | GetUrlInputPath>;
+
+/** @deprecated Use {@link GetUrlInputPath} instead. */
+export type GetUrlInputKey = StorageGetUrlInputKey<GetUrlOptionsKey>;
+export type GetUrlInputPath = StorageGetUrlInputPath<GetUrlOptionsPath>;
 
 /**
  * Input type for S3 list API. Lists all bucket objects.
@@ -52,15 +77,36 @@ export type ListAllInput = StorageListInput<ListAllOptions>;
  */
 export type ListPaginateInput = StorageListInput<ListPaginateOptions>;
 
+/**
+ * @deprecated Use {@link RemoveInputPath} instead.
+ * Input type with key for S3 remove API.
+ */
+export type RemoveInputKey = StorageRemoveInputKey<RemoveOptions>;
+
+/**
+ * Input type with path for S3 remove API.
+ */
+export type RemoveInputPath = StorageRemoveInputPath<
+	Omit<RemoveOptions, 'accessLevel'>
+>;
+
 /**
  * Input type for S3 remove API.
  */
-export type RemoveInput = StorageRemoveInput<RemoveOptions>;
+export type RemoveInput = StrictUnion<RemoveInputKey | RemoveInputPath>;
 
 /**
  * Input type for S3 downloadData API.
  */
-export type DownloadDataInput = StorageDownloadDataInput<DownloadDataOptions>;
+export type DownloadDataInput = StrictUnion<
+	DownloadDataInputKey | DownloadDataInputPath
+>;
+
+/** @deprecated Use {@link DownloadDataInputPath} instead. */
+export type DownloadDataInputKey =
+	StorageDownloadDataInputKey<DownloadDataOptionsKey>;
+export type DownloadDataInputPath =
+	StorageDownloadDataInputPath<DownloadDataOptionsPath>;
 
 /**
  * Input type for S3 uploadData API.

package/src/providers/s3/types/options.ts

@@ -18,11 +18,22 @@ interface CommonOptions {
 	useAccelerateEndpoint?: boolean;
 }
 
+/** @deprecated This may be removed in the next major version. */
 type ReadOptions =
-	| { accessLevel?: 'guest' | 'private' }
-	| { accessLevel: 'protected'; targetIdentityId?: string };
-
+	| {
+			/** @deprecated This may be removed in the next major version. */
+			accessLevel?: 'guest' | 'private';
+	  }
+	| {
+			/** @deprecated This may be removed in the next major version. */
+			accessLevel: 'protected';
+			/** @deprecated This may be removed in the next major version. */
+			targetIdentityId?: string;
+	  };
+
+/** @deprecated This may be removed in the next major version. */
 interface WriteOptions {
+	/** @deprecated This may be removed in the next major version. */
 	accessLevel?: StorageAccessLevel;
 }
 
@@ -46,7 +57,9 @@ interface TransferOptions {
 /**
  * Input options type for S3 getProperties API.
  */
-export type GetPropertiesOptions = ReadOptions & CommonOptions;
+/** @deprecated Use {@link GetPropertiesOptionsPath} instead. */
+export type GetPropertiesOptionsKey = ReadOptions & CommonOptions;
+export type GetPropertiesOptionsPath = CommonOptions;
 
 /**
  * Input options type for S3 getProperties API.
@@ -70,28 +83,34 @@ export type ListPaginateOptions = StorageListPaginateOptions &
 /**
  * Input options type for S3 getUrl API.
  */
-export type GetUrlOptions = ReadOptions &
-	CommonOptions & {
-		/**
-		 * Whether to head object to make sure the object existence before downloading.
-		 * @default false
-		 */
-		validateObjectExistence?: boolean;
-		/**
-		 * Number of seconds till the URL expires.
-		 * @default 900 (15 minutes)
-		 */
-		expiresIn?: number;
-	};
+export type GetUrlOptions = CommonOptions & {
+	/**
+	 * Whether to head object to make sure the object existence before downloading.
+	 * @default false
+	 */
+	validateObjectExistence?: boolean;
+	/**
+	 * Number of seconds till the URL expires.
+	 * @default 900 (15 minutes)
+	 */
+	expiresIn?: number;
+};
+
+/** @deprecated Use {@link GetUrlOptionsPath} instead. */
+export type GetUrlOptionsKey = ReadOptions & GetUrlOptions;
+export type GetUrlOptionsPath = GetUrlOptions;
 
 /**
  * Input options type for S3 downloadData API.
  */
-export type DownloadDataOptions = ReadOptions &
-	CommonOptions &
+export type DownloadDataOptions = CommonOptions &
 	TransferOptions &
 	BytesRangeOptions;
 
+/** @deprecated Use {@link DownloadDataOptionsPath} instead. */
+export type DownloadDataOptionsKey = ReadOptions & DownloadDataOptions;
+export type DownloadDataOptionsPath = DownloadDataOptions;
+
 export type UploadDataOptions = WriteOptions &
 	CommonOptions &
 	TransferOptions & {
@@ -117,11 +136,15 @@ export type UploadDataOptions = WriteOptions &
 		metadata?: Record<string, string>;
 	};
 
-export type CopySourceOptions = ReadOptions & {
+/** @deprecated This may be removed in the next major version. */
+export type CopySourceOptionsKey = ReadOptions & {
+	/** @deprecated This may be removed in the next major version. */
 	key: string;
 };
 
-export type CopyDestinationOptions = WriteOptions & {
+/** @deprecated This may be removed in the next major version. */
+export type CopyDestinationOptionsKey = WriteOptions & {
+	/** @deprecated This may be removed in the next major version. */
 	key: string;
 };
 

package/src/providers/s3/types/outputs.ts

@@ -1,19 +1,22 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { StrictUnion } from '@aws-amplify/core/internals/utils';
+
 import {
 	DownloadTask,
 	StorageDownloadDataOutput,
 	StorageGetUrlOutput,
-	StorageItem,
+	StorageItemKey,
+	StorageItemPath,
 	StorageListOutput,
 	UploadTask,
 } from '../../../types';
 
 /**
- * type for S3 item.
+ * Base type for an S3 item.
  */
-export interface Item extends StorageItem {
+export interface ItemBase {
 	/**
 	 * VersionId used to reference a specific version of the object.
 	 */
@@ -24,15 +27,29 @@ export interface Item extends StorageItem {
 	contentType?: string;
 }
 
+/**
+ * @deprecated Use {@link ItemPath} instead.
+ */
+export type ItemKey = ItemBase & StorageItemKey;
+export type ItemPath = ItemBase & StorageItemPath;
+
 /**
  * type for S3 list item.
  */
-export type ListOutputItem = Omit<StorageItem, 'metadata'>;
+export type ListOutputItem = Omit<ItemKey, 'metadata'>;
+
+/** @deprecated Use {@link DownloadDataOutputPath} instead. */
+export type DownloadDataOutputKey = DownloadTask<
+	StorageDownloadDataOutput<ItemKey>
+>;
+export type DownloadDataOutputPath = DownloadTask<
+	StorageDownloadDataOutput<ItemPath>
+>;
 
 /**
  * Output type for S3 downloadData API.
  */
-export type DownloadDataOutput = DownloadTask<StorageDownloadDataOutput<Item>>;
+export type DownloadDataOutput = DownloadDataOutputKey | DownloadDataOutputPath;
 
 /**
  * Output type for S3 getUrl API.
@@ -42,12 +59,18 @@ export type GetUrlOutput = StorageGetUrlOutput;
 /**
  * Output type for S3 uploadData API.
  */
-export type UploadDataOutput = UploadTask<Item>;
+export type UploadDataOutput = UploadTask<ItemKey>;
+
+/** @deprecated Use {@link GetPropertiesOutputPath} instead. */
+export type GetPropertiesOutputKey = ItemKey;
+export type GetPropertiesOutputPath = ItemPath;
 
 /**
  * Output type for S3 getProperties API.
  */
-export type GetPropertiesOutput = Item;
+export type GetPropertiesOutput =
+	| GetPropertiesOutputKey
+	| GetPropertiesOutputPath;
 
 /**
  * Output type for S3 list API. Lists all bucket objects.
@@ -62,11 +85,25 @@ export type ListPaginateOutput = StorageListOutput<ListOutputItem> & {
 };
 
 /**
- * Output type for S3 copy API.
+ * @deprecated Use {@link CopyOutputPath} instead.
  */
-export type CopyOutput = Pick<Item, 'key'>;
+export type CopyOutputKey = Pick<ItemKey, 'key'>;
+export type CopyOutputPath = Pick<ItemPath, 'path'>;
+
+export type CopyOutput = StrictUnion<CopyOutputKey | CopyOutputPath>;
 
 /**
  * Output type for S3 remove API.
  */
-export type RemoveOutput = Pick<Item, 'key'>;
+export type RemoveOutput = StrictUnion<RemoveOutputKey | RemoveOutputPath>;
+
+/**
+ * @deprecated Use {@link RemoveOutputPath} instead.
+ * Output helper type with key for S3 remove API.
+ */
+export type RemoveOutputKey = Pick<ItemKey, 'key'>;
+
+/**
+ * Output helper type with path for S3 remove API.
+ */
+export type RemoveOutputPath = Pick<ItemPath, 'path'>;

package/src/providers/s3/utils/constants.ts

@@ -19,3 +19,6 @@ export const MAX_PARTS_COUNT = 10000;
 export const DEFAULT_QUEUE_SIZE = 4;
 
 export const UPLOADS_STORAGE_KEY = '__uploadInProgress';
+
+export const STORAGE_INPUT_KEY = 'key';
+export const STORAGE_INPUT_PATH = 'path';

package/src/providers/s3/utils/index.ts

@@ -4,3 +4,5 @@
 export { calculateContentMd5 } from './md5';
 export { resolveS3ConfigAndInput } from './resolveS3ConfigAndInput';
 export { createDownloadTask, createUploadTask } from './transferTask';
+export { validateStorageOperationInput } from './validateStorageOperationInput';
+export { isInputWithPath } from './isInputWithPath';

package/src/providers/s3/utils/isInputWithPath.ts

@@ -0,0 +1,13 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+	StorageOperationInputPath,
+	StorageOperationInputType,
+} from '../../../types/inputs';
+
+export const isInputWithPath = (
+	input: StorageOperationInputType,
+): input is StorageOperationInputPath => {
+	return input.path !== undefined;
+};

package/src/providers/s3/utils/resolveS3ConfigAndInput.ts

@@ -5,7 +5,6 @@ import { AmplifyClassV6, StorageAccessLevel } from '@aws-amplify/core';
 
 import { assertValidationError } from '../../../errors/utils/assertValidationError';
 import { StorageValidationErrorCode } from '../../../errors/types/validation';
-import { StorageError } from '../../../errors/StorageError';
 import { resolvePrefix as defaultPrefixResolver } from '../../../utils/resolvePrefix';
 import { ResolvedS3Config } from '../types/options';
 
@@ -22,6 +21,7 @@ interface ResolvedS3ConfigAndInput {
 	bucket: string;
 	keyPrefix: string;
 	isObjectLockEnabled?: boolean;
+	identityId?: string;
 }
 
 /**
@@ -30,7 +30,7 @@ interface ResolvedS3ConfigAndInput {
  * @param {AmplifyClassV6} amplify The Amplify instance.
  * @param {S3ApiOptions} apiOptions The input options for S3 provider.
  * @returns {Promise<ResolvedS3ConfigAndInput>} The resolved common input options for S3 API handlers.
- * @throws A {@link StorageError} with `error.name` from {@link StorageValidationErrorCode} indicating invalid
+ * @throws A `StorageError` with `error.name` from `StorageValidationErrorCode` indicating invalid
  *   configurations or Amplify library options.
  *
  * @internal
@@ -84,6 +84,7 @@ export const resolveS3ConfigAndInput = async (
 		},
 		bucket,
 		keyPrefix,
+		identityId,
 		isObjectLockEnabled,
 	};
 };

package/src/providers/s3/utils/validateStorageOperationInput.ts

@@ -0,0 +1,39 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { StorageOperationInputType as Input } from '../../../types/inputs';
+import { assertValidationError } from '../../../errors/utils/assertValidationError';
+import { StorageValidationErrorCode } from '../../../errors/types/validation';
+
+import { isInputWithPath } from './isInputWithPath';
+import { STORAGE_INPUT_KEY, STORAGE_INPUT_PATH } from './constants';
+
+export const validateStorageOperationInput = (
+	input: Input,
+	identityId?: string,
+) => {
+	assertValidationError(
+		// Key present without a path
+		(!!(input as Input).key && !(input as Input).path) ||
+			// Path present without a key
+			(!(input as Input).key && !!(input as Input).path),
+		StorageValidationErrorCode.InvalidStorageOperationInput,
+	);
+
+	if (isInputWithPath(input)) {
+		const { path } = input;
+		const objectKey = typeof path === 'string' ? path : path({ identityId });
+
+		assertValidationError(
+			!objectKey.startsWith('/'),
+			StorageValidationErrorCode.InvalidStoragePathInput,
+		);
+
+		return {
+			inputType: STORAGE_INPUT_PATH,
+			objectKey,
+		};
+	} else {
+		return { inputType: STORAGE_INPUT_KEY, objectKey: input.key };
+	}
+};

package/src/types/index.ts

@@ -10,12 +10,17 @@ export {
 export {
 	StorageOperationInput,
 	StorageListInput,
-	StorageGetPropertiesInput,
-	StorageRemoveInput,
-	StorageDownloadDataInput,
+	StorageGetPropertiesInputKey,
+	StorageGetPropertiesInputPath,
+	StorageRemoveInputPath,
+	StorageRemoveInputKey,
+	StorageDownloadDataInputKey,
+	StorageDownloadDataInputPath,
 	StorageUploadDataInput,
-	StorageCopyInput,
-	StorageGetUrlInput,
+	StorageCopyInputKey,
+	StorageCopyInputPath,
+	StorageGetUrlInputKey,
+	StorageGetUrlInputPath,
 	StorageUploadDataPayload,
 } from './inputs';
 export {
@@ -26,6 +31,8 @@ export {
 } from './options';
 export {
 	StorageItem,
+	StorageItemKey,
+	StorageItemPath,
 	StorageListOutput,
 	StorageDownloadDataOutput,
 	StorageGetUrlOutput,