cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge multiple regex transform plugin (#10447)

Browse Source 
* feat: implement create-regexp-features-plugin

* fix: test input is not effective

* refactor: leverage create-regexp-features-plugin

* test: add more test cases

* test: update test fixture

* chore: add type annotation to features

* test: add regression test for issue 9892

* add regression test for issue 9199

* address review comments from Nicolò

* address review comments from Brian

* small tweaks

* Enable dotAllFlag when flags includes u
This commit is contained in:
Huáng Jùnliàng
2019-10-29 17:58:04 -04:00
committed by Nicolò Ribaudo
parent ec3345bb57
commit 8ffca0475a
38 changed files with 333 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/babel-plugin-transform-named-capturing-groups-regex/package.json
View File

@@ -21,7 +21,7 @@
},
"bugs": "https://github.com/babel/babel/issues",
"dependencies": {
"regexpu-core": "^4.6.0"
"@babel/helper-create-regexp-features-plugin": "^7.6.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0"

55
packages/babel-plugin-transform-named-capturing-groups-regex/src/index.js
View File

@@ -1,56 +1,15 @@
import rewritePattern from "regexpu-core";
/* eslint-disable @babel/development/plugin-name */
import { createRegExpFeaturePlugin } from "@babel/helper-create-regexp-features-plugin";
export default function({ types: t }, options) {
export default function(core, options) {
const { runtime = true } = options;
if (typeof runtime !== "boolean") {
throw new Error("The 'runtime' option must be boolean");
}
return {
return createRegExpFeaturePlugin({
name: "transform-named-capturing-groups-regex",
visitor: {
RegExpLiteral(path) {
const node = path.node;
if (!/\(\?<(?![=!])/.test(node.pattern)) {
// Return early if there are no named groups.
// The .indexOf check may have false positives (e.g. /\(?</); in
// this case we parse the regex and regexp-tree won't transform it.
return;
}
const namedCapturingGroups = {};
const result = rewritePattern(node.pattern, node.flags, {
namedGroup: true,
//todo: consider refactor `lookbehind` true as modular plugin
lookbehind: true,
onNamedGroup(name, index) {
namedCapturingGroups[name] = index;
},
});
if (Object.keys(namedCapturingGroups).length > 0) {
node.pattern = result;
if (runtime && !isRegExpTest(path)) {
path.replaceWith(
t.callExpression(this.addHelper("wrapRegExp"), [
node,
t.valueToNode(namedCapturingGroups),
]),
);
}
}
},
},
};
}
function isRegExpTest(path) {
return (
path.parentPath.isMemberExpression({
object: path.node,
computed: false,
}) && path.parentPath.get("property").isIdentifier({ name: "test" })
);
feature: "namedCaptureGroups",
options: { runtime },
});
}

7
packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/issue-10601/exec.js vendored Normal file
View File

@@ -0,0 +1,7 @@
const regex = /<(?<tag>\d)+>.*?<\/\k<tag>>/su;
const result = regex.exec('<0>xxx\nyyy</0>');
expect(result.groups).toEqual({
tag: "0"
});

3
packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/runtime/issue-10601/options.json vendored Normal file
View File

@@ -0,0 +1,3 @@
{
"minNodeVersion": "8.0.0"
}

1
packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group-unicode/input.js vendored Normal file
View File

@@ -0,0 +1 @@
/no-groups-\(?<looks-like-a-group>looks\)\u{10000}/u;

7
packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group-unicode/options.json vendored Normal file
View File

@@ -0,0 +1,7 @@
{
"plugins": [
["external-helpers", { "helperVersion": "7.1000.0" }],
"transform-named-capturing-groups-regex",
"transform-unicode-regex"
]
}

1
packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group-unicode/output.js vendored Normal file
View File

@@ -0,0 +1 @@
/no\x2Dgroups\x2D\(?<looks\x2Dlike\x2Da\x2Dgroup>looks\)(?:\uD800\uDC00)/;

2
packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group/output.js vendored
View File

@@ -1 +1 @@
/no-groups-\(?<looks-like-a-group>looks\)/;
/no\x2Dgroups\x2D\(?<looks\x2Dlike\x2Da\x2Dgroup>looks\)/;