@malloydata/malloy 0.0.190 → 0.0.191-dev240925232958

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

@@ -48,22 +48,22 @@ describe('model statements', () => {
             m.translator.update({
                 errors: { tables: { 'a1:aTable': 'invalid connection' } },
             });
-            expect(m).translationToFailWith('a1 is not a connection');
+            expect(m).toLog((0, test_translator_1.errorMessage)('a1 is not a connection'));
         });
         test('cannot refine table', () => {
-            expect((0, test_translator_1.markSource) `run: \`_db_\`.table('aTable') + { limit: 10 }`).translationToFailWith('Cannot add view refinements to a source');
+            expect((0, test_translator_1.markSource) `run: \`_db_\`.table('aTable') + { limit: 10 }`).toLog((0, test_translator_1.errorMessage)('Cannot add view refinements to a source'));
         });
         test('table function is deprecated', () => {
             expect(`##! m4warnings=warn
       source: testA is table('_db_:aTable')
-    `).toTranslateWithWarnings("`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`");
+    `).toLog((0, test_translator_1.warningMessage)("`table('connection_name:table_path')` is deprecated; use `connection_name.table('table_path')`"));
         });
         test('cannot run table', () => {
-            expect((0, test_translator_1.markSource) `run: \`_db_\`.table('aTable')`).translationToFailWith('This source cannot be used as a query');
+            expect((0, test_translator_1.markSource) `run: \`_db_\`.table('aTable')`).toLog((0, test_translator_1.errorMessage)('This source cannot be used as a query'));
         });
     });
     test('errors on redefinition of query', () => {
-        expect('query: q1 is a -> { select: * }, q1 is a -> { select: * }').translationToFailWith("'q1' is already defined, cannot redefine");
+        expect('query: q1 is a -> { select: * }, q1 is a -> { select: * }').toLog((0, test_translator_1.errorMessage)("'q1' is already defined, cannot redefine"));
     });
     test('##! experimental enables all experiments', () => {
         expect('##! experimental\n;;[ "x" ]').toTranslate();
@@ -72,13 +72,19 @@ describe('model statements', () => {
         expect('##! experimental { compilerTestExperimentParse compilerTestExperimentTranslate }\n;;[ "x" ]').toTranslate();
     });
     test('experiments do not bleed into one another', () => {
-        expect('##! experimental { this_experiment_does_not_exist }\n;;[ "x" ]').translationToFailWith("Experimental flag 'compilerTestExperimentParse' required to enable this feature");
+        expect('##! experimental { this_experiment_does_not_exist }\n;;[ "x" ]').toLog((0, test_translator_1.error)('experiment-not-enabled', {
+            experimentId: 'compilerTestExperimentParse',
+        }));
     });
     test('experiment failures in parse are flagged', () => {
-        expect(';;[ "x" ]').translationToFailWith("Experimental flag 'compilerTestExperimentParse' required to enable this feature");
+        expect(';;[ "x" ]').toLog((0, test_translator_1.error)('experiment-not-enabled', {
+            experimentId: 'compilerTestExperimentParse',
+        }));
     });
     test('experiment failures in second pass are flagged', () => {
-        expect('##! experimental.compilerTestExperimentParse\n;;[ "x" ]').translationToFailWith("Experimental flag 'compilerTestExperimentTranslate' is not set, feature not available");
+        expect('##! experimental.compilerTestExperimentParse\n;;[ "x" ]').toLog((0, test_translator_1.error)('experiment-not-enabled', {
+            experimentId: 'compilerTestExperimentTranslate',
+        }));
     });
 });
 describe('error handling', () => {
@@ -87,7 +93,7 @@ describe('error handling', () => {
       source: flights is _db_.table('malloytest.flights') extend {
         view: carrier is { group_by: carrier }
       }
-    `).translationToFailWith("Cannot redefine 'carrier'");
+    `).toLog((0, test_translator_1.errorMessage)("Cannot redefine 'carrier'"));
     });
     test('redefine source', () => {
         expect((0, test_translator_1.markSource) `
@@ -97,27 +103,27 @@ describe('error handling', () => {
       source: airports is _db_.table('malloytest.airports') extend {
         primary_key: code
       }
-    `).translationToFailWith("Cannot redefine 'airports'");
+    `).toLog((0, test_translator_1.errorMessage)("Cannot redefine 'airports'"));
     });
     test('query from undefined source', () => {
-        expect((0, test_translator_1.markSource) `run: ${'x'}->{ select: y }`).translationToFailWith("Reference to undefined object 'x'");
+        expect((0, test_translator_1.markSource) `run: ${'x'}->{ select: y }`).toLog((0, test_translator_1.errorMessage)("Reference to undefined object 'x'"));
     });
     test('query with expression from undefined source', () => {
         // Regression check: Once upon a time this died with an exception even
         // when "query: x->{ group_by: y}" (above) generated the correct error.
-        expect((0, test_translator_1.markSource) `run: ${'x'}->{ select: y is z / 2 }`).translationToFailWith("Reference to undefined object 'x'");
+        expect((0, test_translator_1.markSource) `run: ${'x'}->{ select: y is z / 2 }`).toLog((0, test_translator_1.errorMessage)("Reference to undefined object 'x'"));
     });
     test('join reference before definition', () => {
         expect((0, test_translator_1.markSource) `
         source: newAB is a extend { join_one: newB is ${'bb'} on astring }
         source: newB is b
-      `).translationToFailWith("Reference to undefined object 'bb'");
+      `).toLog((0, test_translator_1.errorMessage)("Reference to undefined object 'bb'"));
     });
     test('non-rename rename', () => {
-        expect('source: na is a extend { rename: astr is astr }').translationToFailWith("Can't rename field to itself");
+        expect('source: na is a extend { rename: astr is astr }').toLog((0, test_translator_1.errorMessage)("Can't rename field to itself"));
     });
     test('reference to field in its definition', () => {
-        expect('source: na is a extend { dimension: ustr is upper(ustr) } ').translationToFailWith("Circular reference to 'ustr' in definition");
+        expect('source: na is a extend { dimension: ustr is upper(ustr) } ').toLog((0, test_translator_1.errorMessage)("Circular reference to 'ustr' in definition"));
     });
     test('empty model', () => {
         expect('').toTranslate();
@@ -126,38 +132,38 @@ describe('error handling', () => {
         expect('\n').toTranslate();
     });
     test('query without fields', () => {
-        expect('run: a -> { top: 5 }').translationToFailWith("Can't determine view type (`group_by` / `aggregate` / `nest`, `project`, `index`)");
+        expect('run: a -> { top: 5 }').toLog((0, test_translator_1.error)('ambiguous-view-type'));
     });
     test('refine cannot change query type', () => {
-        expect('run: ab -> aturtle + { select: astr }').translationToFailWith(/Not legal in grouping query/);
+        expect('run: ab -> aturtle + { select: astr }').toLog((0, test_translator_1.errorMessage)(/Not legal in grouping query/));
     });
     test('undefined field ref in query', () => {
-        expect('run: ab -> { aggregate: xyzzy }').translationToFailWith("'xyzzy' is not defined");
+        expect('run: ab -> { aggregate: xyzzy }').toLog((0, test_translator_1.errorMessage)("'xyzzy' is not defined"));
     });
     test('query on source with errors', () => {
         expect((0, test_translator_1.markSource) `
         source: na is a extend { join_one: ${'n'} on astr }
-      `).translationToFailWith("Reference to undefined object 'n'");
+      `).toLog((0, test_translator_1.errorMessage)("Reference to undefined object 'n'"));
     });
     test('detect duplicate output field names', () => {
-        expect((0, test_translator_1.markSource) `run: ab -> { group_by: astr, ${'astr'} }`).translationToFailWith("Output already has a field named 'astr'");
+        expect((0, test_translator_1.markSource) `run: ab -> { group_by: astr, ${'astr'} }`).toLog((0, test_translator_1.errorMessage)("Output already has a field named 'astr'"));
     });
     test('detect join tail overlap existing ref', () => {
-        expect((0, test_translator_1.markSource) `run: ab -> { group_by: astr, ${'b.astr'} }`).translationToFailWith("Output already has a field named 'astr'");
+        expect((0, test_translator_1.markSource) `run: ab -> { group_by: astr, ${'b.astr'} }`).toLog((0, test_translator_1.errorMessage)("Output already has a field named 'astr'"));
     });
     test('undefined in expression with regex compare', () => {
         expect(`
         source: c is a extend {
           dimension: d is meaning_of_life ~ r'(forty two|fifty four)'
         }
-      `).translationToFailWith("'meaning_of_life' is not defined");
+      `).toLog((0, test_translator_1.errorMessage)("'meaning_of_life' is not defined"));
     });
     test('detect output collision on join references', () => {
         expect(`
       run: ab -> {
         group_by: astr, b.astr
       }
-    `).translationToFailWith("Output already has a field named 'astr'");
+    `).toLog((0, test_translator_1.errorMessage)("Output already has a field named 'astr'"));
     });
     test('rejoin a query is renamed', () => {
         expect(`
@@ -175,7 +181,7 @@ describe('error handling', () => {
     `).toTranslate();
     });
     test('popping out of embedding when not embedded', () => {
-        expect('}%').translationToFailWith(/extraneous input '}%' expecting/);
+        expect('}%').toLog((0, test_translator_1.errorMessage)(/extraneous input '}%' expecting/));
     });
     test('bad sql in sql block', () => {
         const badSelect = (0, test_translator_1.model) `source: someName is _db_.sql(")")`;
@@ -192,7 +198,7 @@ describe('error handling', () => {
                 },
             });
         }
-        expect(badTrans).translationToFailWith('Invalid SQL, Nobody ZZZZ');
+        expect(badTrans).toLog((0, test_translator_1.errorMessage)('Invalid SQL, Nobody ZZZZ'));
     });
 });
 describe('translate imports', () => {
@@ -222,7 +228,7 @@ describe('translation need error locations', () => {
         m.update({
             errors: { urls: { [(result.urls || [])[0]]: 'Bad file!' } },
         });
-        expect(source).translationToFailWith(/Bad file!/);
+        expect(source).toLog((0, test_translator_1.errorMessage)(/Bad file!/));
     });
     test('sql struct error location', () => {
         const source = (0, test_translator_1.markSource) `
@@ -251,7 +257,7 @@ describe('translation need error locations', () => {
                 tables: { [Object.keys(result.tables || {})[0]]: 'Bad table!' },
             },
         });
-        expect(m).translationToFailWith(/Bad table!/);
+        expect(m).toLog((0, test_translator_1.errorMessage)(/Bad table!/));
     });
 });
 describe('error cascading', () => {
@@ -259,7 +265,7 @@ describe('error cascading', () => {
         expect((0, test_translator_1.markSource) `
         source: a1 is a extend { dimension: ${'x is count()'} }
         source: a2 is a extend { dimension: ${'x is count()'} }
-      `).translationToFailWith('Cannot use an aggregate field in a dimension declaration, did you mean to use a measure declaration instead?', 'Cannot use an aggregate field in a dimension declaration, did you mean to use a measure declaration instead?');
+      `).toLog((0, test_translator_1.errorMessage)('Cannot use an aggregate field in a dimension declaration, did you mean to use a measure declaration instead?'), (0, test_translator_1.errorMessage)('Cannot use an aggregate field in a dimension declaration, did you mean to use a measure declaration instead?'));
     });
     const typedScalars = {
         'err': 'error',
@@ -335,7 +341,7 @@ describe('error cascading', () => {
             .map((m, i) => `e${i + scalars.length} is ${m}`)
             .join('\n            ')}
         }
-      `).translationToFailWith("'nothing' is not defined", "'foo' is not defined");
+      `).toLog((0, test_translator_1.errorMessage)("'nothing' is not defined"), (0, test_translator_1.errorMessage)("'foo' is not defined"));
     });
     test('error type inference is good', () => {
         for (const scalar of scalars) {
@@ -346,7 +352,7 @@ describe('error cascading', () => {
               dim is length(${scalar}, 1)
           }
         `;
-            expect(source).translationToFailWith("'nothing' is not defined", `No matching overload for function length(${typedScalars[scalar]}, number)`);
+            expect(source).toLog((0, test_translator_1.errorMessage)("'nothing' is not defined"), (0, test_translator_1.errorMessage)(`No matching overload for function length(${typedScalars[scalar]}, number)`));
         }
     });
     test('eval space of errors is preserved', () => {
@@ -367,7 +373,7 @@ describe('error cascading', () => {
             .map((m, i) => `e${i + scalars.length} is lag(${m})`)
             .join('\n            ')}
         }
-      `).translationToFailWith("'nothing' is not defined", "'foo' is not defined");
+      `).toLog((0, test_translator_1.errorMessage)("'nothing' is not defined"), (0, test_translator_1.errorMessage)("'foo' is not defined"));
     });
 });
 describe('pipeline comprehension', () => {
@@ -391,7 +397,7 @@ describe('pipeline comprehension', () => {
             select: ${'ai'}
           }
         }
-      `).translationToFailWith("'ai' is not defined");
+      `).toLog((0, test_translator_1.errorMessage)("'ai' is not defined"));
     });
     test('new query can append ops to existing query', () => {
         expect(`
@@ -551,7 +557,7 @@ describe('sql expressions', () => {
             m.update({
                 compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
             });
-            expect(m).translationToFailWith('Cannot add view refinements to a source');
+            expect(m).toLog((0, test_translator_1.errorMessage)('Cannot add view refinements to a source'));
         }
     });
     test('reference to sql expression in join', () => {
@@ -625,7 +631,7 @@ describe('sql expressions', () => {
             m.update({
                 compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
             });
-            expect(m).translationToFailWith('A raw query cannot be refined');
+            expect(m).toLog((0, test_translator_1.errorMessage)('A raw query cannot be refined'));
         }
     });
     test('cannot refine a SQL query directly', () => {
@@ -639,7 +645,7 @@ describe('sql expressions', () => {
             m.update({
                 compileSQL: { [compileSql.name]: (0, test_translator_1.getSelectOneStruct)(compileSql) },
             });
-            expect(m).translationToFailWith('Cannot add view refinements to a source');
+            expect(m).toLog((0, test_translator_1.errorMessage)('Cannot add view refinements to a source'));
         }
     });
 });
@@ -658,7 +664,7 @@ describe('extend and refine', () => {
         `).toTranslate();
         });
         test('source name with query refinements', () => {
-            expect('run: a + { group_by: ai }').translationToFailWith("Cannot add view refinements to 'a' because it is a source");
+            expect('run: a + { group_by: ai }').toLog((0, test_translator_1.errorMessage)("Cannot add view refinements to 'a' because it is a source"));
         });
         test('source name with source refinements', () => {
             expect('source: s is a extend { dimension: ai_2 is ai + ai }').toTranslate();
@@ -684,7 +690,7 @@ describe('extend and refine', () => {
         `).toTranslate();
         });
         test('source name with query refinements', () => {
-            expect('run: a + { group_by: one }').translationToFailWith("Cannot add view refinements to 'a' because it is a source");
+            expect('run: a + { group_by: one }').toLog((0, test_translator_1.errorMessage)("Cannot add view refinements to 'a' because it is a source"));
         });
         test('source name with source refinements', () => {
             expect('source: s is a extend { dimension: ai_2 is ai + ai }').toTranslate();
@@ -695,7 +701,7 @@ describe('extend and refine', () => {
           ##! -m4warnings
           query: q is a -> { group_by: ai }
           run: q + { join_one: b on 1 = 1 } -> { select: b.* }
-        `).translationToFailWith("No such field as 'b'");
+        `).toLog((0, test_translator_1.errorMessage)("No such field as 'b'"));
                 expect(`
           ##! -m4warnings
           query: q is a -> { group_by: ai }
@@ -764,10 +770,10 @@ describe('extend and refine', () => {
     });
     describe('extend and refine fallout', () => {
         test('syntactically valid to run a source, but still illegal', () => {
-            expect('run: a').translationToFailWith("Illegal reference to 'a', query expected");
+            expect('run: a').toLog((0, test_translator_1.errorMessage)("Illegal reference to 'a', query expected"));
         });
         test('syntactically valid to refine a source, but illegal', () => {
-            expect('run: a + { group_by: ai } ').translationToFailWith("Cannot add view refinements to 'a' because it is a source");
+            expect('run: a + { group_by: ai } ').toLog((0, test_translator_1.errorMessage)("Cannot add view refinements to 'a' because it is a source"));
         });
     });
     describe('turtles', () => {
@@ -810,7 +816,7 @@ describe('miscellaneous m4 warnings', () => {
         expect(`
       ##! m4warnings=warn
       query: q is a -> { project: * }
-    `).toTranslateWithWarnings('project: keyword is deprecated, use select:');
+    `).toLog((0, test_translator_1.warningMessage)('project: keyword is deprecated, use select:'));
     });
     test('query leading arrow', () => {
         expect(`
@@ -832,8 +838,8 @@ describe('m3/m4 source query sentences', () => {
     // todo MTOY write test to make sure arrow has correct precedence vs +
     // also maybe arrow vs extend
     test('M4 should error on these sq expressions', () => {
-        expect(`source: s is a + ${qryRefine}`).translationToFailWith("Cannot add view refinements to 'a' because it is a source");
-        expect(`query: q_m4_err is a + ${qryRefine}`).translationToFailWith("Cannot add view refinements to 'a' because it is a source");
+        expect(`source: s is a + ${qryRefine}`).toLog((0, test_translator_1.errorMessage)("Cannot add view refinements to 'a' because it is a source"));
+        expect(`query: q_m4_err is a + ${qryRefine}`).toLog((0, test_translator_1.errorMessage)("Cannot add view refinements to 'a' because it is a source"));
     });
     test('legal sqexpressions', () => {
         // some things that are m4 warnings are commented out
@@ -879,10 +885,4 @@ describe('sql_functions', () => {
     });
 });
 test('non breaking space in source', () => expect('source:\u00a0z\u00a0is\u00a0a').toParse());
-test('error tagging', () => {
-    const m = (0, test_translator_1.model) `run: a -> { select: err is pick 1 when true else 'one' }`;
-    expect(m).translationToFailWith("else type 'string', expected 'number'");
-    const firstErr = m.translator.root.logger.getLog()[0];
-    expect(firstErr === null || firstErr === void 0 ? void 0 : firstErr.errorTag).toBe('pick-values-must-match');
-});
 //# sourceMappingURL=parse.spec.js.map