v4: typescript first

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.vscode
 node_modules
 *.swp
 tests/server.key

docs/typescript-examples/func.ts

@@ -66,11 +66,17 @@ de.run(block2, {
 
 const block3 = block2.extend({
     options: {
-        after: ({ result }) => {
+        params: ({ params }: { params: { param2: number } }) => {
+            return {
+                param: params.param2,
+            };
+        },
+        after: ({ result, params }) => {
             console.log(result);
 
             return {
                 res: result,
+                x: params.param,
             };
         },
     },
@@ -79,21 +85,28 @@ const block3 = block2.extend({
 
 de.run(block3, {
     params: {
-        param: 2,
+        param2: 2,
     },
 })
     .then((result) => {
         console.log(result);
     });
 
 
+const objBlock = de.object({
+    block: {
+        foo: block1,
+        boo: block2,
+    },
+});
+
 const block4 = de.func({
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     block: ({ params }) => {
         //TODO не выводится params.
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         //const x = params.id;
-        return block1;
+        return objBlock;
     },
     options: {
         after: ({ result, params }) => {

docs/typescript-examples/http.ts

@@ -127,3 +127,33 @@ de.run(block2, {
     .then((result) => {
         console.log(result.c);
     });
+
+const block3 = de.http({
+    block: {},
+    options: {},
+});
+
+const block4 = block3.extend({
+    block: {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        headers: ({ params }) => {
+            return {
+                'x-header': String(params.param2),
+            };
+        },
+    },
+    options: {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        params: ({ params }: { params: { param: number } }) => {
+            return {
+                param2: params.param,
+            };
+        },
+    },
+});
+
+de.run(block4, {
+    params: {
+        param: 1,
+    },
+});

docs/typescript-examples/options.ts

@@ -117,6 +117,8 @@ de.run(block2, {
 const block3 = de.http({
     block: {},
     options: {
+        //TODO как вывести In из Out?
+        //params: ({ params }: { params: ParamsIn }) => params,
         before: ({ params }: { params: ParamsIn }) => {
             if (!params.id) {
                 return 'foo';
@@ -143,3 +145,130 @@ de.run(block3, {
 
         return result;
     });
+
+const block4 = de.http({
+    block: {
+        agent: { maxSockets: 16 },
+        maxRetries: 1,
+        timeout: 1000,
+        body: ({ params }: { params: { p4: number } }) => params,
+    },
+    options: {
+        after: ({ result }: { result: de.DescriptHttpBlockResult<{ r: number }> }) => result.result,
+    },
+});
+
+de.run(block4, {
+    params: {
+        p4: 1,
+    },
+});
+
+const block5 = block4.extend({
+    block: {
+        body: ({ params }) => params,
+    },
+
+    options: {
+        after: ({ params }) => params,
+    },
+});
+
+const block6 = de.object({
+    block: {
+        block4: block5.extend({
+            options: {
+                params: ({ params }) => {
+                    return {
+                        p4: params.p4,
+                    };
+                },
+                //after: ({ result }) => result,
+            },
+        }),
+        block3: block3.extend({}),
+    },
+
+    options: {
+        after: ({ result }) => {
+            return result.block4;
+        },
+    },
+});
+
+de.run(block6, {
+    params: {
+        p4: 8,
+        id: '1',
+    },
+});
+
+const block7 = de.object({
+    block: {
+        block6: block6.extend({
+            options: {
+                params: ({ params }) => {
+                    return {
+                        p4: params.p4,
+                        id: '1',
+                        x: 1,
+                    };
+                },
+                //after: ({ result }) => result,
+            },
+        }),
+        block3: block3.extend({}),
+    },
+    options: {
+        after: ({ result }) => {
+            return result.block6;
+        },
+    },
+});
+
+
+de.run(block7, {
+    params: {
+        p4: 8,
+        id: '1',
+    },
+});
+
+const block8 = de.http({
+    block: {
+        agent: { maxSockets: 16 },
+        maxRetries: 1,
+        timeout: 1000,
+        body: ({ params }: { params: { p1: number } }) => params,
+    },
+    options: {
+        after: ({ result }: { result: de.DescriptHttpBlockResult<{ r: number }> }) => result.result,
+    },
+});
+
+const block9 = block8.extend({
+    block: {
+        body: ({ params }: { params: { p4: number; p1: number } }) => params,
+    },
+
+    options: {
+        after: ({ params }) => params,
+    },
+});
+
+
+de.run(block9, {
+    params: {
+        p1: 8,
+    },
+});
+
+const block10 = de.func({
+    block: () => {
+        return block8;
+    },
+});
+
+de.run(block10, {
+    params: {},
+});

lib/arrayBlock.ts

@@ -75,36 +75,21 @@ class ArrayBlock<
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         ExtendedResultOut extends
         BlockResultOut<ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut>,
-        ExtendedParamsOut = Params,
+        ExtendedParamsOut extends Params = Params,
         ExtendedParams = Params,
         ExtendedBlockResult = ResultOut,
         ExtendedBeforeResultOut = undefined,
         ExtendedAfterResultOut = undefined,
         ExtendedErrorResultOut = undefined,
     >({ options }: {
         options: DescriptBlockOptions<
-        Context, Params & ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
+        Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
         >;
     }) {
-        return this.extendClass<
-        ArrayBlock<
-        Context,
-        Block,
-        ExtendedResultOut,
-        Params & ExtendedParamsOut,
-        ExtendedBlockResult,
-        ExtendedBeforeResultOut,
-        ExtendedAfterResultOut,
-        ExtendedErrorResultOut,
-        ExtendedParams
-        >,
-        ExtendedBlockResult,
-        ExtendedParamsOut,
-        ExtendedParams,
-        ExtendedBeforeResultOut,
-        ExtendedAfterResultOut,
-        ExtendedErrorResultOut
-        >({ options });
+        return new ArrayBlock({
+            block: this.extendBlock(this.block),
+            options: this.extendOptions(this.options, options) as typeof options,
+        });
     }
 
     protected initBlock(array: ArrayBlockDefinition<Block>) {

lib/block.ts

@@ -58,7 +58,7 @@ abstract class BaseBlock<
     BeforeResultOut = undefined,
     AfterResultOut = undefined,
     ErrorResultOut = undefined,
-    Params = ParamsOut,
+    Params = ParamsOut
 > {
     protected block: CustomBlock;
     protected options: BlockOptions<Context, ParamsOut, BlockResult, BeforeResultOut, AfterResultOut, ErrorResultOut, Params>;
@@ -84,49 +84,51 @@ abstract class BaseBlock<
     protected extendClass<
         ClassType,
         ExtendedBlockResult,
-        ExtendedParamsOut = Params,
+        ExtendedParamsOut extends Params = Params,
         ExtendedParams = Params,
-        ExtendedBeforeResultOut = undefined,
-        ExtendedAfterResultOut = undefined,
-        ExtendedErrorResultOut = undefined,
+        ExtendedBeforeResultOut = void,
+        ExtendedAfterResultOut = void,
+        ExtendedErrorResultOut = void,
+        ExtendedCustomBlock extends CustomBlock = CustomBlock,
     >({ block, options }: {
-        block?: CustomBlock;
+        block?: ExtendedCustomBlock;
         options?:
         DescriptBlockOptions<
-        Context, Params & ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
+        Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
         >;
     }): ClassType {
 
         return new (<BlockConstructor<
         Context,
-        Params & ExtendedParamsOut,
+        ExtendedParamsOut,
         ExtendedBlockResult,
         ExtendedBeforeResultOut,
         ExtendedAfterResultOut,
         ExtendedErrorResultOut,
         ExtendedParams,
         ClassType,
-        CustomBlock
+        ExtendedCustomBlock
         >> this.constructor)({
-            block: this.extendBlock(block),
+            block: this.extendBlock(block) as ExtendedCustomBlock,
             options: this.extendOptions(this.options, options),
         });
     }
 
     abstract extend<
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        ExtendedResultOut extends
-        BlockResultOut<ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut>,
-        ExtendedParamsOut = Params,
+        //ExtendedResultOut extends
+        //BlockResultOut<ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut>,
+        ExtendedParamsOut extends Params = Params,
         ExtendedParams = Params,
+        //ExtendedCustomBlock = CustomBlock,
         ExtendedBlockResult = ResultOut,
-        ExtendedBeforeResultOut = undefined,
-        ExtendedAfterResultOut = undefined,
-        ExtendedErrorResultOut = undefined,
+        ExtendedBeforeResultOut = void,
+        ExtendedAfterResultOut = void,
+        ExtendedErrorResultOut = void,
     >({ block, options }: {
         block?: CustomBlock;
         options?: DescriptBlockOptions<
-        Context, Params & ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
+        Context, ParamsOut & ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
         >;
     }): unknown
 
@@ -144,7 +146,7 @@ abstract class BaseBlock<
     }
 
     //eslint-disable-next-line @typescript-eslint/no-unused-vars
-    protected extendBlock(block?: CustomBlock) {
+    protected extendBlock<ExtendedCustomBlock extends CustomBlock>(block?: ExtendedCustomBlock) {
         return this.block;
     }
 
@@ -201,9 +203,9 @@ abstract class BaseBlock<
     private extendLifecycle<
         ExtendedParamsOut,
         ExtendedBlockResult,
-        ExtendedBeforeResultOut = undefined,
-        ExtendedAfterResultOut = undefined,
-        ExtendedErrorResultOut = undefined,
+        ExtendedBeforeResultOut = void,
+        ExtendedAfterResultOut = void,
+        ExtendedErrorResultOut = void,
         ExtendedParams = ExtendedParamsOut,
         // eslint-disable-next-line max-len
         W extends BlockOptions<Context, ParamsOut, BlockResult, BeforeResultOut, AfterResultOut, ErrorResultOut, Params> =

lib/compositeBlock.ts

@@ -27,7 +27,7 @@ abstract class CompositeBlock<
     BeforeResultOut = undefined,
     AfterResultOut = undefined,
     ErrorResultOut = undefined,
-    Params = ParamsOut,
+    Params = ParamsOut
 > extends BaseBlock<
     Context,
     CustomBlock,

lib/depsDomain.ts

@@ -1,14 +1,16 @@
 //TODO как это типизировать any этот?
 export type DescriptBlockDeps = Record<DescriptBlockId, any>;
 export type DescriptBlockId = symbol;
+export type GenerateId = (label?: string) => DescriptBlockId;
+
 class DepsDomain {
     ids: Record<DescriptBlockId, boolean>;
     constructor(parent: any) {
         this.ids = (parent instanceof DepsDomain) ? Object.create(parent.ids) : {};
 
     }
 
-    generateId = (label?: string): DescriptBlockId => {
+    generateId: GenerateId = (label?: string): DescriptBlockId => {
         const id = Symbol(label);
         this.ids[ id ] = true;
         return id;