MBQL syntax sugar (for negative filter) in the custom expression compiler (#14938)

frontend/src/metabase/lib/expressions/compile.js

@@ -10,6 +10,11 @@ import {
 
 import { ExpressionCstVisitor, parse } from "./parser";
 
+const NEGATIVE_FILTER_SHORTHANDS = {
+  contains: "does-not-contain",
+  "is-null": "not-null",
+  "is-empty": "not-empty",
+};
 class ExpressionMBQLCompilerVisitor extends ExpressionCstVisitor {
   constructor(options) {
     super();
@@ -50,7 +55,10 @@ class ExpressionMBQLCompilerVisitor extends ExpressionCstVisitor {
     return this.visit(ctx.expression);
   }
   logicalNotExpression(ctx) {
-    return ["not", this.visit(ctx.operands[0])];
+    const expr = this.visit(ctx.operands[0]);
+    const [fn, ...args] = expr;
+    const shorthand = NEGATIVE_FILTER_SHORTHANDS[fn];
+    return shorthand ? [shorthand, ...args] : ["not", expr];
   }
   relationalExpression(ctx) {
     return this._collapseOperators(ctx.operands, ctx.operators);

frontend/test/metabase/lib/expressions/__support__/shared.js

@@ -161,6 +161,13 @@ const filter = [
     ["or", ["not", ["between", subtotal, 3, 14]], segment],
     "filter function with OR",
   ],
+  [
+    'NOT contains([User → Name], "John")',
+    ["does-not-contain", userName, "John"],
+    "not contains",
+  ],
+  ["NOT isnull([Tax])", ["not-null", tax], "not null"],
+  ["NOT isempty([Total])", ["not-empty", total], "not empty"],
 ];
 
 export default [

frontend/test/metabase/lib/expressions/compile.unit.spec.js

@@ -191,6 +191,15 @@ describe("metabase/lib/expressions/compile", () => {
       expect(filter("[Expensive]")).toEqual(["segment", "Expensive"]);
       expect(filter("NOT [Good]")).toEqual(["not", ["segment", "Good"]]);
     });
+    it("should compile negative filters", () => {
+      expect(filter("NOT CONTAINS('X','Y')")).toEqual([
+        "does-not-contain",
+        "X",
+        "Y",
+      ]);
+      expect(filter("NOT ISNULL('P')")).toEqual(["not-null", "P"]);
+      expect(filter("NOT ISEMPTY('Q')")).toEqual(["not-empty", "Q"]);
+    });
   });
 
   describe("(for an aggregation)", () => {

frontend/test/metabase/scenarios/question/filter.cy.spec.js

@@ -868,7 +868,7 @@ describe("scenarios > question > filter", () => {
           "source-table": PRODUCTS_ID,
           filter: [
             "does-not-contain",
-            ["field-id", PRODUCTS.TITLE],
+            ["field", PRODUCTS.TITLE, null],
             "Wallet",
             { "case-sensitive": false },
           ],