Skip to content

Fix/email validation regex #1026

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
cubegao wants to merge 2 commits into
base: main
Choose a base branch
from
+24 −1
Open

Fix/email validation regex #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f3af8c
fix: correct email validation regex pattern
cubegao Aug 20, 2026
06e12c4
Add email validation tests to basic_functions_test
cubegao Aug 20, 2026
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
2 changes: 1 addition & 1 deletion packages/genui/lib/src/catalog/basic_functions.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ class EmailFunction extends SynchronousClientFunction {
Object? executeSync(JsonMap args, ExecutionContext _) {
final Object? value = args['value'];
if (value is! String) return false;
final emailRegex = RegExp(r'^[^@]+@[^@]+\.[^@]+\$');
final emailRegex = RegExp(r'^[^@]+@[^@]+\.[^@]+$');

@gemini-code-assist gemini-code-assist Bot Aug 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Instantiating a RegExp on every invocation of executeSync is inefficient because compiling a regular expression is a relatively expensive operation. Since EmailFunction has a const constructor, you cannot declare a non-static instance field. Instead, consider declaring the RegExp as a static final field inside the EmailFunction class (or as a private top-level variable in the file) to compile it only once.

return emailRegex.hasMatch(value);
}
}
Expand Down
23 changes: 23 additions & 0 deletions packages/genui/test/catalog/basic_functions_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,29 @@ void main() {
expect(await run<int>(func, {'value': null}), 0);
});

test('email', () async {
final EmailFunction func = BasicFunctions.emailFunction;

// Valid emails (Gmail)
expect(await run<bool>(func, {'value': 'zhangsan@gmail.com'}), isTrue);
expect(await run<bool>(func, {'value': 'a@gmail.c'}), isTrue);
expect(await run<bool>(func, {'value': 'first.last@gmail.com'}), isTrue);
expect(await run<bool>(func, {'value': 'user+tag@gmail.com'}), isTrue);

// Invalid emails
expect(await run<bool>(func, {'value': ''}), isFalse);
expect(await run<bool>(func, {'value': 'plainaddress'}), isFalse);
expect(await run<bool>(func, {'value': '@gmail.com'}), isFalse);
expect(await run<bool>(func, {'value': 'no-domain@'}), isFalse);
expect(await run<bool>(func, {'value': 'no-tld@gmail'}), isFalse);
expect(await run<bool>(func, {'value': 'a@gmail@gmail.com'}), isFalse);

// Non-string values return false
expect(await run<bool>(func, {'value': null}), isFalse);
expect(await run<bool>(func, {'value': 123}), isFalse);
expect(await run<bool>(func, <String, Object?>{}), isFalse);
});

test('and', () async {
final AndFunction func = BasicFunctions.andFunction;
expect(
Expand Down
Loading