Labyricorn/liquidjs
1
0
Fork 0
mirror of https://github.com/harttle/liquidjs.git synced 2026-09-20 15:00:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly understand variables with question marks

Browse Source 
Fixes #77
This commit is contained in:
Ryan Kennedy
2018-07-18 10:15:43 +08:00
committed by Jun Yang
parent 6755462056
commit c79700ef1a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lexical.js
+1 -1
View File
@@ -10,7 +10,7 @@ var number = /-?\d+\.?\d*|\.?\d+/
var bool = /true|false/ var bool = /true|false/
// peoperty access // peoperty access
var identifier = /[\w-]+/ var identifier = /[\w-]+[?]?/
var subscript = new RegExp(`\\[(?:${quoted.source}|[\\w-\\.]+)\\]`) var subscript = new RegExp(`\\[(?:${quoted.source}|[\\w-\\.]+)\\]`)
var literal = new RegExp(`(?:${quoted.source}|${bool.source}|${number.source})`) var literal = new RegExp(`(?:${quoted.source}|${bool.source}|${number.source})`)
var variable = new RegExp(`${identifier.source}(?:\\.${identifier.source}|${subscript.source})*`) var variable = new RegExp(`${identifier.source}(?:\\.${identifier.source}|${subscript.source})*`)
test/syntax.js
+3 -1
View File
@@ -17,7 +17,8 @@ describe('expression', function () {
empty: '', empty: '',
x: 'XXX', x: 'XXX',
y: undefined, y: undefined,
z: null z: null,
'has_value?': true
}) })
}) })
@@ -30,6 +31,7 @@ describe('expression', function () {
it('should eval variables', function () { it('should eval variables', function () {
expect(evalValue('23', scope)).to.equal(23) expect(evalValue('23', scope)).to.equal(23)
expect(evalValue('one', scope)).to.equal(1) expect(evalValue('one', scope)).to.equal(1)
expect(evalValue('has_value?', scope)).to.equal(true)
expect(evalValue('x', scope)).to.equal('XXX') expect(evalValue('x', scope)).to.equal('XXX')
}) })