@labdigital/commercetools-mock 0.9.0 → 0.9.1

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/lib/predicateParser.test.ts

@@ -8,10 +8,12 @@ describe('Predicate filter', () => {
     arrayProperty: ['foo', 'bar', 'nar'],
     notDefined: undefined,
     emptyArrayProperty: [],
+    booleanProperty: true,
     nested: {
       numberProperty: 1234,
       objectProperty: {
         stringProperty: 'foobar',
+        booleanProperty: true,
       },
     },
 
@@ -31,6 +33,13 @@ describe('Predicate filter', () => {
     expect(match(`stringProperty=:val`, { val: 'foobar' })).toBeTruthy()
   })
 
+  test('booleanProperty = true', async () => {
+    expect(match(`booleanProperty != true`)).toBeFalsy()
+    expect(match(`booleanProperty = true`)).toBeTruthy()
+
+    expect(match(`booleanProperty=:val`, { val: true })).toBeTruthy()
+  })
+
   test('stringProperty matches ignore case "foobar"', async () => {
     expect(match(`stringProperty="FOObar"`)).toBeFalsy()
     expect(match(`stringProperty matches ignore case "FOObar"`)).toBeTruthy()
@@ -168,6 +177,13 @@ describe('Predicate filter', () => {
     ).toBeTruthy()
   })
 
+  test('nested attribute access', async () => {
+    expect(match(`nested(objectProperty(booleanProperty != true))`)).toBeFalsy()
+    expect(
+      match(`nested(objectProperty(booleanProperty != false))`)
+    ).toBeTruthy()
+  })
+
   test('lexer confusion', async () => {
     expect(() => match(`orSomething="foobar"`)).toThrow(PredicateError)
     expect(() => match(`orSomething="foobar"`)).toThrow(

package/src/lib/predicateParser.ts

@@ -124,6 +124,7 @@ const getLexer = (value: string) => {
     .token('FLOAT', /\d+\.\d+/)
     .token('INT', /\d+/)
     .token('VARIABLE', /:([-_A-Za-z0-9]+)/)
+    .token('BOOLEAN', /(true|false)/)
     .token('IDENTIFIER', /[-_A-Za-z0-9]+/)
     .token('STRING', /"((?:\\.|[^"\\])*)"/)
     .token('STRING', /'((?:\\.|[^'\\])*)'/)
@@ -159,6 +160,13 @@ const generateMatchFunc = (predicate: string): MatchFunc => {
         pos: t.token.strpos(),
       } as Symbol
     })
+    .nud('BOOLEAN', 1, t => {
+      return {
+        type: 'boolean',
+        value: t.token.match === 'true' ? true : false,
+        pos: t.token.strpos(),
+      } as Symbol
+    })
     .nud('VARIABLE', 100, t => {
       return {
         type: 'var',
@@ -254,7 +262,6 @@ const generateMatchFunc = (predicate: string): MatchFunc => {
     .led('!=', 20, ({ left, bp }) => {
       const expr = parser.parse({ terminals: [bp - 1] })
       validateSymbol(expr)
-
       return (obj: any, vars: VariableMap) => {
         return resolveValue(obj, left) !== resolveSymbol(expr, vars)
       }