Ron Buckton (rbuckton) · Apr 7, 2016 · Apr 7, 2016
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -854,14 +854,12 @@ namespace ts {
         );
     }
 
-    export function createMetadataHelper(metadataKey: string, metadataValue: Expression, defer?: boolean) {
+    export function createMetadataHelper(metadataKey: string, metadataValue: Expression) {
         return createCall(
             createIdentifier("__metadata"),
             [
                 createLiteral(metadataKey),
-                defer
-                    ? createArrowFunction([], metadataValue)
-                    : metadataValue
+                metadataValue
             ]
         );
     }

diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
@@ -6,6 +6,11 @@
 namespace ts {
     type SuperContainer = ClassDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration;
 
+    /**
+     * Indicates whether to emit type metadata in the new format.
+     */
+    const USE_NEW_TYPE_METADATA_FORMAT = false;
+
     const enum TypeScriptSubstitutionFlags {
         /** Enables substitutions for decorated classes. */
         DecoratedClasses = 1 << 0,
@@ -1354,6 +1359,30 @@ namespace ts {
          * @param decoratorExpressions The destination array to which to add new decorator expressions.
          */
         function addTypeMetadata(node: Declaration, decoratorExpressions: Expression[]) {
+            if (USE_NEW_TYPE_METADATA_FORMAT) {
+                addNewTypeMetadata(node, decoratorExpressions);
+            }
+            else {
+                addOldTypeMetadata(node, decoratorExpressions);
+            }
+        }
+
+        function addOldTypeMetadata(node: Declaration, decoratorExpressions: Expression[]) {
+            if (compilerOptions.emitDecoratorMetadata) {
+                let properties: ObjectLiteralElement[];
+                if (shouldAddTypeMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper("design:type", serializeTypeOfNode(node)));
+                }
+                if (shouldAddParamTypesMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper("design:paramtypes", serializeParameterTypesOfNode(node)));
+                }
+                if (shouldAddReturnTypeMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper("design:returntype", serializeReturnTypeOfNode(node)));
+                }
+            }
+        }
+
+        function addNewTypeMetadata(node: Declaration, decoratorExpressions: Expression[]) {
             if (compilerOptions.emitDecoratorMetadata) {
                 let properties: ObjectLiteralElement[];
                 if (shouldAddTypeMetadata(node)) {
@@ -1366,7 +1395,7 @@ namespace ts {
                     (properties || (properties = [])).push(createPropertyAssignment("returnType", createArrowFunction([], serializeReturnTypeOfNode(node))));
                 }
                 if (properties) {
-                    decoratorExpressions.push(createMetadataHelper("design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true), /*defer*/ false));
+                    decoratorExpressions.push(createMetadataHelper("design:typeinfo", createObjectLiteral(properties, /*location*/ undefined, /*multiLine*/ true)));
                 }
             }
         }

diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
@@ -49,15 +49,11 @@ var MyComponent = (function () {
 }());
 __decorate([
     decorator,
-    __metadata("design:typeinfo", {
-        type: function () { return Function; },
-        paramTypes: function () { return [Object]; },
-        returnType: function () { return void 0; }
-    })
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
 ], MyComponent.prototype, "method", null);
 MyComponent = __decorate([
     decorator,
-    __metadata("design:typeinfo", {
-        paramTypes: function () { return [service_1.default]; }
-    })
+    __metadata("design:paramtypes", [service_1.default])
 ], MyComponent);
diff --git a/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js b/tests/baselines/reference/decoratorMetadataForMethodWithNoReturnTypeAnnotation01.js
@@ -24,9 +24,7 @@ var MyClass = (function () {
 }());
 __decorate([
     decorator,
-    __metadata("design:typeinfo", {
-        type: function () { return Function; },
-        paramTypes: function () { return []; },
-        returnType: function () { return void 0; }
-    })
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], MyClass.prototype, "doSomething", null);
diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.errors.txt b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.errors.txt
@@ -0,0 +1,7 @@
+file.ts(1,3): error TS1005: ';' expected.
+
+
+==== file.ts (1 errors) ====
+    a b
+      ~
+!!! error TS1005: ';' expected.
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js
diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing module imports.js
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js
diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js
diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js
diff --git a/tests/baselines/reference/transpile/Rename dependencies - System.js b/tests/baselines/reference/transpile/Rename dependencies - System.js
diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js
diff --git a/tests/baselines/reference/transpile/Sets module name.js b/tests/baselines/reference/transpile/Sets module name.js
diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js
diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js
diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js