@malloydata/malloy 0.0.190 → 0.0.191-dev240925232958

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

@@ -73,7 +73,7 @@ describe('lenses', () => {
           view: d is { group_by: n }
         }
         run: x -> d + d
-      `).translationToFailWith('overlapping fields in refinement: n');
+      `).toLog((0, test_translator_1.errorMessage)('overlapping fields in refinement: n'));
     });
     test('cannot override limit', () => {
         expect((0, test_translator_1.markSource) `
@@ -82,7 +82,7 @@ describe('lenses', () => {
           view: d2 is { group_by: n2 is 2; limit: 20 }
         }
         run: x -> d1 + d2
-      `).translationToFailWith('refinement cannot override existing limit');
+      `).toLog((0, test_translator_1.errorMessage)('refinement cannot override existing limit'));
     });
     test('cannot override ordering', () => {
         expect((0, test_translator_1.markSource) `
@@ -91,7 +91,7 @@ describe('lenses', () => {
           view: d2 is { group_by: n2 is 1; order_by: n2 }
         }
         run: x -> d1 + d2
-      `).translationToFailWith('refinement cannot override existing ordering');
+      `).toLog((0, test_translator_1.errorMessage)('refinement cannot override existing ordering'));
     });
     test('weird issue with order by constant group by', () => {
         expect((0, test_translator_1.markSource) `
@@ -122,7 +122,7 @@ describe('lenses', () => {
         run: x -> proj + grp
         run: x -> idx + grp
         run: x -> idx + proj
-      `).translationToFailWith('cannot refine reduce view with project view', 'cannot refine reduce view with index view', 'cannot refine project view with index view', 'cannot refine project view with reduce view', 'cannot refine index view with reduce view', 'cannot refine index view with project view');
+      `).toLog((0, test_translator_1.errorMessage)('cannot refine reduce view with project view'), (0, test_translator_1.errorMessage)('cannot refine reduce view with index view'), (0, test_translator_1.errorMessage)('cannot refine project view with index view'), (0, test_translator_1.errorMessage)('cannot refine project view with reduce view'), (0, test_translator_1.errorMessage)('cannot refine index view with reduce view'), (0, test_translator_1.errorMessage)('cannot refine index view with project view'));
     });
     test('can reference dimension at head of query when experiment is enabled', () => {
         expect((0, test_translator_1.markSource) `
@@ -158,7 +158,7 @@ describe('lenses', () => {
           view: two_stage is { group_by: a is 1 } -> { group_by: a }
         }
         run: x -> one_stage + two_stage
-      `).translationToFailWith('named refinement `two_stage` must have exactly one stage');
+      `).toLog((0, test_translator_1.errorMessage)('named refinement `two_stage` must have exactly one stage'));
     });
     test('cannot refine with literal multi-stage', () => {
         expect((0, test_translator_1.markSource) `
@@ -167,7 +167,7 @@ describe('lenses', () => {
           view: two_stage is { group_by: a is 1 } -> { group_by: a }
         }
         run: x -> one_stage + ({ group_by: a is 1 } -> { group_by: a })
-      `).translationToFailWith('A multi-segment view cannot be used as a refinement');
+      `).toLog((0, test_translator_1.errorMessage)('A multi-segment view cannot be used as a refinement'));
     });
     test('can reference dimension in refinement when experiment is enabled', () => {
         expect((0, test_translator_1.markSource) `
@@ -217,7 +217,7 @@ describe('lenses', () => {
           join_one: y is a on true
           view: m is { aggregate: c is count() }
         }
-        run: x -> m + y + { limit: 1 }`).translationToFailWith('named refinement `y` must be a view, found a struct');
+        run: x -> m + y + { limit: 1 }`).toLog((0, test_translator_1.errorMessage)('named refinement `y` must be a view, found a struct'));
     });
     test('cannot use view from join as whole pipeline', () => {
         expect((0, test_translator_1.markSource) `
@@ -227,7 +227,7 @@ describe('lenses', () => {
           } on true
         }
         run: x -> y.z
-      `).translationToFailWith('Cannot use view from join');
+      `).toLog((0, test_translator_1.errorMessage)('Cannot use view from join'));
     });
     test('cannot use view from join in nest', () => {
         expect((0, test_translator_1.markSource) `
@@ -237,7 +237,7 @@ describe('lenses', () => {
           } on true
         }
         run: x -> { nest: y.z }
-      `).translationToFailWith('Cannot use view from join');
+      `).toLog((0, test_translator_1.errorMessage)('Cannot use view from join'));
     });
     test('cannot use view from join as nest view head', () => {
         expect((0, test_translator_1.markSource) `
@@ -247,7 +247,7 @@ describe('lenses', () => {
           } on true
         }
         run: x -> { nest: y.z + { limit: 1 } }
-      `).translationToFailWith('Cannot use view from join');
+      `).toLog((0, test_translator_1.errorMessage)('Cannot use view from join'));
     });
     test('cannot use view from join as lens in query', () => {
         expect((0, test_translator_1.markSource) `
@@ -257,7 +257,7 @@ describe('lenses', () => {
           } on true
         }
         run: x -> ai + y.z
-      `).translationToFailWith('Cannot use view from join as refinement');
+      `).toLog((0, test_translator_1.errorMessage)('Cannot use view from join as refinement'));
     });
     test('cannot use view from join as lens in nest', () => {
         expect((0, test_translator_1.markSource) `
@@ -267,7 +267,7 @@ describe('lenses', () => {
           } on true
         }
         run: x -> { nest: ai + y.z }
-      `).translationToFailWith('Cannot use view from join as refinement');
+      `).toLog((0, test_translator_1.errorMessage)('Cannot use view from join as refinement'));
     });
     test('can nest dimension with refinement when experiment is enabled', () => {
         expect((0, test_translator_1.markSource) `
@@ -286,7 +286,7 @@ describe('lenses', () => {
           view: d is { group_by: n }
         }
         run: x -> d + b
-      `).translationToFailWith('named refinement `b` must be a view, found a struct');
+      `).toLog((0, test_translator_1.errorMessage)('named refinement `b` must be a view, found a struct'));
     });
     test('cannot reference field in LHS of refinement in group_by', () => {
         expect((0, test_translator_1.markSource) `
@@ -294,7 +294,7 @@ describe('lenses', () => {
           view: v is { group_by: i is 1 }
         }
         run: x -> v + { group_by: j is ${'i'} }
-      `).translationToFailWith("'i' is not defined");
+      `).toLog((0, test_translator_1.errorMessage)("'i' is not defined"));
     });
     test('cannot named-refine multi-stage query', () => {
         expect((0, test_translator_1.markSource) `
@@ -306,7 +306,7 @@ describe('lenses', () => {
         }
         run: x -> multi + d
         run: x -> d + multi
-      `).translationToFailWith('Named refinements of multi-stage views are not supported', 'named refinement `multi` must have exactly one stage');
+      `).toLog((0, test_translator_1.errorMessage)('Named refinements of multi-stage views are not supported'), (0, test_translator_1.errorMessage)('named refinement `multi` must have exactly one stage'));
     });
 });
 describe('partial views', () => {
@@ -342,7 +342,7 @@ describe('partial views', () => {
         run: a -> {
           nest: { group_by: astr }
         }
-      `).translationToFailWith('`nest:` view requires a name (add `nest_name is ...`)');
+      `).toLog((0, test_translator_1.errorMessage)('`nest:` view requires a name (add `nest_name is ...`)'));
     });
     test.skip('partial with index', () => {
         expect((0, test_translator_1.markSource) `
@@ -358,7 +358,7 @@ describe('partial views', () => {
           view: bad1 is { where: true }
           view: bad2 is { where: true } + { where: false }
         }
-      `).translationToFailWith("Can't determine view type (`group_by` / `aggregate` / `nest`, `project`, `index`)", "Can't determine view type (`group_by` / `aggregate` / `nest`, `project`, `index`)");
+      `).toLog((0, test_translator_1.error)('ambiguous-view-type'), (0, test_translator_1.error)('ambiguous-view-type'));
     });
     test('disallow chains that have no fields in multi-stage', () => {
         expect((0, test_translator_1.markSource) `
@@ -369,7 +369,7 @@ describe('partial views', () => {
         }
         run: x -> v -> { where: true }
         run: x -> { where: true } -> { group_by: undef }
-      `).translationToFailWith("Can't determine view type (`group_by` / `aggregate` / `nest`, `project`, `index`)", "'undef' is not defined", "Can't determine view type (`group_by` / `aggregate` / `nest`, `project`, `index`)", "Can't determine view type (`group_by` / `aggregate` / `nest`, `project`, `index`)", "'undef' is not defined", "Can't determine view type (`group_by` / `aggregate` / `nest`, `project`, `index`)");
+      `).toLog((0, test_translator_1.error)('ambiguous-view-type'), (0, test_translator_1.errorMessage)("'undef' is not defined"), (0, test_translator_1.error)('ambiguous-view-type'), (0, test_translator_1.error)('ambiguous-view-type'), (0, test_translator_1.errorMessage)("'undef' is not defined"), (0, test_translator_1.error)('ambiguous-view-type'));
     });
     test('copy of view with refinement should work', () => {
         expect((0, test_translator_1.markSource) `

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

@@ -219,7 +219,7 @@ describe('literals', () => {
             expect(m).toParse();
         });
         test('timezone with illegal query', () => {
-            expect(`run: a->{timezone: """${tz}%{ab->aturtle}"""; select: *}`).translationToFailWith('%{ query } illegal in this string');
+            expect(`run: a->{timezone: """${tz}%{ab->aturtle}"""; select: *}`).toLog((0, test_translator_1.errorMessage)('%{ query } illegal in this string'));
         });
         test('table single quote', () => {
             const m = new test_translator_1.TestTranslator("source: n is bigquery.table('n')");

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

@@ -210,19 +210,19 @@ describe('source locations', () => {
         expect(y.location).toMatchObject(source.locations[0]);
     });
     test('undefined query location', () => {
-        expect((0, test_translator_1.model) `run: ${'xyz'}`).translationToFailWith("Reference to undefined object 'xyz'");
+        expect((0, test_translator_1.model) `run: ${'xyz'}`).toLog((0, test_translator_1.errorMessage)("Reference to undefined object 'xyz'"));
     });
     test('undefined field reference', () => {
-        expect((0, test_translator_1.model) `run: a -> { group_by: ${'xyz'} }`).translationToFailWith("'xyz' is not defined");
+        expect((0, test_translator_1.model) `run: a -> { group_by: ${'xyz'} }`).toLog((0, test_translator_1.errorMessage)("'xyz' is not defined"));
     });
     test('bad query', () => {
-        expect((0, test_translator_1.model) `run: a -> { group_by: astr; ${'select: *'} }`).translationToFailWith(/Not legal in grouping query/);
+        expect((0, test_translator_1.model) `run: a -> { group_by: astr; ${'select: *'} }`).toLog((0, test_translator_1.errorMessage)(/Not legal in grouping query/));
     });
     test.skip('undefined field reference in top', () => {
-        expect((0, test_translator_1.model) `run: a -> { group_by: one is 1; top: 1 by ${'xyz'} }`).translationToFailWith("'xyz' is not defined");
+        expect((0, test_translator_1.model) `run: a -> { group_by: one is 1; top: 1 by ${'xyz'} }`).toLog((0, test_translator_1.errorMessage)("'xyz' is not defined"));
     });
     test.skip('undefined field reference in order_by', () => {
-        expect((0, test_translator_1.model) `run: a -> { group_by: one is 1; order_by: ${'xyz'} }`).translationToFailWith("'xyz' is not defined");
+        expect((0, test_translator_1.model) `run: a -> { group_by: one is 1; order_by: ${'xyz'} }`).toLog((0, test_translator_1.errorMessage)("'xyz' is not defined"));
     });
 });
 describe('source references', () => {

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

@@ -31,19 +31,19 @@ describe('parameters', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
       source: ab_new(param::number is ${'"hello"'}) is ab
-    `).translationToFailWith('Default value for parameter does not match declared type `number`');
+    `).toLog((0, test_translator_1.errorMessage)('Default value for parameter does not match declared type `number`'));
     });
     test('error if paramter has no type or value', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
       source: ab_new(param) is ab
-    `).translationToFailWith('Parameter must have default value or declared type');
+    `).toLog((0, test_translator_1.errorMessage)('Parameter must have default value or declared type'));
     });
     test('error if paramter type is null', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
       source: ab_new(param is null) is ab
-    `).translationToFailWith('Default value cannot have type `null` unless parameter type is also specified');
+    `).toLog((0, test_translator_1.errorMessage)('Default value cannot have type `null` unless parameter type is also specified'));
     });
     test('allowed to write null::string', () => {
         expect(`
@@ -70,13 +70,13 @@ describe('parameters', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
       source: ab_new(param is 10 to 20) is ab
-    `).translationToFailWith('A Range is not a value');
+    `).toLog((0, test_translator_1.errorMessage)('A Range is not a value'));
     });
     test('no additional error if default value type is error', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
       source: ab_new(param::number is 1 + ${'"foo"'}) is ab
-    `).translationToFailWith("The '+' operator requires a number, not a 'string'");
+    `).toLog((0, test_translator_1.errorMessage)("The '+' operator requires a number, not a 'string'"));
     });
     test('can declare parameter with inferred type', () => {
         expect(`
@@ -242,21 +242,21 @@ describe('parameters', () => {
         view: all_fields is { select: * }
       }
       run: ab_new(param is 1) -> all_fields -> { select: ${'param'} }
-    `).translationToFailWith("'param' is not defined");
+    `).toLog((0, test_translator_1.errorMessage)("'param' is not defined"));
     });
     test('cannot reference renamed param in query against source', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
       source: ab_new(param::number) is ab
       run: ab_new(param is 1) -> { select: p is ${'param'} }
-    `).translationToFailWith("'param' is not defined");
+    `).toLog((0, test_translator_1.errorMessage)("'param' is not defined"));
     });
     test('cannot reference param in query against source', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
       source: ab_new(param::number) is ab
       run: ab_new(param is 1) -> { select: ${'param'} }
-    `).translationToFailWith("'param' is not defined");
+    `).toLog((0, test_translator_1.errorMessage)("'param' is not defined"));
     });
     test('cannot reference param in source extension', () => {
         expect((0, test_translator_1.markSource) `
@@ -265,7 +265,7 @@ describe('parameters', () => {
       source: x is ab_new(param is 1) extend {
         dimension: param_copy is ${'param'}
       }
-    `).translationToFailWith("'param' is not defined");
+    `).toLog((0, test_translator_1.errorMessage)("'param' is not defined"));
     });
     test('cannot reference param in in-query source extension', () => {
         expect((0, test_translator_1.markSource) `
@@ -277,14 +277,14 @@ describe('parameters', () => {
         }
         group_by: param_copy
       }
-    `).translationToFailWith("'param' is not defined");
+    `).toLog((0, test_translator_1.errorMessage)("'param' is not defined"));
     });
     test('can reference field in source in argument', () => {
         expect((0, test_translator_1.markSource) `
       ##! experimental.parameters
       source: ab_new(param::number) is ab
       run: ab_new(param is ${'ai'}) -> { select: * }
-    `).translationToFailWith('`ai` is not defined');
+    `).toLog((0, test_translator_1.errorMessage)('`ai` is not defined'));
     });
     test('can pass through parameter to joined source (shorthand)', () => {
         expect(`
@@ -384,7 +384,7 @@ describe('parameters', () => {
       ##! experimental.parameters
       source: ab_new(param::number) is ab
       run: ab_new(param is 1) -> { select: ${'param'} }
-    `).translationToFailWith("'param' is not defined");
+    `).toLog((0, test_translator_1.errorMessage)("'param' is not defined"));
     });
     test('can reference param in view in source', () => {
         expect(`
@@ -407,13 +407,13 @@ describe('parameters', () => {
       ##! experimental.parameters
       source: ab_new(param::number) is ab
       run: ab_new(param is 1) -> { select: p is ${'param'} }
-    `).translationToFailWith("'param' is not defined");
+    `).toLog((0, test_translator_1.errorMessage)("'param' is not defined"));
     });
     test('error when declaring parameter twice', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new(param::number, ${'param::number'}) is ab
-      `).translationToFailWith('Cannot redefine parameter `param`');
+      `).toLog((0, test_translator_1.errorMessage)('Cannot redefine parameter `param`'));
     });
     // This behavior will likely change in the future; but in the meantime, this
     // safeguards against some confusion about parameter scoping
@@ -423,7 +423,7 @@ describe('parameters', () => {
         source: ab_new(ai::string) is ab extend {
           dimension: foo is upper(ai)
         }
-      `).translationToFailWith('No matching overload for function upper(number)', 'Illegal shadowing of field `ai` by parameter with the same name');
+      `).toLog((0, test_translator_1.errorMessage)('No matching overload for function upper(number)'), (0, test_translator_1.errorMessage)('Illegal shadowing of field `ai` by parameter with the same name'));
     });
     test('can shadow field that is excepted', () => {
         expect(`
@@ -438,7 +438,7 @@ describe('parameters', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new(${'ai::string'}) is ab
-      `).translationToFailWith('Illegal shadowing of field `ai` by parameter with the same name');
+      `).toLog((0, test_translator_1.errorMessage)('Illegal shadowing of field `ai` by parameter with the same name'));
     });
     test('do not inherit parameters from base source', () => {
         expect((0, test_translator_1.markSource) `
@@ -446,7 +446,7 @@ describe('parameters', () => {
         source: ab_new(param::number) is ab
         source: ab_new_new is ab_new(param is 1)
         run: ab_new_new(${'param'} is 2) -> { select: * }
-      `).translationToFailWith('`ab_new_new` has no declared parameter named `param`');
+      `).toLog((0, test_translator_1.errorMessage)('`ab_new_new` has no declared parameter named `param`'));
     });
     test('error when declaring field with same name as parameter', () => {
         expect((0, test_translator_1.markSource) `
@@ -454,12 +454,12 @@ describe('parameters', () => {
         source: ab_new(param::number) is ab extend {
           dimension: param is 1
         }
-      `).translationToFailWith("Cannot redefine 'param'");
+      `).toLog((0, test_translator_1.errorMessage)("Cannot redefine 'param'"));
     });
     test('error when declaring parameter without experiment enabled', () => {
         expect((0, test_translator_1.markSource) `
         source: ab_new(param::number) is ab
-      `).translationToFailWith("Experimental flag 'parameters' required to enable this feature");
+      `).toLog((0, test_translator_1.error)('experiment-not-enabled', { experimentId: 'parameters' }));
     });
     test('cannot except parameter from extended source', () => {
         expect((0, test_translator_1.markSource) `
@@ -468,7 +468,7 @@ describe('parameters', () => {
         source: ab_new_new(param_b::number) is ab_new(param_a is 1) extend {
           except: param_a
         }
-      `).translationToFailWith('`param_a` is not defined');
+      `).toLog((0, test_translator_1.errorMessage)('`param_a` is not defined'));
     });
     test('cannot except parameter in direct extend', () => {
         expect((0, test_translator_1.markSource) `
@@ -476,7 +476,7 @@ describe('parameters', () => {
         source: ab_new(param::number) is ab extend {
           except: param
         }
-      `).translationToFailWith('Illegal `except:` of parameter');
+      `).toLog((0, test_translator_1.errorMessage)('Illegal `except:` of parameter'));
     });
     test('cannot accept parameter', () => {
         expect((0, test_translator_1.markSource) `
@@ -484,19 +484,19 @@ describe('parameters', () => {
         source: ab_new(param::number) is ab extend {
           accept: param
         }
-      `).translationToFailWith('Illegal `accept:` of parameter');
+      `).toLog((0, test_translator_1.errorMessage)('Illegal `accept:` of parameter'));
     });
     test('error when using parameter without experiment enabled', () => {
         expect((0, test_translator_1.markSource) `
         run: ab_new${'(param is param)'} -> { select: * }
-      `).translationToFailWith("Experimental flag 'parameters' required to enable this feature");
+      `).toLog((0, test_translator_1.error)('experiment-not-enabled', { experimentId: 'parameters' }));
     });
     test('parameters cannot reference themselves', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new(param::number) is ab
         run: ab_new(param is ${'param'}) -> { select: * }
-      `).translationToFailWith('`param` is not defined');
+      `).toLog((0, test_translator_1.errorMessage)('`param` is not defined'));
     });
     // This just looks like circular referencing--in reality, you cannot reference other
     // parameters in parameter arguments, hence just "xxx is not defined"
@@ -505,42 +505,42 @@ describe('parameters', () => {
         ##! experimental.parameters
         source: ab_new(p_a::number, p_b::number) is ab
         run: ab_new(p_a is ${'p_b'}, p_b is ${'p_a'}) -> { select: * }
-      `).translationToFailWith('`p_b` is not defined', '`p_a` is not defined');
+      `).toLog((0, test_translator_1.errorMessage)('`p_b` is not defined'), (0, test_translator_1.errorMessage)('`p_a` is not defined'));
     });
     test('error when passing param with no name', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new(param::number) is ab
         run: ab_new(${'1'}) -> { select: * }
-      `).translationToFailWith('Parameterized source arguments must be named with `parameter_name is`', 'Argument not provided for required parameter `param`');
+      `).toLog((0, test_translator_1.errorMessage)('Parameterized source arguments must be named with `parameter_name is`'), (0, test_translator_1.errorMessage)('Argument not provided for required parameter `param`'));
     });
     test('error when passing param with incorrect name', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new(param::number) is ab
         run: ab_new(${'wrong_name'} is 1, param is 2) -> { select: * }
-      `).translationToFailWith('`ab_new` has no declared parameter named `wrong_name`');
+      `).toLog((0, test_translator_1.errorMessage)('`ab_new` has no declared parameter named `wrong_name`'));
     });
     test('error when passing param multiple times', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new(param::number) is ab
         run: ab_new(param is 1, ${'param is 2'}) -> { select: * }
-      `).translationToFailWith('Cannot pass argument for `param` more than once');
+      `).toLog((0, test_translator_1.errorMessage)('Cannot pass argument for `param` more than once'));
     });
     test('error when not specifying argument for param with parentheses', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new(param::number) is ab
         run: ${'ab_new'}() -> { select: * }
-      `).translationToFailWith('Argument not provided for required parameter `param`');
+      `).toLog((0, test_translator_1.errorMessage)('Argument not provided for required parameter `param`'));
     });
     test('error when not specifying argument for param without parentheses', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new(param::number) is ab
         run: ${'ab_new'} -> { select: * }
-      `).translationToFailWith('Argument not provided for required parameter `param`');
+      `).toLog((0, test_translator_1.errorMessage)('Argument not provided for required parameter `param`'));
     });
     test('error when not specifying argument for param second time', () => {
         expect((0, test_translator_1.markSource) `
@@ -548,7 +548,7 @@ describe('parameters', () => {
         source: ab_new(param::number) is ab
         run: ab_new(param is 1) -> { select: * }
         run: ${'ab_new'} -> { select: * }
-      `).translationToFailWith('Argument not provided for required parameter `param`');
+      `).toLog((0, test_translator_1.errorMessage)('Argument not provided for required parameter `param`'));
     });
     test('error when referencing parameter that does not exist in join definition', () => {
         expect((0, test_translator_1.markSource) `
@@ -557,13 +557,13 @@ describe('parameters', () => {
         source: ab_new_2(param_2::number) is ab extend {
           join_one: ab_join is ab_new_1(param_1 is ${'param_3'})
         }
-      `).translationToFailWith('`param_3` is not defined');
+      `).toLog((0, test_translator_1.errorMessage)('`param_3` is not defined'));
     });
     test('error when referencing identifier in default param value', () => {
         expect((0, test_translator_1.markSource) `
         ##! experimental.parameters
         source: ab_new_1(param_1 is ${'ident'}) is ab
-      `).translationToFailWith('Only constants allowed in parameter default values');
+      `).toLog((0, test_translator_1.errorMessage)('Only constants allowed in parameter default values'));
     });
     test.skip('can use param in multi-stage query', () => {
         expect(`
@@ -582,7 +582,7 @@ describe('parameters', () => {
       ##! experimental.parameters
       source: ab_new(param::number) is ab
       source: ab_new_new(param::number) is ab_new(${'param'}) -> { select: * }
-    `).translationToFailWith('`param` is not defined');
+    `).toLog((0, test_translator_1.errorMessage)('`param` is not defined'));
     });
     test.skip('can add an annotation to a param', () => {
         expect(`

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

@@ -1,11 +1,16 @@
 import { DocumentLocation } from '../../model';
 import { LogSeverity } from '../parse-log';
-type SimpleProblemSpec = string | RegExp;
-type ComplexProblemSpec = {
+type MessageProblemSpec = {
     severity: LogSeverity;
-    message: SimpleProblemSpec;
+    message: string | RegExp;
+    data?: any;
 };
-type ProblemSpec = SimpleProblemSpec | ComplexProblemSpec;
+type CodeProblemSpec = {
+    severity: LogSeverity;
+    code: string;
+    data?: any;
+};
+type ProblemSpec = CodeProblemSpec | MessageProblemSpec;
 declare global {
     namespace jest {
         interface Matchers<R> {
@@ -26,31 +31,8 @@ declare global {
              * X can be a MarkedSource, a string, or a model.
              */
             toTranslate(): R;
-            /**
-             * expect(X).toTranslateWithWarnings(expectedWarnings)
-             *
-             * Passes if the source compiles to code which could be used to
-             * generate SQL, and the specified warnings appear. If X is a marked
-             * source, the warnings which are found must match the locations of
-             * the markings.
-             *
-             * 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.
-             */
-            toTranslateWithWarnings(...expectedWarnings: SimpleProblemSpec[]): R;
             toReturnType(tp: string): 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: ProblemSpec[]): R;
+            toLog(...expectedErrors: ProblemSpec[]): R;
             isLocationIn(at: DocumentLocation, txt: string): R;
             /**
              * expect(X).compilesTo('expression-string')

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

@@ -102,19 +102,6 @@ function highlightError(dl, txt) {
     }
     return output.join('\n');
 }
-function normalizeProblemSpec(defaultSeverity) {
-    return function (spec) {
-        if (typeof spec === 'string') {
-            return { severity: defaultSeverity, message: spec };
-        }
-        else if (spec instanceof RegExp) {
-            return { severity: defaultSeverity, message: spec };
-        }
-        else {
-            return spec;
-        }
-    };
-}
 function isMarkedSource(ts) {
     return typeof ts !== 'string' && !(ts instanceof test_translator_1.TestTranslator);
 }
@@ -207,11 +194,9 @@ expect.extend({
         const msg = `Expression type ${d.dataType} ${pass ? '=' : '!='} $[returnType`;
         return { pass, message: () => msg };
     },
-    translationToFailWith: function (s, ...msgs) {
-        return checkForProblems(this, false, s, 'error', ...msgs);
-    },
-    toTranslateWithWarnings: function (s, ...msgs) {
-        return checkForProblems(this, true, s, 'warn', ...msgs);
+    toLog: function (s, ...msgs) {
+        const expectCompiles = !msgs.some(m => m.severity === 'error');
+        return checkForProblems(this, expectCompiles, s, ...msgs);
     },
     isLocationIn: function (checkAt, at, text) {
         if (this.equals(at, checkAt)) {
@@ -263,13 +248,14 @@ expect.extend({
         return { pass, message: () => `${msg}` };
     },
 });
-function checkForProblems(context, expectCompiles, s, defaultSeverity, ...msgs) {
+function problemSpecSummary(s) {
+    return `${s.severity} '${'message' in s ? s.message : s.code}' ${s.data !== undefined ? (0, test_translator_1.pretty)(s.data) : ''}`;
+}
+function checkForProblems(context, expectCompiles, s, ...msgs) {
     var _a;
     let emsg = `Expected ${expectCompiles ? 'to' : 'to not'} compile with: `;
     const mSrc = isMarkedSource(s) ? s : undefined;
-    const normalize = normalizeProblemSpec(defaultSeverity);
-    const normMsgs = msgs.map(normalize);
-    const qmsgs = normMsgs.map(s => `${s.severity} '${s.message}'`);
+    const qmsgs = msgs.map(problemSpecSummary);
     if (msgs.length === 1) {
         emsg += ` ${qmsgs[0]}`;
     }
@@ -297,25 +283,44 @@ function checkForProblems(context, expectCompiles, s, defaultSeverity, ...msgs)
         const explain = [];
         const errList = m.problemResponse().problems;
         let i;
-        for (i = 0; i < normMsgs.length && errList[i]; i += 1) {
-            const msg = normMsgs[i];
+        for (i = 0; i < msgs.length && errList[i]; i += 1) {
+            const msg = msgs[i];
             const err = errList[i];
-            const matched = typeof msg.message === 'string'
-                ? msg.message === err.message
-                : err.message.match(msg.message);
+            let matched = true;
+            if ('message' in msg) {
+                if (typeof msg.message === 'string') {
+                    if (msg.message !== err.message) {
+                        explain.push(`Expected: ${msg.message}\nGot: ${err.message}`);
+                        matched = false;
+                    }
+                }
+                else {
+                    if (!err.message.match(msg.message)) {
+                        explain.push(`Expected: ${msg.message}\nGot: ${err.message}`);
+                        matched = false;
+                    }
+                }
+            }
+            else {
+                if (msg.code !== err.code) {
+                    matched = false;
+                    explain.push(`Expected: ${msg.code}\nGot: ${err.code}`);
+                }
+            }
             if (err.severity !== msg.severity) {
                 explain.push(`Expected ${msg.severity}, got ${err.severity} ${err.message}`);
             }
-            if (!matched) {
-                explain.push(`Expected: ${msg.message}\nGot: ${err.message}`);
-            }
-            else {
+            if (matched) {
                 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 (!context.equals(have, want)) {
-                        explain.push(`Expected '${msg.message}' at location: ${rangeToStr(want)}\n` +
-                            `Actual location: ${rangeToStr(have)}`);
+                        explain.push(`Expected ${err.code} (${err.message}) at location: ${rangeToStr(want)}\n` + `Actual location: ${rangeToStr(have)}`);
+                    }
+                }
+                if (msg.data !== undefined) {
+                    if (JSON.stringify(msg.data) !== JSON.stringify(err.data)) {
+                        explain.push(`Expected log data ${(0, test_translator_1.pretty)(msg.data)}\nGot ${(0, test_translator_1.pretty)(err.data)}`);
                     }
                 }
             }