update

node_modules/@babel/helper-create-regexp-features-plugin/lib/features.js

@@ -3,14 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.FEATURES = void 0;
 exports.enableFeature = enableFeature;
+exports.featuresKey = void 0;
 exports.hasFeature = hasFeature;
-exports.runtimeKey = exports.featuresKey = exports.FEATURES = void 0;
+exports.runtimeKey = void 0;
 const FEATURES = Object.freeze({
   unicodeFlag: 1 << 0,
   dotAllFlag: 1 << 1,
   unicodePropertyEscape: 1 << 2,
-  namedCaptureGroups: 1 << 3
+  namedCaptureGroups: 1 << 3,
+  unicodeSetsFlag_syntax: 1 << 4,
+  unicodeSetsFlag: 1 << 5
 });
 exports.FEATURES = FEATURES;
 const featuresKey = "@babel/plugin-regexp-features/featuresKey";

node_modules/@babel/helper-create-regexp-features-plugin/lib/index.js

@@ -5,33 +5,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createRegExpFeaturePlugin = createRegExpFeaturePlugin;
 
-var _regexpuCore = _interopRequireDefault(require("regexpu-core"));
+var _regexpuCore = require("regexpu-core");
 
 var _features = require("./features");
 
 var _util = require("./util");
 
-var _package = _interopRequireDefault(require("../package.json"));
-
 var _core = require("@babel/core");
 
-var _helperRegex = require("@babel/helper-regex");
-
-var _helperAnnotateAsPure = _interopRequireDefault(require("@babel/helper-annotate-as-pure"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const version = _package.default.version.split(".").reduce((v, x) => v * 1e5 + +x, 0);
+var _helperAnnotateAsPure = require("@babel/helper-annotate-as-pure");
 
+const version = "7.18.6".split(".").reduce((v, x) => v * 1e5 + +x, 0);
 const versionKey = "@babel/plugin-regexp-features/version";
 
 function createRegExpFeaturePlugin({
   name,
   feature,
-  options = {}
+  options = {},
+  manipulateOptions = () => {}
 }) {
   return {
     name,
+    manipulateOptions,
 
     pre() {
       var _file$get;
@@ -75,36 +70,26 @@ function createRegExpFeaturePlugin({
         } = this;
         const features = file.get(_features.featuresKey);
         const runtime = (_file$get2 = file.get(_features.runtimeKey)) != null ? _file$get2 : true;
-        const regexpuOptions = (0, _util.generateRegexpuOptions)(node, features);
-
-        if (regexpuOptions === null) {
-          return;
-        }
-
+        const regexpuOptions = (0, _util.generateRegexpuOptions)(features);
+        if ((0, _util.canSkipRegexpu)(node, regexpuOptions)) return;
         const namedCaptureGroups = {};
 
-        if (regexpuOptions.namedGroup) {
+        if (regexpuOptions.namedGroups === "transform") {
           regexpuOptions.onNamedGroup = (name, index) => {
             namedCaptureGroups[name] = index;
           };
         }
 
-        node.pattern = (0, _regexpuCore.default)(node.pattern, node.flags, regexpuOptions);
+        node.pattern = _regexpuCore(node.pattern, node.flags, regexpuOptions);
 
-        if (regexpuOptions.namedGroup && Object.keys(namedCaptureGroups).length > 0 && runtime && !isRegExpTest(path)) {
+        if (regexpuOptions.namedGroups === "transform" && Object.keys(namedCaptureGroups).length > 0 && runtime && !isRegExpTest(path)) {
           const call = _core.types.callExpression(this.addHelper("wrapRegExp"), [node, _core.types.valueToNode(namedCaptureGroups)]);
 
           (0, _helperAnnotateAsPure.default)(call);
           path.replaceWith(call);
         }
 
-        if ((0, _features.hasFeature)(features, _features.FEATURES.unicodeFlag)) {
-          (0, _helperRegex.pullFlag)(node, "u");
-        }
-
-        if ((0, _features.hasFeature)(features, _features.FEATURES.dotAllFlag)) {
-          (0, _helperRegex.pullFlag)(node, "s");
-        }
+        node.flags = (0, _util.transformFlags)(regexpuOptions, node.flags);
       }
 
     }

node_modules/@babel/helper-create-regexp-features-plugin/lib/util.js

@@ -3,53 +3,68 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.canSkipRegexpu = canSkipRegexpu;
 exports.generateRegexpuOptions = generateRegexpuOptions;
+exports.transformFlags = transformFlags;
 
 var _features = require("./features");
 
-function generateRegexpuOptions(node, features) {
-  let useUnicodeFlag = false,
-      dotAllFlag = false,
-      unicodePropertyEscape = false,
-      namedGroup = false;
+function generateRegexpuOptions(toTransform) {
+  const feat = (name, ok = "transform") => {
+    return (0, _features.hasFeature)(toTransform, _features.FEATURES[name]) ? ok : false;
+  };
+
+  return {
+    unicodeFlag: feat("unicodeFlag"),
+    unicodeSetsFlag: feat("unicodeSetsFlag") || feat("unicodeSetsFlag_syntax", "parse"),
+    dotAllFlag: feat("dotAllFlag"),
+    unicodePropertyEscapes: feat("unicodePropertyEscape"),
+    namedGroups: feat("namedCaptureGroups"),
+    onNamedGroup: () => {}
+  };
+}
+
+function canSkipRegexpu(node, options) {
   const {
     flags,
     pattern
   } = node;
-  const flagsIncludesU = flags.includes("u");
 
-  if (flagsIncludesU) {
-    if (!(0, _features.hasFeature)(features, _features.FEATURES.unicodeFlag)) {
-      useUnicodeFlag = true;
-    }
+  if (flags.includes("v")) {
+    if (options.unicodeSetsFlag === "transform") return false;
+  }
 
-    if ((0, _features.hasFeature)(features, _features.FEATURES.unicodePropertyEscape) && /\\[pP]{/.test(pattern)) {
-      unicodePropertyEscape = true;
+  if (flags.includes("u")) {
+    if (options.unicodeFlag === "transform") return false;
+
+    if (options.unicodePropertyEscapes === "transform" && /\\[pP]{/.test(pattern)) {
+      return false;
     }
   }
 
-  if ((0, _features.hasFeature)(features, _features.FEATURES.dotAllFlag) && flags.indexOf("s") >= 0) {
-    dotAllFlag = true;
+  if (flags.includes("s")) {
+    if (options.dotAllFlag === "transform") return false;
   }
 
-  if ((0, _features.hasFeature)(features, _features.FEATURES.namedCaptureGroups) && /\(\?<(?![=!])/.test(pattern)) {
-    namedGroup = true;
+  if (options.namedGroups === "transform" && /\(\?<(?![=!])/.test(pattern)) {
+    return false;
   }
 
-  if (!namedGroup && !unicodePropertyEscape && !dotAllFlag && (!flagsIncludesU || useUnicodeFlag)) {
-    return null;
+  return true;
+}
+
+function transformFlags(regexpuOptions, flags) {
+  if (regexpuOptions.unicodeSetsFlag === "transform") {
+    flags = flags.replace("v", "u");
   }
 
-  if (flagsIncludesU && flags.indexOf("s") >= 0) {
-    dotAllFlag = true;
+  if (regexpuOptions.unicodeFlag === "transform") {
+    flags = flags.replace("u", "");
   }
 
-  return {
-    useUnicodeFlag,
-    onNamedGroup: () => {},
-    namedGroup,
-    unicodePropertyEscape,
-    dotAllFlag,
-    lookbehind: true
-  };
+  if (regexpuOptions.dotAllFlag === "transform") {
+    flags = flags.replace("s", "");
+  }
+
+  return flags;
 }