Merge pull request #3249 from Microsoft/resolveDecoratorAsCall

Migrated decorator checks to call resolution

Author: rbuckton

src/compiler/checker.ts

@@ -191,6 +191,12 @@ namespace ts {
         An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: DiagnosticCategory.Error, key: "An export declaration can only be used in a module." },
         An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: DiagnosticCategory.Error, key: "An ambient module declaration is only allowed at the top level in a file." },
         A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: DiagnosticCategory.Error, key: "A namespace declaration is only allowed in a namespace or module." },
+        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: DiagnosticCategory.Error, key: "The return type of a property decorator function must be either 'void' or 'any'." },
+        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: DiagnosticCategory.Error, key: "The return type of a parameter decorator function must be either 'void' or 'any'." },
+        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: DiagnosticCategory.Error, key: "Unable to resolve signature of class decorator when called as an expression." },
+        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: DiagnosticCategory.Error, key: "Unable to resolve signature of parameter decorator when called as an expression." },
+        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: DiagnosticCategory.Error, key: "Unable to resolve signature of property decorator when called as an expression." },
+        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: DiagnosticCategory.Error, key: "Unable to resolve signature of method decorator when called as an expression." },
         Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
         Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },

src/compiler/diagnosticInformationMap.generated.ts

@@ -753,6 +753,31 @@
     },
 
 
+    "The return type of a property decorator function must be either 'void' or 'any'.": {
+        "category": "Error",
+        "code": 1236
+    },
+    "The return type of a parameter decorator function must be either 'void' or 'any'.": {
+        "category": "Error",
+        "code": 1237
+    },
+    "Unable to resolve signature of class decorator when called as an expression.": {
+        "category": "Error",
+        "code": 1238
+    },
+    "Unable to resolve signature of parameter decorator when called as an expression.": {
+        "category": "Error",
+        "code": 1239
+    },
+    "Unable to resolve signature of property decorator when called as an expression.": {
+        "category": "Error",
+        "code": 1240
+    },
+    "Unable to resolve signature of method decorator when called as an expression.": {
+        "category": "Error",
+        "code": 1241
+    },
+
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300

src/compiler/diagnosticMessages.json

@@ -797,7 +797,7 @@ namespace ts {
         template: LiteralExpression | TemplateExpression;
     }
 
-    export type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression;
+    export type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator;
 
     export interface TypeAssertion extends UnaryExpression {
         type: TypeNode;

src/compiler/types.ts

@@ -752,8 +752,8 @@ namespace ts {
             return (<TaggedTemplateExpression>node).tag;
         }
 
-        // Will either be a CallExpression or NewExpression.
-        return (<CallExpression>node).expression;
+        // Will either be a CallExpression, NewExpression, or Decorator.
+        return (<CallExpression | Decorator>node).expression;
     }
 
     export function nodeCanBeDecorated(node: Node): boolean {

src/compiler/utilities.ts

@@ -1,7 +1,7 @@
 //// [tests/cases/conformance/decorators/class/decoratedClassFromExternalModule.ts] ////
 
 //// [decorated.ts]
-function decorate() { }
+function decorate(target: any) { }
 
 @decorate
 export default class Decorated { }
@@ -18,7 +18,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
         case 4: return decorators.reduceRight(function(o, d) { return (d && d(target, key, o)) || o; }, desc);
     }
 };
-function decorate() { }
+function decorate(target) { }
 let Decorated = class {
 };
 Decorated = __decorate([

tests/baselines/reference/decoratedClassFromExternalModule.js

@@ -1,12 +1,13 @@
 === tests/cases/conformance/decorators/class/decorated.ts ===
-function decorate() { }
+function decorate(target: any) { }
 >decorate : Symbol(decorate, Decl(decorated.ts, 0, 0))
+>target : Symbol(target, Decl(decorated.ts, 0, 18))
 
 @decorate
 >decorate : Symbol(decorate, Decl(decorated.ts, 0, 0))
 
 export default class Decorated { }
->Decorated : Symbol(Decorated, Decl(decorated.ts, 0, 23))
+>Decorated : Symbol(Decorated, Decl(decorated.ts, 0, 34))
 
 === tests/cases/conformance/decorators/class/undecorated.ts ===
 import Decorated from 'decorated';

tests/baselines/reference/decoratedClassFromExternalModule.symbols

@@ -1,9 +1,10 @@
 === tests/cases/conformance/decorators/class/decorated.ts ===
-function decorate() { }
->decorate : () => void
+function decorate(target: any) { }
+>decorate : (target: any) => void
+>target : any
 
 @decorate
->decorate : () => void
+>decorate : (target: any) => void
 
 export default class Decorated { }
 >Decorated : Decorated

tests/baselines/reference/decoratedClassFromExternalModule.types

@@ -8,7 +8,7 @@ tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts(9,14):
     }
 
     class A {
-        @(x => {
+        @((x, p) => {
             var a = 3;
             func(a);
                  ~

tests/baselines/reference/decoratorChecksFunctionBodies.errors.txt

@@ -5,7 +5,7 @@ function func(s: string): void {
 }
 
 class A {
-    @(x => {
+    @((x, p) => {
         var a = 3;
         func(a);
         return x; 
@@ -34,7 +34,7 @@ var A = (function () {
     };
     Object.defineProperty(A.prototype, "m",
         __decorate([
-            (function (x) {
+            (function (x, p) {
                 var a = 3;
                 func(a);
                 return x;