Skip to content

Commit

Permalink
fix: "filter is not a function" for uniq
Browse files Browse the repository at this point in the history
  • Loading branch information
harttle committed Aug 23, 2024
1 parent 2d59cff commit 68387c3
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 14 deletions.
6 changes: 3 additions & 3 deletions src/context/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Drop } from '../drop/drop'
import { __assign } from 'tslib'
import { NormalizedFullOptions, defaultOptions, RenderOptions } from '../liquid-options'
import { Scope } from './scope'
import { isArray, isNil, isUndefined, isString, isFunction, toLiquid, InternalUndefinedVariableError, toValueSync, isObject, Limiter } from '../util'
import { hasOwnProperty, isArray, isNil, isUndefined, isString, isFunction, toLiquid, InternalUndefinedVariableError, toValueSync, isObject, Limiter } from '../util'

type PropertyKey = string | number;

Expand Down Expand Up @@ -133,7 +133,7 @@ export function readProperty (obj: Scope, key: PropertyKey, ownPropertyOnly: boo
return value
}
export function readJSProperty (obj: Scope, key: PropertyKey, ownPropertyOnly: boolean) {
if (ownPropertyOnly && !Object.hasOwnProperty.call(obj, key) && !(obj instanceof Drop)) return undefined
if (ownPropertyOnly && !hasOwnProperty.call(obj, key) && !(obj instanceof Drop)) return undefined
return obj[key]
}

Expand All @@ -148,7 +148,7 @@ function readLast (obj: Scope) {
}

function readSize (obj: Scope) {
if (obj.hasOwnProperty('size') || obj['size'] !== undefined) return obj['size']
if (hasOwnProperty.call(obj, 'size') || obj['size'] !== undefined) return obj['size']
if (isArray(obj) || isString(obj)) return obj.length
if (typeof obj === 'object') return Object.keys(obj).length
}
11 changes: 3 additions & 8 deletions src/filters/array.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { toArray, argumentsToValue, toValue, stringify, caseInsensitiveCompare, isArray, isNil, last as arrayLast, hasOwnProperty } from '../util'
import { toArray, argumentsToValue, toValue, stringify, caseInsensitiveCompare, isArray, isNil, last as arrayLast } from '../util'
import { equals, evalToken, isTruthy } from '../render'
import { Value, FilterImpl } from '../template'
import { Tokenizer } from '../parser'
Expand Down Expand Up @@ -187,14 +187,9 @@ export function * find_exp<T extends object> (this: FilterImpl, arr: T[], itemNa
}

export function uniq<T> (this: FilterImpl, arr: T[]): T[] {
arr = toValue(arr)
arr = toArray(arr)
this.context.memoryLimit.use(arr.length)
const u = {}
return (arr || []).filter(val => {
if (hasOwnProperty.call(u, String(val))) return false
u[String(val)] = true
return true
})
return [...new Set(arr)]
}

export function sample<T> (this: FilterImpl, v: T[] | string, count = 1): T | string | (T | string)[] {
Expand Down
3 changes: 3 additions & 0 deletions src/util/limiter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { assert } from './assert'
import { toNumber } from './underscore'

export class Limiter {
private message: string
Expand All @@ -9,10 +10,12 @@ export class Limiter {
this.limit = limit
}
use (count: number) {
count = toNumber(count)
assert(this.base + count <= this.limit, this.message)
this.base += count
}
check (count: number) {
count = toNumber(count)
assert(count <= this.limit, this.message)
}
}
5 changes: 5 additions & 0 deletions src/util/underscore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ export function toValue (value: any): any {
return (value instanceof Drop && isFunction(value.valueOf)) ? value.valueOf() : value
}

export function toNumber (value: any): number {
value = Number(value)
return isNaN(value) ? 0 : value
}

export function isNumber (value: any): value is number {
return typeof value === 'number'
}
Expand Down
11 changes: 8 additions & 3 deletions test/e2e/issues.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,14 @@ describe('Issues', function () {
expect(() => liquid.parse({} as any)).not.toThrow()
})
it('Unexpected "RenderError: memory alloc limit exceeded" #737', () => {
const liquid = new Liquid();
const context = { x: ["a", "b"] };
const template = "{{ x | join: 5 }}"
const liquid = new Liquid()
const context = { x: ['a', 'b'] }
const template = '{{ x | join: 5 }}'
expect(liquid.parseAndRender(template, context)).resolves.toEqual('a5b')
})
it('{{ 123 | uniq }} throws #737', () => {
const liquid = new Liquid()
expect(liquid.parseAndRender('{{ 113 | uniq }}')).resolves.toEqual('113')
expect(liquid.parseAndRender("{{ '113' | uniq }}")).resolves.toEqual('113')
})
})

0 comments on commit 68387c3

Please sign in to comment.