fix: enumerate Promises (e.g. in for & tablerow) #237
Merged
Conversation
This file contains hidden or 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
Previously, a Promise of an array was not being enumerated in
{% for %}, for example. This is misleading since the library
handles promises elsewhere (e.g. if you {% assign x = promiseArray %}
and then {% for v in x %}, it worked just fine.
This PR makes Promises of arrays handled by changing toEnumerable
to handle then-ables. This affects other iterators, too, e.g. tablerow,
so I put in a test for that as well.
harttle
reviewed
Jun 27, 2020
src/builtin/tags/for.ts
Outdated
| @@ -36,7 +36,7 @@ export default { | |||
| }, | |||
| render: function * (ctx: Context, emitter: Emitter) { | |||
| const r = this.liquid.renderer | |||
| let collection = toEnumerable(evalToken(this.collection, ctx)) | |||
| let collection = yield toEnumerable(evalToken(this.collection, ctx)) | |||
There was a problem hiding this comment.
Can we yield the value (which may be a thenable) instead of the toEmumerable(), that'll keep toEnumerable clean and not aware of promises or/and the generator trick. Like:
let collection = toEnumerable(yield evalToken(this.collection, ctx))There was a problem hiding this comment.
ah sure, one sec. not that familiar with generators tbh
There was a problem hiding this comment.
Updated! How's that? @harttle
There was a problem hiding this comment.
View final diff, I have some dummy commits (you can squash / merge via GitHub?)
|
Great job! @all-contributors please add @tejasmanohar for code. |
|
I've put up a pull request to add @tejasmanohar! 🎉 |
harttle
pushed a commit
that referenced
this pull request
Jul 8, 2020
## [9.14.1](v9.14.0...v9.14.1) (2020-07-08) ### Bug Fixes * enumerate Promises (e.g. in for & tablerow) ([#237](#237)) ([941dd66](941dd66))
|
🎉 This PR is included in version 9.14.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
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.
Previously, a Promise of an array was not being enumerated in
{% for %}, for example. This is unexpected since the library
handles promises elsewhere (e.g. if you {% assign x = promiseArray %}
and then {% for v in x %}, it worked just fine.
This PR makes Promises of arrays handled by changing toEnumerable
to handle then-ables. This affects other iterators, too, e.g. tablerow,
so I put in a test for that as well.