Fix bugs and add tests

Author: graphemecluster

lib/lib.es2015.core.d.ts

@@ -102,7 +102,14 @@ interface ObjectConstructor {
    * @param o The object to change its prototype.
    * @param proto The value of the new prototype or null.
    */
-  setPrototypeOf<T, U extends object = {}>(o: T, proto: U | null): T & U;
+  setPrototypeOf<T extends object, U extends object>(o: T, proto: U): T & U;
+
+  /**
+   * Sets the prototype of a specified object o to object proto or null. Returns the object o.
+   * @param o The object to change its prototype.
+   * @param proto The value of the new prototype or null.
+   */
+  setPrototypeOf<T extends object>(o: T, proto: null): T;
 }
 
 interface String {
@@ -173,7 +180,7 @@ interface String {
   blink(): string;
 
   /**
-   * Returns a `<bold>` HTML element
+   * Returns a `<b>` HTML element
    * @deprecated A legacy feature for browser compatibility
    */
   bold(): string;

lib/lib.es5.d.ts

@@ -97,7 +97,13 @@ interface ObjectConstructor {
    * Creates an object that has the specified prototype or that has null prototype.
    * @param o Object to use as a prototype. May be null.
    */
-  create<O extends object = {}>(o: O | null): O;
+  create<O extends object>(o: O): O;
+
+  /**
+   * Creates an object that has the specified prototype or that has null prototype.
+   * @param o Object to use as a prototype. May be null.
+   */
+  create(o: null): {};
 
   /**
    * Creates an object that has the specified prototype, and that optionally contains specified properties.
@@ -147,13 +153,16 @@ interface ObjectConstructor {
     o: O,
     p: P,
     attributes: D & ThisType<any>
-  ): O & {
-    [K in P]: D extends { value: infer V }
-      ? V
-      : D extends { get: () => infer V }
-      ? V
-      : unknown;
-  };
+  ): O &
+    (P extends PropertyKey // required to make P distributive
+      ? {
+          [K in P]: D extends { value: infer V }
+            ? V
+            : D extends { get: () => infer V }
+            ? V
+            : unknown;
+        }
+      : unknown);
 
   /**
    * Adds one or more properties to an object, and/or modifies attributes of existing properties.
@@ -451,6 +460,22 @@ interface String {
   valueOf(): string;
 
   readonly [index: number]: string;
+
+  /////////////////////////////
+  /// ECMAScript Internationalization API
+  /////////////////////////////
+
+  /**
+   * Determines whether two strings are equivalent in the current or specified locale.
+   * @param that String to compare to target string
+   * @param locales A locale string or array of locale strings that contain one or more language or locale tags. If you include more than one locale string, list them in descending order of priority so that the first entry is the preferred locale. If you omit this parameter, the default locale of the JavaScript runtime is used. This parameter must conform to BCP 47 standards; see the Intl.Collator object for details.
+   * @param options An object that contains one or more properties that specify comparison options. see the Intl.Collator object for details.
+   */
+  localeCompare(
+    that: string,
+    locales?: string | string[],
+    options?: Intl.CollatorOptions
+  ): number;
 }
 
 type JSONValue =

tests/src/es2015.collection.ts

@@ -62,5 +62,3 @@ import { expectType } from "tsd";
     { foo: "foo" }
   );
 }
-
-export {};

tests/src/es2015.core.ts

@@ -25,6 +25,11 @@ import { expectType } from "tsd";
   expectType<{ foo: number } & { bar: string }>(obj2);
   const obj3 = Object.assign({ foo: 123 }, { bar: "wow" }, { baz: true });
   expectType<{ foo: number } & { bar: string } & { baz: boolean }>(obj3);
+  const obj4 = Object.assign(
+    { foo: 123 } as { foo: number } | { bar: string },
+    { baz: true }
+  );
+  expectType<({ foo: number } | { bar: string }) & { baz: boolean }>(obj4);
+  const obj5 = Object.setPrototypeOf({ foo: 123 }, { bar: "wow" });
+  expectType<{ foo: number } & { bar: string }>(obj5);
 }
-
-export {};

tests/src/es5.ts

@@ -8,20 +8,26 @@ expectType<{ foo: number }>(Object({ foo: 123 }));
 expectType<{}>(Object(123));
 // $ExpctType unknown
 expectType<unknown>(Object.getPrototypeOf([]));
+// Object.getOwnPropertyNames
+expectType<never>(Object.getOwnPropertyNames(null));
 // Object.create
 expectType<{}>(Object.create(null));
-// $ExpectType { foo: number; bar: string }
-expectType<{ foo: number; bar: string }>(
-  Object.create(null, {
-    foo: {
-      value: 123,
-    },
-    bar: {
-      get() {
-        return "hi";
-      },
+expectType<{ foo: number }>(Object.create({ foo: 123 }));
+
+const obj = {
+  foo: {
+    value: 123,
+  },
+  bar: {
+    get() {
+      return "hi";
     },
-  })
+  },
+};
+const obj1 = { baz: true };
+expectType<{ foo: number; bar: string }>(Object.create(null, obj));
+expectType<{ foo: number; bar: string; baz: boolean }>(
+  Object.create(obj1, obj)
 );
 
 // Object
@@ -105,11 +111,32 @@ expectType<{ foo: number; bar: string }>(
   expectError(add2.bind({ num: 100 }, 123, 456));
 }
 
+// NewableFunction
+{
+  class Foo {
+    constructor(private a: number, private b: number) {}
+  }
+  expectType<new (a: number, b: number) => Foo>(Foo.bind(null));
+  expectType<new (b: number) => Foo>(Foo.bind(null, 123));
+  expectType<new () => Foo>(Foo.bind(null, 123, 456));
+  expectError(Foo.bind(null, 123, 456, 789));
+}
+
 // IArguments
 (function () {
   expectType<unknown>(arguments[0]);
 })();
 
+// String
+{
+  "foobar".replace(/foo/g, (substr, p1, p2) => {
+    // expectType<string>(substr);
+    // expectType<string | number>(p1);
+    // expectType<string | number>(p2);
+    return "";
+  });
+}
+
 // JSON
 {
   expectType<JSONValue>(JSON.parse("{}"));