fix: undefined in after falls to extended block result

docs/typescript-examples/options.ts

@@ -270,3 +270,97 @@ const block10 = de.func({
 de.run(block10, {
     params: {},
 });
+
+export type BlockResultOut<
+    Result = never,
+    Before = never,
+    After = never,
+> =
+[ After ] extends [ never ] ?
+    [ Before ] extends [ never ] ?
+        Result :
+        Before | Result :
+    After;
+
+class Block<
+    ResultOut extends BlockResultOut<Result, Before, After>,
+    Result = never,
+    Before = never,
+    After = never,
+> {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    constructor(options: Options<Result, Before, After>) {
+
+    }
+
+    extend<
+        ResultOut2 extends BlockResultOut<BlockResult2, Before2, After2>,
+        BlockResult2 = ResultOut,
+        Before2 = never,
+        After2 = never,
+    >(options: Options<BlockResult2, Before2, After2>) {
+        return new Block<ResultOut2, BlockResult2, Before2, After2>(options);
+    };
+
+    run() {
+        return 1 as ResultOut;
+    }
+}
+
+export type InferResultOrResult<Result> = Result extends Block<
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+    infer ResultOut, infer After, infer Before, infer Result
+> ? InferResultOrResult<ResultOut> : Result;
+
+type Options<
+    Result = never,
+    Before = never,
+    After = never,
+> = {
+    block?: () => Result;
+    before?: () => Before;
+    after?: (
+        res: [ Before ] extends [ never ] ?
+            InferResultOrResult<Result> : InferResultOrResult<Before> | InferResultOrResult<Result>
+    ) => After;
+};
+
+const block = <
+    ResultOut extends BlockResultOut<Result, Before, After>,
+    Result = never,
+    Before = never,
+    After = never,
+>(options: Options<Result, Before, After>) => {
+    return new Block<ResultOut, Result, Before, After>(options);
+};
+
+type Block11Result = {
+    data: { somefield: number } | null;
+    errors: Array<string> | null;
+};
+
+const b1 = block({
+    block: (): Block11Result => {
+        return { data: { somefield: 42 }, errors: null };
+    },
+
+    after: (res) => res,
+});
+
+const b2 = b1.extend({
+    after(res) {
+        return res.data?.somefield;
+    },
+});
+
+const b3 = b2.extend({
+    after(res) {
+        return res;
+    },
+});
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const r1 = b3.run();
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+type R = typeof r1; // оно должно стать number | undefined

lib/arrayBlock.ts

@@ -19,13 +19,13 @@
     0: never;
     1: [ InferResultFromBlock<First<T>> | DescriptError ];
     2: [ InferResultFromBlock<First<T>> | DescriptError, ...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 ]>;
@@ -53,9 +53,9 @@
     ParamsOut = GetArrayBlockParams<Block>,
     BlockResult = GetArrayBlockResult<Block>,
 
-    BeforeResultOut = undefined,
-    AfterResultOut = undefined,
-    ErrorResultOut = undefined,
+    BeforeResultOut = unknown,
+    AfterResultOut = unknown,
+    ErrorResultOut = unknown,
     Params = GetArrayBlockParams<Block>,
 > extends CompositeBlock<
         Context,
@@ -78,9 +78,9 @@
         ExtendedParamsOut extends Params = Params,
         ExtendedParams = Params,
         ExtendedBlockResult = ResultOut,
-        ExtendedBeforeResultOut = undefined,
-        ExtendedAfterResultOut = undefined,
-        ExtendedErrorResultOut = undefined,
+        ExtendedBeforeResultOut = unknown,
+        ExtendedAfterResultOut = unknown,
+        ExtendedErrorResultOut = unknown,
     >({ options }: {
         options: DescriptBlockOptions<
             Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams

lib/block.ts

@@ -30,33 +30,16 @@
     'before' | 'after' | 'error' | 'params' | 'deps'
   >>;
 
-interface BlockConstructor<
-    Context,
-    ParamsOut,
-    BlockResult,
-    BeforeResultOut,
-    AfterResultOut,
-    ErrorResultOut,
-    Params,
-    ClassType,
-    CustomBlock,
-> {
-    new ({ block, options }: {
-        block?: CustomBlock;
-        options: DescriptBlockOptions<Context, ParamsOut, BlockResult, BeforeResultOut, AfterResultOut, ErrorResultOut, Params>;
-    }): ClassType;
-}
-
 abstract class BaseBlock<
     Context,
     CustomBlock,
     ParamsOut,
     ResultOut extends BlockResultOut<BlockResult, BeforeResultOut, AfterResultOut, ErrorResultOut>,
     IntermediateResult,
     BlockResult,
-    BeforeResultOut = undefined,
-    AfterResultOut = undefined,
-    ErrorResultOut = undefined,
+    BeforeResultOut = unknown,
+    AfterResultOut = unknown,
+    ErrorResultOut = unknown,
     Params = ParamsOut,
 > {
     protected block: CustomBlock;
@@ -80,39 +63,6 @@
         this.initOptions(options);
     }
 
-    protected extendClass<
-        ClassType,
-        ExtendedBlockResult,
-        ExtendedParamsOut extends Params = Params,
-        ExtendedParams = Params,
-        ExtendedBeforeResultOut = void,
-        ExtendedAfterResultOut = void,
-        ExtendedErrorResultOut = void,
-        ExtendedCustomBlock extends CustomBlock = CustomBlock,
-    >({ block, options }: {
-        block?: ExtendedCustomBlock;
-        options?:
-        DescriptBlockOptions<
-            Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
-        >;
-    }): ClassType {
-
-        return new (<BlockConstructor<
-            Context,
-            ExtendedParamsOut,
-            ExtendedBlockResult,
-            ExtendedBeforeResultOut,
-            ExtendedAfterResultOut,
-            ExtendedErrorResultOut,
-            ExtendedParams,
-            ClassType,
-            ExtendedCustomBlock
-        >> this.constructor)({
-            block: this.extendBlock(block) as ExtendedCustomBlock,
-            options: this.extendOptions(this.options, options),
-        });
-    }
-
     abstract extend<
 
         // ExtendedResultOut extends
@@ -121,13 +71,19 @@
         ExtendedParams = Params,
         // ExtendedCustomBlock = CustomBlock,
         ExtendedBlockResult = ResultOut,
-        ExtendedBeforeResultOut = void,
-        ExtendedAfterResultOut = void,
-        ExtendedErrorResultOut = void,
+        ExtendedBeforeResultOut = unknown,
+        ExtendedAfterResultOut = unknown,
+        ExtendedErrorResultOut = unknown,
     >({ block, options }: {
         block?: CustomBlock;
         options?: DescriptBlockOptions<
-            Context, ParamsOut & ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
+            Context,
+            ParamsOut & ExtendedParamsOut,
+            ExtendedBlockResult,
+            ExtendedBeforeResultOut,
+            ExtendedAfterResultOut,
+            ExtendedErrorResultOut,
+            ExtendedParams
         >;
     }): unknown;
 
@@ -482,7 +438,7 @@
             blockCancel.throwIfCancelled();
 
             if (typeof step.after === 'function') {
                 resultAfter = await step.after({ cancel, params, context, deps, result: (resultBefore || resultBlock) as any });
                 blockCancel.throwIfCancelled();
 
                 if (resultAfter instanceof BaseBlock) {

lib/compositeBlock.ts

@@ -24,9 +24,9 @@ abstract class CompositeBlock<
     IntermediateResult,
     BlockResultInt,
 
-    BeforeResultOut = undefined,
-    AfterResultOut = undefined,
-    ErrorResultOut = undefined,
+    BeforeResultOut = unknown,
+    AfterResultOut = unknown,
+    ErrorResultOut = unknown,
     Params = ParamsOut,
 > extends BaseBlock<
         Context,

lib/firstBlock.ts

@@ -64,9 +64,9 @@ class FirstBlock<
     ParamsOut = GetFirstBlockParams<Block>,
     BlockResult = GetFirstBlockResult<Block>,
 
-    BeforeResultOut = undefined,
-    AfterResultOut = undefined,
-    ErrorResultOut = undefined,
+    BeforeResultOut = unknown,
+    AfterResultOut = unknown,
+    ErrorResultOut = unknown,
     Params = GetFirstBlockParams<Block>,
 > extends CompositeBlock<
         Context,
@@ -90,9 +90,9 @@ class FirstBlock<
         ExtendedParamsOut extends Params = Params,
         ExtendedParams = Params,
         ExtendedBlockResult = ResultOut,
-        ExtendedBeforeResultOut = undefined,
-        ExtendedAfterResultOut = undefined,
-        ExtendedErrorResultOut = undefined,
+        ExtendedBeforeResultOut = unknown,
+        ExtendedAfterResultOut = unknown,
+        ExtendedErrorResultOut = unknown,
     >({ options }: {
         options: DescriptBlockOptions<
             Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams

lib/functionBlock.ts

@@ -24,9 +24,9 @@ class FunctionBlock<
     ParamsOut,
     BlockResult,
     ResultOut extends BlockResultOut<BlockResult, BeforeResultOut, AfterResultOut, ErrorResultOut>,
-    BeforeResultOut = undefined,
-    AfterResultOut = undefined,
-    ErrorResultOut = undefined,
+    BeforeResultOut = unknown,
+    AfterResultOut = unknown,
+    ErrorResultOut = unknown,
     Params = never extends InferParamsOutFromBlock<BlockResult> ? ParamsOut : InferParamsOutFromBlock<BlockResult>,
 > extends BaseBlock<
         Context,
@@ -99,12 +99,18 @@ class FunctionBlock<
         // ExtendedCustomBlock = DescriptHttpBlockDescription<ExtendedParamsOut, Context, HttpResult>,
 
         ExtendedBlockResult = ResultOut,
-        ExtendedBeforeResultOut = undefined,
-        ExtendedAfterResultOut = undefined,
-        ExtendedErrorResultOut = undefined,
+        ExtendedBeforeResultOut = unknown,
+        ExtendedAfterResultOut = unknown,
+        ExtendedErrorResultOut = unknown,
     >({ options }: {
         options: DescriptBlockOptions<
-            Context, ExtendedParamsOut, ExtendedBlockResult, ExtendedBeforeResultOut, ExtendedAfterResultOut, ExtendedErrorResultOut, ExtendedParams
+            Context,
+            ExtendedParamsOut,
+            ExtendedBlockResult,
+            ExtendedBeforeResultOut,
+            ExtendedAfterResultOut,
+            ExtendedErrorResultOut,
+            ExtendedParams
         >;
     }) {
         return new FunctionBlock({

lib/httpBlock.ts

@@ -180,9 +180,9 @@ class HttpBlock<
     HttpResult,
     ResultOut extends BlockResultOut<BlockResult, BeforeResultOut, AfterResultOut, ErrorResultOut>,
     BlockResult = DescriptHttpBlockResult<HttpResult>,
-    BeforeResultOut = undefined,
-    AfterResultOut = undefined,
-    ErrorResultOut = undefined,
+    BeforeResultOut = unknown,
+    AfterResultOut = unknown,
+    ErrorResultOut = unknown,
     Params = ParamsOut,
 > extends Block<
         Context,
@@ -205,9 +205,9 @@ class HttpBlock<
         // ExtendedCustomBlock = DescriptHttpBlockDescription<ExtendedParamsOut, Context, HttpResult>,
 
         ExtendedBlockResult = ResultOut,
-        ExtendedBeforeResultOut = undefined,
-        ExtendedAfterResultOut = undefined,
-        ExtendedErrorResultOut = undefined,
+        ExtendedBeforeResultOut = unknown,
+        ExtendedAfterResultOut = unknown,
+        ExtendedErrorResultOut = unknown,
     >({ options, block }: {
         block?: DescriptHttpBlockDescription<ParamsOut & ExtendedParamsOut, Context, HttpResult>;
         options?: DescriptBlockOptions<