chore: fix lot of type issues

- Reordered dependencies in package.json for consistency
- Added devDependencies and peerDependencies in package.json
- Improved type annotations in FlowRun and FlowStep classes for better type safety
- Corrected remaining_steps type conversion to Number in FlowRun
- Updated event handling in SupabaseBroadcastAdapter to use system event namespace
- Enhanced type definitions for FlowRunEvents, StepEvents, and related state types for stricter
type checking
- Overall, these changes improve maintainability, type safety, and consistency across the codebase

Author: jumski

pkgs/client/package.json

@@ -2,10 +2,10 @@
   "name": "@pgflow/client",
   "version": "0.0.1",
   "dependencies": {
-    "nanoevents": "^7.0.1",
-    "uuid": "^9.0.0",
     "@pgflow/core": "workspace:*",
-    "@pgflow/dsl": "workspace:*"
+    "@pgflow/dsl": "workspace:*",
+    "nanoevents": "^7.0.1",
+    "uuid": "^9.0.0"
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -18,5 +18,12 @@
       "default": "./dist/index.cjs.js"
     }
   },
-  "types": "./dist/index.d.ts"
+  "types": "./dist/index.d.ts",
+  "devDependencies": {
+    "@supabase/supabase-js": "^2.49.4",
+    "@types/uuid": "^10.0.0"
+  },
+  "peerDependencies": {
+    "@supabase/supabase-js": "^2.49.4"
+  }
 }

pkgs/client/src/lib/FlowRun.ts

@@ -1,12 +1,12 @@
 import { createNanoEvents } from 'nanoevents';
-import type { ExtractFlowInput, ExtractFlowOutput, ExtractFlowSteps } from '@pgflow/dsl';
-import type { FlowRunState, FlowRunEvents, Unsubscribe } from './types';
+import type { AnyFlow, ExtractFlowInput, ExtractFlowOutput, ExtractFlowSteps } from '@pgflow/dsl';
+import type { FlowRunState, FlowRunEvents, Unsubscribe, StepEvents } from './types';
 import { FlowStep } from './FlowStep';
 
 /**
  * Represents a single execution of a flow
  */
-export class FlowRun<TFlow> {
+export class FlowRun<TFlow extends AnyFlow> {
   #state: FlowRunState<TFlow>;
   #events = createNanoEvents<FlowRunEvents<TFlow>>();
   #steps = new Map<string, FlowStep<TFlow, keyof ExtractFlowSteps<TFlow> & string>>();
@@ -234,7 +234,7 @@ export class FlowRun<TFlow> {
           ...this.#state,
           status: 'started',
           started_at: event.started_at ? new Date(event.started_at) : new Date(),
-          remaining_steps: 'remaining_steps' in event ? event.remaining_steps : this.#state.remaining_steps,
+          remaining_steps: 'remaining_steps' in event ? Number(event.remaining_steps) : this.#state.remaining_steps,
         };
         this.#events.emit('started', event as FlowRunEvents<TFlow>['started']);
         break;

pkgs/client/src/lib/FlowStep.ts

@@ -1,12 +1,12 @@
 import { createNanoEvents } from 'nanoevents';
-import type { ExtractFlowSteps, StepOutput } from '@pgflow/dsl';
+import type { AnyFlow, ExtractFlowSteps, StepOutput } from '@pgflow/dsl';
 import type { FlowStepState, StepEvents, Unsubscribe } from './types';
 
 /**
  * Represents a single step in a flow run
  */
 export class FlowStep<
-  TFlow,
+  TFlow extends AnyFlow,
   TStepSlug extends keyof ExtractFlowSteps<TFlow> & string
 > {
   #state: FlowStepState<TFlow, TStepSlug>;

pkgs/client/src/lib/SupabaseBroadcastAdapter.ts

@@ -5,6 +5,7 @@ import type {
   IFlowRealtime,
   BroadcastRunEvent,
   BroadcastStepEvent,
+  Unsubscribe,
 } from './types';
 
 // Define the events interface for the adapter
@@ -62,7 +63,7 @@ export class SupabaseBroadcastAdapter implements IFlowRealtime {
     run_id: string,
     channelName: string,
     channel: RealtimeChannel,
-    error: Error | unknown
+    error: unknown
   ): Promise<void> {
     console.error(`Channel ${channelName} error:`, error);
 
@@ -88,16 +89,16 @@ export class SupabaseBroadcastAdapter implements IFlowRealtime {
     channel.on('broadcast', { event: '*' }, this.#handleBroadcastMessage.bind(this));
 
     // Handle channel lifecycle events
-    channel.on('subscribed', () => {
+    channel.on('system', { event: 'subscribed' }, () => {
       console.log(`Subscribed to channel ${channelName}`);
     });
 
-    channel.on('closed', () => {
+    channel.on('system', { event: 'closed' }, () => {
       console.log(`Channel ${channelName} closed`);
     });
 
-    channel.on('error', (error) => 
-      this.#handleChannelError(run_id, channelName, channel, error)
+    channel.on('system', { event: 'error' }, (payload) => 
+      this.#handleChannelError(run_id, channelName, channel, payload.error)
     );
 
     return channel;

pkgs/client/src/lib/types.ts

@@ -5,7 +5,7 @@ import type { FlowRun } from './FlowRun';
 /**
  * Flow run event types
  */
-export type FlowRunEvents<TFlow> = {
+export type FlowRunEvents<TFlow extends AnyFlow> = {
   started: {
     run_id: string;
     flow_slug: string;
@@ -34,7 +34,7 @@ export type FlowRunEvents<TFlow> = {
  * Step event types
  */
 export type StepEvents<
-  TFlow,
+  TFlow extends AnyFlow,
   TStepSlug extends keyof ExtractFlowSteps<TFlow> & string
 > = {
   started: { 
@@ -146,7 +146,7 @@ export type BroadcastStepEvent =
 /**
  * Flow run state
  */
-export type FlowRunState<TFlow> = {
+export type FlowRunState<TFlow extends AnyFlow> = {
   run_id: string;
   flow_slug: string;
   status: 'queued' | 'started' | 'completed' | 'failed';
@@ -163,7 +163,7 @@ export type FlowRunState<TFlow> = {
 /**
  * Flow step state
  */
-export type FlowStepState<TFlow, TStepSlug extends keyof ExtractFlowSteps<TFlow> & string> = {
+export type FlowStepState<TFlow extends AnyFlow, TStepSlug extends keyof ExtractFlowSteps<TFlow> & string> = {
   run_id: string;
   step_slug: TStepSlug;
   status: 'created' | 'started' | 'completed' | 'failed';