Gen2 storage/update storage types (aws-amplify#5177)

Author: calebpollman

packages/react-core/src/hooks/useGetUrl.ts

@@ -1,10 +1,15 @@
 import * as React from 'react';
 
-import { getUrl, GetUrlInput } from 'aws-amplify/storage';
+import {
+  getUrl,
+  GetUrlInput,
+  GetUrlOutput,
+  GetUrlWithPathInput,
+} from 'aws-amplify/storage';
 
 import { isFunction } from '@aws-amplify/ui';
 
-export type UseGetUrlInput = GetUrlInput & {
+export type UseGetUrlInput = (GetUrlInput | GetUrlWithPathInput) & {
   onError?: (error: Error) => void;
 };
 interface UseGetUrlOutput {
@@ -19,13 +24,17 @@ const INIT_STATE: UseGetUrlOutput = {
   isLoading: true,
 };
 
-const useGetUrl = (input: UseGetUrlInput): UseGetUrlOutput => {
+type GetUrl = (
+  input: GetUrlInput | GetUrlWithPathInput
+) => Promise<GetUrlOutput>;
+
+export default function useGetUrl(input: UseGetUrlInput): UseGetUrlOutput {
   const [result, setResult] = React.useState(() => INIT_STATE);
   React.useEffect(() => {
     const { onError, ...getUrlInput } = input;
     let ignore = false;
 
-    getUrl(getUrlInput)
+    (getUrl as GetUrl)(getUrlInput)
       .then((response) => {
         if (ignore) {
           return;
@@ -51,6 +60,4 @@ const useGetUrl = (input: UseGetUrlInput): UseGetUrlOutput => {
   }, [input]);
 
   return result;
-};
-
-export default useGetUrl;
+}

packages/react-storage/src/components/StorageManager/__tests__/StorageManager.test.tsx

@@ -17,7 +17,6 @@ const warnSpy = jest.spyOn(console, 'warn').mockImplementation();
 
 const uploadDataSpy = jest
   .spyOn(Storage, 'uploadData')
-  // @ts-expect-error remove this once StorageManager types are fixed
   .mockImplementation((input) => ({
     cancel: jest.fn(),
     pause: jest.fn(),

packages/react-storage/src/components/StorageManager/hooks/useUploadFiles/__tests__/useUploadFiles.spec.ts

@@ -8,7 +8,6 @@ import { useUploadFiles, UseUploadFilesProps } from '../useUploadFiles';
 
 const uploadDataSpy = jest
   .spyOn(Storage, 'uploadData')
-  // @ts-expect-error remove this once StorageManager types are fixed
   .mockImplementation((input) => {
     return {
       cancel: jest.fn(),
@@ -126,7 +125,6 @@ describe('useUploadFiles', () => {
 
   it('should call onUploadError when upload fails', async () => {
     const errorMessage = new Error('Error');
-    // @ts-expect-error remove this once StorageManager types are fixed
     uploadDataSpy.mockImplementationOnce(() => {
       return {
         cancel: jest.fn(),

packages/react-storage/src/components/StorageManager/utils/__tests__/uploadFile.test.ts

@@ -62,7 +62,6 @@ describe('uploadFile', () => {
   it('calls errorCallback on upload error', async () => {
     uploadDataSpy.mockReturnValueOnce({
       ...uploadDataOutput,
-      // @ts-expect-error remove this once StorageManager types are fixed
       result: Promise.reject(new Error('Error')),
       state: 'ERROR',
     });