Skip to content
This repository has been archived by the owner on Jul 25, 2018. It is now read-only.

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

Merged
merged 1 commit into from
Jul 17, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions snapshots/ramda-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions templates/composeP.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ export default create_composition_declarations(
max_curry_level,
6,
x => x,
x => `PromiseLike<${x}> | ${x}`,
x => `PromiseLike<${x}>`,
);
1 change: 1 addition & 0 deletions templates/pipeP.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ export default create_composition_declarations(
max_curry_level,
6,
x => x,
x => `PromiseLike<${x}> | ${x}`,
x => `PromiseLike<${x}>`,
);
16 changes: 9 additions & 7 deletions templates/utils/create-composition-declarations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand All @@ -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(`
Expand All @@ -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])};
`);
}
}
Expand Down
6 changes: 6 additions & 0 deletions tests/__snapshots__/ramda-tests.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
6 changes: 6 additions & 0 deletions tests/ramda-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down