Merge 12179a1 into 87c200b

Author: ryanbas21

.changeset/empty-nights-sniff.md

@@ -0,0 +1,5 @@
+---
+'@forgerock/davinci-client': patch
+---
+
+update type misalignments and fallback to `continue` state when there is no state given

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

@@ -33,6 +33,7 @@ import type {
 import type { InitFlow, Updater, Validator } from './client.types.js';
 import { returnValidator } from './collector.utils.js';
 import { authorize } from './davinci.utils.js';
+import { NodeStates, StartNode } from '../types.js';
 
 /**
  * Create a client function that returns a set of methods
@@ -126,13 +127,17 @@ export async function davinci<ActionType extends ActionTypes = ActionTypes>({
      * @param {DaVinciRequest} args - the arguments to pass to the next
      * @returns {Promise} - a promise that resolves to the next node
      */
-    next: async (args?: DaVinciRequest) => {
+    next: async (args?: DaVinciRequest): Promise<NodeStates> => {
       const nodeCheck = nodeSlice.selectSlice(store.getState());
       if (nodeCheck.status === 'start') {
         return {
           ...nodeCheck,
-          error: 'Please use `start` before calling `next`',
-        };
+          error: {
+            status: 'error',
+            type: 'state_error',
+            message: 'Please use `start` before calling `next`',
+          },
+        } satisfies StartNode;
       }
 
       await store.dispatch(davinciApi.endpoints.next.initiate(args));

packages/davinci-client/src/lib/node.slice.ts

@@ -210,7 +210,7 @@ export const nodeSlice = createSlice({
         id: action.payload.data.id,
         interactionId: action.payload.data.interactionId,
         interactionToken: action.payload.data.interactionToken,
-        eventName: action.payload.data.eventName,
+        eventName: action.payload.data.eventName || 'continue',
         status: CONTINUE_STATUS,
       };
 

packages/davinci-client/src/lib/node.types.test-d.ts

@@ -176,7 +176,7 @@ describe('Node Types', () => {
       };
 
       expectTypeOf<StartNode>().toHaveProperty('cache').toBeNull();
-      expectTypeOf<StartNode>().toHaveProperty('error').toBeNull();
+      expectTypeOf<StartNode>().toHaveProperty('error').toBeNullable();
       expectTypeOf<StartNode>().toHaveProperty('status').toEqualTypeOf<'start'>();
     });
 

packages/davinci-client/src/lib/node.types.ts

@@ -124,7 +124,7 @@ export interface StartNode {
   client: {
     status: 'start';
   };
-  error: null;
+  error: DaVinciError | null;
   server: {
     status: 'start';
   };

packages/davinci-client/src/types.test-d.ts

@@ -22,6 +22,7 @@ import type {
   SubmitCollector,
 } from './types.js';
 import type * as Types from './types.js';
+import { DaVinciError } from './lib/node.types.js';
 
 describe('Type exports', () => {
   it('should validate all types are exported', () => {
@@ -44,7 +45,7 @@ describe('Type exports', () => {
       type ExpectedStartNode = {
         cache: null;
         client: { status: 'start' };
-        error: null;
+        error: DaVinciError | null;
         server: { status: 'start' };
         status: 'start';
       };

packages/davinci-client/tsconfig.lib.json

@@ -13,7 +13,7 @@
     "noImplicitOverride": true,
     "declaration": true,
     "declarationMap": true,
-    "skipLibCheck": true,
+    "skipLibCheck": false,
     "sourceMap": true,
     "lib": ["es2022", "dom", "dom.iterable"]
   },

tools/release/commands/commands.ts

@@ -2,7 +2,7 @@ import { Effect, Stream, Console } from 'effect';
 import { Command } from '@effect/platform';
 
 export const buildPackages = Command.make('pnpm', 'build').pipe(
-  Command.lines,
+  Command.string,
   Stream.tap((line) => Console.log(`Build: ${line}`)),
   Stream.runDrain,
 );
@@ -33,17 +33,7 @@ export const runChangesetsSnapshot = Command.make(
   'version',
   '--snapshot',
   'beta',
-).pipe(
-  Command.lines,
-  Stream.tap((line) => Console.log(`Changesets: ${line}`)),
-  Stream.runDrain, // Consume the stream and wait for completion
-  Effect.tapBoth({
-    onFailure: (error) =>
-      Effect.fail(Console.error(`Changesets snapshot command failed: ${error}`)),
-    onSuccess: () => Console.log('Changesets snapshot completed successfully.'),
-  }),
-  Effect.asVoid,
-);
+).pipe(Command.exitCode);
 
 // Effect to start local registry (run in background)
 export const startLocalRegistry = Command.make('pnpm', 'nx', 'local-registry').pipe(
@@ -66,7 +56,7 @@ export const publishPackages = Command.make(
   '--registry=http://localhost:4873',
   '--no-git-checks',
 ).pipe(
-  Command.lines,
+  Command.string,
   Stream.tap((line) => Console.log(`Publish: ${line}`)),
   Stream.runDrain,
   Effect.tapBoth({

tools/release/release.ts

@@ -50,16 +50,20 @@ const program = Effect.gen(function* () {
   yield* Console.log('Git status OK (no staged files found).');
   yield* checkForChangesets;
 
+  yield* Console.log('Running Changesets snapshot version...');
+  const exitCode = yield* runChangesetsSnapshot;
+
+  if (exitCode.valueOf() == 1) {
+    return yield* Effect.fail('Failed to version all snapshots');
+  }
+
   yield* Console.log('Building packages');
   yield* buildPackages;
 
-  yield* Console.log('Running Changesets snapshot version...');
-  yield* runChangesetsSnapshot;
-
   yield* Console.log('Starting Verdaccio');
   yield* startLocalRegistry;
-  yield* Console.log('Waiting for local registry to initialize... (5 seconds)');
-  yield* Effect.sleep('5 seconds');
+  yield* Console.log('Waiting for local registry to initialize... (10 seconds)');
+  yield* Effect.sleep('10 seconds');
 
   yield* Console.log('Publishing packages to local registry...');
   yield* publishPackages;