@malloydata/malloy 0.0.237-dev250223010918 → 0.0.237-dev250224215546

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

@@ -13,6 +13,7 @@ import { LiteralMonthContext } from "./MalloyParser";
 import { LiteralQuarterContext } from "./MalloyParser";
 import { LiteralYearContext } from "./MalloyParser";
 import { ExprStringContext } from "./MalloyParser";
+import { Stub_rawStringContext } from "./MalloyParser";
 import { ExprNumberContext } from "./MalloyParser";
 import { ExprTimeContext } from "./MalloyParser";
 import { ExprNULLContext } from "./MalloyParser";
@@ -199,6 +200,7 @@ import { MalloyTypeContext } from "./MalloyParser";
 import { CompareOpContext } from "./MalloyParser";
 import { StringContext } from "./MalloyParser";
 import { ShortStringContext } from "./MalloyParser";
+import { RawStringContext } from "./MalloyParser";
 import { NumericLiteralContext } from "./MalloyParser";
 import { LiteralContext } from "./MalloyParser";
 import { DateLiteralContext } from "./MalloyParser";
@@ -409,6 +411,18 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitExprString?: (ctx: ExprStringContext) => void;
+    /**
+     * Enter a parse tree produced by the `stub_rawString`
+     * labeled alternative in `MalloyParser.literal`.
+     * @param ctx the parse tree
+     */
+    enterStub_rawString?: (ctx: Stub_rawStringContext) => void;
+    /**
+     * Exit a parse tree produced by the `stub_rawString`
+     * labeled alternative in `MalloyParser.literal`.
+     * @param ctx the parse tree
+     */
+    exitStub_rawString?: (ctx: Stub_rawStringContext) => void;
     /**
      * Enter a parse tree produced by the `exprNumber`
      * labeled alternative in `MalloyParser.literal`.
@@ -2413,6 +2427,16 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitShortString?: (ctx: ShortStringContext) => void;
+    /**
+     * Enter a parse tree produced by `MalloyParser.rawString`.
+     * @param ctx the parse tree
+     */
+    enterRawString?: (ctx: RawStringContext) => void;
+    /**
+     * Exit a parse tree produced by `MalloyParser.rawString`.
+     * @param ctx the parse tree
+     */
+    exitRawString?: (ctx: RawStringContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.numericLiteral`.
      * @param ctx the parse tree

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

@@ -13,6 +13,7 @@ import { LiteralMonthContext } from "./MalloyParser";
 import { LiteralQuarterContext } from "./MalloyParser";
 import { LiteralYearContext } from "./MalloyParser";
 import { ExprStringContext } from "./MalloyParser";
+import { Stub_rawStringContext } from "./MalloyParser";
 import { ExprNumberContext } from "./MalloyParser";
 import { ExprTimeContext } from "./MalloyParser";
 import { ExprNULLContext } from "./MalloyParser";
@@ -199,6 +200,7 @@ import { MalloyTypeContext } from "./MalloyParser";
 import { CompareOpContext } from "./MalloyParser";
 import { StringContext } from "./MalloyParser";
 import { ShortStringContext } from "./MalloyParser";
+import { RawStringContext } from "./MalloyParser";
 import { NumericLiteralContext } from "./MalloyParser";
 import { LiteralContext } from "./MalloyParser";
 import { DateLiteralContext } from "./MalloyParser";
@@ -342,6 +344,13 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitExprString?: (ctx: ExprStringContext) => Result;
+    /**
+     * Visit a parse tree produced by the `stub_rawString`
+     * labeled alternative in `MalloyParser.literal`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitStub_rawString?: (ctx: Stub_rawStringContext) => Result;
     /**
      * Visit a parse tree produced by the `exprNumber`
      * labeled alternative in `MalloyParser.literal`.
@@ -1530,6 +1539,12 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitShortString?: (ctx: ShortStringContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyParser.rawString`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitRawString?: (ctx: RawStringContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.numericLiteral`.
      * @param ctx the parse tree

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

@@ -162,6 +162,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitPartialTest(pcx: parse.PartialTestContext): ast.ExpressionDef;
     visitPartialAllowedFieldExpr(pcx: parse.PartialAllowedFieldExprContext): ast.ExpressionDef;
     visitExprString(pcx: parse.ExprStringContext): ast.ExprString;
+    visitRawString(pcx: parse.RawStringContext): ast.ExprString;
     visitExprRegex(pcx: parse.ExprRegexContext): ast.ExprRegEx;
     visitExprNow(_pcx: parse.ExprNowContext): ast.ExprNow;
     visitExprNumber(pcx: parse.ExprNumberContext): ast.ExprNumber;

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

@@ -910,6 +910,15 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const str = this.getPlainStringFrom(pcx);
         return new ast.ExprString(str);
     }
+    visitRawString(pcx) {
+        const str = pcx.text.slice(1).trimStart();
+        const lastChar = str[str.length - 1];
+        if (lastChar === '\n') {
+            this.contextError(pcx, 'literal-string-newline', 'String cannot contain a new-line character');
+        }
+        const astStr = new ast.ExprString(str.slice(1, -1));
+        return this.astAt(astStr, pcx);
+    }
     visitExprRegex(pcx) {
         const malloyRegex = pcx.HACKY_REGEX().text;
         return new ast.ExprRegEx(malloyRegex.slice(2, -1));

package/dist/lang/parse-log.d.ts

@@ -361,6 +361,7 @@ type MessageParameterTypes = {
     'cannot-tag-include-except': string;
     'unsupported-path-in-include': string;
     'wildcard-include-rename': string;
+    'literal-string-newline': string;
 };
 export declare const MESSAGE_FORMATTERS: PartialErrorCodeMessageMap;
 export type MessageCode = keyof MessageParameterTypes;

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

@@ -62,7 +62,7 @@ describe('expressions', () => {
         expect((0, test_translator_1.expr) `concat('foo')`).toTranslate();
     });
     test('raw function call codegen', () => {
-        expect((0, test_translator_1.expr) `special_function!(aweird, 'foo')`).compilesTo('special_function({aweird},{"foo"})');
+        expect((0, test_translator_1.expr) `special_function!(aweird, 'foo')`).compilesTo('special_function({aweird},{{"foo"}})');
     });
     describe('operators', () => {
         test('addition', () => {
@@ -110,19 +110,19 @@ describe('expressions', () => {
             expect('42 < 7').compilesTo('{42 < 7}');
         });
         test('match', () => {
-            expect("'forty-two' ~ 'fifty-four'").compilesTo('{"forty-two" like "fifty-four"}');
+            expect("'forty-two' ~ 'fifty-four'").compilesTo('{{"forty-two"} like {"fifty-four"}}');
         });
         test('not match', () => {
-            expect("'forty-two' !~ 'fifty-four'").compilesTo('{"forty-two" !like "fifty-four"}');
+            expect("'forty-two' !~ 'fifty-four'").compilesTo('{{"forty-two"} !like {"fifty-four"}}');
         });
         test('regexp-match', () => {
-            expect("'forty-two' ~ r'fifty-four'").compilesTo('{"forty-two" regex-match /fifty-four/}');
+            expect("'forty-two' ~ r'fifty-four'").compilesTo('{{"forty-two"} regex-match /fifty-four/}');
         });
         test('not regexp-match', () => {
-            expect("'forty-two' !~ r'fifty-four'").compilesTo('{not {"forty-two" regex-match /fifty-four/}}');
+            expect("'forty-two' !~ r'fifty-four'").compilesTo('{not {{"forty-two"} regex-match /fifty-four/}}');
         });
         test('apply as equality', () => {
-            expect("'forty-two' ? 'fifty-four'").compilesTo('{"forty-two" = "fifty-four"}');
+            expect("'forty-two' ? 'fifty-four'").compilesTo('{{"forty-two"} = {"fifty-four"}}');
         });
         test('not', () => {
             expect('not true').compilesTo('{not true}');
@@ -212,14 +212,14 @@ describe('expressions', () => {
             test('like with warning', () => {
                 const warnSrc = (0, test_translator_1.expr) `astr like 'a'`;
                 expect(warnSrc).toLog((0, test_translator_1.warningMessage)("Use Malloy operator '~' instead of 'LIKE'"));
-                expect(warnSrc).compilesTo('{astr like "a"}');
+                expect(warnSrc).compilesTo('{astr like {"a"}}');
                 const warning = warnSrc.translator.problems()[0];
                 expect(warning.replacement).toEqual("astr ~ 'a'");
             });
             test('NOT LIKE with warning', () => {
                 const warnSrc = (0, test_translator_1.expr) `astr not like 'a'`;
                 expect(warnSrc).toLog((0, test_translator_1.warningMessage)("Use Malloy operator '!~' instead of 'NOT LIKE'"));
-                expect(warnSrc).compilesTo('{astr !like "a"}');
+                expect(warnSrc).compilesTo('{astr !like {"a"}}');
                 const warning = warnSrc.translator.problems()[0];
                 expect(warning.replacement).toEqual("astr !~ 'a'");
             });
@@ -767,7 +767,7 @@ describe('expressions', () => {
         end
       `;
             expect(e).toLog((0, test_translator_1.warning)('sql-case'));
-            expect(e).compilesTo('{case when {ai = 42} then "the answer" when {ai = 54} then "the questionable answer" else "random"}');
+            expect(e).compilesTo('{case when {ai = 42} then {"the answer"} when {ai = 54} then {"the questionable answer"} else {"random"}}');
         });
         test('with value', () => {
             const e = (0, test_translator_1.expr) `
@@ -778,7 +778,7 @@ describe('expressions', () => {
         end
       `;
             expect(e).toLog((0, test_translator_1.warning)('sql-case'));
-            expect(e).compilesTo('{case ai when 42 then "the answer" when 54 then "the questionable answer" else "random"}');
+            expect(e).compilesTo('{case ai when 42 then {"the answer"} when 54 then {"the questionable answer"} else {"random"}}');
         });
         test('no else', () => {
             const e = (0, test_translator_1.expr) `
@@ -788,7 +788,7 @@ describe('expressions', () => {
         end
       `;
             expect(e).toLog((0, test_translator_1.warning)('sql-case'));
-            expect(e).compilesTo('{case when {ai = 42} then "the answer" when {ai = 54} then "the questionable answer"}');
+            expect(e).compilesTo('{case when {ai = 42} then {"the answer"} when {ai = 54} then {"the questionable answer"}}');
         });
         test('wrong then type', () => {
             expect((0, test_translator_1.expr) `

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

@@ -44,6 +44,15 @@ describe('literals', () => {
         const str = "'Is " + '\\' + '\\' + " nice'";
         expect(new test_translator_1.BetaExpression(str)).toTranslate();
     });
+    test("raw s'string", () => {
+        expect("s'a'").compilesTo('{"a"}');
+    });
+    test('raw s"string', () => {
+        expect('s "a"').compilesTo('{"a"}');
+    });
+    test('raw string with quoted end char', () => {
+        expect("s'a\\'b'").compilesTo('{"a\\\'b"}');
+    });
     const literalTimes = [
         ['@1960', 'date', 'year', { literal: '1960-01-01' }],
         ['@1960-Q2', 'date', 'quarter', { literal: '1960-04-01' }],
@@ -269,6 +278,9 @@ describe('literals', () => {
             const x = new test_translator_1.BetaExpression('"""x"""');
             expect(x).toParse();
         });
+        test('Error for missing close in raw string', () => {
+            expect((0, test_translator_1.expr) `s'hello\n`).toLog((0, test_translator_1.errorMessage)('String cannot contain a new-line character'));
+        });
         test('a string containing a tab', () => expect((0, test_translator_1.expr) `'\t'`).toParse());
     });
     describe('compound literals', () => {
@@ -279,10 +291,10 @@ describe('literals', () => {
             expect('{aninline.column}').compilesTo('{column:aninline.column}');
         });
         test('array of records with same schema', () => {
-            expect('[{name is "one", val is 1},{name is "two", val is 2}]').compilesTo('[{name:"one", val:1}, {name:"two", val:2}]');
+            expect('[{name is "one", val is 1},{name is "two", val is 2}]').compilesTo('[{name:{"one"}, val:1}, {name:{"two"}, val:2}]');
         });
         test('array of records with head schema', () => {
-            expect('[{name is "one", val is 1},{"two", 2}]').compilesTo('[{name:"one", val:1}, {name:"two", val:2}]');
+            expect('[{name is "one", val is 1},{"two", 2}]').compilesTo('[{name:{"one"}, val:1}, {name:{"two"}, val:2}]');
         });
     });
 });

package/dist/lang/test/parse-expects.js

@@ -145,7 +145,7 @@ function eToStr(e, symbols) {
         case 'numberLiteral':
             return `${e.literal}`;
         case 'stringLiteral':
-            return `"${e.literal}"`;
+            return `{"${e.literal}"}`;
         case 'timeLiteral':
             return `@${e.literal}`;
         case 'recordLiteral': {

package/dist/model/malloy_query.js

@@ -836,15 +836,15 @@ class QueryField extends QueryNode {
                 return `${expr.kids.left.sql} ${expr.node} ${expr.kids.right.sql}`;
             case 'coalesce':
                 return `COALESCE(${expr.kids.left.sql},${expr.kids.right.sql})`;
-            case 'like':
-                return `${expr.kids.left.sql} LIKE ${expr.kids.right.sql}`;
             case 'in': {
                 const oneOf = expr.kids.oneOf.map(o => o.sql).join(',');
                 return `${expr.kids.e.sql} ${expr.not ? 'NOT IN' : 'IN'} (${oneOf})`;
             }
+            case 'like':
+                return this.parent.dialect.likeExpr(expr);
             // Malloy inequality comparisons always return a boolean
             case '!like': {
-                const notLike = `${expr.kids.left.sql} NOT LIKE ${expr.kids.right.sql}`;
+                const notLike = this.parent.dialect.likeExpr(expr);
                 return `COALESCE(${notLike},true)`;
             }
             case '()':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.237-dev250223010918",
+  "version": "0.0.237-dev250224215546",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",