feat(cli): add inclusion resolver to lb4 relation
#3856
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
agnes512
force-pushed
the
inclusion-cli
branch
2 times, most recently
from
f37f8b4 to
49968eb
Compare
agnes512
force-pushed
the
inclusion-cli
branch
from
49968eb to
4b7a0bf
Compare
agnes512
commented
Oct 2, 2019
dhmlau
reviewed
Oct 2, 2019
| const relationPropertyName = this._getRepositoryRelationPropertyName(); | ||
| if (options.isInclusionResolverRegistered) { | ||
| const statement = | ||
| "this.registerInclusionResolver('" + |
There was a problem hiding this comment.
When first looking at this, I wonder if we can use the template string https://developers.google.com/web/updates/2015/01/ES6-Template-Strings instead of concatenating various strings. But it seems to be how we're doing it throughout the file. This might be something to consider but feel free to ignore.
There was a problem hiding this comment.
Agree. Template string makes the code easier to read.
jannyHou
reviewed
Oct 2, 2019
packages/cli/test/integration/generators/relation.has-many.integration.js
Outdated
Show resolved
Hide resolved
agnes512
force-pushed
the
inclusion-cli
branch
from
7d80293 to
911fb07
Compare
bajtos
suggested changes
Oct 3, 2019
There was a problem hiding this comment.
The pull request looks good at high level, I'd like you to improve few details.
I noticed that hasOne relation is not covered by your changes because it's not implemented yet. Can you please update the Acceptance Criteria in #2980 to mention that we should implement the "inclusion resolver" prompt too?
| /public readonly customer: BelongsToAccessor<Customer, typeof Order\.prototype\.id>;\n/, | ||
| /constructor\(@inject\('datasources\.db'\) dataSource: DbDataSource, @repository\.getter\('CustomerRepository'\) protected customerRepositoryGetter: Getter<CustomerRepository>,\) \{\n/, | ||
| /super\(Order, dataSource\);\n {4}this\.customer = this\.createBelongsToAccessorFor\('customer', customerRepositoryGetter,\);\n {2}\}\n/, | ||
| /super\(Order, dataSource\);\n {4}this\.customer = this\.createBelongsToAccessorFor\('customer', customerRepositoryGetter,\);\n/, |
There was a problem hiding this comment.
These regexp-based tests are verify difficult to understand and work with. Let's switch to snapshots instead. See #3788.
How to proceed:
- Open a new PR that will migrate these tests to snapshots. Don't make any changes in the production code, this way we will know that no regression is accidentally introduced.
- Rebase this PR on top of the first one. Update the snapshots to capture the new version of generated code.
packages/cli/test/integration/generators/relation.belongs-to.integration.js
Outdated
Show resolved
Hide resolved
packages/cli/test/integration/generators/relation.has-many.integration.js
Outdated
Show resolved
Hide resolved
packages/cli/test/integration/generators/relation.has-many.integration.js
Outdated
Show resolved
Hide resolved
agnes512
force-pushed
the
inclusion-cli
branch
from
911fb07 to
8ec8625
Compare
raymondfeng
reviewed
Oct 7, 2019
packages/cli/test/integration/generators/relation.belongs-to.integration.js
Show resolved
Hide resolved
raymondfeng
reviewed
Oct 7, 2019
packages/cli/test/integration/generators/relation.has-many.integration.js
Show resolved
Hide resolved
raymondfeng
approved these changes
Oct 7, 2019
agnes512
force-pushed
the
inclusion-cli
branch
from
1a5e4e8 to
a77b297
Compare
bajtos
reviewed
Oct 8, 2019
bajtos
reviewed
Oct 8, 2019
bajtos
approved these changes
Oct 8, 2019
agnes512
force-pushed
the
inclusion-cli
branch
from
a77b297 to
14a6131
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implements #3451
(updated the cli relation tests with snapshots in #3875)
Checklist
👉 Read and sign the CLA (Contributor License Agreement) 👈
npm testpasses on your machinepackages/cliwere updatedexamples/*were updated👉 Check out how to submit a PR 👈