Skip to content

allow RegexOptions.NonBacktracking #4104

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

allow RegexOptions.NonBacktracking #4104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfb3158
Allow RegexOptions.NonBacktracking as 'l' flag
ieviev Apr 24, 2025
04d1bd2
passing --enable-experimental-regexp-engine to mocha
ieviev Apr 29, 2025
c014486
naming
ieviev Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions src/Fable.Build/Test/JavaScript.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,22 @@ open SimpleExec

let private mainTestSourceDir = Path.Resolve("tests", "Js", "Main")

let private mainTestProject =
Path.Resolve("tests", "Js", "Main", "Fable.Tests.fsproj")
let private mainTestProject = Path.Resolve("tests", "Js", "Main", "Fable.Tests.fsproj")

let private testReact (isWatch: bool) =
let private mochaBin = Path.Resolve("node_modules", ".bin", "mocha")

let private testReact(isWatch: bool) =
let workingDirectory = Path.Resolve("tests", "React")

Command.Run("npm", "install", workingDirectory = workingDirectory)

if isWatch then
Async.Parallel
[
Command.WatchFableAsync(CmdLine.appendRaw "--noCache", workingDirectory = workingDirectory)
Command.WatchFableAsync(
CmdLine.appendRaw "--noCache",
workingDirectory = workingDirectory
)
|> Async.AwaitTask

Command.RunAsync("npx", "jest --watch", workingDirectory = workingDirectory)
Expand All @@ -34,16 +38,17 @@ let private testReact (isWatch: bool) =

Command.Run("npx", "jest", workingDirectory = workingDirectory)

let private testAdaptive (isWatch: bool) =
let private testAdaptive(isWatch: bool) =
let folderName = "Adaptive"
let sourceDir = Path.Resolve("tests", "Js", folderName)

let destinationDir = Path.Resolve("temp", "tests", "JavaScript", folderName)

let mochaCommand =
CmdLine.empty
|> CmdLine.appendRaw "npx"
|> CmdLine.appendRaw "mocha"
|> CmdLine.appendRaw "node"
|> CmdLine.appendRaw "--enable-experimental-regexp-engine"
|> CmdLine.appendRaw mochaBin
|> CmdLine.appendRaw destinationDir
|> CmdLine.appendPrefix "--reporter" "dot"
|> CmdLine.appendPrefix "-t" "10000"
Expand Down Expand Up @@ -83,8 +88,9 @@ let private handleMainTests (isWatch: bool) (noDotnet: bool) =

let mochaCommand =
CmdLine.empty
|> CmdLine.appendRaw "npx"
|> CmdLine.appendRaw "mocha"
|> CmdLine.appendRaw "node"
|> CmdLine.appendRaw "--enable-experimental-regexp-engine"
|> CmdLine.appendRaw mochaBin
|> CmdLine.appendRaw destinationDir
|> CmdLine.appendPrefix "--reporter" "dot"
|> CmdLine.appendPrefix "-t" "10000"
Expand Down Expand Up @@ -129,7 +135,11 @@ let private handleMainTests (isWatch: bool) (noDotnet: bool) =
|> Async.RunSynchronously
|> ignore
else
Command.Run("dotnet", "run -c Release", workingDirectory = Path.Combine("tests", "Js", "Main"))
Command.Run(
"dotnet",
"run -c Release",
workingDirectory = Path.Combine("tests", "Js", "Main")
)

// Test the Main tests against JavaScript
Command.Fable(fableArgs, workingDirectory = destinationDir)
Expand All @@ -143,7 +153,7 @@ let private handleMainTests (isWatch: bool) (noDotnet: bool) =
// if isCI.IsSome then
// Standalone.handleStandaloneFast ()

let handle (args: string list) =
let handle(args: string list) =
let isReactOnly = args |> List.contains "--react-only"
let isStandaloneOnly = args |> List.contains "--standalone-only"
let isAdaptiveOnly = args |> List.contains "--adaptive-only"
Expand All @@ -155,7 +165,8 @@ let handle (args: string list) =
| (true, true, _)
| (true, _, true)
| (_, true, true) ->
failwith "Cannot use '--react-only', '--standalone-only' and '--adaptive-only' at the same time"
failwith
"Cannot use '--react-only', '--standalone-only' and '--adaptive-only' at the same time"

| _ -> ()

Expand Down
13 changes: 9 additions & 4 deletions src/fable-library-ts/RegExp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ export function create(pattern: string, options = 0) {
// * Compiled: 0x0008 (ignored)
// * Singleline: 0x0010
// * ECMAScript: 0x0100 (ignored)
if ((options & ~(1 ^ 2 ^ 8 ^ 16 ^ 256)) !== 0) {
throw new Error("RegexOptions only supports: IgnoreCase, Multiline, Compiled, Singleline and ECMAScript");
// * NonBacktracking: 0x0400
if ((options & ~(1 ^ 2 ^ 8 ^ 16 ^ 256 ^ 1024)) !== 0) {
throw new Error("RegexOptions only supports: IgnoreCase, Multiline, Compiled, Singleline, ECMAScript and NonBacktracking");
}
// Set always global and unicode flags for compatibility with dotnet, see #2925
let flags = "gu";

let flags = "";
// Set global and unicode flags for compatibility with dotnet, see #2925
// for NonBacktracking, add just 'l', ('u' + 'l' is unsupported, 'g' + 'l'
// is supported only with '--enable-experimental-regexp-engine')
flags += options & 1024 ? "l" : "gu";
flags += options & 1 ? "i" : ""; // 0x0001 RegexOptions.IgnoreCase
flags += options & 2 ? "m" : "";
flags += options & 16 ? "s" : "";
Expand Down
31 changes: 31 additions & 0 deletions tests/Js/Main/RegexTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,37 @@ let tests =
let r = Regex("[a-z]", options)
int r.Options |> equal 257

testCase "RegexOptions.NonBacktracking = 1024" <| fun _ ->
let options = RegexOptions.NonBacktracking
int options |> equal 1024

// these tests depend on 'node --enable-experimental-regexp-engine' or
// a newer version of V8 that supports 'l' flag
// /lu (with unicode) is not supported
// /lm (with multiline) is not supported
testCase "Nonbacktracking regex tests" <| fun _ ->
let none = RegexOptions.None
let nonb = RegexOptions.NonBacktracking
// let ignorecase = RegexOptions.IgnoreCase
// let multilineignorecase = multiline ||| ignorecase

let sameResult extraopts str pat =
let result1 = Regex.Match(str, pat, none ||| extraopts).Success
let result2 = Regex.Match(str, pat, nonb ||| extraopts).Success
equal result1 result2

let str = "For more information, see Chapter 3.4.5.1"
sameResult none str "Chapter \d+(\.\d)*"
sameResult none str "chapter \d+(\.\d)*"

// some combinations of settings are not allowed with linear:
// Invalid regular expression: /ab\ncd/ilm: Cannot be executed in linear time
// sameResult multilineignorecase "^ab" "ab\ncd"
// sameResult multilineignorecase "^cd" "ab\ncd"
// sameResult multilineignorecase "^AB" "ab\ncd"
// sameResult multilineignorecase "^bc" "ab\ncd"


testCase "Regex.IsMatch with IgnoreCase and Multiline works" <| fun _ ->
let str = "ab\ncd"
let option1 = RegexOptions.IgnoreCase
Expand Down
Loading