8000 Avoid compiling the _typeof helper with itself (#11049) · babel/babel@916429b · GitHub
[go: up one dir, main page]
Skip to content

Commit 916429b

Browse files
nicolo-ribaudonicolo-ribaudo
authored
Avoid compiling the _typeof helper with itself (#11049)
* Avoid compiling the typeof helper with itself * Update fixtures
1 parent d0518b7 commit 916429b

File tree

17 files changed

+88
-15
lines changed

17 files changed

+88
-15
lines changed

‎packages/babel-helpers/src/helpers.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ const helper = (minVersion: string) => tpl => ({
1212

1313
helpers.typeof = helper("7.0.0-beta.0")`
1414
export default function _typeof(obj) {
15+
"@babel/helpers - typeof";
16+
1517
if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
1618
_typeof = function (obj) { return typeof obj; };
1719
} else {

‎packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1+
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
22

33
function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
44

‎packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1+
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
22

33
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
44

‎packages/babel-plugin-transform-classes/test/fixtures/regression/T7537/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1+
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
22

33
function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
44

‎packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var _args = _interopRequireDefault(require("utils/url/args"));
99

1010
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
1111

12-
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
12+
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1313

1414
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
1515

‎packages/babel-plugin-transform-typeof-symbol/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
},
2020
"devDependencies": {
2121
"@babel/core": "^7.8.3",
22-
"@babel/helper-plugin-test-runner": "^7.8.3"
22+
"@babel/helper-plugin-test-runner": "^7.8.3",
23+
"@babel/runtime": "^7.8.3",
24+
"@babel/runtime-corejs2": "^7.8.3",
25+
"@babel/runtime-corejs3": "^7.8.3",
26+
"resolve": "^1.15.0"
2327
}
2428
}

‎packages/babel-plugin-transform-typeof-symbol/src/index.js

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,23 @@ export default declare(api => {
3636
}
3737
}
3838

39+
let isUnderHelper = path.findParent(path => {
40+
if (path.isFunction()) {
41+
return (
42+
path.get("body.directives.0")?.node.value.value ===
43+
"@babel/helpers - typeof"
44+
);
45+
}
46+
});
47+
48+
if (isUnderHelper) return;
49+
3950
const helper = this.addHelper("typeof");
40-
const isUnderHelper = path.findParent(path => {
51+
52+
// TODO: This is needed for backward compatibility with
53+
// @babel/helpers <= 7.8.3.
54+
// Remove in Babel 8
55+
isUnderHelper = path.findParent(path => {
4156
return (
4257
(path.isVariableDeclarator() && path.node.id === helper) ||
4358
(path.isFunctionDeclaration() &&

‎packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/builtin-global/output.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1+
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
22

33
(typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object";

‎packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/default-export/output.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1+
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
22

33
export default function () {
44
_typeof({}) === "object";

‎packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/shadow/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
1+
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
22

33
var _Symbol = foo();
44

0 commit comments

Comments
 (0)
0