fix: Fix typing of conditional promises in pipeline

Co-authored-by: Mikko Aspiala <[email protected]>
Signed-off-by: Janne Savolainen <[email protected]>

packages/fp/src/pipeline/pipelineFor.d.ts

@@ -108,8 +108,10 @@ type ContainsPromise<T extends [...any[]]> = T extends [
   infer Head,
   ...infer Tail
 ]
-  ? Head extends Promise<any>
-    ? true
+  ? Promise<any> extends Head
+    ? {} extends Head
+      ? false
+      : true
     : ContainsPromise<Tail>
   : false;
 

packages/fp/src/pipeline/unsafePipeline/pipeline.test-d.ts

@@ -72,3 +72,43 @@ expectType<Promise<string>>(pipelineResultWithNoAsyncChanceOfBreak);
 expectNotAssignable<Promise<typeof pipelineBreak>>(
   pipelineResultWithNoAsyncChanceOfBreak,
 );
+
+const pipelineResultWithConditionalType = pipeline(
+  'some-string',
+
+  someParameter => {
+    expectType<string>(someParameter);
+
+    return 1 > 2
+      ? Promise.resolve('some-resolved-string')
+      : 'some-other-string';
+  },
+
+  someParameter => {
+    expectType<string>(someParameter);
+
+    return someParameter;
+  },
+);
+
+expectType<Promise<string>>(pipelineResultWithConditionalType);
+
+const pipelineResultWithConditionalTypeAndBreak = pipeline(
+  'some-string',
+
+  someParameter => {
+    expectType<string>(someParameter);
+
+    return 1 > 2
+      ? Promise.resolve('some-resolved-string')
+      : 'some-other-string';
+  },
+
+  () => pipelineBreak,
+);
+
+expectType<Promise<symbol>>(pipelineResultWithConditionalTypeAndBreak);
+
+const pipelineUsingEmptyObject = pipeline({}, x => x);
+
+expectNotAssignable<{ then: any }>(pipelineUsingEmptyObject);