fix scoping in export* helper

microsoft · Sep 25, 2019 · 27941d0 · 27941d0
1 parent a8d6c2b
commit 27941d0
Show file tree

Hide file tree

Showing 19 changed files with 198 additions and 132 deletions.
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -1807,12 +1807,15 @@ namespace ts {
         scoped: true,
         text: `
             function __export(m) {
-                for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-                  enumerable: true,
-                  get: function () {
-                    return m[p];
-                  }
-                });
+                for (var p in m) b(p);
+                function b(p) {
+                    if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+                        enumerable: true,
+                        get: function () {
+                            return m[p];
+                        }
+                    });
+                }
             }`
     };
 

diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -24,12 +24,15 @@ Object.defineProperty(exports, "x", { enumerable: true, get: () => jquery_1.x })
 //// [reExportAll.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 exports.__esModule = true;
 __export(require("jquery"));

diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference.js b/tests/baselines/reference/declarationEmitReexportedSymlinkReference.js
@@ -51,12 +51,15 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1');
 //// [index.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./keys"));

diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.js b/tests/baselines/reference/declarationEmitReexportedSymlinkReference2.js
@@ -54,12 +54,15 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1');
 //// [index.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./keys"));

diff --git a/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.js b/tests/baselines/reference/declarationEmitReexportedSymlinkReference3.js
@@ -51,12 +51,15 @@ exports.ADMIN = pkg2_1.MetadataAccessor.create('1');
 //// [index.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./keys"));

diff --git a/tests/baselines/reference/doubleUnderscoreExportStarConflict.js b/tests/baselines/reference/doubleUnderscoreExportStarConflict.js
@@ -24,12 +24,15 @@ exports.__foo = __foo;
 //// [index.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 exports.__esModule = true;
 __export(require("./b"));

diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -32,12 +32,15 @@ exports.x = 10;
 //// [client.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./server"));

diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -210,12 +210,15 @@ export * from "class-module";
 "use strict";
 /// <reference path="modules.d.ts"/>
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 exports.__esModule = true;
 var z2 = require("variable");

diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
@@ -58,12 +58,15 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) {
     "use strict";
     function __export(m) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-          enumerable: true,
-          get: function () {
-            return m[p];
-          }
-        });
+        for (var p in m) b(p);
+        function b(p) {
+            if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+                enumerable: true,
+                get: function () {
+                    return m[p];
+                }
+            });
+        }
     }
     Object.defineProperty(exports, "__esModule", { value: true });
     __export(t1_1);

diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
@@ -51,12 +51,15 @@ exports.z = z;
 //// [t4.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./t1"));

diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
@@ -26,12 +26,15 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
     "use strict";
     function __export(m) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-          enumerable: true,
-          get: function () {
-            return m[p];
-          }
-        });
+        for (var p in m) b(p);
+        function b(p) {
+            if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+                enumerable: true,
+                get: function () {
+                    return m[p];
+                }
+            });
+        }
     }
     exports.__esModule = true;
     __export(file2_1);

diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
@@ -44,12 +44,15 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) {
     "use strict";
     function __export(m) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-          enumerable: true,
-          get: function () {
-            return m[p];
-          }
-        });
+        for (var p in m) b(p);
+        function b(p) {
+            if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+                enumerable: true,
+                get: function () {
+                    return m[p];
+                }
+            });
+        }
     }
     exports.__esModule = true;
     __export(file2_1);
@@ -60,12 +63,15 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil
 define(["require", "exports", "file4"], function (require, exports, file4_1) {
     "use strict";
     function __export(m) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-          enumerable: true,
-          get: function () {
-            return m[p];
-          }
-        });
+        for (var p in m) b(p);
+        function b(p) {
+            if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+                enumerable: true,
+                get: function () {
+                    return m[p];
+                }
+            });
+        }
     }
     exports.__esModule = true;
     __export(file4_1);

diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
@@ -24,12 +24,15 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
     "use strict";
     function __export(m) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-          enumerable: true,
-          get: function () {
-            return m[p];
-          }
-        });
+        for (var p in m) b(p);
+        function b(p) {
+            if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+                enumerable: true,
+                get: function () {
+                    return m[p];
+                }
+            });
+        }
     }
     exports.__esModule = true;
     __export(file2_1);
@@ -39,12 +42,15 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
 define(["require", "exports", "file3"], function (require, exports, file3_1) {
     "use strict";
     function __export(m) {
-        for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-          enumerable: true,
-          get: function () {
-            return m[p];
-          }
-        });
+        for (var p in m) b(p);
+        function b(p) {
+            if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+                enumerable: true,
+                get: function () {
+                    return m[p];
+                }
+            });
+        }
     }
     exports.__esModule = true;
     __export(file3_1);

diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -36,12 +36,15 @@ exports.A = A;
 //// [exportStarFromEmptyModule_module3.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./exportStarFromEmptyModule_module2"));

diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarations.js b/tests/baselines/reference/inlineJsxFactoryDeclarations.js
@@ -63,12 +63,15 @@ exports.prerendered3 = renderer_1["default"].createElement("h", null);
 //// [index.js]
 "use strict";
 function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
-      enumerable: true,
-      get: function () {
-        return m[p];
-      }
-    });
+    for (var p in m) b(p);
+    function b(p) {
+        if (!exports.hasOwnProperty(p)) Object.defineProperty(exports, p, {
+            enumerable: true,
+            get: function () {
+                return m[p];
+            }
+        });
+    }
 }
 exports.__esModule = true;
 /** @jsx dom */