cogfy-data-exchange 1.0.20 → 1.0.22

package/dist/types/payload.d.ts

@@ -24,6 +24,10 @@ type ExtractPayload<T> = T extends {
     'on-click-action': {
         payload: infer P;
     };
+} ? P : T extends {
+    'on-select-action': {
+        payload: infer P;
+    };
 } ? P : never;
 type ExtractChildByTrigger<Children, Trigger extends string> = Children extends {
     'on-click-action': {
@@ -31,6 +35,12 @@ type ExtractChildByTrigger<Children, Trigger extends string> = Children extends
             trigger: Trigger;
         };
     };
+} | {
+    'on-select-action': {
+        payload: {
+            trigger: Trigger;
+        };
+    };
 } ? Children : never;
 type ExtractScreenData<T> = T extends {
     data: infer D;

package/dist/types/result.d.ts

@@ -1,9 +1,9 @@
 import type { FlowJson } from './flow-json';
 import type { NextScreens } from './routing';
 import type { ScreenData, ScreenName } from './screen';
-type ScreenErrorResult<S extends string> = {
+type ScreenSelfResult<F extends FlowJson, S extends ScreenName<F>> = {
     screen: S;
-    data: {
+    data: ScreenData<F, S> | {
         error_message: string;
     };
 };
@@ -22,5 +22,5 @@ export type NextResult<F extends FlowJson, S extends ScreenName<F>> = {
         screen: K;
         data: ScreenData<F, K>;
     };
-}[NextScreens<F, S>] | ScreenErrorResult<S> | FlowSuccessResult;
+}[NextScreens<F, S>] | ScreenSelfResult<F, S> | FlowSuccessResult;
 export {};

package/dist/types/trigger.d.ts

@@ -9,17 +9,24 @@ type FlattenIfChildren<C> = C extends {
     then: infer Then;
     else?: infer Else;
 } ? (Then extends readonly unknown[] ? FlattenIfChildren<Then[number]> : never) | (Else extends readonly unknown[] ? FlattenIfChildren<Else[number]> : never) : FlattenListItems<C>;
-type AllChildTriggers<F extends FlowJson> = F['screens'][number] extends infer S ? S extends {
-    layout: {
-        children: readonly (infer C)[];
-    };
-} ? FlattenIfChildren<C> extends infer FC ? FC extends {
+type ExtractActionTrigger<FC> = (FC extends {
     'on-click-action': {
         payload: {
-            trigger: infer T;
+            trigger: infer T extends string;
         };
     };
-} ? T extends string ? T : never : never : never : never : never;
+} ? T : never) | (FC extends {
+    'on-select-action': {
+        payload: {
+            trigger: infer T extends string;
+        };
+    };
+} ? T : never);
+type AllChildTriggers<F extends FlowJson> = F['screens'][number] extends infer S ? S extends {
+    layout: {
+        children: readonly (infer C)[];
+    };
+} ? FlattenIfChildren<C> extends infer FC ? ExtractActionTrigger<FC> : never : never : never;
 export type AllTriggers<F extends FlowJson> = ScreenTrigger<ScreenName<F>> | AllChildTriggers<F>;
 export type ExtractScreen<T extends string, F extends FlowJson> = Extract<T extends `screen.${infer S}.event.${string}` ? S : T extends `screen.${infer S}` ? S : never, ScreenName<F>>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cogfy-data-exchange",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/types/payload.ts

@@ -28,11 +28,15 @@ type ExtractChildren<T> = T extends { layout: { children: infer C } }
     : never
   : never
 
-type ExtractPayload<T> = T extends { 'on-click-action': { payload: infer P } } ? P : never
+type ExtractPayload<T> = T extends { 'on-click-action': { payload: infer P } }
+  ? P
+  : T extends { 'on-select-action': { payload: infer P } }
+    ? P
+    : never
 
-type ExtractChildByTrigger<Children, Trigger extends string> = Children extends {
-  'on-click-action': { payload: { trigger: Trigger } }
-}
+type ExtractChildByTrigger<Children, Trigger extends string> = Children extends
+  | { 'on-click-action': { payload: { trigger: Trigger } } }
+  | { 'on-select-action': { payload: { trigger: Trigger } } }
   ? Children
   : never
 

package/src/types/result.ts

@@ -2,11 +2,9 @@ import type { FlowJson } from './flow-json'
 import type { NextScreens } from './routing'
 import type { ScreenData, ScreenName } from './screen'
 
-type ScreenErrorResult<S extends string> = {
+type ScreenSelfResult<F extends FlowJson, S extends ScreenName<F>> = {
   screen: S
-  data: {
-    error_message: string
-  }
+  data: ScreenData<F, S> | { error_message: string }
 }
 
 type FlowSuccessResult = {
@@ -25,5 +23,5 @@ export type NextResult<F extends FlowJson, S extends ScreenName<F>> =
         data: ScreenData<F, K>
       }
     }[NextScreens<F, S>]
-  | ScreenErrorResult<S>
+  | ScreenSelfResult<F, S>
   | FlowSuccessResult

package/src/types/trigger.ts

@@ -14,14 +14,14 @@ type FlattenIfChildren<C> = C extends { type: 'If'; then: infer Then; else?: inf
     (Else extends readonly unknown[] ? FlattenIfChildren<Else[number]> : never)
   : FlattenListItems<C>
 
+type ExtractActionTrigger<FC> =
+  | (FC extends { 'on-click-action': { payload: { trigger: infer T extends string } } } ? T : never)
+  | (FC extends { 'on-select-action': { payload: { trigger: infer T extends string } } } ? T : never)
+
 type AllChildTriggers<F extends FlowJson> = F['screens'][number] extends infer S
   ? S extends { layout: { children: readonly (infer C)[] } }
     ? FlattenIfChildren<C> extends infer FC
-      ? FC extends { 'on-click-action': { payload: { trigger: infer T } } }
-        ? T extends string
-          ? T
-          : never
-        : never
+      ? ExtractActionTrigger<FC>
       : never
     : never
   : never