Refactor to show the similarity between these two regexes

eoghanmurray · Jun 4, 2024 · 46534e2 · 46534e2
1 parent 8337651
commit 46534e2
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/packages/rrweb-snapshot/src/css.ts b/packages/rrweb-snapshot/src/css.ts
@@ -424,6 +424,17 @@ export function parse(css: string, options: ParserOptions = {}): Stylesheet {
    * Parse selector.
    */
 
+  // originally from https://github.com/NxtChg/pieces/blob/3eb39c8287a97632e9347a24f333d52d916bc816/js/css_parser/css_parse.js#L46C1-L47C1
+  const selectorMatcher = new RegExp(
+    '^((' +
+      [
+        /[^\\]"(?:\\"|[^"])*"/.source, // consume any quoted parts (checking that the double quote isn't itself escaped)
+        /[^\\]'(?:\\'|[^'])*'/.source, // same but for single quotes
+        '[^{]',
+      ].join('|') +
+      ')+)',
+  );
+
   function selector() {
     whitespace();
     while (css[0] == '}') {
@@ -432,8 +443,7 @@ export function parse(css: string, options: ParserOptions = {}): Stylesheet {
       whitespace();
     }
 
-    // originally from https://github.com/NxtChg/pieces/blob/3eb39c8287a97632e9347a24f333d52d916bc816/js/css_parser/css_parse.js#L46C1-L47C1
-    const m = match(/^(([^\\]"(?:\\"|[^"])*"|[^\\]'(?:\\'|[^'])*'|[^{])+)/);
+    const m = match(selectorMatcher);
     if (!m) {
       return;
     }
@@ -869,8 +879,8 @@ export function parse(css: string, options: ParserOptions = {}): Stylesheet {
         name +
         '\\s*((?:' +
         [
-          '[^\\\\]"(?:\\\\"|[^"])*"', // consume any quoted parts (checking that the double quote isn't itself escaped)
-          "[^\\\\]'(?:\\\\'|[^'])*'", // same but for single quotes
+          /[^\\]"(?:\\"|[^"])*"/.source, // consume any quoted parts (checking that the double quote isn't itself escaped)
+          /[^\\]'(?:\\'|[^'])*'/.source, // same but for single quotes
           '[^;]',
         ].join('|') +
         ')+);',