Fix a match case for not operator

Author: kristerkari

src/__tests__/index.spec.js

@@ -810,6 +810,39 @@ describe("media queries", () => {
         }
       })
     ).toEqual({ a: 1 });
+    expect(
+      process({
+        __mediaQueries: {
+          "@media android": [
+            {
+              inverse: false,
+              type: "android",
+              expressions: []
+            }
+          ],
+          "@media not ios and (orientation: portrait)": [
+            {
+              inverse: true,
+              type: "ios",
+              expressions: [
+                {
+                  feature: "orientation",
+                  modifier: undefined,
+                  value: "portrait"
+                }
+              ]
+            }
+          ]
+        },
+        a: 1,
+        "@media android": {
+          a: 2
+        },
+        "@media not ios and (orientation: portrait)": {
+          a: 4
+        }
+      })
+    ).toEqual({ a: 4 });
     expect(
       process({
         __mediaQueries: {

src/mediaquery.js

@@ -30,13 +30,11 @@ function matchQuery(query, values) {
   // equal for a match.
   var typeMatch = query.type === "all" || values.type === query.type;
 
-  // Quit early when `type` doesn't match, but take "not" into account.
-  if ((typeMatch && inverse) || !(typeMatch || inverse)) {
-    return false;
-  }
-
   if (query.expressions.length === 0) {
-    return typeMatch || inverse;
+    // Quit early when `type` doesn't match, but take "not" into account.
+    if ((typeMatch && inverse) || !(typeMatch || inverse)) {
+      return false;
+    }
   }
 
   var expressionsMatch = query.expressions.every(function(expression) {
@@ -94,7 +92,10 @@ function matchQuery(query, values) {
     }
   });
 
-  return expressionsMatch || inverse;
+  if (inverse) {
+    return !(typeMatch && expressionsMatch);
+  }
+  return typeMatch && expressionsMatch;
 }
 
 // -- Utilities ----------------------------------------------------------------