@malloydata/malloy 0.0.43-dev230622180905 → 0.0.43-dev230622192152

package/dist/lang/parse-tree-walkers/document-symbol-walker.js

@@ -45,6 +45,22 @@ class DocumentSymbolWalker {
             children: [],
         });
     }
+    enterRunStatementDef(pcx) {
+        this.symbols.push({
+            range: this.translator.rangeFromContext(pcx.topLevelAnonQueryDef()),
+            name: 'unnamed_query',
+            type: 'unnamed_query',
+            children: [],
+        });
+    }
+    enterRunStatementRef(pcx) {
+        this.symbols.push({
+            range: this.translator.rangeFromContext(pcx.queryName()),
+            name: pcx.queryName().id().text,
+            type: 'query',
+            children: [],
+        });
+    }
     enterTopLevelAnonQueryDef(pcx) {
         this.symbols.push({
             range: this.translator.rangeFromContext(pcx),

package/dist/lang/test/document-symbol-walker.spec.js

@@ -51,6 +51,13 @@ test('source symbols are included', () => {
 test('query symbols are included', () => {
     testSymbol((0, test_translator_1.markSource) `query: ${'flights_by_carrier is flights -> by_carrier'}`, 'flights_by_carrier', 'query', [0]);
 });
+test('run (def) symbols are included', () => {
+    testSymbol((0, test_translator_1.markSource) `run: ${'flights -> by_carrier'}`, 'unnamed_query', 'unnamed_query', [0]);
+});
+test('run (ref) symbols are included', () => {
+    testSymbol((0, test_translator_1.markSource) `query: by_carrier is flights -> by_carrier
+    run: ${'by_carrier'}`, 'by_carrier', 'query', [1]);
+});
 test('expression field defs are included', () => {
     testSymbol((0, test_translator_1.markSource) `
       source: flights is table('my.table.flights') {

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

@@ -59,9 +59,20 @@ describe('model statements', () => {
         });
     });
     describe('query:', () => {
+        // Delete this when ENABLE_M4_WARNINGS is converted to an annotation
         test('anonymous query', () => {
-            expect("query: table('aTable') -> { group_by: astr }").toTranslate();
-        });
+            expect((0, test_translator_1.markSource) `query: ${"table('aTable') -> { group_by: astr }"}`).toTranslate();
+        });
+        // Unskip this when ENABLE_M4_WARNINGS is converted to an annotation
+        test.skip('anonymous query', () => {
+            expect((0, test_translator_1.markSource) `query: ${"table('aTable') -> { group_by: astr }"}`).toTranslateWithWarnings('Anonymous `query:` statements are deprecated, use `run:` instead');
+        });
+        test('run query', () => expect("run: table('aTable') -> { group_by: astr }").toTranslate());
+        test('run query ref', () => expect(`
+        query: foo is table('aTable') -> { group_by: astr }
+        run: foo
+      `).toTranslate());
+        test('query', () => expect("query: name is table('aTable') -> { group_by: astr }").toTranslate());
         test('query', () => {
             expect("query: name is table('aTable') -> { group_by: astr }").toTranslate();
         });
@@ -946,18 +957,49 @@ describe('qops', () => {
       }
     `).toTranslate();
     });
-    test('nest multiple', () => {
-        expect(`
+    test('nest multiple', () => expect(`
       query: a->{
         group_by: ai
         nest:
           nestbystr is { group_by: astr; aggregate: N is count() },
           renest is { group_by: astr; aggregate: N is count() }
       }
-    `).toTranslate();
+    `).toTranslate());
+    test('nest ref', () => expect('query: ab->{group_by: ai; nest: aturtle}').toTranslate());
+    describe('extend block', () => {
+        test('works with dimension', () => {
+            expect('query: a -> { extend: { dimension: x is 1 }; group_by: x }').toTranslate();
+        });
+        test('works with measure', () => {
+            expect('query: a -> { extend: { measure: x is count() }; aggregate: x }').toTranslate();
+        });
+        test('works with join_one', () => {
+            expect('query: a -> { extend: { join_one: bb is b on bb.astr = astr }; group_by: bb.astr }').toTranslate();
+        });
+        test('works with join_many', () => {
+            expect('query: a -> { extend: { join_many: b on astr = b.astr }; group_by: b.astr }').toTranslate();
+        });
+        test('works with join_cross', () => {
+            expect('query: a -> { extend: { join_cross: b on true }; group_by: b.astr }').toTranslate();
+        });
+        test('works with multiple in one block', () => {
+            expect('query: a -> { extend: { dimension: x is 1, y is 2 }; group_by: x, y }').toTranslate();
+        });
+        test('works with multiple blocks', () => {
+            expect('query: a -> { extend: { dimension: x is 1; dimension: y is 2; measure: c is count() }; group_by: x, y; aggregate: c }').toTranslate();
+        });
     });
-    test('nest ref', () => {
-        expect('query: ab->{group_by: ai; nest: aturtle}').toTranslate();
+    // TODO ENABLE_M4_WARNINGS: unskip when we have an M4 warning flag
+    describe.skip('declare/query join warnings', () => {
+        test('declare warning in query', () => {
+            expect((0, test_translator_1.markSource) `query: a -> { declare: ${'x is 1'}; group_by: x, y }`).toTranslateWithWarnings('`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block');
+        });
+        test('declare warning in source', () => {
+            expect((0, test_translator_1.markSource) `source: a2 is a { declare: ${'x is 1'} }`).toTranslateWithWarnings('`declare:` is deprecated; use `dimension:` or `measure:` inside a source or `extend:` block');
+        });
+        test('joins in query', () => {
+            expect((0, test_translator_1.markSource) `query: a -> { ${'join_one: b on true'}; ${'join_many: c is b on true'}; ${'join_cross: d is b on true'}; group_by: b.astr }`).toTranslateWithWarnings('Joins in queries are deprecated, move into an `extend:` block.', 'Joins in queries are deprecated, move into an `extend:` block.', 'Joins in queries are deprecated, move into an `extend:` block.');
+        });
     });
     test('refine query with extended source', () => {
         const m = new test_translator_1.TestTranslator(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.43-dev230622180905",
+  "version": "0.0.43-dev230622192152",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",