@aws-amplify/ui-react-storage 3.10.1 → 3.10.2

package/dist/browser.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var internals = require('@aws-amplify/storage/internals');
 require('@aws-amplify/ui');
-var createStorageBrowser = require('./createStorageBrowser-BfRLqdUj.js');
+var createStorageBrowser = require('./createStorageBrowser-Cbdy8OAN.js');
 require('aws-amplify/storage');
 require('react');
 require('@aws-amplify/ui-react');

package/dist/{createStorageBrowser-BfRLqdUj.js → createStorageBrowser-Cbdy8OAN.js}

@@ -32,7 +32,7 @@ function _interopNamespace(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-const VERSION = '3.10.1';
+const VERSION = '3.10.2';
 
 const toAccessGrantPermission = (permission) => {
     let result = '';
@@ -1923,9 +1923,9 @@ const QUEUED_TASK_BASE = {
     progress: undefined,
     status: 'QUEUED',
 };
-const isTaskHandlerInput = (input) => !!input.data;
+const isSingleTaskInput = (input) => !!input.data;
 function useProcessTasks(handler, options) {
-    const { concurrency, items, ...callbacks } = options ?? {};
+    const { items, ...callbacks } = options ?? {};
     const callbacksRef = React__namespace["default"].useRef(callbacks);
     if (callbacks) {
         callbacksRef.current = callbacks;
@@ -1996,13 +1996,13 @@ function useProcessTasks(handler, options) {
         });
         flush();
     }, [createTask, flush, updateTask, items, refreshTaskData]);
-    const processNextTask = (_input) => {
-        const hasInputData = isTaskHandlerInput(_input);
-        if (hasInputData) {
+    const processTask = (_input) => {
+        const isSingleTask = isSingleTaskInput(_input);
+        if (isSingleTask) {
             createTask(_input.data);
             flush();
         }
-        const { data } = hasInputData
+        const { data } = isSingleTask
             ? _input
             : [...tasksRef.current.values()].find(({ status }) => status === 'QUEUED') ?? {};
         if (!data)
@@ -2047,10 +2047,10 @@ function useProcessTasks(handler, options) {
             const task = getTask();
             if (task && ui.isFunction(onTaskComplete))
                 onTaskComplete(task);
-            // ignore process next task for single operation inputs
-            if (hasInputData)
+            // ignore process next task for single task
+            if (isSingleTask)
                 return;
-            processNextTask(_input);
+            processTask(_input);
         });
         updateTask(data.id, { cancel, status: 'PENDING' });
     };
@@ -2062,13 +2062,22 @@ function useProcessTasks(handler, options) {
         if (isProcessing) {
             return;
         }
+        // if single task, run `processTask` once
+        if (isSingleTaskInput(input)) {
+            processTask(input);
+            return;
+        }
+        const { concurrency, ...options } = input.options ?? {};
+        // reconstruct `input` without `concurrency`
+        const _input = { ...input, options };
+        // for batch tasks, if no `concurrency` process tasks individually
         if (!concurrency) {
-            processNextTask(input);
+            processTask(_input);
             return;
         }
         let count = 0;
         while (count < concurrency) {
-            processNextTask(input);
+            processTask(_input);
             count++;
         }
     };
@@ -2084,10 +2093,7 @@ function useProcessTasks(handler, options) {
 const isOptionsWithItems = (options) => !!options?.items;
 const isHandleTaskInput = (value) => !!value?.data;
 function useHandler(handler, options) {
-    const [state, handleProcessing] = useProcessTasks(handler, {
-        ...options,
-        concurrency: DEFAULT_ACTION_CONCURRENCY,
-    });
+    const [state, handleProcessing] = useProcessTasks(handler, options);
     const getConfig = useGetActionInput();
     const { reset, isProcessing, tasks, ...rest } = state;
     const handleDispatch = React__namespace["default"].useCallback((input) => {
@@ -2098,7 +2104,10 @@ function useHandler(handler, options) {
             reset();
         handleProcessing({
             config,
-            ...(hasData ? { data: input.data } : undefined),
+            ...(hasData
+                ? { data: input.data }
+                : // if no `data` provided, provide `concurrency` to `options`
+                    { options: { concurrency: DEFAULT_ACTION_CONCURRENCY } }),
         });
     }, [getConfig, handleProcessing, reset]);
     if (isOptionsWithItems(options)) {

package/dist/esm/components/StorageBrowser/tasks/useProcessTasks.mjs

@@ -8,9 +8,9 @@ const QUEUED_TASK_BASE = {
     progress: undefined,
     status: 'QUEUED',
 };
-const isTaskHandlerInput = (input) => !!input.data;
+const isSingleTaskInput = (input) => !!input.data;
 function useProcessTasks(handler, options) {
-    const { concurrency, items, ...callbacks } = options ?? {};
+    const { items, ...callbacks } = options ?? {};
     const callbacksRef = React__default.useRef(callbacks);
     if (callbacks) {
         callbacksRef.current = callbacks;
@@ -81,13 +81,13 @@ function useProcessTasks(handler, options) {
         });
         flush();
     }, [createTask, flush, updateTask, items, refreshTaskData]);
-    const processNextTask = (_input) => {
-        const hasInputData = isTaskHandlerInput(_input);
-        if (hasInputData) {
+    const processTask = (_input) => {
+        const isSingleTask = isSingleTaskInput(_input);
+        if (isSingleTask) {
             createTask(_input.data);
             flush();
         }
-        const { data } = hasInputData
+        const { data } = isSingleTask
             ? _input
             : [...tasksRef.current.values()].find(({ status }) => status === 'QUEUED') ?? {};
         if (!data)
@@ -132,10 +132,10 @@ function useProcessTasks(handler, options) {
             const task = getTask();
             if (task && isFunction(onTaskComplete))
                 onTaskComplete(task);
-            // ignore process next task for single operation inputs
-            if (hasInputData)
+            // ignore process next task for single task
+            if (isSingleTask)
                 return;
-            processNextTask(_input);
+            processTask(_input);
         });
         updateTask(data.id, { cancel, status: 'PENDING' });
     };
@@ -147,13 +147,22 @@ function useProcessTasks(handler, options) {
         if (isProcessing) {
             return;
         }
+        // if single task, run `processTask` once
+        if (isSingleTaskInput(input)) {
+            processTask(input);
+            return;
+        }
+        const { concurrency, ...options } = input.options ?? {};
+        // reconstruct `input` without `concurrency`
+        const _input = { ...input, options };
+        // for batch tasks, if no `concurrency` process tasks individually
         if (!concurrency) {
-            processNextTask(input);
+            processTask(_input);
             return;
         }
         let count = 0;
         while (count < concurrency) {
-            processNextTask(input);
+            processTask(_input);
             count++;
         }
     };

package/dist/esm/components/StorageBrowser/useAction/useHandler.mjs

@@ -9,10 +9,7 @@ import { useProcessTasks } from '../tasks/useProcessTasks.mjs';
 const isOptionsWithItems = (options) => !!options?.items;
 const isHandleTaskInput = (value) => !!value?.data;
 function useHandler(handler, options) {
-    const [state, handleProcessing] = useProcessTasks(handler, {
-        ...options,
-        concurrency: DEFAULT_ACTION_CONCURRENCY,
-    });
+    const [state, handleProcessing] = useProcessTasks(handler, options);
     const getConfig = useGetActionInput();
     const { reset, isProcessing, tasks, ...rest } = state;
     const handleDispatch = React__default.useCallback((input) => {
@@ -23,7 +20,10 @@ function useHandler(handler, options) {
             reset();
         handleProcessing({
             config,
-            ...(hasData ? { data: input.data } : undefined),
+            ...(hasData
+                ? { data: input.data }
+                : // if no `data` provided, provide `concurrency` to `options`
+                    { options: { concurrency: DEFAULT_ACTION_CONCURRENCY } }),
         });
     }, [getConfig, handleProcessing, reset]);
     if (isOptionsWithItems(options)) {

package/dist/esm/version.mjs

@@ -1,3 +1,3 @@
-const VERSION = '3.10.1';
+const VERSION = '3.10.2';
 
 export { VERSION };

package/dist/index.js

@@ -9,7 +9,7 @@ var uiReactCore = require('@aws-amplify/ui-react-core');
 var auth = require('aws-amplify/auth');
 var storage = require('aws-amplify/storage');
 var internal = require('@aws-amplify/ui-react/internal');
-var createStorageBrowser = require('./createStorageBrowser-BfRLqdUj.js');
+var createStorageBrowser = require('./createStorageBrowser-Cbdy8OAN.js');
 require('@aws-amplify/storage/internals');
 require('aws-amplify');
 require('aws-amplify/utils');

package/dist/types/components/StorageBrowser/tasks/types.d.ts

@@ -1,4 +1,4 @@
-import { TaskHandlerInput, TaskData, TaskResult, TaskResultStatus } from '../actions';
+import { TaskHandlerInput, TaskData, TaskResult, TaskResultStatus, TaskHandlerOptions } from '../actions';
 /**
  * extends {@link TaskResultStatus} to include `QUEUED` and `PENDING` statuses
  * used in task processing
@@ -9,7 +9,6 @@ export type TaskStatus = TaskResultStatus | 'QUEUED' | 'PENDING';
  */
 export type StatusCounts = Record<TaskStatus | 'TOTAL', number>;
 export interface ProcessTasksOptions<TTask extends Task, TItems = []> {
-    concurrency?: number;
     items?: TItems;
     onTaskCancel?: (task: TTask) => void;
     onTaskComplete?: (task: TTask) => void;
@@ -48,4 +47,12 @@ export type UseProcessTasksState<TTask, TInput> = [
     TasksState<TTask>,
     HandleProcessTasks<TInput>
 ];
-export type InferHandleTasksInput<TItems, TData extends TaskData> = TItems extends NonNullable<TItems> ? Omit<TaskHandlerInput<TData>, 'data'> : TaskHandlerInput<TData>;
+interface HandleTasksOptions extends TaskHandlerOptions {
+    concurrency?: number;
+}
+export interface HandleBatchTasksInput<TData extends TaskData> extends Omit<TaskHandlerInput<TData, HandleTasksOptions>, 'data'> {
+}
+export interface HandleSingleTaskInput<TData extends TaskData> extends TaskHandlerInput<TData> {
+}
+export type InferHandleTasksInput<TItems, TData extends TaskData> = TItems extends NonNullable<TItems> ? HandleBatchTasksInput<TData> : HandleSingleTaskInput<TData>;
+export {};

package/dist/types/components/StorageBrowser/tasks/useProcessTasks.d.ts

@@ -1,3 +1,3 @@
-import { ActionHandler } from '../actions';
-import { InferHandleTasksInput, Task, ProcessTasksOptions, UseProcessTasksState } from './types';
+import type { ActionHandler } from '../actions';
+import type { InferHandleTasksInput, Task, ProcessTasksOptions, UseProcessTasksState } from './types';
 export declare function useProcessTasks<TData, TValue, TTask extends Task<TData, TValue>, TInput extends InferHandleTasksInput<TItems, TTask['data']>, TItems extends TTask['data'][] | undefined = undefined>(handler: ActionHandler<TData, TValue>, options?: ProcessTasksOptions<TTask, TItems>): UseProcessTasksState<TTask, TInput>;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.10.1";
+export declare const VERSION = "3.10.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-storage",
-  "version": "3.10.1",
+  "version": "3.10.2",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {
@@ -66,7 +66,7 @@
       "name": "createStorageBrowser",
       "path": "dist/esm/browser.mjs",
       "import": "{ createStorageBrowser }",
-      "limit": "64.13 kB",
+      "limit": "64.19 kB",
       "ignore": [
         "@aws-amplify/storage"
       ]