Reflect suggestions from review

Author: graphemecluster

src/lib/es2017.object.d.ts

@@ -27,5 +27,5 @@ interface ObjectConstructor {
      * Returns an object containing all own property descriptors of an object
      * @param o Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
      */
-    getOwnPropertyDescriptors<T extends {}>(o: T): { [P in keyof T]: TypedPropertyDescriptor<T[P]> } & { [x: string]: PropertyDescriptor };
+    getOwnPropertyDescriptors<T extends {}>(o: T): { [P in keyof T]: TypedPropertyDescriptor<T[P]> } & PropertyDescriptorMap;
 }

src/lib/es2019.object.d.ts

@@ -5,7 +5,7 @@ interface ObjectConstructor {
      * Returns an object created by key-value entries for properties and methods
      * @param entries An iterable object that contains key-value entries for properties and methods.
      */
-    fromEntries<T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T };
+    fromEntries<T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: PropertyKey]: T };
 
     /**
      * Returns an object created by key-value entries for properties and methods

tests/baselines/reference/objectFromEntries.types

@@ -1,10 +1,10 @@
 === tests/cases/compiler/objectFromEntries.ts ===
 const o = Object.fromEntries([['a', 1], ['b', 2], ['c', 3]]);
->o : { [k: string]: number; }
->Object.fromEntries([['a', 1], ['b', 2], ['c', 3]]) : { [k: string]: number; }
->Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>o : { [k: string]: number; [k: number]: number; [k: symbol]: number; }
+>Object.fromEntries([['a', 1], ['b', 2], ['c', 3]]) : { [k: string]: number; [k: number]: number; [k: symbol]: number; }
+>Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >Object : ObjectConstructor
->fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >[['a', 1], ['b', 2], ['c', 3]] : [string, number][]
 >['a', 1] : [string, number]
 >'a' : "a"
@@ -17,20 +17,20 @@ const o = Object.fromEntries([['a', 1], ['b', 2], ['c', 3]]);
 >3 : 3
 
 const o2 = Object.fromEntries(new URLSearchParams());
->o2 : { [k: string]: string; }
->Object.fromEntries(new URLSearchParams()) : { [k: string]: string; }
->Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>o2 : { [k: string]: string; [k: number]: string; [k: symbol]: string; }
+>Object.fromEntries(new URLSearchParams()) : { [k: string]: string; [k: number]: string; [k: symbol]: string; }
+>Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >Object : ObjectConstructor
->fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >new URLSearchParams() : URLSearchParams
 >URLSearchParams : { new (init?: string | URLSearchParams | string[][] | Record<string, string>): URLSearchParams; prototype: URLSearchParams; toString(): string; }
 
 const o3 = Object.fromEntries(new Map([[Symbol("key"), "value"]]));
->o3 : { [k: string]: string; }
->Object.fromEntries(new Map([[Symbol("key"), "value"]])) : { [k: string]: string; }
->Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>o3 : { [k: string]: string; [k: number]: string; [k: symbol]: string; }
+>Object.fromEntries(new Map([[Symbol("key"), "value"]])) : { [k: string]: string; [k: number]: string; [k: symbol]: string; }
+>Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >Object : ObjectConstructor
->fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >new Map([[Symbol("key"), "value"]]) : Map<symbol, string>
 >Map : MapConstructor
 >[[Symbol("key"), "value"]] : [symbol, string][]
@@ -60,9 +60,9 @@ const frozenArray = Object.freeze([['a', 1], ['b', 2], ['c', 3]]);
 const o4 = Object.fromEntries(frozenArray);
 >o4 : any
 >Object.fromEntries(frozenArray) : any
->Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >Object : ObjectConstructor
->fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >frozenArray : readonly (string | number)[][]
 
 const frozenArray2: readonly [string, number][] = Object.freeze([['a', 1], ['b', 2], ['c', 3]]);
@@ -83,10 +83,10 @@ const frozenArray2: readonly [string, number][] = Object.freeze([['a', 1], ['b',
 >3 : 3
 
 const o5 = Object.fromEntries(frozenArray2);
->o5 : { [k: string]: number; }
->Object.fromEntries(frozenArray2) : { [k: string]: number; }
->Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>o5 : { [k: string]: number; [k: number]: number; [k: symbol]: number; }
+>Object.fromEntries(frozenArray2) : { [k: string]: number; [k: number]: number; [k: symbol]: number; }
+>Object.fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >Object : ObjectConstructor
->fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; }; (entries: Iterable<readonly any[]>): any; }
+>fromEntries : { <T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T; [k: number]: T; [k: symbol]: T; }; (entries: Iterable<readonly any[]>): any; }
 >frozenArray2 : readonly [string, number][]
 

tests/baselines/reference/objectMethodNullability.types

@@ -48,10 +48,10 @@ Object.getOwnPropertyDescriptor(undefined, "foo");
 >"foo" : "foo"
 
 Object.getOwnPropertyDescriptors(undefined);
->Object.getOwnPropertyDescriptors(undefined) : {} & { [x: string]: PropertyDescriptor; }
->Object.getOwnPropertyDescriptors : <T extends {}>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & { [x: string]: PropertyDescriptor; }
+>Object.getOwnPropertyDescriptors(undefined) : {} & PropertyDescriptorMap
+>Object.getOwnPropertyDescriptors : <T extends {}>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & PropertyDescriptorMap
 >Object : ObjectConstructor
->getOwnPropertyDescriptors : <T extends {}>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & { [x: string]: PropertyDescriptor; }
+>getOwnPropertyDescriptors : <T extends {}>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & PropertyDescriptorMap
 >undefined : undefined
 
 Object.getOwnPropertyNames(undefined);
@@ -154,10 +154,10 @@ Object.getOwnPropertyDescriptor(0, "foo");
 >"foo" : "foo"
 
 Object.getOwnPropertyDescriptors(0);
->Object.getOwnPropertyDescriptors(0) : number & { [x: string]: PropertyDescriptor; }
->Object.getOwnPropertyDescriptors : <T extends {}>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & { [x: string]: PropertyDescriptor; }
+>Object.getOwnPropertyDescriptors(0) : number & PropertyDescriptorMap
+>Object.getOwnPropertyDescriptors : <T extends {}>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & PropertyDescriptorMap
 >Object : ObjectConstructor
->getOwnPropertyDescriptors : <T extends {}>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & { [x: string]: PropertyDescriptor; }
+>getOwnPropertyDescriptors : <T extends {}>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & PropertyDescriptorMap
 >0 : 0
 
 Object.getOwnPropertyNames(0);