mirror of
https://github.com/harttle/liquidjs.git
synced 2026-09-16 12:50:38 -07:00
fix: context for group_by_exp/where_exp/find_exp, #790
This commit is contained in:
@@ -140,7 +140,9 @@ export function * where_exp<T extends object> (this: FilterImpl, arr: T[], itemN
|
|||||||
const array = toArray(arr)
|
const array = toArray(arr)
|
||||||
this.context.memoryLimit.use(array.length)
|
this.context.memoryLimit.use(array.length)
|
||||||
for (const item of array) {
|
for (const item of array) {
|
||||||
const value = yield keyTemplate.value(this.context.spawn({ [itemName]: item }))
|
this.context.push({ [itemName]: item })
|
||||||
|
const value = yield keyTemplate.value(this.context)
|
||||||
|
this.context.pop()
|
||||||
if (value) filtered.push(item)
|
if (value) filtered.push(item)
|
||||||
}
|
}
|
||||||
return filtered
|
return filtered
|
||||||
@@ -165,7 +167,9 @@ export function * group_by_exp<T extends object> (this: FilterImpl, arr: T[], it
|
|||||||
arr = toEnumerable(arr)
|
arr = toEnumerable(arr)
|
||||||
this.context.memoryLimit.use(arr.length)
|
this.context.memoryLimit.use(arr.length)
|
||||||
for (const item of arr) {
|
for (const item of arr) {
|
||||||
const key = yield keyTemplate.value(this.context.spawn({ [itemName]: item }))
|
this.context.push({ [itemName]: item })
|
||||||
|
const key = yield keyTemplate.value(this.context)
|
||||||
|
this.context.pop()
|
||||||
if (!map.has(key)) map.set(key, [])
|
if (!map.has(key)) map.set(key, [])
|
||||||
map.get(key).push(item)
|
map.get(key).push(item)
|
||||||
}
|
}
|
||||||
@@ -185,7 +189,9 @@ export function * find_exp<T extends object> (this: FilterImpl, arr: T[], itemNa
|
|||||||
const predicate = new Value(stringify(exp), this.liquid)
|
const predicate = new Value(stringify(exp), this.liquid)
|
||||||
const array = toArray(arr)
|
const array = toArray(arr)
|
||||||
for (const item of array) {
|
for (const item of array) {
|
||||||
const value = yield predicate.value(this.context.spawn({ [itemName]: item }))
|
this.context.push({ [itemName]: item })
|
||||||
|
const value = yield predicate.value(this.context)
|
||||||
|
this.context.pop()
|
||||||
if (value) return item
|
if (value) return item
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -522,6 +522,20 @@ describe('filters/array', function () {
|
|||||||
- Garlic press
|
- Garlic press
|
||||||
`)
|
`)
|
||||||
})
|
})
|
||||||
|
it('should be aware context', function () {
|
||||||
|
const tpl = `{% assign kitchen_products = products | where_exp: "item", "item.type == target" %}
|
||||||
|
Kitchen products:
|
||||||
|
{% for product in kitchen_products -%}
|
||||||
|
- {{ product.title }}
|
||||||
|
{% endfor %}`
|
||||||
|
const scope = { products, target: 'kitchen' }
|
||||||
|
const html = `
|
||||||
|
Kitchen products:
|
||||||
|
- Spatula
|
||||||
|
- Garlic press
|
||||||
|
`
|
||||||
|
return test(tpl, scope, html)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
describe('group_by', function () {
|
describe('group_by', function () {
|
||||||
const members = [
|
const members = [
|
||||||
|
|||||||
Reference in New Issue
Block a user