@malloydata/malloy 0.0.101-dev231107220340 → 0.0.101-dev231109201517

package/dist/lang/ast/elements/pipeline-desc.d.ts

@@ -1,5 +1,5 @@
 import { Annotation, DocumentLocation, PipeSegment, Pipeline, StructDef } from '../../../model/malloy_types';
-import { FieldName, FieldSpace } from '../types/field-space';
+import { FieldSpace } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
 import { QOPDesc } from '../query-properties/qop-desc';
 import { QueryInputSpace } from '../field-space/query-input-space';
@@ -23,7 +23,7 @@ export declare abstract class PipelineDesc extends MalloyElement {
     addSegments(...segDesc: QOPDesc[]): void;
     protected appendOps(pipelineOutput: FieldSpace, modelPipe: PipeSegment[]): AppendResult;
     protected refinePipeline(fs: FieldSpace, modelPipe: Pipeline): Pipeline;
-    protected expandTurtle(turtleName: string, fromStruct: StructDef): {
+    protected expandTurtle(turtleName: ViewFieldReference, fromStruct: StructDef): {
         needsExpansionDueToScalar: boolean;
         pipeline: PipeSegment[];
         location: DocumentLocation | undefined;
@@ -31,8 +31,8 @@ export declare abstract class PipelineDesc extends MalloyElement {
     };
 }
 export declare abstract class TurtleHeadedPipe extends PipelineDesc {
-    _turtleName?: FieldName;
-    set turtleName(turtleName: FieldName | undefined);
-    get turtleName(): FieldName | undefined;
+    _turtleName?: ViewFieldReference;
+    set turtleName(turtleName: ViewFieldReference | undefined);
+    get turtleName(): ViewFieldReference | undefined;
 }
 export {};

package/dist/lang/ast/elements/pipeline-desc.js

@@ -23,9 +23,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurtleHeadedPipe = exports.PipelineDesc = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
+const field_space_1 = require("../types/field-space");
 const malloy_element_1 = require("../types/malloy-element");
-const struct_utils_1 = require("../struct-utils");
+const field_references_1 = require("../query-items/field-references");
 const refinements_1 = require("../query-properties/refinements");
+const static_space_1 = require("../field-space/static-space");
+const space_field_1 = require("../types/space-field");
 /**
  * Generic abstract for all pipelines, the first segment might be a reference
  * to an existing pipeline (query or turtle), and if there is a refinement it
@@ -68,7 +72,11 @@ class PipelineDesc extends malloy_element_1.MalloyElement {
         }
         let pipeline = [];
         if (modelPipe.pipeHead) {
-            const { pipeline: turtlePipe } = this.expandTurtle(modelPipe.pipeHead.name, fs.structDef());
+            const ref = new field_references_1.ViewFieldReference([
+                new field_space_1.FieldName(modelPipe.pipeHead.name),
+            ]);
+            this.has({ ref });
+            const { pipeline: turtlePipe } = this.expandTurtle(ref, fs.structDef());
             pipeline.push(...turtlePipe);
         }
         pipeline.push(...modelPipe.pipeline);
@@ -79,34 +87,54 @@ class PipelineDesc extends malloy_element_1.MalloyElement {
         return { pipeline };
     }
     expandTurtle(turtleName, fromStruct) {
-        const turtle = (0, struct_utils_1.getStructFieldDef)(fromStruct, turtleName);
+        var _a;
+        const fs = new static_space_1.StaticSpace(fromStruct);
+        const lookup = turtleName.getField(fs);
         let annotation;
-        if (!turtle) {
+        if (!lookup.found) {
             this.log(`Query '${turtleName}' is not defined in source`);
         }
-        else if (turtle.type !== 'turtle') {
-            if (this.inExperiment('scalar_lenses', true)) {
+        else if (lookup.found instanceof space_field_1.SpaceField) {
+            const fieldDef = lookup.found.fieldDef();
+            if (fieldDef && (0, malloy_types_1.isAtomicField)(fieldDef)) {
+                if (this.inExperiment('scalar_lenses', true)) {
+                    return {
+                        needsExpansionDueToScalar: true,
+                        pipeline: [
+                            {
+                                type: 'reduce',
+                                fields: [
+                                    {
+                                        type: fieldDef.type,
+                                        name: (_a = fieldDef.as) !== null && _a !== void 0 ? _a : fieldDef.name,
+                                        expressionType: fieldDef.expressionType,
+                                        e: [{ type: 'field', path: turtleName.refString }],
+                                    },
+                                ],
+                            },
+                        ],
+                        location: fieldDef.location,
+                        annotation,
+                    };
+                }
+                else {
+                    this.log(`'${turtleName.refString}' is not a query`);
+                }
+            }
+            else if (turtleName.list.length > 1) {
+                this.log('Cannot use view from join');
+            }
+            else if (fieldDef && (0, malloy_types_1.isTurtleDef)(fieldDef)) {
+                if (fieldDef.annotation) {
+                    annotation = { inherits: fieldDef.annotation };
+                }
                 return {
-                    needsExpansionDueToScalar: true,
-                    pipeline: [{ type: 'reduce', fields: [turtle.name] }],
-                    location: turtle.location,
+                    pipeline: fieldDef.pipeline,
+                    location: fieldDef.location,
                     annotation,
+                    needsExpansionDueToScalar: false,
                 };
             }
-            else {
-                this.log(`'${turtleName}' is not a query`);
-            }
-        }
-        else {
-            if (turtle.annotation) {
-                annotation = { inherits: turtle.annotation };
-            }
-            return {
-                pipeline: turtle.pipeline,
-                location: turtle.location,
-                annotation,
-                needsExpansionDueToScalar: false,
-            };
         }
         return {
             pipeline: [],

package/dist/lang/ast/elements/source-query-nodes.js

@@ -221,7 +221,7 @@ class SQAppendView extends source_query_1.SourceQueryNode {
             const head = views[0];
             const refinements = views.slice(1);
             if (head instanceof field_references_1.ViewFieldReference) {
-                theQuery.turtleName = head.list[0];
+                theQuery.turtleName = head;
             }
             else if (head instanceof qop_desc_1.QOPDesc) {
                 theQuery.addSegments(head);

package/dist/lang/ast/query-elements/full-query.js

@@ -74,8 +74,7 @@ class FullQuery extends pipeline_desc_1.TurtleHeadedPipe {
             const lookFor = this.turtleName.getField(pipeFS);
             if (lookFor.error)
                 this.log(lookFor.error);
-            const name = this.turtleName.refString;
-            const { pipeline, location, annotation, needsExpansionDueToScalar } = this.expandTurtle(name, structDef);
+            const { pipeline, location, annotation, needsExpansionDueToScalar } = this.expandTurtle(this.turtleName, structDef);
             destQuery.location = location;
             let walkPipe = pipeline;
             if (this.refinements &&
@@ -95,7 +94,7 @@ class FullQuery extends pipeline_desc_1.TurtleHeadedPipe {
                 destQuery.pipeline = pipeline;
             }
             else {
-                destQuery.pipeHead = { name };
+                destQuery.pipeHead = { name: this.turtleName.refString };
             }
             if (annotation) {
                 destQuery.annotation = annotation;

package/dist/lang/ast/query-properties/nest.d.ts

@@ -1,5 +1,5 @@
 import * as model from '../../../model/malloy_types';
-import { FieldName, FieldSpace } from '../types/field-space';
+import { FieldSpace } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
 import { Noteable, extendNoteMethod } from '../types/noteable';
 import { QueryField } from '../field-space/query-space-field';
@@ -10,7 +10,7 @@ import { QueryBuilder } from '../types/query-builder';
 import { MakeEntry } from '../types/space-entry';
 import { DynamicSpace } from '../field-space/dynamic-space';
 import { TypeDesc } from '../../../model';
-import { FieldReference } from '../query-items/field-references';
+import { FieldReference, ViewFieldReference } from '../query-items/field-references';
 declare abstract class TurtleDeclRoot extends TurtleHeadedPipe implements Noteable, MakeEntry {
     readonly name: string;
     readonly isNoteableObj = true;
@@ -28,7 +28,7 @@ export declare class NestRefinement extends TurtleDeclRoot implements QueryPrope
     elementType: string;
     queryRefinementStage: LegalRefinementStage;
     forceQueryClass: QueryClass;
-    constructor(turtleName: FieldName);
+    constructor(turtleName: ViewFieldReference);
     queryExecute(executeFor: QueryBuilder): void;
     makeEntry(fs: DynamicSpace): void;
 }
@@ -51,12 +51,13 @@ export declare class QueryFieldAST extends QueryField {
     fieldDef(): model.TurtleDef;
 }
 export declare class NestReference extends FieldReference implements QueryPropertyInterface, MakeEntry {
-    readonly name: FieldName;
+    readonly name: FieldReference;
     elementType: string;
     forceQueryClass: QueryClass;
     queryRefinementStage: LegalRefinementStage;
-    constructor(name: FieldName);
+    constructor(name: FieldReference);
     typecheck(type: TypeDesc): void;
+    makeEntry(fs: DynamicSpace): void;
     queryExecute(executeFor: QueryBuilder): void;
 }
 export type NestedQuery = NestReference | NestDefinition | NestRefinement;

package/dist/lang/ast/query-properties/nest.js

@@ -21,8 +21,32 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestReference = exports.QueryFieldAST = exports.isNestedQuery = exports.NestDefinition = exports.NestRefinement = exports.TurtleDecl = void 0;
+const model = __importStar(require("../../../model/malloy_types"));
 const noteable_1 = require("../types/noteable");
 const query_space_field_1 = require("../field-space/query-space-field");
 const pipeline_desc_1 = require("../elements/pipeline-desc");
@@ -34,6 +58,8 @@ const field_references_1 = require("../query-items/field-references");
 const struct_utils_1 = require("../struct-utils");
 const column_space_field_1 = require("../field-space/column-space-field");
 const query_utils_1 = require("../query-utils");
+const space_field_1 = require("../types/space-field");
+const query_field_struct_1 = require("../field-space/query-field-struct");
 function isTurtle(fd) {
     const ret = fd && typeof fd !== 'string' && fd.type === 'turtle';
     return !!ret;
@@ -55,6 +81,9 @@ class TurtleDeclRoot extends pipeline_desc_1.TurtleHeadedPipe {
                 reportWrongType = false;
             }
             else if (headEnt.found instanceof query_space_field_1.QueryField) {
+                if (this.turtleName.list.length > 1) {
+                    this.turtleName.log('Cannot use view from join');
+                }
                 const headDef = headEnt.found.getQueryFieldDef(fs);
                 if (isTurtle(headDef)) {
                     const newPipe = this.refinePipeline(fs, headDef);
@@ -131,7 +160,7 @@ class TurtleDecl extends TurtleDeclRoot {
 exports.TurtleDecl = TurtleDecl;
 class NestRefinement extends TurtleDeclRoot {
     constructor(turtleName) {
-        super(turtleName.refString);
+        super(turtleName.outputName);
         this.elementType = 'nestRefinement';
         this.queryRefinementStage = query_property_interface_1.LegalRefinementStage.Single;
         this.forceQueryClass = query_property_interface_1.QueryClass.Grouping;
@@ -202,7 +231,7 @@ class QueryFieldAST extends query_space_field_1.QueryField {
 exports.QueryFieldAST = QueryFieldAST;
 class NestReference extends field_references_1.FieldReference {
     constructor(name) {
-        super([name]);
+        super([...name.list]);
         this.name = name;
         this.elementType = 'nestReference';
         this.forceQueryClass = query_property_interface_1.QueryClass.Grouping;
@@ -216,19 +245,60 @@ class NestReference extends field_references_1.FieldReference {
                 useInstead = 'a calculate';
                 kind = 'an analytic';
             }
-            else if ((0, model_1.expressionIsScalar)(type.expressionType)) {
-                useInstead = 'a group_by or select';
-                kind = 'a scalar';
+            else {
+                if (this.inExperiment('scalar_lenses', true)) {
+                    return;
+                }
+                if ((0, model_1.expressionIsScalar)(type.expressionType)) {
+                    useInstead = 'a group_by or select';
+                    kind = 'a scalar';
+                }
+                else if ((0, model_1.expressionIsAggregate)(type.expressionType)) {
+                    useInstead = 'an aggregate';
+                    kind = 'an aggregate';
+                }
+                else {
+                    throw new Error(`Unexpected expression type ${type} not handled here`);
+                }
+                this.log(`Cannot use ${kind} field in a nest operation, did you mean to use ${useInstead} operation instead?`);
             }
-            else if ((0, model_1.expressionIsAggregate)(type.expressionType)) {
-                useInstead = 'an aggregate';
-                kind = 'an aggregate';
+        }
+    }
+    makeEntry(fs) {
+        var _a;
+        if (fs instanceof query_spaces_1.QuerySpace) {
+            const lookup = this.name.getField(fs.inputSpace());
+            if (lookup.found instanceof space_field_1.SpaceField) {
+                const field = lookup.found.fieldDef();
+                if (field && model.isAtomicField(field)) {
+                    const name = (_a = field.as) !== null && _a !== void 0 ? _a : field.name;
+                    fs.newEntry(name, this, new query_field_struct_1.QueryFieldStruct(fs, {
+                        type: 'turtle',
+                        name,
+                        pipeline: [
+                            {
+                                type: 'reduce',
+                                fields: [
+                                    {
+                                        type: field.type,
+                                        name,
+                                        expressionType: field.expressionType,
+                                        e: [{ type: 'field', path: this.name.refString }],
+                                    },
+                                ],
+                            },
+                        ],
+                    }));
+                    return;
+                }
             }
-            else {
-                throw new Error(`Unexpected expression type ${type} not handled here`);
+            if (this.name.list.length > 1) {
+                this.log('Cannot nest view from join');
+                return;
             }
-            this.log(`Cannot use ${kind} field in a nest operation, did you mean to use ${useInstead} operation instead?`);
+            return super.makeEntry(fs);
         }
+        throw this.internalError('Unexpected namespace for nest');
     }
     queryExecute(executeFor) {
         executeFor.resultFS.pushFields(this);

package/dist/lang/ast/query-properties/refinements.js

@@ -56,6 +56,10 @@ class NamedRefinement extends Refinement {
                     this.name.log(`named refinement \`${this.name.refString}\` must have exactly one stage`);
                     return;
                 }
+                if (this.name.list.length > 1) {
+                    this.log('Cannot use view from join as refinement');
+                    return;
+                }
                 return fieldDef.pipeline[0];
             }
             if ((fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.type) !== 'struct') {

package/dist/lang/lib/Malloy/MalloyParser.d.ts

@@ -194,103 +194,102 @@ export declare class MalloyParser extends Parser {
     static readonly RULE_connectionId = 31;
     static readonly RULE_queryProperties = 32;
     static readonly RULE_filterShortcut = 33;
-    static readonly RULE_exploreQueryName = 34;
-    static readonly RULE_queryName = 35;
-    static readonly RULE_sourcePropertyList = 36;
-    static readonly RULE_sourceDefinition = 37;
-    static readonly RULE_sqExplore = 38;
-    static readonly RULE_sourceNameDef = 39;
-    static readonly RULE_sourceID = 40;
-    static readonly RULE_exploreProperties = 41;
-    static readonly RULE_exploreStatement = 42;
-    static readonly RULE_defMeasures = 43;
-    static readonly RULE_defDimensions = 44;
-    static readonly RULE_renameList = 45;
-    static readonly RULE_exploreRenameDef = 46;
-    static readonly RULE_defList = 47;
-    static readonly RULE_fieldDef = 48;
-    static readonly RULE_fieldNameDef = 49;
-    static readonly RULE_joinNameDef = 50;
-    static readonly RULE_declareStatement = 51;
-    static readonly RULE_joinStatement = 52;
-    static readonly RULE_queryExtend = 53;
-    static readonly RULE_ambiguousModification = 54;
-    static readonly RULE_modEither = 55;
-    static readonly RULE_sqExpr = 56;
-    static readonly RULE_leadSeg = 57;
-    static readonly RULE_qSeg = 58;
-    static readonly RULE_queryExtendStatement = 59;
-    static readonly RULE_queryExtendStatementList = 60;
-    static readonly RULE_joinList = 61;
-    static readonly RULE_isExplore = 62;
-    static readonly RULE_joinDef = 63;
-    static readonly RULE_joinExpression = 64;
-    static readonly RULE_filterStatement = 65;
-    static readonly RULE_filteredBy = 66;
-    static readonly RULE_filterClauseList = 67;
-    static readonly RULE_whereStatement = 68;
-    static readonly RULE_havingStatement = 69;
-    static readonly RULE_subQueryDefList = 70;
-    static readonly RULE_exploreQueryNameDef = 71;
-    static readonly RULE_exploreQueryDef = 72;
-    static readonly RULE_queryStatement = 73;
-    static readonly RULE_queryJoinStatement = 74;
-    static readonly RULE_groupByStatement = 75;
-    static readonly RULE_queryFieldList = 76;
-    static readonly RULE_queryFieldEntry = 77;
-    static readonly RULE_nestStatement = 78;
-    static readonly RULE_nestedQueryList = 79;
-    static readonly RULE_nestEntry = 80;
-    static readonly RULE_aggregateStatement = 81;
-    static readonly RULE_calculateStatement = 82;
-    static readonly RULE_projectStatement = 83;
-    static readonly RULE_orderByStatement = 84;
-    static readonly RULE_ordering = 85;
-    static readonly RULE_orderBySpec = 86;
-    static readonly RULE_limitStatement = 87;
-    static readonly RULE_bySpec = 88;
-    static readonly RULE_topStatement = 89;
-    static readonly RULE_indexElement = 90;
-    static readonly RULE_indexFields = 91;
-    static readonly RULE_indexStatement = 92;
-    static readonly RULE_sampleStatement = 93;
-    static readonly RULE_timezoneStatement = 94;
-    static readonly RULE_queryAnnotation = 95;
-    static readonly RULE_sampleSpec = 96;
-    static readonly RULE_aggregate = 97;
-    static readonly RULE_malloyType = 98;
-    static readonly RULE_compareOp = 99;
-    static readonly RULE_string = 100;
-    static readonly RULE_shortString = 101;
-    static readonly RULE_numericLiteral = 102;
-    static readonly RULE_literal = 103;
-    static readonly RULE_dateLiteral = 104;
-    static readonly RULE_tablePath = 105;
-    static readonly RULE_tableURI = 106;
-    static readonly RULE_id = 107;
-    static readonly RULE_timeframe = 108;
-    static readonly RULE_ungroup = 109;
-    static readonly RULE_malloyOrSQLType = 110;
-    static readonly RULE_fieldExpr = 111;
-    static readonly RULE_partialAllowedFieldExpr = 112;
-    static readonly RULE_pickStatement = 113;
-    static readonly RULE_pick = 114;
-    static readonly RULE_argumentList = 115;
-    static readonly RULE_fieldNameList = 116;
-    static readonly RULE_fieldCollection = 117;
-    static readonly RULE_collectionWildCard = 118;
-    static readonly RULE_starQualified = 119;
-    static readonly RULE_taggedRef = 120;
-    static readonly RULE_refExpr = 121;
-    static readonly RULE_collectionMember = 122;
-    static readonly RULE_fieldPath = 123;
-    static readonly RULE_joinName = 124;
-    static readonly RULE_fieldName = 125;
-    static readonly RULE_justExpr = 126;
-    static readonly RULE_sqlExploreNameRef = 127;
-    static readonly RULE_nameSQLBlock = 128;
-    static readonly RULE_connectionName = 129;
-    static readonly RULE_experimentalStatementForTesting = 130;
+    static readonly RULE_queryName = 34;
+    static readonly RULE_sourcePropertyList = 35;
+    static readonly RULE_sourceDefinition = 36;
+    static readonly RULE_sqExplore = 37;
+    static readonly RULE_sourceNameDef = 38;
+    static readonly RULE_sourceID = 39;
+    static readonly RULE_exploreProperties = 40;
+    static readonly RULE_exploreStatement = 41;
+    static readonly RULE_defMeasures = 42;
+    static readonly RULE_defDimensions = 43;
+    static readonly RULE_renameList = 44;
+    static readonly RULE_exploreRenameDef = 45;
+    static readonly RULE_defList = 46;
+    static readonly RULE_fieldDef = 47;
+    static readonly RULE_fieldNameDef = 48;
+    static readonly RULE_joinNameDef = 49;
+    static readonly RULE_declareStatement = 50;
+    static readonly RULE_joinStatement = 51;
+    static readonly RULE_queryExtend = 52;
+    static readonly RULE_ambiguousModification = 53;
+    static readonly RULE_modEither = 54;
+    static readonly RULE_sqExpr = 55;
+    static readonly RULE_leadSeg = 56;
+    static readonly RULE_qSeg = 57;
+    static readonly RULE_queryExtendStatement = 58;
+    static readonly RULE_queryExtendStatementList = 59;
+    static readonly RULE_joinList = 60;
+    static readonly RULE_isExplore = 61;
+    static readonly RULE_joinDef = 62;
+    static readonly RULE_joinExpression = 63;
+    static readonly RULE_filterStatement = 64;
+    static readonly RULE_filteredBy = 65;
+    static readonly RULE_filterClauseList = 66;
+    static readonly RULE_whereStatement = 67;
+    static readonly RULE_havingStatement = 68;
+    static readonly RULE_subQueryDefList = 69;
+    static readonly RULE_exploreQueryNameDef = 70;
+    static readonly RULE_exploreQueryDef = 71;
+    static readonly RULE_queryStatement = 72;
+    static readonly RULE_queryJoinStatement = 73;
+    static readonly RULE_groupByStatement = 74;
+    static readonly RULE_queryFieldList = 75;
+    static readonly RULE_queryFieldEntry = 76;
+    static readonly RULE_nestStatement = 77;
+    static readonly RULE_nestedQueryList = 78;
+    static readonly RULE_nestEntry = 79;
+    static readonly RULE_aggregateStatement = 80;
+    static readonly RULE_calculateStatement = 81;
+    static readonly RULE_projectStatement = 82;
+    static readonly RULE_orderByStatement = 83;
+    static readonly RULE_ordering = 84;
+    static readonly RULE_orderBySpec = 85;
+    static readonly RULE_limitStatement = 86;
+    static readonly RULE_bySpec = 87;
+    static readonly RULE_topStatement = 88;
+    static readonly RULE_indexElement = 89;
+    static readonly RULE_indexFields = 90;
+    static readonly RULE_indexStatement = 91;
+    static readonly RULE_sampleStatement = 92;
+    static readonly RULE_timezoneStatement = 93;
+    static readonly RULE_queryAnnotation = 94;
+    static readonly RULE_sampleSpec = 95;
+    static readonly RULE_aggregate = 96;
+    static readonly RULE_malloyType = 97;
+    static readonly RULE_compareOp = 98;
+    static readonly RULE_string = 99;
+    static readonly RULE_shortString = 100;
+    static readonly RULE_numericLiteral = 101;
+    static readonly RULE_literal = 102;
+    static readonly RULE_dateLiteral = 103;
+    static readonly RULE_tablePath = 104;
+    static readonly RULE_tableURI = 105;
+    static readonly RULE_id = 106;
+    static readonly RULE_timeframe = 107;
+    static readonly RULE_ungroup = 108;
+    static readonly RULE_malloyOrSQLType = 109;
+    static readonly RULE_fieldExpr = 110;
+    static readonly RULE_partialAllowedFieldExpr = 111;
+    static readonly RULE_pickStatement = 112;
+    static readonly RULE_pick = 113;
+    static readonly RULE_argumentList = 114;
+    static readonly RULE_fieldNameList = 115;
+    static readonly RULE_fieldCollection = 116;
+    static readonly RULE_collectionWildCard = 117;
+    static readonly RULE_starQualified = 118;
+    static readonly RULE_taggedRef = 119;
+    static readonly RULE_refExpr = 120;
+    static readonly RULE_collectionMember = 121;
+    static readonly RULE_fieldPath = 122;
+    static readonly RULE_joinName = 123;
+    static readonly RULE_fieldName = 124;
+    static readonly RULE_justExpr = 125;
+    static readonly RULE_sqlExploreNameRef = 126;
+    static readonly RULE_nameSQLBlock = 127;
+    static readonly RULE_connectionName = 128;
+    static readonly RULE_experimentalStatementForTesting = 129;
     static readonly ruleNames: string[];
     private static readonly _LITERAL_NAMES;
     private static readonly _SYMBOLIC_NAMES;
@@ -335,7 +334,6 @@ export declare class MalloyParser extends Parser {
     connectionId(): ConnectionIdContext;
     queryProperties(): QueryPropertiesContext;
     filterShortcut(): FilterShortcutContext;
-    exploreQueryName(): ExploreQueryNameContext;
     queryName(): QueryNameContext;
     sourcePropertyList(): SourcePropertyListContext;
     sourceDefinition(): SourceDefinitionContext;
@@ -711,7 +709,7 @@ export declare class QueryRefinementContext extends ParserRuleContext {
     queryProperties(): QueryPropertiesContext | undefined;
     REFINE(): TerminalNode | undefined;
     refineOperator(): RefineOperatorContext | undefined;
-    turtleName(): TurtleNameContext | undefined;
+    fieldPath(): FieldPathContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;
@@ -757,7 +755,7 @@ export declare class FirstSegmentContext extends ParserRuleContext {
     ARROW(): TerminalNode | undefined;
     queryRefinement(): QueryRefinementContext[];
     queryRefinement(i: number): QueryRefinementContext;
-    exploreQueryName(): ExploreQueryNameContext | undefined;
+    fieldPath(): FieldPathContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
     enterRule(listener: MalloyParserListener): void;
@@ -833,14 +831,6 @@ export declare class FilterShortcutContext extends ParserRuleContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
-export declare class ExploreQueryNameContext extends ParserRuleContext {
-    id(): IdContext;
-    constructor(parent: ParserRuleContext | undefined, invokingState: number);
-    get ruleIndex(): number;
-    enterRule(listener: MalloyParserListener): void;
-    exitRule(listener: MalloyParserListener): void;
-    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
-}
 export declare class QueryNameContext extends ParserRuleContext {
     id(): IdContext;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -1245,7 +1235,7 @@ export declare class SQSQLContext extends SqExprContext {
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class LeadSegContext extends ParserRuleContext {
-    id(): IdContext | undefined;
+    fieldPath(): FieldPathContext | undefined;
     queryRefinement(): QueryRefinementContext[];
     queryRefinement(i: number): QueryRefinementContext;
     queryProperties(): QueryPropertiesContext | undefined;
@@ -1256,7 +1246,7 @@ export declare class LeadSegContext extends ParserRuleContext {
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
 export declare class QSegContext extends ParserRuleContext {
-    id(): IdContext | undefined;
+    fieldPath(): FieldPathContext | undefined;
     queryProperties(): QueryPropertiesContext | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
     get ruleIndex(): number;
@@ -1528,7 +1518,7 @@ export declare class NestEntryContext extends ParserRuleContext {
 }
 export declare class NestExistingContext extends NestEntryContext {
     tags(): TagsContext;
-    queryName(): QueryNameContext;
+    fieldPath(): FieldPathContext;
     queryRefinement(): QueryRefinementContext[];
     queryRefinement(i: number): QueryRefinementContext;
     constructor(ctx: NestEntryContext);