improve types of fulfillment helpers #6976
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhofman
reviewed
Feb 12, 2023
| @@ -3,7 +3,7 @@ const { fromEntries, keys, values } = Object; | |||
| /** @type { <X, Y>(xs: X[], ys: Y[]) => [X, Y][]} */ | |||
| export const zip = (xs, ys) => harden(xs.map((x, i) => [x, ys[+i]])); | |||
|
|
|||
| /** @type { <K extends string, V>(obj: Record<K, ERef<V>>) => Promise<Record<K, V>> } */ | |||
| /** @type { <T extends Record<string, ERef<any>>>(obj: T) => Promise<{ [K in keyof T]: Awaited<T[K]>}> } */ | |||
packages/internal/src/utils.js
Outdated
| @@ -250,16 +250,12 @@ harden(bindAllMethods); | |||
|
|
|||
| /** | |||
| * @template {{}} T | |||
| * @typedef {{ [K in keyof T]: DeeplyAwaited<T[K]> }} DeeplyAwaitedObject | |||
| * @typedef {{ [K in keyof T]: T[K] extends Function ? T[K] : DeeplyAwaited<T[K]> }} DeeplyAwaitedObject | |||
There was a problem hiding this comment.
Suggested change
| * @typedef {{ [K in keyof T]: T[K] extends Function ? T[K] : DeeplyAwaited<T[K]> }} DeeplyAwaitedObject | |
| * @typedef {{ [K in keyof T]: T[K] extends (...args: any[]) => any ? T[K] : DeeplyAwaited<T[K]> }} DeeplyAwaitedObject |
packages/internal/src/utils.js
Outdated
| * @template T | ||
| * @typedef {T extends PromiseLike<any> ? Awaited<T> : T extends {} ? DeeplyAwaitedObject<T> : Awaited<T>} DeeplyAwaited | ||
| * @typedef {T extends PromiseLike<any> ? Awaited<T> : T extends {} ? import('type-fest').Simplify<DeeplyAwaitedObject<T>> : Awaited<T>} DeeplyAwaited |
There was a problem hiding this comment.
Is this the first time we take an external dependency for our types? Wondering how that works out once we start publishing our packages correctly and the exported types have external dependencies (there is an argument to be made in that case that it is not in fact a dev dependency)
There was a problem hiding this comment.
Good catch! yarn prepack showed this change didn't even build.
It's such a small type I backed out the import and copied it over with attribution.
turadg
force-pushed
the
ta/fix-deeplyAwaited
branch
from
9d03e4c to
2683f47
Compare
mhofman
approved these changes
Feb 12, 2023
Comment on lines
+253
to
+254
| * @typedef {{[KeyType in keyof T]: T[KeyType]} & {}} Simplify | ||
| * flatten the type output to improve type hints shown in editors |
turadg
added
automerge:no-update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Split from #6963 for easier review.
Security Considerations
--
Scaling Considerations
--
Documentation Considerations
--
Testing Considerations
New tests