Skip to content

feat(minifier): support advanced String::indexOf evaluation #10186

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

Merged
graphite-app merged 1 commit into from
Apr 2, 2025
Merged

feat(minifier): support advanced String::indexOf evaluation #10186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 27 additions & 21 deletions crates/oxc_minifier/src/peephole/replace_known_methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,24 @@ impl<'a> PeepholeOptimizations {
}
let Expression::StringLiteral(s) = object else { return None };
let search_value = match args.first() {
Some(Argument::StringLiteral(string_lit)) => Some(string_lit.value.as_str()),
Some(Argument::SpreadElement(_)) => return None,
Some(arg @ match_expression!(Argument)) => {
Some(arg.to_expression().get_side_free_string_value(&ctx)?)
}
None => None,
_ => return None,
};
let search_start_index = match args.get(1) {
Some(Argument::NumericLiteral(numeric_lit)) => Some(numeric_lit.value),
Some(Argument::SpreadElement(_)) => return None,
Some(arg @ match_expression!(Argument)) => {
Some(arg.to_expression().get_side_free_number_value(&ctx)?)
}
None => None,
_ => return None,
};
let result = match name {
"indexOf" => s.value.as_str().index_of(search_value, search_start_index),
"lastIndexOf" => s.value.as_str().last_index_of(search_value, search_start_index),
"indexOf" => s.value.as_str().index_of(search_value.as_deref(), search_start_index),
"lastIndexOf" => {
s.value.as_str().last_index_of(search_value.as_deref(), search_start_index)
}
_ => unreachable!(),
};
#[expect(clippy::cast_precision_loss)]
Expand Down Expand Up @@ -1024,32 +1030,32 @@ mod test {
test("x = 'abcdefbe'.indexOf('b', 2)", "x = 6");
test("x = 'abcdef'.indexOf('bcd')", "x = 1");
test("x = 'abcdefsdfasdfbcdassd'.indexOf('bcd', 4)", "x = 13");
test_same("x = 'abcdef'.indexOf(...a, 1)");
test_same("x = 'abcdef'.indexOf('b', ...a)");
test_same("x = 'abcdef'.indexOf(a, 1)");
test_same("x = 'abcdef'.indexOf('b', a)");

test("x = 'abcdef'.lastIndexOf('b')", "x = 1");
test("x = 'abcdefbe'.lastIndexOf('b')", "x = 6");
test("x = 'abcdefbe'.lastIndexOf('b', 5)", "x = 1");

// Both elements must be strings. Don't do anything if either one is not
// string.
// TODO: cast first arg to a string, and fold if possible.
// test("x = 'abc1def'.indexOf(1)", "x = 3");
// test("x = 'abcNaNdef'.indexOf(NaN)", "x = 3");
// test("x = 'abcundefineddef'.indexOf(undefined)", "x = 3");
// test("x = 'abcnulldef'.indexOf(null)", "x = 3");
// test("x = 'abctruedef'.indexOf(true)", "x = 3");

// The following test case fails with JSC_PARSE_ERROR. Hence omitted.
// test_same("x = 1.indexOf('bcd');");
test("x = 'abc1def'.indexOf(1)", "x = 3");
test("x = 'abcNaNdef'.indexOf(NaN)", "x = 3");
test("x = 'abcundefineddef'.indexOf(undefined)", "x = 3");
test("x = 'abcnulldef'.indexOf(null)", "x = 3");
test("x = 'abctruedef'.indexOf(true)", "x = 3");

test_same("x = 1 .indexOf('bcd');");
test_same("x = NaN.indexOf('bcd')");
test("x = undefined.indexOf('bcd')", "x = (void 0).indexOf('bcd')");
test_same("x = null.indexOf('bcd')");
test_same("x = (!0).indexOf('bcd')");
test_same("x = (!1).indexOf('bcd')");

// Avoid dealing with regex or other types.
test_same("x = 'abcdef'.indexOf(/b./)");
test_same("x = 'abcdef'.indexOf({a:2})");
test_same("x = 'abcdef'.indexOf([1,2])");
// dealing with regex or other types.
test("x = 'abcdef/b./'.indexOf(/b./)", "x = 6");
test("x = 'abcdef[object Object]'.indexOf({a:2})", "x = 6");
test("x = 'abcdef1,2'.indexOf([1,2])", "x = 6");

// Template Strings
test("x = `abcdef`.indexOf('b')", "x = 1");
Expand Down
Loading