feat: passing liquid to FilterImpl, closes #277

This commit is contained in:
harttle
2020-12-08 00:17:27 +08:00
parent 2bbf50171b
commit f9f595f0f4
11 changed files with 52 additions and 25 deletions
+5 -4
View File
@@ -5,6 +5,7 @@ import { Filter } from './filter/filter'
import { Context } from '../context/context'
import { ValueToken } from '../tokens/value-token'
import { assert } from '../util/assert'
import { Liquid } from '../liquid'
export class Value {
public readonly filters: Filter[] = []
@@ -13,15 +14,15 @@ export class Value {
/**
* @param str the value to be valuated, eg.: "foobar" | truncate: 3
*/
public constructor (str: string, private readonly filterMap: FilterMap) {
public constructor (str: string, private readonly filterMap: FilterMap, liquid: Liquid) {
const tokenizer = new Tokenizer(str)
this.initial = tokenizer.readValue()
this.filters = tokenizer.readFilters().map(({ name, args }) => new Filter(name, this.filterMap.get(name), args))
this.filters = tokenizer.readFilters().map(({ name, args }) => new Filter(name, this.filterMap.get(name), args, liquid))
}
public * value (ctx: Context) {
assert(ctx, () => 'unable to evaluate: context not defined')
const lenient = ctx.opts.lenientIf && this.filters.length > 0 && this.filters[0].name == "default"
const lenient = ctx.opts.lenientIf && this.filters.length > 0 && this.filters[0].name === 'default'
let val = yield evalToken(this.initial, ctx, lenient)
for (const filter of this.filters) {
val = yield filter.render(val, ctx)