@aws-amplify/storage 6.0.28 → 6.0.29-gen2-storage.e54bfa9.0

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

@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 import {
 	AmplifyServer,
 	getAmplifyServerContext,
@@ -9,45 +8,78 @@ import {
 import {
 	ListAllInput,
 	ListAllOutput,
+	ListAllWithPathInput,
+	ListAllWithPathOutput,
 	ListPaginateInput,
 	ListPaginateOutput,
-	S3Exception,
+	ListPaginateWithPathInput,
+	ListPaginateWithPathOutput,
 } from '../../types';
 import { list as listInternal } from '../internal/list';
-import { StorageValidationErrorCode } from '../../../../errors/types/validation';
 
-interface ListApi {
-	/**
-	 * Lists bucket objects with pagination.
-	 * @param {ListPaginateInput} input The input object
-	 * @return {Promise<ListPaginateOutput>} - Promise resolves to list of keys and metadata with
-	 * pageSize defaulting to 1000. Additionally the result will include a nextToken if there are more items to retrieve
-	 * @throws service: {@link S3Exception} - S3 service errors thrown when checking for existence of bucket
-	 * @throws validation: {@link StorageValidationErrorCode } - thrown when there are issues with credentials
-	 */
-	(
-		contextSpec: AmplifyServer.ContextSpec,
-		input?: ListPaginateInput,
-	): Promise<ListPaginateOutput>;
-	/**
-	 * Lists all bucket objects.
-	 * @param {ListAllInput} input The input object
-	 * @return {Promise<ListAllOutput>} - Promise resolves to list of keys and metadata for all objects in path
-	 * @throws service: {@link S3Exception} - S3 service errors thrown when checking for existence of bucket
-	 * @throws validation: {@link StorageValidationErrorCode } - thrown when there are issues with credentials
-	 */
-	(
-		contextSpec: AmplifyServer.ContextSpec,
-		input?: ListAllInput,
-	): Promise<ListAllOutput>;
-}
+/**
+ * List files in pages with the given `path`.
+ * `pageSize` is defaulted to 1000. Additionally, the result will include a `nextToken` if there are more items to retrieve.
+ * @param input - The `ListPaginateWithPathInput` object.
+ * @param contextSpec - The context spec used to get the Amplify server context.
+ * @returns A list of objects with path and metadata
+ * @throws service: `S3Exception` - S3 service errors thrown when checking for existence of bucket
+ * @throws validation: `StorageValidationErrorCode` - thrown when there are issues with credentials
+ */
+export function list(
+	contextSpec: AmplifyServer.ContextSpec,
+	input: ListPaginateWithPathInput,
+): Promise<ListPaginateWithPathOutput>;
+/**
+ * List all files from S3 for a given `path`. You can set `listAll` to true in `options` to get all the files from S3.
+ * @param input - The `ListAllWithPathInput` object.
+ * @param contextSpec - The context spec used to get the Amplify server context.
+ * @returns A list of all objects with path and metadata
+ * @throws service: `S3Exception` - S3 service errors thrown when checking for existence of bucket
+ * @throws validation: `StorageValidationErrorCode`  - thrown when there are issues with credentials
+ */
+export function list(
+	contextSpec: AmplifyServer.ContextSpec,
+	input: ListAllWithPathInput,
+): Promise<ListAllWithPathOutput>;
+/**
+ * @deprecated The `prefix` 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/list | path} instead.
+ * List files in pages with the given `prefix`.
+ * `pageSize` is defaulted to 1000. Additionally, the result will include a `nextToken` if there are more items to retrieve.
+ * @param input - The `ListPaginateInput` object.
+ * @returns A list of objects with key and metadata
+ * @throws service: `S3Exception` - S3 service errors thrown when checking for existence of bucket
+ * @throws validation: `StorageValidationErrorCode` - thrown when there are issues with credentials
+ */
+export function list(
+	contextSpec: AmplifyServer.ContextSpec,
+	input?: ListPaginateInput,
+): Promise<ListPaginateOutput>;
+/**
+ * @deprecated The `prefix` 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/list | path} instead.
+ * List all files from S3 for a given `prefix`. You can set `listAll` to true in `options` to get all the files from S3.
+ * @param input - The `ListAllInput` object.
+ * @returns A list of all objects with key and metadata
+ * @throws service: `S3Exception` - S3 service errors thrown when checking for existence of bucket
+ * @throws validation: `StorageValidationErrorCode`  - thrown when there are issues with credentials
+ */
+export function list(
+	contextSpec: AmplifyServer.ContextSpec,
+	input?: ListAllInput,
+): Promise<ListAllOutput>;
 
-export const list: ListApi = (
+export function list(
 	contextSpec: AmplifyServer.ContextSpec,
-	input?: ListAllInput | ListPaginateInput,
-): Promise<ListAllOutput | ListPaginateOutput> => {
+	input?:
+		| ListAllInput
+		| ListPaginateInput
+		| ListAllWithPathInput
+		| ListPaginateWithPathInput,
+) {
 	return listInternal(
 		getAmplifyServerContext(contextSpec).amplify,
 		input ?? {},
 	);
-};
+}

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

@@ -6,12 +6,47 @@ import {
 	getAmplifyServerContext,
 } from '@aws-amplify/core/internals/adapter-core';
 
-import { RemoveInput, RemoveOutput } from '../../types';
+import {
+	RemoveInput,
+	RemoveOutput,
+	RemoveWithPathInput,
+	RemoveWithPathOutput,
+} from '../../types';
 import { remove as removeInternal } from '../internal/remove';
 
-export const remove = (
+/**
+ * Remove a file from your S3 bucket.
+ * @param input - The `RemoveWithPathInput` 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.
+ */
+export function remove(
+	contextSpec: AmplifyServer.ContextSpec,
+	input: RemoveWithPathInput,
+): Promise<RemoveWithPathOutput>;
+/**
+ * @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 `RemoveInput` 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.
+ */
+export function remove(
 	contextSpec: AmplifyServer.ContextSpec,
 	input: RemoveInput,
-): Promise<RemoveOutput> => {
+): Promise<RemoveOutput>;
+
+export function remove(
+	contextSpec: AmplifyServer.ContextSpec,
+	input: RemoveInput | RemoveWithPathInput,
+) {
 	return removeInternal(getAmplifyServerContext(contextSpec).amplify, input);
-};
+}

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

@@ -1,7 +1,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { S3Exception, UploadDataInput, UploadDataOutput } from '../../types';
+import {
+	UploadDataInput,
+	UploadDataOutput,
+	UploadDataWithPathInput,
+	UploadDataWithPathOutput,
+} from '../../types';
 import { createUploadTask } from '../../utils';
 import { assertValidationError } from '../../../../errors/utils/assertValidationError';
 import { StorageValidationErrorCode } from '../../../../errors/types/validation';
@@ -12,18 +17,77 @@ import { putObjectJob } from './putObjectJob';
 import { getMultipartUploadHandlers } from './multipart';
 
 /**
- * Upload data to specified S3 object. By default, it uses single PUT operation to upload if the data is less than 5MB.
- * Otherwise, it uses multipart upload to upload the data. If the data length is unknown, it uses multipart upload.
+ * Upload data to the specified S3 object path. By default uses single PUT operation to upload if the payload is less than 5MB.
+ * Otherwise, uses multipart upload to upload the payload. If the payload length cannot be determined, uses multipart upload.
  *
  * Limitations:
  * * Maximum object size is 5TB.
  * * Maximum object size if the size cannot be determined before upload is 50GB.
  *
- * @param input - The UploadDataInput object.
+ * @throws Service: `S3Exception` thrown when checking for existence of the object.
+ * @throws Validation: `StorageValidationErrorCode` thrown when a validation error occurs.
+ *
+ * @param input - A `UploadDataWithPathInput` object.
+ *
  * @returns A cancelable and resumable task exposing result promise from `result`
  * 	property.
- * @throws service: {@link S3Exception} - thrown when checking for existence of the object
- * @throws validation: {@link StorageValidationErrorCode } - Validation errors.
+ *
+ * @example
+ * ```ts
+ * // Upload a file to s3 bucket
+ * await uploadData({ path, data: file, options: {
+ *   onProgress, // Optional progress callback.
+ * } }).result;
+ * ```
+ *
+ * @example
+ * ```ts
+ * // Cancel a task
+ * const uploadTask = uploadData({ path, data: file });
+ * //...
+ * uploadTask.cancel();
+ * try {
+ *   await uploadTask.result;
+ * } catch (error) {
+ *   if(isCancelError(error)) {
+ *     // Handle error thrown by task cancelation.
+ *   }
+ * }
+ *```
+ *
+ * @example
+ * ```ts
+ * // Pause and resume a task
+ * const uploadTask = uploadData({ path, data: file });
+ * //...
+ * uploadTask.pause();
+ * //...
+ * uploadTask.resume();
+ * //...
+ * await uploadTask.result;
+ * ```
+ */
+export function uploadData(
+	input: UploadDataWithPathInput,
+): UploadDataWithPathOutput;
+
+/**
+ * Upload data to the specified S3 object key. By default uses single PUT operation to upload if the payload is less than 5MB.
+ * Otherwise, uses multipart upload to upload the payload. If the payload length cannot be determined, uses multipart upload.
+ *
+ * Limitations:
+ * * Maximum object size is 5TB.
+ * * Maximum object size if the size cannot be determined before upload is 50GB.
+ *
+ * @deprecated The `key` and `accessLevel` parameters are deprecated and will be removed in next major version.
+ * Please use {@link https://docs.amplify.aws/javascript/build-a-backend/storage/upload/#uploaddata | path} instead.
+ *
+ * @throws Service: `S3Exception` thrown when checking for existence of the object.
+ * @throws Validation: `StorageValidationErrorCode` thrown when a validation error occurs.
+ *
+ * @param input - A `UploadDataInput` object.
+ *
+ * @returns A cancelable and resumable task exposing result promise from the `result` property.
  *
  * @example
  * ```ts
@@ -32,6 +96,7 @@ import { getMultipartUploadHandlers } from './multipart';
  *   onProgress, // Optional progress callback.
  * } }).result;
  * ```
+ *
  * @example
  * ```ts
  * // Cancel a task
@@ -59,7 +124,9 @@ import { getMultipartUploadHandlers } from './multipart';
  * await uploadTask.result;
  * ```
  */
-export const uploadData = (input: UploadDataInput): UploadDataOutput => {
+export function uploadData(input: UploadDataInput): UploadDataOutput;
+
+export function uploadData(input: UploadDataInput | UploadDataWithPathInput) {
 	const { data } = input;
 
 	const dataByteLength = byteLength(data);
@@ -69,6 +136,7 @@ export const uploadData = (input: UploadDataInput): UploadDataOutput => {
 	);
 
 	if (dataByteLength && dataByteLength <= DEFAULT_PART_SIZE) {
+		// Single part upload
 		const abortController = new AbortController();
 
 		return createUploadTask({
@@ -79,6 +147,7 @@ export const uploadData = (input: UploadDataInput): UploadDataOutput => {
 			},
 		});
 	} else {
+		// Multipart upload
 		const { multipartUploadJob, onPause, onResume, onCancel } =
 			getMultipartUploadHandlers(input, dataByteLength);
 
@@ -92,4 +161,4 @@ export const uploadData = (input: UploadDataInput): UploadDataOutput => {
 			onResume,
 		});
 	}
-};
+}

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

@@ -18,8 +18,8 @@ interface LoadOrCreateMultipartUploadOptions {
 	s3Config: ResolvedS3Config;
 	data: StorageUploadDataPayload;
 	bucket: string;
-	accessLevel: StorageAccessLevel;
-	keyPrefix: string;
+	accessLevel?: StorageAccessLevel;
+	keyPrefix?: string;
 	key: string;
 	contentType?: string;
 	contentDisposition?: string;
@@ -54,7 +54,7 @@ export const loadOrCreateMultipartUpload = async ({
 	metadata,
 	abortSignal,
 }: LoadOrCreateMultipartUploadOptions): Promise<LoadOrCreateMultipartUploadResult> => {
-	const finalKey = keyPrefix + key;
+	const finalKey = keyPrefix !== undefined ? keyPrefix + key : key;
 
 	let cachedUpload:
 		| {
@@ -75,6 +75,7 @@ export const loadOrCreateMultipartUpload = async ({
 			accessLevel,
 			key,
 		});
+
 		const cachedUploadParts = await findCachedUploadParts({
 			s3Config,
 			cacheKey: uploadCacheKey,

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

@@ -94,7 +94,7 @@ interface UploadsCacheKeyOptions {
 	size: number;
 	contentType?: string;
 	bucket: string;
-	accessLevel: StorageAccessLevel;
+	accessLevel?: StorageAccessLevel;
 	key: string;
 	file?: File;
 }
@@ -112,10 +112,19 @@ export const getUploadsCacheKey = ({
 	accessLevel,
 	key,
 }: UploadsCacheKeyOptions) => {
+	let levelStr;
 	const resolvedContentType =
 		contentType ?? file?.type ?? 'application/octet-stream';
-	const levelStr = accessLevel === 'guest' ? 'public' : accessLevel;
+
+	// If no access level is defined, we're using custom gen2 access rules
+	if (accessLevel === undefined) {
+		levelStr = 'custom';
+	} else {
+		levelStr = accessLevel === 'guest' ? 'public' : accessLevel;
+	}
+
 	const baseId = `${size}_${resolvedContentType}_${bucket}_${levelStr}_${key}`;
+
 	if (file) {
 		return `${file.name}_${file.lastModified}_${baseId}`;
 	} else {

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

@@ -4,14 +4,21 @@
 import { Amplify, StorageAccessLevel } from '@aws-amplify/core';
 import { StorageAction } from '@aws-amplify/core/internals/utils';
 
-import { UploadDataInput } from '../../../types';
-import { resolveS3ConfigAndInput } from '../../../utils';
-import { Item as S3Item } from '../../../types/outputs';
+import { UploadDataInput, UploadDataWithPathInput } from '../../../types';
+import {
+	resolveS3ConfigAndInput,
+	validateStorageOperationInput,
+} from '../../../utils';
+import { ItemWithKey, ItemWithPath } from '../../../types/outputs';
 import {
 	DEFAULT_ACCESS_LEVEL,
 	DEFAULT_QUEUE_SIZE,
+	STORAGE_INPUT_KEY,
 } from '../../../utils/constants';
-import { ResolvedS3Config } from '../../../types/options';
+import {
+	ResolvedS3Config,
+	UploadDataOptionsWithKey,
+} from '../../../types/options';
 import { StorageError } from '../../../../../errors/StorageError';
 import { CanceledError } from '../../../../../errors/CanceledError';
 import {
@@ -36,10 +43,12 @@ import { getDataChunker } from './getDataChunker';
  * @internal
  */
 export const getMultipartUploadHandlers = (
-	{ options: uploadDataOptions, key, data }: UploadDataInput,
+	uploadDataInput: UploadDataInput | UploadDataWithPathInput,
 	size?: number,
 ) => {
-	let resolveCallback: ((value: S3Item) => void) | undefined;
+	let resolveCallback:
+		| ((value: ItemWithKey | ItemWithPath) => void)
+		| undefined;
 	let rejectCallback: ((reason?: any) => void) | undefined;
 	let inProgressUpload:
 		| {
@@ -49,43 +58,62 @@ export const getMultipartUploadHandlers = (
 		| undefined;
 	let resolvedS3Config: ResolvedS3Config | undefined;
 	let abortController: AbortController | undefined;
+	let resolvedAccessLevel: StorageAccessLevel | undefined;
 	let resolvedBucket: string | undefined;
 	let resolvedKeyPrefix: string | undefined;
+	let resolvedIdentityId: string | undefined;
 	let uploadCacheKey: string | undefined;
+	let finalKey: string;
 	// Special flag that differentiates HTTP requests abort error caused by pause() from ones caused by cancel().
 	// The former one should NOT cause the upload job to throw, but cancels any pending HTTP requests.
 	// This should be replaced by a special abort reason. However,the support of this API is lagged behind.
 	let isAbortSignalFromPause = false;
 
-	const startUpload = async (): Promise<S3Item> => {
+	const startUpload = async (): Promise<ItemWithKey | ItemWithPath> => {
+		const { options: uploadDataOptions, data } = uploadDataInput;
 		const resolvedS3Options = await resolveS3ConfigAndInput(
 			Amplify,
 			uploadDataOptions,
 		);
 
+		abortController = new AbortController();
+		isAbortSignalFromPause = false;
 		resolvedS3Config = resolvedS3Options.s3Config;
 		resolvedBucket = resolvedS3Options.bucket;
-		resolvedKeyPrefix = resolvedS3Options.keyPrefix;
+		resolvedIdentityId = resolvedS3Options.identityId;
 
-		abortController = new AbortController();
-		isAbortSignalFromPause = false;
+		const { inputType, objectKey } = validateStorageOperationInput(
+			uploadDataInput,
+			resolvedIdentityId,
+		);
 
 		const {
 			contentDisposition,
 			contentEncoding,
 			contentType = 'application/octet-stream',
 			metadata,
-			accessLevel,
 			onProgress,
 		} = uploadDataOptions ?? {};
 
+		finalKey = objectKey;
+
+		// Resolve "key" specific options
+		if (inputType === STORAGE_INPUT_KEY) {
+			const accessLevel = (uploadDataOptions as UploadDataOptionsWithKey)
+				?.accessLevel;
+
+			resolvedKeyPrefix = resolvedS3Options.keyPrefix;
+			finalKey = resolvedKeyPrefix + objectKey;
+			resolvedAccessLevel = resolveAccessLevel(accessLevel);
+		}
+
 		if (!inProgressUpload) {
 			const { uploadId, cachedParts } = await loadOrCreateMultipartUpload({
 				s3Config: resolvedS3Config,
-				accessLevel: resolveAccessLevel(accessLevel),
+				accessLevel: resolvedAccessLevel,
 				bucket: resolvedBucket,
 				keyPrefix: resolvedKeyPrefix,
-				key,
+				key: objectKey,
 				contentType,
 				contentDisposition,
 				contentEncoding,
@@ -100,15 +128,14 @@ export const getMultipartUploadHandlers = (
 			};
 		}
 
-		const finalKey = resolvedKeyPrefix + key;
 		uploadCacheKey = size
 			? getUploadsCacheKey({
 					file: data instanceof File ? data : undefined,
-					accessLevel: resolveAccessLevel(uploadDataOptions?.accessLevel),
+					accessLevel: resolvedAccessLevel,
 					contentType: uploadDataOptions?.contentType,
 					bucket: resolvedBucket!,
 					size,
-					key,
+					key: objectKey,
 				})
 			: undefined;
 
@@ -186,12 +213,15 @@ export const getMultipartUploadHandlers = (
 			await removeCachedUpload(uploadCacheKey);
 		}
 
-		return {
-			key,
+		const result = {
 			eTag,
 			contentType,
 			metadata,
 		};
+
+		return inputType === STORAGE_INPUT_KEY
+			? { key: objectKey, ...result }
+			: { path: objectKey, ...result };
 	};
 
 	const startUploadWithResumability = () =>
@@ -208,7 +238,7 @@ export const getMultipartUploadHandlers = (
 			});
 
 	const multipartUploadJob = () =>
-		new Promise<S3Item>((resolve, reject) => {
+		new Promise<ItemWithKey | ItemWithPath>((resolve, reject) => {
 			resolveCallback = resolve;
 			rejectCallback = reject;
 			startUploadWithResumability();
@@ -232,7 +262,7 @@ export const getMultipartUploadHandlers = (
 			// 3. clear multipart upload on server side.
 			await abortMultipartUpload(resolvedS3Config!, {
 				Bucket: resolvedBucket,
-				Key: resolvedKeyPrefix! + key,
+				Key: finalKey,
 				UploadId: inProgressUpload?.uploadId,
 			});
 		};

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

@@ -4,11 +4,16 @@
 import { Amplify } from '@aws-amplify/core';
 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 { UploadDataInput, UploadDataWithPathInput } from '../../types';
+import {
+	calculateContentMd5,
+	resolveS3ConfigAndInput,
+	validateStorageOperationInput,
+} from '../../utils';
+import { ItemWithKey, ItemWithPath } from '../../types/outputs';
 import { putObject } from '../../utils/client';
 import { getStorageUserAgentValue } from '../../utils/userAgent';
+import { STORAGE_INPUT_KEY } from '../../utils/constants';
 
 /**
  * Get a function the returns a promise to call putObject API to S3.
@@ -17,15 +22,21 @@ import { getStorageUserAgentValue } from '../../utils/userAgent';
  */
 export const putObjectJob =
 	(
-		{ options: uploadDataOptions, key, data }: UploadDataInput,
+		uploadDataInput: UploadDataInput | UploadDataWithPathInput,
 		abortSignal: AbortSignal,
 		totalLength?: number,
 	) =>
-	async (): Promise<S3Item> => {
-		const { bucket, keyPrefix, s3Config, isObjectLockEnabled } =
+	async (): Promise<ItemWithKey | ItemWithPath> => {
+		const { options: uploadDataOptions, data } = uploadDataInput;
+		const { bucket, keyPrefix, s3Config, isObjectLockEnabled, identityId } =
 			await resolveS3ConfigAndInput(Amplify, uploadDataOptions);
+		const { inputType, objectKey } = validateStorageOperationInput(
+			uploadDataInput,
+			identityId,
+		);
 
-		const finalKey = keyPrefix + key;
+		const finalKey =
+			inputType === STORAGE_INPUT_KEY ? keyPrefix + objectKey : objectKey;
 		const {
 			contentDisposition,
 			contentEncoding,
@@ -55,12 +66,15 @@ export const putObjectJob =
 			},
 		);
 
-		return {
-			key,
+		const result = {
 			eTag,
 			versionId,
 			contentType,
 			metadata,
 			size: totalLength,
 		};
+
+		return inputType === STORAGE_INPUT_KEY
+			? { key: objectKey, ...result }
+			: { path: objectKey, ...result };
 	};

package/src/providers/s3/index.ts

@@ -13,22 +13,38 @@ export {
 
 export {
 	UploadDataInput,
+	UploadDataWithPathInput,
 	DownloadDataInput,
+	DownloadDataWithPathInput,
 	RemoveInput,
+	RemoveWithPathInput,
 	ListAllInput,
+	ListAllWithPathInput,
 	ListPaginateInput,
+	ListPaginateWithPathInput,
 	GetPropertiesInput,
+	GetPropertiesWithPathInput,
 	CopyInput,
+	CopyWithPathInput,
 	GetUrlInput,
+	GetUrlWithPathInput,
 } from './types/inputs';
 
 export {
 	UploadDataOutput,
+	UploadDataWithPathOutput,
 	DownloadDataOutput,
+	DownloadDataWithPathOutput,
 	RemoveOutput,
+	RemoveWithPathOutput,
 	ListAllOutput,
+	ListAllWithPathOutput,
 	ListPaginateOutput,
+	ListPaginateWithPathOutput,
 	GetPropertiesOutput,
+	GetPropertiesWithPathOutput,
 	CopyOutput,
+	CopyWithPathOutput,
 	GetUrlOutput,
+	GetUrlWithPathOutput,
 } from './types/outputs';