Skip to content

Commit abb4f59

Browse files
authored
Revert __importStar helper to match version in _submodules/TypeScript (microsoft#446)
1 parent 9ed5ede commit abb4f59

File tree

2 files changed

+14
-34
lines changed

2 files changed

+14
-34
lines changed

internal/printer/helpers.go

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,13 @@ var importStarHelper = &EmitHelper{
7070
Scoped: false,
7171
Dependencies: []*EmitHelper{createBindingHelper, setModuleDefaultHelper},
7272
Priority: &Priority{2},
73-
Text: `var __importStar = (this && this.__importStar) || (function () {
74-
var ownKeys = function(o) {
75-
ownKeys = Object.getOwnPropertyNames || function (o) {
76-
var ar = [];
77-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
78-
return ar;
79-
};
80-
return ownKeys(o);
81-
};
82-
return function (mod) {
83-
if (mod && mod.__esModule) return mod;
84-
var result = {};
85-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
86-
__setModuleDefault(result, mod);
87-
return result;
88-
};
89-
})();`,
73+
Text: `var __importStar = (this && this.__importStar) || function (mod) {
74+
if (mod && mod.__esModule) return mod;
75+
var result = {};
76+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
77+
__setModuleDefault(result, mod);
78+
return result;
79+
};`,
9080
}
9181

9282
var rewriteRelativeImportExtensionsHelper = &EmitHelper{

internal/transformers/commonjsmodule_test.go

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
8787
}) : function(o, v) {
8888
o["default"] = v;
8989
});
90-
var __importStar = (this && this.__importStar) || (function () {
91-
var ownKeys = function(o) {
92-
ownKeys = Object.getOwnPropertyNames || function (o) {
93-
var ar = [];
94-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
95-
return ar;
96-
};
97-
return ownKeys(o);
98-
};
99-
return function (mod) {
100-
if (mod && mod.__esModule) return mod;
101-
var result = {};
102-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
103-
__setModuleDefault(result, mod);
104-
return result;
105-
};
106-
})();
90+
var __importStar = (this && this.__importStar) || function (mod) {
91+
if (mod && mod.__esModule) return mod;
92+
var result = {};
93+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
94+
__setModuleDefault(result, mod);
95+
return result;
96+
};
10797
Object.defineProperty(exports, "__esModule", { value: true });
10898
const a = __importStar(require("other"));`,
10999
options: core.CompilerOptions{ESModuleInterop: core.TSTrue},

0 commit comments

Comments
 (0)