microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-18 07:29:16 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Updated baselines

Browse Source
This commit is contained in:
Ron Buckton
2015-03-17 17:09:39 -07:00
parent 2a907a9c3a
commit a1d445ebc9
39 changed files with 843 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/compiler/checker.ts
View File

@@ -8702,6 +8702,41 @@ module ts {
}
}
/** Checks a type reference node as an expression. */
function checkTypeNodeAsExpression(node: TypeNode | LiteralExpression) {
if (node && node.kind === SyntaxKind.TypeReference) {
var type = getTypeFromTypeNode(node);
if (!type || type.flags & (TypeFlags.Intrinsic | TypeFlags.NumberLike | TypeFlags.StringLike)) {
return;
}
if (type.symbol.valueDeclaration) {
checkExpressionOrQualifiedName((<TypeReferenceNode>node).typeName);
}
}
}
/**
* Checks the type annotation of an accessor declaration or property declaration as
* an expression if it is a type reference to a type with a value declaration.
*/
function checkTypeAnnotationAsExpression(node: AccessorDeclaration | PropertyDeclaration | ParameterDeclaration | MethodDeclaration) {
switch (node.kind) {
case SyntaxKind.PropertyDeclaration: return checkTypeNodeAsExpression((<PropertyDeclaration>node).type);
case SyntaxKind.Parameter: return checkTypeNodeAsExpression((<ParameterDeclaration>node).type);
case SyntaxKind.MethodDeclaration: return checkTypeNodeAsExpression((<MethodDeclaration>node).type);
case SyntaxKind.GetAccessor: return checkTypeNodeAsExpression((<AccessorDeclaration>node).type);
case SyntaxKind.SetAccessor: return checkTypeNodeAsExpression(getSetAccessorTypeAnnotationNode(<AccessorDeclaration>node));
}
}
/** Checks the type annotation of the parameters of a function/method or the constructor of a class as expressions */
function checkParameterTypeAnnotationsAsExpressions(node: FunctionLikeDeclaration) {
// ensure all type annotations with a value declaration are checked as an expression
if (node) {
forEach(node.parameters, checkTypeAnnotationAsExpression);
}
}
/** Check the decorators of a node */
function checkDecorators(node: Node): void {
if (!node.decorators) {
@@ -8710,18 +8745,28 @@ module ts {
switch (node.kind) {
case SyntaxKind.ClassDeclaration:
var constructor = getFirstConstructorWithBody(<ClassDeclaration>node);
if (constructor) {
checkParameterTypeAnnotationsAsExpressions(constructor);
}
break;
case SyntaxKind.MethodDeclaration:
case SyntaxKind.GetAccessor:
checkParameterTypeAnnotationsAsExpressions(<FunctionLikeDeclaration>node);
// fall-through
case SyntaxKind.SetAccessor:
case SyntaxKind.GetAccessor:
case SyntaxKind.PropertyDeclaration:
case SyntaxKind.Parameter:
emitDecorate = true;
checkTypeAnnotationAsExpression(<PropertyDeclaration | ParameterDeclaration>node);
break;
default:
return;
}
emitDecorate = true;
forEach(node.decorators, checkDecorator);
}
@@ -11400,17 +11445,17 @@ module ts {
else if (type.flags & TypeFlags.ESSymbol) {
return "Symbol";
}
else if (type.symbol.valueDeclaration) {
return serializeEntityName(node.typeName, getGeneratedNameForNode);
}
else if (typeHasCallOrConstructSignatures(type)) {
return "Function";
}
else if (type === unknownType) {
var fallbackPath: string[] = [];
serializeEntityName(node.typeName, getGeneratedNameForNode, fallbackPath);
return fallbackPath;
}
else if (type.symbol && type.symbol.valueDeclaration) {
return serializeEntityName(node.typeName, getGeneratedNameForNode);
}
else if (typeHasCallOrConstructSignatures(type)) {
return "Function";
}
return "Object";
}
@@ -11473,7 +11518,7 @@ module ts {
//
// For rules on serializing type annotations, see `serializeTypeNode`.
switch (node.kind) {
case SyntaxKind.ClassDeclaration: return serializeEntityName((<ClassDeclaration>node).name, getGeneratedNameForNode);
case SyntaxKind.ClassDeclaration: return "Function";
case SyntaxKind.PropertyDeclaration: return serializeTypeNode((<PropertyDeclaration>node).type, getGeneratedNameForNode);
case SyntaxKind.Parameter: return serializeTypeNode((<ParameterDeclaration>node).type, getGeneratedNameForNode);
case SyntaxKind.GetAccessor: return serializeTypeNode((<AccessorDeclaration>node).type, getGeneratedNameForNode);
@@ -11508,7 +11553,22 @@ module ts {
if (parameterCount > 0) {
result = new Array<string>(parameterCount);
for (var i = 0; i < parameterCount; i++) {
result[i] = serializeTypeOfNode(parameters[i], getGeneratedNameForNode);
if (parameters[i].dotDotDotToken) {
var parameterType = parameters[i].type;
if (parameterType.kind === SyntaxKind.ArrayType) {
parameterType = (<ArrayTypeNode>parameterType).elementType;
}
else if (parameterType.kind === SyntaxKind.TypeReference && (<TypeReferenceNode>parameterType).typeArguments && (<TypeReferenceNode>parameterType).typeArguments.length === 1) {
parameterType = (<TypeReferenceNode>parameterType).typeArguments[0];
}
else {
parameterType = undefined;
}
result[i] = serializeTypeNode(parameterType, getGeneratedNameForNode);
}
else {
result[i] = serializeTypeOfNode(parameters[i], getGeneratedNameForNode);
}
}
return result;
}
@@ -11612,6 +11672,9 @@ module ts {
resolvesToSomeValue,
collectLinkedAliases,
getBlockScopedVariableId,
serializeTypeOfNode,
serializeParameterTypesOfNode,
serializeReturnTypeOfNode,
};
}

95
src/compiler/emitter.ts
View File

@@ -3791,7 +3791,7 @@ module ts {
emitStart(node);
emitDeclarationName(node);
write(" = ");
emitDecorateStart(node.decorators);
emitDecorateStart(node);
emitDeclarationName(node);
write(");");
emitEnd(node);
@@ -3879,7 +3879,7 @@ module ts {
write(", ");
}
emitDecorateStart(decorators);
emitDecorateStart(member);
emitStart(member.name);
emitClassMemberPrefix(node, member);
write(", ");
@@ -3931,7 +3931,7 @@ module ts {
writeLine();
emitStart(parameter);
emitDecorateStart(parameter.decorators);
emitDecorateStart(parameter);
emitStart(parameter.name);
if (member.kind === SyntaxKind.Constructor) {
@@ -3953,8 +3953,9 @@ module ts {
});
}
function emitDecorateStart(decorators: Decorator[]): void {
function emitDecorateStart(node: Declaration): void {
write("__decorate([");
let decorators = node.decorators;
let decoratorCount = decorators.length;
for (let i = 0; i < decoratorCount; i++) {
if (i > 0) {
@@ -3965,9 +3966,95 @@ module ts {
emit(decorator.expression);
emitEnd(decorator);
}
emitSerializedTypeMetadata(node);
write("], ");
}
function formatPathSegment(location: Node, path: string[], index: number): string {
switch (index) {
case 0:
return `typeof ${path[index]} !== 'undefined' && ${path[index]}`;
case 1:
return `${formatPathSegment(location, path, index - 1) }.${path[index]}`;
default:
let temp = createTempVariable(location);
recordTempDeclaration(temp);
return `(${temp.text} = ${formatPathSegment(location, path, index - 1) }) && ${temp.text}.${path[index]}`;
}
}
function shouldEmitTypeMetadata(node: Declaration): boolean {
switch (node.kind) {
case SyntaxKind.MethodDeclaration:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
case SyntaxKind.PropertyDeclaration:
case SyntaxKind.Parameter:
return true;
}
return false;
}
function shouldEmitReturnTypeMetadata(node: Declaration): boolean {
switch (node.kind) {
case SyntaxKind.MethodDeclaration:
return true;
}
return false;
}
function shouldEmitParamTypesMetadata(node: Declaration): boolean {
switch (node.kind) {
case SyntaxKind.ClassDeclaration:
case SyntaxKind.MethodDeclaration:
case SyntaxKind.SetAccessor:
return true;
}
return false;
}
function emitSerializedTypeMetadata(node: Declaration): void {
if (shouldEmitTypeMetadata(node)) {
var serializedType = resolver.serializeTypeOfNode(node, getGeneratedNameForNode);
if (serializedType) {
write(", __metadata('design:type', ");
emitSerializedType(node, serializedType);
write(")");
}
}
if (shouldEmitParamTypesMetadata(node)) {
var serializedTypes = resolver.serializeParameterTypesOfNode(node, getGeneratedNameForNode);
if (serializedTypes) {
write(", __metadata('design:paramtypes', [");
for (var i = 0; i < serializedTypes.length; ++i) {
if (i > 0) {
write(", ");
}
emitSerializedType(node, serializedTypes[i]);
}
write("])");
}
}
if (shouldEmitReturnTypeMetadata(node)) {
var serializedType = resolver.serializeReturnTypeOfNode(node, getGeneratedNameForNode);
if (serializedType) {
write(", __metadata('design:returntype', ");
emitSerializedType(node, serializedType);
write(")");
}
}
}
function emitSerializedType(location: Node, name: string | string[]): void {
if (typeof name === "string") {
write(name);
return;
}
else {
Debug.assert(name.length > 0, "Invalid type name path for serialization");
write(`(${formatPathSegment(location, name, name.length - 1) }) || Object`);
}
}
function emitInterfaceDeclaration(node: InterfaceDeclaration) {
emitOnlyPinnedOrTripleSlashComments(node);
}

3
src/compiler/types.ts
View File

@@ -1236,6 +1236,9 @@ module ts {
getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
resolvesToSomeValue(location: Node, name: string): boolean;
getBlockScopedVariableId(node: Identifier): number;
serializeTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[];
serializeParameterTypesOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): (string | string[])[];
serializeReturnTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[];
}
export const enum SymbolFlags {

36
src/lib/es6.d.ts vendored
View File

@@ -3513,27 +3513,27 @@ interface ProxyHandler<T> {
interface ProxyConstructor {
revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
new <T>(target: T, handeler: ProxyHandler<T>): T
new <T>(target: T, handler: ProxyHandler<T>): T
}
declare var Proxy: ProxyConstructor;
declare var Reflect: {
apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
construct(target: Function, argumentsList: ArrayLike<any>): any;
defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
deleteProperty(target: any, propertyKey: PropertyKey): boolean;
enumerate(target: any): IterableIterator<any>;
get(target: any, propertyKey: PropertyKey, receiver?: any): any;
getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
getPrototypeOf(target: any): any;
has(target: any, propertyKey: string): boolean;
has(target: any, propertyKey: symbol): boolean;
isExtensible(target: any): boolean;
ownKeys(target: any): Array<PropertyKey>;
preventExtensions(target: any): boolean;
set(target: any, propertyKey: PropertyKey, value: any, receiver? :any): boolean;
setPrototypeOf(target: any, proto: any): boolean;
};
declare module Reflect {
function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
function construct(target: Function, argumentsList: ArrayLike<any>): any;
function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
function enumerate(target: any): IterableIterator<any>;
function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
function getPrototypeOf(target: any): any;
function has(target: any, propertyKey: string): boolean;
function has(target: any, propertyKey: symbol): boolean;
function isExtensible(target: any): boolean;
function ownKeys(target: any): Array<PropertyKey>;
function preventExtensions(target: any): boolean;
function set(target: any, propertyKey: PropertyKey, value: any, receiver? :any): boolean;
function setPrototypeOf(target: any, proto: any): boolean;
}
/**
* Represents the completion of an asynchronous operation

7
tests/baselines/reference/APISample_compile.js
View File

@@ -964,6 +964,13 @@ declare module "typescript" {
getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
resolvesToSomeValue(location: Node, name: string): boolean;
getBlockScopedVariableId(node: Identifier): number;
<<<<<<< HEAD
=======
getClassDeclarationVariableId(node: Identifier): number;
serializeTypeOfNode(node: Node): string | string[];
serializeParameterTypesOfNode(node: Node): (string | string[])[];
serializeReturnTypeOfNode(node: Node): string | string[];
>>>>>>> Updated baselines
}
const enum SymbolFlags {
FunctionScopedVariable = 1,

23
tests/baselines/reference/APISample_compile.types
View File

@@ -3150,6 +3150,29 @@ declare module "typescript" {
fileName: string;
>fileName : string
text: string;
>text : string
amdDependencies: {
>amdDependencies : { path: string; name: string; }[]
path: string;
>path : string
name: string;
>name : string
}[];
amdModuleName: string;
>amdModuleName : string
referencedFiles: FileReference[];
>referencedFiles : FileReference[]

7
tests/baselines/reference/APISample_linter.js
View File

@@ -995,6 +995,13 @@ declare module "typescript" {
getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
resolvesToSomeValue(location: Node, name: string): boolean;
getBlockScopedVariableId(node: Identifier): number;
<<<<<<< HEAD
=======
getClassDeclarationVariableId(node: Identifier): number;
serializeTypeOfNode(node: Node): string | string[];
serializeParameterTypesOfNode(node: Node): (string | string[])[];
serializeReturnTypeOfNode(node: Node): string | string[];
>>>>>>> Updated baselines
}
const enum SymbolFlags {
FunctionScopedVariable = 1,

23
tests/baselines/reference/APISample_linter.types
View File

@@ -3296,6 +3296,29 @@ declare module "typescript" {
fileName: string;
>fileName : string
text: string;
>text : string
amdDependencies: {
>amdDependencies : { path: string; name: string; }[]
path: string;
>path : string
name: string;
>name : string
}[];
amdModuleName: string;
>amdModuleName : string
referencedFiles: FileReference[];
>referencedFiles : FileReference[]

7
tests/baselines/reference/APISample_transform.js
View File

@@ -996,6 +996,13 @@ declare module "typescript" {
getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
resolvesToSomeValue(location: Node, name: string): boolean;
getBlockScopedVariableId(node: Identifier): number;
<<<<<<< HEAD
=======
getClassDeclarationVariableId(node: Identifier): number;
serializeTypeOfNode(node: Node): string | string[];
serializeParameterTypesOfNode(node: Node): (string | string[])[];
serializeReturnTypeOfNode(node: Node): string | string[];
>>>>>>> Updated baselines
}
const enum SymbolFlags {
FunctionScopedVariable = 1,

23
tests/baselines/reference/APISample_transform.types
View File

@@ -3246,6 +3246,29 @@ declare module "typescript" {
fileName: string;
>fileName : string
text: string;
>text : string
amdDependencies: {
>amdDependencies : { path: string; name: string; }[]
path: string;
>path : string
name: string;
>name : string
}[];
amdModuleName: string;
>amdModuleName : string
referencedFiles: FileReference[];
>referencedFiles : FileReference[]

7
tests/baselines/reference/APISample_watcher.js
View File

@@ -1033,6 +1033,13 @@ declare module "typescript" {
getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
resolvesToSomeValue(location: Node, name: string): boolean;
getBlockScopedVariableId(node: Identifier): number;
<<<<<<< HEAD
=======
getClassDeclarationVariableId(node: Identifier): number;
serializeTypeOfNode(node: Node): string | string[];
serializeParameterTypesOfNode(node: Node): (string | string[])[];
serializeReturnTypeOfNode(node: Node): string | string[];
>>>>>>> Updated baselines
}
const enum SymbolFlags {
FunctionScopedVariable = 1,

23
tests/baselines/reference/APISample_watcher.types
View File

@@ -3419,6 +3419,29 @@ declare module "typescript" {
fileName: string;
>fileName : string
text: string;
>text : string
amdDependencies: {
>amdDependencies : { path: string; name: string; }[]
path: string;
>path : string
name: string;
>name : string
}[];
amdModuleName: string;
>amdModuleName : string
referencedFiles: FileReference[];
>referencedFiles : FileReference[]

18
tests/baselines/reference/decoratorOnClass1.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClass1.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
function C() {
}
C = __decorate([dec], C);
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
C = __decorate([dec, __metadata('design:paramtypes', [])], C);
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClass2.js
View File

@@ -6,6 +6,7 @@ export class C {
}
//// [decoratorOnClass2.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,6 +24,23 @@ var C = (function () {
function C() {
}
C = __decorate([dec], C);
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
C = __decorate([dec, __metadata('design:paramtypes', [])], C);
>>>>>>> Updated baselines
return C;
})();
exports.C = C;

18
tests/baselines/reference/decoratorOnClass3.js
View File

@@ -7,6 +7,7 @@ class C {
}
//// [decoratorOnClass3.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -24,5 +25,22 @@ var C = (function () {
function C() {
}
C = __decorate([dec], C);
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
C = __decorate([dec, __metadata('design:paramtypes', [])], C);
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClass4.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClass4.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
function C() {
}
C = __decorate([dec()], C);
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
C = __decorate([dec(), __metadata('design:paramtypes', [])], C);
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClass5.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClass5.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
function C() {
}
C = __decorate([dec()], C);
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
C = __decorate([dec(), __metadata('design:paramtypes', [])], C);
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClass8.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClass8.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
function C() {
}
C = __decorate([dec()], C);
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
C = __decorate([dec(), __metadata('design:paramtypes', [])], C);
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClassAccessor1.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassAccessor1.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,6 +20,19 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
@@ -29,6 +43,10 @@ var C = (function () {
enumerable: true,
configurable: true
});
<<<<<<< HEAD
Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
=======
__decorate([dec, __metadata('design:type', Object)], C.prototype, "accessor");
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClassAccessor2.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassAccessor2.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,6 +20,19 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
@@ -29,6 +43,10 @@ var C = (function () {
enumerable: true,
configurable: true
});
<<<<<<< HEAD
Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
=======
__decorate([dec, __metadata('design:type', Object)], C.prototype, "accessor");
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClassAccessor4.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassAccessor4.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,6 +20,19 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
@@ -28,6 +42,10 @@ var C = (function () {
enumerable: true,
configurable: true
});
<<<<<<< HEAD
Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
=======
__decorate([dec, __metadata('design:type', Number), __metadata('design:paramtypes', [Number])], C.prototype, "accessor");
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClassAccessor5.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassAccessor5.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,6 +20,19 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
@@ -28,6 +42,10 @@ var C = (function () {
enumerable: true,
configurable: true
});
<<<<<<< HEAD
Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
=======
__decorate([dec, __metadata('design:type', Number), __metadata('design:paramtypes', [Number])], C.prototype, "accessor");
>>>>>>> Updated baselines
return C;
})();

22
tests/baselines/reference/decoratorOnClassConstructorParameter1.js
View File

@@ -1,11 +1,16 @@
//// [decoratorOnClassConstructorParameter1.ts]
<<<<<<< HEAD
declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
=======
declare function dec(target: Function, parameterIndex: number): void;
>>>>>>> Updated baselines
class C {
constructor(@dec p: number) {}
}
//// [decoratorOnClassConstructorParameter1.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
function C(p) {
}
__decorate([dec], C, void 0, 0);
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C(p) {
}
__decorate([dec, __metadata('design:type', Number)], C, 0);
>>>>>>> Updated baselines
return C;
})();

22
tests/baselines/reference/decoratorOnClassConstructorParameter4.js
View File

@@ -1,11 +1,16 @@
//// [decoratorOnClassConstructorParameter4.ts]
<<<<<<< HEAD
declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
=======
declare function dec(target: Function, parameterIndex: number): void;
>>>>>>> Updated baselines
class C {
constructor(public @dec p: number) {}
}
//// [decoratorOnClassConstructorParameter4.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
function C(public, p) {
}
__decorate([dec], C, void 0, 1);
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C(public, p) {
}
__decorate([dec, __metadata('design:type', Number)], C, 1);
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClassMethod1.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassMethod1.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +20,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
C.prototype.method = function () {
};
<<<<<<< HEAD
Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
=======
__decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method");
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClassMethod10.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassMethod10.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +20,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
C.prototype.method = function () {
};
<<<<<<< HEAD
Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
=======
__decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method");
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClassMethod2.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassMethod2.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +20,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
C.prototype.method = function () {
};
<<<<<<< HEAD
Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
=======
__decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method");
>>>>>>> Updated baselines
return C;
})();

23
tests/baselines/reference/decoratorOnClassMethod4.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassMethod4.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -25,3 +26,25 @@ class C {
}
Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
var _a;
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function() {
class C {
[_a = "method"]() {
}
}
__decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, _a);
return C;
var _a;
})();
>>>>>>> Updated baselines

23
tests/baselines/reference/decoratorOnClassMethod5.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassMethod5.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -25,3 +26,25 @@ class C {
}
Object.defineProperty(C.prototype, _a, __decorate([dec()], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
var _a;
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function() {
class C {
[_a = "method"]() {
}
}
__decorate([dec(), __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, _a);
return C;
var _a;
})();
>>>>>>> Updated baselines

23
tests/baselines/reference/decoratorOnClassMethod6.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassMethod6.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -25,3 +26,25 @@ class C {
}
Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
var _a;
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function() {
class C {
[_a = "method"]() {
}
}
__decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, _a);
return C;
var _a;
})();
>>>>>>> Updated baselines

23
tests/baselines/reference/decoratorOnClassMethod7.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassMethod7.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -25,3 +26,25 @@ class C {
}
Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
var _a;
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function() {
class C {
[_a = "method"]() {
}
}
__decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, _a);
return C;
var _a;
})();
>>>>>>> Updated baselines

18
tests/baselines/reference/decoratorOnClassMethod8.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassMethod8.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +20,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
C.prototype.method = function () {
};
<<<<<<< HEAD
Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
=======
__decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method");
>>>>>>> Updated baselines
return C;
})();

22
tests/baselines/reference/decoratorOnClassMethodParameter1.js
View File

@@ -1,11 +1,16 @@
//// [decoratorOnClassMethodParameter1.ts]
<<<<<<< HEAD
declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
=======
declare function dec(target: Function, parameterIndex: number): void;
>>>>>>> Updated baselines
class C {
method(@dec p: number) {}
}
//// [decoratorOnClassMethodParameter1.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +24,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
}
return value;
};
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
>>>>>>> Updated baselines
var C = (function () {
function C() {
}
C.prototype.method = function (p) {
};
<<<<<<< HEAD
__decorate([dec], C.prototype, "method", 0);
=======
__decorate([dec, __metadata('design:type', Number)], C.prototype.method, 0);
>>>>>>> Updated baselines
return C;
})();

22
tests/baselines/reference/decoratorOnClassProperty1.js
View File

@@ -1,11 +1,16 @@
//// [decoratorOnClassProperty1.ts]
<<<<<<< HEAD
declare function dec(target: any, propertyKey: string): void;
=======
declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
>>>>>>> Updated baselines
class C {
@dec prop;
}
//// [decoratorOnClassProperty1.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
function C() {
}
__decorate([dec], C.prototype, "prop");
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
__decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
>>>>>>> Updated baselines
return C;
})();

22
tests/baselines/reference/decoratorOnClassProperty10.js
View File

@@ -1,11 +1,16 @@
//// [decoratorOnClassProperty10.ts]
<<<<<<< HEAD
declare function dec(): <T>(target: any, propertyKey: string) => void;
=======
declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
>>>>>>> Updated baselines
class C {
@dec() prop;
}
//// [decoratorOnClassProperty10.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
function C() {
}
__decorate([dec()], C.prototype, "prop");
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
__decorate([dec(), __metadata('design:type', Object)], C.prototype, "prop");
>>>>>>> Updated baselines
return C;
})();

22
tests/baselines/reference/decoratorOnClassProperty11.js
View File

@@ -1,11 +1,16 @@
//// [decoratorOnClassProperty11.ts]
<<<<<<< HEAD
declare function dec(): <T>(target: any, propertyKey: string) => void;
=======
declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
>>>>>>> Updated baselines
class C {
@dec prop;
}
//// [decoratorOnClassProperty11.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
function C() {
}
__decorate([dec], C.prototype, "prop");
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
__decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
>>>>>>> Updated baselines
return C;
})();

22
tests/baselines/reference/decoratorOnClassProperty2.js
View File

@@ -1,11 +1,16 @@
//// [decoratorOnClassProperty2.ts]
<<<<<<< HEAD
declare function dec(target: any, propertyKey: string): void;
=======
declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
>>>>>>> Updated baselines
class C {
@dec public prop;
}
//// [decoratorOnClassProperty2.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
function C() {
}
__decorate([dec], C.prototype, "prop");
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
__decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
>>>>>>> Updated baselines
return C;
})();

18
tests/baselines/reference/decoratorOnClassProperty6.js
View File

@@ -6,6 +6,7 @@ class C {
}
//// [decoratorOnClassProperty6.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
function C() {
}
__decorate([dec], C.prototype, "prop");
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
__decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
>>>>>>> Updated baselines
return C;
})();

22
tests/baselines/reference/decoratorOnClassProperty7.js
View File

@@ -1,11 +1,16 @@
//// [decoratorOnClassProperty7.ts]
<<<<<<< HEAD
declare function dec(target: Function, propertyKey: string | symbol, paramIndex: number): void;
=======
declare function dec(target: Function, paramIndex: number): void;
>>>>>>> Updated baselines
class C {
@dec prop;
}
//// [decoratorOnClassProperty7.js]
<<<<<<< HEAD
var __decorate = this.__decorate || function (decorators, target, key, value) {
var kind = typeof (arguments.length == 2 ? value = target : value);
for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
function C() {
}
__decorate([dec], C.prototype, "prop");
=======
var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
for (var i = decorators.length - 1; i >= 0; --i) {
var decorator = decorators[i];
result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
}
if (kind == 2 && result) Object.defineProperty(target, key, result);
if (kind == 0) return result;
};
var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
var C = (function () {
function C() {
}
__decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
>>>>>>> Updated baselines
return C;
})();