@malloydata/malloy 0.0.242-dev250313002313 → 0.0.242-dev250313045635

package/dist/dialect/dialect.d.ts

@@ -1,4 +1,4 @@
-import { Expr, Sampling, AtomicTypeDef, MeasureTimeExpr, TimeTruncExpr, TimeExtractExpr, TimeDeltaExpr, TypecastExpr, RegexMatchExpr, TimeLiteralNode, RecordLiteralNode, ArrayLiteralNode, LeafAtomicTypeDef, OrderBy, BinaryExpr } from '../model/malloy_types';
+import { Expr, Sampling, AtomicTypeDef, MeasureTimeExpr, TimeTruncExpr, TimeExtractExpr, TimeDeltaExpr, TypecastExpr, RegexMatchExpr, TimeLiteralNode, RecordLiteralNode, ArrayLiteralNode, LeafAtomicTypeDef, OrderBy } from '../model/malloy_types';
 import { DialectFunctionOverloadDef } from './functions';
 type DialectFieldTypes = string | 'struct';
 interface DialectField {
@@ -101,10 +101,10 @@ export declare abstract class Dialect {
     abstract sqlMeasureTimeExpr(e: MeasureTimeExpr): string;
     abstract sqlAlterTimeExpr(df: TimeDeltaExpr): string;
     abstract sqlCast(qi: QueryInfo, cast: TypecastExpr): string;
+    abstract sqlRegexpMatch(df: RegexMatchExpr): string;
     abstract sqlLiteralTime(qi: QueryInfo, df: TimeLiteralNode): string;
     abstract sqlLiteralString(literal: string): string;
     abstract sqlLiteralRegexp(literal: string): string;
-    abstract sqlRegexpMatch(df: RegexMatchExpr): string;
     abstract sqlLiteralArray(lit: ArrayLiteralNode): string;
     abstract sqlLiteralRecord(lit: RecordLiteralNode): string;
     /**
@@ -139,6 +139,10 @@ export declare abstract class Dialect {
         dstTypeDef: LeafAtomicTypeDef | undefined;
         dstSQLType: string;
     };
-    likeExpr(expr: BinaryExpr): string;
+    /**
+     * Write a LIKE expression. Malloy like strings are escaped with \\% and \\_
+     * but some SQL dialects use an ESCAPE clause.
+     */
+    sqlLike(likeOp: 'LIKE' | 'NOT LIKE', left: string, likeStr: string): string;
 }
 export {};

package/dist/dialect/dialect.js

@@ -225,21 +225,34 @@ class Dialect {
             dstSQLType: this.malloyTypeToSQLType(cast.dstType),
         };
     }
-    likeExpr(expr) {
-        const isLike = expr.kids.right;
-        if (expr.node === 'like' || expr.node === '!like') {
-            const likeOp = expr.node === '!like' ? 'NOT LIKE' : 'LIKE';
-            if (this.likeEscape && isLike.node === 'stringLiteral') {
-                const likeStr = isLike.literal;
-                if (likeStr.includes('\\')) {
-                    const escapeUp = likeStr.replace(/\^/g, '^^');
-                    const newLikeStr = escapeUp.replace(/\\/g, '^');
-                    return `${expr.kids.left.sql} ${likeOp} '${newLikeStr}' ESCAPE '^'`;
+    /**
+     * Write a LIKE expression. Malloy like strings are escaped with \\% and \\_
+     * but some SQL dialects use an ESCAPE clause.
+     */
+    sqlLike(likeOp, left, likeStr) {
+        let escaped = '';
+        let escapeActive = false;
+        let escapeClause = false;
+        for (const c of likeStr) {
+            if (c === '\\' && !escapeActive) {
+                escapeActive = true;
+            }
+            else if (this.likeEscape && c === '^') {
+                escaped += '^^';
+                escapeActive = false;
+                escapeClause = true;
+            }
+            else {
+                if (escapeActive && (c === '%' || c === '_')) {
+                    escaped += this.likeEscape ? '^' : '\\';
+                    escapeClause = this.likeEscape;
                 }
+                escaped += c;
+                escapeActive = false;
             }
-            return `${expr.kids.left.sql} ${likeOp} ${isLike.sql}`;
         }
-        return 'false';
+        const compare = `${left} ${likeOp} ${this.sqlLiteralString(escaped)}`;
+        return escapeClause ? `${compare} ESCAPE '^'` : compare;
     }
 }
 exports.Dialect = Dialect;

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

@@ -0,0 +1,11 @@
+import { BinaryMalloyOperator } from '../types/binary_operators';
+import { ExprValue } from '../types/expr-value';
+import { ExpressionDef } from '../types/expression-def';
+import { FieldSpace } from '../types/field-space';
+export declare class ExprFilterExpression extends ExpressionDef {
+    readonly filterText: string;
+    elementType: string;
+    constructor(filterText: string);
+    getExpression(): ExprValue;
+    apply(fs: FieldSpace, op: BinaryMalloyOperator, left: ExpressionDef, _warnOnComplexTree?: boolean): ExprValue;
+}

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

@@ -0,0 +1,61 @@
+"use strict";
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExprFilterExpression = void 0;
+const expr_value_1 = require("../types/expr-value");
+const expression_def_1 = require("../types/expression-def");
+const malloy_filter_1 = require("@malloydata/malloy-filter");
+class ExprFilterExpression extends expression_def_1.ExpressionDef {
+    constructor(filterText) {
+        super();
+        this.filterText = filterText;
+        this.elementType = 'filter expression literal';
+        // mtoy todo parse the filter and reflect errors into the error stream
+    }
+    getExpression() {
+        return this.loggedErrorExpr('filter-expression-type', 'Filter expression illegal here');
+    }
+    apply(fs, op, left, _warnOnComplexTree = false) {
+        if (op === '~' || op === '!~') {
+            const matchExpr = left.getExpression(fs);
+            if (matchExpr.type === 'error') {
+                return matchExpr;
+            }
+            if (matchExpr.type === 'string') {
+                const fParse = malloy_filter_1.StringFilterExpression.parse(this.filterText);
+                if (fParse.log.length > 0) {
+                    for (const _err of fParse.log) {
+                        // mtoy todo actuall get error and report correct position and error type
+                        return this.loggedErrorExpr('filter-expression-type', 'FHJKL:DSHJKL error in parsing filter expression');
+                    }
+                }
+                if (!fParse.parsed) {
+                    return this.loggedErrorExpr('filter-expression-type', 'FJKLD:JDKSL: expression parsed to null');
+                }
+                const filterMatch = {
+                    node: 'filterMatch',
+                    dataType: matchExpr.type,
+                    filter: fParse.parsed,
+                    e: matchExpr.value,
+                };
+                if (op === '!~') {
+                    filterMatch.notMatch = true;
+                }
+                return (0, expr_value_1.computedExprValue)({
+                    value: filterMatch,
+                    dataType: { type: 'boolean' },
+                    from: [matchExpr],
+                });
+            }
+            return this.loggedErrorExpr('filter-expression-type', `CUISAO)VEFG Filter expressions for ${matchExpr.type} not available`);
+        }
+        return this.loggedErrorExpr('filter-expression-type', `Cannot use the '${op}' operator with a filter expression`);
+    }
+}
+exports.ExprFilterExpression = ExprFilterExpression;
+//# sourceMappingURL=expr-filter-expr.js.map

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

@@ -44,6 +44,7 @@ export * from './expressions/expr-now';
 export * from './expressions/expr-null';
 export * from './expressions/expr-number';
 export * from './expressions/expr-parens';
+export * from './expressions/expr-filter-expr';
 export * from './expressions/expr-regex';
 export * from './expressions/expr-string';
 export * from './expressions/expr-sum';

package/dist/lang/ast/index.js

@@ -82,6 +82,7 @@ __exportStar(require("./expressions/expr-now"), exports);
 __exportStar(require("./expressions/expr-null"), exports);
 __exportStar(require("./expressions/expr-number"), exports);
 __exportStar(require("./expressions/expr-parens"), exports);
+__exportStar(require("./expressions/expr-filter-expr"), exports);
 __exportStar(require("./expressions/expr-regex"), exports);
 __exportStar(require("./expressions/expr-string"), exports);
 __exportStar(require("./expressions/expr-sum"), exports);

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

@@ -109,64 +109,70 @@ export declare class MalloyLexer extends Lexer {
     static readonly HACKY_REGEX = 104;
     static readonly RAW_SQ = 105;
     static readonly RAW_DQ = 106;
-    static readonly SQ_STRING = 107;
-    static readonly DQ_STRING = 108;
-    static readonly BQ_STRING = 109;
-    static readonly DOC_ANNOTATION = 110;
-    static readonly ANNOTATION = 111;
-    static readonly AMPER = 112;
-    static readonly ARROW = 113;
-    static readonly FAT_ARROW = 114;
-    static readonly OPAREN = 115;
-    static readonly CPAREN = 116;
-    static readonly OBRACK = 117;
-    static readonly CBRACK = 118;
-    static readonly OCURLY = 119;
-    static readonly CCURLY = 120;
-    static readonly DOUBLECOLON = 121;
-    static readonly TRIPLECOLON = 122;
-    static readonly EXCLAM = 123;
-    static readonly COLON = 124;
-    static readonly COMMA = 125;
-    static readonly DOT = 126;
-    static readonly LT = 127;
-    static readonly GT = 128;
-    static readonly EQ = 129;
-    static readonly NE = 130;
-    static readonly LTE = 131;
-    static readonly GTE = 132;
-    static readonly PLUS = 133;
-    static readonly MINUS = 134;
-    static readonly STAR = 135;
-    static readonly STARSTAR = 136;
-    static readonly SLASH = 137;
-    static readonly BAR = 138;
-    static readonly SEMI = 139;
-    static readonly NOT_MATCH = 140;
-    static readonly MATCH = 141;
-    static readonly PERCENT = 142;
-    static readonly DOUBLE_QMARK = 143;
-    static readonly QMARK = 144;
-    static readonly LITERAL_TIMESTAMP = 145;
-    static readonly LITERAL_HOUR = 146;
-    static readonly LITERAL_DAY = 147;
-    static readonly LITERAL_QUARTER = 148;
-    static readonly LITERAL_MONTH = 149;
-    static readonly LITERAL_WEEK = 150;
-    static readonly LITERAL_YEAR = 151;
-    static readonly IDENTIFIER = 152;
-    static readonly PERCENT_LITERAL = 153;
-    static readonly NUMERIC_LITERAL = 154;
-    static readonly INTEGER_LITERAL = 155;
-    static readonly BLOCK_COMMENT = 156;
-    static readonly COMMENT_TO_EOL = 157;
-    static readonly WHITE_SPACE = 158;
-    static readonly SQL_BEGIN = 159;
-    static readonly CLOSE_CODE = 160;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 161;
-    static readonly UNEXPECTED_CHAR = 162;
-    static readonly OPEN_CODE = 163;
-    static readonly SQL_END = 164;
+    static readonly SQ3_FILTER = 107;
+    static readonly SQ_FILTER = 108;
+    static readonly DQ3_FILTER = 109;
+    static readonly DQ_FILTER = 110;
+    static readonly BQ3_FILTER = 111;
+    static readonly BQ_FILTER = 112;
+    static readonly SQ_STRING = 113;
+    static readonly DQ_STRING = 114;
+    static readonly BQ_STRING = 115;
+    static readonly DOC_ANNOTATION = 116;
+    static readonly ANNOTATION = 117;
+    static readonly AMPER = 118;
+    static readonly ARROW = 119;
+    static readonly FAT_ARROW = 120;
+    static readonly OPAREN = 121;
+    static readonly CPAREN = 122;
+    static readonly OBRACK = 123;
+    static readonly CBRACK = 124;
+    static readonly OCURLY = 125;
+    static readonly CCURLY = 126;
+    static readonly DOUBLECOLON = 127;
+    static readonly TRIPLECOLON = 128;
+    static readonly EXCLAM = 129;
+    static readonly COLON = 130;
+    static readonly COMMA = 131;
+    static readonly DOT = 132;
+    static readonly LT = 133;
+    static readonly GT = 134;
+    static readonly EQ = 135;
+    static readonly NE = 136;
+    static readonly LTE = 137;
+    static readonly GTE = 138;
+    static readonly PLUS = 139;
+    static readonly MINUS = 140;
+    static readonly STAR = 141;
+    static readonly STARSTAR = 142;
+    static readonly SLASH = 143;
+    static readonly BAR = 144;
+    static readonly SEMI = 145;
+    static readonly NOT_MATCH = 146;
+    static readonly MATCH = 147;
+    static readonly PERCENT = 148;
+    static readonly DOUBLE_QMARK = 149;
+    static readonly QMARK = 150;
+    static readonly LITERAL_TIMESTAMP = 151;
+    static readonly LITERAL_HOUR = 152;
+    static readonly LITERAL_DAY = 153;
+    static readonly LITERAL_QUARTER = 154;
+    static readonly LITERAL_MONTH = 155;
+    static readonly LITERAL_WEEK = 156;
+    static readonly LITERAL_YEAR = 157;
+    static readonly IDENTIFIER = 158;
+    static readonly PERCENT_LITERAL = 159;
+    static readonly NUMERIC_LITERAL = 160;
+    static readonly INTEGER_LITERAL = 161;
+    static readonly BLOCK_COMMENT = 162;
+    static readonly COMMENT_TO_EOL = 163;
+    static readonly WHITE_SPACE = 164;
+    static readonly SQL_BEGIN = 165;
+    static readonly CLOSE_CODE = 166;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 167;
+    static readonly UNEXPECTED_CHAR = 168;
+    static readonly OPEN_CODE = 169;
+    static readonly SQL_END = 170;
     static readonly SQL_MODE = 1;
     static readonly channelNames: string[];
     static readonly modeNames: string[];