@malloydata/malloy 0.0.180-dev240904183715 → 0.0.180-dev240906180931

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

@@ -25,7 +25,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprNot = void 0;
 const fragtype_utils_1 = require("../fragtype-utils");
 const unary_1 = require("./unary");
-const utils_1 = require("./utils");
 class ExprNot extends unary_1.Unary {
     constructor(expr) {
         super(expr);
@@ -38,7 +37,7 @@ class ExprNot extends unary_1.Unary {
         return {
             ...notThis,
             dataType: 'boolean',
-            value: doNot ? (0, utils_1.nullsafeNot)(notThis.value) : { node: 'false' },
+            value: { node: 'not', e: doNot ? notThis.value : { node: 'false' } },
         };
     }
 }

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

@@ -56,7 +56,6 @@ export * from './expressions/range';
 export * from './expressions/time-frame';
 export * from './expressions/top-by';
 export * from './expressions/unary';
-export * from './expressions/utils';
 export * from './statements/import-statement';
 export * from './query-properties/extend';
 export * from './parameters/argument';

package/dist/lang/ast/index.js

@@ -94,7 +94,6 @@ __exportStar(require("./expressions/range"), exports);
 __exportStar(require("./expressions/time-frame"), exports);
 __exportStar(require("./expressions/top-by"), exports);
 __exportStar(require("./expressions/unary"), exports);
-__exportStar(require("./expressions/utils"), exports);
 __exportStar(require("./statements/import-statement"), exports);
 __exportStar(require("./query-properties/extend"), exports);
 __exportStar(require("./parameters/argument"), exports);

package/dist/lang/ast/types/expression-def.js

@@ -25,7 +25,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyBinary = exports.getMorphicValue = exports.ExprDuration = exports.ExpressionDef = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
-const utils_1 = require("../expressions/utils");
 const fragtype_utils_1 = require("../fragtype-utils");
 const time_utils_1 = require("../time-utils");
 const granular_result_1 = require("./granular-result");
@@ -236,6 +235,7 @@ function nullCompare(left, op, right) {
     return undefined;
 }
 function equality(fs, left, op, right) {
+    var _a;
     const lhs = left.getExpression(fs);
     const rhs = right.getExpression(fs);
     const node = (0, binary_operators_1.getExprNode)(op);
@@ -269,19 +269,11 @@ function equality(fs, left, op, right) {
                     }
                     value = regexCmp;
                 }
-                value = (0, utils_1.nullsafeNot)(value, op);
                 break;
             }
             case '=':
             case '!=': {
-                const nullCmp = nullCompare(lhs, op, rhs);
-                const eqNode = value;
-                if (nullCmp) {
-                    value = nullCmp;
-                }
-                else {
-                    value = (0, utils_1.nullsafeNot)(regexEqual(lhs, rhs) || eqNode, op);
-                }
+                value = (_a = nullCompare(lhs, op, rhs)) !== null && _a !== void 0 ? _a : value;
                 break;
             }
         }

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

@@ -66,96 +66,97 @@ export declare class MalloyLexer extends Lexer {
     static readonly JSON = 61;
     static readonly LAST = 62;
     static readonly LEFT = 63;
-    static readonly MAX = 64;
-    static readonly MIN = 65;
-    static readonly MINUTE = 66;
-    static readonly MONTH = 67;
-    static readonly NOT = 68;
-    static readonly NOW = 69;
-    static readonly NULL = 70;
-    static readonly NUMBER = 71;
-    static readonly ON = 72;
-    static readonly OR = 73;
-    static readonly PICK = 74;
-    static readonly QUARTER = 75;
-    static readonly RIGHT = 76;
-    static readonly SECOND = 77;
-    static readonly STRING = 78;
-    static readonly SOURCE_KW = 79;
-    static readonly SUM = 80;
-    static readonly SQL = 81;
-    static readonly TABLE = 82;
-    static readonly THEN = 83;
-    static readonly THIS = 84;
-    static readonly TIMESTAMP = 85;
-    static readonly TO = 86;
-    static readonly TRUE = 87;
-    static readonly TURTLE = 88;
-    static readonly WEEK = 89;
-    static readonly WHEN = 90;
-    static readonly WITH = 91;
-    static readonly YEAR = 92;
-    static readonly UNGROUPED = 93;
-    static readonly STRING_ESCAPE = 94;
-    static readonly HACKY_REGEX = 95;
-    static readonly SQ_STRING = 96;
-    static readonly DQ_STRING = 97;
-    static readonly BQ_STRING = 98;
-    static readonly DOC_ANNOTATION = 99;
-    static readonly ANNOTATION = 100;
-    static readonly AMPER = 101;
-    static readonly ARROW = 102;
-    static readonly FAT_ARROW = 103;
-    static readonly OPAREN = 104;
-    static readonly CPAREN = 105;
-    static readonly OBRACK = 106;
-    static readonly CBRACK = 107;
-    static readonly OCURLY = 108;
-    static readonly CCURLY = 109;
-    static readonly DOUBLECOLON = 110;
-    static readonly TRIPLECOLON = 111;
-    static readonly EXCLAM = 112;
-    static readonly COLON = 113;
-    static readonly COMMA = 114;
-    static readonly DOT = 115;
-    static readonly LT = 116;
-    static readonly GT = 117;
-    static readonly EQ = 118;
-    static readonly NE = 119;
-    static readonly LTE = 120;
-    static readonly GTE = 121;
-    static readonly PLUS = 122;
-    static readonly MINUS = 123;
-    static readonly STAR = 124;
-    static readonly STARSTAR = 125;
-    static readonly SLASH = 126;
-    static readonly BAR = 127;
-    static readonly SEMI = 128;
-    static readonly NOT_MATCH = 129;
-    static readonly MATCH = 130;
-    static readonly PERCENT = 131;
-    static readonly DOUBLE_QMARK = 132;
-    static readonly QMARK = 133;
-    static readonly LITERAL_TIMESTAMP = 134;
-    static readonly LITERAL_HOUR = 135;
-    static readonly LITERAL_DAY = 136;
-    static readonly LITERAL_QUARTER = 137;
-    static readonly LITERAL_MONTH = 138;
-    static readonly LITERAL_WEEK = 139;
-    static readonly LITERAL_YEAR = 140;
-    static readonly IDENTIFIER = 141;
-    static readonly PERCENT_LITERAL = 142;
-    static readonly NUMERIC_LITERAL = 143;
-    static readonly INTEGER_LITERAL = 144;
-    static readonly BLOCK_COMMENT = 145;
-    static readonly COMMENT_TO_EOL = 146;
-    static readonly WHITE_SPACE = 147;
-    static readonly SQL_BEGIN = 148;
-    static readonly CLOSE_CODE = 149;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 150;
-    static readonly UNEXPECTED_CHAR = 151;
-    static readonly OPEN_CODE = 152;
-    static readonly SQL_END = 153;
+    static readonly LIKE = 64;
+    static readonly MAX = 65;
+    static readonly MIN = 66;
+    static readonly MINUTE = 67;
+    static readonly MONTH = 68;
+    static readonly NOT = 69;
+    static readonly NOW = 70;
+    static readonly NULL = 71;
+    static readonly NUMBER = 72;
+    static readonly ON = 73;
+    static readonly OR = 74;
+    static readonly PICK = 75;
+    static readonly QUARTER = 76;
+    static readonly RIGHT = 77;
+    static readonly SECOND = 78;
+    static readonly STRING = 79;
+    static readonly SOURCE_KW = 80;
+    static readonly SUM = 81;
+    static readonly SQL = 82;
+    static readonly TABLE = 83;
+    static readonly THEN = 84;
+    static readonly THIS = 85;
+    static readonly TIMESTAMP = 86;
+    static readonly TO = 87;
+    static readonly TRUE = 88;
+    static readonly TURTLE = 89;
+    static readonly WEEK = 90;
+    static readonly WHEN = 91;
+    static readonly WITH = 92;
+    static readonly YEAR = 93;
+    static readonly UNGROUPED = 94;
+    static readonly STRING_ESCAPE = 95;
+    static readonly HACKY_REGEX = 96;
+    static readonly SQ_STRING = 97;
+    static readonly DQ_STRING = 98;
+    static readonly BQ_STRING = 99;
+    static readonly DOC_ANNOTATION = 100;
+    static readonly ANNOTATION = 101;
+    static readonly AMPER = 102;
+    static readonly ARROW = 103;
+    static readonly FAT_ARROW = 104;
+    static readonly OPAREN = 105;
+    static readonly CPAREN = 106;
+    static readonly OBRACK = 107;
+    static readonly CBRACK = 108;
+    static readonly OCURLY = 109;
+    static readonly CCURLY = 110;
+    static readonly DOUBLECOLON = 111;
+    static readonly TRIPLECOLON = 112;
+    static readonly EXCLAM = 113;
+    static readonly COLON = 114;
+    static readonly COMMA = 115;
+    static readonly DOT = 116;
+    static readonly LT = 117;
+    static readonly GT = 118;
+    static readonly EQ = 119;
+    static readonly NE = 120;
+    static readonly LTE = 121;
+    static readonly GTE = 122;
+    static readonly PLUS = 123;
+    static readonly MINUS = 124;
+    static readonly STAR = 125;
+    static readonly STARSTAR = 126;
+    static readonly SLASH = 127;
+    static readonly BAR = 128;
+    static readonly SEMI = 129;
+    static readonly NOT_MATCH = 130;
+    static readonly MATCH = 131;
+    static readonly PERCENT = 132;
+    static readonly DOUBLE_QMARK = 133;
+    static readonly QMARK = 134;
+    static readonly LITERAL_TIMESTAMP = 135;
+    static readonly LITERAL_HOUR = 136;
+    static readonly LITERAL_DAY = 137;
+    static readonly LITERAL_QUARTER = 138;
+    static readonly LITERAL_MONTH = 139;
+    static readonly LITERAL_WEEK = 140;
+    static readonly LITERAL_YEAR = 141;
+    static readonly IDENTIFIER = 142;
+    static readonly PERCENT_LITERAL = 143;
+    static readonly NUMERIC_LITERAL = 144;
+    static readonly INTEGER_LITERAL = 145;
+    static readonly BLOCK_COMMENT = 146;
+    static readonly COMMENT_TO_EOL = 147;
+    static readonly WHITE_SPACE = 148;
+    static readonly SQL_BEGIN = 149;
+    static readonly CLOSE_CODE = 150;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 151;
+    static readonly UNEXPECTED_CHAR = 152;
+    static readonly OPEN_CODE = 153;
+    static readonly SQL_END = 154;
     static readonly SQL_MODE = 1;
     static readonly channelNames: string[];
     static readonly modeNames: string[];