@malloydata/malloy 0.0.36-dev230524224445 → 0.0.36-dev230525034638

package/dist/lang/ast/expressions/expr-coalesce.d.ts

@@ -0,0 +1,11 @@
+import { ExprValue } from '../types/expr-value';
+import { ExpressionDef } from '../types/expression-def';
+import { FieldSpace } from '../types/field-space';
+export declare class ExprCoalesce extends ExpressionDef {
+    readonly expr: ExpressionDef;
+    readonly altExpr: ExpressionDef;
+    elementType: string;
+    legalChildTypes: import("../types/type-desc").TypeDesc[];
+    constructor(expr: ExpressionDef, altExpr: ExpressionDef);
+    getExpression(fs: FieldSpace): ExprValue;
+}

package/dist/lang/ast/expressions/expr-coalesce.js

@@ -0,0 +1,59 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExprCoalesce = void 0;
+const model_1 = require("../../../model");
+const fragtype_utils_1 = require("../fragtype-utils");
+const expression_def_1 = require("../types/expression-def");
+class ExprCoalesce extends expression_def_1.ExpressionDef {
+    constructor(expr, altExpr) {
+        super({ expr, altExpr });
+        this.expr = expr;
+        this.altExpr = altExpr;
+        this.elementType = 'coalesce expression';
+        this.legalChildTypes = fragtype_utils_1.FT.anyAtomicT;
+    }
+    getExpression(fs) {
+        const maybeNull = this.expr.getExpression(fs);
+        const whenNull = this.altExpr.getExpression(fs);
+        if (maybeNull.dataType === 'null') {
+            return whenNull;
+        }
+        /**
+         * Could maybe walk altExpr to combine all the times that altExpr
+         * is also an ExprCoalesce into a single fragment. Not doing that now.
+         *
+         * Also this should maybe generate a dialect fragment and not write
+         * SQL, but I decided that is will happen when the "expressions are true
+         * trees" rewrite happens.
+         */
+        return {
+            ...whenNull,
+            expressionType: (0, model_1.maxExpressionType)(maybeNull.expressionType, whenNull.expressionType),
+            value: (0, model_1.mkExpr) `COALESCE(${maybeNull.value},${whenNull.value})`,
+        };
+    }
+}
+exports.ExprCoalesce = ExprCoalesce;
+//# sourceMappingURL=expr-coalesce.js.map

package/dist/lang/ast/index.d.ts

@@ -17,6 +17,7 @@ export * from './expressions/expr-alternation-tree';
 export * from './expressions/expr-asymmetric';
 export * from './expressions/expr-avg';
 export * from './expressions/expr-cast';
+export * from './expressions/expr-coalesce';
 export * from './expressions/expr-compare';
 export * from './expressions/expr-count';
 export * from './expressions/expr-count-distinct';

package/dist/lang/ast/index.js

@@ -55,6 +55,7 @@ __exportStar(require("./expressions/expr-alternation-tree"), exports);
 __exportStar(require("./expressions/expr-asymmetric"), exports);
 __exportStar(require("./expressions/expr-avg"), exports);
 __exportStar(require("./expressions/expr-cast"), exports);
+__exportStar(require("./expressions/expr-coalesce"), exports);
 __exportStar(require("./expressions/expr-compare"), exports);
 __exportStar(require("./expressions/expr-count"), exports);
 __exportStar(require("./expressions/expr-count-distinct"), exports);

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

@@ -71,76 +71,77 @@ export declare class MalloyLexer extends Lexer {
     static readonly ON = 66;
     static readonly OR = 67;
     static readonly PICK = 68;
-    static readonly QMARK = 69;
-    static readonly QUARTER = 70;
-    static readonly SECOND = 71;
-    static readonly STRING = 72;
-    static readonly SUM = 73;
-    static readonly TABLE = 74;
-    static readonly THEN = 75;
-    static readonly THIS = 76;
-    static readonly TIMESTAMP = 77;
-    static readonly TO = 78;
-    static readonly TRUE = 79;
-    static readonly TURTLE = 80;
-    static readonly WEEK = 81;
-    static readonly WHEN = 82;
-    static readonly WITH = 83;
-    static readonly YEAR = 84;
-    static readonly UNGROUPED = 85;
-    static readonly STRING_ESCAPE = 86;
-    static readonly HACKY_REGEX = 87;
-    static readonly STRING_LITERAL = 88;
-    static readonly AMPER = 89;
-    static readonly ARROW = 90;
-    static readonly FAT_ARROW = 91;
-    static readonly OPAREN = 92;
-    static readonly CPAREN = 93;
-    static readonly OBRACK = 94;
-    static readonly CBRACK = 95;
-    static readonly OCURLY = 96;
-    static readonly CCURLY = 97;
-    static readonly DOUBLECOLON = 98;
-    static readonly COLON = 99;
-    static readonly COMMA = 100;
-    static readonly DOT = 101;
-    static readonly LT = 102;
-    static readonly GT = 103;
-    static readonly EQ = 104;
-    static readonly NE = 105;
-    static readonly LTE = 106;
-    static readonly GTE = 107;
-    static readonly PLUS = 108;
-    static readonly MINUS = 109;
-    static readonly STAR = 110;
-    static readonly STARSTAR = 111;
-    static readonly SLASH = 112;
-    static readonly BAR = 113;
-    static readonly SEMI = 114;
-    static readonly NOT_MATCH = 115;
-    static readonly MATCH = 116;
-    static readonly PERCENT = 117;
-    static readonly LITERAL_TIMESTAMP = 118;
-    static readonly LITERAL_HOUR = 119;
-    static readonly LITERAL_DAY = 120;
-    static readonly LITERAL_QUARTER = 121;
-    static readonly LITERAL_MONTH = 122;
-    static readonly LITERAL_WEEK = 123;
-    static readonly LITERAL_YEAR = 124;
-    static readonly IDENTIFIER = 125;
-    static readonly PERCENT_LITERAL = 126;
-    static readonly INTEGER_LITERAL = 127;
-    static readonly NUMERIC_LITERAL = 128;
-    static readonly OBJECT_NAME_LITERAL = 129;
-    static readonly BLOCK_COMMENT = 130;
-    static readonly COMMENT_TO_EOL = 131;
-    static readonly WHITE_SPACE = 132;
-    static readonly SQL_BEGIN = 133;
-    static readonly CLOSE_CODE = 134;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 135;
-    static readonly UNEXPECTED_CHAR = 136;
-    static readonly OPEN_CODE = 137;
-    static readonly SQL_END = 138;
+    static readonly QUARTER = 69;
+    static readonly SECOND = 70;
+    static readonly STRING = 71;
+    static readonly SUM = 72;
+    static readonly TABLE = 73;
+    static readonly THEN = 74;
+    static readonly THIS = 75;
+    static readonly TIMESTAMP = 76;
+    static readonly TO = 77;
+    static readonly TRUE = 78;
+    static readonly TURTLE = 79;
+    static readonly WEEK = 80;
+    static readonly WHEN = 81;
+    static readonly WITH = 82;
+    static readonly YEAR = 83;
+    static readonly UNGROUPED = 84;
+    static readonly STRING_ESCAPE = 85;
+    static readonly HACKY_REGEX = 86;
+    static readonly STRING_LITERAL = 87;
+    static readonly AMPER = 88;
+    static readonly ARROW = 89;
+    static readonly FAT_ARROW = 90;
+    static readonly OPAREN = 91;
+    static readonly CPAREN = 92;
+    static readonly OBRACK = 93;
+    static readonly CBRACK = 94;
+    static readonly OCURLY = 95;
+    static readonly CCURLY = 96;
+    static readonly DOUBLECOLON = 97;
+    static readonly COLON = 98;
+    static readonly COMMA = 99;
+    static readonly DOT = 100;
+    static readonly LT = 101;
+    static readonly GT = 102;
+    static readonly EQ = 103;
+    static readonly NE = 104;
+    static readonly LTE = 105;
+    static readonly GTE = 106;
+    static readonly PLUS = 107;
+    static readonly MINUS = 108;
+    static readonly STAR = 109;
+    static readonly STARSTAR = 110;
+    static readonly SLASH = 111;
+    static readonly BAR = 112;
+    static readonly SEMI = 113;
+    static readonly NOT_MATCH = 114;
+    static readonly MATCH = 115;
+    static readonly PERCENT = 116;
+    static readonly DOUBLE_QMARK = 117;
+    static readonly QMARK = 118;
+    static readonly LITERAL_TIMESTAMP = 119;
+    static readonly LITERAL_HOUR = 120;
+    static readonly LITERAL_DAY = 121;
+    static readonly LITERAL_QUARTER = 122;
+    static readonly LITERAL_MONTH = 123;
+    static readonly LITERAL_WEEK = 124;
+    static readonly LITERAL_YEAR = 125;
+    static readonly IDENTIFIER = 126;
+    static readonly PERCENT_LITERAL = 127;
+    static readonly INTEGER_LITERAL = 128;
+    static readonly NUMERIC_LITERAL = 129;
+    static readonly OBJECT_NAME_LITERAL = 130;
+    static readonly BLOCK_COMMENT = 131;
+    static readonly COMMENT_TO_EOL = 132;
+    static readonly WHITE_SPACE = 133;
+    static readonly SQL_BEGIN = 134;
+    static readonly CLOSE_CODE = 135;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 136;
+    static readonly UNEXPECTED_CHAR = 137;
+    static readonly OPEN_CODE = 138;
+    static readonly SQL_END = 139;
     static readonly SQL_MODE = 1;
     static readonly channelNames: string[];
     static readonly modeNames: string[];