Port TypeScript PR #60262: Include non-enumerable keys in __importStar helper (#1141)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: andrewbranch <[email protected]>

Author: Copilot

internal/printer/helpers.go

@@ -181,13 +181,23 @@ var importStarHelper = &EmitHelper{
 	Scoped:       false,
 	Dependencies: []*EmitHelper{createBindingHelper, setModuleDefaultHelper},
 	Priority:     &Priority{2},
-	Text: `var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};`,
+	Text: `var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();`,
 }
 
 var importDefaultHelper = &EmitHelper{

internal/transformers/commonjsmodule_test.go

@@ -91,13 +91,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const a = __importStar(require("other"));`,
 			options: &core.CompilerOptions{ESModuleInterop: core.TSTrue},

testdata/baselines/reference/submodule/compiler/esModuleInterop.js

@@ -36,13 +36,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

testdata/baselines/reference/submodule/compiler/esModuleInterop.js.diff

@@ -1,34 +1,6 @@
 --- old.esModuleInterop.js
 +++ new.esModuleInterop.js
-@@= skipped -35, +35 lines =@@
- }) : function(o, v) {
-     o["default"] = v;
- });
--var __importStar = (this && this.__importStar) || (function () {
--    var ownKeys = function(o) {
--        ownKeys = Object.getOwnPropertyNames || function (o) {
--            var ar = [];
--            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
--            return ar;
--        };
--        return ownKeys(o);
--    };
--    return function (mod) {
--        if (mod && mod.__esModule) return mod;
--        var result = {};
--        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
--        __setModuleDefault(result, mod);
--        return result;
--    };
--})();
-+var __importStar = (this && this.__importStar) || function (mod) {
-+    if (mod && mod.__esModule) return mod;
-+    var result = {};
-+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-+    __setModuleDefault(result, mod);
-+    return result;
-+};
- var __importDefault = (this && this.__importDefault) || function (mod) {
+@@= skipped -56, +56 lines =@@
      return (mod && mod.__esModule) ? mod : { "default": mod };
  };
  Object.defineProperty(exports, "__esModule", { value: true });

testdata/baselines/reference/submodule/compiler/esModuleInteropDefaultImports.js

@@ -62,13 +62,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

testdata/baselines/reference/submodule/compiler/esModuleInteropDefaultImports.js.diff

@@ -9,36 +9,7 @@
  module.exports = mod;
  //// [b.js]
  "use strict";
-@@= skipped -20, +20 lines =@@
- }) : function(o, v) {
-     o["default"] = v;
- });
--var __importStar = (this && this.__importStar) || (function () {
--    var ownKeys = function(o) {
--        ownKeys = Object.getOwnPropertyNames || function (o) {
--            var ar = [];
--            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
--            return ar;
--        };
--        return ownKeys(o);
--    };
--    return function (mod) {
--        if (mod && mod.__esModule) return mod;
--        var result = {};
--        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
--        __setModuleDefault(result, mod);
--        return result;
--    };
--})();
-+var __importStar = (this && this.__importStar) || function (mod) {
-+    if (mod && mod.__esModule) return mod;
-+    var result = {};
-+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-+    __setModuleDefault(result, mod);
-+    return result;
-+};
- var __importDefault = (this && this.__importDefault) || function (mod) {
-     return (mod && mod.__esModule) ? mod : { "default": mod };
+@@= skipped -42, +42 lines =@@
  };
  Object.defineProperty(exports, "__esModule", { value: true });
  exports.def = exports.default = void 0;

testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.js

@@ -27,13 +27,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Promise.resolve().then(() => __importStar(require("./foo"))).then(f => {
     f.default;
 });

testdata/baselines/reference/submodule/compiler/esModuleInteropImportCall.js.diff

@@ -1,34 +1,10 @@
 --- old.esModuleInteropImportCall.js
 +++ new.esModuleInteropImportCall.js
-@@= skipped -26, +26 lines =@@
- }) : function(o, v) {
-     o["default"] = v;
- });
--var __importStar = (this && this.__importStar) || (function () {
--    var ownKeys = function(o) {
--        ownKeys = Object.getOwnPropertyNames || function (o) {
--            var ar = [];
--            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
--            return ar;
--        };
--        return ownKeys(o);
--    };
--    return function (mod) {
--        if (mod && mod.__esModule) return mod;
--        var result = {};
--        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
--        __setModuleDefault(result, mod);
--        return result;
--    };
--})();
+@@= skipped -43, +43 lines =@@
+         return result;
+     };
+ })();
 -Promise.resolve().then(function () { return __importStar(require("./foo")); }).then(function (f) {
-+var __importStar = (this && this.__importStar) || function (mod) {
-+    if (mod && mod.__esModule) return mod;
-+    var result = {};
-+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-+    __setModuleDefault(result, mod);
-+    return result;
-+};
 +Promise.resolve().then(() => __importStar(require("./foo"))).then(f => {
      f.default;
  });

testdata/baselines/reference/submodule/compiler/esModuleInteropImportNamespace.js

@@ -28,13 +28,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const foo = __importStar(require("./foo"));
 foo.default;

testdata/baselines/reference/submodule/compiler/esModuleInteropImportNamespace.js.diff

@@ -1,33 +1,8 @@
 --- old.esModuleInteropImportNamespace.js
 +++ new.esModuleInteropImportNamespace.js
-@@= skipped -27, +27 lines =@@
- }) : function(o, v) {
-     o["default"] = v;
- });
--var __importStar = (this && this.__importStar) || (function () {
--    var ownKeys = function(o) {
--        ownKeys = Object.getOwnPropertyNames || function (o) {
--            var ar = [];
--            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
--            return ar;
--        };
--        return ownKeys(o);
--    };
--    return function (mod) {
--        if (mod && mod.__esModule) return mod;
--        var result = {};
--        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
--        __setModuleDefault(result, mod);
--        return result;
--    };
--})();
-+var __importStar = (this && this.__importStar) || function (mod) {
-+    if (mod && mod.__esModule) return mod;
-+    var result = {};
-+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-+    __setModuleDefault(result, mod);
-+    return result;
-+};
+@@= skipped -45, +45 lines =@@
+     };
+ })();
  Object.defineProperty(exports, "__esModule", { value: true });
 -var foo = __importStar(require("./foo"));
 +const foo = __importStar(require("./foo"));

testdata/baselines/reference/submodule/compiler/esModuleInteropNamedDefaultImports.js

@@ -40,13 +40,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };