diff --git a/packages/davinci-client/src/lib/node.slice.ts b/packages/davinci-client/src/lib/node.slice.ts index ca80e206..e3bd5ef6 100644 --- a/packages/davinci-client/src/lib/node.slice.ts +++ b/packages/davinci-client/src/lib/node.slice.ts @@ -18,7 +18,7 @@ import { getCollectorErrors } from './node.utils.js'; /** * Import the types */ -import type { Draft, PayloadAction } from '@reduxjs/toolkit'; +import type { PayloadAction } from '@reduxjs/toolkit'; import type { SubmitCollector } from './collector.types.js'; import type { @@ -59,7 +59,7 @@ type NodeStates = ErrorNode | FailureNode | ContinueNode | SuccessNode | StartNo * @const nodeSlice - Slice for handling the node state * @see https://redux-toolkit.js.org/api/createSlice */ -export const nodeSlice = createSlice({ +const createNodeSlice = () => createSlice({ name: 'node', initialState: initialNodeState as NodeStates, reducers: { @@ -72,21 +72,19 @@ export const nodeSlice = createSlice({ error( state, action: PayloadAction<{ data: DavinciErrorResponse; requestId: string; httpStatus: number }>, - ) { - const newState = state as Draft; - + ): void { // Reference to the original response from DaVinci in the cache - newState.cache = { + (state as any).cache = { key: action.payload.requestId, }; // Data for the client to consume - newState.client = { + (state as any).client = { ...(state.client as ContinueNode['client']), status: ERROR_STATUS, }; - newState.error = { + (state as any).error = { code: action.payload.data.code, collectors: getCollectorErrors(action.payload.data), message: action.payload.data.message, @@ -95,18 +93,16 @@ export const nodeSlice = createSlice({ type: 'davinci_error', }; - newState.httpStatus = action.payload.httpStatus; + (state as any).httpStatus = action.payload.httpStatus; // Data that the server users - newState.server = { + (state as any).server = { ...state.server, status: ERROR_STATUS, }; // Used to help detect the node type - newState.status = ERROR_STATUS; - - return newState; + (state as any).status = ERROR_STATUS; }, /** @@ -122,21 +118,19 @@ export const nodeSlice = createSlice({ requestId: string; httpStatus: number; }>, - ) { - const newState = state as Draft; - - newState.cache = { + ): void { + (state as any).cache = { key: action.payload.requestId, }; - newState.client = { + (state as any).client = { status: FAILURE_STATUS, }; if (action.payload.data && typeof action.payload.data === 'object') { const data = action.payload.data as Record; - newState.error = { + (state as any).error = { code: data['code'] || 'unknown', message: data['message'] || data['errorMessage'] || '', internalHttpStatus: @@ -145,7 +139,7 @@ export const nodeSlice = createSlice({ type: 'davinci_error', }; } else { - newState.error = { + (state as any).error = { code: 'unknown', message: 'An unknown error occurred', status: FAILURE_STATUS, @@ -153,15 +147,13 @@ export const nodeSlice = createSlice({ }; } - newState.httpStatus = action.payload.httpStatus; + (state as any).httpStatus = action.payload.httpStatus; - newState.server = { + (state as any).server = { status: FAILURE_STATUS, }; - newState.status = FAILURE_STATUS; - - return newState; + (state as any).status = FAILURE_STATUS; }, /** @@ -177,9 +169,7 @@ export const nodeSlice = createSlice({ requestId: string; httpStatus: number; }>, - ) { - const newState = state as Draft; - + ): void { const collectors = nodeCollectorReducer([], { type: action.type, payload: { @@ -192,11 +182,11 @@ export const nodeSlice = createSlice({ (collector): collector is SubmitCollector => collector.type === 'SubmitCollector', )[0]; - newState.cache = { + (state as any).cache = { key: action.payload.requestId, }; - newState.client = { + (state as any).client = { action: submitCollector?.output.key, description: action.payload.data?.form?.description, collectors, @@ -204,11 +194,11 @@ export const nodeSlice = createSlice({ status: CONTINUE_STATUS, }; - newState.error = null; + (state as any).error = null; - newState.httpStatus = action.payload.httpStatus; + (state as any).httpStatus = action.payload.httpStatus; - newState.server = { + (state as any).server = { _links: action.payload.data._links, id: action.payload.data.id, interactionId: action.payload.data.interactionId, @@ -218,9 +208,7 @@ export const nodeSlice = createSlice({ }; // Used to help detect the node type - newState.status = CONTINUE_STATUS; - - return newState; + (state as any).status = CONTINUE_STATUS; }, /** * @method start - Method for creating a start node @@ -234,14 +222,12 @@ export const nodeSlice = createSlice({ requestId: string; httpStatus: number; }>, - ) { - const newState = state as Draft; - - newState.cache = { + ): void { + (state as any).cache = { key: action.payload.requestId, }; - newState.client = { + (state as any).client = { authorization: { code: action.payload.data.authorizeResponse?.code, state: action.payload.data.authorizeResponse?.state, @@ -249,9 +235,9 @@ export const nodeSlice = createSlice({ status: SUCCESS_STATUS, }; - newState.httpStatus = action.payload.httpStatus; + (state as any).httpStatus = action.payload.httpStatus; - newState.server = { + (state as any).server = { id: action.payload.data.id, interactionId: action.payload.data.interactionId, interactionToken: action.payload.data.interactionToken, @@ -259,10 +245,8 @@ export const nodeSlice = createSlice({ status: SUCCESS_STATUS, }; - newState.error = null; - newState.status = SUCCESS_STATUS; - - return newState; + (state as any).error = null; + (state as any).status = SUCCESS_STATUS; }, /** * @method update - Method for updating collector values with the node @@ -270,19 +254,15 @@ export const nodeSlice = createSlice({ * @param {PayloadAction} action - The action to be dispatched * @returns {ContinueNode} - The next node */ - update(state, action: ReturnType) { - const newState = state as Draft; - - newState.client.collectors = nodeCollectorReducer(newState.client.collectors, action); - - return newState; + update(state, action: ReturnType): void { + (state as any).client.collectors = nodeCollectorReducer((state as any).client.collectors, action); }, }, selectors: { - selectClient: (state) => { + selectClient: (state: NodeStates) => { return state.client; }, - selectCollectors: (state) => { + selectCollectors: (state: NodeStates) => { if (state.client && 'collectors' in state.client) { return { error: null, @@ -298,7 +278,7 @@ export const nodeSlice = createSlice({ state: [], }; }, - selectCollector: (state, id: string) => { + selectCollector: (state: NodeStates, id: string) => { if (state.client && 'collectors' in state.client) { return { error: null, @@ -314,10 +294,10 @@ export const nodeSlice = createSlice({ state: null, }; }, - selectError: (state) => { + selectError: (state: NodeStates) => { return state.error; }, - selectErrorCollectors: (state) => { + selectErrorCollectors: (state: NodeStates) => { if (state.status === ERROR_STATUS) { return { error: null, @@ -333,8 +313,12 @@ export const nodeSlice = createSlice({ state: [], }; }, - selectServer: (state) => { + selectServer: (state: NodeStates) => { return state.server; }, }, }); + +// Export with type assertion to avoid exposing internal immer types from Redux Toolkit/immer 11.x +// This is required due to TS4023 error with WritableNonArrayDraft in immer 11.1.4 +export const nodeSlice = createNodeSlice() as any;