@malloydata/malloy 0.0.119-dev240123183113 → 0.0.119-dev240124170348

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

@@ -408,7 +408,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery('findme');
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            const note_a = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_a');
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation(defaultTags);
         }
     });
@@ -434,7 +434,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery(0);
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            const note_a = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_a');
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation({
                 inherits: defaultTags,
                 blockNotes: ['# note1\n'],
@@ -459,7 +459,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery('findme');
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            const note_a = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_a');
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation(defaultTags);
         }
     });
@@ -481,7 +481,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery('findme');
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            const note_a = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_a');
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation(defaultTags);
         }
     });
@@ -508,7 +508,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery('findme');
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            const note_a = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_a');
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation({
                 blockNotes: ['# note1\n'],
                 inherits: defaultTags,
@@ -533,7 +533,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery('findme');
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            const note_a = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_a');
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation(defaultTags);
         }
     });
@@ -560,7 +560,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery('findme');
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            const note_a = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_a');
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation({
                 blockNotes: ['# note1\n'],
                 inherits: defaultTags,
@@ -585,7 +585,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery('findme');
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_a = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_a');
+            const note_a = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_a');
             expect(note_a === null || note_a === void 0 ? void 0 : note_a.annotation).matchesAnnotation(defaultTags);
         }
     });
@@ -600,7 +600,7 @@ describe('query operation annotations', () => {
         const foundYou = m.getQuery(0);
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_b = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'note_b');
+            const note_b = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'note_b');
             expect(note_b === null || note_b === void 0 ? void 0 : note_b.annotation).matchesAnnotation({ inherits: defaultTags });
         }
     });
@@ -626,30 +626,29 @@ describe('query operation annotations', () => {
         const foundYou = m.translator.getQuery(0);
         expect(foundYou).toBeDefined();
         if (foundYou) {
-            const note_b = (0, test_translator_1.getFieldDef)(foundYou.pipeline[0], 'xdim');
+            const note_b = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'xdim');
             expect(note_b === null || note_b === void 0 ? void 0 : note_b.annotation).matchesAnnotation({ inherits: defaultTags });
         }
     });
-    test('annotated references to measures on join preserve expression type', () => {
-        const m = (0, test_translator_1.model) `
-    source: na is a extend {
-      measure:
-          one_count is sum(pick 1 when ai = 1 else 0)
-          pct_one is one_count / count();
-    }
-
-    run: na extend {
-      join_many: na on ai = na.ai
+    test('a reference can have an annotation', () => {
+        const m = (0, test_translator_1.model) `run: a extend {
+      # noted
+      dimension: noted_str is astr
     } -> {
-      group_by: ai
-      aggregate:
-        # percent
-        na.pct_one
+      select:
+        # note
+        noted_str
     }`;
         expect(m).toTranslate();
-        const q = m.translator.queryList[0];
-        const fields = q.pipeline[0].fields;
-        expect(fields[1]).toMatchObject({ expressionType: 'aggregate' });
+        const foundYou = m.translator.getQuery(0);
+        expect(foundYou).toBeDefined();
+        if (foundYou) {
+            const astr = (0, test_translator_1.getQueryFieldDef)(foundYou.pipeline[0], 'noted_str');
+            expect(astr === null || astr === void 0 ? void 0 : astr.annotation).matchesAnnotation({
+                inherits: { blockNotes: ['# noted\n'] },
+                notes: ['# note\n'],
+            });
+        }
     });
 });
 //# sourceMappingURL=annotation.spec.js.map

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

@@ -539,46 +539,49 @@ describe('expressions', () => {
         expect(queryDef).toBeDefined();
         expect(queryDef === null || queryDef === void 0 ? void 0 : queryDef.type).toBe('query');
         if (queryDef && queryDef.type === 'query') {
-            const x = queryDef.pipeline[0].fields[0];
-            if (typeof x !== 'string' &&
-                !(0, model_1.isFilteredAliasedName)(x) &&
-                (0, model_1.isFieldTypeDef)(x) &&
-                x.type === 'number' &&
-                x.e) {
-                expect(x).toMatchObject({
-                    'e': [
-                        {
-                            'function': 'numberLiteral',
-                            'literal': '1',
-                            'type': 'dialect',
-                        },
-                        // TODO not sure why there are TWO sets of parentheses... A previous version of this test
-                        // just checked that there were ANY parens, so that went under the radar. Not fixing now.
-                        '+((',
-                        {
-                            'denominator': [
-                                {
-                                    'function': 'numberLiteral',
-                                    'literal': '4',
-                                    'type': 'dialect',
-                                },
-                            ],
-                            'function': 'div',
-                            'numerator': [
-                                {
-                                    'function': 'numberLiteral',
-                                    'literal': '3',
-                                    'type': 'dialect',
-                                },
-                            ],
-                            'type': 'dialect',
-                        },
-                        '))',
-                    ],
-                });
-            }
-            else {
-                fail('expression with parens compiled oddly');
+            const qSeg = queryDef.pipeline[0];
+            expect(qSeg.type).toEqual('reduce');
+            if (qSeg.type === 'reduce') {
+                const x = qSeg.queryFields[0];
+                if (x.type !== 'fieldref' &&
+                    (0, model_1.isFieldTypeDef)(x) &&
+                    x.type === 'number' &&
+                    x.e) {
+                    expect(x).toMatchObject({
+                        'e': [
+                            {
+                                'function': 'numberLiteral',
+                                'literal': '1',
+                                'type': 'dialect',
+                            },
+                            // TODO not sure why there are TWO sets of parentheses... A previous version of this test
+                            // just checked that there were ANY parens, so that went under the radar. Not fixing now.
+                            '+((',
+                            {
+                                'denominator': [
+                                    {
+                                        'function': 'numberLiteral',
+                                        'literal': '4',
+                                        'type': 'dialect',
+                                    },
+                                ],
+                                'function': 'div',
+                                'numerator': [
+                                    {
+                                        'function': 'numberLiteral',
+                                        'literal': '3',
+                                        'type': 'dialect',
+                                    },
+                                ],
+                                'type': 'dialect',
+                            },
+                            '))',
+                        ],
+                    });
+                }
+                else {
+                    fail('expression with parens compiled oddly');
+                }
             }
         }
     });

package/dist/lang/test/field-symbols.spec.js

@@ -109,7 +109,7 @@ describe('structdef comprehension', () => {
             dialect: 'standardsql',
             structRelationship: {
                 type: 'nested',
-                field: 'a',
+                fieldName: 'a',
                 isArray: false,
             },
             structSource: { type: 'nested' },
@@ -145,9 +145,9 @@ describe('structdef comprehension', () => {
                 type: 'one',
                 matrixOperation: 'left',
                 onExpression: [
-                    { type: 'field', path: 'aKey' },
+                    { type: 'field', path: ['aKey'] },
                     '=',
-                    { type: 'field', path: 't.a' },
+                    { type: 'field', path: ['t', 'a'] },
                 ],
             },
             structSource: { type: 'table', tablePath: 't' },
@@ -166,7 +166,7 @@ describe('structdef comprehension', () => {
             pipeline: [
                 {
                     type: 'reduce',
-                    fields: ['a'],
+                    queryFields: [{ type: 'fieldref', path: ['a'] }],
                 },
             ],
         };

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

@@ -72,8 +72,11 @@ describe('source locations', () => {
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getQueryField)(na, 'x');
-        const y = (0, test_translator_1.getFieldDef)(x.pipeline[0], 'y');
-        expect(y.location).toMatchObject(source.locations[0]);
+        const y = (0, test_translator_1.getQueryFieldDef)(x.pipeline[0], 'y');
+        // mtoy todo ask chris if there should be locations
+        if (y.type !== 'fieldref') {
+            expect(y.location).toMatchObject(source.locations[0]);
+        }
     });
     test('location of filtered field inside a view', () => {
         const source = (0, test_translator_1.markSource) `
@@ -87,8 +90,10 @@ describe('source locations', () => {
         expect(m).toTranslate();
         const na = (0, test_translator_1.getExplore)(m.modelDef, 'na');
         const x = (0, test_translator_1.getQueryField)(na, 'x');
-        const z = (0, test_translator_1.getFieldDef)(x.pipeline[0], 'z');
-        expect(z.location).toMatchObject(source.locations[0]);
+        const z = (0, test_translator_1.getQueryFieldDef)(x.pipeline[0], 'z');
+        if (z.type !== 'fieldref') {
+            expect(z.location).toMatchObject(source.locations[0]);
+        }
     });
     test('location of field inherited from table', () => {
         const source = (0, test_translator_1.markSource) `source: na is ${"_db_.table('aTable')"}`;
@@ -144,8 +149,10 @@ describe('source locations', () => {
         const m = new test_translator_1.TestTranslator(source.code);
         expect(m).toTranslate();
         const q = (0, test_translator_1.getModelQuery)(m.modelDef, 'q');
-        const a = (0, test_translator_1.getFieldDef)(q.pipeline[0], 'b');
-        expect(a.location).toMatchObject(source.locations[0]);
+        const a = (0, test_translator_1.getQueryFieldDef)(q.pipeline[0], 'b');
+        if (a.type !== 'fieldref') {
+            expect(a.location).toMatchObject(source.locations[0]);
+        }
     });
     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""" }'}`;

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

@@ -25,6 +25,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const test_translator_1 = require("./test-translator");
 require("./parse-expects");
 const model_1 = require("../../model");
+function getFirstQuerySegment(q) {
+    const qSeg = q === null || q === void 0 ? void 0 : q.pipeline[0];
+    if (qSeg && (0, model_1.isQuerySegment)(qSeg)) {
+        return qSeg;
+    }
+}
+function getFirstSegmentFields(q) {
+    var _a;
+    const qSeg = getFirstQuerySegment(q);
+    return (_a = qSeg === null || qSeg === void 0 ? void 0 : qSeg.queryFields) !== null && _a !== void 0 ? _a : [];
+}
+function getFirstSegmentFieldNames(q) {
+    const qf = getFirstSegmentFields(q);
+    return qf.map(f => f.type === 'fieldref' && f.path.length === 1
+        ? f.path[0]
+        : `expected simple ref, got ${JSON.stringify(f)}`);
+}
 describe('query:', () => {
     describe('basic query syntax', () => {
         test('run:anonymous query', () => expect('run: a -> { group_by: astr }').toTranslate());
@@ -93,11 +110,10 @@ describe('query:', () => {
       query: nq is q + { group_by: astr }
     `);
             expect(x).toTranslate();
-            const q = x.getQuery('q');
+            const q = getFirstSegmentFields(x.getQuery('q'));
             expect(q).toBeDefined();
             if (q) {
-                const qFields = q.pipeline[0].fields;
-                expect(qFields.length).toBe(1);
+                expect(q.length).toBe(1);
             }
         });
         test('query composition preserves original', () => {
@@ -462,13 +478,9 @@ describe('query:', () => {
           calculate: l is lag(ai, 1, pi)
         }`).translationToFailWith("Parameter 3 ('default') of lag must be literal or constant, but received output");
         });
-        // TODO we don't handle referencing a join as a field correctly in all cases today.
-        // For now, it at least is considered type `struct` and therefore fails to parse
-        // as a function argument.
-        // We add <join_name>_id to the query, but it's not included in the output space
         test('cannot use struct in function arg', () => {
-            expect(`run: a extend {join_one: b with astr } -> {
-          group_by: b
+            expect(`run: ab -> {
+          group_by: b.astr
           calculate: foo is lag(b)
         }`).translationToFailWith('No matching overload for function lag(struct)');
         });
@@ -558,12 +570,6 @@ describe('query:', () => {
             expect(`run: a -> {
         extend: { join_one: b with astr }
         group_by: b.ai
-      }`).toTranslate();
-        });
-        test('reference join name in group_by', () => {
-            expect(`run: a -> {
-        extend: { join_one: b with astr }
-        group_by: b
       }`).toTranslate();
         });
         test('can reference select: inline join.* field in calculate', () => {
@@ -608,26 +614,22 @@ describe('query:', () => {
             expect('run: a->{ select: astr, ai calculate: num is lag(ai) }').toTranslate();
         });
         test('aggregate reference', () => {
-            var _a;
             const doc = (0, test_translator_1.model) `run: a->{ aggregate: ai.sum() }`;
             expect(doc).toTranslate();
-            const q = doc.translator.getQuery(0);
+            const q = getFirstSegmentFields(doc.translator.getQuery(0));
             expect(q).toBeDefined();
-            const ai = (_a = q === null || q === void 0 ? void 0 : q.pipeline[0]) === null || _a === void 0 ? void 0 : _a.fields[0];
-            expect(ai).toMatchObject({
+            expect(q[0]).toMatchObject({
                 name: 'ai',
                 type: 'number',
                 expressionType: 'aggregate',
             });
         });
         test('timeunit reference', () => {
-            var _a;
             const doc = (0, test_translator_1.model) `run: a->{ group_by: ats.day }`;
             expect(doc).toTranslate();
-            const q = doc.translator.getQuery(0);
+            const q = getFirstSegmentFields(doc.translator.getQuery(0));
             expect(q).toBeDefined();
-            const ats = (_a = q === null || q === void 0 ? void 0 : q.pipeline[0]) === null || _a === void 0 ? void 0 : _a.fields[0];
-            expect(ats).toMatchObject({ name: 'ats', type: 'timestamp' });
+            expect(q[0]).toMatchObject({ name: 'ats', type: 'timestamp' });
         });
         test('aggregate multiple', () => {
             expect(`
@@ -646,27 +648,23 @@ describe('query:', () => {
         test('expands star correctly', () => {
             const selstar = (0, test_translator_1.model) `run: ab->{select: *}`;
             expect(selstar).toTranslate();
-            const query = selstar.translator.getQuery(0);
-            expect(query).toBeDefined();
-            const fields = query.pipeline[0].fields;
-            expect(fields.sort()).toEqual(afields);
+            const fields = getFirstSegmentFieldNames(selstar.translator.getQuery(0));
+            expect(fields).toEqual(afields);
         });
         test('expands join dot star correctly', () => {
             const selstar = (0, test_translator_1.model) `run: ab->{select: b.*}`;
             expect(selstar).toTranslate();
             const query = selstar.translator.getQuery(0);
             expect(query).toBeDefined();
-            const fields = query.pipeline[0].fields;
-            expect(fields.sort()).toEqual(afields.map(f => `b.${f}`));
+            const fields = getFirstSegmentFields(selstar.translator.getQuery(0)).map(f => (f.type === 'fieldref' ? f.path : `wrong field type ${f.type}`));
+            expect(fields).toEqual(afields.map(f => ['b', f]));
         });
         test('expands star with exclusions', () => {
             const selstar = (0, test_translator_1.model) `run: ab->{select: * { except: ai, except: aun, aweird }}`;
             const filterdFields = afields.filter(f => f !== 'ai' && f !== 'aun' && f !== 'aweird');
             expect(selstar).toTranslate();
-            const query = selstar.translator.getQuery(0);
-            expect(query).toBeDefined();
-            const fields = query.pipeline[0].fields;
-            expect(fields.sort()).toEqual(filterdFields);
+            const fields = getFirstSegmentFieldNames(selstar.translator.getQuery(0));
+            expect(fields).toEqual(filterdFields);
         });
         test('star error checking', () => {
             expect((0, test_translator_1.markSource) `run: a->{select: ${'zzz'}.*}`).translationToFailWith("No such field as 'zzz'");
@@ -686,10 +684,8 @@ describe('query:', () => {
         test('regress check extend: and star', () => {
             const m = (0, test_translator_1.model) `run: ab->{ extend: {dimension: x is 1} select: * }`;
             expect(m).toTranslate();
-            const q = m.translator.getQuery(0);
-            expect(q).toBeDefined();
-            const fields = q.pipeline[0].fields;
-            expect(fields.sort()).toEqual(afields.concat('x'));
+            const fields = getFirstSegmentFieldNames(m.translator.getQuery(0));
+            expect(fields).toEqual(afields.concat('x'));
         });
         test('project def', () => {
             expect('run: ab->{ select: one is 1 }').toTranslate();
@@ -701,10 +697,8 @@ describe('query:', () => {
         test('regress check extend: and star', () => {
             const m = (0, test_translator_1.model) `run: ab->{ extend: {dimension: x is 1} select: * }`;
             expect(m).toTranslate();
-            const q = m.translator.getQuery(0);
-            expect(q).toBeDefined();
-            const fields = q.pipeline[0].fields;
-            expect(fields.sort()).toEqual(afields.concat('x'));
+            const fields = getFirstSegmentFieldNames(m.translator.getQuery(0));
+            expect(fields).toEqual(afields.concat('x'));
         });
         test('project def', () => {
             expect('run:ab->{ select: one is 1 }').toTranslate();
@@ -720,13 +714,13 @@ describe('query:', () => {
             expect('run:a->{index: astr}').toTranslate();
         });
         test('index path', () => {
-            expect('run:ab->{index: ab.astr}').toTranslate();
+            expect('run:ab->{index: b.astr}').toTranslate();
         });
         test('index unique on path', () => {
-            expect('run:ab->{index: b.astr, ab.astr}').toTranslate();
+            expect('run:ab->{index: astr, b.astr}').toTranslate();
         });
         test('index join.*', () => {
-            expect('run:ab->{index: ab.*}').toTranslate();
+            expect('run:ab->{index: b.*}').toTranslate();
         });
         test('index multiple', () => {
             const model = new test_translator_1.TestTranslator('run:a->{index: af, astr}');
@@ -736,18 +730,12 @@ describe('query:', () => {
             if (q) {
                 const index = q.pipeline[0];
                 expect(index.type).toBe('index');
-                expect(index.fields).toEqual(['af', 'astr']);
-            }
-        });
-        test('index star', () => {
-            const model = new test_translator_1.TestTranslator('run:a->{index: *, astr}');
-            expect(model).toTranslate();
-            const q = model.getQuery(0);
-            expect(q).toBeDefined();
-            if (q) {
-                const index = q.pipeline[0];
-                expect(index.type).toBe('index');
-                expect(index.fields).toEqual(['*', 'astr']);
+                if (index.type === 'index') {
+                    expect(index.indexFields).toEqual([
+                        { type: 'fieldref', path: ['af'] },
+                        { type: 'fieldref', path: ['astr'] },
+                    ]);
+                }
             }
         });
         test('index by', () => {

package/dist/lang/test/test-translator.d.ts

@@ -1,4 +1,4 @@
-import { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, SQLBlockSource, SQLBlockStructDef, StructDef, TurtleDef } from '../../model/malloy_types';
+import { DocumentLocation, FieldDef, ModelDef, NamedModelObject, PipeSegment, Query, QueryFieldDef, SQLBlockSource, SQLBlockStructDef, StructDef, TurtleDef } from '../../model/malloy_types';
 import { MalloyElement } from '../ast';
 import { NameSpace } from '../ast/types/name-space';
 import { ModelEntry } from '../ast/types/model-entry';
@@ -50,7 +50,8 @@ export declare class BetaExpression extends TestTranslator {
 }
 export declare function getExplore(modelDef: ModelDef, name: string): StructDef;
 export declare function getModelQuery(modelDef: ModelDef, name: string): Query;
-export declare function getFieldDef(thing: StructDef | PipeSegment, name: string): FieldDef;
+export declare function getFieldDef(source: StructDef, name: string): FieldDef;
+export declare function getQueryFieldDef(query: PipeSegment, name: string): QueryFieldDef;
 export declare function getQueryField(structDef: StructDef, name: string): TurtleDef;
 export declare function getJoinField(structDef: StructDef, name: string): StructDef;
 export interface MarkedSource {

package/dist/lang/test/test-translator.js

@@ -23,7 +23,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSelectOneStruct = exports.markSource = exports.makeModelFunc = exports.model = exports.expr = exports.getJoinField = exports.getQueryField = exports.getFieldDef = exports.getModelQuery = exports.getExplore = exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.aTableDef = exports.pretty = void 0;
+exports.getSelectOneStruct = exports.markSource = exports.makeModelFunc = exports.model = exports.expr = exports.getJoinField = exports.getQueryField = exports.getQueryFieldDef = exports.getFieldDef = exports.getModelQuery = exports.getExplore = exports.BetaExpression = exports.TestTranslator = exports.TestChildTranslator = exports.aTableDef = exports.pretty = void 0;
 const util_1 = require("util");
 const malloy_types_1 = require("../../model/malloy_types");
 const ast_1 = require("../ast");
@@ -55,7 +55,7 @@ const mockSchema = {
                 type: 'struct',
                 name: 'astruct',
                 structSource: { type: 'nested' },
-                structRelationship: { type: 'nested', isArray: true, field: 'foo' },
+                structRelationship: { type: 'nested', isArray: true, fieldName: 'foo' },
                 fields: [{ type: 'number', name: 'column', numberType: 'integer' }],
                 dialect: 'standardsql',
             },
@@ -242,9 +242,9 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
                                 type: 'one',
                                 matrixOperation: 'left',
                                 onExpression: [
-                                    { type: 'field', path: 'astr' },
+                                    { type: 'field', path: ['astr'] },
                                     '=',
-                                    { type: 'field', path: 'b.astr' },
+                                    { type: 'field', path: ['b', 'astr'] },
                                 ],
                             },
                         },
@@ -262,7 +262,10 @@ class TestTranslator extends parse_malloy_1.MalloyTranslator {
                             pipeline: [
                                 {
                                     type: 'reduce',
-                                    fields: ['astr', 'acount'],
+                                    queryFields: [
+                                        { type: 'fieldref', path: ['astr'] },
+                                        { type: 'fieldref', path: ['acount'] },
+                                    ],
                                 },
                             ],
                         },
@@ -424,30 +427,33 @@ function getModelQuery(modelDef, name) {
     return modelDef.contents[name];
 }
 exports.getModelQuery = getModelQuery;
-function getFieldDef(thing, name) {
-    let found = undefined;
-    for (const f of thing.fields) {
-        if (typeof f === 'string') {
-            if (f === name) {
-                throw new Error(`Expected def for '${name}', found a ref`);
-            }
+function getFieldDef(source, name) {
+    var _a;
+    for (const f of source.fields) {
+        if ((_a = f.as) !== null && _a !== void 0 ? _a : f.name === name) {
+            return f;
         }
-        else if ((f.as || f.name) === name) {
-            if ((0, malloy_types_1.isFilteredAliasedName)(f)) {
-                throw new Error(`FilteredAliasedName for '${name}' unexpected`);
+    }
+    throw new Error(`Compiled source did not contain expected field '${name}'`);
+}
+exports.getFieldDef = getFieldDef;
+function getQueryFieldDef(query, name) {
+    var _a;
+    if ((0, malloy_types_1.isQuerySegment)(query)) {
+        for (const f of query.queryFields) {
+            if (f.type === 'fieldref') {
+                if (name === f.path[f.path.length - 1]) {
+                    return f;
+                }
+            }
+            else if ((_a = f.as) !== null && _a !== void 0 ? _a : f.name === name) {
+                return f;
             }
-            found = f;
-            break;
         }
     }
-    if (found === undefined) {
-        throw new Error(`Compiled code did not contain expected field '${name}'`);
-    }
-    else {
-        return found;
-    }
+    throw new Error(`Compiled query did not contain expected field '${name}'`);
 }
-exports.getFieldDef = getFieldDef;
+exports.getQueryFieldDef = getQueryFieldDef;
 // TODO "as" is almost always a code smell ...
 function getQueryField(structDef, name) {
     return getFieldDef(structDef, name);

package/dist/malloy.js

@@ -1000,7 +1000,7 @@ class Explore extends Entity {
             pipeline: [
                 {
                     type: 'reduce',
-                    fields: [name],
+                    queryFields: [{ type: 'fieldref', path: [name] }],
                 },
             ],
         };