From a53f9e8ec34008ad488bc93deef4c266a48331f4 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 30 Mar 2018 16:07:09 -0700 Subject: [PATCH] Call ensureModifiers on private property modifiers (#23026) --- src/compiler/transformers/declarations.ts | 2 +- .../reference/declarationEmitPrivateAsync.js | 64 +++++++++++++++++++ .../declarationEmitPrivateAsync.symbols | 10 +++ .../declarationEmitPrivateAsync.types | 10 +++ .../compiler/declarationEmitPrivateAsync.ts | 7 ++ 5 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/declarationEmitPrivateAsync.js create mode 100644 tests/baselines/reference/declarationEmitPrivateAsync.symbols create mode 100644 tests/baselines/reference/declarationEmitPrivateAsync.types create mode 100644 tests/cases/compiler/declarationEmitPrivateAsync.ts diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts index 8ce0e32a3ba..42c97301020 100644 --- a/src/compiler/transformers/declarations.ts +++ b/src/compiler/transformers/declarations.ts @@ -614,7 +614,7 @@ namespace ts { if (isMethodDeclaration(input) || isMethodSignature(input)) { if (hasModifier(input, ModifierFlags.Private)) { if (input.symbol && input.symbol.declarations && input.symbol.declarations[0] !== input) return; // Elide all but the first overload - return cleanup(createProperty(/*decorators*/undefined, input.modifiers, input.name, /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined)); + return cleanup(createProperty(/*decorators*/undefined, ensureModifiers(input), input.name, /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined)); } } diff --git a/tests/baselines/reference/declarationEmitPrivateAsync.js b/tests/baselines/reference/declarationEmitPrivateAsync.js new file mode 100644 index 00000000000..dd1aac8fc37 --- /dev/null +++ b/tests/baselines/reference/declarationEmitPrivateAsync.js @@ -0,0 +1,64 @@ +//// [declarationEmitPrivateAsync.ts] +export class Foo { + private async baz() { + return; + } +} + +//// [declarationEmitPrivateAsync.js] +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [0, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +exports.__esModule = true; +var Foo = /** @class */ (function () { + function Foo() { + } + Foo.prototype.baz = function () { + return __awaiter(this, void 0, void 0, function () { + return __generator(this, function (_a) { + return [2 /*return*/]; + }); + }); + }; + return Foo; +}()); +exports.Foo = Foo; + + +//// [declarationEmitPrivateAsync.d.ts] +export declare class Foo { + private baz; +} diff --git a/tests/baselines/reference/declarationEmitPrivateAsync.symbols b/tests/baselines/reference/declarationEmitPrivateAsync.symbols new file mode 100644 index 00000000000..430ca15afaf --- /dev/null +++ b/tests/baselines/reference/declarationEmitPrivateAsync.symbols @@ -0,0 +1,10 @@ +=== tests/cases/compiler/declarationEmitPrivateAsync.ts === +export class Foo { +>Foo : Symbol(Foo, Decl(declarationEmitPrivateAsync.ts, 0, 0)) + + private async baz() { +>baz : Symbol(Foo.baz, Decl(declarationEmitPrivateAsync.ts, 0, 18)) + + return; + } +} diff --git a/tests/baselines/reference/declarationEmitPrivateAsync.types b/tests/baselines/reference/declarationEmitPrivateAsync.types new file mode 100644 index 00000000000..20e20d551b0 --- /dev/null +++ b/tests/baselines/reference/declarationEmitPrivateAsync.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/declarationEmitPrivateAsync.ts === +export class Foo { +>Foo : Foo + + private async baz() { +>baz : () => Promise + + return; + } +} diff --git a/tests/cases/compiler/declarationEmitPrivateAsync.ts b/tests/cases/compiler/declarationEmitPrivateAsync.ts new file mode 100644 index 00000000000..f4231279f41 --- /dev/null +++ b/tests/cases/compiler/declarationEmitPrivateAsync.ts @@ -0,0 +1,7 @@ +// @lib: es6 +// @declaration: true +export class Foo { + private async baz() { + return; + } +} \ No newline at end of file