feat(pipeP-like): allow non-PromiseLike as fn return type (#44)

ikatyang · Jul 17, 2017 · 9bd79dd · 9bd79dd
1 parent 9b325f1
commit 9bd79dd
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/snapshots/ramda-tests.ts b/snapshots/ramda-tests.ts
@@ -2194,6 +2194,12 @@ import * as R from '../ramda/dist/index';
     (m: number) => Promise.resolve(R.multiply(2, m)),
     (m: number) => Promise.resolve(m / 2),
   )(10);
+  // @dts-jest:pass -> PromiseLike<number>
+  R.pipeP(
+    (m: number) => Promise.resolve(R.multiply(2, m)),
+    (m: number) => Promise.resolve(m / 2),
+    R.multiply(5),
+  )(10);
 })();
 
 // @dts-jest:group pluck

diff --git a/templates/composeP.ts b/templates/composeP.ts
@@ -8,5 +8,6 @@ export default create_composition_declarations(
   max_curry_level,
   6,
   x => x,
+  x => `PromiseLike<${x}> | ${x}`,
   x => `PromiseLike<${x}>`,
 );
diff --git a/templates/pipeP.ts b/templates/pipeP.ts
@@ -8,5 +8,6 @@ export default create_composition_declarations(
   max_curry_level,
   6,
   x => x,
+  x => `PromiseLike<${x}> | ${x}`,
   x => `PromiseLike<${x}>`,
 );
diff --git a/templates/utils/create-composition-declarations.ts b/templates/utils/create-composition-declarations.ts
@@ -6,9 +6,11 @@ export const create_composition_declarations = (
     max_function_count: number,
     max_parameter_count: number,
     // istanbul ignore next
-    generate_parameter_type: (generic: string) => string = x => x,
+    generate_function_parameter_type: (generic: string) => string = x => x,
     // istanbul ignore next
-    generate_return_type: (generic: string) => string = x => x,
+    generate_function_return_type: (generic: string) => string = x => x,
+    // istanbul ignore next
+    generate_composed_return_type: (generic: string) => string = generate_function_return_type,
     ) => {
   const function_names = [...new Array(max_function_count)].map((_, index) => `fn${index + 1}`);
   const return_generics = [...new Array(max_function_count)].map((_, index) => `R${index + 1}`);
@@ -33,7 +35,7 @@ export const create_composition_declarations = (
       const current_parameter_generics = parameter_generics.slice(0, parameter_count);
 
       const entry_parameters = current_parameter_names.map((parameter_name, param_index) => `
-        ${parameter_name}: ${generate_parameter_type(current_parameter_generics[param_index])}
+        ${parameter_name}: ${generate_function_parameter_type(current_parameter_generics[param_index])}
       `).join(',');
 
       declarations.push(`
@@ -42,12 +44,12 @@ export const create_composition_declarations = (
             const function_name = current_sorted_function_names[index];
             const return_generic = current_sorted_return_generics[index];
             return (index === entry_index)
-              ? `${function_name}: (${entry_parameters}) => ${generate_return_type(return_generic)}`
+              ? `${function_name}: (${entry_parameters}) => ${generate_function_return_type(return_generic)}`
               : `${function_name}: (v: ${
-                generate_parameter_type(current_sorted_return_generics[index + (kind === 'compose' ? 1 : -1)])
-              }) => ${generate_return_type(return_generic)}`;
+                generate_function_parameter_type(current_sorted_return_generics[index + (kind === 'compose' ? 1 : -1)])
+              }) => ${generate_function_return_type(return_generic)}`;
           }).join(',')}
-        ): (${entry_parameters}) => ${generate_return_type(current_return_generics[current_return_generics.length - 1])};
+        ): (${entry_parameters}) => ${generate_composed_return_type(current_return_generics[current_return_generics.length - 1])};
       `);
     }
   }

diff --git a/tests/__snapshots__/ramda-tests.ts.snap b/tests/__snapshots__/ramda-tests.ts.snap
@@ -1025,6 +1025,12 @@ exports[`pipe f(3, 4) 1`] = `"number"`;
 
 exports[`pipe squareThenDoubleThenTriple(5) 1`] = `"number"`;
 
+exports[`pipeP R.pipeP(
+        (m: number) => Promise.resolve(R.multiply(2, m)),
+        (m: number) => Promise.resolve(m / 2),
+        R.multiply(5),
+      )(10) 1`] = `"PromiseLike<number>"`;
+
 exports[`pipeP R.pipeP(
         (m: number) => Promise.resolve(R.multiply(2, m)),
         (m: number) => Promise.resolve(m / 2),

diff --git a/tests/ramda-tests.ts b/tests/ramda-tests.ts
@@ -2194,6 +2194,12 @@ import * as R from '../ramda/dist/index';
     (m: number) => Promise.resolve(R.multiply(2, m)),
     (m: number) => Promise.resolve(m / 2),
   )(10);
+  // @dts-jest:pass
+  R.pipeP(
+    (m: number) => Promise.resolve(R.multiply(2, m)),
+    (m: number) => Promise.resolve(m / 2),
+    R.multiply(5),
+  )(10);
 })();
 
 // @dts-jest:group pluck