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
+2
View File
@@ -1,5 +1,7 @@
import { Context } from '../../context/context'
import { Liquid } from '../../liquid'
export interface FilterImpl {
context: Context;
liquid: Liquid;
}
+6 -2
View File
@@ -2,11 +2,15 @@ import { FilterImplOptions } from './filter-impl-options'
import { Filter } from './filter'
import { FilterArg } from '../../parser/filter-arg'
import { assert } from '../../util/assert'
import { Liquid } from '../../liquid'
export class FilterMap {
private impls: {[key: string]: FilterImplOptions} = {}
constructor (private readonly strictFilters: boolean) {}
constructor (
private readonly strictFilters: boolean,
private readonly liquid: Liquid
) {}
get (name: string) {
const impl = this.impls[name]
@@ -19,6 +23,6 @@ export class FilterMap {
}
create (name: string, args: FilterArg[]) {
return new Filter(name, this.get(name), args)
return new Filter(name, this.get(name), args, this.liquid)
}
}
+5 -2
View File
@@ -3,16 +3,19 @@ import { Context } from '../../context/context'
import { identify } from '../../util/underscore'
import { FilterImplOptions } from './filter-impl-options'
import { FilterArg, isKeyValuePair } from '../../parser/filter-arg'
import { Liquid } from '../../liquid'
export class Filter {
public name: string
public args: FilterArg[]
private impl: FilterImplOptions
private liquid: Liquid
public constructor (name: string, impl: FilterImplOptions, args: FilterArg[]) {
public constructor (name: string, impl: FilterImplOptions, args: FilterArg[], liquid: Liquid) {
this.name = name
this.impl = impl || identify
this.args = args
this.liquid = liquid
}
public * render (value: any, context: Context) {
const argv: any[] = []
@@ -20,6 +23,6 @@ export class Filter {
if (isKeyValuePair(arg)) argv.push([arg[0], yield evalToken(arg[1], context)])
else argv.push(yield evalToken(arg, context))
}
return yield this.impl.apply({ context }, [value, ...argv])
return yield this.impl.apply({ context, liquid: this.liquid }, [value, ...argv])
}
}
+3 -2
View File
@@ -6,12 +6,13 @@ import { Template } from '../template/template'
import { Context } from '../context/context'
import { Emitter } from '../render/emitter'
import { OutputToken } from '../tokens/output-token'
import { Liquid } from '../liquid'
export class Output extends TemplateImpl<OutputToken> implements Template {
private value: Value
public constructor (token: OutputToken, filters: FilterMap) {
public constructor (token: OutputToken, filters: FilterMap, liquid: Liquid) {
super(token)
this.value = new Value(token.content, filters)
this.value = new Value(token.content, filters, liquid)
}
public * render (ctx: Context, emitter: Emitter) {
const val = yield this.value.value(ctx)
+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)