Skip to content

Commit d969423

Browse files
authored
Fix #3437: extendShape erases JSDoc property documentation (#3463)
1 parent 29d2ea2 commit d969423

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

deno/lib/helpers/util.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,9 @@ export namespace objectUtil {
132132
};
133133

134134
export type extendShape<A extends object, B extends object> = {
135-
[K in keyof A | keyof B]: K extends keyof B
136-
? B[K]
137-
: K extends keyof A
138-
? A[K]
139-
: never;
135+
[K in keyof A as K extends keyof B ? never : K]: A[K];
136+
} & {
137+
[K in keyof B]: B[K];
140138
};
141139
}
142140

src/helpers/util.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,9 @@ export namespace objectUtil {
132132
};
133133

134134
export type extendShape<A extends object, B extends object> = {
135-
[K in keyof A | keyof B]: K extends keyof B
136-
? B[K]
137-
: K extends keyof A
138-
? A[K]
139-
: never;
135+
[K in keyof A as K extends keyof B ? never : K]: A[K];
136+
} & {
137+
[K in keyof B]: B[K];
140138
};
141139
}
142140

0 commit comments

Comments
 (0)