fix for blocks chaining types

descript-org · May 20, 2024 · c4e1a16 · c4e1a16
1 parent aae7a2d
commit c4e1a16
Show file tree

Hide file tree

Showing 5 changed files with 293 additions and 64 deletions.
diff --git a/docs/typescript-examples/func.ts b/docs/typescript-examples/func.ts
@@ -30,16 +30,17 @@ const block_1 = de.func( {
         };
     },
     options: {
+        /*error: () => {
+            return {
+                x: 1
+            }
+        },*/
         params: ( { params }: { params: ParamsIn1 } ) => {
             return {
                 s1: params.id,
             };
         },
 
-        //  Важно!!!
-        //  Необходимо задать тип входящего result'а именно здесь.
-        //  Почему-то этот тип не берется из результата функции из block.
-        //
         after: ( { params, result }) => {
             console.log( params );
             return {
@@ -64,7 +65,7 @@ const block_2 = de.func({
         return Promise.resolve(result);
     },
     options: {
-        after: ({ result }): string => {
+        after: ({ result }) => {
             return result.foo;
         },
     },
@@ -74,3 +75,21 @@ de.run( block_2, {} )
     .then( ( result ) => {
         console.log( result );
     });
+
+const block3 = block_2({
+    options: {
+        after: ({ result }) => {
+            console.log(result);
+
+            return {
+                res: result,
+            }
+        },
+    }
+})
+
+
+de.run( block3, {} )
+    .then( ( result ) => {
+        console.log( result );
+    });
diff --git a/docs/typescript-examples/http.ts b/docs/typescript-examples/http.ts
@@ -65,6 +65,16 @@ const block1 = de.http( {
     },
 
     options: ({
+        before: () => {
+            return {
+                d: 1
+            }
+        },
+        /*error: () => {
+            return {
+                x: 's'
+            }
+        },*/
         params: ( { params }: { params: ParamsIn1 }) => {
             return {
                 s1: params.id_1,

diff --git a/docs/typescript-examples/object.ts b/docs/typescript-examples/object.ts
@@ -10,24 +10,49 @@ interface Context {
 }
 
 //  ---------------------------------------------------------------------------------------------------------------  //
+export interface CreateCardRequest {
+    added_manually?: boolean;
+    added_by_identifier?: string;
+    // card: Card;
+    card: Record<string, string>;
+}
 
 interface ParamsIn1 {
     id_1: string;
+    payload: CreateCardRequest;
+}
+interface ParamsOut1 {
+    s1: string;
+}
+interface Result1 {
+    r: number;
 }
 
 const block_1 = de.http( {
-    block: {},
+    block: {
+        body: ({ params }) => params.payload,
+    },
     options: {
         params: ( { params }: { params: ParamsIn1, context: Context } ) => {
             return {
                 s1: params.id_1,
+                payload: params.payload
             };
         },
 
-        after: ( { params, context } ) => {
-            return {
-                a: params.s1,
+        after: ( { params, context, result }: { params: ParamsOut1, context: Context, result: Result1 } ) => {
+            const a = {
+                a: 1,
             };
+            const b = {
+                b: params.s1,
+            }
+
+            if (params.s1 === 'lol') {
+                return a;
+            }
+
+            return b;
         },
     },
 } );
@@ -36,12 +61,15 @@ const block_1 = de.http( {
 de.run( block_1, {
     params: {
         id_1: '67890',
+        payload: {
+            card: {}
+        }
     },
 } )
     .then( ( result ) => {
         console.log( result );
         return {
-            foo: result.a,
+            foo: 'a' in result ? result.a : result.b,
             bar: undefined,
         };
     } );
@@ -138,6 +166,9 @@ de.run( block_3, {
     params: {
         id_1: '12345',
         id_2: 67890,
+        payload: {
+            card: {}
+        }
     },
 } )
     .then( ( result ) => {
@@ -166,6 +197,9 @@ de.run( block_3_func, {
     params: {
         id_1: '12345',
         id_2: 67890,
+        payload: {
+            card: {}
+        }
     },
 } )
     .then( ( result ) => {
@@ -180,10 +214,24 @@ const block_4 = block_3( {
     },
 } );
 
+const block_5 = block_3( {
+    options: {
+        error: ({ cancel, error }) => {
+            if (error.error) {
+                throw error;
+            }
+        },
+        after: ( { result } ) => result,
+    },
+} );
+
 de.run( block_4, {
     params: {
         id_1: '12345',
         id_2: 67890,
+        payload: {
+            card: {}
+        }
     },
 } )
     .then( ( result ) => {

diff --git a/docs/typescript-examples/session.ts b/docs/typescript-examples/session.ts
@@ -133,6 +133,7 @@ const sessionMethod = de.func({
                 },
 
                 after: ({context, params, result}) => {
+                    const x = result;
                     const session = result.session as Session & Record<string, unknown>;
 
                     return session;