@malloydata/malloy 0.0.88-dev231002231014 → 0.0.88-dev231003001139

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

@@ -32,13 +32,13 @@ describe('source locations', () => {
         expect((0, test_translator_1.getExplore)(m.modelDef, 'na').location).toMatchObject(source.locations[0]);
     });
     test('refined source location', () => {
-        const source = (0, test_translator_1.markSource) `source: ${'na is a {}'}`;
+        const source = (0, test_translator_1.markSource) `source: ${'na is a extend {}'}`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toParse();
         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) `source: na is a { dimension: ${'x is 1'} }`;
+        const source = (0, test_translator_1.markSource) `source: na is a extend { dimension: ${'x is 1'} }`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
@@ -46,25 +46,25 @@ describe('source locations', () => {
         expect(x.location).toMatchObject(source.locations[0]);
     });
     test('location of defined measure', () => {
-        const source = (0, test_translator_1.markSource) `source: na is a { measure: ${'x is count()'} }`;
+        const source = (0, test_translator_1.markSource) `source: na is a extend { measure: ${'x is count()'} }`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getFieldDef)(na, 'x');
         expect(x.location).toMatchObject(source.locations[0]);
     });
-    test('location of defined query', () => {
-        const source = (0, test_translator_1.markSource) `source: na is a { query: ${'x is { group_by: y is 1 }'} }`;
+    test('location of defined view', () => {
+        const source = (0, test_translator_1.markSource) `source: na is a extend { view: ${'x is { group_by: y is 1 }'} }`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getFieldDef)(na, 'x');
         expect(x.location).toMatchObject(source.locations[0]);
     });
-    test('location of defined field inside a query', () => {
+    test('location of defined field inside a view', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
-        query: x is {
+      source: na is a extend {
+        view: x is {
           group_by: ${'y is 1'}
         }
       }`;
@@ -75,11 +75,11 @@ describe('source locations', () => {
         const y = (0, test_translator_1.getFieldDef)(x.pipeline[0], 'y');
         expect(y.location).toMatchObject(source.locations[0]);
     });
-    test('location of filtered field inside a query', () => {
+    test('location of filtered field inside a view', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
+      source: na is a extend {
         measure: y is count()
-        query: x is {
+        view: x is {
           aggregate: ${'z is y { where: true }'}
         }
       }`;
@@ -91,15 +91,15 @@ describe('source locations', () => {
         expect(z.location).toMatchObject(source.locations[0]);
     });
     test('location of field inherited from table', () => {
-        const source = (0, test_translator_1.markSource) `source: na is ${"table('aTable')"}`;
+        const source = (0, test_translator_1.markSource) `source: na is ${"_db_.table('aTable')"}`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const abool = (0, test_translator_1.getFieldDef)(na, 'abool');
         expect(abool.location).toMatchObject(source.locations[0]);
     });
-    test('location of field inherited from sql block', () => {
-        const source = (0, test_translator_1.markSource) `--- comment
+    test('pre m4 location of field inherited from sql block', () => {
+        const source = (0, test_translator_1.markSource) `##! -m4warnings
       sql: s is { select: ${'"""SELECT 1 as one """'} }
       source: na is from_sql(s)
     `;
@@ -117,10 +117,11 @@ describe('source locations', () => {
             expect(one.location).isLocationIn(source.locations[0], source.code);
         }
     });
-    test('location of fields inherited from a query', () => {
+    test('pre m4 location of fields inherited from a query', () => {
         const source = (0, test_translator_1.markSource) `
+      ##! -m4warnings
       source: na is from(
-        ${"table('aTable')"} -> {
+        ${"_db_.table('aTable')"} -> {
           group_by:
             abool
             ${'y is 1'}
@@ -136,7 +137,7 @@ describe('source locations', () => {
         expect(y.location).toMatchObject(source.locations[1]);
     });
     test('location of named query', () => {
-        const source = (0, test_translator_1.markSource) `query: ${'q is a -> { project: * }'}`;
+        const source = (0, test_translator_1.markSource) `query: ${'q is a -> { select: * }'}`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const q = (0, test_translator_1.getExplore)(m.modelDef, 'q');
@@ -150,8 +151,8 @@ describe('source locations', () => {
         const a = (0, test_translator_1.getFieldDef)(q.pipeline[0], 'b');
         expect(a.location).toMatchObject(source.locations[0]);
     });
-    test('location of named SQL block', () => {
-        const source = (0, test_translator_1.markSource) `${'sql: s is { select: """SELECT 1 as one""" }'}`;
+    test('pre m4 location of named SQL block', () => {
+        const source = (0, test_translator_1.markSource) `##! -m4warnings\n${'sql: s is { select: """SELECT 1 as one""" }'}`;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toParse();
         const compileSql = m.translate().compileSQL;
@@ -167,7 +168,7 @@ describe('source locations', () => {
     });
     test('location of renamed field', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
+      source: na is a extend {
         rename: ${'bbool is abool'}
       }
     `;
@@ -179,8 +180,8 @@ describe('source locations', () => {
     });
     test('location of join on', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
-        join_one: ${'x is a { primary_key: abool } on abool'}
+      source: na is a extend {
+        join_one: ${'x is a extend { primary_key: abool } on abool'}
       }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
@@ -191,8 +192,8 @@ describe('source locations', () => {
     });
     test('location of join with', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
-        join_one: ${'x is a { primary_key: astr } with astr'}
+      source: na is a extend {
+        join_one: ${'x is a extend { primary_key: astr } with astr'}
       }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
@@ -203,8 +204,8 @@ describe('source locations', () => {
     });
     test('location of field in join', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
-        join_one: x is a {
+      source: na is a extend {
+        join_one: x is a extend {
           primary_key: abool
           dimension: ${'y is 1'}
         } on abool
@@ -226,26 +227,26 @@ describe('source locations', () => {
     //   expect(errList[0].at?.range.end).toEqual({ line: 2, character: 11 });
     // });
     test('undefined query location', () => {
-        expect((0, test_translator_1.model) `query: ${'-> xyz'}`).translationToFailWith("Reference to undefined query 'xyz'");
+        expect((0, test_translator_1.model) `run: ${'xyz'}`).translationToFailWith("Reference to undefined object 'xyz'");
     });
     test('undefined field reference', () => {
-        expect((0, test_translator_1.model) `query: a -> { group_by: ${'xyz'} }`).translationToFailWith("'xyz' is not defined");
+        expect((0, test_translator_1.model) `run: a -> { group_by: ${'xyz'} }`).translationToFailWith("'xyz' is not defined");
     });
     test('bad query', () => {
-        expect((0, test_translator_1.model) `query: a -> { group_by: astr; ${'project: *'} }`).translationToFailWith(/Not legal in grouping query/);
+        expect((0, test_translator_1.model) `run: a -> { group_by: astr; ${'select: *'} }`).translationToFailWith(/Not legal in grouping query/);
     });
     test.skip('undefined field reference in top', () => {
-        expect((0, test_translator_1.model) `query: 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'} }`).translationToFailWith("'xyz' is not defined");
     });
     test.skip('undefined field reference in order_by', () => {
-        expect((0, test_translator_1.model) `query: 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'} }`).translationToFailWith("'xyz' is not defined");
     });
 });
 describe('source references', () => {
     test('reference to explore', () => {
         const source = (0, test_translator_1.markSource) `
       source: ${'na is a'}
-      query: ${'na'} -> { project: * }
+      run: ${'na'} -> { select: * }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -260,10 +261,10 @@ describe('source references', () => {
     });
     test('reference to query in query', () => {
         const source = (0, test_translator_1.markSource) `
-      source: t is a {
-        query: ${'q is { project: * }'}
+      source: t is a extend {
+        view: ${'q is { select: * }'}
       }
-      query: t -> ${'q'}
+      run: t -> ${'q'}
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -278,8 +279,8 @@ describe('source references', () => {
     });
     test('reference to query in query (version 2)', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a { query: ${'x is { group_by: y is 1 }'} }
-      query: na -> ${'x'}
+      source: na is a extend { view: ${'x is { group_by: y is 1 }'} }
+      run: na -> ${'x'}
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -292,8 +293,9 @@ describe('source references', () => {
             },
         });
     });
-    test('reference to sql block', () => {
+    test('pre m4 reference to sql block', () => {
         const source = (0, test_translator_1.markSource) `
+      ##! -m4warnings
       ${'sql: s is {select:"""SELECT 1 as one"""}'}
       source: na is from_sql(${'s'})
     `;
@@ -318,14 +320,15 @@ describe('source references', () => {
             });
         }
     });
-    test('reference to query in from', () => {
-        const source = (0, test_translator_1.markSource) `
-      query: ${'q is a -> { project: * }'}
+    test('pre m4 reference to query in from', () => {
+        const source = (0, test_translator_1.model) `
+      ##! -m4warnings
+      query: ${'q is a -> { select: * }'}
       source: na is from(-> ${'q'})
     `;
-        const m = new test_translator_1.TestTranslator(source.code);
-        expect(m).toTranslate();
-        expect(m.referenceAt(pos(source.locations[1]))).toMatchObject({
+        expect(source).toTranslate();
+        const mt = source.translator;
+        expect(mt.referenceAt(pos(source.locations[1]))).toMatchObject({
             location: source.locations[1],
             type: 'queryReference',
             text: 'q',
@@ -336,8 +339,8 @@ describe('source references', () => {
     });
     test('reference to query in query head', () => {
         const source = (0, test_translator_1.markSource) `
-      query: ${'q is a -> { project: * }'}
-      query: q2 is -> ${'q'} -> { project: * }
+      query: ${'q is a -> { select: * }'}
+      query: q2 is ${'q'} -> { select: * }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -352,8 +355,8 @@ describe('source references', () => {
     });
     test('reference to query in refined query', () => {
         const source = (0, test_translator_1.markSource) `
-      query: ${'q is a -> { project: * }'}
-      query: q2 is -> ${'q'} { limit: 10 }
+      query: ${'q is a -> { select: * }'}
+      query: q2 is ${'q'} + { limit: 10 }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -368,8 +371,8 @@ describe('source references', () => {
     });
     test('reference to field in expression', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is ${"table('aTable')"}
-      query: na -> { project: bbool is not ${'abool'} }
+      source: na is ${"_db_.table('aTable')"}
+      run: na -> { select: bbool is not ${'abool'} }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -384,10 +387,10 @@ describe('source references', () => {
     });
     test('reference to quoted field in expression', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
+      source: na is a extend {
         dimension: ${"`name` is 'name'"}
       }
-      query: na -> { project: ${'`name`'} }
+      run: na -> { select: ${'`name`'} }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -402,11 +405,11 @@ describe('source references', () => {
     });
     test('reference to joined field in expression', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
-        join_one: self is ${"table('aTable')"}
+      source: na is a extend {
+        join_one: self is ${"_db_.table('aTable')"}
           on astr = self.astr
       }
-      query: na -> { project: bstr is self.${'astr'} }
+      run: na -> { select: bstr is self.${'astr'} }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -421,10 +424,10 @@ describe('source references', () => {
     });
     test('reference to joined join in expression', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
+      source: na is a extend {
         join_one: ${'self is a on astr = self.astr'}
       }
-      query: na -> { project: bstr is ${'self'}.astr }
+      run: na -> { select: bstr is ${'self'}.astr }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -439,7 +442,7 @@ describe('source references', () => {
     });
     test('reference to field not in expression (group by)', () => {
         const source = (0, test_translator_1.markSource) `
-      query: ${"table('aTable')"} -> { group_by: ${'abool'} }
+      run: ${"_db_.table('aTable')"} -> { group_by: ${'abool'} }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -454,8 +457,8 @@ describe('source references', () => {
     });
     test('reference to field not in expression (project)', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is ${"table('aTable')"}
-      query: na -> { project: ${'abool'} }
+      source: na is ${"_db_.table('aTable')"}
+      run: na -> { select: ${'abool'} }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -470,7 +473,7 @@ describe('source references', () => {
     });
     test.skip('reference to field in order by', () => {
         const source = (0, test_translator_1.markSource) `
-      query: ${"table('aTable')"} -> {
+      run: ${"_db_.table('aTable')"} -> {
         group_by: abool
         order_by: ${'abool'}
       }
@@ -488,7 +491,7 @@ describe('source references', () => {
     });
     test.skip('reference to field in order by (output space)', () => {
         const source = (0, test_translator_1.markSource) `
-      query: a -> {
+      run: a -> {
         group_by: ${'one is 1'}
         order_by: ${'one'}
       }
@@ -506,7 +509,7 @@ describe('source references', () => {
     });
     test('reference to field in aggregate', () => {
         const source = (0, test_translator_1.markSource) `
-      query: a { measure: ${'c is count()'} } -> {
+      run: a extend { measure: ${'c is count()'} } -> {
         group_by: abool
         aggregate: ${'c'}
       }
@@ -524,7 +527,7 @@ describe('source references', () => {
     });
     test('reference to field in measure', () => {
         const source = (0, test_translator_1.markSource) `
-      source: e is a {
+      source: e is a extend {
         measure: ${'c is count()'}
         measure: c2 is ${'c'}
       }
@@ -542,7 +545,7 @@ describe('source references', () => {
     });
     test.skip('reference to field in top', () => {
         const source = (0, test_translator_1.markSource) `
-      query: ${"table('aTable')"} -> {
+      run: ${"_db_.table('aTable')"} -> {
         group_by: abool
         top: 10 by ${'abool'}
       }
@@ -560,7 +563,7 @@ describe('source references', () => {
     });
     test.skip('reference to field in top (output space)', () => {
         const source = (0, test_translator_1.markSource) `
-      query: a -> {
+      run: a -> {
         group_by: ${'one is 1'}
         top: 10 by ${'one'}
       }
@@ -578,7 +581,7 @@ describe('source references', () => {
     });
     test('reference to field in filter', () => {
         const source = (0, test_translator_1.markSource) `
-      query: ${"table('aTable')"} -> {
+      run: ${"_db_.table('aTable')"} -> {
         group_by: abool
         where: ${'abool'}
       }
@@ -596,8 +599,8 @@ describe('source references', () => {
     });
     test('reference to field in aggregate source', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is ${"table('aTable')"}
-      query: na -> { aggregate: ai_sum is ${'ai'}.sum() }
+      source: na is ${"_db_.table('aTable')"}
+      run: na -> { aggregate: ai_sum is ${'ai'}.sum() }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -615,10 +618,10 @@ describe('source references', () => {
     }
     test('reference to join in aggregate source', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
+      source: na is a extend {
         join_one: ${'self is a on astr = self.astr'}
       }
-      query: na -> { aggregate: ai_sum is ${'self'}.sum(self.ai) }
+      run: na -> { aggregate: ai_sum is ${'self'}.sum(self.ai) }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -633,10 +636,10 @@ describe('source references', () => {
     });
     test('reference to join in aggregate in expr', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is a {
+      source: na is a extend {
         join_one: ${'self is a on astr = self.astr'}
       }
-      query: na -> { aggregate: ai_sum is self.sum(${'self'}.ai) }
+      run: na -> { aggregate: ai_sum is self.sum(${'self'}.ai) }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -652,7 +655,7 @@ describe('source references', () => {
     test('reference to sourcein join', () => {
         const source = (0, test_translator_1.markSource) `
       source: ${'exp1 is a'}
-      source: exp2 is a {
+      source: exp2 is a extend {
         join_one: ${'exp1'} on astr = exp1.astr
       }
     `;
@@ -669,8 +672,8 @@ describe('source references', () => {
     });
     test('reference to field in aggregate (in expr)', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is ${"table('aTable')"}
-      query: na -> { aggregate: ai_sum is sum(${'ai'}) }
+      source: na is ${"_db_.table('aTable')"}
+      run: na -> { aggregate: ai_sum is sum(${'ai'}) }
     `;
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
@@ -685,7 +688,7 @@ describe('source references', () => {
     });
     test('reference to field in rename', () => {
         const source = (0, test_translator_1.markSource) `
-      source: na is ${"table('aTable')"} {
+      source: na is ${"_db_.table('aTable')"} extend {
         rename: bbool is ${'abool'}
       }
     `;
@@ -702,9 +705,8 @@ describe('source references', () => {
     });
     test('reference to field in join with', () => {
         const source = (0, test_translator_1.markSource) `
-      source: exp1 is a { primary_key: astr }
-      source: exp2 is ${"table('aTable')"} {
-        join_one: exp1 with ${'astr'}
+      source: exp2 is ${"_db_.table('aTable')"} extend {
+        join_one: exp1 is a with ${'astr'}
       }
     `;
         const m = new test_translator_1.TestTranslator(source.code);

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

@@ -250,7 +250,11 @@ function checkForProblems(context, expectCompiles, s, defaultSeverity, ...msgs)
         }
         return {
             pass: false,
-            message: () => `Compiler errors did not match expected errors\n${explain.join('\n')}`,
+            message: () => `Compiler errors did not match expected errors\n${explain.join('\n')}
+        -------- FROM SOURCE --------
+        ${src}
+        -----------------------------
+        `,
         };
     }
 }