@malloydata/malloy 0.0.43-dev230621180201 → 0.0.43-dev230621212545

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

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * Copyright 2023 Google LLC
@@ -24,30 +27,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 require("./parse-expects");
 const test_translator_1 = require("./test-translator");
+const escapeRegExp_1 = __importDefault(require("lodash/escapeRegExp"));
 describe('import:', () => {
     test('simple source', () => {
         const docParse = new test_translator_1.TestTranslator('import "child"');
         const xr = docParse.unresolved();
-        expect(docParse).toBeErrorless();
+        expect(docParse).toParse();
         expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
         docParse.update({
             urls: { 'internal://test/langtests/child': 'source: aa is a' },
         });
-        expect(docParse).modelCompiled();
+        expect(docParse).toTranslate();
         const aa = docParse.getSourceDef('aa');
         expect(aa).toBeDefined();
     });
     test('simple query', () => {
         const docParse = new test_translator_1.TestTranslator('import "child"');
         const xr = docParse.unresolved();
-        expect(docParse).toBeErrorless();
+        expect(docParse).toParse();
         expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
         docParse.update({
             urls: {
                 'internal://test/langtests/child': 'query: aq is a->{ project: * }',
             },
         });
-        expect(docParse).modelCompiled();
+        expect(docParse).toTranslate();
         const aq = docParse.getQuery('aq');
         expect(aq).toBeDefined();
     });
@@ -59,7 +63,7 @@ source: newSrc is a {
 }
 `);
         const xr = docParse.unresolved();
-        expect(docParse).toBeErrorless();
+        expect(docParse).toParse();
         expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
         docParse.update({
             urls: {
@@ -70,7 +74,7 @@ source: botProjQSrc is from(->botProjQ)
 `,
             },
         });
-        expect(docParse).modelCompiled();
+        expect(docParse).toTranslate();
         const newSrc = docParse.getSourceDef('newSrc');
         const f = newSrc === null || newSrc === void 0 ? void 0 : newSrc.fields.find(f => f.name === 'b');
         expect(f === null || f === void 0 ? void 0 : f.type).toBe('struct');
@@ -85,7 +89,7 @@ source: botProjQSrc is from(->botProjQ)
     test('missing import', () => {
         const docParse = new test_translator_1.TestTranslator('import "child"');
         const xr = docParse.unresolved();
-        expect(docParse).toBeErrorless();
+        expect(docParse).toParse();
         expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
         const reportedError = 'ENOWAY: No way to find your child';
         docParse.update({
@@ -94,8 +98,7 @@ source: botProjQSrc is from(->botProjQ)
             },
         });
         docParse.translate();
-        expect(docParse).not.toBeErrorless();
-        expect(docParse.prettyErrors()).toContain(reportedError);
+        expect(docParse).translationToFailWith(new RegExp((0, escapeRegExp_1.default)(reportedError)));
     });
     test('chained imports', () => {
         const docParse = new test_translator_1.TestTranslator('import "child"');
@@ -103,12 +106,12 @@ source: botProjQSrc is from(->botProjQ)
             urls: { 'internal://test/langtests/child': 'import "grandChild"' },
         });
         const xr = docParse.unresolved();
-        expect(docParse).toBeErrorless();
+        expect(docParse).toParse();
         expect(xr).toEqual({ urls: ['internal://test/langtests/grandChild'] });
     });
     test('relative imports', () => {
         const docParse = new test_translator_1.TestTranslator('import "../parent.malloy"');
-        expect(docParse).modelParsed();
+        expect(docParse).toParse();
         const xr = docParse.unresolved();
         expect(xr).toEqual({ urls: ['internal://test/parent.malloy'] });
         docParse.update({
@@ -116,11 +119,11 @@ source: botProjQSrc is from(->botProjQ)
                 'internal://test/parent.malloy': "source: aa is table('aTable')",
             },
         });
-        expect(docParse).modelCompiled();
+        expect(docParse).toTranslate();
     });
     test('relative imports with errors', () => {
         const docParse = new test_translator_1.TestTranslator('import "../parent.malloy"');
-        expect(docParse).modelParsed();
+        expect(docParse).toParse();
         const xr = docParse.unresolved();
         expect(xr).toEqual({ urls: ['internal://test/parent.malloy'] });
         docParse.update({
@@ -131,7 +134,7 @@ source: botProjQSrc is from(->botProjQ)
           }`,
             },
         });
-        expect(docParse).compileToFailWith("Cannot redefine 'astr'");
+        expect(docParse).translationToFailWith("Cannot redefine 'astr'");
     });
     test('source references expanded when not exported', () => {
         const srcFiles = {
@@ -145,7 +148,7 @@ source: botProjQSrc is from(->botProjQ)
       import "middle"
     `);
         fullModel.update({ urls: srcFiles });
-        expect(fullModel).modelCompiled();
+        expect(fullModel).toTranslate();
         const ms = fullModel.getSourceDef('midSrc');
         expect(ms).toBeDefined();
         if (ms) {

package/dist/lang/test/parse-expects.d.ts

@@ -3,13 +3,39 @@ declare type ErrorSpec = string | RegExp;
 declare global {
     namespace jest {
         interface Matchers<R> {
-            modelParsed(): R;
-            toBeErrorless(): R;
-            toCompile(): R;
-            modelCompiled(): R;
-            expressionCompiled(): R;
+            /**
+             * expect(X).toParse()
+             *
+             * Passes if the source parses to an AST without errors.
+             *
+             * X can be a MarkedSource, a string, or a model. If it is a marked
+             * source, the errors which are found must match the locations of
+             * the markings.
+             */
+            toParse(): R;
+            /**
+             * expect(X).toTranslate()
+             *
+             * Passes if the source compiles to code which could be used to
+             * generate SQL.
+             *
+             * X can be a MarkedSource, a string, or a model. If it is a marked
+             * source, the errors which are found must match the locations of
+             * the markings.
+             */
+            toTranslate(): R;
             toReturnType(tp: string): R;
-            compileToFailWith(...expectedErrors: ErrorSpec[]): R;
+            /**
+             * expect(X).translateToFailWith(expectedErrors)
+             *
+             * X can be a MarkedSource, a string, or a model. If it is a marked
+             * source, the errors which are found must match the locations of
+             * the markings.
+             *
+             * @param expectedErrors varargs list of strings which must match
+             *        exactly, or regular expressions.
+             */
+            translationToFailWith(...expectedErrors: ErrorSpec[]): R;
             isLocationIn(at: DocumentLocation, txt: string): R;
         }
     }

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

@@ -92,60 +92,53 @@ function highlightError(dl, txt) {
     }
     return output.join('\n');
 }
+function isMarkedSource(ts) {
+    return typeof ts !== 'string' && !(ts instanceof test_translator_1.TestTranslator);
+}
+function xlator(ts) {
+    if (ts instanceof test_translator_1.TestTranslator) {
+        return ts;
+    }
+    if (typeof ts === 'string') {
+        return new test_translator_1.TestTranslator(ts);
+    }
+    return ts.translator || new test_translator_1.TestTranslator(ts.code);
+}
+function xlated(tt) {
+    const errorCheck = checkForErrors(tt);
+    if (!errorCheck.pass) {
+        return errorCheck;
+    }
+    tt.translate();
+    return checkForNeededs(tt);
+}
 expect.extend({
-    toCompile: function (s) {
-        const x = new test_translator_1.TestTranslator(s);
-        x.compile();
-        const errorCheck = checkForErrors(x);
-        if (!errorCheck.pass) {
-            return errorCheck;
-        }
-        x.translate();
-        return checkForNeededs(x);
-    },
-    modelParsed: function (x) {
+    toParse: function (tx) {
+        const x = xlator(tx);
         x.compile();
         return checkForErrors(x);
     },
-    modelCompiled: function (x) {
+    toTranslate: function (tx) {
+        const x = xlator(tx);
         x.compile();
-        const errorCheck = checkForErrors(x);
-        if (!errorCheck.pass) {
-            return errorCheck;
-        }
-        x.translate();
-        return checkForNeededs(x);
+        return xlated(x);
     },
-    expressionCompiled: function (src) {
-        const x = new test_translator_1.BetaExpression(src);
-        x.compile();
-        const errorCheck = checkForErrors(x);
-        if (!errorCheck.pass) {
-            return errorCheck;
+    toReturnType: function (exprText, returnType) {
+        const exprModel = new test_translator_1.BetaExpression(exprText);
+        exprModel.compile();
+        const ok = xlated(exprModel);
+        if (!ok.pass) {
+            return ok;
         }
-        return checkForNeededs(x);
+        const d = exprModel.generated();
+        const pass = d.dataType === returnType;
+        const msg = `Expression type ${d.dataType} ${pass ? '=' : '!='} $[returnType`;
+        return { pass, message: () => msg };
     },
-    toBeErrorless: function (trans) {
-        return checkForErrors(trans);
-    },
-    toReturnType: function (functionCall, returnType) {
-        const exprModel = new test_translator_1.TestTranslator(`source: 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) {
+    translationToFailWith: function (s, ...msgs) {
         var _a;
         let emsg = 'Compile Error expectation not met\nExpected message';
-        let mSrc;
+        const mSrc = isMarkedSource(s) ? s : undefined;
         const qmsgs = msgs.map(s => `error '${s}'`);
         if (msgs.length === 1) {
             emsg += ` ${qmsgs[0]}`;
@@ -153,22 +146,8 @@ expect.extend({
         else {
             emsg += `s [\n${qmsgs.join('\n')}\n]`;
         }
-        let m;
-        let src;
-        if (s instanceof test_translator_1.TestTranslator) {
-            m = s;
-            src = m.testSrc;
-        }
-        else {
-            if (typeof s === 'string') {
-                src = s;
-            }
-            else {
-                src = s.code;
-                mSrc = s;
-            }
-            m = new test_translator_1.TestTranslator(src);
-        }
+        const m = xlator(s);
+        const src = m.testSrc;
         emsg += `\nSource:\n${src}`;
         m.compile();
         const t = m.translate();