@malloydata/malloy 0.0.28-dev230314211807 → 0.0.28-dev230320190215

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

@@ -28,127 +28,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const model_1 = require("../../model");
 const sql_block_1 = require("../../model/sql_block");
-const static_space_1 = require("../ast/field-space/static-space");
-const expression_def_1 = require("../ast/types/expression-def");
 const test_translator_1 = require("./test-translator");
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
-const util_1 = require("util");
 const granular_result_1 = require("../ast/types/granular-result");
-const inspectCompile = false;
-/*
- * Thinking of these tests as just "do things parse", there should maybe
- * be additional tests for, "does the correct code get generated", but
- * the first step should be to write all the phrases in the grammar
- * and make sure they parse to ast and the ast generates something
- */
-class Testable extends test_translator_1.TestTranslator {
-}
-class BetaModel extends Testable {
-    constructor(testSrc) {
-        super(testSrc);
-        this.testSrc = testSrc;
-    }
-    compile() {
-        const compileTo = this.translate();
-        if (compileTo.translated && inspectCompile) {
-            console.log('MODEL: ', (0, test_translator_1.pretty)(compileTo.translated.modelDef));
-            console.log('QUERIES: ', (0, test_translator_1.pretty)(compileTo.translated.queryList));
-        }
-        // All the stuff to ask the ast for a translation is already in TestTranslator
-    }
-    unresolved() {
-        return this.importsAndTablesStep.step(this);
-    }
-    getSourceDef(srcName) {
-        const t = this.translate().translated;
-        if (t) {
-            const s = t.modelDef.contents[srcName];
-            if (s.type === 'struct') {
-                return s;
-            }
-        }
-        return undefined;
-    }
-    getQuery(queryName) {
-        const t = this.translate().translated;
-        if (t) {
-            const s = typeof queryName === 'string'
-                ? t.modelDef.contents[queryName]
-                : t.queryList[queryName];
-            if ((s === null || s === void 0 ? void 0 : s.type) === 'query') {
-                return s;
-            }
-        }
-        return undefined;
-    }
-}
-function checkForErrors(trans) {
-    if (trans.logger === undefined) {
-        throw new Error('JESTERY BROKEN, CANT FIND ERORR LOG');
-    }
-    if (trans.logger.hasErrors()) {
-        return {
-            message: () => `Translation Errors:\n${trans.prettyErrors()}`,
-            pass: false,
-        };
-    }
-    return {
-        message: () => 'Unexpected error free translation',
-        pass: true,
-    };
-}
-function prettyNeeds(response) {
-    let needString = '';
-    if (response.tables) {
-        needString += 'Tables:\n';
-        response.tables.forEach(table => (needString += `  - ${table}`));
-    }
-    if (response.compileSQL) {
-        needString += `Compile SQL: ${response.compileSQL.name}`;
-    }
-    if (response.urls) {
-        needString += 'URLs:\n';
-        response.urls.forEach(url => (needString += `  - ${url}`));
-    }
-    return needString;
-}
-function checkForNeededs(trans) {
-    const response = trans.translateStep.step(trans);
-    if (!response.final) {
-        return {
-            message: () => `Translation is not complete, needs:\n${prettyNeeds(response)}`,
-            pass: false,
-        };
-    }
-    return {
-        message: () => 'Unexpected complete translation',
-        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');
-}
+require("./parse-expects");
 function unlocatedStructDef(sd) {
     const ret = { ...sd };
     ret.fields = sd.fields.map(f => {
@@ -159,187 +42,15 @@ function unlocatedStructDef(sd) {
     delete ret.location;
     return ret;
 }
-expect.extend({
-    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);
-    },
-    modelCompiled: function (x) {
-        x.compile();
-        const errorCheck = checkForErrors(x);
-        if (!errorCheck.pass) {
-            return errorCheck;
-        }
-        x.translate();
-        return checkForNeededs(x);
-    },
-    toBeErrorless: function (trans) {
-        return checkForErrors(trans);
-    },
-    toReturnType: function (functionCall, returnType) {
-        const exprModel = new BetaModel(`explore: x is a { dimension: d is ${functionCall} }`);
-        expect(exprModel).modelCompiled();
-        const x = exprModel.getSourceDef('x');
-        expect(x).toBeDefined();
-        if (x) {
-            const d = x.fields.find(f => f.name === 'd');
-            expect(d === null || d === void 0 ? void 0 : d.type).toBe(returnType);
-        }
-        return {
-            pass: true,
-            message: () => '',
-        };
-    },
-    compileToFailWith: function (s, ...msgs) {
-        var _a;
-        let emsg = 'Compile Error expectation not met\nExpected error';
-        let mSrc;
-        const qmsgs = msgs.map(s => `error '${s}'`);
-        if (msgs.length === 1) {
-            emsg += ` ${qmsgs[0]}`;
-        }
-        else {
-            emsg += `s [\n${qmsgs.join('\n')}\n]`;
-        }
-        let m;
-        let src;
-        if (s instanceof BetaModel) {
-            m = s;
-            src = m.testSrc;
-        }
-        else {
-            if (typeof s === 'string') {
-                src = s;
-            }
-            else {
-                src = s.code;
-                mSrc = s;
-            }
-            m = new BetaModel(src);
-        }
-        emsg += `\nSource:\n${src}`;
-        const t = m.translate();
-        if (t.translated) {
-            return { pass: false, message: () => emsg };
-        }
-        else if (t.errors === undefined) {
-            return {
-                pass: false,
-                message: () => 'TEST ERROR, not all objects resolved in source\n' +
-                    (0, test_translator_1.pretty)(t) +
-                    '\n' +
-                    emsg,
-            };
-        }
-        else {
-            const explain = [];
-            const errList = m.errors().errors;
-            let i;
-            for (i = 0; i < msgs.length && errList[i]; i += 1) {
-                const msg = msgs[i];
-                const err = errList[i];
-                if (msg !== err.message) {
-                    explain.push(`Expected: ${msg}\nGot: ${err.message}`);
-                }
-                else {
-                    if (mSrc === null || mSrc === void 0 ? void 0 : mSrc.locations[i]) {
-                        const have = (_a = err.at) === null || _a === void 0 ? void 0 : _a.range;
-                        const want = mSrc.locations[i].range;
-                        if (!this.equals(have, want)) {
-                            explain.push(`Expected '${msg}' at location: ${(0, util_1.inspect)(want)}\n` +
-                                `Actual location: ${(0, util_1.inspect)(have)}`);
-                        }
-                    }
-                }
-            }
-            if (i !== msgs.length) {
-                explain.push(...msgs.slice(i).map(m => `Missing: ${m}`));
-            }
-            if (i !== errList.length) {
-                explain.push(...errList.slice(i).map(m => `Unexpected Error: ${m.message}`));
-            }
-            if (explain.length === 0) {
-                return {
-                    pass: true,
-                    message: () => `All expected errors found: ${(0, test_translator_1.pretty)(msgs)}`,
-                };
-            }
-            return {
-                pass: false,
-                message: () => `Compiler did not generated expected errors\n${explain.join('\n')}`,
-            };
-        }
-    },
-    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) {
-        super(src, 'justExpr');
-    }
-    compile() {
-        const exprAst = this.ast();
-        if (exprAst instanceof expression_def_1.ExpressionDef) {
-            const aStruct = this.internalModel.contents['ab'];
-            if (aStruct.type === 'struct') {
-                const tstFS = new static_space_1.StaticSpace(aStruct);
-                const exprDef = exprAst.getExpression(tstFS);
-                this.compiled = exprDef;
-                if (inspectCompile) {
-                    console.log('EXPRESSION: ', (0, test_translator_1.pretty)(exprDef));
-                }
-            }
-            else {
-                throw new Error("Can't get simple namespace for expression tests");
-            }
-        }
-        else if (this.logger.hasErrors()) {
-            return;
-        }
-        else {
-            const whatIsIt = (exprAst === null || exprAst === void 0 ? void 0 : exprAst.toString()) || 'NO AST GENERATED';
-            throw new Error(`Not an expression: ${whatIsIt}`);
-        }
-    }
-    generated() {
-        if (!this.compiled) {
-            throw new Error('Must compile expression before fetching generated code');
-        }
-        return this.compiled;
-    }
-}
 function exprOK(s) {
     return () => {
-        expect(new BetaExpression(s)).modelParsed();
+        expect(new test_translator_1.BetaExpression(s)).modelParsed();
         return undefined;
     };
 }
 function modelOK(s) {
     return () => {
-        const m = new BetaModel(s);
+        const m = new test_translator_1.TestTranslator(s);
         expect(m).modelCompiled();
         return undefined;
     };
@@ -348,7 +59,7 @@ function badModel(s, msg) {
     return () => {
         const src = typeof s === 'string' ? s : s.code;
         const emsg = `Error expectation not met\nExpected error: '${msg}'\nSource:\n${src}`;
-        const m = new BetaModel(src);
+        const m = new test_translator_1.TestTranslator(src);
         const t = m.translate();
         if (t.translated) {
             fail(emsg);
@@ -382,7 +93,7 @@ describe('model statements', () => {
         test('explore query', modelOK('explore: testA is from(a->{group_by: astr})'));
         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 }');
+            const x = new test_translator_1.TestTranslator('source: na is a + { dimension: one is 1 }');
             expect(x).modelCompiled();
             const a = x.getSourceDef('a');
             if (a) {
@@ -427,7 +138,7 @@ describe('model statements', () => {
         query: -> a_by_str { aggregate: str_count is count() }
       `));
         test('query refinement preserves original', () => {
-            const x = new BetaModel(`
+            const x = new test_translator_1.TestTranslator(`
         query: q is a -> { aggregate: acount is count() }
         query: nq is -> q + { group_by: astr }
       `);
@@ -440,7 +151,7 @@ describe('model statements', () => {
             }
         });
         test('query composition preserves original', () => {
-            const x = new BetaModel(`
+            const x = new test_translator_1.TestTranslator(`
         query: q is ab -> { aggregate: acount }
         query: nq is -> q -> { project: * }
       `);
@@ -516,93 +227,6 @@ describe('model statements', () => {
         }
       `));
     });
-    describe('import:', () => {
-        test('simple import', () => {
-            const docParse = new BetaModel('import "child"');
-            const xr = docParse.unresolved();
-            expect(docParse).toBeErrorless();
-            expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
-            docParse.update({
-                urls: { 'internal://test/langtests/child': 'explore: aa is a' },
-            });
-            const yr = docParse.unresolved();
-            expect(yr).toBeNull();
-        });
-        test('missing import', () => {
-            const docParse = new BetaModel('import "child"');
-            const xr = docParse.unresolved();
-            expect(docParse).toBeErrorless();
-            expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
-            const reportedError = 'ENOWAY: No way to find your child';
-            docParse.update({
-                errors: {
-                    urls: { 'internal://test/langtests/child': reportedError },
-                },
-            });
-            docParse.translate();
-            expect(docParse).not.toBeErrorless();
-            expect(docParse.prettyErrors()).toContain(reportedError);
-        });
-        test('chained imports', () => {
-            const docParse = new BetaModel('import "child"');
-            docParse.update({
-                urls: { 'internal://test/langtests/child': 'import "grandChild"' },
-            });
-            const xr = docParse.unresolved();
-            expect(docParse).toBeErrorless();
-            expect(xr).toEqual({ urls: ['internal://test/langtests/grandChild'] });
-        });
-        test('relative imports', () => {
-            const docParse = new BetaModel('import "../parent.malloy"');
-            expect(docParse).modelParsed();
-            const xr = docParse.unresolved();
-            expect(xr).toEqual({ urls: ['internal://test/parent.malloy'] });
-            docParse.update({
-                urls: {
-                    'internal://test/parent.malloy': "source: aa is table('aTable')",
-                },
-            });
-            expect(docParse).modelCompiled();
-        });
-        test('relative imports with errors', () => {
-            const docParse = new BetaModel('import "../parent.malloy"');
-            expect(docParse).modelParsed();
-            const xr = docParse.unresolved();
-            expect(xr).toEqual({ urls: ['internal://test/parent.malloy'] });
-            docParse.update({
-                urls: {
-                    'internal://test/parent.malloy': `
-            source: aa is table('aTable') {
-              dimension: astr is 'not legal beause astr exists'
-            }`,
-                },
-            });
-            expect(docParse).compileToFailWith("Cannot redefine 'astr'");
-        });
-        test('source references expanded when not exported', () => {
-            const srcFiles = {
-                'internal://test/langtests/middle': `
-          import "bottom"
-          source: midSrc is from(bottomSrc -> { group_by: astr })
-        `,
-                'internal://test/langtests/bottom': "source: bottomSrc is table('aTable')",
-            };
-            const fullModel = new BetaModel(`
-        import "middle"
-      `);
-            fullModel.update({ urls: srcFiles });
-            expect(fullModel).modelCompiled();
-            const ms = fullModel.getSourceDef('midSrc');
-            expect(ms).toBeDefined();
-            if (ms) {
-                expect(ms.structSource.type).toBe('query');
-                if (ms.structSource.type === 'query') {
-                    const qs = ms.structSource.query.structRef;
-                    expect(typeof qs).not.toBe('string');
-                }
-            }
-        });
-    });
 });
 describe('explore properties', () => {
     test('single dimension', modelOK('explore: aa is a { dimension: x is 1 }'));
@@ -675,7 +299,7 @@ describe('explore properties', () => {
     test('primary_key', modelOK('explore: c is a { primary_key: ai }'));
     test('rename', modelOK('explore: c is a { rename: nn is ai }'));
     test('accept single', () => {
-        const onlyAstr = new BetaModel('explore: c is a { accept: astr }');
+        const onlyAstr = new test_translator_1.TestTranslator('explore: c is a { accept: astr }');
         expect(onlyAstr).modelCompiled();
         const c = onlyAstr.getSourceDef('c');
         if (c) {
@@ -684,7 +308,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 }');
+        const noAstr = new test_translator_1.TestTranslator('explore: c is a { except: astr }');
         expect(noAstr).modelCompiled();
         const c = noAstr.getSourceDef('c');
         if (c) {
@@ -740,7 +364,7 @@ describe('qops', () => {
     test('index unique on path', modelOK('query:ab->{index: b.astr, ab.astr}'));
     test('index join.*', modelOK('query:ab->{index: ab.*}'));
     test('index multiple', () => {
-        const model = new BetaModel('query:a->{index: af, astr}');
+        const model = new test_translator_1.TestTranslator('query:a->{index: af, astr}');
         expect(model).modelCompiled();
         const q = model.getQuery(0);
         expect(q).toBeDefined();
@@ -751,7 +375,7 @@ describe('qops', () => {
         }
     });
     test('index star', () => {
-        const model = new BetaModel('query:a->{index: *, astr}');
+        const model = new test_translator_1.TestTranslator('query:a->{index: *, astr}');
         expect(model).modelCompiled();
         const q = model.getQuery(0);
         expect(q).toBeDefined();
@@ -765,7 +389,7 @@ describe('qops', () => {
     test('index sampled', modelOK('query:a->{index: *; sample: true}'));
     test('index unsampled', modelOK('query:a->{index: *; sample: false}'));
     test('index sample-percent', () => {
-        const model = new BetaModel('query:a->{index: *; sample: 42%}');
+        const model = new test_translator_1.TestTranslator('query:a->{index: *; sample: 42%}');
         expect(model).modelCompiled();
         const q = model.getQuery(0);
         expect(q).toBeDefined();
@@ -798,7 +422,7 @@ describe('qops', () => {
     test('compound aggregate still works', modelOK('query:ab->{ aggregate: thing is acount > 10 and acount < 100 }'));
     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' }");
+        const model = new test_translator_1.TestTranslator("source: notb is a + { where: astr  !=  'b' }");
         expect(model).modelCompiled();
         const notb = model.getSourceDef('notb');
         expect(notb).toBeDefined();
@@ -811,7 +435,7 @@ describe('qops', () => {
         }
     });
     test('field expressions preserve source formatting in code:', () => {
-        const model = new BetaModel('source: notb is a + { dimension: d is 1 +   2 }');
+        const model = new test_translator_1.TestTranslator('source: notb is a + { dimension: d is 1 +   2 }');
         expect(model).modelCompiled();
         const notb = model.getSourceDef('notb');
         expect(notb).toBeDefined();
@@ -840,7 +464,7 @@ describe('qops', () => {
     `));
     test('nest ref', modelOK('query: ab->{group_by: ai; nest: aturtle}'));
     test('refine query with extended source', () => {
-        const m = new BetaModel(`
+        const m = new test_translator_1.TestTranslator(`
       source: nab is ab {
         query: xturtle is aturtle + {
           declare: aratio is ai / acount
@@ -866,7 +490,7 @@ describe('qops', () => {
         }
     });
     test('refine query source with field', () => {
-        const m = new BetaModel(`
+        const m = new test_translator_1.TestTranslator(`
       query: ab -> aturtle + {
         declare: aratio is ai / acount
         aggregate: aratio
@@ -890,7 +514,7 @@ describe('qops', () => {
         }
     });
     test('refine query source with join', () => {
-        const m = new BetaModel(`
+        const m = new test_translator_1.TestTranslator(`
       query: ab -> aturtle + {
         join_one: bb is b on bb.astr = astr
         group_by: foo is bb.astr
@@ -977,7 +601,7 @@ describe('literals', () => {
         ],
     ];
     test.each(literalTimes)('%s', (expr, timeType, timeframe, result) => {
-        const exprModel = new BetaExpression(expr);
+        const exprModel = new test_translator_1.BetaExpression(expr);
         expect(exprModel).modelCompiled();
         const ir = exprModel.generated();
         expect(ir.dataType).toEqual(timeType);
@@ -1001,7 +625,7 @@ describe('literals', () => {
         ['@1960-06-30 00:00', undefined],
     ];
     test.each(morphicLiterals)('morphic value for %s is %s', (expr, morphic) => {
-        const exprModel = new BetaExpression(expr);
+        const exprModel = new test_translator_1.BetaExpression(expr);
         expect(exprModel).modelCompiled();
         const ir = exprModel.generated();
         const morphTo = ir.morphic && ir.morphic['timestamp'];
@@ -1167,7 +791,7 @@ describe('expressions', () => {
     test('paren and applied div', () => {
         var _a, _b;
         const modelSrc = 'query: z is a -> { group_by: x is 1+(3/4) }';
-        const m = new BetaModel(modelSrc);
+        const m = new test_translator_1.TestTranslator(modelSrc);
         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();
@@ -1195,33 +819,33 @@ describe('expressions', () => {
 });
 describe('unspported fields in schema', () => {
     test('unsupported reference in result allowed', () => {
-        const uModel = new BetaModel('query: a->{ group_by: aun }');
+        const uModel = new test_translator_1.TestTranslator('query: a->{ group_by: aun }');
         expect(uModel).modelCompiled();
     });
     test('unsupported reference can be compared to NULL', () => {
-        const uModel = new BetaModel('query: a->{ where: aun != NULL; project: * }');
+        const uModel = new test_translator_1.TestTranslator('query: a->{ where: aun != NULL; project: * }');
         expect(uModel).modelCompiled();
     });
     test('flag unsupported equality', () => {
         // because we don't know if the two unsupported types are comparable
-        const uModel = new BetaModel('query: ab->{ where: aun = b.aun  project: * }');
+        const uModel = new test_translator_1.TestTranslator('query: ab->{ where: aun = b.aun  project: * }');
         expect(uModel).compileToFailWith('Unsupported type not allowed in expression');
     });
     test('flag unsupported compare', () => {
         // because we don't know if the two unsupported types are comparable
-        const uModel = new BetaModel('query: ab->{ where: aun > b.aun  project: * }');
+        const uModel = new test_translator_1.TestTranslator('query: ab->{ where: aun > b.aun  project: * }');
         expect(uModel).compileToFailWith('Unsupported type not allowed in expression');
     });
     test('allow unsupported equality when raw types match', () => {
-        const uModel = new BetaModel('query: ab->{ where: aweird = b.aweird  project: * }');
+        const uModel = new test_translator_1.TestTranslator('query: ab->{ where: aweird = b.aweird  project: * }');
         expect(uModel).modelCompiled();
     });
     test('flag not applied to unsupported', () => {
-        const uModel = new BetaModel('source: x is a { dimension: notUn is not aun }');
+        const uModel = new test_translator_1.TestTranslator('source: x is a { dimension: notUn is not aun }');
         expect(uModel).compileToFailWith("'not' Can't use type unsupported");
     });
     test('allow unsupported to be cast', () => {
-        const uModel = new BetaModel('source: x is a { dimension: notUn is aun::string }');
+        const uModel = new test_translator_1.TestTranslator('source: x is a { dimension: notUn is aun::string }');
         expect(uModel).modelCompiled();
     });
 });
@@ -1247,7 +871,7 @@ describe('sql:', () => {
     }
     test('definition', () => {
         const selStmt = 'SELECT * FROM aTable';
-        const model = new BetaModel(`
+        const model = new test_translator_1.TestTranslator(`
       sql: users IS {
         select: """${selStmt}"""
         connection: "aConnection"
@@ -1272,7 +896,7 @@ describe('sql:', () => {
     });
     test('source from sql', () => {
         const selStmt = 'SELECT * FROM aTable';
-        const model = new BetaModel(`
+        const model = new test_translator_1.TestTranslator(`
       sql: users IS { select: """${selStmt}""" }
       source: malloyUsers is from_sql(users) { primary_key: ai }
     `);
@@ -1295,7 +919,7 @@ describe('sql:', () => {
       sql: users IS { select: """${selStmt}""" }
       source: malloyUsers is from_sql(users) { primary_key: ai }
     `;
-        const model = new BetaModel(`
+        const model = new test_translator_1.TestTranslator(`
       import "createModel.malloy"
       source: importUsers is malloyUsers
     `);
@@ -1309,7 +933,7 @@ describe('sql:', () => {
         expect(model).modelCompiled();
     });
     it('turducken', () => {
-        const m = new BetaModel(`
+        const m = new test_translator_1.TestTranslator(`
       sql: someSql is {
         select: """SELECT * FROM %{ a -> { group_by: astr } }% WHERE 1=1"""
       }
@@ -1333,7 +957,7 @@ describe('sql:', () => {
       sql: someSql is { select: """${selStmt}""" }
       source: newaa is newa
     `;
-        const model = new BetaModel(shouldBeOK);
+        const model = new test_translator_1.TestTranslator(shouldBeOK);
         expect(model).modelParsed();
         const needReq = model.translate();
         const needs = needReq === null || needReq === void 0 ? void 0 : needReq.compileSQL;
@@ -1383,7 +1007,7 @@ describe('error handling', () => {
     test("refine can't change query type", badModel('query: ab -> aturtle { project: astr }', 'project: not legal in grouping query'));
     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}");
+    //   const m = new TestTranslator("query: a->{\n group_by: a+1\n}");
     //   expect(m).not.modelParsed();
     //   const errList = m.errors().errors;
     //   const firstError = errList[0];
@@ -1433,7 +1057,7 @@ describe('error handling', () => {
         expect('}%').compileToFailWith("extraneous input '}%' expecting {<EOF>, EXPLORE, QUERY, SOURCE, SQL, IMPORT, ';'}");
     });
     test('bad sql in sql block', () => {
-        const badModel = new BetaModel('sql: { select: """)""" }');
+        const badModel = new test_translator_1.TestTranslator('sql: { select: """)""" }');
         expect(badModel).modelParsed();
         const needSchema = badModel.translate();
         expect(needSchema.compileSQL).toBeDefined();
@@ -1474,19 +1098,19 @@ function getSelectOneStruct(sqlBlock) {
 describe('source locations', () => {
     test('renamed explore location', () => {
         const source = (0, test_translator_1.markSource) `explore: ${'na is a'}`;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         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);
+        const m = new test_translator_1.TestTranslator(source.code);
         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);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getField)(na, 'x');
@@ -1494,7 +1118,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);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getField)(na, 'x');
@@ -1502,7 +1126,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);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getField)(na, 'x');
@@ -1515,7 +1139,7 @@ describe('source locations', () => {
           group_by: ${'y is 1'}
         }
       }`;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getQueryField)(na, 'x');
@@ -1530,7 +1154,7 @@ describe('source locations', () => {
           group_by: ${'z is y { where: true }'}
         }
       }`;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getQueryField)(na, 'x');
@@ -1539,7 +1163,7 @@ 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);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const abool = (0, test_translator_1.getField)(na, 'abool');
@@ -1550,7 +1174,7 @@ describe('source locations', () => {
       sql: s is { select: ${'"""SELECT 1 as one """'} }
       explore: na is from_sql(s)
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelParsed();
         const compileSql = m.translate().compileSQL;
         expect(compileSql).toBeDefined();
@@ -1574,7 +1198,7 @@ describe('source locations', () => {
         }
       )
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const abool = (0, test_translator_1.getField)(na, 'abool');
@@ -1584,14 +1208,14 @@ 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);
+        const m = new test_translator_1.TestTranslator(source.code);
         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);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const q = (0, test_translator_1.getModelQuery)(m.modelDef, 'q');
         const a = (0, test_translator_1.getField)(q.pipeline[0], 'b');
@@ -1599,7 +1223,7 @@ describe('source locations', () => {
     });
     test('location of named SQL block', () => {
         const source = (0, test_translator_1.markSource) `${'sql: s is { select: """SELECT 1 as one""" }'}`;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelParsed();
         const compileSql = m.translate().compileSQL;
         expect(compileSql).toBeDefined();
@@ -1618,7 +1242,7 @@ describe('source locations', () => {
         rename: ${'bbool is abool'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const bbool = (0, test_translator_1.getField)(na, 'bbool');
@@ -1630,7 +1254,7 @@ describe('source locations', () => {
         join_one: ${'x is a { primary_key: abool } on abool'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getField)(na, 'x');
@@ -1642,7 +1266,7 @@ describe('source locations', () => {
         join_one: ${'x is a { primary_key: astr } with astr'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getField)(na, 'x');
@@ -1657,7 +1281,7 @@ describe('source locations', () => {
         } on abool
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getJoinField)(na, 'x');
@@ -1667,7 +1291,7 @@ describe('source locations', () => {
     // 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);
+    //   const m = new TestTranslator(sqlSource);
     //   expect(m).not.modelParsed();
     //   const errList = m.errors().errors;
     //   expect(errList[0].at?.range.end).toEqual({ line: 2, character: 11 });
@@ -1684,7 +1308,7 @@ describe('source references', () => {
       explore: ${'na is a'}
       query: ${'na'} -> { project: * }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1702,7 +1326,7 @@ describe('source references', () => {
       }
       query: t -> ${'q'}
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1718,7 +1342,7 @@ describe('source references', () => {
       explore: na is a { query: ${'x is { group_by: y is 1 }'} }
       query: na -> ${'x'}
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1734,7 +1358,7 @@ describe('source references', () => {
       ${'sql: s is {select:"""SELECT 1 as one"""}'}
       explore: na is from_sql(${'s'})
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelParsed();
         const compileSql = m.translate().compileSQL;
         expect(compileSql).toBeDefined();
@@ -1760,7 +1384,7 @@ describe('source references', () => {
       query: ${'q is a -> { project: * }'}
       explore: na is from(-> ${'q'})
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1776,7 +1400,7 @@ describe('source references', () => {
       query: ${'q is a -> { project: * }'}
       query: q2 is -> ${'q'} -> { project: * }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1792,7 +1416,7 @@ describe('source references', () => {
       query: ${'q is a -> { project: * }'}
       query: q2 is -> ${'q'} { limit: 10 }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1808,7 +1432,7 @@ describe('source references', () => {
       explore: na is ${"table('aTable')"}
       query: na -> { project: bbool is not ${'abool'} }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1826,7 +1450,7 @@ describe('source references', () => {
       }
       query: na -> { project: ${'`name`'} }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1845,7 +1469,7 @@ describe('source references', () => {
       }
       query: na -> { project: bstr is self.${'astr'} }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1863,7 +1487,7 @@ describe('source references', () => {
       }
       query: na -> { project: bstr is ${'self'}.astr }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1878,7 +1502,7 @@ describe('source references', () => {
         const source = (0, test_translator_1.markSource) `
       query: ${"table('aTable')"} -> { group_by: ${'abool'} }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1894,7 +1518,7 @@ describe('source references', () => {
       explore: na is ${"table('aTable')"}
       query: na -> { project: ${'abool'} }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1912,7 +1536,7 @@ describe('source references', () => {
         order_by: ${'abool'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1930,7 +1554,7 @@ describe('source references', () => {
         order_by: ${'one'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1948,7 +1572,7 @@ describe('source references', () => {
         aggregate: ${'c'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1966,7 +1590,7 @@ describe('source references', () => {
         measure: c2 is ${'c'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -1984,7 +1608,7 @@ describe('source references', () => {
         top: 10 by ${'abool'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2002,7 +1626,7 @@ describe('source references', () => {
         top: 10 by ${'one'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2020,7 +1644,7 @@ describe('source references', () => {
         where: ${'abool'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2036,7 +1660,7 @@ describe('source references', () => {
       explore: na is ${"table('aTable')"}
       query: na -> { aggregate: ai_sum is ${'ai'}.sum() }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2057,7 +1681,7 @@ describe('source references', () => {
       }
       query: na -> { aggregate: ai_sum is ${'self'}.sum(self.ai) }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2075,7 +1699,7 @@ describe('source references', () => {
       }
       query: na -> { aggregate: ai_sum is self.sum(${'self'}.ai) }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2093,7 +1717,7 @@ describe('source references', () => {
         join_one: ${'exp1'} on astr = exp1.astr
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2109,7 +1733,7 @@ describe('source references', () => {
       explore: na is ${"table('aTable')"}
       query: na -> { aggregate: ai_sum is sum(${'ai'}) }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2126,7 +1750,7 @@ describe('source references', () => {
         rename: bbool is ${'abool'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2144,7 +1768,7 @@ describe('source references', () => {
         join_one: exp1 with ${'astr'}
       }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelCompiled();
         expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
@@ -2159,7 +1783,7 @@ describe('source references', () => {
 describe('translation need error locations', () => {
     test('import error location', () => {
         const source = (0, test_translator_1.markSource) `import ${'"badfile"'}`;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         const result = m.translate();
         m.update({
             errors: { urls: { [(result.urls || [])[0]]: 'Bad file!' } },
@@ -2174,7 +1798,7 @@ describe('translation need error locations', () => {
       sql: bad_sql is {select: ${'"""BAD_SQL"""'}}
       query: from_sql(bad_sql) -> { project: * }
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         expect(m).modelParsed();
         const req = m.translate().compileSQL;
         expect(req).toBeDefined();
@@ -2189,7 +1813,7 @@ describe('translation need error locations', () => {
         const source = (0, test_translator_1.markSource) `
       explore: bad_explore is ${"table('malloy-data.bad.table')"}
     `;
-        const m = new BetaModel(source.code);
+        const m = new test_translator_1.TestTranslator(source.code);
         const result = m.translate();
         m.update({
             errors: {
@@ -2263,7 +1887,7 @@ describe('pipeline comprehension', () => {
         group_by: destination
       }
     `;
-        const m = new BetaModel(src);
+        const m = new test_translator_1.TestTranslator(src);
         expect(m).modelCompiled();
         const s2 = m.getQuery('s2');
         expect(s2 === null || s2 === void 0 ? void 0 : s2.pipeline.length).toBe(2);