issue-80: добавил поддержку required для всех блоков

lib/arrayBlock.ts

@@ -24,13 +24,13 @@
     0: never;
     1: [ InferArrayElement<First<T>> ];
     2: [ InferArrayElement<First<T>>, ...GetArrayBlockResult<Tail<T>> ];
 }[ T extends [] ? 0 : T extends ((readonly [ any ]) | [ any ]) ? 1 : 2 ];
 
 export type GetArrayBlockParamsUnion<T extends ReadonlyArray<unknown>> = {
     0: never;
     1: First<T>;
     2: First<T> & GetArrayBlockParamsUnion<Tail<T>>;
 }[ T extends [] ? 0 : T extends ((readonly [ any ]) | [ any ]) ? 1 : 2 ];
 
 type GetArrayBlockParamsMap<T extends ReadonlyArray<unknown>> = {
     [ P in keyof T ]: InferParamsInFromBlock<T[ P ]>;
@@ -79,7 +79,6 @@
     > {
 
     extend<
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         ExtendedResultOut extends
         BlockResultOut<ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut>,
         ExtendedParamsOut extends Params = Params,
@@ -88,15 +87,20 @@
         ExtendedBeforeResultOut = unknown,
         ExtendedAfterResultOut = unknown,
         ExtendedErrorResultOut = unknown,
+        const ExtendedIsRequired extends boolean = IsRequired,
     >({ options }: {
         options: DescriptBlockOptions<
             Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
-        >;
+        > & { required?: ExtendedIsRequired };
     }) {
-        return new ArrayBlock({
+        const result = new ArrayBlock({
             block: this.extendBlock(this.block),
             options: this.extendOptions(this.options, options) as typeof options,
         });
+        return result as unknown as ArrayBlock<
+            Context, Block, ExtendedResultOut, ExtendedParamsOut, ExtendedBlockResult,
+            ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams, ExtendedIsRequired
+        >;
     }
 
     protected initBlock(array: ArrayBlockDefinition<Block>) {

lib/block.ts

@@ -78,6 +78,7 @@
         ExtendedBeforeResultOut = unknown,
         ExtendedAfterResultOut = unknown,
         ExtendedErrorResultOut = unknown,
+        const ExtendedIsRequired extends boolean = IsRequired,
     >({ block, options }: {
         block?: CustomBlock;
         options?: DescriptBlockOptions<
@@ -88,7 +89,7 @@
             ExtendedAfterResultOut,
             ExtendedErrorResultOut,
             ExtendedParams
-        >;
+        > & { required?: ExtendedIsRequired };
     }): unknown;
 
     protected initBlock(block: CustomBlock) {
@@ -444,7 +445,7 @@
             blockCancel.throwIfCancelled();
 
             if (typeof step.after === 'function') {
                 resultAfter = await step.after({ cancel, params, context, deps, dep, result: (resultBefore || resultBlock) as any });
                 blockCancel.throwIfCancelled();
 
                 if (resultAfter instanceof BaseBlock) {

lib/firstBlock.ts

@@ -85,7 +85,6 @@ class FirstBlock<
     > {
 
     extend<
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         ExtendedResultOut extends
         BlockResultOut<ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut>,
         // ExtendedCustomBlock extends FirstBlockDefinition<Block>,
@@ -95,15 +94,20 @@ class FirstBlock<
         ExtendedBeforeResultOut = unknown,
         ExtendedAfterResultOut = unknown,
         ExtendedErrorResultOut = unknown,
+        const ExtendedIsRequired extends boolean = IsRequired,
     >({ options }: {
         options: DescriptBlockOptions<
             Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
-        >;
+        > & { required?: ExtendedIsRequired };
     }) {
-        return new FirstBlock({
+        const result = new FirstBlock({
             block: this.extendBlock(this.block),
             options: this.extendOptions(this.options, options) as typeof options,
         });
+        return result as unknown as FirstBlock<
+            Context, Block, ExtendedResultOut, ExtendedParamsOut, ExtendedBlockResult,
+            ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams, ExtendedIsRequired
+        >;
     }
 
     protected initBlock(block: FirstBlockDefinition<Block>) {

lib/httpBlock.ts

@@ -214,11 +214,12 @@ class HttpBlock<
         ExtendedBeforeResultOut = unknown,
         ExtendedAfterResultOut = unknown,
         ExtendedErrorResultOut = unknown,
+        const ExtendedIsRequired extends boolean = IsRequired,
     >({ options, block }: {
         block?: DescriptHttpBlockDescription<ParamsOut & ExtendedParamsOut, Context, HttpResult>;
         options?: DescriptBlockOptions<
             Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
-        >;
+        > & { required?: ExtendedIsRequired };
     }) {
         const x = new HttpBlock<
             Context,
@@ -229,7 +230,8 @@ class HttpBlock<
             ExtendedBeforeResultOut,
             ExtendedAfterResultOut,
             ExtendedErrorResultOut,
-            ExtendedParams
+            ExtendedParams,
+            ExtendedIsRequired
         >({
             block: this.extendBlock(block),
             options: this.extendOptions(this.options, options),

lib/objectBlock.ts

@@ -110,7 +110,6 @@ class ObjectBlock<
     }
 
     extend<
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         ExtendedResultOut extends
         BlockResultOut<ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut>,
         // ExtendedCustomBlock extends ObjectBlockDefinition<Blocks>,
@@ -120,15 +119,20 @@ class ObjectBlock<
         ExtendedBeforeResultOut = unknown,
         ExtendedAfterResultOut = unknown,
         ExtendedErrorResultOut = unknown,
+        const ExtendedIsRequired extends boolean = IsRequired,
     >({ options }: {
         options: DescriptBlockOptions<
             Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
-        >;
+        > & { required?: ExtendedIsRequired };
     }) {
-        return new ObjectBlock({
+        const result = new ObjectBlock({
             block: this.extendBlock(this.block),
             options: this.extendOptions(this.options, options) as typeof options,
         });
+        return result as unknown as ObjectBlock<
+            Context, Blocks, ExtendedResultOut, ExtendedParamsOut, ExtendedBlockResult,
+            ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams, ExtendedIsRequired
+        >;
     }
 
 }

lib/pipeBlock.ts

@@ -78,25 +78,29 @@ class PipeBlock<
     > {
 
     extend<
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        // ExtendedResultOut extends
-        // BlockResultOut<ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut>,
+        ExtendedResultOut extends
+        BlockResultOut<ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut>,
         // ExtendedCustomBlock extends PipeBlockDefinition<Block>,
         ExtendedParamsOut extends Params = Params,
         ExtendedParams = Params,
         ExtendedBlockResult = ResultOut,
         ExtendedBeforeResultOut = unknown,
         ExtendedAfterResultOut = unknown,
         ExtendedErrorResultOut = unknown,
+        const ExtendedIsRequired extends boolean = IsRequired,
     >({ options }: {
         options: DescriptBlockOptions<
             Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
-        >;
+        > & { required?: ExtendedIsRequired };
     }) {
-        return new PipeBlock({
+        const result = new PipeBlock({
             block: this.extendBlock(this.block),
             options: this.extendOptions(this.options, options) as typeof options,
         });
+        return result as unknown as PipeBlock<
+            Context, Block, ExtendedResultOut, ExtendedParamsOut, ExtendedBlockResult,
+            ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams, ExtendedIsRequired
+        >;
     }
 
     protected initBlock(block: PipeBlockDefinition<Block>) {

tests/options.required.test.ts

@@ -232,4 +232,170 @@ describe('options.required', () => {
             Expect<TypesMatch<typeof result, { foo: number | DescriptError }>>,
         ];
     });
+
+    it('types: func .extend({ required: true }) removes DescriptError from object block result', async() => {
+        const base = de.func({
+            block: () => 42,
+        });
+        const block = de.object({
+            block: {
+                foo: base.extend({
+                    options: {
+                        required: true,
+                    },
+                }),
+            },
+        });
+
+        const result = await de.run(block, { params: {} });
+
+        expect(result.foo).toBe(42);
+
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        type Tests = [
+            Expect<TypesMatch<typeof result, { foo: number }>>,
+        ];
+    });
+
+    it('types: http .extend({ required: true }) removes DescriptError from object block result', async() => {
+        const path = getPath();
+        fake.add(path, {
+            statusCode: 200,
+            headers: { 'content-type': 'application/json' },
+            content: JSON.stringify({ foo: 'bar' }),
+        });
+
+        const base = de.http({
+            block: {
+                hostname: 'localhost',
+                port: PORT,
+                pathname: path,
+            },
+            options: {
+                after: ({ result }) => result.result as { foo: string },
+            },
+        });
+        const block = de.object({
+            block: {
+                data: base.extend({
+                    options: {
+                        required: true,
+                    },
+                }),
+            },
+        });
+
+        const result = await de.run(block);
+
+        expect(result.data).toEqual({ foo: 'bar' });
+
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        type Tests = [
+            Expect<TypesMatch<typeof result, { data: { foo: string } }>>,
+        ];
+    });
+
+    it('types: http .extend({ required: false }) keeps DescriptError in object block result', async() => {
+        const path = getPath();
+        fake.add(path, {
+            statusCode: 200,
+            headers: { 'content-type': 'application/json' },
+            content: JSON.stringify({ foo: 'bar' }),
+        });
+
+        const base = de.http({
+            block: {
+                hostname: 'localhost',
+                port: PORT,
+                pathname: path,
+            },
+            options: {
+                after: ({ result }) => result.result as { foo: string },
+            },
+        });
+        const block = de.object({
+            block: {
+                data: base.extend({
+                    options: {
+                        required: false,
+                    },
+                }),
+            },
+        });
+
+        const result = await de.run(block);
+
+        expect(result.data).toEqual({ foo: 'bar' });
+
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        type Tests = [
+            Expect<TypesMatch<typeof result, { data: { foo: string } | DescriptError }>>,
+        ];
+    });
+
+    it('types: http .extend() inherits required=true from parent', async() => {
+        const path = getPath();
+        fake.add(path, {
+            statusCode: 200,
+            headers: { 'content-type': 'application/json' },
+            content: JSON.stringify({ foo: 'bar' }),
+        });
+
+        const base = de.http({
+            block: {
+                hostname: 'localhost',
+                port: PORT,
+                pathname: path,
+            },
+            options: {
+                after: ({ result }) => result.result as { foo: string },
+                required: true,
+            },
+        });
+        const block = de.object({
+            block: {
+                data: base.extend({}),
+            },
+        });
+
+        const result = await de.run(block);
+
+        expect(result.data).toEqual({ foo: 'bar' });
+
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        type Tests = [
+            Expect<TypesMatch<typeof result, { data: { foo: string } }>>,
+        ];
+    });
+
+    it('types: object .extend({ required: true }) removes DescriptError from parent object block result', async() => {
+        const inner = de.object({
+            block: {
+                foo: de.func({
+                    block: () => 42,
+                    options: {
+                        required: true,
+                    },
+                }),
+            },
+        });
+        const block = de.object({
+            block: {
+                data: inner.extend({
+                    options: {
+                        required: true,
+                    },
+                }),
+            },
+        });
+
+        const result = await de.run(block, { params: {} });
+
+        expect(result.data).toEqual({ foo: 42 });
+
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        type Tests = [
+            Expect<TypesMatch<typeof result, { data: { foo: number } }>>,
+        ];
+    });
 });