-
Notifications
You must be signed in to change notification settings - Fork 0
Fix nested SelectExpr code generation: parent class qualification, array types, and comment verbosity #222
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.
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
Conversation
|
Important Review skippedBot user detected. To trigger a single review, invoke the You can disable this status message by setting the Note Other AI code review bot(s) detectedCodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review. Comment |
Co-authored-by: arika0093 <[email protected]>
Co-authored-by: arika0093 <[email protected]>
Co-authored-by: arika0093 <[email protected]>
Co-authored-by: arika0093 <[email protected]>
arika0093
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@copilot Please fix the review comments.
…partial declarations, improve comments, extract method Co-authored-by: arika0093 <[email protected]>
arika0093
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…eneration Co-authored-by: arika0093 <[email protected]>
…ray types, and comment verbosity (#222) * Initial plan * Initial analysis of nested SelectExpr issues Co-authored-by: arika0093 <[email protected]> * Fix Issues 1 and 3 for nested SelectExpr - Issue 2 still in progress Co-authored-by: arika0093 <[email protected]> * Fix Issue 2 - array property types now correctly include [] suffix Co-authored-by: arika0093 <[email protected]> * Refactor array type detection into helper method per code review Co-authored-by: arika0093 <[email protected]> * Address PR review comments: rename test file, remove qualifiers with partial declarations, improve comments, extract method Co-authored-by: arika0093 <[email protected]> * Clarify that partial class declarations are required for nested DTO generation Co-authored-by: arika0093 <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: arika0093 <[email protected]> (cherry picked from commit a163791)
* Fix: Remove parent class nesting from implicit DTOs in hash namespaces (#219) * Initial plan * Add test for issue: implicit DTOs should not be nested in parent class when using hash namespace Co-authored-by: arika0093 <[email protected]> * Fix: Implicit DTOs should not be nested in parent class when using hash namespace Co-authored-by: arika0093 <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: arika0093 <[email protected]> (cherry picked from commit dd2d380) * Fix nested SelectExpr inconsistency between playground and source generator (#221) * Initial plan * Add shared IsNestedInsideAnotherSelectExpr helper and use in playground and source generator Co-authored-by: arika0093 <[email protected]> * Add comprehensive tests for nested SelectExpr consistency fix Co-authored-by: arika0093 <[email protected]> * Remove tests for nested SelectExpr type verification --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: arika0093 <[email protected]> Co-authored-by: Arika Ishinami <[email protected]> (cherry picked from commit a25737e) * docs: Add IntroductionSection component and improve accessibility (#223) * feat: add IntroductionSection component for query-based DTO generation * fix: add translate attribute to improve accessibility in playground components * refactor: remove custom animation definitions from tailwind.css (cherry picked from commit 2a039c0) * Fix nested SelectExpr code generation: parent class qualification, array types, and comment verbosity (#222) * Initial plan * Initial analysis of nested SelectExpr issues Co-authored-by: arika0093 <[email protected]> * Fix Issues 1 and 3 for nested SelectExpr - Issue 2 still in progress Co-authored-by: arika0093 <[email protected]> * Fix Issue 2 - array property types now correctly include [] suffix Co-authored-by: arika0093 <[email protected]> * Refactor array type detection into helper method per code review Co-authored-by: arika0093 <[email protected]> * Address PR review comments: rename test file, remove qualifiers with partial declarations, improve comments, extract method Co-authored-by: arika0093 <[email protected]> * Clarify that partial class declarations are required for nested DTO generation Co-authored-by: arika0093 <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: arika0093 <[email protected]> (cherry picked from commit a163791) * docs: separate README contents to other files (#224) (cherry picked from commit 29b0301) * Fix: set default value of settingsExpanded to false in Sidebar component (cherry picked from commit a34d686) * docs: add comprehensive documentation for Nested SelectExpr feature (cherry picked from commit 97439c9) * Revert "docs: add comprehensive documentation for Nested SelectExpr feature" This reverts commit 97439c9. (cherry picked from commit 755698c) * docs: add Nested SelectExpr documentation for reusable DTOs (#225) * docs: add Nested SelectExpr documentation for reusable DTOs * docs: update Nested SelectExpr documentation with important notes and usage requirements * upd * Fix GitHub Issue link in nested-selectexpr.md (cherry picked from commit 64b9787) * fix: NestedSelectExprTest and update documentation (#229) * Fix: update Issue207_NestedSelectExprTest to support partial classes and remove .NET 9 specific warnings * Fix: update documentation for Nested SelectExpr to clarify beta status and remove .NET 9+ recommendation (cherry picked from commit 1aa5ec7) * Document explicit class naming for nested DTOs Added section on explicit class naming in nested DTOs. (cherry picked from commit 1ddc079) * Enhance library comparison with GitHub stars Updated the library comparison table to include GitHub repository star counts for each library. (cherry picked from commit d875f80) * Update Docs link to point to library directory (cherry picked from commit 59498e4) * Refactor Order example to use records and facets Updated the example to use records and facets for Order and OrderChild. (cherry picked from commit c66f8b8) * Add pre-built expression tree caching for IQueryable operations (#234) * Initial plan * Add pre-built expression tree configuration and implementation - Added LinqraftUsePrebuildExpression configuration option (default: false) - Created ExpressionTreeBuilder helper class for generating cached expression fields - Updated SelectExprInfoAnonymous to use pre-built expressions when enabled - Updated SelectExprInfoNamed to use pre-built expressions when enabled - Updated SelectExprInfoExplicitDto to use pre-built expressions when enabled - Pre-built expressions only apply to IQueryable (not IEnumerable) - Pre-built expressions are disabled when captures are used Co-authored-by: arika0093 <[email protected]> * Refactor static field generation to class level - Moved static field generation from method body to class level - Added GenerateStaticFields() virtual method to SelectExprInfo - Updated SelectExprGroups to collect and pass static fields - Updated GenerateSourceCodeSnippets to output static fields before methods - Fixed null reference warning in SelectExprGroups Co-authored-by: arika0093 <[email protected]> * Complete pre-built expression tree implementation - Fixed CompilerVisibleProperty list to include LinqraftUsePrebuildExpression - Anonymous types cannot use pre-built expressions (result type is compiler-generated) - Pre-built expressions only work for named/predefined/explicit DTO types - Added comprehensive tests for IQueryable with different DTO patterns - All tests passing with pre-built expressions enabled Co-authored-by: arika0093 <[email protected]> * Add LinqraftUsePrebuildExpression to all CompilerVisibleProperty lists - Updated examples/Directory.Build.props with new configuration property - Fixed playground/Services/CodeGenerationService.cs to use updated API signature - All projects now support the new LinqraftUsePrebuildExpression configuration Co-authored-by: arika0093 <[email protected]> * Add LinqraftUsePrebuildExpression property to project files * Fix code generation issues per review feedback - Use 'var' instead of explicit type in expression initialization (line 93) - Remove unnecessary '!' null-forgiving operator when fieldName is not null - Fix indentation of generated multi-line lambda expressions - Use explicit Expression<> type instead of 'as' operator (lambdas cannot use 'as') Co-authored-by: arika0093 <[email protected]> * Refactor to use direct expression initialization per review feedback - Updated documentation in global-properties.md for LinqraftUsePrebuildExpression - Added note about captures not supporting pre-built expressions - Refactored ExpressionTreeBuilder to directly initialize expression fields (no lazy init) - Removed GenerateNamedExpressionTreeInitialization and GenerateAnonymousExpressionTreeInitialization - Expression trees now initialized at field declaration, eliminating null checks - Updated SelectExprInfoNamed and SelectExprInfoExplicitDto to use new approach - Added test for multiple DTO types to verify pre-built expressions work correctly - All 6 tests passing Co-authored-by: arika0093 <[email protected]> * Address final review feedback: readonly, indentation, remove test, add playground toggle - Added 'readonly' keyword to static expression fields for immutability - Fixed indentation: ensured proper line ending with AppendLine for multi-line expressions - Deleted Linqraft.Tests.Configuration project as requested - Removed project reference from Linqraft.slnx - Added toggle for LinqraftUsePrebuildExpression in playground Settings section - All tests passing (130/130) Co-authored-by: arika0093 <[email protected]> * revert: reset Linqraft.Tests.Configuration * Fix indentation in BuildExprCodeSnippets for static fields * Add static fields generation to expression code snippets * formatt --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: arika0093 <[email protected]> Co-authored-by: Arika Ishinami <[email protected]> (cherry picked from commit 1761753) * chore(deps): bump stefanzweifel/git-auto-commit-action from 4 to 7 (#236) Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4 to 7. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](stefanzweifel/git-auto-commit-action@v4...v7) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 107f2d2) * Bump AutoMapper from 15.1.0 to 16.0.0 (#237) --- updated-dependencies: - dependency-name: AutoMapper dependency-version: 16.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 623b9fa) * feat: optimize DTO generation and performance documentation (#235) * Refactor GenerateDtoClasses method for improved readability and performance * Add caching for pre-built expressions in SelectExprInfoNamed * Refactor nullable access conversion to simplify default value handling * Update performance documentation to clarify benchmarks and improve readability * Update README to simplify performance and FAQ sections * Fix nullable type handling in GetDefaultValueForType method (cherry picked from commit 54005a1) * formatted (cherry picked from commit 11122cb) * chore: update commit message format for csharpier workflow (cherry picked from commit 735eb9f) * playground: enable ScrollBeyondLastLine and update StickyScroll options in EditorPane and PreviewPane (cherry picked from commit 9bc3057) * Deduplicate DTO class definitions globally across all generated files (#240) * Initial plan * Fix duplicate ChildDto generation for same-shaped nested DTOs in Select expressions Co-authored-by: arika0093 <[email protected]> * Improve code comments based on review feedback Co-authored-by: arika0093 <[email protected]> * Fix duplicate DTO class definitions by deduplicating at generation point Reverted changes to DtoProperty.cs and implemented deduplication in GenerateSourceCodeSnippets.BuildDtoCodeSnippetsGroupedByNamespace instead. This ensures DTOs with the same FullName (namespace + class name) are only generated once, even when used across multiple SelectExpr calls. Co-authored-by: arika0093 <[email protected]> * Implement global DTO deduplication across all files - Collect all DTOs from all SelectExpr groups - Deduplicate globally by FullName before generation - Generate all DTOs in a single shared GeneratedDtos.g.cs file - Each expression group file now only contains expression methods - This ensures DTOs are not duplicated even when used across different files Co-authored-by: arika0093 <[email protected]> * Refactor DTO generation based on code review feedback - Moved global DTO deduplication logic to GenerateSourceCodeSnippets.BuildGlobalDtoCodeSnippet - Separated SelectExprGroups.GenerateCode into two methods: GenerateCode and GenerateCodeWithoutDtos - Made GenerateCommentHeaderPart and GenerateHeaderFlagsPart public for cross-namespace use - Renamed test files to Issue239_* pattern for clarity - Updated playground CodeGenerationService to use new global DTO deduplication - Fixed null reference warning in playground service Co-authored-by: arika0093 <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: arika0093 <[email protected]> (cherry picked from commit 16b287e) * refactor: DTO handling and improve code clarity (#216) * refactor: improve code structure and add documentation for auto-generated DTO attribute * refactor: rename ExportAll method to ExportAllConstantSnippets for clarity * refactor: replace hardcoded DTO attributes with a dedicated method for better maintainability * refactor: add EditorBrowsable attribute to internal DTO attributes for better visibility control (cherry picked from commit ae2ba5f) * fix --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: arika0093 <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Summary
This PR fixes three issues with nested SelectExpr code generation as reported in the issue:
✅ Issue 1: Missing Parent Class Qualification
Problem: When using nested SelectExpr with explicit DTO types declared inside a parent class, the generated code referenced them without the parent class qualifier, causing compilation errors.
Solution:
DtoProperty.csto extract parent class information from the syntax tree when the type symbol is not available (error type)SelectExprInfo.csto useToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)for fully qualified namesGenerateDtoClassInfo.csto preserveglobal::prefix in generic type argumentsExample:
NestedItemDtoEnumerable→global::MinRepro.Issue_NestedSelectExprTest.NestedItemDtoEnumerable✅ Issue 2: Array Property Type Missing [] Suffix
Problem: When using
.ToArray()with nested SelectExpr, the generated DTO property type was missing the array suffix[].Solution:
IsArrayTypehelper method inGenerateDtoClassInfo.csthat checks:IArrayTypeSymbol)[]).ToArray())Example:
NestedItemDtoArray→NestedItemDtoArray[]✅ Issue 3: Verbose Documentation Comments
Problem: SelectExpr method calls in documentation comments included full generic type arguments and lambda bodies, making them overly verbose.
Solution:
AbbreviateAllMethodCallsinDtoProperty.csto detect and skip generic type arguments when abbreviating method callsSkipGenericTypeArgumentshelper method for better code organizationExample:
SelectExpr<TIn,TResult>(lambda)→SelectExpr(...)Review Comments Addressed
Test File Updates
Issue217_NestedSelectExprTest.csper naming conventionIssue_NestedSelectExprTest.NestedItemDtoEnumerable→NestedItemDtoEnumerable)Code Quality Improvements
IsArrayTypehelper to clarify that.ToArray()detection is a necessary compromise when semantic model information is unavailableSkipGenericTypeArgumentshelper method fromAbbreviateAllMethodCallsfor better separation of concernsImportant Note on Partial Class Declarations
Partial class declarations are required when using unqualified DTO type names in nested SelectExpr calls. Without them, the generator cannot determine if the DTO should be nested inside a parent class or placed at the namespace level, and defaults to namespace level placement.
Two approaches work:
Issue_NestedSelectExprTest.NestedItemDtoEnumerablein the SelectExpr type argumentsThe test demonstrates approach #1 for cleaner code.
Testing
Original prompt
This section details on the original issue you should resolve
<issue_title>bug: The code generated for nested SelectExpr is still insufficient</issue_title>
<issue_description>### Minimal Reproducible Example
Generated Output