@malloydata/malloy 0.0.86-dev230922233440 → 0.0.86-dev230923002041

package/dist/lang/malloy-to-ast.js

@@ -598,6 +598,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const queryDefs = this.visitSubQueryDefList(pcx.subQueryDefList());
         const blockNotes = this.getNotes(pcx.tags());
         queryDefs.extendNote({ blockNotes });
+        if (this.m4WarningsEnabled() && pcx.QUERY()) {
+            this.contextError(pcx, 'Use view: inside of a source instead of query:', 'warn');
+        }
         return queryDefs;
     }
     visitDefExplorePrimaryKey(pcx) {

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

@@ -797,7 +797,7 @@ describe('extend and refine', () => {
         test('implicit refine in nest', () => {
             expect(`##! m4warnings
       source: c is a extend {
-        query: x is { select: * }
+        view: x is { select: * }
       }
 
       run: c -> {
@@ -807,8 +807,8 @@ describe('extend and refine', () => {
         test('implicit refine in turtle works', () => {
             expect(`##! m4warnings
       source: c is a extend {
-        query: x is { select: * }
-        query: y is x { limit: 1 }
+        view: x is { select: * }
+        view: y is x { limit: 1 }
       }`).toTranslateWithWarnings('Implicit query refinement is deprecated, use the `refine` operator.');
         });
         test('implicit query refinement', () => {

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

@@ -112,7 +112,7 @@ describe('source:', () => {
         test('where clause can use the join namespace in source refined query', () => {
             expect(`
       source: flights is table('malloytest.flights') + {
-        query: boo is {
+        view: boo is {
           join_one: carriers is table('malloytest.carriers') on carrier = carriers.code
           where: carriers.code = 'WN' | 'AA'
           group_by: carriers.nickname
@@ -198,15 +198,17 @@ describe('source:', () => {
             expect('source: c is a { except: astr, af }').toTranslate();
         });
         test('turtle in a source can be called view', () => {
-            expect('source: c is a {view: q is { group_by: astr } }').toTranslate();
+            expect('source: c is a extend {view: q is { group_by: astr } }').toTranslate();
         });
-        test('turtle in source can be called query', () => {
-            expect('source: c is a {query: q is { group_by: astr } }').toTranslate();
+        test('turtle in source can be called query with m4 warning', () => {
+            expect(`##! m4warnings
+          source: c is a extend {query: q is { group_by: astr } }
+        `).toTranslateWithWarnings('Use view: inside of a source instead of query:');
         });
         test('refined explore-query', () => {
             expect(`
         source: abNew is ab {
-          query: for1 is aturtle {? ai = 1 }
+          view: for1 is aturtle {? ai = 1 }
         }
       `).toTranslate();
         });
@@ -214,14 +216,14 @@ describe('source:', () => {
             expect(`
         ##! m4warnings
         source: abNew is ab extend {
-          query: for1 is aturtle refine {? ai = 1 }
+          view: for1 is aturtle refine {? ai = 1 }
         }
       `).toTranslateWithWarnings('Filter shortcut `{? condition }` is deprecated; use `{ where: condition } instead');
         });
         test('chained explore-query', () => {
             expect(`
         source: c is a {
-          query: chain is {
+          view: chain is {
             group_by: astr
           } -> {
             top: 10; order_by: astr
@@ -233,7 +235,7 @@ describe('source:', () => {
         test('multiple explore-query', () => {
             expect(`
         source: abNew is ab {
-          query:
+          view:
             q1 is { group_by: astr },
             q2 is { group_by: ai }
         }

package/package.json

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