fix: layer with shared encoding ignore repeater #9246
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
domoritz
requested changes
Feb 1, 2024
src/normalize/core.ts
Outdated
| }, | ||
| {config} | ||
| ); | ||
| if (this.isEmpty(encoding) && !this.isEmpty(params.repeater)) { |
There was a problem hiding this comment.
Can we move this check to the second argument of the map unit method?
There was a problem hiding this comment.
ah yes, simplify and updated!
domoritz
approved these changes
Feb 2, 2024
src/normalize/core.ts
Outdated
| @@ -212,6 +211,13 @@ export class CoreNormalizer extends SpecMapper<NormalizerParams, FacetedUnitSpec | |||
|
|
|||
| return super.mapFacet(spec, params); | |||
| } | |||
| // | |||
| private isEmpty(obj: any) { | |||
There was a problem hiding this comment.
I think this should be a helper function outside of this class, no?
There was a problem hiding this comment.
Yes, move this outside the class
domoritz
requested changes
Feb 2, 2024
src/normalize/core.ts
Outdated
| @@ -398,3 +405,10 @@ function mergeProjection<ES extends ExprRef | SignalRef>(opt: { | |||
| } | |||
| return projection ?? parentProjection; | |||
| } | |||
|
|
|||
| function emptyFlag(obj: any) { | |||
There was a problem hiding this comment.
I was thinking this should be it utils. We already have isEmpty there so you could use that.
There was a problem hiding this comment.
good to know that!
src/normalize/core.ts
Outdated
| return this.mapUnit( | ||
| { | ||
| ...spec, | ||
| ...(mergedProjection ? {projection: mergedProjection} : {}), | ||
| ...(mergedEncoding ? {encoding: mergedEncoding} : {}) | ||
| }, | ||
| {config} | ||
| emptyFlag(encoding) && !emptyFlag(params.repeater) |
There was a problem hiding this comment.
Suggested change
| emptyFlag(encoding) && !emptyFlag(params.repeater) | |
| isEmpty(encoding ?? {}) && ! isEmpty(params.repeater ?? {}) |
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.
close #8734
I noticed that the main reason for the spec failed to replace
repeatis due to there are some problem when handling the shared layer encoding, the params.repeater will be read when running mapUnit at the first time, but since in shared layer spec, the encoding will not be at the same layer as the repeater, and the repeater will not be record since mapUnitWithParentEncodingOrProjection will return config only, and therepeatis thus cannot be replaced.I am not familiar with typescript so using some redundant code, I think this can be clean up and be more concised.