From 2a907a9c3ab48e8d68ed11a6fd5546b3bcdd8a62 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 17 Mar 2015 14:57:21 -0700 Subject: [PATCH 1/3] Type serialization for decorators --- src/compiler/checker.ts | 188 ++++++++++++++++++++++++++++++++++++++++ src/compiler/emitter.ts | 3 +- 2 files changed, 190 insertions(+), 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6fdaac79ce..58607e449d 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2965,6 +2965,16 @@ module ts { return getSignaturesOfObjectOrUnionType(getApparentType(type), kind); } + function typeHasCallOrConstructSignatures(type: Type): boolean { + let apparentType = getApparentType(type); + if (apparentType.flags & (TypeFlags.ObjectType | TypeFlags.Union)) { + let resolved = resolveObjectOrUnionTypeMembers(type); + return resolved.callSignatures.length > 0 + || resolved.constructSignatures.length > 0; + } + return false; + } + function getIndexTypeOfObjectOrUnionType(type: Type, kind: IndexKind): Type { if (type.flags & (TypeFlags.ObjectType | TypeFlags.Union)) { let resolved = resolveObjectOrUnionTypeMembers(type); @@ -11337,6 +11347,184 @@ module ts { return undefined; } + /** Serializes an EntityName (with substitutions) to an appropriate JS constructor value. Used by the `@type`, `@paramtypes`, and `@returntype` decorators. */ + function serializeEntityName(node: EntityName, getGeneratedNameForNode: (Node: Node) => string, fallbackPath?: string[]): string { + if (node.kind === SyntaxKind.Identifier) { + var substitution = getExpressionNameSubstitution(node, getGeneratedNameForNode); + var text = substitution || (node).text; + if (fallbackPath) { + fallbackPath.push(text); + } + else { + return text; + } + } + else { + var left = serializeEntityName((node).left, getGeneratedNameForNode, fallbackPath); + var right = serializeEntityName((node).right, getGeneratedNameForNode, fallbackPath); + if (!fallbackPath) { + return left + "." + right; + } + } + } + + /** Serializes a TypeReferenceNode to an appropriate JS constructor value. Used by the `@type`, `@paramtypes`, and `@returntype` decorators. */ + function serializeTypeReferenceNode(node: TypeReferenceNode, getGeneratedNameForNode: (Node: Node) => string): string | string[] { + // serialization of a TypeReferenceNode uses the following rules: + // + // * The serialized type of a TypeReference that is `void` is "void 0". + // * The serialized type of a TypeReference that is a `boolean` is "Boolean". + // * The serialized type of a TypeReference that is an enum or `number` is "Number". + // * The serialized type of a TypeReference that is a string literal or `string` is "String". + // * The serialized type of a TypeReference that is a tuple is "Array". + // * The serialized type of a TypeReference that is a `symbol` is "Symbol". + // * The serialized type of a TypeReference with a value declaration is its entity name. + // * The serialized type of a TypeReference with a call or construct signature is "Function". + // * The serialized type of any other type is "Object". + let type = getTypeFromTypeReferenceNode(node); + if (type.flags & TypeFlags.Void) { + return "void 0"; + } + else if (type.flags & TypeFlags.Boolean) { + return "Boolean"; + } + else if (type.flags & TypeFlags.NumberLike) { + return "Number"; + } + else if (type.flags & TypeFlags.StringLike) { + return "String"; + } + else if (type.flags & TypeFlags.Tuple) { + return "Array"; + } + 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; + } + + return "Object"; + } + + /** Serializes a TypeNode to an appropriate JS constructor value. Used by the `@type`, `@paramtypes`, and `@returntype` decorators. */ + function serializeTypeNode(node: TypeNode | LiteralExpression, getGeneratedNameForNode: (Node: Node) => string): string | string[] { + // serialization of a TypeNode uses the following rules: + // + // * The serialized type of `void` is "void 0" (undefined). + // * The serialized type of a parenthesized type is the serialized type of its nested type. + // * The serialized type of a Function or Constructor type is "Function". + // * The serialized type of an Array or Tuple type is "Array". + // * The serialized type of `boolean` is "Boolean". + // * The serialized type of `string` or a string-literal type is "String". + // * The serialized type of a type reference is handled by `serializeTypeReferenceNode`. + // * The serialized type of any other type node is "Object". + if (node) { + switch (node.kind) { + case SyntaxKind.VoidKeyword: + return "void 0"; + case SyntaxKind.ParenthesizedType: + return serializeTypeNode((node).type, getGeneratedNameForNode); + case SyntaxKind.FunctionType: + case SyntaxKind.ConstructorType: + return "Function"; + case SyntaxKind.ArrayType: + case SyntaxKind.TupleType: + return "Array"; + case SyntaxKind.BooleanKeyword: + return "Boolean"; + case SyntaxKind.StringKeyword: + case SyntaxKind.StringLiteral: + return "String"; + case SyntaxKind.NumberKeyword: + return "Number"; + case SyntaxKind.TypeReference: + return serializeTypeReferenceNode(node, getGeneratedNameForNode); + case SyntaxKind.TypeQuery: + case SyntaxKind.TypeLiteral: + case SyntaxKind.UnionType: + case SyntaxKind.AnyKeyword: + default: + break; + } + } + + return "Object"; + } + + /** Serializes the type of a declaration to an appropriate JS constructor value. Used by the `@type` and `@paramtypes` decorators. */ + function serializeTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[] { + // serialization of the type of a declaration uses the following rules: + // + // * The serialized type of a ClassDeclaration is the class name (see serializeEntityName). + // * The serialized type of a ParameterDeclaration is the serialized type of its type annotation. + // * The serialized type of a PropertyDeclaration is the serialized type of its type annotation. + // * The serialized type of an AccessorDeclaration is the serialized type of the return type annotation of its getter or parameter type annotation of its setter. + // * The serialized type of any other FunctionLikeDeclaration is "Function". + // * The serialized type of any other node is "void 0". + // + // For rules on serializing type annotations, see `serializeTypeNode`. + switch (node.kind) { + case SyntaxKind.ClassDeclaration: return serializeEntityName((node).name, getGeneratedNameForNode); + case SyntaxKind.PropertyDeclaration: return serializeTypeNode((node).type, getGeneratedNameForNode); + case SyntaxKind.Parameter: return serializeTypeNode((node).type, getGeneratedNameForNode); + case SyntaxKind.GetAccessor: return serializeTypeNode((node).type, getGeneratedNameForNode); + case SyntaxKind.SetAccessor: return serializeTypeNode(getSetAccessorTypeAnnotationNode(node), getGeneratedNameForNode); + } + if (isFunctionLike(node)) { + return "Function"; + } + return "void 0"; + } + + /** Serializes the parameter types of a function or the constructor of a class. Used by the `@paramtypes` decorator. */ + function serializeParameterTypesOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): (string | string[])[] { + // serialization of parameter types uses the following rules: + // + // * If the declaration is a class, the parameters of the first constructor with a body are used. + // * If the declaration is function-like and has a body, the parameters of the function are used. + // + // For the rules on serializing the type of each parameter declaration, see `serializeTypeOfDeclaration`. + if (node) { + var valueDeclaration: FunctionLikeDeclaration; + if (node.kind === SyntaxKind.ClassDeclaration) { + valueDeclaration = getFirstConstructorWithBody(node); + } + else if (isFunctionLike(node) && nodeIsPresent((node).body)) { + valueDeclaration = node; + } + if (valueDeclaration) { + var result: (string | string[])[]; + var parameters = valueDeclaration.parameters; + var parameterCount = parameters.length; + if (parameterCount > 0) { + result = new Array(parameterCount); + for (var i = 0; i < parameterCount; i++) { + result[i] = serializeTypeOfNode(parameters[i], getGeneratedNameForNode); + } + return result; + } + } + } + return emptyArray; + } + + /** Serializes the return type of function. Used by the `@returntype` decorator. */ + function serializeReturnTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[] { + if (node && isFunctionLike(node)) { + return serializeTypeNode((node).type, getGeneratedNameForNode); + } + return "void 0"; + } + function writeTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) { // Get type of the symbol if this is the valid symbol otherwise get type at location let symbol = getSymbolOfNode(declaration); diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 02531593de..c772262e89 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -4652,7 +4652,8 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } } return value; -};`); +}; +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };`); decorateEmitted = true; } if (isExternalModule(node)) { From a1d445ebc90876cb61c456309c3dc239ad0f9c85 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Tue, 17 Mar 2015 17:09:39 -0700 Subject: [PATCH 2/3] Updated baselines --- src/compiler/checker.ts | 83 ++++++++++++++-- src/compiler/emitter.ts | 95 ++++++++++++++++++- src/compiler/types.ts | 3 + src/lib/es6.d.ts | 36 +++---- .../baselines/reference/APISample_compile.js | 7 ++ .../reference/APISample_compile.types | 23 +++++ tests/baselines/reference/APISample_linter.js | 7 ++ .../reference/APISample_linter.types | 23 +++++ .../reference/APISample_transform.js | 7 ++ .../reference/APISample_transform.types | 23 +++++ .../baselines/reference/APISample_watcher.js | 7 ++ .../reference/APISample_watcher.types | 23 +++++ .../baselines/reference/decoratorOnClass1.js | 18 ++++ .../baselines/reference/decoratorOnClass2.js | 18 ++++ .../baselines/reference/decoratorOnClass3.js | 18 ++++ .../baselines/reference/decoratorOnClass4.js | 18 ++++ .../baselines/reference/decoratorOnClass5.js | 18 ++++ .../baselines/reference/decoratorOnClass8.js | 18 ++++ .../reference/decoratorOnClassAccessor1.js | 18 ++++ .../reference/decoratorOnClassAccessor2.js | 18 ++++ .../reference/decoratorOnClassAccessor4.js | 18 ++++ .../reference/decoratorOnClassAccessor5.js | 18 ++++ .../decoratorOnClassConstructorParameter1.js | 22 +++++ .../decoratorOnClassConstructorParameter4.js | 22 +++++ .../reference/decoratorOnClassMethod1.js | 18 ++++ .../reference/decoratorOnClassMethod10.js | 18 ++++ .../reference/decoratorOnClassMethod2.js | 18 ++++ .../reference/decoratorOnClassMethod4.js | 23 +++++ .../reference/decoratorOnClassMethod5.js | 23 +++++ .../reference/decoratorOnClassMethod6.js | 23 +++++ .../reference/decoratorOnClassMethod7.js | 23 +++++ .../reference/decoratorOnClassMethod8.js | 18 ++++ .../decoratorOnClassMethodParameter1.js | 22 +++++ .../reference/decoratorOnClassProperty1.js | 22 +++++ .../reference/decoratorOnClassProperty10.js | 22 +++++ .../reference/decoratorOnClassProperty11.js | 22 +++++ .../reference/decoratorOnClassProperty2.js | 22 +++++ .../reference/decoratorOnClassProperty6.js | 18 ++++ .../reference/decoratorOnClassProperty7.js | 22 +++++ 39 files changed, 843 insertions(+), 32 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 58607e449d..a5a27df412 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -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((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((node).type); + case SyntaxKind.Parameter: return checkTypeNodeAsExpression((node).type); + case SyntaxKind.MethodDeclaration: return checkTypeNodeAsExpression((node).type); + case SyntaxKind.GetAccessor: return checkTypeNodeAsExpression((node).type); + case SyntaxKind.SetAccessor: return checkTypeNodeAsExpression(getSetAccessorTypeAnnotationNode(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(node); + if (constructor) { + checkParameterTypeAnnotationsAsExpressions(constructor); + } + break; + case SyntaxKind.MethodDeclaration: - case SyntaxKind.GetAccessor: + checkParameterTypeAnnotationsAsExpressions(node); + // fall-through + case SyntaxKind.SetAccessor: + case SyntaxKind.GetAccessor: case SyntaxKind.PropertyDeclaration: case SyntaxKind.Parameter: - emitDecorate = true; + checkTypeAnnotationAsExpression(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((node).name, getGeneratedNameForNode); + case SyntaxKind.ClassDeclaration: return "Function"; case SyntaxKind.PropertyDeclaration: return serializeTypeNode((node).type, getGeneratedNameForNode); case SyntaxKind.Parameter: return serializeTypeNode((node).type, getGeneratedNameForNode); case SyntaxKind.GetAccessor: return serializeTypeNode((node).type, getGeneratedNameForNode); @@ -11508,7 +11553,22 @@ module ts { if (parameterCount > 0) { result = new Array(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 = (parameterType).elementType; + } + else if (parameterType.kind === SyntaxKind.TypeReference && (parameterType).typeArguments && (parameterType).typeArguments.length === 1) { + parameterType = (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, }; } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index c772262e89..1e959eeb7d 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -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); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index e5697f9f37..06f21836a6 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -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 { diff --git a/src/lib/es6.d.ts b/src/lib/es6.d.ts index 3e6ac3f756..8590e2273e 100644 --- a/src/lib/es6.d.ts +++ b/src/lib/es6.d.ts @@ -3513,27 +3513,27 @@ interface ProxyHandler { interface ProxyConstructor { revocable(target: T, handler: ProxyHandler): { proxy: T; revoke: () => void; }; - new (target: T, handeler: ProxyHandler): T + new (target: T, handler: ProxyHandler): T } declare var Proxy: ProxyConstructor; -declare var Reflect: { - apply(target: Function, thisArgument: any, argumentsList: ArrayLike): any; - construct(target: Function, argumentsList: ArrayLike): any; - defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean; - deleteProperty(target: any, propertyKey: PropertyKey): boolean; - enumerate(target: any): IterableIterator; - 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; - 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; + function construct(target: Function, argumentsList: ArrayLike): any; + function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean; + function deleteProperty(target: any, propertyKey: PropertyKey): boolean; + function enumerate(target: any): IterableIterator; + 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; + 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 diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 07d5e4337a..cb9cd765b2 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -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, diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index eff47a4cb7..71c0db3d19 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -3150,6 +3150,29 @@ declare module "typescript" { >getBlockScopedVariableId : (node: Identifier) => number >node : Identifier >Identifier : Identifier +<<<<<<< HEAD +======= + + getClassDeclarationVariableId(node: Identifier): number; +>getClassDeclarationVariableId : (node: Identifier) => number +>node : Identifier +>Identifier : Identifier + + serializeTypeOfNode(node: Node): string | string[]; +>serializeTypeOfNode : (node: Node) => string | string[] +>node : Node +>Node : Node + + serializeParameterTypesOfNode(node: Node): (string | string[])[]; +>serializeParameterTypesOfNode : (node: Node) => (string | string[])[] +>node : Node +>Node : Node + + serializeReturnTypeOfNode(node: Node): string | string[]; +>serializeReturnTypeOfNode : (node: Node) => string | string[] +>node : Node +>Node : Node +>>>>>>> Updated baselines } const enum SymbolFlags { >SymbolFlags : SymbolFlags diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index b57acaf0e9..1459cf0f77 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -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, diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 600bf5c6ad..f979f60b57 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -3296,6 +3296,29 @@ declare module "typescript" { >getBlockScopedVariableId : (node: Identifier) => number >node : Identifier >Identifier : Identifier +<<<<<<< HEAD +======= + + getClassDeclarationVariableId(node: Identifier): number; +>getClassDeclarationVariableId : (node: Identifier) => number +>node : Identifier +>Identifier : Identifier + + serializeTypeOfNode(node: Node): string | string[]; +>serializeTypeOfNode : (node: Node) => string | string[] +>node : Node +>Node : Node + + serializeParameterTypesOfNode(node: Node): (string | string[])[]; +>serializeParameterTypesOfNode : (node: Node) => (string | string[])[] +>node : Node +>Node : Node + + serializeReturnTypeOfNode(node: Node): string | string[]; +>serializeReturnTypeOfNode : (node: Node) => string | string[] +>node : Node +>Node : Node +>>>>>>> Updated baselines } const enum SymbolFlags { >SymbolFlags : SymbolFlags diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 4004007508..7c59f94ca4 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -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, diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index 4ea9c49d75..004f179f28 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -3246,6 +3246,29 @@ declare module "typescript" { >getBlockScopedVariableId : (node: Identifier) => number >node : Identifier >Identifier : Identifier +<<<<<<< HEAD +======= + + getClassDeclarationVariableId(node: Identifier): number; +>getClassDeclarationVariableId : (node: Identifier) => number +>node : Identifier +>Identifier : Identifier + + serializeTypeOfNode(node: Node): string | string[]; +>serializeTypeOfNode : (node: Node) => string | string[] +>node : Node +>Node : Node + + serializeParameterTypesOfNode(node: Node): (string | string[])[]; +>serializeParameterTypesOfNode : (node: Node) => (string | string[])[] +>node : Node +>Node : Node + + serializeReturnTypeOfNode(node: Node): string | string[]; +>serializeReturnTypeOfNode : (node: Node) => string | string[] +>node : Node +>Node : Node +>>>>>>> Updated baselines } const enum SymbolFlags { >SymbolFlags : SymbolFlags diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 34503a0d81..606bffdf77 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -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, diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 3903e169b4..5170a0bd2b 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -3419,6 +3419,29 @@ declare module "typescript" { >getBlockScopedVariableId : (node: Identifier) => number >node : Identifier >Identifier : Identifier +<<<<<<< HEAD +======= + + getClassDeclarationVariableId(node: Identifier): number; +>getClassDeclarationVariableId : (node: Identifier) => number +>node : Identifier +>Identifier : Identifier + + serializeTypeOfNode(node: Node): string | string[]; +>serializeTypeOfNode : (node: Node) => string | string[] +>node : Node +>Node : Node + + serializeParameterTypesOfNode(node: Node): (string | string[])[]; +>serializeParameterTypesOfNode : (node: Node) => (string | string[])[] +>node : Node +>Node : Node + + serializeReturnTypeOfNode(node: Node): string | string[]; +>serializeReturnTypeOfNode : (node: Node) => string | string[] +>node : Node +>Node : Node +>>>>>>> Updated baselines } const enum SymbolFlags { >SymbolFlags : SymbolFlags diff --git a/tests/baselines/reference/decoratorOnClass1.js b/tests/baselines/reference/decoratorOnClass1.js index 24be251746..c5b0233bfb 100644 --- a/tests/baselines/reference/decoratorOnClass1.js +++ b/tests/baselines/reference/decoratorOnClass1.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js index 92741819e9..ee0fd6010b 100644 --- a/tests/baselines/reference/decoratorOnClass2.js +++ b/tests/baselines/reference/decoratorOnClass2.js @@ -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; diff --git a/tests/baselines/reference/decoratorOnClass3.js b/tests/baselines/reference/decoratorOnClass3.js index 766acc4207..17f0c395b8 100644 --- a/tests/baselines/reference/decoratorOnClass3.js +++ b/tests/baselines/reference/decoratorOnClass3.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClass4.js b/tests/baselines/reference/decoratorOnClass4.js index 95bde54937..b530b477c1 100644 --- a/tests/baselines/reference/decoratorOnClass4.js +++ b/tests/baselines/reference/decoratorOnClass4.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClass5.js b/tests/baselines/reference/decoratorOnClass5.js index a93d625f49..c01463ace0 100644 --- a/tests/baselines/reference/decoratorOnClass5.js +++ b/tests/baselines/reference/decoratorOnClass5.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClass8.js b/tests/baselines/reference/decoratorOnClass8.js index 0e782d45e1..99ce993e95 100644 --- a/tests/baselines/reference/decoratorOnClass8.js +++ b/tests/baselines/reference/decoratorOnClass8.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.js b/tests/baselines/reference/decoratorOnClassAccessor1.js index d78e776cb9..6065bad5dc 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor1.js +++ b/tests/baselines/reference/decoratorOnClassAccessor1.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.js b/tests/baselines/reference/decoratorOnClassAccessor2.js index f1bfce9ea6..6ba38de1b1 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor2.js +++ b/tests/baselines/reference/decoratorOnClassAccessor2.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.js b/tests/baselines/reference/decoratorOnClassAccessor4.js index 77dbc569e5..5495d4d8f4 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor4.js +++ b/tests/baselines/reference/decoratorOnClassAccessor4.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.js b/tests/baselines/reference/decoratorOnClassAccessor5.js index bfd6518c59..6b4542b637 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor5.js +++ b/tests/baselines/reference/decoratorOnClassAccessor5.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js index 0c86a1ccf7..232d687322 100644 --- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js +++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js index 07dc7cae07..afb8775f58 100644 --- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js +++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethod1.js b/tests/baselines/reference/decoratorOnClassMethod1.js index be9c00290f..ece5d6320e 100644 --- a/tests/baselines/reference/decoratorOnClassMethod1.js +++ b/tests/baselines/reference/decoratorOnClassMethod1.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethod10.js b/tests/baselines/reference/decoratorOnClassMethod10.js index 3dd38f806b..b8b60aa944 100644 --- a/tests/baselines/reference/decoratorOnClassMethod10.js +++ b/tests/baselines/reference/decoratorOnClassMethod10.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethod2.js b/tests/baselines/reference/decoratorOnClassMethod2.js index b7df7b9ba9..01f41e185f 100644 --- a/tests/baselines/reference/decoratorOnClassMethod2.js +++ b/tests/baselines/reference/decoratorOnClassMethod2.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethod4.js b/tests/baselines/reference/decoratorOnClassMethod4.js index 7021e5af32..4f4227a23f 100644 --- a/tests/baselines/reference/decoratorOnClassMethod4.js +++ b/tests/baselines/reference/decoratorOnClassMethod4.js @@ -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 diff --git a/tests/baselines/reference/decoratorOnClassMethod5.js b/tests/baselines/reference/decoratorOnClassMethod5.js index 3bde0968ea..a74536cc16 100644 --- a/tests/baselines/reference/decoratorOnClassMethod5.js +++ b/tests/baselines/reference/decoratorOnClassMethod5.js @@ -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 diff --git a/tests/baselines/reference/decoratorOnClassMethod6.js b/tests/baselines/reference/decoratorOnClassMethod6.js index 126dc47ad2..6f9c42a720 100644 --- a/tests/baselines/reference/decoratorOnClassMethod6.js +++ b/tests/baselines/reference/decoratorOnClassMethod6.js @@ -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 diff --git a/tests/baselines/reference/decoratorOnClassMethod7.js b/tests/baselines/reference/decoratorOnClassMethod7.js index 34fbdb53ca..2ad1e43998 100644 --- a/tests/baselines/reference/decoratorOnClassMethod7.js +++ b/tests/baselines/reference/decoratorOnClassMethod7.js @@ -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 diff --git a/tests/baselines/reference/decoratorOnClassMethod8.js b/tests/baselines/reference/decoratorOnClassMethod8.js index 629ff4e253..2fd17798b2 100644 --- a/tests/baselines/reference/decoratorOnClassMethod8.js +++ b/tests/baselines/reference/decoratorOnClassMethod8.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.js index 1dcb057e53..171872ee28 100644 --- a/tests/baselines/reference/decoratorOnClassMethodParameter1.js +++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty1.js b/tests/baselines/reference/decoratorOnClassProperty1.js index efc6a2c04d..f9cfab7d65 100644 --- a/tests/baselines/reference/decoratorOnClassProperty1.js +++ b/tests/baselines/reference/decoratorOnClassProperty1.js @@ -1,11 +1,16 @@ //// [decoratorOnClassProperty1.ts] +<<<<<<< HEAD declare function dec(target: any, propertyKey: string): void; +======= +declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; +>>>>>>> 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; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty10.js b/tests/baselines/reference/decoratorOnClassProperty10.js index d55eb71e3c..c7b3a56464 100644 --- a/tests/baselines/reference/decoratorOnClassProperty10.js +++ b/tests/baselines/reference/decoratorOnClassProperty10.js @@ -1,11 +1,16 @@ //// [decoratorOnClassProperty10.ts] +<<<<<<< HEAD declare function dec(): (target: any, propertyKey: string) => void; +======= +declare function dec(): (target: any, propertyKey: string, descriptor: TypedPropertyDescriptor) => TypedPropertyDescriptor; +>>>>>>> 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; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty11.js b/tests/baselines/reference/decoratorOnClassProperty11.js index 63e5f8d02e..d784eb56a8 100644 --- a/tests/baselines/reference/decoratorOnClassProperty11.js +++ b/tests/baselines/reference/decoratorOnClassProperty11.js @@ -1,11 +1,16 @@ //// [decoratorOnClassProperty11.ts] +<<<<<<< HEAD declare function dec(): (target: any, propertyKey: string) => void; +======= +declare function dec(): (target: any, propertyKey: string, descriptor: TypedPropertyDescriptor) => TypedPropertyDescriptor; +>>>>>>> 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; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty2.js b/tests/baselines/reference/decoratorOnClassProperty2.js index d52baa7920..4968fce088 100644 --- a/tests/baselines/reference/decoratorOnClassProperty2.js +++ b/tests/baselines/reference/decoratorOnClassProperty2.js @@ -1,11 +1,16 @@ //// [decoratorOnClassProperty2.ts] +<<<<<<< HEAD declare function dec(target: any, propertyKey: string): void; +======= +declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; +>>>>>>> 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; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty6.js b/tests/baselines/reference/decoratorOnClassProperty6.js index 7f087156bc..2eaf977c7e 100644 --- a/tests/baselines/reference/decoratorOnClassProperty6.js +++ b/tests/baselines/reference/decoratorOnClassProperty6.js @@ -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; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty7.js b/tests/baselines/reference/decoratorOnClassProperty7.js index ba2c8383a2..72f08c988f 100644 --- a/tests/baselines/reference/decoratorOnClassProperty7.js +++ b/tests/baselines/reference/decoratorOnClassProperty7.js @@ -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; })(); From 71803c6412ffc827a3543b1918d36a3c4a396f18 Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 25 Mar 2015 18:12:57 -0700 Subject: [PATCH 3/3] Minor emit cleanup --- src/compiler/emitter.ts | 10 +- .../baselines/reference/APISample_compile.js | 10 +- .../reference/APISample_compile.types | 33 +- tests/baselines/reference/APISample_linter.js | 10 +- .../reference/APISample_linter.types | 33 +- .../reference/APISample_transform.js | 10 +- .../reference/APISample_transform.types | 33 +- .../baselines/reference/APISample_watcher.js | 10 +- .../reference/APISample_watcher.types | 33 +- .../baselines/reference/decoratorOnClass1.js | 19 +- .../baselines/reference/decoratorOnClass2.js | 19 +- .../baselines/reference/decoratorOnClass3.js | 19 +- .../baselines/reference/decoratorOnClass4.js | 19 +- .../baselines/reference/decoratorOnClass5.js | 19 +- .../baselines/reference/decoratorOnClass8.js | 19 +- .../reference/decoratorOnClassAccessor1.js | 21 +- .../reference/decoratorOnClassAccessor2.js | 21 +- .../reference/decoratorOnClassAccessor4.js | 21 +- .../reference/decoratorOnClassAccessor5.js | 21 +- .../decoratorOnClassConstructorParameter1.js | 25 +- .../decoratorOnClassConstructorParameter4.js | 25 +- .../reference/decoratorOnClassMethod1.js | 21 +- .../reference/decoratorOnClassMethod10.js | 21 +- .../reference/decoratorOnClassMethod2.js | 21 +- .../reference/decoratorOnClassMethod4.js | 26 +- .../reference/decoratorOnClassMethod5.js | 26 +- .../reference/decoratorOnClassMethod6.js | 26 +- .../reference/decoratorOnClassMethod7.js | 26 +- .../reference/decoratorOnClassMethod8.js | 21 +- .../decoratorOnClassMethodParameter1.js | 25 +- .../reference/decoratorOnClassProperty1.js | 23 +- .../reference/decoratorOnClassProperty10.js | 23 +- .../reference/decoratorOnClassProperty11.js | 23 +- .../reference/decoratorOnClassProperty2.js | 23 +- .../reference/decoratorOnClassProperty6.js | 19 +- .../reference/decoratorOnClassProperty7.js | 23 +- .../sourceMapValidationDecorators.js | 19 +- .../sourceMapValidationDecorators.js.map | 2 +- ...ourceMapValidationDecorators.sourcemap.txt | 531 +++++++++--------- 39 files changed, 404 insertions(+), 925 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 1e959eeb7d..de52dd370c 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -3970,16 +3970,16 @@ module ts { write("], "); } - function formatPathSegment(location: Node, path: string[], index: number): string { + function serializeTypeNameSegment(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]}`; + return `${serializeTypeNameSegment(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]}`; + return `(${temp.text} = ${serializeTypeNameSegment(location, path, index - 1) }) && ${temp.text}.${path[index]}`; } } @@ -4052,7 +4052,7 @@ module ts { } else { Debug.assert(name.length > 0, "Invalid type name path for serialization"); - write(`(${formatPathSegment(location, name, name.length - 1) }) || Object`); + write(`(${serializeTypeNameSegment(location, name, name.length - 1) }) || Object`); } } function emitInterfaceDeclaration(node: InterfaceDeclaration) { @@ -4740,7 +4740,7 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };`); +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } };`); decorateEmitted = true; } if (isExternalModule(node)) { diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index cb9cd765b2..f8c09387a8 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -964,13 +964,9 @@ 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 + 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[]; } const enum SymbolFlags { FunctionScopedVariable = 1, diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 71c0db3d19..d2a1f44d17 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -3150,29 +3150,30 @@ declare module "typescript" { >getBlockScopedVariableId : (node: Identifier) => number >node : Identifier >Identifier : Identifier -<<<<<<< HEAD -======= - getClassDeclarationVariableId(node: Identifier): number; ->getClassDeclarationVariableId : (node: Identifier) => number ->node : Identifier ->Identifier : Identifier - - serializeTypeOfNode(node: Node): string | string[]; ->serializeTypeOfNode : (node: Node) => string | string[] + serializeTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[]; +>serializeTypeOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => string | string[] >node : Node >Node : Node - - serializeParameterTypesOfNode(node: Node): (string | string[])[]; ->serializeParameterTypesOfNode : (node: Node) => (string | string[])[] ->node : Node +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node >Node : Node - serializeReturnTypeOfNode(node: Node): string | string[]; ->serializeReturnTypeOfNode : (node: Node) => string | string[] + serializeParameterTypesOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): (string | string[])[]; +>serializeParameterTypesOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => (string | string[])[] >node : Node >Node : Node ->>>>>>> Updated baselines +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node +>Node : Node + + serializeReturnTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[]; +>serializeReturnTypeOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => string | string[] +>node : Node +>Node : Node +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node +>Node : Node } const enum SymbolFlags { >SymbolFlags : SymbolFlags diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 1459cf0f77..40abbad18c 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -995,13 +995,9 @@ 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 + 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[]; } const enum SymbolFlags { FunctionScopedVariable = 1, diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index f979f60b57..bb5dd76470 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -3296,29 +3296,30 @@ declare module "typescript" { >getBlockScopedVariableId : (node: Identifier) => number >node : Identifier >Identifier : Identifier -<<<<<<< HEAD -======= - getClassDeclarationVariableId(node: Identifier): number; ->getClassDeclarationVariableId : (node: Identifier) => number ->node : Identifier ->Identifier : Identifier - - serializeTypeOfNode(node: Node): string | string[]; ->serializeTypeOfNode : (node: Node) => string | string[] + serializeTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[]; +>serializeTypeOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => string | string[] >node : Node >Node : Node - - serializeParameterTypesOfNode(node: Node): (string | string[])[]; ->serializeParameterTypesOfNode : (node: Node) => (string | string[])[] ->node : Node +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node >Node : Node - serializeReturnTypeOfNode(node: Node): string | string[]; ->serializeReturnTypeOfNode : (node: Node) => string | string[] + serializeParameterTypesOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): (string | string[])[]; +>serializeParameterTypesOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => (string | string[])[] >node : Node >Node : Node ->>>>>>> Updated baselines +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node +>Node : Node + + serializeReturnTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[]; +>serializeReturnTypeOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => string | string[] +>node : Node +>Node : Node +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node +>Node : Node } const enum SymbolFlags { >SymbolFlags : SymbolFlags diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 7c59f94ca4..c108f5a341 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -996,13 +996,9 @@ 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 + 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[]; } const enum SymbolFlags { FunctionScopedVariable = 1, diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index 004f179f28..280427efe8 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -3246,29 +3246,30 @@ declare module "typescript" { >getBlockScopedVariableId : (node: Identifier) => number >node : Identifier >Identifier : Identifier -<<<<<<< HEAD -======= - getClassDeclarationVariableId(node: Identifier): number; ->getClassDeclarationVariableId : (node: Identifier) => number ->node : Identifier ->Identifier : Identifier - - serializeTypeOfNode(node: Node): string | string[]; ->serializeTypeOfNode : (node: Node) => string | string[] + serializeTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[]; +>serializeTypeOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => string | string[] >node : Node >Node : Node - - serializeParameterTypesOfNode(node: Node): (string | string[])[]; ->serializeParameterTypesOfNode : (node: Node) => (string | string[])[] ->node : Node +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node >Node : Node - serializeReturnTypeOfNode(node: Node): string | string[]; ->serializeReturnTypeOfNode : (node: Node) => string | string[] + serializeParameterTypesOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): (string | string[])[]; +>serializeParameterTypesOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => (string | string[])[] >node : Node >Node : Node ->>>>>>> Updated baselines +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node +>Node : Node + + serializeReturnTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[]; +>serializeReturnTypeOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => string | string[] +>node : Node +>Node : Node +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node +>Node : Node } const enum SymbolFlags { >SymbolFlags : SymbolFlags diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index 606bffdf77..e752b4e53f 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -1033,13 +1033,9 @@ 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 + 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[]; } const enum SymbolFlags { FunctionScopedVariable = 1, diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 5170a0bd2b..c8d758fd86 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -3419,29 +3419,30 @@ declare module "typescript" { >getBlockScopedVariableId : (node: Identifier) => number >node : Identifier >Identifier : Identifier -<<<<<<< HEAD -======= - getClassDeclarationVariableId(node: Identifier): number; ->getClassDeclarationVariableId : (node: Identifier) => number ->node : Identifier ->Identifier : Identifier - - serializeTypeOfNode(node: Node): string | string[]; ->serializeTypeOfNode : (node: Node) => string | string[] + serializeTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[]; +>serializeTypeOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => string | string[] >node : Node >Node : Node - - serializeParameterTypesOfNode(node: Node): (string | string[])[]; ->serializeParameterTypesOfNode : (node: Node) => (string | string[])[] ->node : Node +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node >Node : Node - serializeReturnTypeOfNode(node: Node): string | string[]; ->serializeReturnTypeOfNode : (node: Node) => string | string[] + serializeParameterTypesOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): (string | string[])[]; +>serializeParameterTypesOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => (string | string[])[] >node : Node >Node : Node ->>>>>>> Updated baselines +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node +>Node : Node + + serializeReturnTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[]; +>serializeReturnTypeOfNode : (node: Node, getGeneratedNameForNode: (Node: Node) => string) => string | string[] +>node : Node +>Node : Node +>getGeneratedNameForNode : (Node: Node) => string +>Node : Node +>Node : Node } const enum SymbolFlags { >SymbolFlags : SymbolFlags diff --git a/tests/baselines/reference/decoratorOnClass1.js b/tests/baselines/reference/decoratorOnClass1.js index c5b0233bfb..eff31559ba 100644 --- a/tests/baselines/reference/decoratorOnClass1.js +++ b/tests/baselines/reference/decoratorOnClass1.js @@ -6,7 +6,6 @@ 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) { @@ -20,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } C = __decorate([dec, __metadata('design:paramtypes', [])], C); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js index ee0fd6010b..b90db23abf 100644 --- a/tests/baselines/reference/decoratorOnClass2.js +++ b/tests/baselines/reference/decoratorOnClass2.js @@ -6,7 +6,6 @@ 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) { @@ -20,27 +19,11 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } C = __decorate([dec, __metadata('design:paramtypes', [])], C); ->>>>>>> Updated baselines return C; })(); exports.C = C; diff --git a/tests/baselines/reference/decoratorOnClass3.js b/tests/baselines/reference/decoratorOnClass3.js index 17f0c395b8..990adc775e 100644 --- a/tests/baselines/reference/decoratorOnClass3.js +++ b/tests/baselines/reference/decoratorOnClass3.js @@ -7,7 +7,6 @@ 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) { @@ -21,26 +20,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } C = __decorate([dec, __metadata('design:paramtypes', [])], C); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClass4.js b/tests/baselines/reference/decoratorOnClass4.js index b530b477c1..89afb51bf7 100644 --- a/tests/baselines/reference/decoratorOnClass4.js +++ b/tests/baselines/reference/decoratorOnClass4.js @@ -6,7 +6,6 @@ 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) { @@ -20,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } C = __decorate([dec(), __metadata('design:paramtypes', [])], C); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClass5.js b/tests/baselines/reference/decoratorOnClass5.js index c01463ace0..264397450a 100644 --- a/tests/baselines/reference/decoratorOnClass5.js +++ b/tests/baselines/reference/decoratorOnClass5.js @@ -6,7 +6,6 @@ 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) { @@ -20,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } C = __decorate([dec(), __metadata('design:paramtypes', [])], C); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClass8.js b/tests/baselines/reference/decoratorOnClass8.js index 99ce993e95..87334f216a 100644 --- a/tests/baselines/reference/decoratorOnClass8.js +++ b/tests/baselines/reference/decoratorOnClass8.js @@ -6,7 +6,6 @@ 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) { @@ -20,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } C = __decorate([dec(), __metadata('design:paramtypes', [])], C); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.js b/tests/baselines/reference/decoratorOnClassAccessor1.js index 6065bad5dc..0aa6073c24 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor1.js +++ b/tests/baselines/reference/decoratorOnClassAccessor1.js @@ -6,7 +6,6 @@ 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) { @@ -20,19 +19,7 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } @@ -43,10 +30,6 @@ 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 + Object.defineProperty(C.prototype, "accessor", __decorate([dec, __metadata('design:type', Object)], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor"))); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.js b/tests/baselines/reference/decoratorOnClassAccessor2.js index 6ba38de1b1..3349c73a2e 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor2.js +++ b/tests/baselines/reference/decoratorOnClassAccessor2.js @@ -6,7 +6,6 @@ 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) { @@ -20,19 +19,7 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } @@ -43,10 +30,6 @@ 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 + Object.defineProperty(C.prototype, "accessor", __decorate([dec, __metadata('design:type', Object)], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor"))); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.js b/tests/baselines/reference/decoratorOnClassAccessor4.js index 5495d4d8f4..a236f893d6 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor4.js +++ b/tests/baselines/reference/decoratorOnClassAccessor4.js @@ -6,7 +6,6 @@ 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) { @@ -20,19 +19,7 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } @@ -42,10 +29,6 @@ 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 + Object.defineProperty(C.prototype, "accessor", __decorate([dec, __metadata('design:type', Number), __metadata('design:paramtypes', [Number])], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor"))); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.js b/tests/baselines/reference/decoratorOnClassAccessor5.js index 6b4542b637..c127904250 100644 --- a/tests/baselines/reference/decoratorOnClassAccessor5.js +++ b/tests/baselines/reference/decoratorOnClassAccessor5.js @@ -6,7 +6,6 @@ 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) { @@ -20,19 +19,7 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } @@ -42,10 +29,6 @@ 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 + Object.defineProperty(C.prototype, "accessor", __decorate([dec, __metadata('design:type', Number), __metadata('design:paramtypes', [Number])], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor"))); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js index 232d687322..4f32240a4f 100644 --- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js +++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js @@ -1,16 +1,11 @@ //// [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) { @@ -24,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; 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 + __decorate([dec, __metadata('design:type', Number)], C, void 0, 0); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js index afb8775f58..a9e5f2b9d6 100644 --- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js +++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js @@ -1,16 +1,11 @@ //// [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) { @@ -24,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; 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 + __decorate([dec, __metadata('design:type', Number)], C, void 0, 1); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethod1.js b/tests/baselines/reference/decoratorOnClassMethod1.js index ece5d6320e..10fd030203 100644 --- a/tests/baselines/reference/decoratorOnClassMethod1.js +++ b/tests/baselines/reference/decoratorOnClassMethod1.js @@ -6,7 +6,6 @@ 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) { @@ -20,28 +19,12 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; 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 + Object.defineProperty(C.prototype, "method", __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method"))); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethod10.js b/tests/baselines/reference/decoratorOnClassMethod10.js index b8b60aa944..520b8f1ee0 100644 --- a/tests/baselines/reference/decoratorOnClassMethod10.js +++ b/tests/baselines/reference/decoratorOnClassMethod10.js @@ -6,7 +6,6 @@ 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) { @@ -20,28 +19,12 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; 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 + Object.defineProperty(C.prototype, "method", __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method"))); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethod2.js b/tests/baselines/reference/decoratorOnClassMethod2.js index 01f41e185f..30ff677eda 100644 --- a/tests/baselines/reference/decoratorOnClassMethod2.js +++ b/tests/baselines/reference/decoratorOnClassMethod2.js @@ -6,7 +6,6 @@ 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) { @@ -20,28 +19,12 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; 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 + Object.defineProperty(C.prototype, "method", __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method"))); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethod4.js b/tests/baselines/reference/decoratorOnClassMethod4.js index 4f4227a23f..c670644ed6 100644 --- a/tests/baselines/reference/decoratorOnClassMethod4.js +++ b/tests/baselines/reference/decoratorOnClassMethod4.js @@ -6,7 +6,6 @@ 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) { @@ -20,31 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; class C { [_a = "method"]() { } } -Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a))); +Object.defineProperty(C.prototype, _a, __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], 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 diff --git a/tests/baselines/reference/decoratorOnClassMethod5.js b/tests/baselines/reference/decoratorOnClassMethod5.js index a74536cc16..809461edc7 100644 --- a/tests/baselines/reference/decoratorOnClassMethod5.js +++ b/tests/baselines/reference/decoratorOnClassMethod5.js @@ -6,7 +6,6 @@ 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) { @@ -20,31 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; class C { [_a = "method"]() { } } -Object.defineProperty(C.prototype, _a, __decorate([dec()], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a))); +Object.defineProperty(C.prototype, _a, __decorate([dec(), __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], 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 diff --git a/tests/baselines/reference/decoratorOnClassMethod6.js b/tests/baselines/reference/decoratorOnClassMethod6.js index 6f9c42a720..c954417e85 100644 --- a/tests/baselines/reference/decoratorOnClassMethod6.js +++ b/tests/baselines/reference/decoratorOnClassMethod6.js @@ -6,7 +6,6 @@ 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) { @@ -20,31 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; class C { [_a = "method"]() { } } -Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a))); +Object.defineProperty(C.prototype, _a, __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], 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 diff --git a/tests/baselines/reference/decoratorOnClassMethod7.js b/tests/baselines/reference/decoratorOnClassMethod7.js index 2ad1e43998..accc79d371 100644 --- a/tests/baselines/reference/decoratorOnClassMethod7.js +++ b/tests/baselines/reference/decoratorOnClassMethod7.js @@ -6,7 +6,6 @@ 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) { @@ -20,31 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; class C { [_a = "method"]() { } } -Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a))); +Object.defineProperty(C.prototype, _a, __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], 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 diff --git a/tests/baselines/reference/decoratorOnClassMethod8.js b/tests/baselines/reference/decoratorOnClassMethod8.js index 2fd17798b2..60c9d73c82 100644 --- a/tests/baselines/reference/decoratorOnClassMethod8.js +++ b/tests/baselines/reference/decoratorOnClassMethod8.js @@ -6,7 +6,6 @@ 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) { @@ -20,28 +19,12 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; 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 + Object.defineProperty(C.prototype, "method", __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method"))); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.js index 171872ee28..e5452fd99e 100644 --- a/tests/baselines/reference/decoratorOnClassMethodParameter1.js +++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.js @@ -1,16 +1,11 @@ //// [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) { @@ -24,28 +19,12 @@ 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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; 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 + __decorate([dec, __metadata('design:type', Number)], C.prototype, "method", 0); return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty1.js b/tests/baselines/reference/decoratorOnClassProperty1.js index f9cfab7d65..c8c8132f7a 100644 --- a/tests/baselines/reference/decoratorOnClassProperty1.js +++ b/tests/baselines/reference/decoratorOnClassProperty1.js @@ -1,16 +1,11 @@ //// [decoratorOnClassProperty1.ts] -<<<<<<< HEAD declare function dec(target: any, propertyKey: string): void; -======= -declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; ->>>>>>> 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) { @@ -24,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop"); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty10.js b/tests/baselines/reference/decoratorOnClassProperty10.js index c7b3a56464..d53f0a2d5d 100644 --- a/tests/baselines/reference/decoratorOnClassProperty10.js +++ b/tests/baselines/reference/decoratorOnClassProperty10.js @@ -1,16 +1,11 @@ //// [decoratorOnClassProperty10.ts] -<<<<<<< HEAD declare function dec(): (target: any, propertyKey: string) => void; -======= -declare function dec(): (target: any, propertyKey: string, descriptor: TypedPropertyDescriptor) => TypedPropertyDescriptor; ->>>>>>> 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) { @@ -24,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } __decorate([dec(), __metadata('design:type', Object)], C.prototype, "prop"); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty11.js b/tests/baselines/reference/decoratorOnClassProperty11.js index d784eb56a8..8d31376b00 100644 --- a/tests/baselines/reference/decoratorOnClassProperty11.js +++ b/tests/baselines/reference/decoratorOnClassProperty11.js @@ -1,16 +1,11 @@ //// [decoratorOnClassProperty11.ts] -<<<<<<< HEAD declare function dec(): (target: any, propertyKey: string) => void; -======= -declare function dec(): (target: any, propertyKey: string, descriptor: TypedPropertyDescriptor) => TypedPropertyDescriptor; ->>>>>>> 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) { @@ -24,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop"); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty2.js b/tests/baselines/reference/decoratorOnClassProperty2.js index 4968fce088..78c53b3eb3 100644 --- a/tests/baselines/reference/decoratorOnClassProperty2.js +++ b/tests/baselines/reference/decoratorOnClassProperty2.js @@ -1,16 +1,11 @@ //// [decoratorOnClassProperty2.ts] -<<<<<<< HEAD declare function dec(target: any, propertyKey: string): void; -======= -declare function dec(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor): TypedPropertyDescriptor; ->>>>>>> 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) { @@ -24,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop"); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty6.js b/tests/baselines/reference/decoratorOnClassProperty6.js index 2eaf977c7e..d1751ca315 100644 --- a/tests/baselines/reference/decoratorOnClassProperty6.js +++ b/tests/baselines/reference/decoratorOnClassProperty6.js @@ -6,7 +6,6 @@ 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) { @@ -20,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop"); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/decoratorOnClassProperty7.js b/tests/baselines/reference/decoratorOnClassProperty7.js index 72f08c988f..bc381ec5cf 100644 --- a/tests/baselines/reference/decoratorOnClassProperty7.js +++ b/tests/baselines/reference/decoratorOnClassProperty7.js @@ -1,16 +1,11 @@ //// [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) { @@ -24,26 +19,10 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; -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 __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var C = (function () { function C() { } __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop"); ->>>>>>> Updated baselines return C; })(); diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js b/tests/baselines/reference/sourceMapValidationDecorators.js index 81ce9bc60f..eae494a440 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.js +++ b/tests/baselines/reference/sourceMapValidationDecorators.js @@ -68,6 +68,7 @@ var __decorate = this.__decorate || function (decorators, target, key, value) { } return value; }; +var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; var Greeter = (function () { function Greeter(greeting) { var b = []; @@ -93,15 +94,15 @@ var Greeter = (function () { configurable: true }); Greeter.x1 = 10; - Object.defineProperty(Greeter.prototype, "greet", __decorate([PropertyDecorator1, PropertyDecorator2(40)], Greeter.prototype, "greet", Object.getOwnPropertyDescriptor(Greeter.prototype, "greet"))); - __decorate([PropertyDecorator1, PropertyDecorator2(50)], Greeter.prototype, "x"); - __decorate([ParameterDecorator1, ParameterDecorator2(70)], Greeter.prototype, "fn", 0); - __decorate([ParameterDecorator1, ParameterDecorator2(90)], Greeter.prototype, "greetings", 0); - Object.defineProperty(Greeter.prototype, "greetings", __decorate([PropertyDecorator1, PropertyDecorator2(80)], Greeter.prototype, "greetings", Object.getOwnPropertyDescriptor(Greeter.prototype, "greetings"))); - __decorate([PropertyDecorator1, PropertyDecorator2(60)], Greeter, "x1"); - __decorate([ParameterDecorator1, ParameterDecorator2(20)], Greeter, void 0, 0); - __decorate([ParameterDecorator1, ParameterDecorator2(30)], Greeter, void 0, 1); - Greeter = __decorate([ClassDecorator1, ClassDecorator2(10)], Greeter); + Object.defineProperty(Greeter.prototype, "greet", __decorate([PropertyDecorator1, PropertyDecorator2(40), __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], Greeter.prototype, "greet", Object.getOwnPropertyDescriptor(Greeter.prototype, "greet"))); + __decorate([PropertyDecorator1, PropertyDecorator2(50), __metadata('design:type', String)], Greeter.prototype, "x"); + __decorate([ParameterDecorator1, ParameterDecorator2(70), __metadata('design:type', Number)], Greeter.prototype, "fn", 0); + __decorate([ParameterDecorator1, ParameterDecorator2(90), __metadata('design:type', String)], Greeter.prototype, "greetings", 0); + Object.defineProperty(Greeter.prototype, "greetings", __decorate([PropertyDecorator1, PropertyDecorator2(80), __metadata('design:type', Object)], Greeter.prototype, "greetings", Object.getOwnPropertyDescriptor(Greeter.prototype, "greetings"))); + __decorate([PropertyDecorator1, PropertyDecorator2(60), __metadata('design:type', Number)], Greeter, "x1"); + __decorate([ParameterDecorator1, ParameterDecorator2(20), __metadata('design:type', String)], Greeter, void 0, 0); + __decorate([ParameterDecorator1, ParameterDecorator2(30), __metadata('design:type', Array)], Greeter, void 0, 1); + Greeter = __decorate([ClassDecorator1, ClassDecorator2(10), __metadata('design:paramtypes', [String, String])], Greeter); return Greeter; })(); //# sourceMappingURL=sourceMapValidationDecorators.js.map \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map index 4cca04a1e3..f90ca15a23 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.js.map +++ b/tests/baselines/reference/sourceMapValidationDecorators.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationDecorators.js.map] -{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;;;;;AAOA;IAGIA,iBAGSA,QAAgBA;QAEvBC,WAEcA;aAFdA,WAEcA,CAFdA,sBAEcA,CAFdA,IAEcA;YAFdA,0BAEcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAFLA;QAGIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAEDH,sBAEIA,8BAASA;aAFbA;YAGII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAZ/BA,sBAEAA,0BAAKA,cAFJA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,GACvBA,0BAAKA,kCAALA,0BAAKA,IAEJA;IAEDA,YAACA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,GACfA,sBAACA,EAASA;IAOhBA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,GACxBA,0BAACA,EAAQA;IAWTA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,GACxBA,iCAASA,EAAQA;IATnBA,sBAEIA,8BAASA,cAFZA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,GACnBA,8BAASA,kCAATA,8BAASA,IAEZA;IAfDA,YAACA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,GACRA,aAAEA,EAAcA;IArB7BA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,GACjBA,kBAAQA,EAAQA;IAEvBA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,GACrBA,kBAACA,EAAUA;IAVpBA,sBAACA,eAAeA,EACfA,eAAeA,CAACA,EAAEA,CAACA,YA6CnBA;IAADA,cAACA;AAADA,CAACA,AA9CD,IA8CC"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationDecorators.js","sourceRoot":"","sources":["sourceMapValidationDecorators.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":";;;;;;;;;;;;;;AAOA;IAGIA,iBAGSA,QAAgBA;QAEvBC,WAEcA;aAFdA,WAEcA,CAFdA,sBAEcA,CAFdA,IAEcA;YAFdA,0BAEcA;;QAJPA,aAAQA,GAARA,QAAQA,CAAQA;IAKzBA,CAACA;IAIDD,uBAAKA,GAFLA;QAGIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAUOF,oBAAEA,GAAVA,UAGEA,CAASA;QACPG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IAEDH,sBAEIA,8BAASA;aAFbA;YAGII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aAEDJ,UAGEA,SAAiBA;YACfI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAPAJ;IAbcA,UAAEA,GAAWA,EAAEA,CAACA;IAZ/BA,sBAEAA,0BAAKA,cAFJA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,sHACvBA,0BAAKA,kCAALA,0BAAKA,IAEJA;IAEDA,YAACA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,sCACfA,sBAACA,EAASA;IAOhBA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,sCACxBA,0BAACA,EAAQA;IAWTA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,sCACxBA,iCAASA,EAAQA;IATnBA,sBAEIA,8BAASA,cAFZA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,sCACnBA,8BAASA,kCAATA,8BAASA,IAEZA;IAfDA,YAACA,kBAAkBA,EAClBA,kBAAkBA,CAACA,EAAEA,CAACA,sCACRA,aAAEA,EAAcA;IArB7BA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,sCACjBA,kBAAQA,EAAQA;IAEvBA,YAACA,mBAAmBA,EACnBA,mBAAmBA,CAACA,EAAEA,CAACA,qCACrBA,kBAACA,EAAUA;IAVpBA,sBAACA,eAAeA,EACfA,eAAeA,CAACA,EAAEA,CAACA,+DA6CnBA;IAADA,cAACA;AAADA,CAACA,AA9CD,IA8CC"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt index c0b9d97e6f..bd57077959 100644 --- a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt @@ -21,6 +21,7 @@ sourceFile:sourceMapValidationDecorators.ts >>> } >>> return value; >>>}; +>>>var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function () { return function() { } }; >>>var Greeter = (function () { 1 > 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> @@ -32,7 +33,7 @@ sourceFile:sourceMapValidationDecorators.ts >declare function ParameterDecorator2(x: number): (target: Function, key: string | symbol, paramIndex: number) => void; > > -1 >Emitted(14, 1) Source(8, 1) + SourceIndex(0) +1 >Emitted(15, 1) Source(8, 1) + SourceIndex(0) --- >>> function Greeter(greeting) { 1->^^^^ @@ -47,9 +48,9 @@ sourceFile:sourceMapValidationDecorators.ts > @ParameterDecorator2(20) > public 3 > greeting: string -1->Emitted(15, 5) Source(11, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(15, 22) Source(14, 14) + SourceIndex(0) name (Greeter) -3 >Emitted(15, 30) Source(14, 30) + SourceIndex(0) name (Greeter) +1->Emitted(16, 5) Source(11, 5) + SourceIndex(0) name (Greeter) +2 >Emitted(16, 22) Source(14, 14) + SourceIndex(0) name (Greeter) +3 >Emitted(16, 30) Source(14, 30) + SourceIndex(0) name (Greeter) --- >>> var b = []; 1 >^^^^^^^^ @@ -61,8 +62,8 @@ sourceFile:sourceMapValidationDecorators.ts 2 > @ParameterDecorator1 > @ParameterDecorator2(30) > ...b: string[] -1 >Emitted(16, 9) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(16, 20) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(17, 9) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +2 >Emitted(17, 20) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) --- >>> for (var _i = 1; _i < arguments.length; _i++) { 1->^^^^^^^^^^^^^ @@ -83,12 +84,12 @@ sourceFile:sourceMapValidationDecorators.ts 6 > @ParameterDecorator1 > @ParameterDecorator2(30) > ...b: string[] -1->Emitted(17, 14) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(17, 25) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(17, 26) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(17, 48) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(17, 49) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -6 >Emitted(17, 53) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) +1->Emitted(18, 14) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +2 >Emitted(18, 25) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) +3 >Emitted(18, 26) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +4 >Emitted(18, 48) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) +5 >Emitted(18, 49) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +6 >Emitted(18, 53) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) --- >>> b[_i - 1] = arguments[_i]; 1 >^^^^^^^^^^^^ @@ -97,8 +98,8 @@ sourceFile:sourceMapValidationDecorators.ts 2 > @ParameterDecorator1 > @ParameterDecorator2(30) > ...b: string[] -1 >Emitted(18, 13) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(18, 39) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(19, 13) Source(16, 7) + SourceIndex(0) name (Greeter.constructor) +2 >Emitted(19, 39) Source(18, 21) + SourceIndex(0) name (Greeter.constructor) --- >>> } >>> this.greeting = greeting; @@ -112,11 +113,11 @@ sourceFile:sourceMapValidationDecorators.ts 3 > 4 > greeting 5 > : string -1 >Emitted(20, 9) Source(14, 14) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(20, 22) Source(14, 22) + SourceIndex(0) name (Greeter.constructor) -3 >Emitted(20, 25) Source(14, 14) + SourceIndex(0) name (Greeter.constructor) -4 >Emitted(20, 33) Source(14, 22) + SourceIndex(0) name (Greeter.constructor) -5 >Emitted(20, 34) Source(14, 30) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(21, 9) Source(14, 14) + SourceIndex(0) name (Greeter.constructor) +2 >Emitted(21, 22) Source(14, 22) + SourceIndex(0) name (Greeter.constructor) +3 >Emitted(21, 25) Source(14, 14) + SourceIndex(0) name (Greeter.constructor) +4 >Emitted(21, 33) Source(14, 22) + SourceIndex(0) name (Greeter.constructor) +5 >Emitted(21, 34) Source(14, 30) + SourceIndex(0) name (Greeter.constructor) --- >>> } 1 >^^^^ @@ -129,8 +130,8 @@ sourceFile:sourceMapValidationDecorators.ts > ...b: string[]) { > 2 > } -1 >Emitted(21, 5) Source(19, 5) + SourceIndex(0) name (Greeter.constructor) -2 >Emitted(21, 6) Source(19, 6) + SourceIndex(0) name (Greeter.constructor) +1 >Emitted(22, 5) Source(19, 5) + SourceIndex(0) name (Greeter.constructor) +2 >Emitted(22, 6) Source(19, 6) + SourceIndex(0) name (Greeter.constructor) --- >>> Greeter.prototype.greet = function () { 1->^^^^ @@ -144,9 +145,9 @@ sourceFile:sourceMapValidationDecorators.ts > 2 > greet 3 > -1->Emitted(22, 5) Source(23, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(22, 28) Source(23, 10) + SourceIndex(0) name (Greeter) -3 >Emitted(22, 31) Source(21, 5) + SourceIndex(0) name (Greeter) +1->Emitted(23, 5) Source(23, 5) + SourceIndex(0) name (Greeter) +2 >Emitted(23, 28) Source(23, 10) + SourceIndex(0) name (Greeter) +3 >Emitted(23, 31) Source(21, 5) + SourceIndex(0) name (Greeter) --- >>> return "

" + this.greeting + "

"; 1->^^^^^^^^ @@ -174,17 +175,17 @@ sourceFile:sourceMapValidationDecorators.ts 9 > + 10> "" 11> ; -1->Emitted(23, 9) Source(24, 9) + SourceIndex(0) name (Greeter.greet) -2 >Emitted(23, 15) Source(24, 15) + SourceIndex(0) name (Greeter.greet) -3 >Emitted(23, 16) Source(24, 16) + SourceIndex(0) name (Greeter.greet) -4 >Emitted(23, 22) Source(24, 22) + SourceIndex(0) name (Greeter.greet) -5 >Emitted(23, 25) Source(24, 25) + SourceIndex(0) name (Greeter.greet) -6 >Emitted(23, 29) Source(24, 29) + SourceIndex(0) name (Greeter.greet) -7 >Emitted(23, 30) Source(24, 30) + SourceIndex(0) name (Greeter.greet) -8 >Emitted(23, 38) Source(24, 38) + SourceIndex(0) name (Greeter.greet) -9 >Emitted(23, 41) Source(24, 41) + SourceIndex(0) name (Greeter.greet) -10>Emitted(23, 48) Source(24, 48) + SourceIndex(0) name (Greeter.greet) -11>Emitted(23, 49) Source(24, 49) + SourceIndex(0) name (Greeter.greet) +1->Emitted(24, 9) Source(24, 9) + SourceIndex(0) name (Greeter.greet) +2 >Emitted(24, 15) Source(24, 15) + SourceIndex(0) name (Greeter.greet) +3 >Emitted(24, 16) Source(24, 16) + SourceIndex(0) name (Greeter.greet) +4 >Emitted(24, 22) Source(24, 22) + SourceIndex(0) name (Greeter.greet) +5 >Emitted(24, 25) Source(24, 25) + SourceIndex(0) name (Greeter.greet) +6 >Emitted(24, 29) Source(24, 29) + SourceIndex(0) name (Greeter.greet) +7 >Emitted(24, 30) Source(24, 30) + SourceIndex(0) name (Greeter.greet) +8 >Emitted(24, 38) Source(24, 38) + SourceIndex(0) name (Greeter.greet) +9 >Emitted(24, 41) Source(24, 41) + SourceIndex(0) name (Greeter.greet) +10>Emitted(24, 48) Source(24, 48) + SourceIndex(0) name (Greeter.greet) +11>Emitted(24, 49) Source(24, 49) + SourceIndex(0) name (Greeter.greet) --- >>> }; 1 >^^^^ @@ -193,8 +194,8 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > 2 > } -1 >Emitted(24, 5) Source(25, 5) + SourceIndex(0) name (Greeter.greet) -2 >Emitted(24, 6) Source(25, 6) + SourceIndex(0) name (Greeter.greet) +1 >Emitted(25, 5) Source(25, 5) + SourceIndex(0) name (Greeter.greet) +2 >Emitted(25, 6) Source(25, 6) + SourceIndex(0) name (Greeter.greet) --- >>> Greeter.prototype.fn = function (x) { 1->^^^^ @@ -220,11 +221,11 @@ sourceFile:sourceMapValidationDecorators.ts > @ParameterDecorator2(70) > 5 > x: number -1->Emitted(25, 5) Source(35, 13) + SourceIndex(0) name (Greeter) -2 >Emitted(25, 25) Source(35, 15) + SourceIndex(0) name (Greeter) -3 >Emitted(25, 28) Source(35, 5) + SourceIndex(0) name (Greeter) -4 >Emitted(25, 38) Source(38, 7) + SourceIndex(0) name (Greeter) -5 >Emitted(25, 39) Source(38, 16) + SourceIndex(0) name (Greeter) +1->Emitted(26, 5) Source(35, 13) + SourceIndex(0) name (Greeter) +2 >Emitted(26, 25) Source(35, 15) + SourceIndex(0) name (Greeter) +3 >Emitted(26, 28) Source(35, 5) + SourceIndex(0) name (Greeter) +4 >Emitted(26, 38) Source(38, 7) + SourceIndex(0) name (Greeter) +5 >Emitted(26, 39) Source(38, 16) + SourceIndex(0) name (Greeter) --- >>> return this.greeting; 1 >^^^^^^^^ @@ -242,13 +243,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > . 6 > greeting 7 > ; -1 >Emitted(26, 9) Source(39, 9) + SourceIndex(0) name (Greeter.fn) -2 >Emitted(26, 15) Source(39, 15) + SourceIndex(0) name (Greeter.fn) -3 >Emitted(26, 16) Source(39, 16) + SourceIndex(0) name (Greeter.fn) -4 >Emitted(26, 20) Source(39, 20) + SourceIndex(0) name (Greeter.fn) -5 >Emitted(26, 21) Source(39, 21) + SourceIndex(0) name (Greeter.fn) -6 >Emitted(26, 29) Source(39, 29) + SourceIndex(0) name (Greeter.fn) -7 >Emitted(26, 30) Source(39, 30) + SourceIndex(0) name (Greeter.fn) +1 >Emitted(27, 9) Source(39, 9) + SourceIndex(0) name (Greeter.fn) +2 >Emitted(27, 15) Source(39, 15) + SourceIndex(0) name (Greeter.fn) +3 >Emitted(27, 16) Source(39, 16) + SourceIndex(0) name (Greeter.fn) +4 >Emitted(27, 20) Source(39, 20) + SourceIndex(0) name (Greeter.fn) +5 >Emitted(27, 21) Source(39, 21) + SourceIndex(0) name (Greeter.fn) +6 >Emitted(27, 29) Source(39, 29) + SourceIndex(0) name (Greeter.fn) +7 >Emitted(27, 30) Source(39, 30) + SourceIndex(0) name (Greeter.fn) --- >>> }; 1 >^^^^ @@ -257,8 +258,8 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > 2 > } -1 >Emitted(27, 5) Source(40, 5) + SourceIndex(0) name (Greeter.fn) -2 >Emitted(27, 6) Source(40, 6) + SourceIndex(0) name (Greeter.fn) +1 >Emitted(28, 5) Source(40, 5) + SourceIndex(0) name (Greeter.fn) +2 >Emitted(28, 6) Source(40, 6) + SourceIndex(0) name (Greeter.fn) --- >>> Object.defineProperty(Greeter.prototype, "greetings", { 1->^^^^ @@ -271,15 +272,15 @@ sourceFile:sourceMapValidationDecorators.ts > @PropertyDecorator2(80) > get 3 > greetings -1->Emitted(28, 5) Source(42, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(28, 27) Source(44, 9) + SourceIndex(0) name (Greeter) -3 >Emitted(28, 57) Source(44, 18) + SourceIndex(0) name (Greeter) +1->Emitted(29, 5) Source(42, 5) + SourceIndex(0) name (Greeter) +2 >Emitted(29, 27) Source(44, 9) + SourceIndex(0) name (Greeter) +3 >Emitted(29, 57) Source(44, 18) + SourceIndex(0) name (Greeter) --- >>> get: function () { 1 >^^^^^^^^^^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^-> 1 > -1 >Emitted(29, 14) Source(42, 5) + SourceIndex(0) name (Greeter) +1 >Emitted(30, 14) Source(42, 5) + SourceIndex(0) name (Greeter) --- >>> return this.greeting; 1->^^^^^^^^^^^^ @@ -299,13 +300,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > . 6 > greeting 7 > ; -1->Emitted(30, 13) Source(45, 9) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(30, 19) Source(45, 15) + SourceIndex(0) name (Greeter.greetings) -3 >Emitted(30, 20) Source(45, 16) + SourceIndex(0) name (Greeter.greetings) -4 >Emitted(30, 24) Source(45, 20) + SourceIndex(0) name (Greeter.greetings) -5 >Emitted(30, 25) Source(45, 21) + SourceIndex(0) name (Greeter.greetings) -6 >Emitted(30, 33) Source(45, 29) + SourceIndex(0) name (Greeter.greetings) -7 >Emitted(30, 34) Source(45, 30) + SourceIndex(0) name (Greeter.greetings) +1->Emitted(31, 13) Source(45, 9) + SourceIndex(0) name (Greeter.greetings) +2 >Emitted(31, 19) Source(45, 15) + SourceIndex(0) name (Greeter.greetings) +3 >Emitted(31, 20) Source(45, 16) + SourceIndex(0) name (Greeter.greetings) +4 >Emitted(31, 24) Source(45, 20) + SourceIndex(0) name (Greeter.greetings) +5 >Emitted(31, 25) Source(45, 21) + SourceIndex(0) name (Greeter.greetings) +6 >Emitted(31, 33) Source(45, 29) + SourceIndex(0) name (Greeter.greetings) +7 >Emitted(31, 34) Source(45, 30) + SourceIndex(0) name (Greeter.greetings) --- >>> }, 1 >^^^^^^^^ @@ -314,8 +315,8 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > 2 > } -1 >Emitted(31, 9) Source(46, 5) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(31, 10) Source(46, 6) + SourceIndex(0) name (Greeter.greetings) +1 >Emitted(32, 9) Source(46, 5) + SourceIndex(0) name (Greeter.greetings) +2 >Emitted(32, 10) Source(46, 6) + SourceIndex(0) name (Greeter.greetings) --- >>> set: function (greetings) { 1->^^^^^^^^^^^^^ @@ -330,9 +331,9 @@ sourceFile:sourceMapValidationDecorators.ts > @ParameterDecorator2(90) > 3 > greetings: string -1->Emitted(32, 14) Source(48, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(32, 24) Source(51, 7) + SourceIndex(0) name (Greeter) -3 >Emitted(32, 33) Source(51, 24) + SourceIndex(0) name (Greeter) +1->Emitted(33, 14) Source(48, 5) + SourceIndex(0) name (Greeter) +2 >Emitted(33, 24) Source(51, 7) + SourceIndex(0) name (Greeter) +3 >Emitted(33, 33) Source(51, 24) + SourceIndex(0) name (Greeter) --- >>> this.greeting = greetings; 1->^^^^^^^^^^^^ @@ -350,13 +351,13 @@ sourceFile:sourceMapValidationDecorators.ts 5 > = 6 > greetings 7 > ; -1->Emitted(33, 13) Source(52, 9) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(33, 17) Source(52, 13) + SourceIndex(0) name (Greeter.greetings) -3 >Emitted(33, 18) Source(52, 14) + SourceIndex(0) name (Greeter.greetings) -4 >Emitted(33, 26) Source(52, 22) + SourceIndex(0) name (Greeter.greetings) -5 >Emitted(33, 29) Source(52, 25) + SourceIndex(0) name (Greeter.greetings) -6 >Emitted(33, 38) Source(52, 34) + SourceIndex(0) name (Greeter.greetings) -7 >Emitted(33, 39) Source(52, 35) + SourceIndex(0) name (Greeter.greetings) +1->Emitted(34, 13) Source(52, 9) + SourceIndex(0) name (Greeter.greetings) +2 >Emitted(34, 17) Source(52, 13) + SourceIndex(0) name (Greeter.greetings) +3 >Emitted(34, 18) Source(52, 14) + SourceIndex(0) name (Greeter.greetings) +4 >Emitted(34, 26) Source(52, 22) + SourceIndex(0) name (Greeter.greetings) +5 >Emitted(34, 29) Source(52, 25) + SourceIndex(0) name (Greeter.greetings) +6 >Emitted(34, 38) Source(52, 34) + SourceIndex(0) name (Greeter.greetings) +7 >Emitted(34, 39) Source(52, 35) + SourceIndex(0) name (Greeter.greetings) --- >>> }, 1 >^^^^^^^^ @@ -365,8 +366,8 @@ sourceFile:sourceMapValidationDecorators.ts 1 > > 2 > } -1 >Emitted(34, 9) Source(53, 5) + SourceIndex(0) name (Greeter.greetings) -2 >Emitted(34, 10) Source(53, 6) + SourceIndex(0) name (Greeter.greetings) +1 >Emitted(35, 9) Source(53, 5) + SourceIndex(0) name (Greeter.greetings) +2 >Emitted(35, 10) Source(53, 6) + SourceIndex(0) name (Greeter.greetings) --- >>> enumerable: true, >>> configurable: true @@ -374,7 +375,7 @@ sourceFile:sourceMapValidationDecorators.ts 1->^^^^^^^ 2 > ^^^^^^^^^^^^^^-> 1-> -1->Emitted(37, 8) Source(46, 6) + SourceIndex(0) name (Greeter) +1->Emitted(38, 8) Source(46, 6) + SourceIndex(0) name (Greeter) --- >>> Greeter.x1 = 10; 1->^^^^ @@ -382,19 +383,19 @@ sourceFile:sourceMapValidationDecorators.ts 3 > ^^^ 4 > ^^ 5 > ^ -6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +6 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1-> 2 > x1 3 > : number = 4 > 10 5 > ; -1->Emitted(38, 5) Source(33, 20) + SourceIndex(0) name (Greeter) -2 >Emitted(38, 15) Source(33, 22) + SourceIndex(0) name (Greeter) -3 >Emitted(38, 18) Source(33, 33) + SourceIndex(0) name (Greeter) -4 >Emitted(38, 20) Source(33, 35) + SourceIndex(0) name (Greeter) -5 >Emitted(38, 21) Source(33, 36) + SourceIndex(0) name (Greeter) +1->Emitted(39, 5) Source(33, 20) + SourceIndex(0) name (Greeter) +2 >Emitted(39, 15) Source(33, 22) + SourceIndex(0) name (Greeter) +3 >Emitted(39, 18) Source(33, 33) + SourceIndex(0) name (Greeter) +4 >Emitted(39, 20) Source(33, 35) + SourceIndex(0) name (Greeter) +5 >Emitted(39, 21) Source(33, 36) + SourceIndex(0) name (Greeter) --- ->>> Object.defineProperty(Greeter.prototype, "greet", __decorate([PropertyDecorator1, PropertyDecorator2(40)], Greeter.prototype, "greet", Object.getOwnPropertyDescriptor(Greeter.prototype, "greet"))); +>>> Object.defineProperty(Greeter.prototype, "greet", __decorate([PropertyDecorator1, PropertyDecorator2(40), __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], Greeter.prototype, "greet", Object.getOwnPropertyDescriptor(Greeter.prototype, "greet"))); 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -405,11 +406,11 @@ sourceFile:sourceMapValidationDecorators.ts 8 > ^ 9 > ^^ 10> ^ -11> ^^^ -12> ^^^^^^^^^^^^^^^^^^^^^^^^^^ -13> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -14> ^^^^^^^^^^^^^^^^^^^^^^^^^^ -15> ^^^^ +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +12> ^^^^^^^^^^^^^^^^^^^^^^^^^^ +13> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +14> ^^^^^^^^^^^^^^^^^^^^^^^^^^ +15> ^^^^ 1-> 2 > @PropertyDecorator1 > @PropertyDecorator2(40) @@ -425,29 +426,29 @@ sourceFile:sourceMapValidationDecorators.ts 10> ) 11> > -12> greet -13> -14> greet -15> () { - > return "

" + this.greeting + "

"; - > } -1->Emitted(39, 5) Source(21, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(39, 27) Source(23, 5) + SourceIndex(0) name (Greeter) -3 >Emitted(39, 53) Source(23, 10) + SourceIndex(0) name (Greeter) -4 >Emitted(39, 67) Source(21, 6) + SourceIndex(0) name (Greeter) -5 >Emitted(39, 85) Source(21, 24) + SourceIndex(0) name (Greeter) -6 >Emitted(39, 87) Source(22, 6) + SourceIndex(0) name (Greeter) -7 >Emitted(39, 105) Source(22, 24) + SourceIndex(0) name (Greeter) -8 >Emitted(39, 106) Source(22, 25) + SourceIndex(0) name (Greeter) -9 >Emitted(39, 108) Source(22, 27) + SourceIndex(0) name (Greeter) -10>Emitted(39, 109) Source(22, 28) + SourceIndex(0) name (Greeter) -11>Emitted(39, 112) Source(23, 5) + SourceIndex(0) name (Greeter) -12>Emitted(39, 138) Source(23, 10) + SourceIndex(0) name (Greeter) -13>Emitted(39, 172) Source(23, 5) + SourceIndex(0) name (Greeter) -14>Emitted(39, 198) Source(23, 10) + SourceIndex(0) name (Greeter) -15>Emitted(39, 202) Source(25, 6) + SourceIndex(0) name (Greeter) +12> greet +13> +14> greet +15> () { + > return "

" + this.greeting + "

"; + > } +1->Emitted(40, 5) Source(21, 5) + SourceIndex(0) name (Greeter) +2 >Emitted(40, 27) Source(23, 5) + SourceIndex(0) name (Greeter) +3 >Emitted(40, 53) Source(23, 10) + SourceIndex(0) name (Greeter) +4 >Emitted(40, 67) Source(21, 6) + SourceIndex(0) name (Greeter) +5 >Emitted(40, 85) Source(21, 24) + SourceIndex(0) name (Greeter) +6 >Emitted(40, 87) Source(22, 6) + SourceIndex(0) name (Greeter) +7 >Emitted(40, 105) Source(22, 24) + SourceIndex(0) name (Greeter) +8 >Emitted(40, 106) Source(22, 25) + SourceIndex(0) name (Greeter) +9 >Emitted(40, 108) Source(22, 27) + SourceIndex(0) name (Greeter) +10>Emitted(40, 109) Source(22, 28) + SourceIndex(0) name (Greeter) +11>Emitted(40, 227) Source(23, 5) + SourceIndex(0) name (Greeter) +12>Emitted(40, 253) Source(23, 10) + SourceIndex(0) name (Greeter) +13>Emitted(40, 287) Source(23, 5) + SourceIndex(0) name (Greeter) +14>Emitted(40, 313) Source(23, 10) + SourceIndex(0) name (Greeter) +15>Emitted(40, 317) Source(25, 6) + SourceIndex(0) name (Greeter) --- ->>> __decorate([PropertyDecorator1, PropertyDecorator2(50)], Greeter.prototype, "x"); +>>> __decorate([PropertyDecorator1, PropertyDecorator2(50), __metadata('design:type', String)], Greeter.prototype, "x"); 1 >^^^^ 2 > ^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^ @@ -456,10 +457,10 @@ sourceFile:sourceMapValidationDecorators.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^ -10> ^^^^^^^^^^^^^^^^^^^^^^ -11> ^^ -12> ^^^^^^^-> +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +10> ^^^^^^^^^^^^^^^^^^^^^^ +11> ^^ +12> ^^^^^^^-> 1 > > > @@ -473,21 +474,21 @@ sourceFile:sourceMapValidationDecorators.ts 8 > ) 9 > > private -10> x -11> : string; -1 >Emitted(40, 5) Source(27, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(40, 17) Source(27, 6) + SourceIndex(0) name (Greeter) -3 >Emitted(40, 35) Source(27, 24) + SourceIndex(0) name (Greeter) -4 >Emitted(40, 37) Source(28, 6) + SourceIndex(0) name (Greeter) -5 >Emitted(40, 55) Source(28, 24) + SourceIndex(0) name (Greeter) -6 >Emitted(40, 56) Source(28, 25) + SourceIndex(0) name (Greeter) -7 >Emitted(40, 58) Source(28, 27) + SourceIndex(0) name (Greeter) -8 >Emitted(40, 59) Source(28, 28) + SourceIndex(0) name (Greeter) -9 >Emitted(40, 62) Source(29, 13) + SourceIndex(0) name (Greeter) -10>Emitted(40, 84) Source(29, 14) + SourceIndex(0) name (Greeter) -11>Emitted(40, 86) Source(29, 23) + SourceIndex(0) name (Greeter) +10> x +11> : string; +1 >Emitted(41, 5) Source(27, 5) + SourceIndex(0) name (Greeter) +2 >Emitted(41, 17) Source(27, 6) + SourceIndex(0) name (Greeter) +3 >Emitted(41, 35) Source(27, 24) + SourceIndex(0) name (Greeter) +4 >Emitted(41, 37) Source(28, 6) + SourceIndex(0) name (Greeter) +5 >Emitted(41, 55) Source(28, 24) + SourceIndex(0) name (Greeter) +6 >Emitted(41, 56) Source(28, 25) + SourceIndex(0) name (Greeter) +7 >Emitted(41, 58) Source(28, 27) + SourceIndex(0) name (Greeter) +8 >Emitted(41, 59) Source(28, 28) + SourceIndex(0) name (Greeter) +9 >Emitted(41, 97) Source(29, 13) + SourceIndex(0) name (Greeter) +10>Emitted(41, 119) Source(29, 14) + SourceIndex(0) name (Greeter) +11>Emitted(41, 121) Source(29, 23) + SourceIndex(0) name (Greeter) --- ->>> __decorate([ParameterDecorator1, ParameterDecorator2(70)], Greeter.prototype, "fn", 0); +>>> __decorate([ParameterDecorator1, ParameterDecorator2(70), __metadata('design:type', Number)], Greeter.prototype, "fn", 0); 1->^^^^ 2 > ^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^ @@ -496,10 +497,10 @@ sourceFile:sourceMapValidationDecorators.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^ -10> ^^^^^^^^^^^^^^^^^^^^^^^^^^ -11> ^^ -12> ^^^^^^^^-> +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +10> ^^^^^^^^^^^^^^^^^^^^^^^^^^ +11> ^^ +12> ^^^^^^^^-> 1-> > > @PropertyDecorator1 @@ -518,21 +519,21 @@ sourceFile:sourceMapValidationDecorators.ts 8 > ) 9 > > -10> x -11> : number -1->Emitted(41, 5) Source(36, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(41, 17) Source(36, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(41, 36) Source(36, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(41, 38) Source(37, 8) + SourceIndex(0) name (Greeter) -5 >Emitted(41, 57) Source(37, 27) + SourceIndex(0) name (Greeter) -6 >Emitted(41, 58) Source(37, 28) + SourceIndex(0) name (Greeter) -7 >Emitted(41, 60) Source(37, 30) + SourceIndex(0) name (Greeter) -8 >Emitted(41, 61) Source(37, 31) + SourceIndex(0) name (Greeter) -9 >Emitted(41, 64) Source(38, 7) + SourceIndex(0) name (Greeter) -10>Emitted(41, 90) Source(38, 8) + SourceIndex(0) name (Greeter) -11>Emitted(41, 92) Source(38, 16) + SourceIndex(0) name (Greeter) +10> x +11> : number +1->Emitted(42, 5) Source(36, 7) + SourceIndex(0) name (Greeter) +2 >Emitted(42, 17) Source(36, 8) + SourceIndex(0) name (Greeter) +3 >Emitted(42, 36) Source(36, 27) + SourceIndex(0) name (Greeter) +4 >Emitted(42, 38) Source(37, 8) + SourceIndex(0) name (Greeter) +5 >Emitted(42, 57) Source(37, 27) + SourceIndex(0) name (Greeter) +6 >Emitted(42, 58) Source(37, 28) + SourceIndex(0) name (Greeter) +7 >Emitted(42, 60) Source(37, 30) + SourceIndex(0) name (Greeter) +8 >Emitted(42, 61) Source(37, 31) + SourceIndex(0) name (Greeter) +9 >Emitted(42, 99) Source(38, 7) + SourceIndex(0) name (Greeter) +10>Emitted(42, 125) Source(38, 8) + SourceIndex(0) name (Greeter) +11>Emitted(42, 127) Source(38, 16) + SourceIndex(0) name (Greeter) --- ->>> __decorate([ParameterDecorator1, ParameterDecorator2(90)], Greeter.prototype, "greetings", 0); +>>> __decorate([ParameterDecorator1, ParameterDecorator2(90), __metadata('design:type', String)], Greeter.prototype, "greetings", 0); 1->^^^^ 2 > ^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^ @@ -541,10 +542,10 @@ sourceFile:sourceMapValidationDecorators.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^ -10> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -11> ^^ -12> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +10> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +11> ^^ +12> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1->) { > return this.greeting; > } @@ -567,21 +568,21 @@ sourceFile:sourceMapValidationDecorators.ts 8 > ) 9 > > -10> greetings -11> : string -1->Emitted(42, 5) Source(49, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(42, 17) Source(49, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(42, 36) Source(49, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(42, 38) Source(50, 8) + SourceIndex(0) name (Greeter) -5 >Emitted(42, 57) Source(50, 27) + SourceIndex(0) name (Greeter) -6 >Emitted(42, 58) Source(50, 28) + SourceIndex(0) name (Greeter) -7 >Emitted(42, 60) Source(50, 30) + SourceIndex(0) name (Greeter) -8 >Emitted(42, 61) Source(50, 31) + SourceIndex(0) name (Greeter) -9 >Emitted(42, 64) Source(51, 7) + SourceIndex(0) name (Greeter) -10>Emitted(42, 97) Source(51, 16) + SourceIndex(0) name (Greeter) -11>Emitted(42, 99) Source(51, 24) + SourceIndex(0) name (Greeter) +10> greetings +11> : string +1->Emitted(43, 5) Source(49, 7) + SourceIndex(0) name (Greeter) +2 >Emitted(43, 17) Source(49, 8) + SourceIndex(0) name (Greeter) +3 >Emitted(43, 36) Source(49, 27) + SourceIndex(0) name (Greeter) +4 >Emitted(43, 38) Source(50, 8) + SourceIndex(0) name (Greeter) +5 >Emitted(43, 57) Source(50, 27) + SourceIndex(0) name (Greeter) +6 >Emitted(43, 58) Source(50, 28) + SourceIndex(0) name (Greeter) +7 >Emitted(43, 60) Source(50, 30) + SourceIndex(0) name (Greeter) +8 >Emitted(43, 61) Source(50, 31) + SourceIndex(0) name (Greeter) +9 >Emitted(43, 99) Source(51, 7) + SourceIndex(0) name (Greeter) +10>Emitted(43, 132) Source(51, 16) + SourceIndex(0) name (Greeter) +11>Emitted(43, 134) Source(51, 24) + SourceIndex(0) name (Greeter) --- ->>> Object.defineProperty(Greeter.prototype, "greetings", __decorate([PropertyDecorator1, PropertyDecorator2(80)], Greeter.prototype, "greetings", Object.getOwnPropertyDescriptor(Greeter.prototype, "greetings"))); +>>> Object.defineProperty(Greeter.prototype, "greetings", __decorate([PropertyDecorator1, PropertyDecorator2(80), __metadata('design:type', Object)], Greeter.prototype, "greetings", Object.getOwnPropertyDescriptor(Greeter.prototype, "greetings"))); 1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -592,11 +593,11 @@ sourceFile:sourceMapValidationDecorators.ts 8 > ^ 9 > ^^ 10> ^ -11> ^^^ -12> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -13> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -14> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -15> ^^^^ +11> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +12> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +13> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +14> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +15> ^^^^ 1-> 2 > @PropertyDecorator1 > @PropertyDecorator2(80) @@ -612,29 +613,29 @@ sourceFile:sourceMapValidationDecorators.ts 10> ) 11> > get -12> greetings -13> -14> greetings -15> () { - > return this.greeting; - > } -1->Emitted(43, 5) Source(42, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(43, 27) Source(44, 9) + SourceIndex(0) name (Greeter) -3 >Emitted(43, 57) Source(44, 18) + SourceIndex(0) name (Greeter) -4 >Emitted(43, 71) Source(42, 6) + SourceIndex(0) name (Greeter) -5 >Emitted(43, 89) Source(42, 24) + SourceIndex(0) name (Greeter) -6 >Emitted(43, 91) Source(43, 6) + SourceIndex(0) name (Greeter) -7 >Emitted(43, 109) Source(43, 24) + SourceIndex(0) name (Greeter) -8 >Emitted(43, 110) Source(43, 25) + SourceIndex(0) name (Greeter) -9 >Emitted(43, 112) Source(43, 27) + SourceIndex(0) name (Greeter) -10>Emitted(43, 113) Source(43, 28) + SourceIndex(0) name (Greeter) -11>Emitted(43, 116) Source(44, 9) + SourceIndex(0) name (Greeter) -12>Emitted(43, 146) Source(44, 18) + SourceIndex(0) name (Greeter) -13>Emitted(43, 180) Source(44, 9) + SourceIndex(0) name (Greeter) -14>Emitted(43, 210) Source(44, 18) + SourceIndex(0) name (Greeter) -15>Emitted(43, 214) Source(46, 6) + SourceIndex(0) name (Greeter) +12> greetings +13> +14> greetings +15> () { + > return this.greeting; + > } +1->Emitted(44, 5) Source(42, 5) + SourceIndex(0) name (Greeter) +2 >Emitted(44, 27) Source(44, 9) + SourceIndex(0) name (Greeter) +3 >Emitted(44, 57) Source(44, 18) + SourceIndex(0) name (Greeter) +4 >Emitted(44, 71) Source(42, 6) + SourceIndex(0) name (Greeter) +5 >Emitted(44, 89) Source(42, 24) + SourceIndex(0) name (Greeter) +6 >Emitted(44, 91) Source(43, 6) + SourceIndex(0) name (Greeter) +7 >Emitted(44, 109) Source(43, 24) + SourceIndex(0) name (Greeter) +8 >Emitted(44, 110) Source(43, 25) + SourceIndex(0) name (Greeter) +9 >Emitted(44, 112) Source(43, 27) + SourceIndex(0) name (Greeter) +10>Emitted(44, 113) Source(43, 28) + SourceIndex(0) name (Greeter) +11>Emitted(44, 151) Source(44, 9) + SourceIndex(0) name (Greeter) +12>Emitted(44, 181) Source(44, 18) + SourceIndex(0) name (Greeter) +13>Emitted(44, 215) Source(44, 9) + SourceIndex(0) name (Greeter) +14>Emitted(44, 245) Source(44, 18) + SourceIndex(0) name (Greeter) +15>Emitted(44, 249) Source(46, 6) + SourceIndex(0) name (Greeter) --- ->>> __decorate([PropertyDecorator1, PropertyDecorator2(60)], Greeter, "x1"); +>>> __decorate([PropertyDecorator1, PropertyDecorator2(60), __metadata('design:type', Number)], Greeter, "x1"); 1 >^^^^ 2 > ^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^ @@ -643,10 +644,10 @@ sourceFile:sourceMapValidationDecorators.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^ -10> ^^^^^^^^^^^^^ -11> ^^ -12> ^^^^^^^^-> +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +10> ^^^^^^^^^^^^^ +11> ^^ +12> ^^^^^^^^-> 1 > 2 > @ 3 > PropertyDecorator1 @@ -658,21 +659,21 @@ sourceFile:sourceMapValidationDecorators.ts 8 > ) 9 > > private static -10> x1 -11> : number = 10; -1 >Emitted(44, 5) Source(31, 5) + SourceIndex(0) name (Greeter) -2 >Emitted(44, 17) Source(31, 6) + SourceIndex(0) name (Greeter) -3 >Emitted(44, 35) Source(31, 24) + SourceIndex(0) name (Greeter) -4 >Emitted(44, 37) Source(32, 6) + SourceIndex(0) name (Greeter) -5 >Emitted(44, 55) Source(32, 24) + SourceIndex(0) name (Greeter) -6 >Emitted(44, 56) Source(32, 25) + SourceIndex(0) name (Greeter) -7 >Emitted(44, 58) Source(32, 27) + SourceIndex(0) name (Greeter) -8 >Emitted(44, 59) Source(32, 28) + SourceIndex(0) name (Greeter) -9 >Emitted(44, 62) Source(33, 20) + SourceIndex(0) name (Greeter) -10>Emitted(44, 75) Source(33, 22) + SourceIndex(0) name (Greeter) -11>Emitted(44, 77) Source(33, 36) + SourceIndex(0) name (Greeter) +10> x1 +11> : number = 10; +1 >Emitted(45, 5) Source(31, 5) + SourceIndex(0) name (Greeter) +2 >Emitted(45, 17) Source(31, 6) + SourceIndex(0) name (Greeter) +3 >Emitted(45, 35) Source(31, 24) + SourceIndex(0) name (Greeter) +4 >Emitted(45, 37) Source(32, 6) + SourceIndex(0) name (Greeter) +5 >Emitted(45, 55) Source(32, 24) + SourceIndex(0) name (Greeter) +6 >Emitted(45, 56) Source(32, 25) + SourceIndex(0) name (Greeter) +7 >Emitted(45, 58) Source(32, 27) + SourceIndex(0) name (Greeter) +8 >Emitted(45, 59) Source(32, 28) + SourceIndex(0) name (Greeter) +9 >Emitted(45, 97) Source(33, 20) + SourceIndex(0) name (Greeter) +10>Emitted(45, 110) Source(33, 22) + SourceIndex(0) name (Greeter) +11>Emitted(45, 112) Source(33, 36) + SourceIndex(0) name (Greeter) --- ->>> __decorate([ParameterDecorator1, ParameterDecorator2(20)], Greeter, void 0, 0); +>>> __decorate([ParameterDecorator1, ParameterDecorator2(20), __metadata('design:type', String)], Greeter, void 0, 0); 1->^^^^ 2 > ^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^ @@ -681,10 +682,9 @@ sourceFile:sourceMapValidationDecorators.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^ -10> ^^^^^^^^^^^^^^^^^^ -11> ^^ -12> ^-> +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +10> ^^^^^^^^^^^^^^^^^^ +11> ^^ 1-> 2 > @ 3 > ParameterDecorator1 @@ -696,22 +696,22 @@ sourceFile:sourceMapValidationDecorators.ts 8 > ) 9 > > public -10> greeting -11> : string -1->Emitted(45, 5) Source(12, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(45, 17) Source(12, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(45, 36) Source(12, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(45, 38) Source(13, 8) + SourceIndex(0) name (Greeter) -5 >Emitted(45, 57) Source(13, 27) + SourceIndex(0) name (Greeter) -6 >Emitted(45, 58) Source(13, 28) + SourceIndex(0) name (Greeter) -7 >Emitted(45, 60) Source(13, 30) + SourceIndex(0) name (Greeter) -8 >Emitted(45, 61) Source(13, 31) + SourceIndex(0) name (Greeter) -9 >Emitted(45, 64) Source(14, 14) + SourceIndex(0) name (Greeter) -10>Emitted(45, 82) Source(14, 22) + SourceIndex(0) name (Greeter) -11>Emitted(45, 84) Source(14, 30) + SourceIndex(0) name (Greeter) +10> greeting +11> : string +1->Emitted(46, 5) Source(12, 7) + SourceIndex(0) name (Greeter) +2 >Emitted(46, 17) Source(12, 8) + SourceIndex(0) name (Greeter) +3 >Emitted(46, 36) Source(12, 27) + SourceIndex(0) name (Greeter) +4 >Emitted(46, 38) Source(13, 8) + SourceIndex(0) name (Greeter) +5 >Emitted(46, 57) Source(13, 27) + SourceIndex(0) name (Greeter) +6 >Emitted(46, 58) Source(13, 28) + SourceIndex(0) name (Greeter) +7 >Emitted(46, 60) Source(13, 30) + SourceIndex(0) name (Greeter) +8 >Emitted(46, 61) Source(13, 31) + SourceIndex(0) name (Greeter) +9 >Emitted(46, 99) Source(14, 14) + SourceIndex(0) name (Greeter) +10>Emitted(46, 117) Source(14, 22) + SourceIndex(0) name (Greeter) +11>Emitted(46, 119) Source(14, 30) + SourceIndex(0) name (Greeter) --- ->>> __decorate([ParameterDecorator1, ParameterDecorator2(30)], Greeter, void 0, 1); -1->^^^^ +>>> __decorate([ParameterDecorator1, ParameterDecorator2(30), __metadata('design:type', Array)], Greeter, void 0, 1); +1 >^^^^ 2 > ^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^^^^^ 4 > ^^ @@ -719,10 +719,11 @@ sourceFile:sourceMapValidationDecorators.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^ -10> ^^^^^^^^^^^^^^^^^^ -11> ^^ -1->, +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +10> ^^^^^^^^^^^^^^^^^^ +11> ^^ +12> ^^^^^^^^^-> +1 >, > > 2 > @ @@ -735,22 +736,22 @@ sourceFile:sourceMapValidationDecorators.ts 8 > ) 9 > > ... -10> b -11> : string[] -1->Emitted(46, 5) Source(16, 7) + SourceIndex(0) name (Greeter) -2 >Emitted(46, 17) Source(16, 8) + SourceIndex(0) name (Greeter) -3 >Emitted(46, 36) Source(16, 27) + SourceIndex(0) name (Greeter) -4 >Emitted(46, 38) Source(17, 8) + SourceIndex(0) name (Greeter) -5 >Emitted(46, 57) Source(17, 27) + SourceIndex(0) name (Greeter) -6 >Emitted(46, 58) Source(17, 28) + SourceIndex(0) name (Greeter) -7 >Emitted(46, 60) Source(17, 30) + SourceIndex(0) name (Greeter) -8 >Emitted(46, 61) Source(17, 31) + SourceIndex(0) name (Greeter) -9 >Emitted(46, 64) Source(18, 10) + SourceIndex(0) name (Greeter) -10>Emitted(46, 82) Source(18, 11) + SourceIndex(0) name (Greeter) -11>Emitted(46, 84) Source(18, 21) + SourceIndex(0) name (Greeter) +10> b +11> : string[] +1 >Emitted(47, 5) Source(16, 7) + SourceIndex(0) name (Greeter) +2 >Emitted(47, 17) Source(16, 8) + SourceIndex(0) name (Greeter) +3 >Emitted(47, 36) Source(16, 27) + SourceIndex(0) name (Greeter) +4 >Emitted(47, 38) Source(17, 8) + SourceIndex(0) name (Greeter) +5 >Emitted(47, 57) Source(17, 27) + SourceIndex(0) name (Greeter) +6 >Emitted(47, 58) Source(17, 28) + SourceIndex(0) name (Greeter) +7 >Emitted(47, 60) Source(17, 30) + SourceIndex(0) name (Greeter) +8 >Emitted(47, 61) Source(17, 31) + SourceIndex(0) name (Greeter) +9 >Emitted(47, 98) Source(18, 10) + SourceIndex(0) name (Greeter) +10>Emitted(47, 116) Source(18, 11) + SourceIndex(0) name (Greeter) +11>Emitted(47, 118) Source(18, 21) + SourceIndex(0) name (Greeter) --- ->>> Greeter = __decorate([ClassDecorator1, ClassDecorator2(10)], Greeter); -1 >^^^^ +>>> Greeter = __decorate([ClassDecorator1, ClassDecorator2(10), __metadata('design:paramtypes', [String, String])], Greeter); +1->^^^^ 2 > ^^^^^^^^^^^^^^^^^^^^^^ 3 > ^^^^^^^^^^^^^^^ 4 > ^^ @@ -758,8 +759,8 @@ sourceFile:sourceMapValidationDecorators.ts 6 > ^ 7 > ^^ 8 > ^ -9 > ^^^^^^^^^^^^ -1 > +9 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1-> 2 > @ 3 > ClassDecorator1 4 > @@ -814,23 +815,23 @@ sourceFile:sourceMapValidationDecorators.ts > this.greeting = greetings; > } > } -1 >Emitted(47, 5) Source(8, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(47, 27) Source(8, 2) + SourceIndex(0) name (Greeter) -3 >Emitted(47, 42) Source(8, 17) + SourceIndex(0) name (Greeter) -4 >Emitted(47, 44) Source(9, 2) + SourceIndex(0) name (Greeter) -5 >Emitted(47, 59) Source(9, 17) + SourceIndex(0) name (Greeter) -6 >Emitted(47, 60) Source(9, 18) + SourceIndex(0) name (Greeter) -7 >Emitted(47, 62) Source(9, 20) + SourceIndex(0) name (Greeter) -8 >Emitted(47, 63) Source(9, 21) + SourceIndex(0) name (Greeter) -9 >Emitted(47, 75) Source(54, 2) + SourceIndex(0) name (Greeter) +1->Emitted(48, 5) Source(8, 1) + SourceIndex(0) name (Greeter) +2 >Emitted(48, 27) Source(8, 2) + SourceIndex(0) name (Greeter) +3 >Emitted(48, 42) Source(8, 17) + SourceIndex(0) name (Greeter) +4 >Emitted(48, 44) Source(9, 2) + SourceIndex(0) name (Greeter) +5 >Emitted(48, 59) Source(9, 17) + SourceIndex(0) name (Greeter) +6 >Emitted(48, 60) Source(9, 18) + SourceIndex(0) name (Greeter) +7 >Emitted(48, 62) Source(9, 20) + SourceIndex(0) name (Greeter) +8 >Emitted(48, 63) Source(9, 21) + SourceIndex(0) name (Greeter) +9 >Emitted(48, 126) Source(54, 2) + SourceIndex(0) name (Greeter) --- >>> return Greeter; 1 >^^^^ 2 > ^^^^^^^^^^^^^^ 1 > 2 > } -1 >Emitted(48, 5) Source(54, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(48, 19) Source(54, 2) + SourceIndex(0) name (Greeter) +1 >Emitted(49, 5) Source(54, 1) + SourceIndex(0) name (Greeter) +2 >Emitted(49, 19) Source(54, 2) + SourceIndex(0) name (Greeter) --- >>>})(); 1 > @@ -888,9 +889,9 @@ sourceFile:sourceMapValidationDecorators.ts > this.greeting = greetings; > } > } -1 >Emitted(49, 1) Source(54, 1) + SourceIndex(0) name (Greeter) -2 >Emitted(49, 2) Source(54, 2) + SourceIndex(0) name (Greeter) -3 >Emitted(49, 2) Source(8, 1) + SourceIndex(0) -4 >Emitted(49, 6) Source(54, 2) + SourceIndex(0) +1 >Emitted(50, 1) Source(54, 1) + SourceIndex(0) name (Greeter) +2 >Emitted(50, 2) Source(54, 2) + SourceIndex(0) name (Greeter) +3 >Emitted(50, 2) Source(8, 1) + SourceIndex(0) +4 >Emitted(50, 6) Source(54, 2) + SourceIndex(0) --- >>>//# sourceMappingURL=sourceMapValidationDecorators.js.map \ No newline at end of file