chore: refactor-union-file

Refactor of the union.ts file to a single /types file. removed union
export.

Author: ryanbas21

packages/davinci-client/src/lib/client.store.ts

@@ -13,7 +13,7 @@ import { davinciApi } from './davinci.api.js';
 import { configSlice } from './config.slice.js';
 import { wellknownApi } from './wellknown.api.js';
 
-import type { RequestMiddleware } from '@forgerock/effects/types';
+import type { ActionTypes, RequestMiddleware } from '@forgerock/effects/types';
 /**
  * Import the DaVinciRequest types
  */
@@ -32,7 +32,6 @@ import type {
 import type { InitFlow, Updater, Validator } from './client.types.js';
 import { returnValidator } from './collector.utils.js';
 import { authorize } from './davinci.utils.js';
-import { ActionTypes } from '@forgerock/effects/unions';
 
 /**
  * Create a client function that returns a set of methods

packages/davinci-client/src/lib/client.store.utils.ts

@@ -6,13 +6,12 @@
  */
 import { configureStore } from '@reduxjs/toolkit';
 
-import type { RequestMiddleware } from '@forgerock/effects/types';
+import type { ActionTypes, RequestMiddleware } from '@forgerock/effects/types';
 import { configSlice } from './config.slice.js';
 import { nodeSlice } from './node.slice.js';
 import { davinciApi } from './davinci.api.js';
 import { ErrorNode, ContinueNode, StartNode, SuccessNode } from '../types.js';
 import { wellknownApi } from './wellknown.api.js';
-import { ActionTypes } from '@forgerock/effects/unions';
 
 export function createClientStore<ActionType extends ActionTypes>({
   requestMiddleware,

packages/davinci-client/src/lib/davinci.api.ts

@@ -21,7 +21,7 @@ import {
  * Import internal modules
  */
 import { initQuery } from '@forgerock/effects';
-import { RequestMiddleware } from '@forgerock/effects/types';
+import type { RequestMiddleware } from '@forgerock/effects/types';
 
 import { createAuthorizeUrl } from './authorize.utils.js';
 import { handleResponse, transformActionRequest, transformSubmitRequest } from './davinci.utils.js';
@@ -38,7 +38,7 @@ import type {
 } from './davinci.types.js';
 import type { ContinueNode } from './node.types.js';
 import type { StartNode } from '../types.js';
-import { ActionTypes } from '@forgerock/effects/unions';
+import { ActionTypes } from '@forgerock/effects/types';
 
 type BaseQueryResponse = Promise<
   QueryReturnValue<unknown, FetchBaseQueryError, FetchBaseQueryMeta>

packages/effects/package.json

@@ -11,8 +11,7 @@
       "default": "./dist/src/index.js"
     },
     "./package.json": "./package.json",
-    "./types": "./dist/src/lib/request.types.js",
-    "./unions": "./dist/src/lib/request.unions.js"
+    "./types": "./dist/src/lib/request.types.js"
   },
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",

packages/effects/src/lib/request.mock.ts

@@ -14,8 +14,7 @@
  * of the MIT license. See the LICENSE file for details.
  */
 
-import type { Action, ModifiedFetchArgs, RequestMiddleware } from './request.types.js';
-import type { ActionTypes } from './request.unions.js';
+import type { Action, ActionTypes, ModifiedFetchArgs, RequestMiddleware } from './request.types.js';
 
 type NextFn = () => ModifiedFetchArgs;
 

packages/effects/src/lib/request.types.ts

@@ -11,8 +11,18 @@ import {
   QueryReturnValue,
 } from '@reduxjs/toolkit/query';
 
-import type { ActionTypes } from './request.unions.js';
+export const actionTypes = {
+  start: 'DAVINCI_START',
+  next: 'DAVINCI_NEXT',
+  flow: 'DAVINCI_FLOW',
+  success: 'DAVINCI_SUCCESS',
+  error: 'DAVINCI_ERROR',
+  failure: 'DAVINCI_FAILURE',
+  resume: 'DAVINCI_RESUME',
+} as const;
 
+export type ActionTypes = (typeof actionTypes)[keyof typeof actionTypes];
+export type EndpointTypes = keyof typeof actionTypes;
 export interface Action<Type extends ActionTypes = ActionTypes, Payload = unknown> {
   type: Type;
   payload: Payload;

packages/effects/src/lib/request.unions.ts

@@ -12,9 +12,8 @@ import {
 } from '@reduxjs/toolkit/query';
 
 import { initQuery, middlewareWrapper } from './request.utils.js';
+import type { Action, ActionTypes, ModifiedFetchArgs } from './request.types.js';
 import middleware from './request.mock.js';
-import type { ActionTypes } from './request.unions.js';
-import { ModifiedFetchArgs } from './request.types.js';
 
 type BaseQueryResponse = Promise<
   QueryReturnValue<unknown, FetchBaseQueryError, FetchBaseQueryMeta>

packages/effects/src/lib/request.utils.test.ts

@@ -10,10 +10,13 @@ import {
   FetchBaseQueryMeta,
   QueryReturnValue,
 } from '@reduxjs/toolkit/query';
-import { actionTypes } from './request.unions.js';
-
-import type { ActionTypes, EndpointTypes } from './request.unions.js';
-import type { ModifiedFetchArgs, RequestMiddleware } from './request.types.js';
+import { actionTypes } from './request.types.js';
+import type {
+  ActionTypes,
+  EndpointTypes,
+  ModifiedFetchArgs,
+  RequestMiddleware,
+} from './request.types.js';
 
 /**
  * @function middlewareWrapper - A "Node" and "Redux" style middleware that is called just before