Skip to content

fix(build): Fix builder fail when model files have part directives #667

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
KiddoV wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(build): Fix builder fail when model files have part directives #667

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39eacf7
fix generate failed when model files have part directives
KiddoV Apr 8, 2026
003b25d
apply suggestions from code review
KiddoV Apr 11, 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
6 changes: 3 additions & 3 deletions packages/brick_build/lib/src/builders/aggregate_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ class AggregateBuilder implements Builder {
imports.addAll(findAllImports(contents));
final newContents = contents
.replaceAll(importRegex, '')
.replaceAll(RegExp("part of '.*';"), '')
.replaceAll(RegExp(r"^part\s'.*';", multiLine: true), '')
.replaceAll(RegExp(r'^export\s.*;', multiLine: true), '');
.replaceAll(RegExp(r'^\s*part(?: of)?\s+["\x27][^"\x27]*["\x27];', multiLine: true), '')
.replaceAll(RegExp(r'^\s*part\s+["\x27][^"\x27]*["\x27];', multiLine: true), '')
Comment thread
KiddoV marked this conversation as resolved.
Outdated
.replaceAll(RegExp(r'^\s*export\s+[^\n;]+;', multiLine: true), '');
Comment thread
KiddoV marked this conversation as resolved.
Outdated
files.add(newContents);
}
}
Expand Down
6 changes: 5 additions & 1 deletion packages/brick_build/lib/src/builders/model_dictionary_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ class ModelDictionaryBuilder<_ClassAnnotation> extends BaseBuilder<_ClassAnnotat
{
for (final annotation in annotations)
'${annotation.element.name}': filesToContents.entries
.firstWhere((entry) => entry.value.contains(RegExp(r'class\s+${annotation.element.name}\s*')))
.firstWhere(
(entry) =>
entry.key.endsWith('.model.dart') && // Only use model files
Copy link
Copy Markdown
Collaborator

@tshedor tshedor Apr 10, 2026

Choose a reason for hiding this comment

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

That's a good fix

entry.value.contains(RegExp('class\\s+${annotation.element.name}\\b')),
Copy link
Copy Markdown
Collaborator

@tshedor tshedor Apr 10, 2026

Choose a reason for hiding this comment

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

Is the word boundary necessary here or could it remain that the ending is an optional whitespace character?

Copy link
Copy Markdown
Author

@KiddoV KiddoV Apr 11, 2026

Choose a reason for hiding this comment

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

We should keep this...
If you remove \b, this will match wrong classes:
Example:

class UserProfile {}
class User {}

Searching for User:
=> Without \b → matches UserProfile
=> With \b → only matches User

)
.key
// Make relative from the `brick/` folder
.replaceAll(RegExp('^lib/'), '../'),
Expand Down
Loading