@ordergroove/offers 2.33.1 → 2.33.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordergroove/offers",
-  "version": "2.33.1",
+  "version": "2.33.2",
   "description": "offer state component",
   "author": "Eugenio Lattanzio <eugenio63@gmail.com>",
   "homepage": "https://github.com/ordergroove/plush-toys#readme",
@@ -47,5 +47,5 @@
   "devDependencies": {
     "@ordergroove/offers-templates": "^0.8.0"
   },
-  "gitHead": "9efba8c79207132f927c2bff1f3ee4c5eaa11eda"
+  "gitHead": "771e0978a0b4025ce0a250e35a976e22cd1f09b2"
 }

package/src/components/When.js

@@ -16,9 +16,16 @@ export class When extends withProduct(LitElement) {
   }
 
   render() {
-    const result =
-      this.test &&
-      expression.parse(removeWhitespace(this.test), key => descriptors[key] && descriptors[key](this.state, this));
+    if (!this.test) {
+      return html``;
+    }
+
+    let test = removeWhitespace(this.test);
+    // the parser returns incorrect result if you use an expression with &!, e.g. test1&!test2
+    // it succeeds if you wrap !test2 in parentheses, e.g. test1&(!test2)
+    // so we'll wrap all "not" expressions in parentheses
+    test = test.replace(/(![a-zA-Z]+)/g, '($1)');
+    const result = expression.parse(test, key => descriptors[key] && descriptors[key](this.state, this));
 
     if (result) {
       return html`

package/src/components/__tests__/When.spec.js

@@ -12,38 +12,62 @@ class When extends WhenBase {
 }
 customElements.define('og-when-test', When);
 
+const PRODUCT_ID = 'prodA';
+
+function stateToString(state) {
+  return Object.keys(state)
+    .map(key => `${key}=${state[key][PRODUCT_ID]}`)
+    .join(' and ');
+}
+
+async function testWhen(expression, productState, expected) {
+  const element = new When();
+  element.product = { id: PRODUCT_ID };
+  element.test = expression;
+  element.state = Object.keys(productState).reduce((acc, key) => {
+    acc[key] = { [PRODUCT_ID]: productState[key] };
+    return acc;
+  }, {});
+  await appendToBody(element).then(() => {
+    const slot = querySelector(element, 'slot');
+    const expectedMessage = `expected ${expression} to be ${expected} when ${stateToString(element.state)}`;
+    if (expected) {
+      expect(slot).toBeTruthy(expectedMessage);
+    } else {
+      expect(slot).toBeFalsy(expectedMessage);
+    }
+  });
+}
+
 describe('Conditional', () => {
   it('should not render child given test result is false', async () => {
-    const element = new When();
-    element.product = { id: 'prodA' };
-    element.test = 'inStock';
-    element.state = {
-      inStock: {
-        prodA: false
-      },
-      autoshipEligible: {
-        prodA: false
-      }
-    };
-    await appendToBody(element);
-
-    expect(querySelector(element, 'slot')).toBeFalsy();
+    await testWhen('inStock', { inStock: false, autoshipEligible: false }, false);
   });
 
   it('should render child given test result is true', async () => {
-    const element = new When();
-    element.product = { id: 'prodA' };
-    element.test = 'inStock';
-    element.state = {
-      inStock: {
-        prodA: true
-      },
-      autoshipEligible: {
-        prodA: true
-      }
-    };
-    await appendToBody(element);
-
-    expect(querySelector(element, 'slot')).toBeTruthy();
+    await testWhen('inStock', { inStock: true, autoshipEligible: false }, true);
+  });
+
+  it('should handle compound expressions', async () => {
+    await testWhen('inStock&!eligible', { inStock: false, autoshipEligible: false }, false);
+    await testWhen('inStock&(!eligible)', { inStock: false, autoshipEligible: false }, false);
+    await testWhen('inStock|!eligible', { inStock: false, autoshipEligible: false }, true);
+    await testWhen('inStock|eligible', { inStock: false, autoshipEligible: true }, true);
+    await testWhen('!inStock&!eligible', { inStock: false, autoshipEligible: false }, true);
+    await testWhen(
+      'inStock&eligible&autoshipByDefault',
+      { inStock: false, autoshipEligible: true, autoshipbyDefault: true },
+      false
+    );
+    await testWhen(
+      'inStock&eligible&autoshipByDefault',
+      { inStock: true, autoshipEligible: true, autoshipbyDefault: true },
+      false
+    );
+    await testWhen(
+      'inStock&(!eligible|autoshipByDefault)',
+      { inStock: true, autoshipEligible: true, autoshipByDefault: true },
+      true
+    );
   });
 });