@malloydata/malloy 0.0.86-dev230922233440 → 0.0.86-dev230927172239

package/dist/lang/ast/field-space/reference-field.js

@@ -84,7 +84,7 @@ class ReferenceField extends space_field_1.SpaceField {
                     // and annotate the expression.
                     if ((0, malloy_types_1.isAtomicFieldType)(origFd.type)) {
                         const newField = {
-                            name: this.fieldRef.list[-1].refString,
+                            name: this.fieldRef.list[this.fieldRef.list.length - 1].refString,
                             type: origFd.type,
                             e: [{ type: 'field', path }],
                             annotation,

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) {
@@ -817,6 +820,9 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     buildPipelineFromName(pipe, pipeCx) {
         const firstCx = pipeCx.firstSegment();
+        if (this.m4WarningsEnabled() && firstCx.ARROW()) {
+            this.contextError(firstCx, "Leading '->' in a view or nest definition is no longer needed.", 'warn');
+        }
         const nameCx = firstCx.exploreQueryName();
         if (nameCx) {
             pipe.turtleName = this.getFieldName(nameCx);

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

@@ -601,5 +601,31 @@ describe('query operation annotations', () => {
             expect(note_b === null || note_b === void 0 ? void 0 : note_b.annotation).matchesAnnotation({ inherits: defaultTags });
         }
     });
+    test('annotations preserved from path references', () => {
+        const m = (0, test_translator_1.model) `
+      run: a -> {
+        extend: {
+          join_one: x is
+            a extend {
+              # blockNote
+              dimension:
+                # note
+                xdim
+                # b4-is
+                is
+                # after-is
+                1
+            } on x.ai = ai
+        }
+        group_by: x.xdim
+      }`;
+        expect(m).toTranslate();
+        const foundYou = m.translator.getQuery(0);
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const note_b = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'xdim');
+            expect(note_b === null || note_b === void 0 ? void 0 : note_b.annotation).matchesAnnotation({ inherits: defaultTags });
+        }
+    });
 });
 //# sourceMappingURL=annotation.spec.js.map

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/query.spec.js

@@ -26,52 +26,53 @@ const test_translator_1 = require("./test-translator");
 require("./parse-expects");
 const model_1 = require("../../model");
 describe('query:', () => {
-    test('anonymous query', () => {
-        expect((0, test_translator_1.markSource) `query: ${"table('aTable') -> { group_by: astr }"}`).toTranslate();
-    });
-    test('anonymous query', () => {
-        expect((0, test_translator_1.markSource) `##! m4warnings
+    describe('basic query syntax', () => {
+        test('anonymous query', () => {
+            expect((0, test_translator_1.markSource) `query: ${"table('aTable') -> { group_by: astr }"}`).toTranslate();
+        });
+        test('anonymous query', () => {
+            expect((0, test_translator_1.markSource) `##! m4warnings
       query: ${"conn.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(`
+        });
+        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();
-    });
-    test('query from query', () => {
-        expect(`
+        test('query', () => expect("query: name is table('aTable') -> { group_by: astr }").toTranslate());
+        test('query', () => {
+            expect("query: name is table('aTable') -> { group_by: astr }").toTranslate();
+        });
+        test('query from query', () => {
+            expect(`
         query: q1 is ab->{ group_by: astr limit: 10 }
         query: q2 is ->q1
       `).toTranslate();
-    });
-    test('query with refinements from query', () => {
-        expect(`
+        });
+        test('query with refinements from query', () => {
+            expect(`
         query: q1 is ab->{ group_by: astr limit: 10 }
         query: q2 is ->q1 { aggregate: acount }
       `).toTranslate();
-    });
-    test('chained query operations', () => {
-        expect(`
+        });
+        test('chained query operations', () => {
+            expect(`
       query: ab
         -> { group_by: astr; aggregate: acount }
         -> { top: 5; where: astr ~ 'a%' group_by: astr }
     `).toTranslate();
-    });
-    test('from(query) refined into query', () => {
-        expect('query: from(ab -> {group_by: astr}) { dimension: bigstr is upper(astr) } -> { group_by: bigstr }').toTranslate();
-    });
-    test('query with shortcut filtered turtle', () => {
-        expect("query: allA is ab -> aturtle {? astr ~ 'a%' }").toTranslate();
-    });
-    test('query with filtered turtle', () => {
-        expect("query: allA is ab -> aturtle { where: astr ~ 'a%' }").toTranslate();
-    });
-    test('nest: in group_by:', () => {
-        expect(`
+        });
+        test('from(query) refined into query', () => {
+            expect('query: from(ab -> {group_by: astr}) { dimension: bigstr is upper(astr) } -> { group_by: bigstr }').toTranslate();
+        });
+        test('query with shortcut filtered turtle', () => {
+            expect("query: allA is ab -> aturtle {? astr ~ 'a%' }").toTranslate();
+        });
+        test('query with filtered turtle', () => {
+            expect("query: allA is ab -> aturtle { where: astr ~ 'a%' }").toTranslate();
+        });
+        test('nest: in group_by:', () => {
+            expect(`
       query: ab -> {
         group_by: astr;
         nest: nested_count is {
@@ -79,45 +80,45 @@ describe('query:', () => {
         }
       }
     `).toTranslate();
-    });
-    test('reduce pipe project', () => {
-        expect(`
+        });
+        test('reduce pipe project', () => {
+            expect(`
       query: a -> { aggregate: f is count() } -> { project: f2 is f + 1 }
     `).toTranslate();
-    });
-    test('refine and extend query', () => {
-        expect(`
+        });
+        test('refine and extend query', () => {
+            expect(`
       query: a_by_str is a -> { group_by: astr }
       query: -> a_by_str { aggregate: str_count is count() }
     `).toTranslate();
-    });
-    test('query refinement preserves original', () => {
-        const x = new test_translator_1.TestTranslator(`
+        });
+        test('query refinement preserves original', () => {
+            const x = new test_translator_1.TestTranslator(`
       query: q is a -> { aggregate: acount is count() }
       query: nq is -> q + { group_by: astr }
     `);
-        expect(x).toTranslate();
-        const q = x.getQuery('q');
-        expect(q).toBeDefined();
-        if (q) {
-            const qFields = q.pipeline[0].fields;
-            expect(qFields.length).toBe(1);
-        }
-    });
-    test('query composition preserves original', () => {
-        const x = new test_translator_1.TestTranslator(`
+            expect(x).toTranslate();
+            const q = x.getQuery('q');
+            expect(q).toBeDefined();
+            if (q) {
+                const qFields = q.pipeline[0].fields;
+                expect(qFields.length).toBe(1);
+            }
+        });
+        test('query composition preserves original', () => {
+            const x = new test_translator_1.TestTranslator(`
       query: q is ab -> { aggregate: acount }
       query: nq is -> q -> { project: * }
     `);
-        expect(x).toTranslate();
-        const q = x.getQuery('q');
-        expect(q).toBeDefined();
-        if (q) {
-            expect(q.pipeline.length).toBe(1);
-        }
-    });
-    test('all ungroup with args', () => {
-        expect(`
+            expect(x).toTranslate();
+            const q = x.getQuery('q');
+            expect(q).toBeDefined();
+            if (q) {
+                expect(q.pipeline.length).toBe(1);
+            }
+        });
+        test('all ungroup with args', () => {
+            expect(`
       query: a -> {
         group_by: astr
         nest: by_int is {
@@ -126,9 +127,9 @@ describe('query:', () => {
         }
       }
     `).toTranslate();
-    });
-    test('all ungroup checks args', () => {
-        expect(`
+        });
+        test('all ungroup checks args', () => {
+            expect(`
     query: a -> {
       group_by: astr
       nest: by_int is {
@@ -137,9 +138,9 @@ describe('query:', () => {
       }
     }
   `).translationToFailWith("all() 'afloat' is missing from query output");
-    });
-    test('exclude ungroup with args', () => {
-        expect(`
+        });
+        test('exclude ungroup with args', () => {
+            expect(`
       query: a -> {
         group_by: aa is 'a'
         nest: by_b is {
@@ -151,9 +152,9 @@ describe('query:', () => {
         }
       }
     `).toTranslate();
-    });
-    test('exclude ungroup checks args', () => {
-        expect(`
+        });
+        test('exclude ungroup checks args', () => {
+            expect(`
       query: a -> {
         group_by: aa is 'a'
         nest: by_b is {
@@ -165,9 +166,9 @@ describe('query:', () => {
         }
       }
     `).translationToFailWith("exclude() 'aaa' is missing from query output");
-    });
-    test('exclude problem revealed by production models', () => {
-        expect(`
+        });
+        test('exclude problem revealed by production models', () => {
+            expect(`
       source: carriers is table('malloytest.carriers') {
         primary_key: code
       }
@@ -185,6 +186,7 @@ describe('query:', () => {
         }
       }
     `).toTranslate();
+        });
     });
     describe('query operation typechecking', () => {
         describe('field declarations', () => {

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,22 @@ 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('turtle in source m4 warning on arrow', () => {
+            expect(`##! m4warnings
+          source: c is a extend {view: q is -> { group_by: astr } }
+        `).toTranslateWithWarnings("Leading '->' in a view or nest definition is no longer needed.");
         });
         test('refined explore-query', () => {
             expect(`
         source: abNew is ab {
-          query: for1 is aturtle {? ai = 1 }
+          view: for1 is aturtle {? ai = 1 }
         }
       `).toTranslate();
         });
@@ -214,14 +221,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 +240,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-dev230927172239",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",