@malloydata/malloy 0.0.225-dev250113200903 → 0.0.225-dev250113203344

package/dist/lang/lib/Malloy/MalloyParserListener.d.ts

@@ -40,7 +40,7 @@ import { ExprAndTreeContext } from "./MalloyParser";
 import { ExprOrTreeContext } from "./MalloyParser";
 import { ExprCompareContext } from "./MalloyParser";
 import { ExprWarnLikeContext } from "./MalloyParser";
-import { ExprWarnNullCmpContext } from "./MalloyParser";
+import { ExprNullCheckContext } from "./MalloyParser";
 import { ExprWarnInContext } from "./MalloyParser";
 import { ExprApplyContext } from "./MalloyParser";
 import { ExprNotContext } from "./MalloyParser";
@@ -209,6 +209,8 @@ import { TimeframeContext } from "./MalloyParser";
 import { UngroupContext } from "./MalloyParser";
 import { MalloyOrSQLTypeContext } from "./MalloyParser";
 import { FieldExprContext } from "./MalloyParser";
+import { PartialCompareContext } from "./MalloyParser";
+import { PartialTestContext } from "./MalloyParser";
 import { PartialAllowedFieldExprContext } from "./MalloyParser";
 import { FieldExprListContext } from "./MalloyParser";
 import { PickStatementContext } from "./MalloyParser";
@@ -733,17 +735,17 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitExprWarnLike?: (ctx: ExprWarnLikeContext) => void;
     /**
-     * Enter a parse tree produced by the `exprWarnNullCmp`
+     * Enter a parse tree produced by the `exprNullCheck`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    enterExprWarnNullCmp?: (ctx: ExprWarnNullCmpContext) => void;
+    enterExprNullCheck?: (ctx: ExprNullCheckContext) => void;
     /**
-     * Exit a parse tree produced by the `exprWarnNullCmp`
+     * Exit a parse tree produced by the `exprNullCheck`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    exitExprWarnNullCmp?: (ctx: ExprWarnNullCmpContext) => void;
+    exitExprNullCheck?: (ctx: ExprNullCheckContext) => void;
     /**
      * Enter a parse tree produced by the `exprWarnIn`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -2512,6 +2514,26 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitFieldExpr?: (ctx: FieldExprContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.partialCompare`.
+     * @param ctx the parse tree
+     */
+    enterPartialCompare?: (ctx: PartialCompareContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.partialCompare`.
+     * @param ctx the parse tree
+     */
+    exitPartialCompare?: (ctx: PartialCompareContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.partialTest`.
+     * @param ctx the parse tree
+     */
+    enterPartialTest?: (ctx: PartialTestContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.partialTest`.
+     * @param ctx the parse tree
+     */
+    exitPartialTest?: (ctx: PartialTestContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.partialAllowedFieldExpr`.
      * @param ctx the parse tree

package/dist/lang/lib/Malloy/MalloyParserVisitor.d.ts

@@ -40,7 +40,7 @@ import { ExprAndTreeContext } from "./MalloyParser";
 import { ExprOrTreeContext } from "./MalloyParser";
 import { ExprCompareContext } from "./MalloyParser";
 import { ExprWarnLikeContext } from "./MalloyParser";
-import { ExprWarnNullCmpContext } from "./MalloyParser";
+import { ExprNullCheckContext } from "./MalloyParser";
 import { ExprWarnInContext } from "./MalloyParser";
 import { ExprApplyContext } from "./MalloyParser";
 import { ExprNotContext } from "./MalloyParser";
@@ -209,6 +209,8 @@ import { TimeframeContext } from "./MalloyParser";
 import { UngroupContext } from "./MalloyParser";
 import { MalloyOrSQLTypeContext } from "./MalloyParser";
 import { FieldExprContext } from "./MalloyParser";
+import { PartialCompareContext } from "./MalloyParser";
+import { PartialTestContext } from "./MalloyParser";
 import { PartialAllowedFieldExprContext } from "./MalloyParser";
 import { FieldExprListContext } from "./MalloyParser";
 import { PickStatementContext } from "./MalloyParser";
@@ -531,12 +533,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitExprWarnLike?: (ctx: ExprWarnLikeContext) => Result;
     /**
-     * Visit a parse tree produced by the `exprWarnNullCmp`
+     * Visit a parse tree produced by the `exprNullCheck`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExprWarnNullCmp?: (ctx: ExprWarnNullCmpContext) => Result;
+    visitExprNullCheck?: (ctx: ExprNullCheckContext) => Result;
     /**
      * Visit a parse tree produced by the `exprWarnIn`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -1589,6 +1591,18 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitFieldExpr?: (ctx: FieldExprContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.partialCompare`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitPartialCompare?: (ctx: PartialCompareContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.partialTest`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitPartialTest?: (ctx: PartialTestContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.partialAllowedFieldExpr`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.d.ts

@@ -158,6 +158,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExprOrTree(pcx: parse.ExprOrTreeContext): ast.ExprAlternationTree;
     visitExprAndTree(pcx: parse.ExprAndTreeContext): ast.ExprAlternationTree;
     visitExprCoalesce(pcx: parse.ExprCoalesceContext): ast.ExprCoalesce;
+    visitPartialCompare(pcx: parse.PartialCompareContext): ast.PartialCompare;
+    visitPartialTest(pcx: parse.PartialTestContext): ast.ExpressionDef;
     visitPartialAllowedFieldExpr(pcx: parse.PartialAllowedFieldExprContext): ast.ExpressionDef;
     visitExprString(pcx: parse.ExprStringContext): ast.ExprString;
     visitExprRegex(pcx: parse.ExprRegexContext): ast.ExprRegEx;
@@ -236,7 +238,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExprLiteralRecord(pcx: parse.ExprLiteralRecordContext): ast.RecordLiteral;
     visitExprArrayLiteral(pcx: parse.ExprArrayLiteralContext): ast.ArrayLiteral;
     visitExprWarnLike(pcx: parse.ExprWarnLikeContext): ast.ExprCompare;
-    visitExprWarnNullCmp(pcx: parse.ExprWarnNullCmpContext): ast.ExprCompare;
+    visitExprNullCheck(pcx: parse.ExprNullCheckContext): ast.ExprIsNull;
     visitExprWarnIn(pcx: parse.ExprWarnInContext): ast.ExprLegacyIn;
 }
 export {};

package/dist/lang/malloy-to-ast.js

@@ -881,17 +881,30 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const right = this.getFieldExpr(pcx.fieldExpr()[1]);
         return this.astAt(new ast.ExprCoalesce(left, right), pcx);
     }
+    visitPartialCompare(pcx) {
+        const partialOp = pcx.compareOp().text;
+        if (ast.isComparison(partialOp)) {
+            return this.astAt(new ast.PartialCompare(partialOp, this.getFieldExpr(pcx.fieldExpr())), pcx);
+        }
+        throw this.internalError(pcx, `partial comparison '${partialOp}' not recognized`);
+    }
+    visitPartialTest(pcx) {
+        const cmp = pcx.partialCompare();
+        if (cmp) {
+            return this.visitPartialCompare(cmp);
+        }
+        return this.astAt(new ast.PartialIsNull(pcx.NOT() ? '!=' : '='), pcx);
+    }
     visitPartialAllowedFieldExpr(pcx) {
-        var _a;
-        const fieldExpr = this.getFieldExpr(pcx.fieldExpr());
-        const partialOp = (_a = pcx.compareOp()) === null || _a === void 0 ? void 0 : _a.text;
-        if (partialOp) {
-            if (ast.isComparison(partialOp)) {
-                return this.astAt(new ast.PartialCompare(partialOp, fieldExpr), pcx);
-            }
-            throw this.internalError(pcx, `partial comparison '${partialOp}' not recognized`);
+        const exprCx = pcx.fieldExpr();
+        if (exprCx) {
+            return this.getFieldExpr(exprCx);
         }
-        return fieldExpr;
+        const partialCx = pcx.partialTest();
+        if (partialCx) {
+            return this.visitPartialTest(partialCx);
+        }
+        throw this.internalError(pcx, 'impossible partial');
     }
     visitExprString(pcx) {
         const str = this.getPlainStringFrom(pcx);
@@ -935,6 +948,15 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const left = this.getFieldExpr(pcx.fieldExpr(0));
         const right = this.getFieldExpr(pcx.fieldExpr(1));
         if (ast.isEquality(op)) {
+            const wholeRange = this.parseInfo.rangeFromContext(pcx);
+            if (right instanceof ast.ExprNULL) {
+                if (op === '=') {
+                    this.warnWithReplacement('sql-is-null', "Use 'is null' to check for NULL instead of '= null'", wholeRange, `${this.getSourceCode(pcx.fieldExpr(0))} is null`);
+                }
+                else if (op === '!=') {
+                    this.warnWithReplacement('sql-is-not-null', "Use 'is not null' to check for NULL instead of '!= null'", wholeRange, `${this.getSourceCode(pcx.fieldExpr(0))} is not null`);
+                }
+            }
             return this.astAt(new ast.ExprEquality(left, op, right), pcx);
         }
         else if (ast.isComparison(op)) {
@@ -1465,19 +1487,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return this.astAt(new ast.ExprCompare(this.getFieldExpr(left), op, this.getFieldExpr(right)), pcx);
     }
-    visitExprWarnNullCmp(pcx) {
-        let op = '=';
+    visitExprNullCheck(pcx) {
         const expr = pcx.fieldExpr();
-        const wholeRange = this.parseInfo.rangeFromContext(pcx);
-        if (pcx.NOT()) {
-            op = '!=';
-            this.warnWithReplacement('sql-is-not-null', "Use '!= NULL' to check for NULL instead of 'IS NOT NULL'", wholeRange, `${this.getSourceCode(expr)} != null`);
-        }
-        else {
-            this.warnWithReplacement('sql-is-null', "Use '= NULL' to check for NULL instead of 'IS NULL'", wholeRange, `${this.getSourceCode(expr)} = null`);
-        }
-        const nullExpr = new ast.ExprNULL();
-        return this.astAt(new ast.ExprCompare(this.getFieldExpr(expr), op, nullExpr), pcx);
+        return this.astAt(new ast.ExprIsNull(this.getFieldExpr(expr), pcx.NOT() ? '!=' : '='), pcx);
     }
     visitExprWarnIn(pcx) {
         const expr = this.getFieldExpr(pcx.fieldExpr());

package/dist/lang/test/expressions.spec.js

@@ -136,6 +136,18 @@ describe('expressions', () => {
         test('null-check (??)', () => {
             expect('ai ?? 7').compilesTo('{ai coalesce 7}');
         });
+        test('normal is-null', () => {
+            expect('ai is null').compilesTo('{is-null ai}');
+        });
+        test('normal is-not-null', () => {
+            expect('ai is not null').compilesTo('{is-not-null ai}');
+        });
+        test('apply is-null', () => {
+            expect('ai ? is null').compilesTo('{is-null ai}');
+        });
+        test('apply is-not-null', () => {
+            expect('ai ? is not null').compilesTo('{is-not-null ai}');
+        });
         test('coalesce type mismatch', () => {
             expect(new test_translator_1.BetaExpression('ai ?? @2003')).toLog((0, test_translator_1.errorMessage)('Mismatched types for coalesce (number, date)'));
         });
@@ -177,19 +189,19 @@ describe('expressions', () => {
             expect((0, test_translator_1.expr) `ai ? (> 1 & < 100)`).toTranslate();
         });
         describe('sql friendly warnings', () => {
-            test('is null with warning', () => {
-                const warnSrc = (0, test_translator_1.expr) `ai is null`;
-                expect(warnSrc).toLog((0, test_translator_1.warningMessage)("Use '= NULL' to check for NULL instead of 'IS NULL'"));
+            test('= null with warning', () => {
+                const warnSrc = (0, test_translator_1.expr) `${'ai = null'}`;
+                expect(warnSrc).toLog((0, test_translator_1.warningMessage)("Use 'is null' to check for NULL instead of '= null'"));
                 expect(warnSrc).compilesTo('{is-null ai}');
                 const warning = warnSrc.translator.problems()[0];
-                expect(warning.replacement).toEqual('ai = null');
+                expect(warning.replacement).toEqual('ai is null');
             });
             test('is not null with warning', () => {
-                const warnSrc = (0, test_translator_1.expr) `ai is not null`;
-                expect(warnSrc).toLog((0, test_translator_1.warningMessage)("Use '!= NULL' to check for NULL instead of 'IS NOT NULL'"));
+                const warnSrc = (0, test_translator_1.expr) `${'ai != null'}`;
+                expect(warnSrc).toLog((0, test_translator_1.warningMessage)("Use 'is not null' to check for NULL instead of '!= null'"));
                 expect(warnSrc).compilesTo('{is-not-null ai}');
                 const warning = warnSrc.translator.problems()[0];
-                expect(warning.replacement).toEqual('ai != null');
+                expect(warning.replacement).toEqual('ai is not null');
             });
             test('like with warning', () => {
                 const warnSrc = (0, test_translator_1.expr) `astr like 'a'`;
@@ -205,20 +217,6 @@ describe('expressions', () => {
                 const warning = warnSrc.translator.problems()[0];
                 expect(warning.replacement).toEqual("astr !~ 'a'");
             });
-            test('is is-null in a model', () => {
-                const isNullSrc = (0, test_translator_1.model) `source: xa is a extend { dimension: x1 is astr is null }`;
-                expect(isNullSrc).toLog((0, test_translator_1.warningMessage)("Use '= NULL' to check for NULL instead of 'IS NULL'"));
-            });
-            test('is not-null in a model', () => {
-                const isNullSrc = (0, test_translator_1.model) `source: xa is a extend { dimension: x1 is not null }`;
-                expect(isNullSrc).toTranslate();
-            });
-            test('is not-null is in a model', () => {
-                const isNullSrc = (0, test_translator_1.model) `source: xa is a extend { dimension: x1 is not null is null }`;
-                expect(isNullSrc).toLog((0, test_translator_1.warningMessage)("Use '= NULL' to check for NULL instead of 'IS NULL'"));
-                const warning = isNullSrc.translator.problems()[0];
-                expect(warning.replacement).toEqual('null = null');
-            });
             test('x is expr y is not null', () => {
                 const isNullSrc = (0, test_translator_1.model) `source: xa is a extend { dimension: x is 1 y is not null }`;
                 expect(isNullSrc).toTranslate();
@@ -1042,7 +1040,7 @@ describe('expressions', () => {
         ['astr', 'string'],
         ['abool', 'boolean'],
     ])('Can compare field %s (type %s) to NULL', (name, _datatype) => {
-        expect((0, test_translator_1.expr) `${name} = NULL`).toTranslate();
+        expect((0, test_translator_1.expr) `${name} IS NULL`).toTranslate();
     });
 });
 describe('alternations as in', () => {
@@ -1098,7 +1096,7 @@ describe('sql native fields in schema', () => {
         expect(uModel).toTranslate();
     });
     test('sql native reference can be compared to NULL', () => {
-        const uModel = new test_translator_1.TestTranslator('run: a->{ where: aun != NULL; select: * }');
+        const uModel = new test_translator_1.TestTranslator('run: a->{ where: aun is not null; select: * }');
         expect(uModel).toTranslate();
     });
     test('flag unsupported equality', () => {

package/dist/lang/test/parameters.spec.js

@@ -61,7 +61,7 @@ describe('parameters', () => {
         expect(`
       ##! experimental.parameters
       source: ab_new(param is null::string) is ab extend {
-        where: param = null
+        where: param is null
       }
         run: ab_new(param is "foo") -> { select: * } -> { select: * }
     `).toTranslate();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.225-dev250113200903",
+  "version": "0.0.225-dev250113203344",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",