@malloydata/malloy 0.0.88-dev231002231014 → 0.0.88-dev231003001139

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

@@ -140,11 +140,11 @@ describe('expressions', () => {
         });
     });
     test('filtered measure', () => {
-        expect((0, test_translator_1.expr) `acount {? astr = 'why?' }`).toTranslate();
+        expect((0, test_translator_1.expr) `acount {where: astr = 'why?' }`).toTranslate();
     });
     test('filtered ungrouped aggregate', () => {
         expect(`
-        query: a -> {
+        run: a -> {
           group_by: ai
           aggregate: x is all(avg(ai)) { where: true }
         }
@@ -165,7 +165,7 @@ describe('expressions', () => {
     });
     test('correctly flags filtered analytic', () => {
         expect((0, test_translator_1.markSource) `
-        query: a -> {
+        run: a -> {
           group_by: ai
           calculate: l is lag(ai) { where: true }
         }
@@ -478,14 +478,14 @@ describe('expressions', () => {
         });
         test('n-ary without else', () => {
             expect(`
-        source: na is a + { dimension: d is
+        source: na is a extend { dimension: d is
           pick 7 when true and true
         }
       `).translationToFailWith("pick incomplete, missing 'else'");
         });
         test('n-ary with mismatch when clauses', () => {
             expect((0, test_translator_1.markSource) `
-        source: na is a + { dimension: d is
+        source: na is a extend { dimension: d is
           pick 7 when true and true
           pick '7' when true or true
           else 7
@@ -494,7 +494,7 @@ describe('expressions', () => {
         });
         test('n-ary with mismatched else clause', () => {
             expect((0, test_translator_1.markSource) `
-        source: na is a + { dimension: d is
+        source: na is a extend { dimension: d is
           pick 7 when true and true
           else '7'
         }
@@ -502,21 +502,21 @@ describe('expressions', () => {
         });
         test('applied else mismatch', () => {
             expect((0, test_translator_1.markSource) `
-        source: na is a + { dimension: d is
+        source: na is a extend { dimension: d is
           7 ? pick 7 when 7 else 'not seven'
         }
       `).translationToFailWith("else type 'string', expected 'number'");
         });
         test('applied default mismatch', () => {
             expect((0, test_translator_1.markSource) `
-        source: na is a + { dimension: d is
+        source: na is a extend { dimension: d is
           7 ? pick 'seven' when 7
         }
       `).translationToFailWith("pick default type 'number', expected 'string'");
         });
         test('applied when mismatch', () => {
             expect((0, test_translator_1.markSource) `
-        source: na is a + { dimension: d is
+        source: na is a extend { dimension: d is
           7 ? pick 'seven' when 7 pick 6 when 6
         }
       `).translationToFailWith("pick type 'number', expected 'string'");
@@ -586,33 +586,33 @@ describe('expressions', () => {
 });
 describe('unspported fields in schema', () => {
     test('unsupported reference in result allowed', () => {
-        const uModel = new test_translator_1.TestTranslator('query: a->{ group_by: aun }');
+        const uModel = new test_translator_1.TestTranslator('run: a->{ group_by: aun }');
         expect(uModel).toTranslate();
     });
     test('unsupported reference can be compared to NULL', () => {
-        const uModel = new test_translator_1.TestTranslator('query: a->{ where: aun != NULL; project: * }');
+        const uModel = new test_translator_1.TestTranslator('run: a->{ where: aun != NULL; select: * }');
         expect(uModel).toTranslate();
     });
     test('flag unsupported equality', () => {
         // because we don't know if the two unsupported types are comparable
-        const uModel = new test_translator_1.TestTranslator('query: ab->{ where: aun = b.aun  project: * }');
+        const uModel = new test_translator_1.TestTranslator('run: ab->{ where: aun = b.aun  select: * }');
         expect(uModel).translationToFailWith('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 test_translator_1.TestTranslator('query: ab->{ where: aun > b.aun  project: * }');
+        const uModel = new test_translator_1.TestTranslator('run: ab->{ where: aun > b.aun  select: * }');
         expect(uModel).translationToFailWith('Unsupported type not allowed in expression');
     });
     test('allow unsupported equality when raw types match', () => {
-        const uModel = new test_translator_1.TestTranslator('query: ab->{ where: aweird = b.aweird  project: * }');
+        const uModel = new test_translator_1.TestTranslator('run: ab->{ where: aweird = b.aweird  select: * }');
         expect(uModel).toTranslate();
     });
     test('flag not applied to unsupported', () => {
-        const uModel = new test_translator_1.TestTranslator('source: x is a { dimension: notUn is not aun }');
+        const uModel = new test_translator_1.TestTranslator('source: x is a extend { dimension: notUn is not aun }');
         expect(uModel).translationToFailWith("'not' Can't use type unsupported");
     });
     test('allow unsupported to be cast', () => {
-        const uModel = new test_translator_1.TestTranslator('source: x is a { dimension: notUn is aun::string }');
+        const uModel = new test_translator_1.TestTranslator('source: x is a extend { dimension: notUn is aun::string }');
         expect(uModel).toTranslate();
     });
     describe('cast', () => {

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

@@ -60,7 +60,7 @@ describe('import:', () => {
         expect(xr).toEqual({ urls: ['internal://test/langtests/child'] });
         docParse.update({
             urls: {
-                'internal://test/langtests/child': 'query: aq is a->{ project: * }',
+                'internal://test/langtests/child': 'query: aq is a->{ select: * }',
             },
         });
         expect(docParse).toTranslate();
@@ -70,7 +70,7 @@ describe('import:', () => {
     test('query based source with named structref', () => {
         const docParse = new test_translator_1.TestTranslator(`
 import "child"
-source: newSrc is a {
+source: newSrc is a extend {
   join_one: b is botProjQSrc on b.astr = astr
 }
 `);
@@ -81,8 +81,8 @@ source: newSrc is a {
             urls: {
                 'internal://test/langtests/child': `
 source: bottomSrc is a
-query: botProjQ is bottomSrc -> { project: * }
-source: botProjQSrc is from(->botProjQ)
+query: botProjQ is bottomSrc -> { select: * }
+source: botProjQSrc is botProjQ
 `,
             },
         });
@@ -128,7 +128,7 @@ source: botProjQSrc is from(->botProjQ)
         expect(xr).toEqual({ urls: ['internal://test/parent.malloy'] });
         docParse.update({
             urls: {
-                'internal://test/parent.malloy': "source: aa is table('aTable')",
+                'internal://test/parent.malloy': "source: aa is _db_.table('aTable')",
             },
         });
         expect(docParse).toTranslate();
@@ -141,7 +141,7 @@ source: botProjQSrc is from(->botProjQ)
         docParse.update({
             urls: {
                 'internal://test/parent.malloy': `
-          source: aa is table('aTable') {
+          source: aa is _db_.table('aTable') extend {
             dimension: astr is 'not legal beause astr exists'
           }`,
             },
@@ -152,9 +152,11 @@ source: botProjQSrc is from(->botProjQ)
         const srcFiles = {
             'internal://test/langtests/middle': `
         import "bottom"
-        source: midSrc is from(bottomSrc -> { group_by: astr })
+        // in m4 source: NAME is SRC -> { QUERY } wasn't parsing
+        query: q is bottomSrc -> { group_by: astr }
+        source: midSrc is q
       `,
-            'internal://test/langtests/bottom': "source: bottomSrc is table('aTable')",
+            'internal://test/langtests/bottom': "source: bottomSrc is _db_.table('aTable')",
         };
         const fullModel = new test_translator_1.TestTranslator(`
       import "middle"

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

@@ -207,19 +207,19 @@ describe('literals', () => {
             expect(v).toMatchObject({ literal: 'right\n  mid\nleft' });
         });
         test('timezone single quote', () => {
-            const m = new test_translator_1.TestTranslator(`run: a-> {timezone: '${tz}'; project: *}`);
+            const m = new test_translator_1.TestTranslator(`run: a-> {timezone: '${tz}'; select: *}`);
             expect(m).toParse();
         });
         test('timezone double quote', () => {
-            const m = new test_translator_1.TestTranslator(`run: a-> {timezone: "${tz}"; project: *}`);
+            const m = new test_translator_1.TestTranslator(`run: a-> {timezone: "${tz}"; select: *}`);
             expect(m).toParse();
         });
         test('timezone triple quote', () => {
-            const m = new test_translator_1.TestTranslator(`run: a->{timezone: """${tz}"""; project: *}`);
+            const m = new test_translator_1.TestTranslator(`run: a->{timezone: """${tz}"""; select: *}`);
             expect(m).toParse();
         });
         test('timezone with illegal query', () => {
-            expect(`run: a->{timezone: """${tz}%{ab->aturtle}"""; project: *}`).translationToFailWith('%{ query } illegal in this string');
+            expect(`run: a->{timezone: """${tz}%{ab->aturtle}"""; select: *}`).translationToFailWith('%{ query } illegal in this string');
         });
         test('table single quote', () => {
             const m = new test_translator_1.TestTranslator("source: n is bigquery.table('n')");