Fix #3437: extendShape erases JSDoc property documentation (#3463)

colinhacks · May 7, 2024 · d969423 · d969423
1 parent 29d2ea2
commit d969423
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/deno/lib/helpers/util.ts b/deno/lib/helpers/util.ts
@@ -132,11 +132,9 @@ export namespace objectUtil {
   };
 
   export type extendShape<A extends object, B extends object> = {
-    [K in keyof A | keyof B]: K extends keyof B
-      ? B[K]
-      : K extends keyof A
-      ? A[K]
-      : never;
+    [K in keyof A as K extends keyof B ? never : K]: A[K];
+  } & {
+    [K in keyof B]: B[K];
   };
 }
 

diff --git a/src/helpers/util.ts b/src/helpers/util.ts
@@ -132,11 +132,9 @@ export namespace objectUtil {
   };
 
   export type extendShape<A extends object, B extends object> = {
-    [K in keyof A | keyof B]: K extends keyof B
-      ? B[K]
-      : K extends keyof A
-      ? A[K]
-      : never;
+    [K in keyof A as K extends keyof B ? never : K]: A[K];
+  } & {
+    [K in keyof B]: B[K];
   };
 }