diff --git a/src/compiler/factory/emitHelpers.ts b/src/compiler/factory/emitHelpers.ts index 1e820f2092697..797107c37c15b 100644 --- a/src/compiler/factory/emitHelpers.ts +++ b/src/compiler/factory/emitHelpers.ts @@ -783,7 +783,9 @@ namespace ts { text: ` var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js index c78122c9424d2..2f5bf67557311 100644 --- a/tests/baselines/reference/ambientShorthand_reExport.js +++ b/tests/baselines/reference/ambientShorthand_reExport.js @@ -20,7 +20,9 @@ x($); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -33,7 +35,9 @@ __createBinding(exports, jquery_1, "x"); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/constEnumPreserveEmitReexport.js b/tests/baselines/reference/constEnumPreserveEmitReexport.js index ac5e823d4198c..7e472e4a33df5 100644 --- a/tests/baselines/reference/constEnumPreserveEmitReexport.js +++ b/tests/baselines/reference/constEnumPreserveEmitReexport.js @@ -30,7 +30,9 @@ exports["default"] = ConstEnum_1.MyConstEnum; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/declarationEmitAliasExportStar.js b/tests/baselines/reference/declarationEmitAliasExportStar.js index 450e1b15fa03b..c721386aef3d9 100644 --- a/tests/baselines/reference/declarationEmitAliasExportStar.js +++ b/tests/baselines/reference/declarationEmitAliasExportStar.js @@ -16,7 +16,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.js b/tests/baselines/reference/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.js index add035f1054c5..da523a1ed3812 100644 --- a/tests/baselines/reference/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.js +++ b/tests/baselines/reference/declarationEmitExportAssignedNamespaceNoTripleSlashTypesReference.js @@ -59,7 +59,9 @@ exports.obj = { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference.js b/tests/baselines/reference/declarationEmitReexportedSymlinkReference.js index b658eff96a793..de6a0de62a40a 100644 --- a/tests/baselines/reference/declarationEmitReexportedSymlinkReference.js +++ b/tests/baselines/reference/declarationEmitReexportedSymlinkReference.js @@ -53,7 +53,9 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1'); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.js b/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.js index 01e6e13a56357..5d8950d13de03 100644 --- a/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.js +++ b/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.js @@ -56,7 +56,9 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1'); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.js b/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.js index e69ecceea663f..aae7b56fd6f37 100644 --- a/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.js +++ b/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.js @@ -53,7 +53,9 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1'); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/doubleUnderscoreExportStarConflict.js b/tests/baselines/reference/doubleUnderscoreExportStarConflict.js index eee48374d1edf..1810f4af42f0d 100644 --- a/tests/baselines/reference/doubleUnderscoreExportStarConflict.js +++ b/tests/baselines/reference/doubleUnderscoreExportStarConflict.js @@ -27,7 +27,9 @@ exports.__foo = __foo; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js index 12bc63037a1eb..66e3440083f90 100644 --- a/tests/baselines/reference/es6ExportAllInEs5.js +++ b/tests/baselines/reference/es6ExportAllInEs5.js @@ -34,7 +34,9 @@ exports.x = 10; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js index 7b0902786a11e..13f564dd8a8b8 100644 --- a/tests/baselines/reference/es6ExportEqualsInterop.js +++ b/tests/baselines/reference/es6ExportEqualsInterop.js @@ -211,7 +211,9 @@ export * from "class-module"; /// var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleInterop.js b/tests/baselines/reference/esModuleInterop.js index 26ae64863ba85..74d6d951653b3 100644 --- a/tests/baselines/reference/esModuleInterop.js +++ b/tests/baselines/reference/esModuleInterop.js @@ -22,7 +22,9 @@ fs; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleInteropImportCall.js b/tests/baselines/reference/esModuleInteropImportCall.js index c4e3b3b26acd5..ba24dfaee305b 100644 --- a/tests/baselines/reference/esModuleInteropImportCall.js +++ b/tests/baselines/reference/esModuleInteropImportCall.js @@ -13,7 +13,9 @@ import("./foo").then(f => { //// [index.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleInteropImportNamespace.js b/tests/baselines/reference/esModuleInteropImportNamespace.js index b392c4d740000..127a0587fc91a 100644 --- a/tests/baselines/reference/esModuleInteropImportNamespace.js +++ b/tests/baselines/reference/esModuleInteropImportNamespace.js @@ -14,7 +14,9 @@ foo.default; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleInteropNamedDefaultImports.js b/tests/baselines/reference/esModuleInteropNamedDefaultImports.js index ab28bbfaae7b3..f14c6c592aec8 100644 --- a/tests/baselines/reference/esModuleInteropNamedDefaultImports.js +++ b/tests/baselines/reference/esModuleInteropNamedDefaultImports.js @@ -32,7 +32,9 @@ exports.Bar = Bar; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.js b/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.js index cba862db14575..1e2145dba87d7 100644 --- a/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.js +++ b/tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.js @@ -14,7 +14,9 @@ invoke(foo); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleInteropUsesExportStarWhenDefaultPlusNames.js b/tests/baselines/reference/esModuleInteropUsesExportStarWhenDefaultPlusNames.js index 0586ebeeeca1d..8e8594268b7ee 100644 --- a/tests/baselines/reference/esModuleInteropUsesExportStarWhenDefaultPlusNames.js +++ b/tests/baselines/reference/esModuleInteropUsesExportStarWhenDefaultPlusNames.js @@ -7,7 +7,9 @@ void var2; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js b/tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js index ef026250745f8..d13876140f294 100644 --- a/tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js +++ b/tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js @@ -16,7 +16,9 @@ export {x as y} from "./fs"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js b/tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js index d306d05644c19..69f746f746d5f 100644 --- a/tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js +++ b/tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js @@ -16,7 +16,9 @@ export {x as y} from "./fs"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/esModuleIntersectionCrash.js b/tests/baselines/reference/esModuleIntersectionCrash.js index ce60fc48e92a6..6875f7a40bc1a 100644 --- a/tests/baselines/reference/esModuleIntersectionCrash.js +++ b/tests/baselines/reference/esModuleIntersectionCrash.js @@ -16,7 +16,9 @@ mod.b; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace2(module=amd).js b/tests/baselines/reference/exportAsNamespace2(module=amd).js index a211d159abfe5..589556afca816 100644 --- a/tests/baselines/reference/exportAsNamespace2(module=amd).js +++ b/tests/baselines/reference/exportAsNamespace2(module=amd).js @@ -26,7 +26,9 @@ define(["require", "exports"], function (require, exports) { //// [1.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -54,7 +56,9 @@ define(["require", "exports", "./0"], function (require, exports, ns) { //// [2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace2(module=commonjs).js b/tests/baselines/reference/exportAsNamespace2(module=commonjs).js index 9b0ba0dd3e1e7..eed531d33931c 100644 --- a/tests/baselines/reference/exportAsNamespace2(module=commonjs).js +++ b/tests/baselines/reference/exportAsNamespace2(module=commonjs).js @@ -25,7 +25,9 @@ exports.b = 2; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -51,7 +53,9 @@ ns.b; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace2(module=umd).js b/tests/baselines/reference/exportAsNamespace2(module=umd).js index f8e2745939304..9cd7ada0937c6 100644 --- a/tests/baselines/reference/exportAsNamespace2(module=umd).js +++ b/tests/baselines/reference/exportAsNamespace2(module=umd).js @@ -34,7 +34,9 @@ foo.ns.b; //// [1.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -70,7 +72,9 @@ var __importStar = (this && this.__importStar) || function (mod) { //// [2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace3(module=amd).js b/tests/baselines/reference/exportAsNamespace3(module=amd).js index 0d0f63426fa32..3664567465d30 100644 --- a/tests/baselines/reference/exportAsNamespace3(module=amd).js +++ b/tests/baselines/reference/exportAsNamespace3(module=amd).js @@ -29,7 +29,9 @@ define(["require", "exports"], function (require, exports) { //// [1.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -60,7 +62,9 @@ define(["require", "exports", "./0"], function (require, exports, ns) { //// [2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace3(module=commonjs).js b/tests/baselines/reference/exportAsNamespace3(module=commonjs).js index 5d2226039fb15..786ecb4860a79 100644 --- a/tests/baselines/reference/exportAsNamespace3(module=commonjs).js +++ b/tests/baselines/reference/exportAsNamespace3(module=commonjs).js @@ -28,7 +28,9 @@ exports.b = 2; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -57,7 +59,9 @@ ns.b; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace3(module=umd).js b/tests/baselines/reference/exportAsNamespace3(module=umd).js index da902de4e41f2..19c994d3ec9c5 100644 --- a/tests/baselines/reference/exportAsNamespace3(module=umd).js +++ b/tests/baselines/reference/exportAsNamespace3(module=umd).js @@ -37,7 +37,9 @@ foo.ns.b; //// [1.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -76,7 +78,9 @@ var __importStar = (this && this.__importStar) || function (mod) { //// [2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace4(module=amd).js b/tests/baselines/reference/exportAsNamespace4(module=amd).js index e52a55df548f7..4055d9a304591 100644 --- a/tests/baselines/reference/exportAsNamespace4(module=amd).js +++ b/tests/baselines/reference/exportAsNamespace4(module=amd).js @@ -32,7 +32,9 @@ define(["require", "exports"], function (require, exports) { //// [1.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -58,7 +60,9 @@ define(["require", "exports", "./0"], function (require, exports, _0_1) { //// [11.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace4(module=commonjs).js b/tests/baselines/reference/exportAsNamespace4(module=commonjs).js index 64d03766b0c81..847e538437942 100644 --- a/tests/baselines/reference/exportAsNamespace4(module=commonjs).js +++ b/tests/baselines/reference/exportAsNamespace4(module=commonjs).js @@ -31,7 +31,9 @@ exports.b = 2; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -55,7 +57,9 @@ exports["default"] = __importStar(require("./0")); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace4(module=umd).js b/tests/baselines/reference/exportAsNamespace4(module=umd).js index e88f8063a5aba..fb4066eb30dea 100644 --- a/tests/baselines/reference/exportAsNamespace4(module=umd).js +++ b/tests/baselines/reference/exportAsNamespace4(module=umd).js @@ -40,7 +40,9 @@ foo1.b; //// [1.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -74,7 +76,9 @@ var __importStar = (this && this.__importStar) || function (mod) { //// [11.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportAsNamespace_exportAssignment.js b/tests/baselines/reference/exportAsNamespace_exportAssignment.js index dd7ac8623c896..dd5db48bb7ab6 100644 --- a/tests/baselines/reference/exportAsNamespace_exportAssignment.js +++ b/tests/baselines/reference/exportAsNamespace_exportAssignment.js @@ -14,7 +14,9 @@ module.exports = {}; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js index eae506a0f9588..c3edf80d15961 100644 --- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js +++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js @@ -28,7 +28,9 @@ exports.x = "x"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -44,7 +46,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -57,7 +61,9 @@ __createBinding(exports, t1_1, "x", "a"); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportDefault.js b/tests/baselines/reference/exportDefault.js index ff7173e1c0eaa..149dd68c69ee3 100644 --- a/tests/baselines/reference/exportDefault.js +++ b/tests/baselines/reference/exportDefault.js @@ -46,7 +46,9 @@ exports["default"] = types; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -79,7 +81,9 @@ new types.A(); // Error "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportDefaultDuplicateCrash.js b/tests/baselines/reference/exportDefaultDuplicateCrash.js index f61546f1854f8..443b3247be40e 100644 --- a/tests/baselines/reference/exportDefaultDuplicateCrash.js +++ b/tests/baselines/reference/exportDefaultDuplicateCrash.js @@ -11,7 +11,9 @@ export { aa as default } from './hi' // #38214 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportNamespace1.js b/tests/baselines/reference/exportNamespace1.js index 0ff7ef64173cf..93f1187c1f114 100644 --- a/tests/baselines/reference/exportNamespace1.js +++ b/tests/baselines/reference/exportNamespace1.js @@ -31,7 +31,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js index f209cc9974416..acd4c26c52d20 100644 --- a/tests/baselines/reference/exportStar-amd.js +++ b/tests/baselines/reference/exportStar-amd.js @@ -60,7 +60,9 @@ define(["require", "exports"], function (require, exports) { //// [t4.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js index 7b0feb3675e17..d9afe4168a80f 100644 --- a/tests/baselines/reference/exportStar.js +++ b/tests/baselines/reference/exportStar.js @@ -55,7 +55,9 @@ exports.z = z; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js index d361304a7db27..dce77bfe92132 100644 --- a/tests/baselines/reference/exportStarForValues.js +++ b/tests/baselines/reference/exportStarForValues.js @@ -15,7 +15,9 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js index afa4f5a4481f6..2754fabe00a44 100644 --- a/tests/baselines/reference/exportStarForValues2.js +++ b/tests/baselines/reference/exportStarForValues2.js @@ -19,7 +19,9 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -36,7 +38,9 @@ define(["require", "exports", "file1"], function (require, exports, file1_1) { //// [file3.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js index 35e5b40ac167e..0ffbc6855c523 100644 --- a/tests/baselines/reference/exportStarForValues3.js +++ b/tests/baselines/reference/exportStarForValues3.js @@ -31,7 +31,9 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -48,7 +50,9 @@ define(["require", "exports", "file1"], function (require, exports, file1_1) { //// [file3.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -65,7 +69,9 @@ define(["require", "exports", "file1"], function (require, exports, file1_1) { //// [file4.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -83,7 +89,9 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil //// [file5.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js index 0b7f5aa3b969d..7308ec36c5998 100644 --- a/tests/baselines/reference/exportStarForValues4.js +++ b/tests/baselines/reference/exportStarForValues4.js @@ -23,7 +23,9 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -40,7 +42,9 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { //// [file2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarForValues5.js b/tests/baselines/reference/exportStarForValues5.js index 200bb38188e1c..975b059731813 100644 --- a/tests/baselines/reference/exportStarForValues5.js +++ b/tests/baselines/reference/exportStarForValues5.js @@ -15,7 +15,9 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js index db443acd80ee8..628b6aad09e0d 100644 --- a/tests/baselines/reference/exportStarForValues7.js +++ b/tests/baselines/reference/exportStarForValues7.js @@ -19,7 +19,9 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -37,7 +39,9 @@ define(["require", "exports", "file1"], function (require, exports, file1_1) { //// [file3.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js index ad8e183a19ee5..b6afe97a3fb88 100644 --- a/tests/baselines/reference/exportStarForValues8.js +++ b/tests/baselines/reference/exportStarForValues8.js @@ -31,7 +31,9 @@ define(["require", "exports"], function (require, exports) { //// [file2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -49,7 +51,9 @@ define(["require", "exports", "file1"], function (require, exports, file1_1) { //// [file3.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -67,7 +71,9 @@ define(["require", "exports", "file1"], function (require, exports, file1_1) { //// [file4.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -86,7 +92,9 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil //// [file5.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js index 8eb91c032fa0a..48c12e3ef2d22 100644 --- a/tests/baselines/reference/exportStarForValues9.js +++ b/tests/baselines/reference/exportStarForValues9.js @@ -23,7 +23,9 @@ define(["require", "exports"], function (require, exports) { //// [file3.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -41,7 +43,9 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) { //// [file2.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js index 1b5484fa76d9b..1b992e714b7aa 100644 --- a/tests/baselines/reference/exportStarFromEmptyModule.js +++ b/tests/baselines/reference/exportStarFromEmptyModule.js @@ -38,7 +38,9 @@ exports.A = A; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportStarNotElided.js b/tests/baselines/reference/exportStarNotElided.js index 6bdbefe6a20a8..6cad75f588800 100644 --- a/tests/baselines/reference/exportStarNotElided.js +++ b/tests/baselines/reference/exportStarNotElided.js @@ -26,7 +26,9 @@ exports.register = register; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js index 5c4b529131f8f..ff8ac3c1b4a8c 100644 --- a/tests/baselines/reference/exportsAndImports1.js +++ b/tests/baselines/reference/exportsAndImports1.js @@ -64,7 +64,9 @@ exports.a = a; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js index aaaed576b6a53..95d4cbef24e7c 100644 --- a/tests/baselines/reference/exportsAndImports2.js +++ b/tests/baselines/reference/exportsAndImports2.js @@ -22,7 +22,9 @@ exports.y = "y"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js index f0f53fc351de5..61ebde12f012f 100644 --- a/tests/baselines/reference/exportsAndImports3.js +++ b/tests/baselines/reference/exportsAndImports3.js @@ -66,7 +66,9 @@ exports.a1 = exports.a; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/importAssertion2(module=commonjs).js b/tests/baselines/reference/importAssertion2(module=commonjs).js index 067291329ba82..3d6f174348760 100644 --- a/tests/baselines/reference/importAssertion2(module=commonjs).js +++ b/tests/baselines/reference/importAssertion2(module=commonjs).js @@ -25,7 +25,9 @@ exports.b = 2; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/importEquals1.js b/tests/baselines/reference/importEquals1.js index ba224823ac98b..f37b6cb1ea164 100644 --- a/tests/baselines/reference/importEquals1.js +++ b/tests/baselines/reference/importEquals1.js @@ -45,7 +45,9 @@ module.exports = types; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/importEquals2.js b/tests/baselines/reference/importEquals2.js index 8eb56dd89afdb..14f6f39e90a55 100644 --- a/tests/baselines/reference/importEquals2.js +++ b/tests/baselines/reference/importEquals2.js @@ -25,7 +25,9 @@ var A = /** @class */ (function () { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarations.js b/tests/baselines/reference/inlineJsxFactoryDeclarations.js index c230676a556fe..e855710397a97 100644 --- a/tests/baselines/reference/inlineJsxFactoryDeclarations.js +++ b/tests/baselines/reference/inlineJsxFactoryDeclarations.js @@ -67,7 +67,9 @@ exports.prerendered3 = renderer_1["default"].createElement("h", null); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/intersectionsAndEmptyObjects.js b/tests/baselines/reference/intersectionsAndEmptyObjects.js index d1abeb2215251..b018ea76a42e0 100644 --- a/tests/baselines/reference/intersectionsAndEmptyObjects.js +++ b/tests/baselines/reference/intersectionsAndEmptyObjects.js @@ -97,7 +97,9 @@ export {} // that contain other object types var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/isolatedModulesReExportType.js b/tests/baselines/reference/isolatedModulesReExportType.js index 2e3828fcfbb8d..0cfca921db1ab 100644 --- a/tests/baselines/reference/isolatedModulesReExportType.js +++ b/tests/baselines/reference/isolatedModulesReExportType.js @@ -75,7 +75,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/jsDeclarationsExportForms.js b/tests/baselines/reference/jsDeclarationsExportForms.js index 083462b444f3a..d9535b85f9a64 100644 --- a/tests/baselines/reference/jsDeclarationsExportForms.js +++ b/tests/baselines/reference/jsDeclarationsExportForms.js @@ -78,7 +78,9 @@ exports.func = func; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -92,7 +94,9 @@ __exportStar(require("./cls"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/jsDeclarationsExportFormsErr.js b/tests/baselines/reference/jsDeclarationsExportFormsErr.js index 3146597117146..bf02b8f56460e 100644 --- a/tests/baselines/reference/jsDeclarationsExportFormsErr.js +++ b/tests/baselines/reference/jsDeclarationsExportFormsErr.js @@ -44,7 +44,9 @@ module.exports = ns; // We refuse to bind cjs module exports assignments in the "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleAugmentationDoesInterfaceMergeOfReexport.js b/tests/baselines/reference/moduleAugmentationDoesInterfaceMergeOfReexport.js index 45b1fe736c9a7..dea418b2e926d 100644 --- a/tests/baselines/reference/moduleAugmentationDoesInterfaceMergeOfReexport.js +++ b/tests/baselines/reference/moduleAugmentationDoesInterfaceMergeOfReexport.js @@ -29,7 +29,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js b/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js index 33f63201f6523..a5323a27b3448 100644 --- a/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js +++ b/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js @@ -34,7 +34,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleAugmentationDoesNamespaceMergeOfReexport.js b/tests/baselines/reference/moduleAugmentationDoesNamespaceMergeOfReexport.js index 16a902446fada..70662f5986685 100644 --- a/tests/baselines/reference/moduleAugmentationDoesNamespaceMergeOfReexport.js +++ b/tests/baselines/reference/moduleAugmentationDoesNamespaceMergeOfReexport.js @@ -33,7 +33,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleAugmentationEnumClassMergeOfReexportIsError.js b/tests/baselines/reference/moduleAugmentationEnumClassMergeOfReexportIsError.js index e86b27b453829..075bb43d58cdd 100644 --- a/tests/baselines/reference/moduleAugmentationEnumClassMergeOfReexportIsError.js +++ b/tests/baselines/reference/moduleAugmentationEnumClassMergeOfReexportIsError.js @@ -32,7 +32,9 @@ exports.Foo = Foo; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.js b/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.js index aa2db1ec14065..ce368bc2547e1 100644 --- a/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.js +++ b/tests/baselines/reference/moduleDeclarationExportStarShadowingGlobalIsNameable.js @@ -32,7 +32,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=node).js b/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=node).js index 1e4231d994c56..9ead3a4c3190e 100644 --- a/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=node).js +++ b/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=node).js @@ -16,7 +16,9 @@ p.thing(); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=node12).js b/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=node12).js index 1e4231d994c56..9ead3a4c3190e 100644 --- a/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=node12).js +++ b/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=node12).js @@ -16,7 +16,9 @@ p.thing(); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=nodenext).js b/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=nodenext).js index 1e4231d994c56..9ead3a4c3190e 100644 --- a/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=nodenext).js +++ b/tests/baselines/reference/moduleResolutionWithModule(module=node12,moduleresolution=nodenext).js @@ -16,7 +16,9 @@ p.thing(); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node).js b/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node).js index 1e4231d994c56..9ead3a4c3190e 100644 --- a/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node).js +++ b/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node).js @@ -16,7 +16,9 @@ p.thing(); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node12).js b/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node12).js index 1e4231d994c56..9ead3a4c3190e 100644 --- a/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node12).js +++ b/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=node12).js @@ -16,7 +16,9 @@ p.thing(); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js b/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js index 1e4231d994c56..9ead3a4c3190e 100644 --- a/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js +++ b/tests/baselines/reference/moduleResolutionWithModule(module=nodenext,moduleresolution=nodenext).js @@ -16,7 +16,9 @@ p.thing(); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js index f0d186d22d49e..b89617f118c23 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js @@ -19,7 +19,9 @@ exports.foo = 42; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -33,7 +35,9 @@ __exportStar(require("./c"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js index 5fef7d152dfb0..7c42d4f515a70 100644 --- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js +++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js @@ -27,7 +27,9 @@ var Animals; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -40,7 +42,9 @@ __createBinding(exports, c_1, "Animals"); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeAllowJsPackageSelfName(module=node12).js b/tests/baselines/reference/nodeAllowJsPackageSelfName(module=node12).js index 07532294ff7d3..f5a20535a8c18 100644 --- a/tests/baselines/reference/nodeAllowJsPackageSelfName(module=node12).js +++ b/tests/baselines/reference/nodeAllowJsPackageSelfName(module=node12).js @@ -32,7 +32,9 @@ self; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeAllowJsPackageSelfName(module=nodenext).js b/tests/baselines/reference/nodeAllowJsPackageSelfName(module=nodenext).js index 07532294ff7d3..f5a20535a8c18 100644 --- a/tests/baselines/reference/nodeAllowJsPackageSelfName(module=nodenext).js +++ b/tests/baselines/reference/nodeAllowJsPackageSelfName(module=nodenext).js @@ -32,7 +32,9 @@ self; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModules1(module=node12).js b/tests/baselines/reference/nodeModules1(module=node12).js index 46163abc085d0..d8197e068e755 100644 --- a/tests/baselines/reference/nodeModules1(module=node12).js +++ b/tests/baselines/reference/nodeModules1(module=node12).js @@ -375,7 +375,9 @@ exports.x = x; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModules1(module=nodenext).js b/tests/baselines/reference/nodeModules1(module=nodenext).js index 46163abc085d0..d8197e068e755 100644 --- a/tests/baselines/reference/nodeModules1(module=nodenext).js +++ b/tests/baselines/reference/nodeModules1(module=nodenext).js @@ -375,7 +375,9 @@ exports.x = x; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=node12).js b/tests/baselines/reference/nodeModulesAllowJs1(module=node12).js index b9c1d7efe5fbe..5d0d3b13f3b4f 100644 --- a/tests/baselines/reference/nodeModulesAllowJs1(module=node12).js +++ b/tests/baselines/reference/nodeModulesAllowJs1(module=node12).js @@ -375,7 +375,9 @@ export { x }; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).js b/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).js index b9c1d7efe5fbe..5d0d3b13f3b4f 100644 --- a/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesAllowJs1(module=nodenext).js @@ -375,7 +375,9 @@ export { x }; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node12).js b/tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node12).js index 77df1469fbf62..40db6f0ca35dd 100644 --- a/tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node12).js +++ b/tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node12).js @@ -158,7 +158,9 @@ ts.mjsSource; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=nodenext).js b/tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=nodenext).js index 77df1469fbf62..40db6f0ca35dd 100644 --- a/tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=nodenext).js @@ -158,7 +158,9 @@ ts.mjsSource; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsPackageExports(module=node12).js b/tests/baselines/reference/nodeModulesAllowJsPackageExports(module=node12).js index dfb76ab777867..5908cfa0142fb 100644 --- a/tests/baselines/reference/nodeModulesAllowJsPackageExports(module=node12).js +++ b/tests/baselines/reference/nodeModulesAllowJsPackageExports(module=node12).js @@ -120,7 +120,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsPackageExports(module=nodenext).js b/tests/baselines/reference/nodeModulesAllowJsPackageExports(module=nodenext).js index dfb76ab777867..5908cfa0142fb 100644 --- a/tests/baselines/reference/nodeModulesAllowJsPackageExports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesAllowJsPackageExports(module=nodenext).js @@ -120,7 +120,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsPackageImports(module=node12).js b/tests/baselines/reference/nodeModulesAllowJsPackageImports(module=node12).js index c6fa45d5bb7a3..54cf24ab0d565 100644 --- a/tests/baselines/reference/nodeModulesAllowJsPackageImports(module=node12).js +++ b/tests/baselines/reference/nodeModulesAllowJsPackageImports(module=node12).js @@ -57,7 +57,9 @@ type; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsPackageImports(module=nodenext).js b/tests/baselines/reference/nodeModulesAllowJsPackageImports(module=nodenext).js index c6fa45d5bb7a3..54cf24ab0d565 100644 --- a/tests/baselines/reference/nodeModulesAllowJsPackageImports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesAllowJsPackageImports(module=nodenext).js @@ -57,7 +57,9 @@ type; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node12).js b/tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node12).js index b2ef85d6e5f97..d920870968e80 100644 --- a/tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node12).js +++ b/tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node12).js @@ -85,7 +85,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=nodenext).js b/tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=nodenext).js index b2ef85d6e5f97..d920870968e80 100644 --- a/tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=nodenext).js @@ -85,7 +85,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node12).js b/tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node12).js index 9627f89af2bb1..7905432a4ce9d 100644 --- a/tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node12).js +++ b/tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node12).js @@ -85,7 +85,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).js b/tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).js index 9627f89af2bb1..7905432a4ce9d 100644 --- a/tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).js @@ -85,7 +85,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesConditionalPackageExports(module=node12).js b/tests/baselines/reference/nodeModulesConditionalPackageExports(module=node12).js index cd984941c2c9b..a41129d8a96b8 100644 --- a/tests/baselines/reference/nodeModulesConditionalPackageExports(module=node12).js +++ b/tests/baselines/reference/nodeModulesConditionalPackageExports(module=node12).js @@ -142,7 +142,9 @@ ts.mjsSource; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesConditionalPackageExports(module=nodenext).js b/tests/baselines/reference/nodeModulesConditionalPackageExports(module=nodenext).js index cd984941c2c9b..a41129d8a96b8 100644 --- a/tests/baselines/reference/nodeModulesConditionalPackageExports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesConditionalPackageExports(module=nodenext).js @@ -142,7 +142,9 @@ ts.mjsSource; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesDeclarationEmitWithPackageExports(module=node12).js b/tests/baselines/reference/nodeModulesDeclarationEmitWithPackageExports(module=node12).js index 7fdb02cf02112..48deae726796a 100644 --- a/tests/baselines/reference/nodeModulesDeclarationEmitWithPackageExports(module=node12).js +++ b/tests/baselines/reference/nodeModulesDeclarationEmitWithPackageExports(module=node12).js @@ -109,7 +109,9 @@ export const f = typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).js b/tests/baselines/reference/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).js index 7fdb02cf02112..48deae726796a 100644 --- a/tests/baselines/reference/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesDeclarationEmitWithPackageExports(module=nodenext).js @@ -109,7 +109,9 @@ export const f = typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesImportResolutionIntoExport(module=node12).js b/tests/baselines/reference/nodeModulesImportResolutionIntoExport(module=node12).js index 813d5046ccfbc..4c83f5f6c3a26 100644 --- a/tests/baselines/reference/nodeModulesImportResolutionIntoExport(module=node12).js +++ b/tests/baselines/reference/nodeModulesImportResolutionIntoExport(module=node12).js @@ -27,7 +27,9 @@ type; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesImportResolutionIntoExport(module=nodenext).js b/tests/baselines/reference/nodeModulesImportResolutionIntoExport(module=nodenext).js index 813d5046ccfbc..4c83f5f6c3a26 100644 --- a/tests/baselines/reference/nodeModulesImportResolutionIntoExport(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesImportResolutionIntoExport(module=nodenext).js @@ -27,7 +27,9 @@ type; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesImportResolutionNoCycle(module=node12).js b/tests/baselines/reference/nodeModulesImportResolutionNoCycle(module=node12).js index ccdc459ab1a08..b99771af9ca30 100644 --- a/tests/baselines/reference/nodeModulesImportResolutionNoCycle(module=node12).js +++ b/tests/baselines/reference/nodeModulesImportResolutionNoCycle(module=node12).js @@ -35,7 +35,9 @@ type; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesImportResolutionNoCycle(module=nodenext).js b/tests/baselines/reference/nodeModulesImportResolutionNoCycle(module=nodenext).js index ccdc459ab1a08..b99771af9ca30 100644 --- a/tests/baselines/reference/nodeModulesImportResolutionNoCycle(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesImportResolutionNoCycle(module=nodenext).js @@ -35,7 +35,9 @@ type; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesPackageExports(module=node12).js b/tests/baselines/reference/nodeModulesPackageExports(module=node12).js index 28c25e10f9ef1..9591784f50574 100644 --- a/tests/baselines/reference/nodeModulesPackageExports(module=node12).js +++ b/tests/baselines/reference/nodeModulesPackageExports(module=node12).js @@ -106,7 +106,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesPackageExports(module=nodenext).js b/tests/baselines/reference/nodeModulesPackageExports(module=nodenext).js index 28c25e10f9ef1..9591784f50574 100644 --- a/tests/baselines/reference/nodeModulesPackageExports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesPackageExports(module=nodenext).js @@ -106,7 +106,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesPackageImports(module=node12).js b/tests/baselines/reference/nodeModulesPackageImports(module=node12).js index 7fb8361dd0ac8..f13604777caf2 100644 --- a/tests/baselines/reference/nodeModulesPackageImports(module=node12).js +++ b/tests/baselines/reference/nodeModulesPackageImports(module=node12).js @@ -49,7 +49,9 @@ type; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesPackageImports(module=nodenext).js b/tests/baselines/reference/nodeModulesPackageImports(module=nodenext).js index 7fb8361dd0ac8..f13604777caf2 100644 --- a/tests/baselines/reference/nodeModulesPackageImports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesPackageImports(module=nodenext).js @@ -49,7 +49,9 @@ type; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesPackagePatternExports(module=node12).js b/tests/baselines/reference/nodeModulesPackagePatternExports(module=node12).js index 982cd292396a5..014b483e9fa07 100644 --- a/tests/baselines/reference/nodeModulesPackagePatternExports(module=node12).js +++ b/tests/baselines/reference/nodeModulesPackagePatternExports(module=node12).js @@ -85,7 +85,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesPackagePatternExports(module=nodenext).js b/tests/baselines/reference/nodeModulesPackagePatternExports(module=nodenext).js index 982cd292396a5..014b483e9fa07 100644 --- a/tests/baselines/reference/nodeModulesPackagePatternExports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesPackagePatternExports(module=nodenext).js @@ -85,7 +85,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=node12).js b/tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=node12).js index 0e0b80d540422..42a5d1c287882 100644 --- a/tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=node12).js +++ b/tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=node12).js @@ -85,7 +85,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=nodenext).js b/tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=nodenext).js index 0e0b80d540422..42a5d1c287882 100644 --- a/tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=nodenext).js @@ -85,7 +85,9 @@ typei; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesResolveJsonModule(module=node12).js b/tests/baselines/reference/nodeModulesResolveJsonModule(module=node12).js index 3736ec5f37a1a..655c7c38e9d3b 100644 --- a/tests/baselines/reference/nodeModulesResolveJsonModule(module=node12).js +++ b/tests/baselines/reference/nodeModulesResolveJsonModule(module=node12).js @@ -43,7 +43,9 @@ export const name2 = ns.default.name; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesResolveJsonModule(module=nodenext).js b/tests/baselines/reference/nodeModulesResolveJsonModule(module=nodenext).js index 3736ec5f37a1a..655c7c38e9d3b 100644 --- a/tests/baselines/reference/nodeModulesResolveJsonModule(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesResolveJsonModule(module=nodenext).js @@ -43,7 +43,9 @@ export const name2 = ns.default.name; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=node12).js b/tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=node12).js index 8cb62238370ee..a65af1298cafd 100644 --- a/tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=node12).js +++ b/tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=node12).js @@ -63,7 +63,9 @@ mod.correctVersionApplied; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=nodenext).js b/tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=nodenext).js index 8cb62238370ee..a65af1298cafd 100644 --- a/tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=nodenext).js +++ b/tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=nodenext).js @@ -63,7 +63,9 @@ mod.correctVersionApplied; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodePackageSelfName(module=node12).js b/tests/baselines/reference/nodePackageSelfName(module=node12).js index 23c9f6f1fa067..7f76cf1e964e5 100644 --- a/tests/baselines/reference/nodePackageSelfName(module=node12).js +++ b/tests/baselines/reference/nodePackageSelfName(module=node12).js @@ -32,7 +32,9 @@ self; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodePackageSelfName(module=nodenext).js b/tests/baselines/reference/nodePackageSelfName(module=nodenext).js index 23c9f6f1fa067..7f76cf1e964e5 100644 --- a/tests/baselines/reference/nodePackageSelfName(module=nodenext).js +++ b/tests/baselines/reference/nodePackageSelfName(module=nodenext).js @@ -32,7 +32,9 @@ self; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodePackageSelfNameScoped(module=node12).js b/tests/baselines/reference/nodePackageSelfNameScoped(module=node12).js index c812b758e9bba..f28b7f7f78f8d 100644 --- a/tests/baselines/reference/nodePackageSelfNameScoped(module=node12).js +++ b/tests/baselines/reference/nodePackageSelfNameScoped(module=node12).js @@ -32,7 +32,9 @@ self; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/nodePackageSelfNameScoped(module=nodenext).js b/tests/baselines/reference/nodePackageSelfNameScoped(module=nodenext).js index c812b758e9bba..f28b7f7f78f8d 100644 --- a/tests/baselines/reference/nodePackageSelfNameScoped(module=nodenext).js +++ b/tests/baselines/reference/nodePackageSelfNameScoped(module=nodenext).js @@ -32,7 +32,9 @@ self; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js index 94efed6f41d21..dd9bc13aaad13 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.js @@ -14,7 +14,9 @@ export {x} from "../file2"; //// [file3.js] var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js index 3facab66265ac..63a5e65331e1b 100644 --- a/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js +++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_node.js @@ -15,7 +15,9 @@ export {x} from "../file2"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportMissingDefault.js b/tests/baselines/reference/reexportMissingDefault.js index 9af5fe9b6f197..35870b615bc26 100644 --- a/tests/baselines/reference/reexportMissingDefault.js +++ b/tests/baselines/reference/reexportMissingDefault.js @@ -16,7 +16,9 @@ exports.b = null; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportMissingDefault1.js b/tests/baselines/reference/reexportMissingDefault1.js index fe5a3799287f0..b8e2aec830e88 100644 --- a/tests/baselines/reference/reexportMissingDefault1.js +++ b/tests/baselines/reference/reexportMissingDefault1.js @@ -17,7 +17,9 @@ exports.b = null; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportMissingDefault2.js b/tests/baselines/reference/reexportMissingDefault2.js index ca164d40aac37..43362d99cc0f4 100644 --- a/tests/baselines/reference/reexportMissingDefault2.js +++ b/tests/baselines/reference/reexportMissingDefault2.js @@ -16,7 +16,9 @@ exports.b = null; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportMissingDefault3.js b/tests/baselines/reference/reexportMissingDefault3.js index fb170146c9784..412ff5425153b 100644 --- a/tests/baselines/reference/reexportMissingDefault3.js +++ b/tests/baselines/reference/reexportMissingDefault3.js @@ -16,7 +16,9 @@ exports.b = null; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportMissingDefault4.js b/tests/baselines/reference/reexportMissingDefault4.js index 89491b838e16e..74ff5c5a6f8fc 100644 --- a/tests/baselines/reference/reexportMissingDefault4.js +++ b/tests/baselines/reference/reexportMissingDefault4.js @@ -12,7 +12,9 @@ export { default } from "./b"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportMissingDefault6.js b/tests/baselines/reference/reexportMissingDefault6.js index d34d707852d21..150376cfcbd12 100644 --- a/tests/baselines/reference/reexportMissingDefault6.js +++ b/tests/baselines/reference/reexportMissingDefault6.js @@ -16,7 +16,9 @@ exports.b = null; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportMissingDefault8.js b/tests/baselines/reference/reexportMissingDefault8.js index 64d559be6f01a..7ea2b700feaf5 100644 --- a/tests/baselines/reference/reexportMissingDefault8.js +++ b/tests/baselines/reference/reexportMissingDefault8.js @@ -15,7 +15,9 @@ module.exports = b; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportNameAliasedAndHoisted.js b/tests/baselines/reference/reexportNameAliasedAndHoisted.js index 4dabd47388e7a..92a6841b32187 100644 --- a/tests/baselines/reference/reexportNameAliasedAndHoisted.js +++ b/tests/baselines/reference/reexportNameAliasedAndHoisted.js @@ -19,7 +19,9 @@ exports.Sizing = null; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.js b/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.js index 607b15571d85d..2deb113655d8a 100644 --- a/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.js +++ b/tests/baselines/reference/reexportWrittenCorrectlyInDeclaration.js @@ -43,7 +43,9 @@ exports.ThingB = ThingB; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.js b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.js index b26402042fc0c..cd7e80557efef 100644 --- a/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.js +++ b/tests/baselines/reference/symbolLinkDeclarationEmitModuleNames.js @@ -44,7 +44,9 @@ exports.BindingKey = BindingKey; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToImport.js b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToImport.js index 8eff7bf85741b..06aadd959a422 100644 --- a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToImport.js +++ b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddCommentToImport.js @@ -1,7 +1,9 @@ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tsbuild/sample1/initial-build/when-esModuleInterop-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-build/when-esModuleInterop-option-changes.js index 1391bb0e38795..61ac14cf99011 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-build/when-esModuleInterop-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-build/when-esModuleInterop-option-changes.js @@ -438,7 +438,9 @@ exitCode:: ExitStatus.Success "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tsbuild/watchMode/reexport/Reports-errors-correctly.js b/tests/baselines/reference/tsbuild/watchMode/reexport/Reports-errors-correctly.js index 29f9718c4d5ec..57d29ec4dd5ac 100644 --- a/tests/baselines/reference/tsbuild/watchMode/reexport/Reports-errors-correctly.js +++ b/tests/baselines/reference/tsbuild/watchMode/reexport/Reports-errors-correctly.js @@ -166,7 +166,9 @@ export interface Session { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tsc/declarationEmit/when-pkg-references-sibling-package-through-indirect-symlink-moduleCaseChange.js b/tests/baselines/reference/tsc/declarationEmit/when-pkg-references-sibling-package-through-indirect-symlink-moduleCaseChange.js index c190744661c2d..3918c8f38a408 100644 --- a/tests/baselines/reference/tsc/declarationEmit/when-pkg-references-sibling-package-through-indirect-symlink-moduleCaseChange.js +++ b/tests/baselines/reference/tsc/declarationEmit/when-pkg-references-sibling-package-through-indirect-symlink-moduleCaseChange.js @@ -114,7 +114,9 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1'); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tsc/declarationEmit/when-pkg-references-sibling-package-through-indirect-symlink.js b/tests/baselines/reference/tsc/declarationEmit/when-pkg-references-sibling-package-through-indirect-symlink.js index 14407ff2b68e4..a0b23ba5aba7a 100644 --- a/tests/baselines/reference/tsc/declarationEmit/when-pkg-references-sibling-package-through-indirect-symlink.js +++ b/tests/baselines/reference/tsc/declarationEmit/when-pkg-references-sibling-package-through-indirect-symlink.js @@ -114,7 +114,9 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1'); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js index 0237630666c12..ef6b7b7bdf3a3 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js @@ -123,7 +123,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -139,7 +141,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -173,7 +177,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js index 8e2a2098f5771..8ec7fcfce01d4 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js @@ -134,7 +134,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -150,7 +152,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -196,7 +200,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js index 953b7fbf8013b..84a55492510f6 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js @@ -129,7 +129,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -149,7 +151,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -194,7 +198,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js index 713dde9eb1d67..21d70d05624aa 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js @@ -140,7 +140,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -160,7 +162,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -226,7 +230,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js index 3a5be53f86022..f4ccdacbba362 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js @@ -123,7 +123,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -139,7 +141,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -173,7 +177,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js index b43ae5e8cc78c..9e84c934896ec 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js @@ -134,7 +134,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -150,7 +152,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -196,7 +200,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js index 04d185f609247..e50dd65840c1a 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js @@ -129,7 +129,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -149,7 +151,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -194,7 +198,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js index 47f6264bd13a9..089a0ab694209 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js @@ -140,7 +140,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -160,7 +162,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -226,7 +230,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js index ccc1f7f6425fc..e176decc1f95f 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js @@ -123,7 +123,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -139,7 +141,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -173,7 +177,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js index 8588caf937d36..d0f7e10427496 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js @@ -134,7 +134,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -150,7 +152,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -196,7 +200,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js index 439a01e9fe23b..48a7d024d2067 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js @@ -129,7 +129,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -149,7 +151,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -194,7 +198,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js index 4958929c7817b..dd5d2623dffad 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js @@ -140,7 +140,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -160,7 +162,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -226,7 +230,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/no-circular-import/export.js index d40edf8b192b7..6c6bd9d2d6a37 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/no-circular-import/export.js @@ -123,7 +123,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -139,7 +141,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -173,7 +177,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/yes-circular-import/exports.js index 7278d90e9d5c3..63541996c9434 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/yes-circular-import/exports.js @@ -134,7 +134,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -150,7 +152,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -196,7 +200,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/no-circular-import/export.js index 2c31fcb210358..c2b1350b96e21 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/no-circular-import/export.js @@ -129,7 +129,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -149,7 +151,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -194,7 +198,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/yes-circular-import/exports.js index f5ed82b6ff13f..16d9fbb03253a 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/yes-circular-import/exports.js @@ -140,7 +140,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -160,7 +162,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -226,7 +230,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/no-circular-import/export.js index 18e3c362441eb..c458d6bb04797 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/no-circular-import/export.js @@ -123,7 +123,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -139,7 +141,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -173,7 +177,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/yes-circular-import/exports.js index 90fdbe7b3374c..4ae84e4cedfcd 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/yes-circular-import/exports.js @@ -134,7 +134,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -150,7 +152,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -196,7 +200,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/no-circular-import/export.js index b33400d973abd..e5fa85d5ba90b 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/no-circular-import/export.js @@ -129,7 +129,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -149,7 +151,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -194,7 +198,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js index 4db5a0b92cf71..db11b04d286fe 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js @@ -140,7 +140,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -160,7 +162,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -226,7 +230,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js index 256d89ce0ff7d..7f835f0f9e02c 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js @@ -123,7 +123,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -139,7 +141,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -173,7 +177,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js index 581159631429a..08be20cbb2e6f 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js @@ -134,7 +134,9 @@ exports.__esModule = true; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -150,7 +152,9 @@ __exportStar(require("./tools.interface"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -196,7 +200,9 @@ exports.Data = Data; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js index 64626f407d0da..ac6ae76d20acc 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js @@ -129,7 +129,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -149,7 +151,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -194,7 +198,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js index 99e1720b958e4..374a260f7cfbb 100644 --- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js +++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js @@ -140,7 +140,9 @@ export interface ITest { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -160,7 +162,9 @@ export * from "./tools.interface"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -226,7 +230,9 @@ export declare class Data { "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js index 304bbecca58b1..4f26d2a19b523 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js +++ b/tests/baselines/reference/tscWatch/programUpdates/changes-in-files-are-reflected-in-project-structure.js @@ -80,7 +80,9 @@ exports.x = 1; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -155,7 +157,9 @@ exitCode:: ExitStatus.undefined "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js index d8d61be4d03e8..4880fb0463948 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js +++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js @@ -79,7 +79,9 @@ exports.y = 1; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -95,7 +97,9 @@ __exportStar(require("../c/f3"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js index b6b7d5716a387..0ead84590ee19 100644 --- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js +++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js @@ -79,7 +79,9 @@ exports.y = 1; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -95,7 +97,9 @@ __exportStar(require("../c/f3"), exports); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; diff --git a/tests/baselines/reference/unclosedExportClause01.js b/tests/baselines/reference/unclosedExportClause01.js index 2ed69f22b137b..fab712985f18a 100644 --- a/tests/baselines/reference/unclosedExportClause01.js +++ b/tests/baselines/reference/unclosedExportClause01.js @@ -24,7 +24,9 @@ exports.x = "x"; "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -38,7 +40,9 @@ __createBinding(exports, t1_1, "from"); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -51,7 +55,9 @@ __createBinding(exports, t1_1, "from"); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -65,7 +71,9 @@ __createBinding(exports, t1_1, "from"); "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var oldDesc = Object.getOwnPropertyDescriptor(m, k); + var desc = ("get" in oldDesc) && !("value" in oldDesc) ? oldDesc : { enumerable: true, get: function() { return m[k]; } }; + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k];