@malloydata/malloy 0.0.11-dev221202152346 → 0.0.11

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

@@ -89,9 +89,8 @@ function prettyNeeds(response) {
         needString += "Tables:\n";
         response.tables.forEach((table) => (needString += `  - ${table}`));
     }
-    if (response.sqlStructs) {
-        needString += "SQL Structs:\n";
-        response.sqlStructs.forEach((sql) => (needString += `  - ${sql.as || "(unnamed sql struct)"}`));
+    if (response.compileSQL) {
+        needString += `Compile SQL: ${response.compileSQL.name}`;
     }
     if (response.urls) {
         needString += "URLs:\n";
@@ -112,12 +111,56 @@ function checkForNeededs(trans) {
         pass: true,
     };
 }
+function highlightError(dl, txt) {
+    if (dl == undefined) {
+        return "~Location Undefined~";
+    }
+    const { start, end } = dl.range;
+    const output = [
+        `${start.line}:${start.character}-${end.line}:${end.character}`,
+    ];
+    let errStart = start.character;
+    const doc = txt.split("\n");
+    for (let line = start.line; line <= end.line; line += 1) {
+        const lineText = doc[line];
+        const lineStr = `     ${line}`.slice(-5);
+        output.push(`${lineStr}| ${lineText}`);
+        const upToError = `     | ` + " ".repeat(errStart);
+        let errLen = end.character - errStart;
+        if (line < end.line) {
+            errLen = lineText.length - errStart;
+            errStart = 0;
+        }
+        output.push(upToError + "-".repeat(errLen));
+    }
+    return output.join("\n");
+}
+function unlocatedStructDef(sd) {
+    const ret = { ...sd };
+    ret.fields = sd.fields.map((f) => {
+        const nf = { ...f };
+        delete nf.location;
+        return nf;
+    });
+    delete ret.location;
+    return ret;
+}
 expect.extend({
-    toCompile: function (x) {
+    toCompile: function (s) {
+        const x = new BetaModel(s);
+        x.compile();
+        const errorCheck = checkForErrors(x);
+        if (!errorCheck.pass) {
+            return errorCheck;
+        }
+        x.translate();
+        return checkForNeededs(x);
+    },
+    modelParsed: function (x) {
         x.compile();
         return checkForErrors(x);
     },
-    toTranslate: function (x) {
+    modelCompiled: function (x) {
         x.compile();
         const errorCheck = checkForErrors(x);
         if (!errorCheck.pass) {
@@ -131,7 +174,7 @@ expect.extend({
     },
     toReturnType: function (functionCall, returnType) {
         const exprModel = new BetaModel(`explore: x is a { dimension: d is ${functionCall} }`);
-        expect(exprModel).toTranslate();
+        expect(exprModel).modelCompiled();
         const x = exprModel.getSourceDef("x");
         expect(x).toBeDefined();
         if (x) {
@@ -223,6 +266,21 @@ expect.extend({
             };
         }
     },
+    isLocationIn: function (checkAt, at, text) {
+        if (this.equals(at, checkAt)) {
+            return {
+                pass: true,
+                message: () => `Locations match`,
+            };
+        }
+        const errMsg = `Locations do not match\n` +
+            `Expected: ${highlightError(at, text)}\n` +
+            `Received: ${highlightError(checkAt, text)}\n`;
+        return {
+            pass: false,
+            message: () => errMsg,
+        };
+    },
 });
 class BetaExpression extends Testable {
     constructor(src) {
@@ -254,14 +312,14 @@ class BetaExpression extends Testable {
 }
 function exprOK(s) {
     return () => {
-        expect(new BetaExpression(s)).toCompile();
+        expect(new BetaExpression(s)).modelParsed();
         return undefined;
     };
 }
 function modelOK(s) {
     return () => {
         const m = new BetaModel(s);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         return undefined;
     };
 }
@@ -293,9 +351,9 @@ function badModel(s, msg) {
 describe("model statements", () => {
     describe("explore:", () => {
         test("explore table", modelOK(`explore: testA is table('aTable')`));
-        test("explore shorcut fitlered table", modelOK(`
-        explore: testA is table('aTable') {? astr ~ 'a%' }
-      `));
+        test("explore shorcut fitlered table", () => {
+            expect(`explore: testA is table('aTable') {? astr ~ 'a%' } `).toCompile();
+        });
         test("explore fitlered table", modelOK(`
         explore: testA is table('aTable') { where: astr ~ 'a%' }
       `));
@@ -304,7 +362,7 @@ describe("model statements", () => {
         test("refine explore", modelOK(`explore: aa is a { dimension: a is astr }`));
         test("source refinement preserves original", () => {
             const x = new BetaModel("source: na is a + { dimension: one is 1 }");
-            expect(x).toTranslate();
+            expect(x).modelCompiled();
             const a = x.getSourceDef("a");
             if (a) {
                 const aFields = a.fields.map((f) => f.as || f.name);
@@ -352,7 +410,7 @@ describe("model statements", () => {
         query: q is a -> { aggregate: acount is count() }
         query: nq is -> q + { group_by: astr }
       `);
-            expect(x).toTranslate();
+            expect(x).modelCompiled();
             const q = x.getQuery("q");
             expect(q).toBeDefined();
             if (q) {
@@ -365,7 +423,7 @@ describe("model statements", () => {
         query: q is ab -> { aggregate: acount }
         query: nq is -> q -> { project: * }
       `);
-            expect(x).toTranslate();
+            expect(x).modelCompiled();
             const q = x.getQuery("q");
             expect(q).toBeDefined();
             if (q) {
@@ -473,7 +531,7 @@ describe("model statements", () => {
         });
         test("relative imports", () => {
             const docParse = new BetaModel(`import "../parent.malloy"`);
-            expect(docParse).toCompile();
+            expect(docParse).modelParsed();
             const xr = docParse.unresolved();
             expect(xr).toEqual({ urls: ["internal://test/parent.malloy"] });
             docParse.update({
@@ -481,11 +539,11 @@ describe("model statements", () => {
                     "internal://test/parent.malloy": `source: aa is table('aTable')`,
                 },
             });
-            expect(docParse).toTranslate();
+            expect(docParse).modelCompiled();
         });
         test("relative imports with errors", () => {
             const docParse = new BetaModel(`import "../parent.malloy"`);
-            expect(docParse).toCompile();
+            expect(docParse).modelParsed();
             const xr = docParse.unresolved();
             expect(xr).toEqual({ urls: ["internal://test/parent.malloy"] });
             docParse.update({
@@ -510,7 +568,7 @@ describe("model statements", () => {
         import "middle"
       `);
             fullModel.update({ urls: srcFiles });
-            expect(fullModel).toTranslate();
+            expect(fullModel).modelCompiled();
             const ms = fullModel.getSourceDef("midSrc");
             expect(ms).toBeDefined();
             if (ms) {
@@ -595,7 +653,7 @@ describe("explore properties", () => {
     test("rename", modelOK("explore: c is a { rename: nn is ai }"));
     test("accept single", () => {
         const onlyAstr = new BetaModel("explore: c is a { accept: astr }");
-        expect(onlyAstr).toTranslate();
+        expect(onlyAstr).modelCompiled();
         const c = onlyAstr.getSourceDef("c");
         if (c) {
             expect(c.fields.length).toBe(1);
@@ -604,7 +662,7 @@ describe("explore properties", () => {
     test("accept multi", modelOK("explore: c is a { accept: astr, af }"));
     test("except single", () => {
         const noAstr = new BetaModel("explore: c is a { except: astr }");
-        expect(noAstr).toTranslate();
+        expect(noAstr).modelCompiled();
         const c = noAstr.getSourceDef("c");
         if (c) {
             const foundAstr = c.fields.find((f) => f.name == "astr");
@@ -612,7 +670,7 @@ describe("explore properties", () => {
         }
     });
     test("except multi", modelOK("explore: c is a { except: astr, af }"));
-    test("explore-query", modelOK("explore: c is a {query: q is { group_by: astr }}"));
+    test("explore-query", modelOK("explore: c is a {query: q is { group_by: astr } }"));
     test("refined explore-query", modelOK(`
       explore: abNew is ab {
         query: for1 is aturtle {? ai = 1 }
@@ -660,7 +718,7 @@ describe("qops", () => {
     test("index join.*", modelOK("query:ab->{index: ab.*}"));
     test("index multiple", () => {
         const model = new BetaModel("query:a->{index: af, astr}");
-        expect(model).toTranslate();
+        expect(model).modelCompiled();
         const q = model.getQuery(0);
         expect(q).toBeDefined();
         if (q) {
@@ -671,7 +729,7 @@ describe("qops", () => {
     });
     test("index star", () => {
         const model = new BetaModel("query:a->{index: *, astr}");
-        expect(model).toTranslate();
+        expect(model).modelCompiled();
         const q = model.getQuery(0);
         expect(q).toBeDefined();
         if (q) {
@@ -685,7 +743,7 @@ describe("qops", () => {
     test("index unsampled", modelOK("query:a->{index: *; sample: false}"));
     test("index sample-percent", () => {
         const model = new BetaModel("query:a->{index: *; sample: 42%}");
-        expect(model).toTranslate();
+        expect(model).modelCompiled();
         const q = model.getQuery(0);
         expect(q).toBeDefined();
         if (q) {
@@ -716,7 +774,7 @@ describe("qops", () => {
     test("where multiple", modelOK("query:a->{ group_by: astr; where: af > 10,astr~'a%' }"));
     test(`filters preserve source formatting in code:`, () => {
         const model = new BetaModel(`source: notb is a + { where: astr  !=  'b' }`);
-        expect(model).toTranslate();
+        expect(model).modelCompiled();
         const notb = model.getSourceDef("notb");
         expect(notb).toBeDefined();
         if (notb) {
@@ -729,7 +787,7 @@ describe("qops", () => {
     });
     test(`field expressions preserve source formatting in code:`, () => {
         const model = new BetaModel(`source: notb is a + { dimension: d is 1 +   2 }`);
-        expect(model).toTranslate();
+        expect(model).modelCompiled();
         const notb = model.getSourceDef("notb");
         expect(notb).toBeDefined();
         if (notb) {
@@ -765,7 +823,7 @@ describe("qops", () => {
       }
       query: nab -> xturtle + { aggregate: aratio }
     `);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const t = m.translate();
         if (t.translated) {
             const q = t.translated.queryList[0].pipeline[0];
@@ -789,7 +847,7 @@ describe("qops", () => {
         aggregate: aratio
       }
     `);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const t = m.translate();
         if (t.translated) {
             const q = t.translated.queryList[0].pipeline[0];
@@ -813,7 +871,7 @@ describe("qops", () => {
         group_by: foo is bb.astr
       }
     `);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const t = m.translate();
         if (t.translated) {
             const q = t.translated.queryList[0].pipeline[0];
@@ -989,7 +1047,7 @@ describe("expressions", () => {
         var _a, _b;
         const modelSrc = `query: z is a -> { group_by: x is 1+(3/4) }`;
         const m = new BetaModel(modelSrc);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const queryDef = (_b = (_a = m.translate()) === null || _a === void 0 ? void 0 : _a.translated) === null || _b === void 0 ? void 0 : _b.modelDef.contents.z;
         expect(queryDef).toBeDefined();
         expect(queryDef === null || queryDef === void 0 ? void 0 : queryDef.type).toBe("query");
@@ -1014,8 +1072,9 @@ describe("expressions", () => {
         }
     });
 });
-describe("sql backdoor", () => {
+describe("sql:", () => {
     function makeSchemaResponse(sql) {
+        const cname = sql.connection || "bigquery";
         return {
             type: "struct",
             name: sql.name,
@@ -1023,85 +1082,95 @@ describe("sql backdoor", () => {
             structSource: {
                 type: "sql",
                 method: "subquery",
-                sqlBlock: { ...sql },
+                sqlBlock: {
+                    type: "sqlBlock",
+                    ...sql,
+                    selectStr: sql.select.filter((s) => typeof s == "string").join(""),
+                },
             },
-            structRelationship: { type: "basetable", connectionName: "bigquery" },
+            structRelationship: { type: "basetable", connectionName: cname },
             fields: test_translator_1.aTableDef.fields,
         };
     }
-    test("single sql statement", modelOK("sql: users is || SELECT * FROM USERS;;"));
-    test("connection shows up in model", () => {
+    test("definition", () => {
+        const selStmt = "SELECT * FROM aTable";
         const model = new BetaModel(`
-      sql: users IS || SELECT * FROM aTable ;; on "someConnection";
-      source: malloyUsers is from_sql(users) { primary_key: ai }
+      sql: users IS {
+        select: """${selStmt}"""
+        connection: "aConnection"
+      }
     `);
         const needReq = model.translate();
-        expect(model).toBeErrorless();
-        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.sqlStructs;
+        expect(model).modelParsed();
+        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
         expect(needs).toBeDefined();
         if (needs) {
-            expect(needs.length).toBe(1);
-            const sql = (0, sql_block_1.makeSQLBlock)({
-                select: " SELECT * FROM aTable ",
-                connection: "someConnection",
-            });
-            expect(needs[0]).toMatchObject(sql);
-            const refKey = needs[0].name;
+            const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }], "aConnection");
+            expect(needs).toMatchObject(sql);
+            const refKey = needs.name;
             expect(refKey).toBeDefined();
             if (refKey) {
-                model.update({ sqlStructs: { [refKey]: makeSchemaResponse(sql) } });
-                expect(model).toTranslate();
+                const sr = makeSchemaResponse(sql);
+                model.update({ compileSQL: { [refKey]: sr } });
+                expect(model).modelCompiled();
+                expect(unlocatedStructDef(model.sqlBlocks[0])).toEqual(unlocatedStructDef({ ...sr, as: "users" }));
             }
-            const users = model.getSourceDef("malloyUsers");
-            expect(users).toBeDefined();
-            expect(users).toHaveProperty("structSource.sqlBlock.connection", "someConnection");
         }
     });
-    test("explore from sql", () => {
+    test("source from sql", () => {
+        const selStmt = "SELECT * FROM aTable";
         const model = new BetaModel(`
-      sql: users IS || SELECT * FROM aTable ;;
+      sql: users IS { select: """${selStmt}""" }
       source: malloyUsers is from_sql(users) { primary_key: ai }
     `);
+        expect(model).modelParsed();
         const needReq = model.translate();
-        expect(model).toBeErrorless();
-        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.sqlStructs;
+        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
         expect(needs).toBeDefined();
         if (needs) {
-            expect(needs.length).toBe(1);
-            const sql = (0, sql_block_1.makeSQLBlock)({ select: " SELECT * FROM aTable " });
-            expect(needs[0]).toMatchObject(sql);
-            const refKey = needs[0].name;
-            expect(refKey).toBeDefined();
-            if (refKey) {
-                model.update({ sqlStructs: { [refKey]: makeSchemaResponse(sql) } });
-                expect(model).toTranslate();
-            }
+            const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }], "aConnection");
+            const refKey = needs.name;
+            model.update({ compileSQL: { [refKey]: makeSchemaResponse(sql) } });
+            expect(model).modelCompiled();
+            const users = model.getSourceDef("malloyUsers");
+            expect(users).toBeDefined();
         }
     });
     test("explore from imported sql-based-source", () => {
+        const selStmt = "SELECT * FROM aTable";
         const createModel = `
-      sql: users IS || SELECT * FROM aTable ;;
+      sql: users IS { select: """${selStmt}""" }
       source: malloyUsers is from_sql(users) { primary_key: ai }
     `;
         const model = new BetaModel(`
       import "createModel.malloy"
-      source: foo is malloyUsers
+      source: importUsers is malloyUsers
     `);
         model.importZone.define("internal://test/langtests/createModel.malloy", createModel);
+        expect(model).modelParsed();
         const needReq = model.translate();
-        expect(model).toBeErrorless();
-        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.sqlStructs;
+        const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
         expect(needs).toBeDefined();
-        if (needs) {
-            expect(needs.length).toBe(1);
-            const sql = (0, sql_block_1.makeSQLBlock)({ select: " SELECT * FROM aTable " });
-            expect(needs[0]).toMatchObject(sql);
-            const refKey = needs[0].name;
-            expect(refKey).toBeDefined();
-            if (refKey) {
-                model.update({ sqlStructs: { [refKey]: makeSchemaResponse(sql) } });
-                expect(model).toTranslate();
-            }
+        const sql = (0, sql_block_1.makeSQLBlock)([{ sql: selStmt }]);
+        model.update({ compileSQL: { [sql.name]: makeSchemaResponse(sql) } });
+        expect(model).modelCompiled();
+    });
+    it("turducken", () => {
+        const m = new BetaModel(`
+      sql: someSql is {
+        select: """SELECT * FROM %{ a -> { group_by: astr } }% WHERE 1=1"""
+      }
+    `);
+        expect(m).modelParsed();
+        const compileSql = m.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            const select = compileSql.select[0];
+            const star = compileSql.select[1];
+            const where = compileSql.select[2];
+            expect(select).toEqual({ sql: "SELECT * FROM " });
+            expect((0, model_1.isSQLFragment)(star)).toBeFalsy();
+            expect(where).toEqual({ sql: " WHERE 1=1" });
         }
     });
 });
@@ -1146,7 +1215,7 @@ describe("error handling", () => {
     test("undefined field ref in query", badModel(`query: ab -> { aggregate: xyzzy }`, "'xyzzy' is not defined"));
     // test("queries with anonymous expressions", () => {
     //   const m = new BetaModel("query: a->{\n group_by: a+1\n}");
-    //   expect(m).not.toCompile();
+    //   expect(m).not.modelParsed();
     //   const errList = m.errors().errors;
     //   const firstError = errList[0];
     //   expect(firstError.message).toBe("Expressions in queries must have names");
@@ -1193,6 +1262,10 @@ describe("error handling", () => {
     `));
 });
 function getSelectOneStruct(sqlBlock) {
+    const selectThis = sqlBlock.select[0];
+    if (!(0, model_1.isSQLFragment)(selectThis)) {
+        throw new Error("weird test support error sorry");
+    }
     return {
         type: "struct",
         name: sqlBlock.name,
@@ -1200,7 +1273,11 @@ function getSelectOneStruct(sqlBlock) {
         structSource: {
             type: "sql",
             method: "subquery",
-            sqlBlock,
+            sqlBlock: {
+                type: "sqlBlock",
+                name: sqlBlock.name,
+                selectStr: selectThis.sql,
+            },
         },
         structRelationship: { type: "basetable", connectionName: "bigquery" },
         fields: [{ type: "number", name: "one" }],
@@ -1210,19 +1287,19 @@ describe("source locations", () => {
     test("renamed explore location", () => {
         const source = (0, test_translator_1.markSource) `explore: ${"na is a"}`;
         const m = new BetaModel(source.code);
-        expect(m).toCompile();
+        expect(m).modelParsed();
         expect((0, test_translator_1.getExplore)(m.modelDef, "na").location).toMatchObject(source.locations[0]);
     });
     test("refined explore location", () => {
         const source = (0, test_translator_1.markSource) `explore: ${"na is a {}"}`;
         const m = new BetaModel(source.code);
-        expect(m).toCompile();
+        expect(m).modelParsed();
         expect((0, test_translator_1.getExplore)(m.modelDef, "na").location).toMatchObject(source.locations[0]);
     });
     test("location of defined dimension", () => {
         const source = (0, test_translator_1.markSource) `explore: na is a { dimension: ${"x is 1"} }`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const x = (0, test_translator_1.getField)(na, "x");
         expect(x.location).toMatchObject(source.locations[0]);
@@ -1230,7 +1307,7 @@ describe("source locations", () => {
     test("location of defined measure", () => {
         const source = (0, test_translator_1.markSource) `explore: na is a { measure: ${"x is count()"} }`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const x = (0, test_translator_1.getField)(na, "x");
         expect(x.location).toMatchObject(source.locations[0]);
@@ -1238,7 +1315,7 @@ describe("source locations", () => {
     test("location of defined query", () => {
         const source = (0, test_translator_1.markSource) `explore: na is a { query: ${"x is { group_by: y is 1 }"} }`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const x = (0, test_translator_1.getField)(na, "x");
         expect(x.location).toMatchObject(source.locations[0]);
@@ -1251,7 +1328,7 @@ describe("source locations", () => {
         }
       }`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const x = (0, test_translator_1.getQueryField)(na, "x");
         const y = (0, test_translator_1.getField)(x.pipeline[0], "y");
@@ -1266,7 +1343,7 @@ describe("source locations", () => {
         }
       }`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const x = (0, test_translator_1.getQueryField)(na, "x");
         const z = (0, test_translator_1.getField)(x.pipeline[0], "z");
@@ -1275,29 +1352,29 @@ describe("source locations", () => {
     test("location of field inherited from table", () => {
         const source = (0, test_translator_1.markSource) `explore: na is ${"table('aTable')"}`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const abool = (0, test_translator_1.getField)(na, "abool");
         expect(abool.location).toMatchObject(source.locations[0]);
     });
     test("location of field inherited from sql block", () => {
-        const source = (0, test_translator_1.markSource) `
-      sql: ${"s is || SELECT 1 as one ;;"}
-
+        const source = (0, test_translator_1.markSource) `--- comment
+      sql: s is { select: ${'"""SELECT 1 as one """'} }
       explore: na is from_sql(s)
     `;
         const m = new BetaModel(source.code);
-        const result = m.translate();
-        const sqlBlock = (result.sqlStructs || [])[0];
-        m.update({
-            sqlStructs: {
-                [sqlBlock.name]: getSelectOneStruct(sqlBlock),
-            },
-        });
-        expect(m).toTranslate();
-        const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
-        const one = (0, test_translator_1.getField)(na, "one");
-        expect(one.location).toMatchObject(source.locations[0]);
+        expect(m).modelParsed();
+        const compileSql = m.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).modelCompiled();
+            const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
+            const one = (0, test_translator_1.getField)(na, "one");
+            expect(one.location).isLocationIn(source.locations[0], source.code);
+        }
     });
     test("location of fields inherited from a query", () => {
         const source = (0, test_translator_1.markSource) `
@@ -1310,7 +1387,7 @@ describe("source locations", () => {
       )
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const abool = (0, test_translator_1.getField)(na, "abool");
         expect(abool.location).toMatchObject(source.locations[0]);
@@ -1320,24 +1397,32 @@ describe("source locations", () => {
     test("location of named query", () => {
         const source = (0, test_translator_1.markSource) `query: ${"q is a -> { project: * }"}`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const q = (0, test_translator_1.getExplore)(m.modelDef, "q");
         expect(q.location).toMatchObject(source.locations[0]);
     });
     test("location of field in named query", () => {
         const source = (0, test_translator_1.markSource) `query: q is a -> { group_by: ${"b is 1"} }`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const q = (0, test_translator_1.getModelQuery)(m.modelDef, "q");
         const a = (0, test_translator_1.getField)(q.pipeline[0], "b");
         expect(a.location).toMatchObject(source.locations[0]);
     });
     test("location of named SQL block", () => {
-        const source = (0, test_translator_1.markSource) `sql: ${"s is || SELECT 1 as one ;;"}`;
+        const source = (0, test_translator_1.markSource) `${`sql: s is { select: """SELECT 1 as one""" }`}`;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
-        const s = m.sqlBlocks[0];
-        expect(s.location).toMatchObject(source.locations[0]);
+        expect(m).modelParsed();
+        const compileSql = m.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).modelCompiled();
+            const s = m.sqlBlocks[0];
+            expect(s.location).isLocationIn(source.locations[0], source.code);
+        }
     });
     test("location of renamed field", () => {
         const source = (0, test_translator_1.markSource) `
@@ -1346,7 +1431,7 @@ describe("source locations", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const bbool = (0, test_translator_1.getField)(na, "bbool");
         expect(bbool.location).toMatchObject(source.locations[0]);
@@ -1358,7 +1443,7 @@ describe("source locations", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const x = (0, test_translator_1.getField)(na, "x");
         expect(x.location).toMatchObject(source.locations[0]);
@@ -1370,7 +1455,7 @@ describe("source locations", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const x = (0, test_translator_1.getField)(na, "x");
         expect(x.location).toMatchObject(source.locations[0]);
@@ -1385,21 +1470,20 @@ describe("source locations", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, "na");
         const x = (0, test_translator_1.getJoinField)(na, "x");
         const y = (0, test_translator_1.getField)(x, "y");
         expect(y.location).toMatchObject(source.locations[0]);
     });
-    test("multi line sql block token span is correct", () => {
-        var _a;
-        // There is exactly one token in this file ..
-        const sqlSource = "|| // line 0\n//line 1\n// line 2;;";
-        const m = new BetaModel(sqlSource);
-        expect(m).not.toCompile();
-        const errList = m.errors().errors;
-        expect((_a = errList[0].at) === null || _a === void 0 ? void 0 : _a.range.end).toEqual({ line: 2, character: 11 });
-    });
+    // Since """ strings are not single tokens, I don't know how to do this.
+    // test("multi line sql block token span is correct", () => {
+    //   const sqlSource = `sql: { select: """// line 0\n//line 1\n// line 2""" }`;
+    //   const m = new BetaModel(sqlSource);
+    //   expect(m).not.modelParsed();
+    //   const errList = m.errors().errors;
+    //   expect(errList[0].at?.range.end).toEqual({ line: 2, character: 11 });
+    // });
     test("undefined query location", badModel((0, test_translator_1.markSource) `query: ${"-> xyz"}`, "Reference to undefined query 'xyz'"));
     test("undefined field reference", badModel((0, test_translator_1.markSource) `query: a -> { group_by: ${"xyz"} }`, "'xyz' is not defined"));
     test("bad query", badModel((0, test_translator_1.markSource) `query: a -> { group_by: astr; ${"project: *"} }`, "project: not legal in grouping query"));
@@ -1413,7 +1497,7 @@ describe("source references", () => {
       query: ${"na"} -> { project: * }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "exploreReference",
@@ -1431,7 +1515,7 @@ describe("source references", () => {
       query: t -> ${"q"}
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1447,7 +1531,7 @@ describe("source references", () => {
       query: na -> ${"x"}
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1459,26 +1543,29 @@ describe("source references", () => {
     });
     test("reference to sql block", () => {
         const source = (0, test_translator_1.markSource) `
-      sql: ${"s is || SELECT 1 as one ;;"}
+      ${`sql: s is {select:"""SELECT 1 as one"""}`}
       explore: na is from_sql(${"s"})
     `;
         const m = new BetaModel(source.code);
-        const result = m.translate();
-        const sqlBlock = (result.sqlStructs || [])[0];
-        m.update({
-            sqlStructs: {
-                [sqlBlock.name]: getSelectOneStruct(sqlBlock),
-            },
-        });
-        expect(m).toTranslate();
-        expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
-            location: source.locations[1],
-            type: "sqlBlockReference",
-            text: "s",
-            definition: {
-                location: source.locations[0],
-            },
-        });
+        expect(m).modelParsed();
+        const compileSql = m.translate().compileSQL;
+        expect(compileSql).toBeDefined();
+        if (compileSql) {
+            m.update({
+                compileSQL: { [compileSql.name]: getSelectOneStruct(compileSql) },
+            });
+            expect(m).modelCompiled();
+            const ref = m.referenceAt(pos(source.locations[1]));
+            expect(ref).toMatchObject({
+                location: source.locations[1],
+                type: "sqlBlockReference",
+                text: "s",
+                definition: {
+                    ...getSelectOneStruct(compileSql),
+                    location: source.locations[0],
+                },
+            });
+        }
     });
     test("reference to query in from", () => {
         const source = (0, test_translator_1.markSource) `
@@ -1486,7 +1573,7 @@ describe("source references", () => {
       explore: na is from(-> ${"q"})
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "queryReference",
@@ -1502,7 +1589,7 @@ describe("source references", () => {
       query: q2 is -> ${"q"} -> { project: * }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "queryReference",
@@ -1518,7 +1605,7 @@ describe("source references", () => {
       query: q2 is -> ${"q"} { limit: 10 }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "queryReference",
@@ -1534,7 +1621,7 @@ describe("source references", () => {
       query: na -> { project: bbool is not ${"abool"} }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1552,7 +1639,7 @@ describe("source references", () => {
       query: na -> { project: ${"`name`"} }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1571,7 +1658,7 @@ describe("source references", () => {
       query: na -> { project: bstr is self.${"astr"} }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1589,7 +1676,7 @@ describe("source references", () => {
       query: na -> { project: bstr is ${"self"}.astr }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "joinReference",
@@ -1604,7 +1691,7 @@ describe("source references", () => {
       query: ${"table('aTable')"} -> { group_by: ${"abool"} }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1620,7 +1707,7 @@ describe("source references", () => {
       query: na -> { project: ${"abool"} }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1638,7 +1725,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1656,7 +1743,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1674,7 +1761,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1692,7 +1779,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1710,7 +1797,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1728,7 +1815,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1746,7 +1833,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1762,7 +1849,7 @@ describe("source references", () => {
       query: na -> { aggregate: ai_sum is ${"ai"}.sum() }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1783,7 +1870,7 @@ describe("source references", () => {
       query: na -> { aggregate: ai_sum is ${"self"}.sum(self.ai) }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "joinReference",
@@ -1801,7 +1888,7 @@ describe("source references", () => {
       query: na -> { aggregate: ai_sum is self.sum(${"self"}.ai) }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "joinReference",
@@ -1819,7 +1906,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "exploreReference",
@@ -1835,7 +1922,7 @@ describe("source references", () => {
       query: na -> { aggregate: ai_sum is sum(${"ai"}) }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1852,7 +1939,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1870,7 +1957,7 @@ describe("source references", () => {
       }
     `;
         const m = new BetaModel(source.code);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: "fieldReference",
@@ -1889,27 +1976,26 @@ describe("translation need error locations", () => {
         m.update({
             errors: { urls: { [(result.urls || [])[0]]: "Bad file!" } },
         });
-        expect(m).not.toCompile();
+        expect(m).not.modelParsed();
         const errList = m.errors().errors;
-        expect(errList[0].at).toEqual(source.locations[0]);
+        expect(errList[0].at).isLocationIn(source.locations[0], source.code);
         return undefined;
     });
     test("sql struct error location", () => {
         const source = (0, test_translator_1.markSource) `
-      sql: bad_sql is || BAD SQL ;;
-      query: ${"from_sql(bad_sql)"} -> { project: * }
+      sql: bad_sql is {select: ${'"""BAD_SQL"""'}}
+      query: from_sql(bad_sql) -> { project: * }
     `;
         const m = new BetaModel(source.code);
-        const result = m.translate();
-        m.update({
-            errors: {
-                sqlStructs: { [(result.sqlStructs || [])[0].name]: "Bad SQL!" },
-            },
-        });
-        expect(m).not.toCompile();
+        expect(m).modelParsed();
+        const req = m.translate().compileSQL;
+        expect(req).toBeDefined();
+        if (req) {
+            m.update({ errors: { compileSQL: { [req.name]: "Bad SQL!" } } });
+        }
+        expect(m).not.modelCompiled();
         const errList = m.errors().errors;
-        expect(errList[0].at).toEqual(source.locations[0]);
-        return undefined;
+        expect(errList[0].at).isLocationIn(source.locations[0], source.code);
     });
     test("table struct error location", () => {
         const source = (0, test_translator_1.markSource) `
@@ -1922,9 +2008,9 @@ describe("translation need error locations", () => {
                 tables: { [(result.tables || [])[0]]: "Bad table!" },
             },
         });
-        expect(m).not.toCompile();
+        expect(m).not.modelParsed();
         const errList = m.errors().errors;
-        expect(errList[0].at).toEqual(source.locations[0]);
+        expect(errList[0].at).isLocationIn(source.locations[0], source.code);
         return undefined;
     });
 });
@@ -1990,7 +2076,7 @@ describe("pipeline comprehension", () => {
       }
     `;
         const m = new BetaModel(src);
-        expect(m).toTranslate();
+        expect(m).modelCompiled();
         const s2 = m.getQuery("s2");
         expect(s2 === null || s2 === void 0 ? void 0 : s2.pipeline.length).toBe(2);
     });