@malloydata/malloy 0.0.51-dev230629171920 → 0.0.51-dev230705184641

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

@@ -5,6 +5,7 @@ import { NamedSourceContext } from "./MalloyParser";
 import { TableSourceContext } from "./MalloyParser";
 import { QuerySourceContext } from "./MalloyParser";
 import { SQLSourceNameContext } from "./MalloyParser";
+import { SQLSourceContext } from "./MalloyParser";
 import { LiteralTimestampContext } from "./MalloyParser";
 import { LiteralHourContext } from "./MalloyParser";
 import { LiteralDayContext } from "./MalloyParser";
@@ -271,6 +272,18 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitSQLSourceName?: (ctx: SQLSourceNameContext) => void;
+    /**
+     * Enter a parse tree produced by the `SQLSource`
+     * labeled alternative in `MalloyParser.exploreSource`.
+     * @param ctx the parse tree
+     */
+    enterSQLSource?: (ctx: SQLSourceContext) => void;
+    /**
+     * Exit a parse tree produced by the `SQLSource`
+     * labeled alternative in `MalloyParser.exploreSource`.
+     * @param ctx the parse tree
+     */
+    exitSQLSource?: (ctx: SQLSourceContext) => void;
     /**
      * Enter a parse tree produced by the `literalTimestamp`
      * labeled alternative in `MalloyParser.dateLiteral`.

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

@@ -5,6 +5,7 @@ import { NamedSourceContext } from "./MalloyParser";
 import { TableSourceContext } from "./MalloyParser";
 import { QuerySourceContext } from "./MalloyParser";
 import { SQLSourceNameContext } from "./MalloyParser";
+import { SQLSourceContext } from "./MalloyParser";
 import { LiteralTimestampContext } from "./MalloyParser";
 import { LiteralHourContext } from "./MalloyParser";
 import { LiteralDayContext } from "./MalloyParser";
@@ -244,6 +245,13 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitSQLSourceName?: (ctx: SQLSourceNameContext) => Result;
+    /**
+     * Visit a parse tree produced by the `SQLSource`
+     * labeled alternative in `MalloyParser.exploreSource`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitSQLSource?: (ctx: SQLSourceContext) => Result;
     /**
      * Visit a parse tree produced by the `literalTimestamp`
      * labeled alternative in `MalloyParser.dateLiteral`.

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

@@ -68,7 +68,8 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitTableFunction(pcx: parse.TableFunctionContext): ast.TableSource;
     visitTableMethod(pcx: parse.TableMethodContext): ast.TableSource;
     visitTableSource(pcx: parse.TableSourceContext): ast.TableSource;
-    visitSQLSourceName(pcx: parse.SQLSourceNameContext): ast.SQLSource;
+    visitSQLSourceName(pcx: parse.SQLSourceNameContext): ast.FromSQLSource;
+    visitSQLSource(pcx: parse.SQLSourceContext): ast.SQLSource;
     visitQuerySource(pcx: parse.QuerySourceContext): ast.Source;
     visitDefJoinMany(pcx: parse.DefJoinManyContext): ast.Joins;
     visitDefJoinOne(pcx: parse.DefJoinOneContext): ast.Joins;
@@ -122,7 +123,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected buildPipelineFromName(pipe: ast.TurtleHeadedPipe, pipeCx: parse.PipelineFromNameContext): void;
     visitExploreArrowQuery(pcx: parse.ExploreArrowQueryContext): ast.FullQuery;
     visitArrowQuery(pcx: parse.ArrowQueryContext): ast.ExistingQuery;
-    visitTopLevelQueryDefs(pcx: parse.TopLevelQueryDefsContext): ast.DocStatement;
+    visitTopLevelQueryDefs(pcx: parse.TopLevelQueryDefsContext): ast.DefineQueryList;
     visitTopLevelQueryDef(pcx: parse.TopLevelQueryDefContext): ast.DefineQuery;
     visitAnonymousQuery(pcx: parse.AnonymousQueryContext): ast.AnonymousQuery;
     visitRunStatementDef(pcx: parse.RunStatementDefContext): ast.RunQueryDef;

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

@@ -213,6 +213,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         const lastChars = (_a = pcx.SQL_END()) === null || _a === void 0 ? void 0 : _a.text.slice(0, -3);
         sqlStr.push(lastChars || '');
+        sqlStr.complete();
         this.astAt(sqlStr, pcx);
     }
     /**
@@ -229,7 +230,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.astAt(def, pcx);
     }
     visitMalloyDocument(pcx) {
-        const stmts = this.only(pcx.malloyStatement().map(scx => this.visit(scx)), x => ast.isDocStatement(x) && x, 'statement');
+        const stmts = this.only(pcx.malloyStatement().map(scx => this.visit(scx)), x => ast.isDocStatementOrDocStatementList(x) && x, 'statement');
         return new ast.Document(stmts);
     }
     visitDefineSourceStatement(pcx) {
@@ -286,7 +287,16 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitSQLSourceName(pcx) {
         const name = this.getModelEntryName(pcx.sqlExploreNameRef());
-        return this.astAt(new ast.SQLSource(name), pcx);
+        return this.astAt(new ast.FromSQLSource(name), pcx);
+    }
+    visitSQLSource(pcx) {
+        const connId = pcx.connectionId();
+        const connectionName = this.astAt(this.getModelEntryName(connId), connId);
+        const sqlStr = new ast.SQLString();
+        const selCx = pcx.sqlString();
+        this.makeSqlString(selCx, sqlStr);
+        const expr = new ast.SQLSource(connectionName, sqlStr);
+        return this.astAt(expr, pcx);
     }
     visitQuerySource(pcx) {
         const query = this.visit(pcx.query());
@@ -1111,7 +1121,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             stmt.connection = connectionName;
         }
         stmt.is = blockName;
-        return this.astAt(stmt, pcx);
+        const result = this.astAt(stmt, pcx);
+        if (ENABLE_M4_WARNINGS) {
+            this.astError(result, '`sql:` statement is deprecated, use `connection_name.sql(...)` instead', 'warn');
+        }
+        return result;
     }
     visitSampleStatement(pcx) {
         const rowCx = pcx.sampleSpec().INTEGER_LITERAL();

package/dist/lang/parse-malloy.js

@@ -301,8 +301,8 @@ class ASTStep {
         // instead of in the parse step. Note to myself, do that someday.
         const sqlExplores = {};
         if (!this.walked) {
-            newAst.walk((walkedTo) => {
-                if (walkedTo instanceof ast.SQLSource) {
+            for (const walkedTo of newAst.walk()) {
+                if (walkedTo instanceof ast.FromSQLSource) {
                     if (!sqlExplores[walkedTo.refName]) {
                         sqlExplores[walkedTo.refName] = {};
                     }
@@ -317,7 +317,7 @@ class ASTStep {
                 else if (walkedTo instanceof ast.Unimplemented) {
                     walkedTo.log('INTERNAL COMPILER ERROR: Untranslated parse node');
                 }
-            });
+            }
             this.walked = true;
         }
         // If there is a partial ast ...

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

@@ -1695,7 +1695,7 @@ function getSelectOneStruct(sqlBlock) {
     return {
         type: 'struct',
         name: sqlBlock.name,
-        dialect: 'bigquery',
+        dialect: 'standardsql',
         structSource: {
             type: 'sql',
             method: 'subquery',
@@ -2770,4 +2770,91 @@ describe('raw function call with type specified', () => {
         expect('timestamp_seconds!timestamp(0)').toReturnType('timestamp');
     });
 });
+describe('sql expressions', () => {
+    test('reference to sql expression in unextended source', () => {
+        const m = (0, test_translator_1.model) `
+      source: na is bigquery.sql("""SELECT 1 as one""")
+    `;
+        expect(m).toParse();
+        const compileSql = m.translator.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.translator.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
+    test('reference to sql expression in extended source', () => {
+        const m = (0, test_translator_1.model) `
+      source: na is bigquery.sql("""SELECT 1 as one""") {
+        dimension: two is one + one
+      }
+    `;
+        const compileSql = m.translator.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.translator.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
+    test('reference to sql expression in named query', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: nq is bigquery.sql("""SELECT 1 as one""") -> { project: * }
+    `);
+        expect(m).toParse();
+        const compileSql = m.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
+    test('reference to sql expression in unnamed query', () => {
+        const m = new test_translator_1.TestTranslator(`
+      query: bigquery.sql("""SELECT 1 as one""") -> { project: * }
+    `);
+        expect(m).toParse();
+        const compileSql = m.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
+    test('reference to sql expression in join', () => {
+        const m = (0, test_translator_1.model) `
+      source: quux is a {
+        join_one: xyzzy is
+          duckdb.sql("""SELECT 1 as one""")
+          on ai = xyzzy.one
+      }
+    `;
+        const compileSql = m.translator.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.translator.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).toTranslate();
+        }
+    });
+    // TODO unskip when ENABLE_M4_WARNINGS is turned into an annotation
+    test.skip('sql statement deprecation warning', () => {
+        const m = new test_translator_1.TestTranslator('sql: bad_sql is {select: """SELECT 1 as one"""}');
+        const req = m.translate().compileSQL;
+        if (req) {
+            m.update({
+                compileSQL: { [req.name]: getSelectOneStruct(req) },
+            });
+        }
+        expect(m).toTranslateWithWarnings('`sql:` statement is deprecated, use `connection_name.sql(...)` instead');
+    });
+});
 //# sourceMappingURL=parse.spec.js.map

package/dist/lang/zone.d.ts

@@ -17,7 +17,7 @@ interface EntryErrored extends AllEntries {
     status: 'error';
     message: string;
 }
-declare type ZoneEntry<T> = EntryPresent<T> | ReferenceEntry | EntryErrored;
+export declare type ZoneEntry<T> = EntryPresent<T> | ReferenceEntry | EntryErrored;
 /**
  * A Zone is a symbol table which may contain references to symbols
  * which are not yet defined. This is used by the parser to track

package/dist/malloy.js

@@ -186,7 +186,7 @@ class Malloy {
                     }
                     queryModel = new model_1.QueryModel(partialModel);
                 }
-                return queryModel.compileQuery(segment).sql;
+                return queryModel.compileQuery(segment, false).sql;
             }
         });
         const { name, connection } = toCompile;

package/dist/tags.d.ts

@@ -1,5 +1,5 @@
 import { Annotation } from './model';
-declare type MalloyTagProperties = Record<string, string | boolean>;
+export declare type MalloyTagProperties = Record<string, string | boolean>;
 interface PropertyTag {
     properties: MalloyTagProperties;
 }

package/package.json

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