@malloydata/malloy 0.0.36-dev230524224445 → 0.0.36-dev230525034638

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

@@ -29,19 +29,22 @@ import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
 import { ExprFilterContext } from "./MalloyParser";
 import { ExprLiteralContext } from "./MalloyParser";
-import { ExprMinusContext } from "./MalloyParser";
 import { ExprDurationContext } from "./MalloyParser";
 import { ExprTimeTruncContext } from "./MalloyParser";
 import { ExprSafeCastContext } from "./MalloyParser";
+import { ExprMinusContext } from "./MalloyParser";
 import { ExprMulDivContext } from "./MalloyParser";
 import { ExprAddSubContext } from "./MalloyParser";
 import { ExprRangeContext } from "./MalloyParser";
 import { ExprForRangeContext } from "./MalloyParser";
-import { ExprLogicalTreeContext } from "./MalloyParser";
+import { ExprAndTreeContext } from "./MalloyParser";
+import { ExprOrTreeContext } from "./MalloyParser";
 import { ExprCompareContext } from "./MalloyParser";
 import { ExprApplyContext } from "./MalloyParser";
 import { ExprNotContext } from "./MalloyParser";
-import { ExprLogicalContext } from "./MalloyParser";
+import { ExprLogicalAndContext } from "./MalloyParser";
+import { ExprLogicalOrContext } from "./MalloyParser";
+import { ExprCoalesceContext } from "./MalloyParser";
 import { ExprCastContext } from "./MalloyParser";
 import { ExprCountDisinctContext } from "./MalloyParser";
 import { ExprAggregateContext } from "./MalloyParser";
@@ -538,18 +541,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExprLiteral?: (ctx: ExprLiteralContext) => void;
-    /**
-     * Enter a parse tree produced by the `exprMinus`
-     * labeled alternative in `MalloyParser.fieldExpr`.
-     * @param ctx the parse tree
-     */
-    enterExprMinus?: (ctx: ExprMinusContext) => void;
-    /**
-     * Exit a parse tree produced by the `exprMinus`
-     * labeled alternative in `MalloyParser.fieldExpr`.
-     * @param ctx the parse tree
-     */
-    exitExprMinus?: (ctx: ExprMinusContext) => void;
     /**
      * Enter a parse tree produced by the `exprDuration`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -586,6 +577,18 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExprSafeCast?: (ctx: ExprSafeCastContext) => void;
+    /**
+     * Enter a parse tree produced by the `exprMinus`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    enterExprMinus?: (ctx: ExprMinusContext) => void;
+    /**
+     * Exit a parse tree produced by the `exprMinus`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    exitExprMinus?: (ctx: ExprMinusContext) => void;
     /**
      * Enter a parse tree produced by the `exprMulDiv`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -635,17 +638,29 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitExprForRange?: (ctx: ExprForRangeContext) => void;
     /**
-     * Enter a parse tree produced by the `exprLogicalTree`
+     * Enter a parse tree produced by the `exprAndTree`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    enterExprLogicalTree?: (ctx: ExprLogicalTreeContext) => void;
+    enterExprAndTree?: (ctx: ExprAndTreeContext) => void;
     /**
-     * Exit a parse tree produced by the `exprLogicalTree`
+     * Exit a parse tree produced by the `exprAndTree`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    exitExprLogicalTree?: (ctx: ExprLogicalTreeContext) => void;
+    exitExprAndTree?: (ctx: ExprAndTreeContext) => void;
+    /**
+     * Enter a parse tree produced by the `exprOrTree`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    enterExprOrTree?: (ctx: ExprOrTreeContext) => void;
+    /**
+     * Exit a parse tree produced by the `exprOrTree`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    exitExprOrTree?: (ctx: ExprOrTreeContext) => void;
     /**
      * Enter a parse tree produced by the `exprCompare`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -683,17 +698,41 @@ export interface MalloyParserListener extends ParseTreeListener {
      */
     exitExprNot?: (ctx: ExprNotContext) => void;
     /**
-     * Enter a parse tree produced by the `exprLogical`
+     * Enter a parse tree produced by the `exprLogicalAnd`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    enterExprLogicalAnd?: (ctx: ExprLogicalAndContext) => void;
+    /**
+     * Exit a parse tree produced by the `exprLogicalAnd`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    exitExprLogicalAnd?: (ctx: ExprLogicalAndContext) => void;
+    /**
+     * Enter a parse tree produced by the `exprLogicalOr`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    enterExprLogicalOr?: (ctx: ExprLogicalOrContext) => void;
+    /**
+     * Exit a parse tree produced by the `exprLogicalOr`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     */
+    exitExprLogicalOr?: (ctx: ExprLogicalOrContext) => void;
+    /**
+     * Enter a parse tree produced by the `exprCoalesce`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    enterExprLogical?: (ctx: ExprLogicalContext) => void;
+    enterExprCoalesce?: (ctx: ExprCoalesceContext) => void;
     /**
-     * Exit a parse tree produced by the `exprLogical`
+     * Exit a parse tree produced by the `exprCoalesce`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      */
-    exitExprLogical?: (ctx: ExprLogicalContext) => void;
+    exitExprCoalesce?: (ctx: ExprCoalesceContext) => void;
     /**
      * Enter a parse tree produced by the `exprCast`
      * labeled alternative in `MalloyParser.fieldExpr`.

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

@@ -29,19 +29,22 @@ import { NestDefContext } from "./MalloyParser";
 import { ExprFieldPathContext } from "./MalloyParser";
 import { ExprFilterContext } from "./MalloyParser";
 import { ExprLiteralContext } from "./MalloyParser";
-import { ExprMinusContext } from "./MalloyParser";
 import { ExprDurationContext } from "./MalloyParser";
 import { ExprTimeTruncContext } from "./MalloyParser";
 import { ExprSafeCastContext } from "./MalloyParser";
+import { ExprMinusContext } from "./MalloyParser";
 import { ExprMulDivContext } from "./MalloyParser";
 import { ExprAddSubContext } from "./MalloyParser";
 import { ExprRangeContext } from "./MalloyParser";
 import { ExprForRangeContext } from "./MalloyParser";
-import { ExprLogicalTreeContext } from "./MalloyParser";
+import { ExprAndTreeContext } from "./MalloyParser";
+import { ExprOrTreeContext } from "./MalloyParser";
 import { ExprCompareContext } from "./MalloyParser";
 import { ExprApplyContext } from "./MalloyParser";
 import { ExprNotContext } from "./MalloyParser";
-import { ExprLogicalContext } from "./MalloyParser";
+import { ExprLogicalAndContext } from "./MalloyParser";
+import { ExprLogicalOrContext } from "./MalloyParser";
+import { ExprCoalesceContext } from "./MalloyParser";
 import { ExprCastContext } from "./MalloyParser";
 import { ExprCountDisinctContext } from "./MalloyParser";
 import { ExprAggregateContext } from "./MalloyParser";
@@ -391,13 +394,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExprLiteral?: (ctx: ExprLiteralContext) => Result;
-    /**
-     * Visit a parse tree produced by the `exprMinus`
-     * labeled alternative in `MalloyParser.fieldExpr`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitExprMinus?: (ctx: ExprMinusContext) => Result;
     /**
      * Visit a parse tree produced by the `exprDuration`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -419,6 +415,13 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExprSafeCast?: (ctx: ExprSafeCastContext) => Result;
+    /**
+     * Visit a parse tree produced by the `exprMinus`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitExprMinus?: (ctx: ExprMinusContext) => Result;
     /**
      * Visit a parse tree produced by the `exprMulDiv`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -448,12 +451,19 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitExprForRange?: (ctx: ExprForRangeContext) => Result;
     /**
-     * Visit a parse tree produced by the `exprLogicalTree`
+     * Visit a parse tree produced by the `exprAndTree`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExprLogicalTree?: (ctx: ExprLogicalTreeContext) => Result;
+    visitExprAndTree?: (ctx: ExprAndTreeContext) => Result;
+    /**
+     * Visit a parse tree produced by the `exprOrTree`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitExprOrTree?: (ctx: ExprOrTreeContext) => Result;
     /**
      * Visit a parse tree produced by the `exprCompare`
      * labeled alternative in `MalloyParser.fieldExpr`.
@@ -476,12 +486,26 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      */
     visitExprNot?: (ctx: ExprNotContext) => Result;
     /**
-     * Visit a parse tree produced by the `exprLogical`
+     * Visit a parse tree produced by the `exprLogicalAnd`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitExprLogicalAnd?: (ctx: ExprLogicalAndContext) => Result;
+    /**
+     * Visit a parse tree produced by the `exprLogicalOr`
+     * labeled alternative in `MalloyParser.fieldExpr`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitExprLogicalOr?: (ctx: ExprLogicalOrContext) => Result;
+    /**
+     * Visit a parse tree produced by the `exprCoalesce`
      * labeled alternative in `MalloyParser.fieldExpr`.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    visitExprLogical?: (ctx: ExprLogicalContext) => Result;
+    visitExprCoalesce?: (ctx: ExprCoalesceContext) => Result;
     /**
      * Visit a parse tree produced by the `exprCast`
      * labeled alternative in `MalloyParser.fieldExpr`.

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

@@ -119,8 +119,11 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExprNot(pcx: parse.ExprNotContext): ast.ExprNot;
     visitExprBool(pcx: parse.ExprBoolContext): ast.Boolean;
     allFieldExpressions(exprList: parse.FieldExprContext[]): ast.ExpressionDef[];
-    visitExprLogical(pcx: parse.ExprLogicalContext): ast.ExprLogicalOp;
-    visitExprLogicalTree(pcx: parse.ExprLogicalTreeContext): ast.ExprAlternationTree;
+    visitExprLogicalOr(pcx: parse.ExprLogicalOrContext): ast.ExprLogicalOp;
+    visitExprLogicalAnd(pcx: parse.ExprLogicalAndContext): ast.ExprLogicalOp;
+    visitExprOrTree(pcx: parse.ExprOrTreeContext): ast.ExprAlternationTree;
+    visitExprAndTree(pcx: parse.ExprAndTreeContext): ast.ExprAlternationTree;
+    visitExprCoalesce(pcx: parse.ExprCoalesceContext): ast.ExprCoalesce;
     visitPartialAllowedFieldExpr(pcx: parse.PartialAllowedFieldExprContext): ast.ExpressionDef;
     visitExprString(pcx: parse.ExprStringContext): ast.ExprString;
     visitExprRegex(pcx: parse.ExprRegexContext): ast.ExprRegEx;

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

@@ -705,15 +705,30 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     allFieldExpressions(exprList) {
         return exprList.map(ecx => this.getFieldExpr(ecx));
     }
-    visitExprLogical(pcx) {
+    visitExprLogicalOr(pcx) {
         const left = this.getFieldExpr(pcx.fieldExpr(0));
         const right = this.getFieldExpr(pcx.fieldExpr(1));
-        return new ast.ExprLogicalOp(left, pcx.AND() ? 'and' : 'or', right);
+        return new ast.ExprLogicalOp(left, 'or', right);
     }
-    visitExprLogicalTree(pcx) {
+    visitExprLogicalAnd(pcx) {
+        const left = this.getFieldExpr(pcx.fieldExpr(0));
+        const right = this.getFieldExpr(pcx.fieldExpr(1));
+        return new ast.ExprLogicalOp(left, 'and', right);
+    }
+    visitExprOrTree(pcx) {
+        const left = this.getFieldExpr(pcx.fieldExpr());
+        const right = this.getFieldExpr(pcx.partialAllowedFieldExpr());
+        return this.astAt(new ast.ExprAlternationTree(left, '|', right), pcx);
+    }
+    visitExprAndTree(pcx) {
         const left = this.getFieldExpr(pcx.fieldExpr());
         const right = this.getFieldExpr(pcx.partialAllowedFieldExpr());
-        return new ast.ExprAlternationTree(left, pcx.AMPER() ? '&' : '|', right);
+        return this.astAt(new ast.ExprAlternationTree(left, '&', right), pcx);
+    }
+    visitExprCoalesce(pcx) {
+        const left = this.getFieldExpr(pcx.fieldExpr()[0]);
+        const right = this.getFieldExpr(pcx.fieldExpr()[1]);
+        return this.astAt(new ast.ExprCoalesce(left, right), pcx);
     }
     visitPartialAllowedFieldExpr(pcx) {
         var _a;
@@ -839,9 +854,6 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return new ast.ExprNULL();
     }
     visitExprApply(pcx) {
-        if (pcx.COLON()) {
-            this.contextError(pcx, "':' for apply is deprecated, use '?'", 'warn');
-        }
         return new ast.Apply(this.getFieldExpr(pcx.fieldExpr()), this.getFieldExpr(pcx.partialAllowedFieldExpr()));
     }
     visitExprRange(pcx) {

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

@@ -664,6 +664,7 @@ describe('expressions', () => {
         test('not', exprOK('not true'));
         test('and', exprOK('true and false'));
         test('or', exprOK('true or false'));
+        test('null-check (??)', exprOK('ai ?? 7'));
         test('disallow date OP number', () => {
             expect(new test_translator_1.BetaExpression('@2001 = 7')).compileToFailWith('Cannot compare a date to a number');
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.36-dev230524224445",
+  "version": "0.0.36-dev230525034638",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",