From 061175ef9fb6ab985de56b9c4b49db4bdd4d272a Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Sun, 15 Jan 2017 16:26:17 -0800
Subject: [PATCH] Emit 'object' type in declaration emitter

---
 src/compiler/declarationEmitter.ts             |  1 +
 .../reference/nonPrimitiveAsProperty.js        |  8 ++++++++
 .../reference/nonPrimitiveInFunction.js        |  8 ++++++++
 .../reference/nonPrimitiveInGeneric.js         | 18 ++++++++++++++++++
 .../reference/nonPrimitiveUnionIntersection.js |  5 +++++
 .../nonPrimitive/nonPrimitiveAsProperty.ts     |  1 +
 .../nonPrimitive/nonPrimitiveInFunction.ts     |  1 +
 .../nonPrimitive/nonPrimitiveInGeneric.ts      |  1 +
 .../nonPrimitiveUnionIntersection.ts           |  1 +
 9 files changed, 44 insertions(+)

diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index cd98622e080a1..bdeb700f1d1a7 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -390,6 +390,7 @@ namespace ts {
                 case SyntaxKind.StringKeyword:
                 case SyntaxKind.NumberKeyword:
                 case SyntaxKind.BooleanKeyword:
+                case SyntaxKind.ObjectKeyword:
                 case SyntaxKind.SymbolKeyword:
                 case SyntaxKind.VoidKeyword:
                 case SyntaxKind.UndefinedKeyword:
diff --git a/tests/baselines/reference/nonPrimitiveAsProperty.js b/tests/baselines/reference/nonPrimitiveAsProperty.js
index f51a9b35435eb..d3e1b072a0625 100644
--- a/tests/baselines/reference/nonPrimitiveAsProperty.js
+++ b/tests/baselines/reference/nonPrimitiveAsProperty.js
@@ -11,3 +11,11 @@ var b: WithNonPrimitive = {foo: "bar"}; // expect error
 //// [nonPrimitiveAsProperty.js]
 var a = { foo: { bar: "bar" } };
 var b = { foo: "bar" }; // expect error
+
+
+//// [nonPrimitiveAsProperty.d.ts]
+interface WithNonPrimitive {
+    foo: object;
+}
+declare var a: WithNonPrimitive;
+declare var b: WithNonPrimitive;
diff --git a/tests/baselines/reference/nonPrimitiveInFunction.js b/tests/baselines/reference/nonPrimitiveInFunction.js
index a67b68542dd99..1d2a246250273 100644
--- a/tests/baselines/reference/nonPrimitiveInFunction.js
+++ b/tests/baselines/reference/nonPrimitiveInFunction.js
@@ -34,3 +34,11 @@ function returnError() {
     var ret = 123;
     return ret; // expect error
 }
+
+
+//// [nonPrimitiveInFunction.d.ts]
+declare function takeObject(o: object): void;
+declare function returnObject(): object;
+declare var nonPrimitive: object;
+declare var primitive: boolean;
+declare function returnError(): object;
diff --git a/tests/baselines/reference/nonPrimitiveInGeneric.js b/tests/baselines/reference/nonPrimitiveInGeneric.js
index 2db357c3eb594..d7e013c71f18f 100644
--- a/tests/baselines/reference/nonPrimitiveInGeneric.js
+++ b/tests/baselines/reference/nonPrimitiveInGeneric.js
@@ -73,3 +73,21 @@ var x; // error
 var y; // ok
 var z; // ok
 var u; // ok
+
+
+//// [nonPrimitiveInGeneric.d.ts]
+declare function generic<T>(t: T): void;
+declare var a: {};
+declare var b: string;
+declare function bound<T extends object>(t: T): void;
+declare function bound2<T extends object>(): void;
+declare function bound3<T extends {}>(t: T): void;
+interface Proxy<T extends object> {
+}
+declare var x: Proxy<number>;
+declare var y: Proxy<null>;
+declare var z: Proxy<undefined>;
+interface Blah {
+    foo: number;
+}
+declare var u: Proxy<Blah>;
diff --git a/tests/baselines/reference/nonPrimitiveUnionIntersection.js b/tests/baselines/reference/nonPrimitiveUnionIntersection.js
index c50a23300183a..7f4b46c42ed11 100644
--- a/tests/baselines/reference/nonPrimitiveUnionIntersection.js
+++ b/tests/baselines/reference/nonPrimitiveUnionIntersection.js
@@ -10,3 +10,8 @@ var a = ""; // error
 var b = ""; // ok
 a = b; // error
 b = a; // ok
+
+
+//// [nonPrimitiveUnionIntersection.d.ts]
+declare var a: object & string;
+declare var b: object | string;
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAsProperty.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAsProperty.ts
index ee4011ecf7df2..3cd2ce4cef5f3 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAsProperty.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveAsProperty.ts
@@ -1,3 +1,4 @@
+// @declaration: true
 interface WithNonPrimitive {
     foo: object
 }
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts
index c38693dbfb18a..d56c02fafe98d 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInFunction.ts
@@ -1,3 +1,4 @@
+// @declaration: true
 function takeObject(o: object) {}
 function returnObject(): object {
     return {};
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts
index 836896b5a57fc..490a9f88135ce 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveInGeneric.ts
@@ -1,3 +1,4 @@
+// @declaration: true
 function generic<T>(t: T) {
     var o: object = t; // expect error
 }
diff --git a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts
index c1667c7a32e54..a9d5872705c1b 100644
--- a/tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts
+++ b/tests/cases/conformance/types/nonPrimitive/nonPrimitiveUnionIntersection.ts
@@ -1,3 +1,4 @@
+// @declaration: true
 var a: object & string = ""; // error
 var b: object | string = ""; // ok
 a = b; // error