feat: make convertHexDigitsShorthand behind a flag

antfu · Sep 1, 2024 · ae8b144 · ae8b144
1 parent 75ee5be
commit ae8b144
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 23 deletions.
diff --git a/src/convert.ts b/src/convert.ts
@@ -17,6 +17,7 @@ export function onigurumaToRegexp(
   } = syntaxLowering(pattern, {
     removePossessiveQuantifier: true,
     removeAtomicGroup: true,
+    convertHexDigitsShorthand: true,
     ...options,
   })
 

diff --git a/src/lowering.ts b/src/lowering.ts
@@ -46,6 +46,13 @@ export interface SyntaxLoweringOptions {
    * @default false
    */
   removeAtomicGroup?: boolean
+
+  /**
+   * Convert `\h` and `\H` to `[0-9A-Fa-f]` and `[^0-9A-Fa-f]` respectively.
+   *
+   * @default false
+   */
+  convertHexDigitsShorthand?: boolean
 }
 
 export interface SyntaxLoweringResult {
@@ -64,6 +71,7 @@ export function syntaxLowering(
     preserveFlags = false,
     removePossessiveQuantifier = false,
     removeAtomicGroup = false,
+    convertHexDigitsShorthand = false,
   } = options
 
   let output = ''
@@ -89,30 +97,32 @@ export function syntaxLowering(
 
       // Escape sequences
       if (char === '\\') {
-        // Expand \h shorthands
-        if (input[i + 1] === 'h') {
-          const body = `0-9A-Fa-f`
-          if (head === '[') {
-            output += body
-          }
-          else {
-            output += `[${body}]`
-          }
-          i += 2
-          continue
-        }
-        if (input[i + 1] === 'H') {
-          if (head === '[') {
-            throw new RegExpConversionError(
-              'Expending \\H in character class is not supported',
-              { pattern: input, converted: output, cursor: i },
-            )
+        // Expand \h and \H
+        if (convertHexDigitsShorthand) {
+          if (input[i + 1] === 'h') {
+            const body = `0-9A-Fa-f`
+            if (head === '[') {
+              output += body
+            }
+            else {
+              output += `[${body}]`
+            }
+            i += 2
+            continue
           }
-          else {
-            output += `[^0-9A-Fa-f]`
+          if (input[i + 1] === 'H') {
+            if (head === '[') {
+              throw new RegExpConversionError(
+                'Expending \\H in character class is not supported',
+                { pattern: input, converted: output, cursor: i },
+              )
+            }
+            else {
+              output += `[^0-9A-Fa-f]`
+            }
+            i += 2
+            continue
           }
-          i += 2
-          continue
         }
         output += char + input[i + 1]
         i += 2

diff --git a/test/lowering.test.ts b/test/lowering.test.ts
@@ -114,7 +114,7 @@ it('lowering mixed flags', () => {
 })
 
 it('lowering \\h', () => {
-  expect(syntaxLowering('(?x)\\h [\\h\\w] \\H'))
+  expect(syntaxLowering('(?x)\\h [\\h\\w] \\H', { convertHexDigitsShorthand: true }))
     .toMatchInlineSnapshot(`
       {
         "flags": "",