Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mark wrapNativeSuper and wrapRegExp as pure #11134

Merged
merged 1 commit into from Feb 21, 2020
Merged

Mark wrapNativeSuper and wrapRegExp as pure #11134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/babel-helper-create-regexp-features-plugin/package.json
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@
"babel-plugin"
],
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.8.3",
"@babel/helper-regex": "^7.8.3",
"regexpu-core": "^4.6.0"
},
Expand Down
14 changes: 8 additions & 6 deletions packages/babel-helper-create-regexp-features-plugin/src/index.js
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ import { generateRegexpuOptions } from "./util";
import pkg from "../package.json";
import { types as t } from "@babel/core";
import { pullFlag } from "@babel/helper-regex";
import annotateAsPure from "@babel/helper-annotate-as-pure";

// Note: Versions are represented as an integer. e.g. 7.1.5 is represented
// as 70000100005. This method is easier than using a semver-parsing
Expand Down Expand Up @@ -68,12 +69,13 @@ export function createRegExpFeaturePlugin({ name, feature, options = {} }) {
runtime &&
!isRegExpTest(path)
) {
path.replaceWith(
t.callExpression(this.addHelper("wrapRegExp"), [
node,
t.valueToNode(namedCaptureGroups),
]),
);
const call = t.callExpression(this.addHelper("wrapRegExp"), [
node,
t.valueToNode(namedCaptureGroups),
]);
annotateAsPure(call);

path.replaceWith(call);
}
if (hasFeature(features, FEATURES.unicodeFlag)) {
pullFlag(node, "u");
Expand Down
14 changes: 9 additions & 5 deletions packages/babel-plugin-transform-classes/src/transformClass.js
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@ import ReplaceSupers, {
import optimiseCall from "@babel/helper-optimise-call-expression";
import * as defineMap from "@babel/helper-define-map";
import { traverse, template, types as t } from "@babel/core";
import annotateAsPure from "@babel/helper-annotate-as-pure";

type ReadonlySet<T> = Set<T> | { has(val: T): boolean };

Expand Down Expand Up @@ -565,11 +566,14 @@ export default function transformClass(
const closureArgs = [];

if (classState.isDerived) {
const arg = classState.extendsNative
? t.callExpression(classState.file.addHelper("wrapNativeSuper"), [
t.cloneNode(superName),
])
: t.cloneNode(superName);
let arg = t.cloneNode(superName);
if (classState.extendsNative) {
arg = t.callExpression(classState.file.addHelper("wrapNativeSuper"), [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add pure notation to the helper sources so we don't worry about if the helper needs pure annotation when added?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have thought about it, but the problem is that the annotation should be added to the CallExpression, and the æddHelper function only returns the callee.

arg,
]);
annotateAsPure(arg);
}

const param = classState.scope.generateUidIdentifierBasedOnNode(
superName,
);
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/loose/output.js
View file
Open in desktop
Expand Up @@ -22,4 +22,4 @@ var List = /*#__PURE__*/function (_Array) {
}

return List;
}(_wrapNativeSuper(Array));
}( /*#__PURE__*/_wrapNativeSuper(Array));
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/spec/output.js
View file
Open in desktop
Expand Up @@ -30,4 +30,4 @@ var List = /*#__PURE__*/function (_Array) {
}

return List;
}(_wrapNativeSuper(Array));
}( /*#__PURE__*/_wrapNativeSuper(Array));
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-classes/test/fixtures/regression/8499/output.js
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ var CustomElement = /*#__PURE__*/function (_HTMLElement) {
}

return CustomElement;
}(babelHelpers.wrapNativeSuper(HTMLElement));
}( /*#__PURE__*/babelHelpers.wrapNativeSuper(HTMLElement));

;
new CustomElement();
Expand Down
2 changes: 1 addition & 1 deletion ...babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/basic/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
"foo".match(babelHelpers.wrapRegExp(/(.)\1/, {
"foo".match( /*#__PURE__*/babelHelpers.wrapRegExp(/(.)\1/, {
double: 1
}));
2 changes: 1 addition & 1 deletion ...d-capturing-groups-regex/test/fixtures/wrapper/skips-anonymous-capturing-groups/output.js
View file
Open in desktop
@@ -1,3 +1,3 @@
"abba".match(babelHelpers.wrapRegExp(/(.)(.)\2\1/, {
"abba".match( /*#__PURE__*/babelHelpers.wrapRegExp(/(.)(.)\2\1/, {
n: 2
}));
2 changes: 1 addition & 1 deletion packages/babel-preset-env/test/fixtures/plugins-integration/issue-7527/output.js
View file
Open in desktop
Expand Up @@ -32,6 +32,6 @@ var MyDate = /*#__PURE__*/function (_Date) {
}

return MyDate;
}(_wrapNativeSuper(Date));
}( /*#__PURE__*/_wrapNativeSuper(Date));

var myDate = new MyDate();