@malloydata/render 0.0.123-dev240203154014 → 0.0.123-dev240205203117

package/dist/bundle/bundled_renderer.js

@@ -226,6 +226,7 @@
           between: options === null || options === void 0 ? void 0 : options.between,
           isSymmetric: options === null || options === void 0 ? void 0 : options.isSymmetric,
           supportsOrderBy: options === null || options === void 0 ? void 0 : options.supportsOrderBy,
+          defaultOrderByArgIndex: options === null || options === void 0 ? void 0 : options.defaultOrderByArgIndex,
           supportsLimit: options === null || options === void 0 ? void 0 : options.supportsLimit
         };
       }
@@ -1354,6 +1355,9 @@
               case "function_parameter":
               case "parameter":
               case "outputField":
+              case "source-reference":
+              case "aggregate_limit":
+              case "aggregate_order_by":
                 return fragment2;
               case "sql-string":
                 return {
@@ -1460,6 +1464,9 @@
             case "function_parameter":
             case "parameter":
             case "outputField":
+            case "source-reference":
+            case "aggregate_limit":
+            case "aggregate_order_by":
               return fragment;
             case "function_call":
               return {
@@ -1533,7 +1540,7 @@
               }
             }
             default:
-              throw new Error("unexpected");
+              throw new Error(`unexpected fragment type ${fragment.type}`);
           }
         });
       }
@@ -2461,8 +2468,8 @@
         const separator = (0, util_1.makeParam)("separator", (0, util_1.literal)((0, util_1.maxScalar)("string")));
         const orderBy = { type: "aggregate_order_by" };
         return [
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(${value3.arg}${orderBy})`, { supportsOrderBy: true }),
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(${value3.arg}, ${separator.arg}${orderBy})`, { supportsOrderBy: true })
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(${value3.arg}${orderBy})`, { supportsOrderBy: true, defaultOrderByArgIndex: 0 }),
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(${value3.arg}, ${separator.arg}${orderBy})`, { supportsOrderBy: true, defaultOrderByArgIndex: 0 })
         ];
       }
       exports.fnStringAgg = fnStringAgg;
@@ -2471,8 +2478,16 @@
         const separator = (0, util_1.makeParam)("separator", (0, util_1.literal)((0, util_1.maxScalar)("string")));
         const orderBy = { type: "aggregate_order_by" };
         return [
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}${orderBy})`, { isSymmetric: true, supportsOrderBy: true }),
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}, ${separator.arg}${orderBy})`, { isSymmetric: true, supportsOrderBy: true })
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}${orderBy})`, {
+            isSymmetric: true,
+            supportsOrderBy: "only_default",
+            defaultOrderByArgIndex: 0
+          }),
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}, ${separator.arg}${orderBy})`, {
+            isSymmetric: true,
+            supportsOrderBy: "only_default",
+            defaultOrderByArgIndex: 0
+          })
         ];
       }
       exports.fnStringAggDistinct = fnStringAggDistinct;
@@ -2668,8 +2683,8 @@
         const orderBy = { type: "aggregate_order_by" };
         const limit = { type: "aggregate_limit" };
         return [
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(${value3.arg}${orderBy}${limit})`, { supportsOrderBy: true, supportsLimit: true }),
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(${value3.arg}, ${separator.arg}${orderBy}${limit})`, { supportsOrderBy: true, supportsLimit: true })
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(${value3.arg}${orderBy}${limit})`, { supportsOrderBy: true, supportsLimit: true, defaultOrderByArgIndex: 0 }),
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(${value3.arg}, ${separator.arg}${orderBy}${limit})`, { supportsOrderBy: true, supportsLimit: true, defaultOrderByArgIndex: 0 })
         ];
       }
       exports.fnStringAgg = fnStringAgg;
@@ -2679,8 +2694,18 @@
         const orderBy = { type: "aggregate_order_by" };
         const limit = { type: "aggregate_limit" };
         return [
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}${orderBy}${limit})`, { isSymmetric: true, supportsOrderBy: true, supportsLimit: true }),
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}, ${separator.arg}${orderBy}${limit})`, { isSymmetric: true, supportsOrderBy: true, supportsLimit: true })
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}${orderBy}${limit})`, {
+            isSymmetric: true,
+            supportsOrderBy: "only_default",
+            supportsLimit: true,
+            defaultOrderByArgIndex: 0
+          }),
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}, ${separator.arg}${orderBy}${limit})`, {
+            isSymmetric: true,
+            supportsOrderBy: "only_default",
+            supportsLimit: true,
+            defaultOrderByArgIndex: 0
+          })
         ];
       }
       exports.fnStringAggDistinct = fnStringAggDistinct;
@@ -3234,8 +3259,16 @@ ${(0, utils_1.indent)(sql)}
         const separator = (0, util_1.makeParam)("separator", (0, util_1.literal)((0, util_1.maxScalar)("string")));
         const orderBy = { type: "aggregate_order_by" };
         return [
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}, ','${orderBy})`, { isSymmetric: true, supportsOrderBy: true }),
-          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}, ${separator.arg}${orderBy})`, { isSymmetric: true, supportsOrderBy: true })
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}, ','${orderBy})`, {
+            isSymmetric: true,
+            supportsOrderBy: "only_default",
+            defaultOrderByArgIndex: 0
+          }),
+          (0, util_1.overload)((0, util_1.minAggregate)("string"), [value3.param, separator.param], (0, util_1.sql)`STRING_AGG(DISTINCT ${value3.arg}, ${separator.arg}${orderBy})`, {
+            isSymmetric: true,
+            supportsOrderBy: "only_default",
+            defaultOrderByArgIndex: 0
+          })
         ];
       }
       exports.fnStringAggDistinct = fnStringAggDistinct;
@@ -4734,6 +4767,7 @@ ${hackSplitComment}
                 existingOverload.dialect[dialect.name] = {
                   e: overload.e,
                   supportsOrderBy: overload.supportsOrderBy,
+                  defaultOrderByArgIndex: overload.defaultOrderByArgIndex,
                   supportsLimit: overload.supportsLimit
                 };
                 handled = true;
@@ -4746,6 +4780,7 @@ ${hackSplitComment}
                     [dialect.name]: {
                       e: overload.e,
                       supportsOrderBy: overload.supportsOrderBy,
+                      defaultOrderByArgIndex: overload.defaultOrderByArgIndex,
                       supportsLimit: overload.supportsLimit
                     }
                   },
@@ -4872,7 +4907,7 @@ ${hackSplitComment}
           }
         }
         hasAsymetricFunctions() {
-          return this.has("sum") || this.has("avg") || this.has("count");
+          return this.has("sum") || this.has("avg") || this.has("count") || this.has("generic_asymmetric_aggregate");
         }
       };
       var StageWriter = class {
@@ -5091,40 +5126,91 @@ ${(0, utils_1.indent)(sql)})
             return [fragment];
           });
         }
+        getFunctionOrderBy(resultSet, context3, state, orderBy, args, overload) {
+          if (orderBy.length === 0)
+            return void 0;
+          return "ORDER BY " + orderBy.map((ob) => {
+            var _a, _b;
+            const defaultOrderByArgIndex = (_a = overload.dialect[context3.dialect.name].defaultOrderByArgIndex) !== null && _a !== void 0 ? _a : 0;
+            const expr2 = (_b = ob.e) !== null && _b !== void 0 ? _b : args[defaultOrderByArgIndex];
+            const osql = this.generateDimFragment(resultSet, context3, expr2, state);
+            const dirsql = ob.dir === "asc" ? " ASC" : ob.dir === "desc" ? " DESC" : "";
+            return `${osql}${dirsql}`;
+          }).join(", ");
+        }
+        generateAsymmetricStringAggExpression(resultSet, context3, value3, separator, distinctKey, orderBy, dialectName, state) {
+          if (orderBy) {
+            throw new Error(`Function \`string_agg\` does not support fanning out with an order by in ${dialectName}`);
+          }
+          const valueSQL = this.generateDimFragment(resultSet, context3, value3, state);
+          const separatorSQL = separator ? " ," + this.generateDimFragment(resultSet, context3, separator, state) : "";
+          const keyStart = "__STRING_AGG_KS__";
+          const keyEnd = "__STRING_AGG_KE__";
+          const distinctValueSQL = `concat('${keyStart}', ${distinctKey}, '${keyEnd}', ${valueSQL})`;
+          return `REGEXP_REPLACE(
+      STRING_AGG(DISTINCT ${distinctValueSQL}${separatorSQL}),
+      '${keyStart}.*?${keyEnd}',
+      ''
+    )`;
+        }
+        getParamForArgIndex(params2, argIndex) {
+          const prevVariadic = params2.slice(0, argIndex).find((p3) => p3.isVariadic);
+          return prevVariadic !== null && prevVariadic !== void 0 ? prevVariadic : params2[argIndex];
+        }
         generateFunctionCallExpression(resultSet, context3, frag, state) {
-          var _a, _b;
+          var _a, _b, _c2;
           const overload = frag.overload;
           const args = frag.args;
           const isSymmetric = (_a = frag.overload.isSymmetric) !== null && _a !== void 0 ? _a : false;
           const distinctKey = (0, malloy_types_1.expressionIsAggregate)(overload.returnType.expressionType) && !isSymmetric && this.generateDistinctKeyIfNecessary(resultSet, context3, frag.structPath);
-          const aggregateOrderBy = frag.orderBy ? "ORDER BY " + frag.orderBy.map((ob) => {
-            const osql = this.generateDimFragment(resultSet, context3, ob.e, state);
-            const dirsql = ob.dir === "asc" ? " ASC" : ob.dir === "desc" ? " DESC" : "";
-            return `${osql}${dirsql}`;
-          }).join(", ") : void 0;
           const aggregateLimit = frag.limit ? `LIMIT ${frag.limit}` : void 0;
+          if (frag.name === "string_agg" && distinctKey && !context3.dialect.supportsAggDistinct) {
+            return this.generateAsymmetricStringAggExpression(resultSet, context3, args[0], args[1], distinctKey, frag.orderBy, context3.dialect.name, state);
+          }
           if (distinctKey) {
             if (!context3.dialect.supportsAggDistinct) {
-              throw new Error(`Asymmetric aggregates are not supported for custom functions in ${context3.dialect.name}.`);
+              throw new Error(`Function \`${frag.name}\` does not support fanning out in ${context3.dialect.name}`);
             }
             const argsExpressions = args.map((arg) => {
               return this.generateDimFragment(resultSet, context3, arg, state);
             });
-            return context3.dialect.sqlAggDistinct(distinctKey, argsExpressions, (valNames) => {
-              const funcCall = this.expandFunctionCall(context3.dialect.name, overload, valNames.map((v6) => [v6]), aggregateOrderBy, aggregateLimit);
+            const orderBys = (_b = frag.orderBy) !== null && _b !== void 0 ? _b : [];
+            const orderByExpressions = orderBys.map((ob) => {
+              var _a2, _b2;
+              const defaultOrderByArgIndex = (_a2 = overload.dialect[context3.dialect.name].defaultOrderByArgIndex) !== null && _a2 !== void 0 ? _a2 : 0;
+              const expr2 = (_b2 = ob.e) !== null && _b2 !== void 0 ? _b2 : args[defaultOrderByArgIndex];
+              return this.generateDimFragment(resultSet, context3, expr2, state);
+            });
+            return context3.dialect.sqlAggDistinct(distinctKey, [...argsExpressions, ...orderByExpressions], (valNames) => {
+              const vals2 = valNames.map((v6, i6) => {
+                if (i6 < args.length) {
+                  const param2 = this.getParamForArgIndex(overload.params, i6);
+                  if (param2.allowedTypes.every((t9) => (0, malloy_types_1.isLiteral)(t9.evalSpace))) {
+                    return args[i6];
+                  }
+                }
+                return [v6];
+              });
+              const newArgs = vals2.slice(0, argsExpressions.length);
+              const orderBy = vals2.slice(argsExpressions.length).map((e12, i6) => {
+                return { e: e12, dir: orderBys[i6].dir };
+              });
+              const orderBySQL = this.getFunctionOrderBy(resultSet, context3, state, orderBy, newArgs, overload);
+              const funcCall = this.expandFunctionCall(context3.dialect.name, overload, newArgs, orderBySQL, aggregateLimit);
               return this.generateExpressionFromExpr(resultSet, context3, funcCall, state);
             });
           } else {
             const mappedArgs = (0, malloy_types_1.expressionIsAggregate)(overload.returnType.expressionType) ? args.map((arg, index3) => {
-              const param2 = overload.params[index3];
+              const param2 = this.getParamForArgIndex(overload.params, index3);
               return param2.allowedTypes.every((t9) => (0, malloy_types_1.isLiteral)(t9.evalSpace)) ? arg : [this.generateDimFragment(resultSet, context3, arg, state)];
             }) : args;
-            const funcCall = this.expandFunctionCall(context3.dialect.name, overload, mappedArgs, aggregateOrderBy, aggregateLimit);
+            const orderBySql = frag.orderBy ? this.getFunctionOrderBy(resultSet, context3, state, frag.orderBy, args, overload) : "";
+            const funcCall = this.expandFunctionCall(context3.dialect.name, overload, mappedArgs, orderBySql, aggregateLimit);
             if ((0, malloy_types_1.expressionIsAnalytic)(overload.returnType.expressionType)) {
-              const extraPartitions = ((_b = frag.partitionBy) !== null && _b !== void 0 ? _b : []).map((outputName) => {
+              const extraPartitions = ((_c2 = frag.partitionBy) !== null && _c2 !== void 0 ? _c2 : []).map((outputName) => {
                 return `(${resultSet.getField(outputName).getAnalyticalSQL(false)})`;
               });
-              return this.generateAnalyticFragment(resultSet, context3, funcCall, overload, state, args, extraPartitions, aggregateOrderBy);
+              return this.generateAnalyticFragment(resultSet, context3, funcCall, overload, state, args, extraPartitions, orderBySql);
             }
             return this.generateExpressionFromExpr(resultSet, context3, funcCall, state);
           }
@@ -6071,6 +6157,7 @@ ${(0, utils_1.indent)(sql)})
           resultStruct.root().addStructToJoin(struct.getJoinableParent(), this, uniqueKeyPossibleUse, joinStack);
         }
         addDependantExpr(resultStruct, context3, e12, joinStack) {
+          var _a;
           for (const expr2 of e12) {
             if ((0, malloy_types_1.isFunctionCallFragment)(expr2) && (0, malloy_types_1.expressionIsAnalytic)(expr2.overload.returnType.expressionType) && this.parent.dialect.cantPartitionWindowFunctionsOnExpressions) {
               resultStruct.root().isComplexQuery = true;
@@ -6148,8 +6235,14 @@ ${(0, utils_1.indent)(sql)})
               }
               this.addDependantExpr(resultStruct, context3, expr2.e, joinStack);
             } else if ((0, malloy_types_1.isFunctionCallFragment)(expr2)) {
+              const isSymmetric = (_a = expr2.overload.isSymmetric) !== null && _a !== void 0 ? _a : false;
+              const isAggregate3 = (0, malloy_types_1.expressionIsAggregate)(expr2.overload.returnType.expressionType);
+              const isAsymmetricAggregate = isAggregate3 && !isSymmetric;
+              const uniqueKeyPossibleUse = isAsymmetricAggregate ? "generic_asymmetric_aggregate" : void 0;
               if (expr2.structPath) {
-                this.addDependantPath(resultStruct, context3, expr2.structPath, "generic_aggregate", joinStack);
+                this.addDependantPath(resultStruct, context3, expr2.structPath, uniqueKeyPossibleUse, joinStack);
+              } else if (isAsymmetricAggregate) {
+                resultStruct.addStructToJoin(context3, this, uniqueKeyPossibleUse, joinStack);
               }
               for (const e13 of expr2.args) {
                 this.addDependantExpr(resultStruct, context3, e13, joinStack);
@@ -6159,7 +6252,9 @@ ${(0, utils_1.indent)(sql)})
               }
               if (expr2.orderBy) {
                 for (const ob of expr2.orderBy) {
-                  this.addDependantExpr(resultStruct, context3, ob.e, joinStack);
+                  if (ob.e) {
+                    this.addDependantExpr(resultStruct, context3, ob.e, joinStack);
+                  }
                 }
               }
             }
@@ -33333,9 +33428,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.DefExploreEditFieldContext = exports.DefExploreRenameContext = exports.DefExplorePrimaryKeyContext = exports.DefExploreWhere_stubContext = exports.DefJoin_stubContext = exports.DefDeclare_stubContext = exports.DefExploreMeasure_stubContext = exports.DefExploreDimension_stubContext = exports.ExploreStatementContext = exports.ExplorePropertiesContext = exports.SourceIDContext = exports.SourceNameDefContext = exports.SqExploreContext = exports.SourceDefinitionContext = exports.SourcePropertyListContext = exports.QueryNameContext = exports.FilterShortcutContext = exports.QueryPropertiesContext = exports.ConnectionIdContext = exports.TableMethodContext = exports.TableFunctionContext = exports.ExploreTableContext = exports.SqlSourceContext = exports.TurtleNameContext = exports.RefineOperatorContext = exports.TopLevelQueryDefContext = exports.TopLevelQueryDefsContext = exports.IgnoredModelAnnotationsContext = exports.IgnoredObjectAnnotationsContext = exports.DocAnnotationsContext = exports.ImportURLContext = exports.ImportItemContext = exports.ImportSelectContext = exports.ImportStatementContext = exports.SqlInterpolationContext = exports.SqlStringContext = exports.BlockSQLDefContext = exports.SqlBlockContext = exports.DefineSQLStatementContext = exports.RunStatementContext = exports.IsDefineContext = exports.TagsContext = exports.TopLevelAnonQueryDefContext = exports.AnonymousQueryContext = exports.Use_top_level_query_defsContext = exports.DefineQueryContext = exports.DefineSourceStatementContext = exports.MalloyStatementContext = exports.MalloyDocumentContext = exports.MalloyParser = void 0;
       exports.FieldPropertyLimitStatementContext = exports.AggregateOrderByStatementContext = exports.AggregateOrderBySpecContext = exports.AggregateOrderingContext = exports.FieldPropertiesContext = exports.FilterStatementContext = exports.JoinExpressionContext = exports.JoinOnContext = exports.JoinWithContext = exports.JoinDefContext = exports.MatrixOperationContext = exports.IsExploreContext = exports.JoinListContext = exports.QueryExtendStatementListContext = exports.QueryExtendStatementContext = exports.VArrowContext = exports.VSegContext = exports.VExprContext = exports.SegRefineContext = exports.SegParenContext = exports.SegOpsContext = exports.SegFieldContext = exports.SegExprContext = exports.SQSQLContext = exports.SQTableContext = exports.SQExtendedSourceContext = exports.SQArrowContext = exports.SQRefinedQueryContext = exports.SQParensContext = exports.SQIDContext = exports.SqExprContext = exports.ModEitherContext = exports.QueryExtendContext = exports.DefJoinCrossContext = exports.DefJoinManyContext = exports.DefJoinOneContext = exports.JoinStatementContext = exports.DeclareStatementContext = exports.JoinNameDefContext = exports.FieldNameDefContext = exports.FieldDefContext = exports.DefListContext = exports.ExploreRenameDefContext = exports.RenameListContext = exports.DefDimensionsContext = exports.DefMeasuresContext = exports.DefIgnoreModel_stubContext = exports.DefExploreAnnotationContext = exports.DefExploreTimezoneContext = exports.DefExploreQueryContext = void 0;
-      exports.LiteralTimestampContext = exports.DateLiteralContext = exports.ExprNowContext = exports.ExprRegexContext = exports.ExprBoolContext = exports.ExprNULLContext = exports.ExprTimeContext = exports.ExprNumberContext = exports.ExprStringContext = exports.LiteralContext = exports.NumericLiteralContext = exports.ShortStringContext = exports.StringContext = exports.CompareOpContext = exports.MalloyTypeContext = exports.AggregateContext = exports.SampleSpecContext = exports.QueryAnnotationContext = exports.TimezoneStatementContext = exports.SampleStatementContext = exports.IndexStatementContext = exports.IndexFieldsContext = exports.IndexElementContext = exports.TopStatementContext = exports.BySpecContext = exports.LimitStatementContext = exports.OrderBySpecContext = exports.OrderingContext = exports.OrderByStatementContext = exports.PartitionByStatementContext = exports.ProjectStatementContext = exports.CalculateStatementContext = exports.AggregateStatementContext = exports.NestDefContext = exports.NestExistingContext = exports.NestEntryContext = exports.NestedQueryListContext = exports.NestStatementContext = exports.QueryFieldEntryContext = exports.QueryFieldListContext = exports.GroupByStatementContext = exports.QueryJoinStatementContext = exports.QueryStatementContext = exports.ExploreQueryDefContext = exports.ExploreQueryNameDefContext = exports.SubQueryDefListContext = exports.HavingStatementContext = exports.WhereStatementContext = exports.FilterClauseListContext = exports.FieldPropertyStatementContext = void 0;
-      exports.TaggedRefContext = exports.StarQualifiedContext = exports.CollectionWildCardContext = exports.FieldCollectionContext = exports.FieldNameListContext = exports.ArgumentListContext = exports.PickContext = exports.PickStatementContext = exports.PartialAllowedFieldExprContext = exports.ExprUngroupContext = exports.ExprPickContext = exports.ExprFuncContext = exports.ExprAggFuncContext = exports.ExprExprContext = exports.ExprAggregateContext = exports.ExprPathlessAggregateContext = exports.ExprCountDisinctContext = exports.ExprCoalesceContext = exports.ExprLogicalOrContext = exports.ExprLogicalAndContext = exports.ExprNotContext = exports.ExprApplyContext = exports.ExprCompareContext = exports.ExprOrTreeContext = exports.ExprAndTreeContext = exports.ExprForRangeContext = exports.ExprRangeContext = exports.ExprAddSubContext = exports.ExprMulDivContext = exports.ExprMinusContext = exports.ExprSafeCastContext = exports.ExprCastContext = exports.ExprTimeTruncContext = exports.ExprDurationContext = exports.ExprLiteralContext = exports.ExprFieldPropsContext = exports.ExprFieldPathContext = exports.FieldExprContext = exports.MalloyOrSQLTypeContext = exports.UngroupContext = exports.TimeframeContext = exports.IdContext = exports.TableURIContext = exports.TablePathContext = exports.LiteralYearContext = exports.LiteralQuarterContext = exports.LiteralMonthContext = exports.LiteralWeekContext = exports.LiteralDayContext = exports.LiteralHourContext = void 0;
-      exports.ExperimentalStatementForTestingContext = exports.ConnectionNameContext = exports.NameSQLBlockContext = exports.SqlExploreNameRefContext = exports.JustExprContext = exports.FieldNameContext = exports.JoinNameContext = exports.FieldPathContext = exports.CollectionMemberContext = exports.RefExprContext = void 0;
+      exports.LiteralHourContext = exports.LiteralTimestampContext = exports.DateLiteralContext = exports.ExprNowContext = exports.ExprRegexContext = exports.ExprBoolContext = exports.ExprNULLContext = exports.ExprTimeContext = exports.ExprNumberContext = exports.ExprStringContext = exports.LiteralContext = exports.NumericLiteralContext = exports.ShortStringContext = exports.StringContext = exports.CompareOpContext = exports.MalloyTypeContext = exports.AggregateContext = exports.SampleSpecContext = exports.QueryAnnotationContext = exports.TimezoneStatementContext = exports.SampleStatementContext = exports.IndexStatementContext = exports.IndexFieldsContext = exports.IndexElementContext = exports.TopStatementContext = exports.BySpecContext = exports.LimitStatementContext = exports.OrderBySpecContext = exports.OrderingContext = exports.OrderByStatementContext = exports.PartitionByStatementContext = exports.ProjectStatementContext = exports.CalculateStatementContext = exports.AggregateStatementContext = exports.NestDefContext = exports.NestEntryContext = exports.NestedQueryListContext = exports.NestStatementContext = exports.QueryFieldEntryContext = exports.QueryFieldListContext = exports.GroupByStatementContext = exports.QueryJoinStatementContext = exports.QueryStatementContext = exports.ExploreQueryDefContext = exports.ExploreQueryNameDefContext = exports.SubQueryDefListContext = exports.HavingStatementContext = exports.WhereStatementContext = exports.FilterClauseListContext = exports.FieldPropertyStatementContext = void 0;
+      exports.RefExprContext = exports.TaggedRefContext = exports.StarQualifiedContext = exports.CollectionWildCardContext = exports.FieldCollectionContext = exports.FieldNameListContext = exports.ArgumentListContext = exports.PickContext = exports.PickStatementContext = exports.PartialAllowedFieldExprContext = exports.ExprUngroupContext = exports.ExprPickContext = exports.ExprFuncContext = exports.ExprAggFuncContext = exports.ExprExprContext = exports.ExprAggregateContext = exports.ExprPathlessAggregateContext = exports.ExprCountDisinctContext = exports.ExprCoalesceContext = exports.ExprLogicalOrContext = exports.ExprLogicalAndContext = exports.ExprNotContext = exports.ExprApplyContext = exports.ExprCompareContext = exports.ExprOrTreeContext = exports.ExprAndTreeContext = exports.ExprForRangeContext = exports.ExprRangeContext = exports.ExprAddSubContext = exports.ExprMulDivContext = exports.ExprMinusContext = exports.ExprSafeCastContext = exports.ExprCastContext = exports.ExprTimeTruncContext = exports.ExprDurationContext = exports.ExprLiteralContext = exports.ExprFieldPropsContext = exports.ExprFieldPathContext = exports.FieldExprContext = exports.MalloyOrSQLTypeContext = exports.UngroupContext = exports.TimeframeContext = exports.IdContext = exports.TableURIContext = exports.TablePathContext = exports.LiteralYearContext = exports.LiteralQuarterContext = exports.LiteralMonthContext = exports.LiteralWeekContext = exports.LiteralDayContext = void 0;
+      exports.ExperimentalStatementForTestingContext = exports.ConnectionNameContext = exports.NameSQLBlockContext = exports.SqlExploreNameRefContext = exports.JustExprContext = exports.FieldNameContext = exports.JoinNameContext = exports.FieldPathContext = exports.CollectionMemberContext = void 0;
       var ATN_1 = require_ATN();
       var ATNDeserializer_1 = require_ATNDeserializer();
       var FailedPredicateException_1 = require_FailedPredicateException();
@@ -36381,28 +36476,89 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           this.enterRule(_localctx, 124, _MalloyParser.RULE_aggregateOrderBySpec);
           let _la;
           try {
-            this.enterOuterAlt(_localctx, 1);
-            {
-              this.state = 727;
-              this.fieldExpr(0);
-              this.state = 729;
-              this._errHandler.sync(this);
-              _la = this._input.LA(1);
-              if (_la === _MalloyParser.ASC || _la === _MalloyParser.DESC) {
+            this.state = 733;
+            this._errHandler.sync(this);
+            switch (this._input.LA(1)) {
+              case _MalloyParser.ALL:
+              case _MalloyParser.AVG:
+              case _MalloyParser.CAST:
+              case _MalloyParser.COUNT:
+              case _MalloyParser.DAY:
+              case _MalloyParser.EXCLUDE:
+              case _MalloyParser.FALSE:
+              case _MalloyParser.HOUR:
+              case _MalloyParser.MAX:
+              case _MalloyParser.MIN:
+              case _MalloyParser.MINUTE:
+              case _MalloyParser.MONTH:
+              case _MalloyParser.NOT:
+              case _MalloyParser.NOW:
+              case _MalloyParser.NULL:
+              case _MalloyParser.PICK:
+              case _MalloyParser.QUARTER:
+              case _MalloyParser.SECOND:
+              case _MalloyParser.SOURCE_KW:
+              case _MalloyParser.SUM:
+              case _MalloyParser.TRUE:
+              case _MalloyParser.WEEK:
+              case _MalloyParser.YEAR:
+              case _MalloyParser.HACKY_REGEX:
+              case _MalloyParser.SQ_STRING:
+              case _MalloyParser.DQ_STRING:
+              case _MalloyParser.BQ_STRING:
+              case _MalloyParser.OPAREN:
+              case _MalloyParser.MINUS:
+              case _MalloyParser.LITERAL_TIMESTAMP:
+              case _MalloyParser.LITERAL_HOUR:
+              case _MalloyParser.LITERAL_DAY:
+              case _MalloyParser.LITERAL_QUARTER:
+              case _MalloyParser.LITERAL_MONTH:
+              case _MalloyParser.LITERAL_WEEK:
+              case _MalloyParser.LITERAL_YEAR:
+              case _MalloyParser.IDENTIFIER:
+              case _MalloyParser.NUMERIC_LITERAL:
+              case _MalloyParser.INTEGER_LITERAL:
+              case _MalloyParser.SQL_BEGIN:
+                this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 728;
+                  this.state = 727;
+                  this.fieldExpr(0);
+                  this.state = 729;
+                  this._errHandler.sync(this);
                   _la = this._input.LA(1);
-                  if (!(_la === _MalloyParser.ASC || _la === _MalloyParser.DESC)) {
-                    this._errHandler.recoverInline(this);
-                  } else {
-                    if (this._input.LA(1) === Token_1.Token.EOF) {
-                      this.matchedEOF = true;
+                  if (_la === _MalloyParser.ASC || _la === _MalloyParser.DESC) {
+                    {
+                      this.state = 728;
+                      _la = this._input.LA(1);
+                      if (!(_la === _MalloyParser.ASC || _la === _MalloyParser.DESC)) {
+                        this._errHandler.recoverInline(this);
+                      } else {
+                        if (this._input.LA(1) === Token_1.Token.EOF) {
+                          this.matchedEOF = true;
+                        }
+                        this._errHandler.reportMatch(this);
+                        this.consume();
+                      }
                     }
-                    this._errHandler.reportMatch(this);
-                    this.consume();
                   }
                 }
-              }
+                break;
+              case _MalloyParser.ASC:
+                this.enterOuterAlt(_localctx, 2);
+                {
+                  this.state = 731;
+                  this.match(_MalloyParser.ASC);
+                }
+                break;
+              case _MalloyParser.DESC:
+                this.enterOuterAlt(_localctx, 3);
+                {
+                  this.state = 732;
+                  this.match(_MalloyParser.DESC);
+                }
+                break;
+              default:
+                throw new NoViableAltException_1.NoViableAltException(this);
             }
           } catch (re2) {
             if (re2 instanceof RecognitionException_1.RecognitionException) {
@@ -36424,9 +36580,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 731;
+              this.state = 735;
               this.match(_MalloyParser.ORDER_BY);
-              this.state = 732;
+              this.state = 736;
               this.aggregateOrdering();
             }
           } catch (re2) {
@@ -36449,7 +36605,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 734;
+              this.state = 738;
               this.limitStatement();
             }
           } catch (re2) {
@@ -36470,34 +36626,34 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new FieldPropertyStatementContext(this._ctx, this.state);
           this.enterRule(_localctx, 130, _MalloyParser.RULE_fieldPropertyStatement);
           try {
-            this.state = 740;
+            this.state = 744;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
               case _MalloyParser.WHERE:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 736;
+                  this.state = 740;
                   this.whereStatement();
                 }
                 break;
               case _MalloyParser.PARTITION_BY:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 737;
+                  this.state = 741;
                   this.partitionByStatement();
                 }
                 break;
               case _MalloyParser.ORDER_BY:
                 this.enterOuterAlt(_localctx, 3);
                 {
-                  this.state = 738;
+                  this.state = 742;
                   this.aggregateOrderByStatement();
                 }
                 break;
               case _MalloyParser.LIMIT:
                 this.enterOuterAlt(_localctx, 4);
                 {
-                  this.state = 739;
+                  this.state = 743;
                   this.fieldPropertyLimitStatement();
                 }
                 break;
@@ -36526,32 +36682,32 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 742;
+              this.state = 746;
               this.fieldExpr(0);
-              this.state = 747;
+              this.state = 751;
               this._errHandler.sync(this);
-              _alt = this.interpreter.adaptivePredict(this._input, 65, this._ctx);
+              _alt = this.interpreter.adaptivePredict(this._input, 66, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 743;
+                      this.state = 747;
                       this.match(_MalloyParser.COMMA);
-                      this.state = 744;
+                      this.state = 748;
                       this.fieldExpr(0);
                     }
                   }
                 }
-                this.state = 749;
+                this.state = 753;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 65, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 66, this._ctx);
               }
-              this.state = 751;
+              this.state = 755;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.COMMA) {
                 {
-                  this.state = 750;
+                  this.state = 754;
                   this.match(_MalloyParser.COMMA);
                 }
               }
@@ -36576,9 +36732,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 753;
+              this.state = 757;
               this.match(_MalloyParser.WHERE);
-              this.state = 754;
+              this.state = 758;
               this.filterClauseList();
             }
           } catch (re2) {
@@ -36601,9 +36757,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 756;
+              this.state = 760;
               this.match(_MalloyParser.HAVING);
-              this.state = 757;
+              this.state = 761;
               this.filterClauseList();
             }
           } catch (re2) {
@@ -36628,39 +36784,39 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 759;
+              this.state = 763;
               this.exploreQueryDef();
-              this.state = 766;
+              this.state = 770;
               this._errHandler.sync(this);
-              _alt = this.interpreter.adaptivePredict(this._input, 68, this._ctx);
+              _alt = this.interpreter.adaptivePredict(this._input, 69, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 761;
+                      this.state = 765;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if (_la === _MalloyParser.COMMA) {
                         {
-                          this.state = 760;
+                          this.state = 764;
                           this.match(_MalloyParser.COMMA);
                         }
                       }
-                      this.state = 763;
+                      this.state = 767;
                       this.exploreQueryDef();
                     }
                   }
                 }
-                this.state = 768;
+                this.state = 772;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 68, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 69, this._ctx);
               }
-              this.state = 770;
+              this.state = 774;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.COMMA) {
                 {
-                  this.state = 769;
+                  this.state = 773;
                   this.match(_MalloyParser.COMMA);
                 }
               }
@@ -36685,7 +36841,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 772;
+              this.state = 776;
               this.id();
             }
           } catch (re2) {
@@ -36709,25 +36865,25 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 777;
+              this.state = 781;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               while (_la === _MalloyParser.ANNOTATION) {
                 {
                   {
-                    this.state = 774;
+                    this.state = 778;
                     this.match(_MalloyParser.ANNOTATION);
                   }
                 }
-                this.state = 779;
+                this.state = 783;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
               }
-              this.state = 780;
+              this.state = 784;
               this.exploreQueryNameDef();
-              this.state = 781;
+              this.state = 785;
               this.isDefine();
-              this.state = 782;
+              this.state = 786;
               this.vExpr();
             }
           } catch (re2) {
@@ -36748,132 +36904,132 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new QueryStatementContext(this._ctx, this.state);
           this.enterRule(_localctx, 144, _MalloyParser.RULE_queryStatement);
           try {
-            this.state = 802;
+            this.state = 806;
             this._errHandler.sync(this);
-            switch (this.interpreter.adaptivePredict(this._input, 71, this._ctx)) {
+            switch (this.interpreter.adaptivePredict(this._input, 72, this._ctx)) {
               case 1:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 784;
+                  this.state = 788;
                   this.groupByStatement();
                 }
                 break;
               case 2:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 785;
+                  this.state = 789;
                   this.declareStatement();
                 }
                 break;
               case 3:
                 this.enterOuterAlt(_localctx, 3);
                 {
-                  this.state = 786;
+                  this.state = 790;
                   this.queryJoinStatement();
                 }
                 break;
               case 4:
                 this.enterOuterAlt(_localctx, 4);
                 {
-                  this.state = 787;
+                  this.state = 791;
                   this.queryExtend();
                 }
                 break;
               case 5:
                 this.enterOuterAlt(_localctx, 5);
                 {
-                  this.state = 788;
+                  this.state = 792;
                   this.projectStatement();
                 }
                 break;
               case 6:
                 this.enterOuterAlt(_localctx, 6);
                 {
-                  this.state = 789;
+                  this.state = 793;
                   this.indexStatement();
                 }
                 break;
               case 7:
                 this.enterOuterAlt(_localctx, 7);
                 {
-                  this.state = 790;
+                  this.state = 794;
                   this.aggregateStatement();
                 }
                 break;
               case 8:
                 this.enterOuterAlt(_localctx, 8);
                 {
-                  this.state = 791;
+                  this.state = 795;
                   this.calculateStatement();
                 }
                 break;
               case 9:
                 this.enterOuterAlt(_localctx, 9);
                 {
-                  this.state = 792;
+                  this.state = 796;
                   this.topStatement();
                 }
                 break;
               case 10:
                 this.enterOuterAlt(_localctx, 10);
                 {
-                  this.state = 793;
+                  this.state = 797;
                   this.limitStatement();
                 }
                 break;
               case 11:
                 this.enterOuterAlt(_localctx, 11);
                 {
-                  this.state = 794;
+                  this.state = 798;
                   this.orderByStatement();
                 }
                 break;
               case 12:
                 this.enterOuterAlt(_localctx, 12);
                 {
-                  this.state = 795;
+                  this.state = 799;
                   this.whereStatement();
                 }
                 break;
               case 13:
                 this.enterOuterAlt(_localctx, 13);
                 {
-                  this.state = 796;
+                  this.state = 800;
                   this.havingStatement();
                 }
                 break;
               case 14:
                 this.enterOuterAlt(_localctx, 14);
                 {
-                  this.state = 797;
+                  this.state = 801;
                   this.nestStatement();
                 }
                 break;
               case 15:
                 this.enterOuterAlt(_localctx, 15);
                 {
-                  this.state = 798;
+                  this.state = 802;
                   this.sampleStatement();
                 }
                 break;
               case 16:
                 this.enterOuterAlt(_localctx, 16);
                 {
-                  this.state = 799;
+                  this.state = 803;
                   this.timezoneStatement();
                 }
                 break;
               case 17:
                 this.enterOuterAlt(_localctx, 17);
                 {
-                  this.state = 800;
+                  this.state = 804;
                   this.queryAnnotation();
                 }
                 break;
               case 18:
                 this.enterOuterAlt(_localctx, 18);
                 {
-                  this.state = 801;
+                  this.state = 805;
                   this.ignoredModelAnnotations();
                 }
                 break;
@@ -36898,7 +37054,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 804;
+              this.state = 808;
               this.joinStatement();
             }
           } catch (re2) {
@@ -36921,11 +37077,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 806;
+              this.state = 810;
               this.tags();
-              this.state = 807;
+              this.state = 811;
               this.match(_MalloyParser.GROUP_BY);
-              this.state = 808;
+              this.state = 812;
               this.queryFieldList();
             }
           } catch (re2) {
@@ -36950,39 +37106,39 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 810;
+              this.state = 814;
               this.queryFieldEntry();
-              this.state = 817;
+              this.state = 821;
               this._errHandler.sync(this);
-              _alt = this.interpreter.adaptivePredict(this._input, 73, this._ctx);
+              _alt = this.interpreter.adaptivePredict(this._input, 74, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 812;
+                      this.state = 816;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if (_la === _MalloyParser.COMMA) {
                         {
-                          this.state = 811;
+                          this.state = 815;
                           this.match(_MalloyParser.COMMA);
                         }
                       }
-                      this.state = 814;
+                      this.state = 818;
                       this.queryFieldEntry();
                     }
                   }
                 }
-                this.state = 819;
+                this.state = 823;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 73, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 74, this._ctx);
               }
-              this.state = 821;
+              this.state = 825;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.COMMA) {
                 {
-                  this.state = 820;
+                  this.state = 824;
                   this.match(_MalloyParser.COMMA);
                 }
               }
@@ -37005,20 +37161,20 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new QueryFieldEntryContext(this._ctx, this.state);
           this.enterRule(_localctx, 152, _MalloyParser.RULE_queryFieldEntry);
           try {
-            this.state = 825;
+            this.state = 829;
             this._errHandler.sync(this);
-            switch (this.interpreter.adaptivePredict(this._input, 75, this._ctx)) {
+            switch (this.interpreter.adaptivePredict(this._input, 76, this._ctx)) {
               case 1:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 823;
+                  this.state = 827;
                   this.taggedRef();
                 }
                 break;
               case 2:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 824;
+                  this.state = 828;
                   this.fieldDef();
                 }
                 break;
@@ -37043,11 +37199,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 827;
+              this.state = 831;
               this.tags();
-              this.state = 828;
+              this.state = 832;
               this.match(_MalloyParser.NEST);
-              this.state = 829;
+              this.state = 833;
               this.nestedQueryList();
             }
           } catch (re2) {
@@ -37072,39 +37228,39 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 831;
+              this.state = 835;
               this.nestEntry();
-              this.state = 838;
+              this.state = 842;
               this._errHandler.sync(this);
-              _alt = this.interpreter.adaptivePredict(this._input, 77, this._ctx);
+              _alt = this.interpreter.adaptivePredict(this._input, 78, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 833;
+                      this.state = 837;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if (_la === _MalloyParser.COMMA) {
                         {
-                          this.state = 832;
+                          this.state = 836;
                           this.match(_MalloyParser.COMMA);
                         }
                       }
-                      this.state = 835;
+                      this.state = 839;
                       this.nestEntry();
                     }
                   }
                 }
-                this.state = 840;
+                this.state = 844;
                 this._errHandler.sync(this);
-                _alt = this.interpreter.adaptivePredict(this._input, 77, this._ctx);
+                _alt = this.interpreter.adaptivePredict(this._input, 78, this._ctx);
               }
-              this.state = 842;
+              this.state = 846;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.COMMA) {
                 {
-                  this.state = 841;
+                  this.state = 845;
                   this.match(_MalloyParser.COMMA);
                 }
               }
@@ -37126,46 +37282,26 @@ ${struct.dialect.sqlFinalStage("__stage0", [
         nestEntry() {
           let _localctx = new NestEntryContext(this._ctx, this.state);
           this.enterRule(_localctx, 158, _MalloyParser.RULE_nestEntry);
-          let _la;
           try {
-            this.state = 855;
-            this._errHandler.sync(this);
-            switch (this.interpreter.adaptivePredict(this._input, 80, this._ctx)) {
-              case 1:
-                _localctx = new NestExistingContext(_localctx);
-                this.enterOuterAlt(_localctx, 1);
-                {
-                  this.state = 844;
-                  this.tags();
-                  this.state = 845;
-                  this.fieldPath();
-                  this.state = 848;
-                  this._errHandler.sync(this);
-                  _la = this._input.LA(1);
-                  if (_la === _MalloyParser.PLUS) {
-                    {
-                      this.state = 846;
-                      this.match(_MalloyParser.PLUS);
-                      this.state = 847;
-                      this.vExpr();
-                    }
+            _localctx = new NestDefContext(_localctx);
+            this.enterOuterAlt(_localctx, 1);
+            {
+              this.state = 848;
+              this.tags();
+              this.state = 852;
+              this._errHandler.sync(this);
+              switch (this.interpreter.adaptivePredict(this._input, 80, this._ctx)) {
+                case 1:
+                  {
+                    this.state = 849;
+                    this.queryName();
+                    this.state = 850;
+                    this.isDefine();
                   }
-                }
-                break;
-              case 2:
-                _localctx = new NestDefContext(_localctx);
-                this.enterOuterAlt(_localctx, 2);
-                {
-                  this.state = 850;
-                  this.tags();
-                  this.state = 851;
-                  this.queryName();
-                  this.state = 852;
-                  this.isDefine();
-                  this.state = 853;
-                  this.vExpr();
-                }
-                break;
+                  break;
+              }
+              this.state = 854;
+              this.vExpr();
             }
           } catch (re2) {
             if (re2 instanceof RecognitionException_1.RecognitionException) {
@@ -37187,11 +37323,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 857;
+              this.state = 856;
               this.tags();
-              this.state = 858;
+              this.state = 857;
               this.match(_MalloyParser.AGGREGATE);
-              this.state = 859;
+              this.state = 858;
               this.queryFieldList();
             }
           } catch (re2) {
@@ -37214,11 +37350,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 861;
+              this.state = 860;
               this.tags();
-              this.state = 862;
+              this.state = 861;
               this.match(_MalloyParser.CALCULATE);
-              this.state = 863;
+              this.state = 862;
               this.queryFieldList();
             }
           } catch (re2) {
@@ -37242,9 +37378,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 865;
+              this.state = 864;
               this.tags();
-              this.state = 866;
+              this.state = 865;
               _la = this._input.LA(1);
               if (!(_la === _MalloyParser.PROJECT || _la === _MalloyParser.SELECT)) {
                 this._errHandler.recoverInline(this);
@@ -37255,7 +37391,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 this._errHandler.reportMatch(this);
                 this.consume();
               }
-              this.state = 867;
+              this.state = 866;
               this.fieldCollection();
             }
           } catch (re2) {
@@ -37280,34 +37416,34 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 869;
+              this.state = 868;
               this.match(_MalloyParser.PARTITION_BY);
-              this.state = 870;
+              this.state = 869;
               this.id();
-              this.state = 875;
+              this.state = 874;
               this._errHandler.sync(this);
               _alt = this.interpreter.adaptivePredict(this._input, 81, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 871;
+                      this.state = 870;
                       this.match(_MalloyParser.COMMA);
-                      this.state = 872;
+                      this.state = 871;
                       this.id();
                     }
                   }
                 }
-                this.state = 877;
+                this.state = 876;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 81, this._ctx);
               }
-              this.state = 879;
+              this.state = 878;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.COMMA) {
                 {
-                  this.state = 878;
+                  this.state = 877;
                   this.match(_MalloyParser.COMMA);
                 }
               }
@@ -37332,9 +37468,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 881;
+              this.state = 880;
               this.match(_MalloyParser.ORDER_BY);
-              this.state = 882;
+              this.state = 881;
               this.ordering();
             }
           } catch (re2) {
@@ -37359,39 +37495,39 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 884;
+              this.state = 883;
               this.orderBySpec();
-              this.state = 891;
+              this.state = 890;
               this._errHandler.sync(this);
               _alt = this.interpreter.adaptivePredict(this._input, 84, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 886;
+                      this.state = 885;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if (_la === _MalloyParser.COMMA) {
                         {
-                          this.state = 885;
+                          this.state = 884;
                           this.match(_MalloyParser.COMMA);
                         }
                       }
-                      this.state = 888;
+                      this.state = 887;
                       this.orderBySpec();
                     }
                   }
                 }
-                this.state = 893;
+                this.state = 892;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 84, this._ctx);
               }
-              this.state = 895;
+              this.state = 894;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.COMMA) {
                 {
-                  this.state = 894;
+                  this.state = 893;
                   this.match(_MalloyParser.COMMA);
                 }
               }
@@ -37417,31 +37553,31 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 899;
+              this.state = 898;
               this._errHandler.sync(this);
               switch (this._input.LA(1)) {
                 case _MalloyParser.INTEGER_LITERAL:
                   {
-                    this.state = 897;
+                    this.state = 896;
                     this.match(_MalloyParser.INTEGER_LITERAL);
                   }
                   break;
                 case _MalloyParser.BQ_STRING:
                 case _MalloyParser.IDENTIFIER:
                   {
-                    this.state = 898;
+                    this.state = 897;
                     this.fieldName();
                   }
                   break;
                 default:
                   throw new NoViableAltException_1.NoViableAltException(this);
               }
-              this.state = 902;
+              this.state = 901;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.ASC || _la === _MalloyParser.DESC) {
                 {
-                  this.state = 901;
+                  this.state = 900;
                   _la = this._input.LA(1);
                   if (!(_la === _MalloyParser.ASC || _la === _MalloyParser.DESC)) {
                     this._errHandler.recoverInline(this);
@@ -37475,9 +37611,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 904;
+              this.state = 903;
               this.match(_MalloyParser.LIMIT);
-              this.state = 905;
+              this.state = 904;
               this.match(_MalloyParser.INTEGER_LITERAL);
             }
           } catch (re2) {
@@ -37498,24 +37634,24 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new BySpecContext(this._ctx, this.state);
           this.enterRule(_localctx, 176, _MalloyParser.RULE_bySpec);
           try {
-            this.state = 911;
+            this.state = 910;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 88, this._ctx)) {
               case 1:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 907;
+                  this.state = 906;
                   this.match(_MalloyParser.BY);
-                  this.state = 908;
+                  this.state = 907;
                   this.fieldName();
                 }
                 break;
               case 2:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 909;
+                  this.state = 908;
                   this.match(_MalloyParser.BY);
-                  this.state = 910;
+                  this.state = 909;
                   this.fieldExpr(0);
                 }
                 break;
@@ -37541,16 +37677,16 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 913;
+              this.state = 912;
               this.match(_MalloyParser.TOP);
-              this.state = 914;
+              this.state = 913;
               this.match(_MalloyParser.INTEGER_LITERAL);
-              this.state = 916;
+              this.state = 915;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.BY) {
                 {
-                  this.state = 915;
+                  this.state = 914;
                   this.bySpec();
                 }
               }
@@ -37574,23 +37710,23 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           this.enterRule(_localctx, 180, _MalloyParser.RULE_indexElement);
           let _la;
           try {
-            this.state = 924;
+            this.state = 923;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
               case _MalloyParser.BQ_STRING:
               case _MalloyParser.IDENTIFIER:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 918;
+                  this.state = 917;
                   this.fieldPath();
-                  this.state = 921;
+                  this.state = 920;
                   this._errHandler.sync(this);
                   _la = this._input.LA(1);
                   if (_la === _MalloyParser.DOT) {
                     {
-                      this.state = 919;
+                      this.state = 918;
                       this.match(_MalloyParser.DOT);
-                      this.state = 920;
+                      this.state = 919;
                       this.match(_MalloyParser.STAR);
                     }
                   }
@@ -37599,7 +37735,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
               case _MalloyParser.STAR:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 923;
+                  this.state = 922;
                   this.match(_MalloyParser.STAR);
                 }
                 break;
@@ -37628,30 +37764,30 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 926;
+              this.state = 925;
               this.indexElement();
-              this.state = 933;
+              this.state = 932;
               this._errHandler.sync(this);
               _alt = this.interpreter.adaptivePredict(this._input, 93, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 928;
+                      this.state = 927;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if (_la === _MalloyParser.COMMA) {
                         {
-                          this.state = 927;
+                          this.state = 926;
                           this.match(_MalloyParser.COMMA);
                         }
                       }
-                      this.state = 930;
+                      this.state = 929;
                       this.indexElement();
                     }
                   }
                 }
-                this.state = 935;
+                this.state = 934;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 93, this._ctx);
               }
@@ -37677,18 +37813,18 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 936;
+              this.state = 935;
               this.match(_MalloyParser.INDEX);
-              this.state = 937;
+              this.state = 936;
               this.indexFields();
-              this.state = 940;
+              this.state = 939;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.BY) {
                 {
-                  this.state = 938;
+                  this.state = 937;
                   this.match(_MalloyParser.BY);
-                  this.state = 939;
+                  this.state = 938;
                   this.fieldName();
                 }
               }
@@ -37713,9 +37849,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 942;
+              this.state = 941;
               this.match(_MalloyParser.SAMPLE);
-              this.state = 943;
+              this.state = 942;
               this.sampleSpec();
             }
           } catch (re2) {
@@ -37738,9 +37874,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 945;
+              this.state = 944;
               this.match(_MalloyParser.TIMEZONE);
-              this.state = 946;
+              this.state = 945;
               this.string();
             }
           } catch (re2) {
@@ -37763,7 +37899,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 948;
+              this.state = 947;
               this.match(_MalloyParser.ANNOTATION);
             }
           } catch (re2) {
@@ -37787,7 +37923,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 950;
+              this.state = 949;
               _la = this._input.LA(1);
               if (!(_la === _MalloyParser.FALSE || _la === _MalloyParser.TRUE || _la === _MalloyParser.PERCENT_LITERAL || _la === _MalloyParser.INTEGER_LITERAL)) {
                 this._errHandler.recoverInline(this);
@@ -37820,7 +37956,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 952;
+              this.state = 951;
               _la = this._input.LA(1);
               if (!((_la - 38 & ~31) === 0 && (1 << _la - 38 & (1 << _MalloyParser.AVG - 38 | 1 << _MalloyParser.COUNT - 38 | 1 << _MalloyParser.MAX - 38 | 1 << _MalloyParser.MIN - 38)) !== 0 || _la === _MalloyParser.SUM)) {
                 this._errHandler.recoverInline(this);
@@ -37853,7 +37989,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 954;
+              this.state = 953;
               _la = this._input.LA(1);
               if (!(_la === _MalloyParser.BOOLEAN || _la === _MalloyParser.DATE || (_la - 73 & ~31) === 0 && (1 << _la - 73 & (1 << _MalloyParser.NUMBER - 73 | 1 << _MalloyParser.STRING - 73 | 1 << _MalloyParser.TIMESTAMP - 73)) !== 0)) {
                 this._errHandler.recoverInline(this);
@@ -37886,7 +38022,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 956;
+              this.state = 955;
               _la = this._input.LA(1);
               if (!((_la - 118 & ~31) === 0 && (1 << _la - 118 & (1 << _MalloyParser.LT - 118 | 1 << _MalloyParser.GT - 118 | 1 << _MalloyParser.EQ - 118 | 1 << _MalloyParser.NE - 118 | 1 << _MalloyParser.LTE - 118 | 1 << _MalloyParser.GTE - 118 | 1 << _MalloyParser.NOT_MATCH - 118 | 1 << _MalloyParser.MATCH - 118)) !== 0)) {
                 this._errHandler.recoverInline(this);
@@ -37916,21 +38052,21 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new StringContext(this._ctx, this.state);
           this.enterRule(_localctx, 200, _MalloyParser.RULE_string);
           try {
-            this.state = 960;
+            this.state = 959;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
               case _MalloyParser.SQ_STRING:
               case _MalloyParser.DQ_STRING:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 958;
+                  this.state = 957;
                   this.shortString();
                 }
                 break;
               case _MalloyParser.SQL_BEGIN:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 959;
+                  this.state = 958;
                   this.sqlString();
                 }
                 break;
@@ -37958,7 +38094,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 962;
+              this.state = 961;
               _la = this._input.LA(1);
               if (!(_la === _MalloyParser.SQ_STRING || _la === _MalloyParser.DQ_STRING)) {
                 this._errHandler.recoverInline(this);
@@ -37991,7 +38127,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 964;
+              this.state = 963;
               _la = this._input.LA(1);
               if (!(_la === _MalloyParser.NUMERIC_LITERAL || _la === _MalloyParser.INTEGER_LITERAL)) {
                 this._errHandler.recoverInline(this);
@@ -38022,7 +38158,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           this.enterRule(_localctx, 206, _MalloyParser.RULE_literal);
           let _la;
           try {
-            this.state = 973;
+            this.state = 972;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
               case _MalloyParser.SQ_STRING:
@@ -38031,7 +38167,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new ExprStringContext(_localctx);
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 966;
+                  this.state = 965;
                   this.string();
                 }
                 break;
@@ -38040,7 +38176,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new ExprNumberContext(_localctx);
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 967;
+                  this.state = 966;
                   this.numericLiteral();
                 }
                 break;
@@ -38054,7 +38190,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new ExprTimeContext(_localctx);
                 this.enterOuterAlt(_localctx, 3);
                 {
-                  this.state = 968;
+                  this.state = 967;
                   this.dateLiteral();
                 }
                 break;
@@ -38062,7 +38198,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new ExprNULLContext(_localctx);
                 this.enterOuterAlt(_localctx, 4);
                 {
-                  this.state = 969;
+                  this.state = 968;
                   this.match(_MalloyParser.NULL);
                 }
                 break;
@@ -38071,7 +38207,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new ExprBoolContext(_localctx);
                 this.enterOuterAlt(_localctx, 5);
                 {
-                  this.state = 970;
+                  this.state = 969;
                   _la = this._input.LA(1);
                   if (!(_la === _MalloyParser.FALSE || _la === _MalloyParser.TRUE)) {
                     this._errHandler.recoverInline(this);
@@ -38088,7 +38224,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new ExprRegexContext(_localctx);
                 this.enterOuterAlt(_localctx, 6);
                 {
-                  this.state = 971;
+                  this.state = 970;
                   this.match(_MalloyParser.HACKY_REGEX);
                 }
                 break;
@@ -38096,7 +38232,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new ExprNowContext(_localctx);
                 this.enterOuterAlt(_localctx, 7);
                 {
-                  this.state = 972;
+                  this.state = 971;
                   this.match(_MalloyParser.NOW);
                 }
                 break;
@@ -38121,14 +38257,14 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new DateLiteralContext(this._ctx, this.state);
           this.enterRule(_localctx, 208, _MalloyParser.RULE_dateLiteral);
           try {
-            this.state = 982;
+            this.state = 981;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
               case _MalloyParser.LITERAL_TIMESTAMP:
                 _localctx = new LiteralTimestampContext(_localctx);
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 975;
+                  this.state = 974;
                   this.match(_MalloyParser.LITERAL_TIMESTAMP);
                 }
                 break;
@@ -38136,7 +38272,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new LiteralHourContext(_localctx);
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 976;
+                  this.state = 975;
                   this.match(_MalloyParser.LITERAL_HOUR);
                 }
                 break;
@@ -38144,7 +38280,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new LiteralDayContext(_localctx);
                 this.enterOuterAlt(_localctx, 3);
                 {
-                  this.state = 977;
+                  this.state = 976;
                   this.match(_MalloyParser.LITERAL_DAY);
                 }
                 break;
@@ -38152,7 +38288,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new LiteralWeekContext(_localctx);
                 this.enterOuterAlt(_localctx, 4);
                 {
-                  this.state = 978;
+                  this.state = 977;
                   this.match(_MalloyParser.LITERAL_WEEK);
                 }
                 break;
@@ -38160,7 +38296,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new LiteralMonthContext(_localctx);
                 this.enterOuterAlt(_localctx, 5);
                 {
-                  this.state = 979;
+                  this.state = 978;
                   this.match(_MalloyParser.LITERAL_MONTH);
                 }
                 break;
@@ -38168,7 +38304,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new LiteralQuarterContext(_localctx);
                 this.enterOuterAlt(_localctx, 6);
                 {
-                  this.state = 980;
+                  this.state = 979;
                   this.match(_MalloyParser.LITERAL_QUARTER);
                 }
                 break;
@@ -38176,7 +38312,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                 _localctx = new LiteralYearContext(_localctx);
                 this.enterOuterAlt(_localctx, 7);
                 {
-                  this.state = 981;
+                  this.state = 980;
                   this.match(_MalloyParser.LITERAL_YEAR);
                 }
                 break;
@@ -38203,7 +38339,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 984;
+              this.state = 983;
               this.string();
             }
           } catch (re2) {
@@ -38226,7 +38362,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 986;
+              this.state = 985;
               this.string();
             }
           } catch (re2) {
@@ -38250,7 +38386,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 988;
+              this.state = 987;
               _la = this._input.LA(1);
               if (!(_la === _MalloyParser.BQ_STRING || _la === _MalloyParser.IDENTIFIER)) {
                 this._errHandler.recoverInline(this);
@@ -38283,7 +38419,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 990;
+              this.state = 989;
               _la = this._input.LA(1);
               if (!((_la - 46 & ~31) === 0 && (1 << _la - 46 & (1 << _MalloyParser.DAY - 46 | 1 << _MalloyParser.HOUR - 46 | 1 << _MalloyParser.MINUTE - 46 | 1 << _MalloyParser.MONTH - 46 | 1 << _MalloyParser.QUARTER - 46)) !== 0 || (_la - 79 & ~31) === 0 && (1 << _la - 79 & (1 << _MalloyParser.SECOND - 79 | 1 << _MalloyParser.WEEK - 79 | 1 << _MalloyParser.YEAR - 79)) !== 0)) {
                 this._errHandler.recoverInline(this);
@@ -38316,7 +38452,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 992;
+              this.state = 991;
               _la = this._input.LA(1);
               if (!(_la === _MalloyParser.ALL || _la === _MalloyParser.EXCLUDE)) {
                 this._errHandler.recoverInline(this);
@@ -38346,7 +38482,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new MalloyOrSQLTypeContext(this._ctx, this.state);
           this.enterRule(_localctx, 220, _MalloyParser.RULE_malloyOrSQLType);
           try {
-            this.state = 996;
+            this.state = 995;
             this._errHandler.sync(this);
             switch (this._input.LA(1)) {
               case _MalloyParser.BOOLEAN:
@@ -38356,7 +38492,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
               case _MalloyParser.TIMESTAMP:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 994;
+                  this.state = 993;
                   this.malloyType();
                 }
                 break;
@@ -38365,7 +38501,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
               case _MalloyParser.SQL_BEGIN:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 995;
+                  this.state = 994;
                   this.string();
                 }
                 break;
@@ -38401,7 +38537,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1081;
+              this.state = 1080;
               this._errHandler.sync(this);
               switch (this.interpreter.adaptivePredict(this._input, 108, this._ctx)) {
                 case 1:
@@ -38409,7 +38545,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprFieldPathContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 999;
+                    this.state = 998;
                     this.fieldPath();
                   }
                   break;
@@ -38418,7 +38554,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprLiteralContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1e3;
+                    this.state = 999;
                     this.literal();
                   }
                   break;
@@ -38427,9 +38563,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprMinusContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1001;
+                    this.state = 1e3;
                     this.match(_MalloyParser.MINUS);
-                    this.state = 1002;
+                    this.state = 1001;
                     this.fieldExpr(22);
                   }
                   break;
@@ -38438,9 +38574,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprNotContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1003;
+                    this.state = 1002;
                     this.match(_MalloyParser.NOT);
-                    this.state = 1004;
+                    this.state = 1003;
                     this.fieldExpr(13);
                   }
                   break;
@@ -38449,17 +38585,17 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprCastContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1005;
+                    this.state = 1004;
                     this.match(_MalloyParser.CAST);
-                    this.state = 1006;
+                    this.state = 1005;
                     this.match(_MalloyParser.OPAREN);
-                    this.state = 1007;
+                    this.state = 1006;
                     this.fieldExpr(0);
-                    this.state = 1008;
+                    this.state = 1007;
                     this.match(_MalloyParser.AS);
-                    this.state = 1009;
+                    this.state = 1008;
                     this.malloyOrSQLType();
-                    this.state = 1010;
+                    this.state = 1009;
                     this.match(_MalloyParser.CPAREN);
                   }
                   break;
@@ -38468,15 +38604,15 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprCountDisinctContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1012;
+                    this.state = 1011;
                     this.match(_MalloyParser.COUNT);
-                    this.state = 1013;
+                    this.state = 1012;
                     this.match(_MalloyParser.OPAREN);
-                    this.state = 1014;
+                    this.state = 1013;
                     this.match(_MalloyParser.DISTINCT);
-                    this.state = 1015;
+                    this.state = 1014;
                     this.fieldExpr(0);
-                    this.state = 1016;
+                    this.state = 1015;
                     this.match(_MalloyParser.CPAREN);
                   }
                   break;
@@ -38485,22 +38621,22 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprPathlessAggregateContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1020;
+                    this.state = 1019;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                     if (_la === _MalloyParser.SOURCE_KW) {
                       {
-                        this.state = 1018;
+                        this.state = 1017;
                         this.match(_MalloyParser.SOURCE_KW);
-                        this.state = 1019;
+                        this.state = 1018;
                         this.match(_MalloyParser.DOT);
                       }
                     }
-                    this.state = 1022;
+                    this.state = 1021;
                     this.aggregate();
-                    this.state = 1023;
+                    this.state = 1022;
                     this.match(_MalloyParser.OPAREN);
-                    this.state = 1026;
+                    this.state = 1025;
                     this._errHandler.sync(this);
                     switch (this._input.LA(1)) {
                       case _MalloyParser.ALL:
@@ -38544,13 +38680,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                       case _MalloyParser.INTEGER_LITERAL:
                       case _MalloyParser.SQL_BEGIN:
                         {
-                          this.state = 1024;
+                          this.state = 1023;
                           this.fieldExpr(0);
                         }
                         break;
                       case _MalloyParser.STAR:
                         {
-                          this.state = 1025;
+                          this.state = 1024;
                           this.match(_MalloyParser.STAR);
                         }
                         break;
@@ -38559,7 +38695,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                       default:
                         break;
                     }
-                    this.state = 1028;
+                    this.state = 1027;
                     this.match(_MalloyParser.CPAREN);
                   }
                   break;
@@ -38568,24 +38704,24 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprAggregateContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1030;
+                    this.state = 1029;
                     this.fieldPath();
-                    this.state = 1031;
+                    this.state = 1030;
                     this.match(_MalloyParser.DOT);
-                    this.state = 1032;
+                    this.state = 1031;
                     this.aggregate();
-                    this.state = 1033;
+                    this.state = 1032;
                     this.match(_MalloyParser.OPAREN);
-                    this.state = 1035;
+                    this.state = 1034;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                     if ((_la - 34 & ~31) === 0 && (1 << _la - 34 & (1 << _MalloyParser.ALL - 34 | 1 << _MalloyParser.AVG - 34 | 1 << _MalloyParser.CAST - 34 | 1 << _MalloyParser.COUNT - 34 | 1 << _MalloyParser.DAY - 34 | 1 << _MalloyParser.EXCLUDE - 34 | 1 << _MalloyParser.FALSE - 34 | 1 << _MalloyParser.HOUR - 34)) !== 0 || (_la - 66 & ~31) === 0 && (1 << _la - 66 & (1 << _MalloyParser.MAX - 66 | 1 << _MalloyParser.MIN - 66 | 1 << _MalloyParser.MINUTE - 66 | 1 << _MalloyParser.MONTH - 66 | 1 << _MalloyParser.NOT - 66 | 1 << _MalloyParser.NOW - 66 | 1 << _MalloyParser.NULL - 66 | 1 << _MalloyParser.PICK - 66 | 1 << _MalloyParser.QUARTER - 66 | 1 << _MalloyParser.SECOND - 66 | 1 << _MalloyParser.SOURCE_KW - 66 | 1 << _MalloyParser.SUM - 66 | 1 << _MalloyParser.TRUE - 66 | 1 << _MalloyParser.WEEK - 66 | 1 << _MalloyParser.YEAR - 66 | 1 << _MalloyParser.HACKY_REGEX - 66)) !== 0 || (_la - 98 & ~31) === 0 && (1 << _la - 98 & (1 << _MalloyParser.SQ_STRING - 98 | 1 << _MalloyParser.DQ_STRING - 98 | 1 << _MalloyParser.BQ_STRING - 98 | 1 << _MalloyParser.OPAREN - 98 | 1 << _MalloyParser.MINUS - 98)) !== 0 || (_la - 136 & ~31) === 0 && (1 << _la - 136 & (1 << _MalloyParser.LITERAL_TIMESTAMP - 136 | 1 << _MalloyParser.LITERAL_HOUR - 136 | 1 << _MalloyParser.LITERAL_DAY - 136 | 1 << _MalloyParser.LITERAL_QUARTER - 136 | 1 << _MalloyParser.LITERAL_MONTH - 136 | 1 << _MalloyParser.LITERAL_WEEK - 136 | 1 << _MalloyParser.LITERAL_YEAR - 136 | 1 << _MalloyParser.IDENTIFIER - 136 | 1 << _MalloyParser.NUMERIC_LITERAL - 136 | 1 << _MalloyParser.INTEGER_LITERAL - 136 | 1 << _MalloyParser.SQL_BEGIN - 136)) !== 0) {
                       {
-                        this.state = 1034;
+                        this.state = 1033;
                         this.fieldExpr(0);
                       }
                     }
-                    this.state = 1037;
+                    this.state = 1036;
                     this.match(_MalloyParser.CPAREN);
                   }
                   break;
@@ -38594,11 +38730,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprExprContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1039;
+                    this.state = 1038;
                     this.match(_MalloyParser.OPAREN);
-                    this.state = 1040;
+                    this.state = 1039;
                     this.partialAllowedFieldExpr();
-                    this.state = 1041;
+                    this.state = 1040;
                     this.match(_MalloyParser.CPAREN);
                   }
                   break;
@@ -38607,26 +38743,26 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprAggFuncContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1043;
+                    this.state = 1042;
                     this.fieldPath();
-                    this.state = 1044;
+                    this.state = 1043;
                     this.match(_MalloyParser.DOT);
-                    this.state = 1045;
+                    this.state = 1044;
                     this.id();
-                    this.state = 1046;
+                    this.state = 1045;
                     this.match(_MalloyParser.OPAREN);
                     {
-                      this.state = 1048;
+                      this.state = 1047;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if ((_la - 34 & ~31) === 0 && (1 << _la - 34 & (1 << _MalloyParser.ALL - 34 | 1 << _MalloyParser.AVG - 34 | 1 << _MalloyParser.CAST - 34 | 1 << _MalloyParser.COUNT - 34 | 1 << _MalloyParser.DAY - 34 | 1 << _MalloyParser.EXCLUDE - 34 | 1 << _MalloyParser.FALSE - 34 | 1 << _MalloyParser.HOUR - 34)) !== 0 || (_la - 66 & ~31) === 0 && (1 << _la - 66 & (1 << _MalloyParser.MAX - 66 | 1 << _MalloyParser.MIN - 66 | 1 << _MalloyParser.MINUTE - 66 | 1 << _MalloyParser.MONTH - 66 | 1 << _MalloyParser.NOT - 66 | 1 << _MalloyParser.NOW - 66 | 1 << _MalloyParser.NULL - 66 | 1 << _MalloyParser.PICK - 66 | 1 << _MalloyParser.QUARTER - 66 | 1 << _MalloyParser.SECOND - 66 | 1 << _MalloyParser.SOURCE_KW - 66 | 1 << _MalloyParser.SUM - 66 | 1 << _MalloyParser.TRUE - 66 | 1 << _MalloyParser.WEEK - 66 | 1 << _MalloyParser.YEAR - 66 | 1 << _MalloyParser.HACKY_REGEX - 66)) !== 0 || (_la - 98 & ~31) === 0 && (1 << _la - 98 & (1 << _MalloyParser.SQ_STRING - 98 | 1 << _MalloyParser.DQ_STRING - 98 | 1 << _MalloyParser.BQ_STRING - 98 | 1 << _MalloyParser.OPAREN - 98 | 1 << _MalloyParser.MINUS - 98)) !== 0 || (_la - 136 & ~31) === 0 && (1 << _la - 136 & (1 << _MalloyParser.LITERAL_TIMESTAMP - 136 | 1 << _MalloyParser.LITERAL_HOUR - 136 | 1 << _MalloyParser.LITERAL_DAY - 136 | 1 << _MalloyParser.LITERAL_QUARTER - 136 | 1 << _MalloyParser.LITERAL_MONTH - 136 | 1 << _MalloyParser.LITERAL_WEEK - 136 | 1 << _MalloyParser.LITERAL_YEAR - 136 | 1 << _MalloyParser.IDENTIFIER - 136 | 1 << _MalloyParser.NUMERIC_LITERAL - 136 | 1 << _MalloyParser.INTEGER_LITERAL - 136 | 1 << _MalloyParser.SQL_BEGIN - 136)) !== 0) {
                         {
-                          this.state = 1047;
+                          this.state = 1046;
                           this.argumentList();
                         }
                       }
                     }
-                    this.state = 1050;
+                    this.state = 1049;
                     this.match(_MalloyParser.CPAREN);
                   }
                   break;
@@ -38635,28 +38771,28 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprFuncContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1060;
+                    this.state = 1059;
                     this._errHandler.sync(this);
                     switch (this._input.LA(1)) {
                       case _MalloyParser.BQ_STRING:
                       case _MalloyParser.IDENTIFIER:
                         {
                           {
-                            this.state = 1052;
+                            this.state = 1051;
                             this.id();
-                            this.state = 1057;
+                            this.state = 1056;
                             this._errHandler.sync(this);
                             _la = this._input.LA(1);
                             if (_la === _MalloyParser.EXCLAM) {
                               {
-                                this.state = 1053;
+                                this.state = 1052;
                                 this.match(_MalloyParser.EXCLAM);
-                                this.state = 1055;
+                                this.state = 1054;
                                 this._errHandler.sync(this);
                                 _la = this._input.LA(1);
                                 if (_la === _MalloyParser.BOOLEAN || _la === _MalloyParser.DATE || (_la - 73 & ~31) === 0 && (1 << _la - 73 & (1 << _MalloyParser.NUMBER - 73 | 1 << _MalloyParser.STRING - 73 | 1 << _MalloyParser.TIMESTAMP - 73)) !== 0) {
                                   {
-                                    this.state = 1054;
+                                    this.state = 1053;
                                     this.malloyType();
                                   }
                                 }
@@ -38674,27 +38810,27 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                       case _MalloyParser.WEEK:
                       case _MalloyParser.YEAR:
                         {
-                          this.state = 1059;
+                          this.state = 1058;
                           this.timeframe();
                         }
                         break;
                       default:
                         throw new NoViableAltException_1.NoViableAltException(this);
                     }
-                    this.state = 1062;
+                    this.state = 1061;
                     this.match(_MalloyParser.OPAREN);
                     {
-                      this.state = 1064;
+                      this.state = 1063;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if ((_la - 34 & ~31) === 0 && (1 << _la - 34 & (1 << _MalloyParser.ALL - 34 | 1 << _MalloyParser.AVG - 34 | 1 << _MalloyParser.CAST - 34 | 1 << _MalloyParser.COUNT - 34 | 1 << _MalloyParser.DAY - 34 | 1 << _MalloyParser.EXCLUDE - 34 | 1 << _MalloyParser.FALSE - 34 | 1 << _MalloyParser.HOUR - 34)) !== 0 || (_la - 66 & ~31) === 0 && (1 << _la - 66 & (1 << _MalloyParser.MAX - 66 | 1 << _MalloyParser.MIN - 66 | 1 << _MalloyParser.MINUTE - 66 | 1 << _MalloyParser.MONTH - 66 | 1 << _MalloyParser.NOT - 66 | 1 << _MalloyParser.NOW - 66 | 1 << _MalloyParser.NULL - 66 | 1 << _MalloyParser.PICK - 66 | 1 << _MalloyParser.QUARTER - 66 | 1 << _MalloyParser.SECOND - 66 | 1 << _MalloyParser.SOURCE_KW - 66 | 1 << _MalloyParser.SUM - 66 | 1 << _MalloyParser.TRUE - 66 | 1 << _MalloyParser.WEEK - 66 | 1 << _MalloyParser.YEAR - 66 | 1 << _MalloyParser.HACKY_REGEX - 66)) !== 0 || (_la - 98 & ~31) === 0 && (1 << _la - 98 & (1 << _MalloyParser.SQ_STRING - 98 | 1 << _MalloyParser.DQ_STRING - 98 | 1 << _MalloyParser.BQ_STRING - 98 | 1 << _MalloyParser.OPAREN - 98 | 1 << _MalloyParser.MINUS - 98)) !== 0 || (_la - 136 & ~31) === 0 && (1 << _la - 136 & (1 << _MalloyParser.LITERAL_TIMESTAMP - 136 | 1 << _MalloyParser.LITERAL_HOUR - 136 | 1 << _MalloyParser.LITERAL_DAY - 136 | 1 << _MalloyParser.LITERAL_QUARTER - 136 | 1 << _MalloyParser.LITERAL_MONTH - 136 | 1 << _MalloyParser.LITERAL_WEEK - 136 | 1 << _MalloyParser.LITERAL_YEAR - 136 | 1 << _MalloyParser.IDENTIFIER - 136 | 1 << _MalloyParser.NUMERIC_LITERAL - 136 | 1 << _MalloyParser.INTEGER_LITERAL - 136 | 1 << _MalloyParser.SQL_BEGIN - 136)) !== 0) {
                         {
-                          this.state = 1063;
+                          this.state = 1062;
                           this.argumentList();
                         }
                       }
                     }
-                    this.state = 1066;
+                    this.state = 1065;
                     this.match(_MalloyParser.CPAREN);
                   }
                   break;
@@ -38703,7 +38839,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprPickContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1068;
+                    this.state = 1067;
                     this.pickStatement();
                   }
                   break;
@@ -38712,35 +38848,35 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                     _localctx = new ExprUngroupContext(_localctx);
                     this._ctx = _localctx;
                     _prevctx = _localctx;
-                    this.state = 1069;
+                    this.state = 1068;
                     this.ungroup();
-                    this.state = 1070;
+                    this.state = 1069;
                     this.match(_MalloyParser.OPAREN);
-                    this.state = 1071;
+                    this.state = 1070;
                     this.fieldExpr(0);
-                    this.state = 1076;
+                    this.state = 1075;
                     this._errHandler.sync(this);
                     _la = this._input.LA(1);
                     while (_la === _MalloyParser.COMMA) {
                       {
                         {
-                          this.state = 1072;
+                          this.state = 1071;
                           this.match(_MalloyParser.COMMA);
-                          this.state = 1073;
+                          this.state = 1072;
                           this.fieldName();
                         }
                       }
-                      this.state = 1078;
+                      this.state = 1077;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                     }
-                    this.state = 1079;
+                    this.state = 1078;
                     this.match(_MalloyParser.CPAREN);
                   }
                   break;
               }
               this._ctx._stop = this._input.tryLT(-1);
-              this.state = 1134;
+              this.state = 1133;
               this._errHandler.sync(this);
               _alt = this.interpreter.adaptivePredict(this._input, 110, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
@@ -38750,18 +38886,18 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                   }
                   _prevctx = _localctx;
                   {
-                    this.state = 1132;
+                    this.state = 1131;
                     this._errHandler.sync(this);
                     switch (this.interpreter.adaptivePredict(this._input, 109, this._ctx)) {
                       case 1:
                         {
                           _localctx = new ExprMulDivContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1083;
+                          this.state = 1082;
                           if (!this.precpred(this._ctx, 21)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 21)");
                           }
-                          this.state = 1084;
+                          this.state = 1083;
                           _la = this._input.LA(1);
                           if (!((_la - 126 & ~31) === 0 && (1 << _la - 126 & (1 << _MalloyParser.STAR - 126 | 1 << _MalloyParser.SLASH - 126 | 1 << _MalloyParser.PERCENT - 126)) !== 0)) {
                             this._errHandler.recoverInline(this);
@@ -38772,7 +38908,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                             this._errHandler.reportMatch(this);
                             this.consume();
                           }
-                          this.state = 1085;
+                          this.state = 1084;
                           this.fieldExpr(22);
                         }
                         break;
@@ -38780,11 +38916,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprAddSubContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1086;
+                          this.state = 1085;
                           if (!this.precpred(this._ctx, 20)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 20)");
                           }
-                          this.state = 1087;
+                          this.state = 1086;
                           _la = this._input.LA(1);
                           if (!(_la === _MalloyParser.PLUS || _la === _MalloyParser.MINUS)) {
                             this._errHandler.recoverInline(this);
@@ -38795,7 +38931,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                             this._errHandler.reportMatch(this);
                             this.consume();
                           }
-                          this.state = 1088;
+                          this.state = 1087;
                           this.fieldExpr(21);
                         }
                         break;
@@ -38803,13 +38939,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprRangeContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1089;
+                          this.state = 1088;
                           if (!this.precpred(this._ctx, 19)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 19)");
                           }
-                          this.state = 1090;
+                          this.state = 1089;
                           this.match(_MalloyParser.TO);
-                          this.state = 1091;
+                          this.state = 1090;
                           this.fieldExpr(20);
                         }
                         break;
@@ -38817,13 +38953,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprCompareContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1092;
+                          this.state = 1091;
                           if (!this.precpred(this._ctx, 15)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 15)");
                           }
-                          this.state = 1093;
+                          this.state = 1092;
                           this.compareOp();
-                          this.state = 1094;
+                          this.state = 1093;
                           this.fieldExpr(16);
                         }
                         break;
@@ -38831,13 +38967,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprLogicalAndContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1096;
+                          this.state = 1095;
                           if (!this.precpred(this._ctx, 12)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 12)");
                           }
-                          this.state = 1097;
+                          this.state = 1096;
                           this.match(_MalloyParser.AND);
-                          this.state = 1098;
+                          this.state = 1097;
                           this.fieldExpr(13);
                         }
                         break;
@@ -38845,13 +38981,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprLogicalOrContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1099;
+                          this.state = 1098;
                           if (!this.precpred(this._ctx, 11)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
                           }
-                          this.state = 1100;
+                          this.state = 1099;
                           this.match(_MalloyParser.OR);
-                          this.state = 1101;
+                          this.state = 1100;
                           this.fieldExpr(12);
                         }
                         break;
@@ -38859,13 +38995,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprCoalesceContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1102;
+                          this.state = 1101;
                           if (!this.precpred(this._ctx, 10)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
                           }
-                          this.state = 1103;
+                          this.state = 1102;
                           this.match(_MalloyParser.DOUBLE_QMARK);
-                          this.state = 1104;
+                          this.state = 1103;
                           this.fieldExpr(11);
                         }
                         break;
@@ -38873,11 +39009,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprFieldPropsContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1105;
+                          this.state = 1104;
                           if (!this.precpred(this._ctx, 28)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 28)");
                           }
-                          this.state = 1106;
+                          this.state = 1105;
                           this.fieldProperties();
                         }
                         break;
@@ -38885,11 +39021,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprDurationContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1107;
+                          this.state = 1106;
                           if (!this.precpred(this._ctx, 26)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 26)");
                           }
-                          this.state = 1108;
+                          this.state = 1107;
                           this.timeframe();
                         }
                         break;
@@ -38897,13 +39033,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprTimeTruncContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1109;
+                          this.state = 1108;
                           if (!this.precpred(this._ctx, 25)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 25)");
                           }
-                          this.state = 1110;
+                          this.state = 1109;
                           this.match(_MalloyParser.DOT);
-                          this.state = 1111;
+                          this.state = 1110;
                           this.timeframe();
                         }
                         break;
@@ -38911,13 +39047,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprCastContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1112;
+                          this.state = 1111;
                           if (!this.precpred(this._ctx, 24)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 24)");
                           }
-                          this.state = 1113;
+                          this.state = 1112;
                           this.match(_MalloyParser.DOUBLECOLON);
-                          this.state = 1114;
+                          this.state = 1113;
                           this.malloyOrSQLType();
                         }
                         break;
@@ -38925,13 +39061,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprSafeCastContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1115;
+                          this.state = 1114;
                           if (!this.precpred(this._ctx, 23)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 23)");
                           }
-                          this.state = 1116;
+                          this.state = 1115;
                           this.match(_MalloyParser.TRIPLECOLON);
-                          this.state = 1117;
+                          this.state = 1116;
                           this.malloyOrSQLType();
                         }
                         break;
@@ -38940,15 +39076,15 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                           _localctx = new ExprForRangeContext(new FieldExprContext(_parentctx, _parentState));
                           _localctx._startAt = _prevctx;
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1118;
+                          this.state = 1117;
                           if (!this.precpred(this._ctx, 18)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 18)");
                           }
-                          this.state = 1119;
+                          this.state = 1118;
                           this.match(_MalloyParser.FOR);
-                          this.state = 1120;
+                          this.state = 1119;
                           _localctx._duration = this.fieldExpr(0);
-                          this.state = 1121;
+                          this.state = 1120;
                           this.timeframe();
                         }
                         break;
@@ -38956,13 +39092,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprAndTreeContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1123;
+                          this.state = 1122;
                           if (!this.precpred(this._ctx, 17)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 17)");
                           }
-                          this.state = 1124;
+                          this.state = 1123;
                           this.match(_MalloyParser.AMPER);
-                          this.state = 1125;
+                          this.state = 1124;
                           this.partialAllowedFieldExpr();
                         }
                         break;
@@ -38970,13 +39106,13 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprOrTreeContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1126;
+                          this.state = 1125;
                           if (!this.precpred(this._ctx, 16)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 16)");
                           }
-                          this.state = 1127;
+                          this.state = 1126;
                           this.match(_MalloyParser.BAR);
-                          this.state = 1128;
+                          this.state = 1127;
                           this.partialAllowedFieldExpr();
                         }
                         break;
@@ -38984,20 +39120,20 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                         {
                           _localctx = new ExprApplyContext(new FieldExprContext(_parentctx, _parentState));
                           this.pushNewRecursionContext(_localctx, _startState, _MalloyParser.RULE_fieldExpr);
-                          this.state = 1129;
+                          this.state = 1128;
                           if (!this.precpred(this._ctx, 14)) {
                             throw this.createFailedPredicateException("this.precpred(this._ctx, 14)");
                           }
-                          this.state = 1130;
+                          this.state = 1129;
                           this.match(_MalloyParser.QMARK);
-                          this.state = 1131;
+                          this.state = 1130;
                           this.partialAllowedFieldExpr();
                         }
                         break;
                     }
                   }
                 }
-                this.state = 1136;
+                this.state = 1135;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 110, this._ctx);
               }
@@ -39021,42 +39157,42 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           this.enterRule(_localctx, 224, _MalloyParser.RULE_partialAllowedFieldExpr);
           let _la;
           try {
-            this.state = 1148;
+            this.state = 1147;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 113, this._ctx)) {
               case 1:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 1137;
+                  this.state = 1136;
                   this.match(_MalloyParser.OPAREN);
-                  this.state = 1139;
+                  this.state = 1138;
                   this._errHandler.sync(this);
                   _la = this._input.LA(1);
                   if ((_la - 118 & ~31) === 0 && (1 << _la - 118 & (1 << _MalloyParser.LT - 118 | 1 << _MalloyParser.GT - 118 | 1 << _MalloyParser.EQ - 118 | 1 << _MalloyParser.NE - 118 | 1 << _MalloyParser.LTE - 118 | 1 << _MalloyParser.GTE - 118 | 1 << _MalloyParser.NOT_MATCH - 118 | 1 << _MalloyParser.MATCH - 118)) !== 0) {
                     {
-                      this.state = 1138;
+                      this.state = 1137;
                       this.compareOp();
                     }
                   }
-                  this.state = 1141;
+                  this.state = 1140;
                   this.fieldExpr(0);
-                  this.state = 1142;
+                  this.state = 1141;
                   this.match(_MalloyParser.CPAREN);
                 }
                 break;
               case 2:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 1145;
+                  this.state = 1144;
                   this._errHandler.sync(this);
                   _la = this._input.LA(1);
                   if ((_la - 118 & ~31) === 0 && (1 << _la - 118 & (1 << _MalloyParser.LT - 118 | 1 << _MalloyParser.GT - 118 | 1 << _MalloyParser.EQ - 118 | 1 << _MalloyParser.NE - 118 | 1 << _MalloyParser.LTE - 118 | 1 << _MalloyParser.GTE - 118 | 1 << _MalloyParser.NOT_MATCH - 118 | 1 << _MalloyParser.MATCH - 118)) !== 0) {
                     {
-                      this.state = 1144;
+                      this.state = 1143;
                       this.compareOp();
                     }
                   }
-                  this.state = 1147;
+                  this.state = 1146;
                   this.fieldExpr(0);
                 }
                 break;
@@ -39082,7 +39218,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1151;
+              this.state = 1150;
               this._errHandler.sync(this);
               _alt = 1;
               do {
@@ -39090,7 +39226,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                   case 1:
                     {
                       {
-                        this.state = 1150;
+                        this.state = 1149;
                         this.pick();
                       }
                     }
@@ -39098,18 +39234,18 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                   default:
                     throw new NoViableAltException_1.NoViableAltException(this);
                 }
-                this.state = 1153;
+                this.state = 1152;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 114, this._ctx);
               } while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER);
-              this.state = 1157;
+              this.state = 1156;
               this._errHandler.sync(this);
               switch (this.interpreter.adaptivePredict(this._input, 115, this._ctx)) {
                 case 1:
                   {
-                    this.state = 1155;
+                    this.state = 1154;
                     this.match(_MalloyParser.ELSE);
-                    this.state = 1156;
+                    this.state = 1155;
                     _localctx._pickElse = this.fieldExpr(0);
                   }
                   break;
@@ -39136,20 +39272,20 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1159;
+              this.state = 1158;
               this.match(_MalloyParser.PICK);
-              this.state = 1161;
+              this.state = 1160;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if ((_la - 34 & ~31) === 0 && (1 << _la - 34 & (1 << _MalloyParser.ALL - 34 | 1 << _MalloyParser.AVG - 34 | 1 << _MalloyParser.CAST - 34 | 1 << _MalloyParser.COUNT - 34 | 1 << _MalloyParser.DAY - 34 | 1 << _MalloyParser.EXCLUDE - 34 | 1 << _MalloyParser.FALSE - 34 | 1 << _MalloyParser.HOUR - 34)) !== 0 || (_la - 66 & ~31) === 0 && (1 << _la - 66 & (1 << _MalloyParser.MAX - 66 | 1 << _MalloyParser.MIN - 66 | 1 << _MalloyParser.MINUTE - 66 | 1 << _MalloyParser.MONTH - 66 | 1 << _MalloyParser.NOT - 66 | 1 << _MalloyParser.NOW - 66 | 1 << _MalloyParser.NULL - 66 | 1 << _MalloyParser.PICK - 66 | 1 << _MalloyParser.QUARTER - 66 | 1 << _MalloyParser.SECOND - 66 | 1 << _MalloyParser.SOURCE_KW - 66 | 1 << _MalloyParser.SUM - 66 | 1 << _MalloyParser.TRUE - 66 | 1 << _MalloyParser.WEEK - 66 | 1 << _MalloyParser.YEAR - 66 | 1 << _MalloyParser.HACKY_REGEX - 66)) !== 0 || (_la - 98 & ~31) === 0 && (1 << _la - 98 & (1 << _MalloyParser.SQ_STRING - 98 | 1 << _MalloyParser.DQ_STRING - 98 | 1 << _MalloyParser.BQ_STRING - 98 | 1 << _MalloyParser.OPAREN - 98 | 1 << _MalloyParser.MINUS - 98)) !== 0 || (_la - 136 & ~31) === 0 && (1 << _la - 136 & (1 << _MalloyParser.LITERAL_TIMESTAMP - 136 | 1 << _MalloyParser.LITERAL_HOUR - 136 | 1 << _MalloyParser.LITERAL_DAY - 136 | 1 << _MalloyParser.LITERAL_QUARTER - 136 | 1 << _MalloyParser.LITERAL_MONTH - 136 | 1 << _MalloyParser.LITERAL_WEEK - 136 | 1 << _MalloyParser.LITERAL_YEAR - 136 | 1 << _MalloyParser.IDENTIFIER - 136 | 1 << _MalloyParser.NUMERIC_LITERAL - 136 | 1 << _MalloyParser.INTEGER_LITERAL - 136 | 1 << _MalloyParser.SQL_BEGIN - 136)) !== 0) {
                 {
-                  this.state = 1160;
+                  this.state = 1159;
                   _localctx._pickValue = this.fieldExpr(0);
                 }
               }
-              this.state = 1163;
+              this.state = 1162;
               this.match(_MalloyParser.WHEN);
-              this.state = 1164;
+              this.state = 1163;
               _localctx._pickWhen = this.partialAllowedFieldExpr();
             }
           } catch (re2) {
@@ -39174,32 +39310,32 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1166;
+              this.state = 1165;
               this.fieldExpr(0);
-              this.state = 1171;
+              this.state = 1170;
               this._errHandler.sync(this);
               _alt = this.interpreter.adaptivePredict(this._input, 117, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 1167;
+                      this.state = 1166;
                       this.match(_MalloyParser.COMMA);
-                      this.state = 1168;
+                      this.state = 1167;
                       this.fieldExpr(0);
                     }
                   }
                 }
-                this.state = 1173;
+                this.state = 1172;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 117, this._ctx);
               }
-              this.state = 1175;
+              this.state = 1174;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.COMMA) {
                 {
-                  this.state = 1174;
+                  this.state = 1173;
                   this.match(_MalloyParser.COMMA);
                 }
               }
@@ -39226,30 +39362,30 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1177;
+              this.state = 1176;
               this.fieldName();
-              this.state = 1184;
+              this.state = 1183;
               this._errHandler.sync(this);
               _alt = this.interpreter.adaptivePredict(this._input, 120, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 1179;
+                      this.state = 1178;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if (_la === _MalloyParser.COMMA) {
                         {
-                          this.state = 1178;
+                          this.state = 1177;
                           this.match(_MalloyParser.COMMA);
                         }
                       }
-                      this.state = 1181;
+                      this.state = 1180;
                       this.fieldName();
                     }
                   }
                 }
-                this.state = 1186;
+                this.state = 1185;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 120, this._ctx);
               }
@@ -39276,39 +39412,39 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1187;
+              this.state = 1186;
               this.collectionMember();
-              this.state = 1194;
+              this.state = 1193;
               this._errHandler.sync(this);
               _alt = this.interpreter.adaptivePredict(this._input, 122, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 1189;
+                      this.state = 1188;
                       this._errHandler.sync(this);
                       _la = this._input.LA(1);
                       if (_la === _MalloyParser.COMMA) {
                         {
-                          this.state = 1188;
+                          this.state = 1187;
                           this.match(_MalloyParser.COMMA);
                         }
                       }
-                      this.state = 1191;
+                      this.state = 1190;
                       this.collectionMember();
                     }
                   }
                 }
-                this.state = 1196;
+                this.state = 1195;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 122, this._ctx);
               }
-              this.state = 1198;
+              this.state = 1197;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.COMMA) {
                 {
-                  this.state = 1197;
+                  this.state = 1196;
                   this.match(_MalloyParser.COMMA);
                 }
               }
@@ -39334,25 +39470,25 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1203;
+              this.state = 1202;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.BQ_STRING || _la === _MalloyParser.IDENTIFIER) {
                 {
-                  this.state = 1200;
+                  this.state = 1199;
                   this.fieldPath();
-                  this.state = 1201;
+                  this.state = 1200;
                   this.match(_MalloyParser.DOT);
                 }
               }
-              this.state = 1205;
+              this.state = 1204;
               this.match(_MalloyParser.STAR);
-              this.state = 1207;
+              this.state = 1206;
               this._errHandler.sync(this);
               switch (this.interpreter.adaptivePredict(this._input, 125, this._ctx)) {
                 case 1:
                   {
-                    this.state = 1206;
+                    this.state = 1205;
                     this.starQualified();
                   }
                   break;
@@ -39379,29 +39515,29 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1209;
+              this.state = 1208;
               this.match(_MalloyParser.OCURLY);
-              this.state = 1213;
+              this.state = 1212;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               do {
                 {
-                  this.state = 1213;
+                  this.state = 1212;
                   this._errHandler.sync(this);
                   switch (this._input.LA(1)) {
                     case _MalloyParser.EXCEPT:
                       {
                         {
-                          this.state = 1210;
+                          this.state = 1209;
                           this.match(_MalloyParser.EXCEPT);
-                          this.state = 1211;
+                          this.state = 1210;
                           this.fieldNameList();
                         }
                       }
                       break;
                     case _MalloyParser.COMMA:
                       {
-                        this.state = 1212;
+                        this.state = 1211;
                         this.match(_MalloyParser.COMMA);
                       }
                       break;
@@ -39409,11 +39545,11 @@ ${struct.dialect.sqlFinalStage("__stage0", [
                       throw new NoViableAltException_1.NoViableAltException(this);
                   }
                 }
-                this.state = 1215;
+                this.state = 1214;
                 this._errHandler.sync(this);
                 _la = this._input.LA(1);
               } while (_la === _MalloyParser.EXCEPT || _la === _MalloyParser.COMMA);
-              this.state = 1217;
+              this.state = 1216;
               this.match(_MalloyParser.CCURLY);
             }
           } catch (re2) {
@@ -39437,16 +39573,16 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1219;
+              this.state = 1218;
               this.tags();
-              this.state = 1220;
+              this.state = 1219;
               this.fieldPath();
-              this.state = 1222;
+              this.state = 1221;
               this._errHandler.sync(this);
               _la = this._input.LA(1);
               if (_la === _MalloyParser.DOT) {
                 {
-                  this.state = 1221;
+                  this.state = 1220;
                   this.refExpr();
                 }
               }
@@ -39469,28 +39605,28 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new RefExprContext(this._ctx, this.state);
           this.enterRule(_localctx, 242, _MalloyParser.RULE_refExpr);
           try {
-            this.state = 1231;
+            this.state = 1230;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 129, this._ctx)) {
               case 1:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 1224;
+                  this.state = 1223;
                   this.match(_MalloyParser.DOT);
-                  this.state = 1225;
+                  this.state = 1224;
                   this.timeframe();
                 }
                 break;
               case 2:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 1226;
+                  this.state = 1225;
                   this.match(_MalloyParser.DOT);
-                  this.state = 1227;
+                  this.state = 1226;
                   this.aggregate();
-                  this.state = 1228;
+                  this.state = 1227;
                   this.match(_MalloyParser.OPAREN);
-                  this.state = 1229;
+                  this.state = 1228;
                   this.match(_MalloyParser.CPAREN);
                 }
                 break;
@@ -39513,27 +39649,27 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           let _localctx = new CollectionMemberContext(this._ctx, this.state);
           this.enterRule(_localctx, 244, _MalloyParser.RULE_collectionMember);
           try {
-            this.state = 1236;
+            this.state = 1235;
             this._errHandler.sync(this);
             switch (this.interpreter.adaptivePredict(this._input, 130, this._ctx)) {
               case 1:
                 this.enterOuterAlt(_localctx, 1);
                 {
-                  this.state = 1233;
+                  this.state = 1232;
                   this.taggedRef();
                 }
                 break;
               case 2:
                 this.enterOuterAlt(_localctx, 2);
                 {
-                  this.state = 1234;
+                  this.state = 1233;
                   this.collectionWildCard();
                 }
                 break;
               case 3:
                 this.enterOuterAlt(_localctx, 3);
                 {
-                  this.state = 1235;
+                  this.state = 1234;
                   this.fieldDef();
                 }
                 break;
@@ -39559,23 +39695,23 @@ ${struct.dialect.sqlFinalStage("__stage0", [
             let _alt;
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1238;
+              this.state = 1237;
               this.fieldName();
-              this.state = 1243;
+              this.state = 1242;
               this._errHandler.sync(this);
               _alt = this.interpreter.adaptivePredict(this._input, 131, this._ctx);
               while (_alt !== 2 && _alt !== ATN_1.ATN.INVALID_ALT_NUMBER) {
                 if (_alt === 1) {
                   {
                     {
-                      this.state = 1239;
+                      this.state = 1238;
                       this.match(_MalloyParser.DOT);
-                      this.state = 1240;
+                      this.state = 1239;
                       this.fieldName();
                     }
                   }
                 }
-                this.state = 1245;
+                this.state = 1244;
                 this._errHandler.sync(this);
                 _alt = this.interpreter.adaptivePredict(this._input, 131, this._ctx);
               }
@@ -39600,7 +39736,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1246;
+              this.state = 1245;
               this.id();
             }
           } catch (re2) {
@@ -39623,7 +39759,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1248;
+              this.state = 1247;
               this.id();
             }
           } catch (re2) {
@@ -39646,9 +39782,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1250;
+              this.state = 1249;
               this.fieldExpr(0);
-              this.state = 1251;
+              this.state = 1250;
               this.match(_MalloyParser.EOF);
             }
           } catch (re2) {
@@ -39671,7 +39807,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1253;
+              this.state = 1252;
               this.id();
             }
           } catch (re2) {
@@ -39694,7 +39830,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1255;
+              this.state = 1254;
               this.id();
             }
           } catch (re2) {
@@ -39717,7 +39853,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
-              this.state = 1257;
+              this.state = 1256;
               this.string();
             }
           } catch (re2) {
@@ -39740,15 +39876,15 @@ ${struct.dialect.sqlFinalStage("__stage0", [
           try {
             this.enterOuterAlt(_localctx, 1);
             {
+              this.state = 1258;
+              this.match(_MalloyParser.SEMI);
               this.state = 1259;
               this.match(_MalloyParser.SEMI);
               this.state = 1260;
-              this.match(_MalloyParser.SEMI);
-              this.state = 1261;
               this.match(_MalloyParser.OBRACK);
-              this.state = 1262;
+              this.state = 1261;
               this.string();
-              this.state = 1263;
+              this.state = 1262;
               this.match(_MalloyParser.CBRACK);
             }
           } catch (re2) {
@@ -40571,9 +40707,9 @@ ${struct.dialect.sqlFinalStage("__stage0", [
       ];
       MalloyParser.VOCABULARY = new VocabularyImpl_1.VocabularyImpl(MalloyParser._LITERAL_NAMES, MalloyParser._SYMBOLIC_NAMES, []);
       MalloyParser._serializedATNSegments = 3;
-      MalloyParser._serializedATNSegment0 = "\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x9D\u04F4					\x07	\x07\b	\b			\n	\n\v	\v\f	\f\r	\r													\x1B	\x1B				 	 !	!\"	\"#	#$	$%	%&	&'	'(	()	)*	*+	+,	,-	-.	./	/0	01	12	23	34	45	56	67	78	89	9:	:;	;<	<=	=>	>?	?@	@A	AB	BC	CD	DE	EF	FG	GH	HI	IJ	JK	KL	LM	MN	NO	OP	PQ	QR	RS	ST	TU	UV	VW	WX	XY	YZ	Z[	[\\	\\]	]^	^_	_`	`a	ab	bc	cd	de	ef	fg	gh	hi	ij	jk	kl	lm	mn	no	op	pq	qr	rs	st	tu	uv	vw	wx	xy	yz	z{	{|	|}	}~	~\x7F	\x7F\x80	\x80\x81	\x81\x82	\x82\x83	\x83\x84	\x84\x07\u010B\n\f\u010E\v\u011A\n\u0125\n\x07\x07\x07\u012B\n\x07\f\x07\x07\u012E\v\x07\b\b\b\b				\n\n\n\n\n\v\v\v\u013F\n\v\r\v\v\u0140\v\v\f\f\f\f\f\u0149\n\f\r\r\x07\r\u014D\n\r\f\r\r\u0150\v\r\r\r\u015A\n\x07\u0162\n\f\u0165\v\u016D\n\u0172\n\r\u0173\u0177\n\r\u0178\u017C\n\r\u017D\u0184\n\x07\u0187\n\f\u018A\v\u018D\n\u019E\n\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\u01AE\n\x1B\x07\u01B6\n\f\u01B9\v\u01BC\n   \u01C7\n  \x07 \u01CA\n \f  \u01CD\v   \u01D0\n !!!!!\"\"##$$%%%\x07%\u01E0\n%\f%%\u01E3\v%%%%\u01E7\n%&&&&&&&&&&&&&&&&&&\u01FA\n&\r&&\u01FB&&\u01FF\n&''''(((()))\u020B\n))\x07)\u020E\n)\f))\u0211\v)))\u0214\n)****+++\u021C\n++\x07+\u021F\n+\f++\u0222\v+++\u0225\n+,,,,,--..///0000000000000\u023F\n01112222\u0247\n2333333333\u0251\n3333333333\x073\u025C\n3\f33\u025F\v344444444\u0268\n4444\x074\u026D\n4\f44\u0270\v4555555\u0277\n56666\u027C\n6777\x077\u0281\n7\f77\u0284\v777888\u028A\n88\x078\u028D\n8\f88\u0290\v888\u0293\n899999::;\x07;\u029D\n;\f;;\u02A0\v;;;;\u02A4\n;;;\u02A7\n;;;;;\x07;\u02AD\n;\f;;\u02B0\v;;;;\u02B4\n;;;\u02B7\n;;;;\u02BB\n;;\u02BD\n;<<===\u02C3\n=>>>\x07>\u02C8\n>\f>>\u02CB\v>>>???\x07?\u02D2\n?\f??\u02D5\v???\u02D8\n?@@@\u02DC\n@AAABBCCCCC\u02E7\nCDDD\x07D\u02EC\nD\fDD\u02EF\vDDD\u02F2\nDEEEFFFGGG\u02FC\nGG\x07G\u02FF\nG\fGG\u0302\vGGG\u0305\nGHHI\x07I\u030A\nI\fII\u030D\vIIIIIJJJJJJJJJJJJJJJJJJJ\u0325\nJKKLLLLMMM\u032F\nMM\x07M\u0332\nM\fMM\u0335\vMMM\u0338\nMNNN\u033C\nNOOOOPPP\u0344\nPP\x07P\u0347\nP\fPP\u034A\vPPP\u034D\nPQQQQQ\u0353\nQQQQQQQ\u035A\nQRRRRSSSSTTTTUUUU\x07U\u036C\nU\fUU\u036F\vUUU\u0372\nUVVVWWW\u0379\nWW\x07W\u037C\nW\fWW\u037F\vWWW\u0382\nWXXX\u0386\nXXX\u0389\nXYYYZZZZZ\u0392\nZ[[[[\u0397\n[\\\\\\\\\u039C\n\\\\\\\u039F\n\\]]]\u03A3\n]]\x07]\u03A6\n]\f]]\u03A9\v]^^^^^\u03AF\n^___```aabbccddeefff\u03C3\nfgghhiiiiiiii\u03D0\nijjjjjjjj\u03D9\njkkllmmnnooppp\u03E7\npqqqqqqqqqqqqqqqqqqqqqqq\u03FF\nqqqqqq\u0405\nqqqqqqqqq\u040E\nqqqqqqqqqqqqq\u041B\nqqqqqqq\u0422\nqq\u0424\nqqq\u0427\nqqqq\u042B\nqqqqqqqqq\x07q\u0435\nq\fqq\u0438\vqqqq\u043C\nqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq\x07q\u046F\nq\fqq\u0472\vqrrr\u0476\nrrrrrr\u047C\nrrr\u047F\nrss\u0482\ns\rss\u0483sss\u0488\nsttt\u048C\nttttuuu\x07u\u0494\nu\fuu\u0497\vuuu\u049A\nuvvv\u049E\nvv\x07v\u04A1\nv\fvv\u04A4\vvwww\u04A8\nww\x07w\u04AB\nw\fww\u04AE\vwww\u04B1\nwxxxx\u04B6\nxxxx\u04BA\nxyyyyy\u04C0\ny\ryy\u04C1yyzzzz\u04C9\nz{{{{{{{{\u04D2\n{||||\u04D7\n|}}}\x07}\u04DC\n}\f}}\u04DF\v}~~\x7F\x7F\x80\x80\x80\x81\x81\x82\x82\x83\x83\x84\x84\x84\x84\x84\x84\x84df\xE0\x85\b\n\f \"$&(*,.02468:<>@BDFHJLNPRTVXZ\\^`bdfhjlnprtvxz|~\x80\x82\x84\x86\x88\x8A\x8C\x8E\x90\x92\x94\x96\x98\x9A\x9C\x9E\xA0\xA2\xA4\xA6\xA8\xAA\xAC\xAE\xB0\xB2\xB4\xB6\xB8\xBA\xBC\xBE\xC0\xC2\xC4\xC6\xC8\xCA\xCC\xCE\xD0\xD2\xD4\xD6\xD8\xDA\xDC\xDE\xE0\xE2\xE4\xE6\xE8\xEA\xEC\xEE\xF0\xF2\xF4\xF6\xF8\xFA\xFC\xFE\u0100\u0102\u0104\u0106qq\x99\x99\n\n\"\"88??CCPP''1177[[\x92\x92\x94\x94((..DETT\x07))//KKRRYYx}\x85\x86de\x93\x9477[[ff\x91\x91	00==FGOOQQ]]``$$55\x80\x80\x82\x82\x87\x87~\x7F\u0542\u010C\u0119\u011B\b\u0124\n\u0126\f\u012C\u012F\u0133\u0137\u013C\u0148\u014A\u0153\u0157\u015D \u0169\"\u016E$\u0171&\u0176(\u017B*\u017F,\u018E.\u01930\u01952\u01974\u01AD6\u01AF8\u01BB:\u01BD<\u01C2>\u01C4@\u01D1B\u01D6D\u01D8F\u01DAH\u01E6J\u01FEL\u0200N\u0204P\u0208R\u0215T\u0219V\u0226X\u022BZ\u022D\\\u022F^\u023E`\u0240b\u0246d\u0250f\u0267h\u0276j\u027Bl\u027Dn\u0287p\u0294r\u0299t\u02BCv\u02BEx\u02C2z\u02C4|\u02CE~\u02D9\x80\u02DD\x82\u02E0\x84\u02E6\x86\u02E8\x88\u02F3\x8A\u02F6\x8C\u02F9\x8E\u0306\x90\u030B\x92\u0324\x94\u0326\x96\u0328\x98\u032C\x9A\u033B\x9C\u033D\x9E\u0341\xA0\u0359\xA2\u035B\xA4\u035F\xA6\u0363\xA8\u0367\xAA\u0373\xAC\u0376\xAE\u0385\xB0\u038A\xB2\u0391\xB4\u0393\xB6\u039E\xB8\u03A0\xBA\u03AA\xBC\u03B0\xBE\u03B3\xC0\u03B6\xC2\u03B8\xC4\u03BA\xC6\u03BC\xC8\u03BE\xCA\u03C2\xCC\u03C4\xCE\u03C6\xD0\u03CF\xD2\u03D8\xD4\u03DA\xD6\u03DC\xD8\u03DE\xDA\u03E0\xDC\u03E2\xDE\u03E6\xE0\u043B\xE2\u047E\xE4\u0481\xE6\u0489\xE8\u0490\xEA\u049B\xEC\u04A5\xEE\u04B5\xF0\u04BB\xF2\u04C5\xF4\u04D1\xF6\u04D6\xF8\u04D8\xFA\u04E0\xFC\u04E2\xFE\u04E4\u0100\u04E7\u0102\u04E9\u0104\u04EB\u0106\u04ED\u0108\u010B\u0109\u010B\x07\x84\u010A\u0108\u010A\u0109\u010B\u010E\u010C\u010A\u010C\u010D\u010D\u010F\u010E\u010C\u010F\u0110\x07\u0110\u0111\u011A\u0112\u011A\n\u0113\u011A\b\u0114\u011A\u0115\u011A	\u0116\u011A$\u0117\u011A&\u0118\u011A\u0106\x84\u0119\u0111\u0119\u0112\u0119\u0113\u0119\u0114\u0119\u0115\u0119\u0116\u0119\u0117\u0119\u0118\u011A\u011B\u011C\f\x07\u011C\u011D\x07\u011D\u011E> \u011E\x07\u011F\u0125*\u0120\u0121\f\x07\u0121\u0122\x07\u0122\u0123\n\u0123\u0125\u0124\u011F\u0124\u0120\u0125	\u0126\u0127\f\x07\u0127\u0128d3\u0128\v\u0129\u012B\x07h\u012A\u0129\u012B\u012E\u012C\u012A\u012C\u012D\u012D\r\u012E\u012C\u012F\u0130\f\x07\u0130\u0131\x07@\u0131\u0132\f\x07\u0132\u0133\u0134\f\x07\u0134\u0135\x07\x1B\u0135\u0136\n\u0136\u0137\u0138\x07\u0138\u0139\u0102\x82\u0139\u013A\b\u013A\u013B\v\u013B\u013C\u013E\x07p\u013D\u013F\f\u013E\u013D\u013F\u0140\u0140\u013E\u0140\u0141\u0141\u0142\u0142\u0143\x07q\u0143\u0144\u0145\x07\x07\u0145\u0149\u0104\x83\u0146\u0147\x07\u0147\u0149\r\u0148\u0144\u0148\u0146\u0149\u014A\u014E\x07\x98\u014B\u014D\u014C\u014B\u014D\u0150\u014E\u014C\u014E\u014F\u014F\u0151\u0150\u014E\u0151\u0152\x07\x9D\u0152\u0153\u0154\x07\x9C\u0154\u0155d3\u0155\u0156	\u0156\x1B\u0157\u0159\x07>\u0158\u015A\u0159\u0158\u0159\u015A\u015A\u015B\u015B\u015C\"\u015C\u015D\u015E\x07p\u015E\u0163 \u015F\u0160\x07v\u0160\u0162 \u0161\u015F\u0162\u0165\u0163\u0161\u0163\u0164\u0164\u0166\u0165\u0163\u0166\u0167\x07q\u0167\u0168\x07:\u0168\u0169\u016C\xD8m\u016A\u016B\x07@\u016B\u016D\xD8m\u016C\u016A\u016C\u016D\u016D!\u016E\u016F\xCAf\u016F#\u0170\u0172\x07g\u0171\u0170\u0172\u0173\u0173\u0171\u0173\u0174\u0174%\u0175\u0177\x07h\u0176\u0175\u0177\u0178\u0178\u0176\u0178\u0179\u0179'\u017A\u017C\x07g\u017B\u017A\u017C\u017D\u017D\u017B\u017D\u017E\u017E)\u017F\u0180\f\x07\u0180\u0181\x07\u0181\u0188,\u0182\u0184\x07v\u0183\u0182\u0183\u0184\u0184\u0185\u0185\u0187,\u0186\u0183\u0187\u018A\u0188\u0186\u0188\u0189\u0189\u018C\u018A\u0188\u018B\u018D\x07v\u018C\u018B\u018C\u018D\u018D+\u018E\u018F\f\x07\u018F\u0190<\u0190\u0191\b\u0191\u0192d3\u0192-\u0193\u0194\x07~\u0194/\u0195\u0196\xD8m\u01961\u0197\u01986\u0198\u0199\x07w\u0199\u019A\x07U\u019A\u019D\x07l\u019B\u019E\r\u019C\u019E\xCCg\u019D\u019B\u019D\u019C\u019E\u019F\u019F\u01A0\x07m\u01A03\u01A1\u01A2\x07V\u01A2\u01A3\x07l\u01A3\u01A4\xD6l\u01A4\u01A5\x07m\u01A5\u01AE\u01A6\u01A76\u01A7\u01A8\x07w";
-      MalloyParser._serializedATNSegment1 = "\u01A8\u01A9\x07V\u01A9\u01AA\x07l\u01AA\u01AB\xD4k\u01AB\u01AC\x07m\u01AC\u01AE\u01AD\u01A1\u01AD\u01A6\u01AE5\u01AF\u01B0\xD8m\u01B07\u01B1\u01BC:\u01B2\u01B7\x07p\u01B3\u01B6\x92J\u01B4\u01B6\x07\x84\u01B5\u01B3\u01B5\u01B4\u01B6\u01B9\u01B7\u01B5\u01B7\u01B8\u01B8\u01BA\u01B9\u01B7\u01BA\u01BC\x07q\u01BB\u01B1\u01BB\u01B2\u01BC9\u01BD\u01BE\x07p\u01BE\u01BF\x07\x89\u01BF\u01C0\xE0q\u01C0\u01C1\x07q\u01C1;\u01C2\u01C3\xD8m\u01C3=\u01C4\u01CB@!\u01C5\u01C7\x07v\u01C6\u01C5\u01C6\u01C7\u01C7\u01C8\u01C8\u01CA@!\u01C9\u01C6\u01CA\u01CD\u01CB\u01C9\u01CB\u01CC\u01CC\u01CF\u01CD\u01CB\u01CE\u01D0\x07v\u01CF\u01CE\u01CF\u01D0\u01D0?\u01D1\u01D2\f\x07\u01D2\u01D3D#\u01D3\u01D4\b\u01D4\u01D5B\"\u01D5A\u01D6\u01D7d3\u01D7C\u01D8\u01D9\xD8m\u01D9E\u01DA\u01DB\xD8m\u01DBG\u01DC\u01E1\x07p\u01DD\u01E0J&\u01DE\u01E0\x07\x84\u01DF\u01DD\u01DF\u01DE\u01E0\u01E3\u01E1\u01DF\u01E1\u01E2\u01E2\u01E4\u01E3\u01E1\u01E4\u01E7\x07q\u01E5\u01E7:\u01E6\u01DC\u01E6\u01E5\u01E7I\u01E8\u01FFN(\u01E9\u01FFL'\u01EA\u01FF\\/\u01EB\u01FF^0\u01EC\u01FF\x88E\u01ED\u01EE\x07\u01EE\u01FF\xFC\x7F\u01EF\u01F0\x07\u01F0\u01FFP)\u01F1\u01F2	\u01F2\u01FF\xEAv\u01F3\u01F4\f\x07\u01F4\u01F5	\u01F5\u01F6\x8CG\u01F6\u01FF\u01F7\u01FF\xBE`\u01F8\u01FA\x07h\u01F9\u01F8\u01FA\u01FB\u01FB\u01F9\u01FB\u01FC\u01FC\u01FF\u01FD\u01FF(\u01FE\u01E8\u01FE\u01E9\u01FE\u01EA\u01FE\u01EB\u01FE\u01EC\u01FE\u01ED\u01FE\u01EF\u01FE\u01F1\u01FE\u01F3\u01FE\u01F7\u01FE\u01F9\u01FE\u01FD\u01FFK\u0200\u0201\f\x07\u0201\u0202\x07\u0202\u0203T+\u0203M\u0204\u0205\f\x07\u0205\u0206\x07	\u0206\u0207T+\u0207O\u0208\u020FR*\u0209\u020B\x07v\u020A\u0209\u020A\u020B\u020B\u020C\u020C\u020ER*\u020D\u020A\u020E\u0211\u020F\u020D\u020F\u0210\u0210\u0213\u0211\u020F\u0212\u0214\x07v\u0213\u0212\u0213\u0214\u0214Q\u0215\u0216\xFC\x7F\u0216\u0217\b\u0217\u0218\xFC\x7F\u0218S\u0219\u0220V,\u021A\u021C\x07v\u021B\u021A\u021B\u021C\u021C\u021D\u021D\u021FV,\u021E\u021B\u021F\u0222\u0220\u021E\u0220\u0221\u0221\u0224\u0222\u0220\u0223\u0225\x07v\u0224\u0223\u0224\u0225\u0225U\u0226\u0227\f\x07\u0227\u0228X-\u0228\u0229\b\u0229\u022A\xE0q\u022AW\u022B\u022C\xD8m\u022CY\u022D\u022E\xD8m\u022E[\u022F\u0230\x07\b\u0230\u0231T+\u0231]\u0232\u0233\f\x07\u0233\u0234\x07\u0234\u0235n8\u0235\u023F\u0236\u0237\f\x07\u0237\u0238\x07\u0238\u0239n8\u0239\u023F\u023A\u023B\f\x07\u023B\u023C\x07\u023C\u023Dn8\u023D\u023F\u023E\u0232\u023E\u0236\u023E\u023A\u023F_\u0240\u0241\x07\v\u0241\u0242l7\u0242a\u0243\u0247^0\u0244\u0247\x88E\u0245\u0247\\/\u0246\u0243\u0246\u0244\u0246\u0245\u0247c\u0248\u0249\b3
\u0249\u0251\xD8m\u024A\u024B\x07l\u024B\u024Cd3\u024C\u024D\x07m\u024D\u0251\u024E\u02514\x1B\u024F\u02512\u0250\u0248\u0250\u024A\u0250\u024E\u0250\u024F\u0251\u025D\u0252\u0253\f\x07\u0253\u0254\x07~\u0254\u025Cf4\u0255\u0256\f\u0256\u0257\x07j\u0257\u025Cf4\u0258\u0259\f\u0259\u025A\x076\u025A\u025CH%\u025B\u0252\u025B\u0255\u025B\u0258\u025C\u025F\u025D\u025B\u025D\u025E\u025Ee\u025F\u025D\u0260\u0261\b4
\u0261\u0268\xF8}\u0262\u02688\u0263\u0264\x07l\u0264\u0265h5\u0265\u0266\x07m\u0266\u0268\u0267\u0260\u0267\u0262\u0267\u0263\u0268\u026E\u0269\u026A\f\u026A\u026B\x07~\u026B\u026Df4\u026C\u0269\u026D\u0270\u026E\u026C\u026E\u026F\u026Fg\u0270\u026E\u0271\u0277f4\u0272\u0273f4\u0273\u0274\x07j\u0274\u0275h5\u0275\u0277\u0276\u0271\u0276\u0272\u0277i\u0278\u027CN(\u0279\u027CL'\u027A\u027C^0\u027B\u0278\u027B\u0279\u027B\u027A\u027Ck\u027D\u0282\x07p\u027E\u0281j6\u027F\u0281\x07\x84\u0280\u027E\u0280\u027F\u0281\u0284\u0282\u0280\u0282\u0283\u0283\u0285\u0284\u0282\u0285\u0286\x07q\u0286m\u0287\u028Et;\u0288\u028A\x07v\u0289\u0288\u0289\u028A\u028A\u028B\u028B\u028Dt;\u028C\u0289\u028D\u0290\u028E\u028C\u028E\u028F\u028F\u0292\u0290\u028E\u0291\u0293\x07v\u0292\u0291\u0292\u0293\u0293o\u0294\u0295\f\x07\u0295\u0296\x07@\u0296\u0297\f\x07\u0297\u0298d3\u0298q\u0299\u029A	\u029As\u029B\u029D\x07h\u029C\u029B\u029D\u02A0\u029E\u029C\u029E\u029F\u029F\u02A1\u02A0\u029E\u02A1\u02A3Z.\u02A2\u02A4p9\u02A3\u02A2\u02A3\u02A4\u02A4\u02A6\u02A5\u02A7r:\u02A6\u02A5\u02A6\u02A7\u02A7\u02A8\u02A8\u02A9\x07_\u02A9\u02AA\xE0q\u02AA\u02BD\u02AB\u02AD\x07h\u02AC\u02AB\u02AD\u02B0\u02AE\u02AC\u02AE\u02AF\u02AF\u02B1\u02B0\u02AE\u02B1\u02B3Z.\u02B2\u02B4p9\u02B3\u02B2\u02B3\u02B4\u02B4\u02BA\u02B5\u02B7r:\u02B6\u02B5\u02B6\u02B7\u02B7\u02B8\u02B8\u02B9\x07L\u02B9\u02BBv<\u02BA\u02B6\u02BA\u02BB\u02BB\u02BD\u02BC\u029E\u02BC\u02AE\u02BDu\u02BE\u02BF\xE0q\u02BFw\u02C0\u02C3\x88E\u02C1\u02C3\x8AF\u02C2\u02C0\u02C2\u02C1\u02C3y\u02C4\u02C9\x07p\u02C5\u02C8\x84C\u02C6\u02C8\x07\x84\u02C7\u02C5\u02C7\u02C6\u02C8\u02CB\u02C9\u02C7\u02C9\u02CA\u02CA\u02CC\u02CB\u02C9\u02CC\u02CD\x07q\u02CD{\u02CE\u02D3~@\u02CF\u02D0\x07v\u02D0\u02D2~@\u02D1\u02CF\u02D2\u02D5\u02D3\u02D1\u02D3\u02D4\u02D4\u02D7\u02D5\u02D3\u02D6\u02D8\x07v\u02D7\u02D6\u02D7\u02D8\u02D8}\u02D9\u02DB\xE0q\u02DA\u02DC	\u02DB\u02DA\u02DB\u02DC\u02DC\x7F\u02DD\u02DE\x07\u02DE\u02DF|?\u02DF\x81\u02E0\u02E1\xB0Y\u02E1\x83\u02E2\u02E7\x88E\u02E3\u02E7\xA8U\u02E4\u02E7\x80A\u02E5\u02E7\x82B\u02E6\u02E2\u02E6\u02E3\u02E6\u02E4\u02E6\u02E5\u02E7\x85\u02E8\u02ED\xE0q\u02E9\u02EA\x07v\u02EA\u02EC\xE0q\u02EB\u02E9\u02EC\u02EF\u02ED\u02EB\u02ED\u02EE\u02EE\u02F1\u02EF\u02ED\u02F0\u02F2\x07v\u02F1\u02F0\u02F1\u02F2\u02F2\x87\u02F3\u02F4\x07!\u02F4\u02F5\x86D\u02F5\x89\u02F6\u02F7\x07\r\u02F7\u02F8\x86D\u02F8\x8B\u02F9\u0300\x90I\u02FA\u02FC\x07v\u02FB\u02FA\u02FB\u02FC\u02FC\u02FD\u02FD\u02FF\x90I\u02FE\u02FB\u02FF\u0302\u0300\u02FE\u0300\u0301\u0301\u0304\u0302\u0300\u0303\u0305\x07v\u0304\u0303\u0304\u0305\u0305\x8D\u0306\u0307\xD8m\u0307\x8F\u0308\u030A\x07h\u0309\u0308\u030A\u030D\u030B\u0309\u030B\u030C\u030C\u030E\u030D\u030B\u030E\u030F\x8EH\u030F\u0310\b\u0310\u0311h5\u0311\x91\u0312\u0325\x96L\u0313\u0325\\/\u0314\u0325\x94K\u0315\u0325`1\u0316\u0325\xA6T\u0317\u0325\xBA^\u0318\u0325\xA2R\u0319\u0325\xA4S\u031A\u0325\xB4[\u031B\u0325\xB0Y\u031C\u0325\xAAV\u031D\u0325\x88E\u031E\u0325\x8AF\u031F\u0325\x9CO\u0320\u0325\xBC_\u0321\u0325\xBE`\u0322\u0325\xC0a\u0323\u0325(\u0324\u0312\u0324\u0313\u0324\u0314\u0324\u0315\u0324\u0316\u0324\u0317\u0324\u0318\u0324\u0319\u0324\u031A\u0324\u031B\u0324\u031C\u0324\u031D\u0324\u031E\u0324\u031F\u0324\u0320\u0324\u0321\u0324\u0322\u0324\u0323\u0325\x93\u0326\u0327^0\u0327\x95\u0328\u0329\f\x07\u0329\u032A\x07\f\u032A\u032B\x98M\u032B\x97\u032C\u0333\x9AN\u032D\u032F\x07v\u032E\u032D\u032E\u032F\u032F\u0330\u0330\u0332\x9AN\u0331\u032E\u0332\u0335\u0333\u0331\u0333\u0334\u0334\u0337\u0335\u0333\u0336\u0338\x07v\u0337\u0336\u0337\u0338\u0338\x99\u0339\u033C\xF2z\u033A\u033CV,\u033B\u0339\u033B\u033A\u033C\x9B\u033D\u033E\f\x07\u033E\u033F\x07\u033F\u0340\x9EP\u0340\x9D\u0341\u0348\xA0Q\u0342\u0344\x07v\u0343\u0342\u0343\u0344\u0344\u0345\u0345\u0347\xA0Q\u0346\u0343\u0347\u034A\u0348\u0346\u0348\u0349\u0349\u034C\u034A\u0348\u034B\u034D\x07v\u034C\u034B\u034C\u034D\u034D\x9F\u034E\u034F\f\x07\u034F\u0352\xF8}\u0350\u0351\x07~\u0351\u0353h5\u0352\u0350\u0352\u0353\u0353\u035A\u0354\u0355\f\x07\u0355\u0356<\u0356\u0357\b\u0357\u0358h5\u0358\u035A\u0359\u034E\u0359\u0354\u035A\xA1\u035B\u035C\f\x07\u035C\u035D\x07\u035D\u035E\x98M\u035E\xA3\u035F\u0360\f\x07\u0360\u0361\x07\u0361\u0362\x98M\u0362\xA5\u0363\u0364\f\x07\u0364\u0365	\x07\u0365\u0366\xECw\u0366\xA7\u0367\u0368\x07\u0368\u036D\xD8m\u0369\u036A\x07v\u036A\u036C\xD8m\u036B\u0369\u036C\u036F\u036D\u036B\u036D\u036E\u036E\u0371\u036F\u036D\u0370\u0372\x07v\u0371\u0370\u0371\u0372\u0372\xA9\u0373\u0374\x07\u0374\u0375\xACW\u0375\xAB\u0376\u037D\xAEX\u0377\u0379\x07v\u0378\u0377\u0378\u0379\u0379\u037A\u037A\u037C\xAEX\u037B\u0378\u037C\u037F\u037D\u037B\u037D\u037E\u037E\u0381\u037F\u037D\u0380\u0382\x07v\u0381\u0380\u0381\u0382\u0382\xAD\u0383\u0386\x07\x94\u0384\u0386\xFC\x7F\u0385\u0383\u0385\u0384\u0386\u0388\u0387\u0389	\u0388\u0387\u0388\u0389\u0389\xAF\u038A\u038B\x07\u038B\u038C\x07\x94\u038C\xB1\u038D\u038E\x07*\u038E\u0392\xFC\x7F\u038F\u0390\x07*\u0390\u0392\xE0q\u0391\u038D\u0391\u038F\u0392\xB3\u0393\u0394\x07 \u0394\u0396\x07\x94\u0395\u0397\xB2Z\u0396\u0395\u0396\u0397\u0397\xB5\u0398\u039B\xF8}\u0399\u039A\x07w\u039A\u039C\x07\x80\u039B\u0399\u039B\u039C\u039C\u039F\u039D\u039F\x07\x80\u039E\u0398\u039E\u039D\u039F\xB7\u03A0\u03A7\xB6\\\u03A1\u03A3\x07v\u03A2\u03A1\u03A2\u03A3\u03A3\u03A4\u03A4\u03A6\xB6\\\u03A5\u03A2\u03A6\u03A9\u03A7\u03A5\u03A7\u03A8\u03A8\xB9\u03A9\u03A7\u03AA\u03AB\x07\u03AB\u03AE\xB8]\u03AC\u03AD\x07*\u03AD\u03AF\xFC\x7F\u03AE\u03AC\u03AE\u03AF\u03AF\xBB\u03B0\u03B1\x07\u03B1\u03B2\xC2b\u03B2\xBD\u03B3\u03B4\x07#\u03B4\u03B5\xCAf\u03B5\xBF\u03B6\u03B7\x07h\u03B7\xC1\u03B8\u03B9	\b\u03B9\xC3\u03BA\u03BB		\u03BB\xC5\u03BC\u03BD	\n\u03BD\xC7\u03BE\u03BF	\v\u03BF\xC9\u03C0\u03C3\xCCg\u03C1\u03C3\r\u03C2\u03C0\u03C2\u03C1\u03C3\xCB\u03C4\u03C5	\f\u03C5\xCD\u03C6\u03C7	\r\u03C7\xCF\u03C8\u03D0\xCAf\u03C9\u03D0\xCEh\u03CA\u03D0\xD2j\u03CB\u03D0\x07J\u03CC\u03D0	\u03CD\u03D0\x07c\u03CE\u03D0\x07I\u03CF\u03C8\u03CF\u03C9\u03CF\u03CA\u03CF\u03CB\u03CF\u03CC\u03CF\u03CD\u03CF\u03CE\u03D0\xD1\u03D1\u03D9\x07\x8A\u03D2\u03D9\x07\x8B\u03D3\u03D9\x07\x8C\u03D4\u03D9\x07\x8F\u03D5\u03D9\x07\x8E\u03D6\u03D9\x07\x8D\u03D7\u03D9\x07\x90\u03D8\u03D1\u03D8\u03D2\u03D8\u03D3\u03D8\u03D4\u03D8\u03D5\u03D8\u03D6\u03D8\u03D7\u03D9\xD3\u03DA\u03DB\xCAf\u03DB\xD5\u03DC\u03DD\xCAf\u03DD\xD7\u03DE\u03DF	\u03DF\xD9\u03E0\u03E1	\u03E1\xDB\u03E2\u03E3	\u03E3\xDD\u03E4\u03E7\xC6d\u03E5\u03E7\xCAf\u03E6\u03E4\u03E6\u03E5\u03E7\xDF\u03E8\u03E9\bq
\u03E9\u043C\xF8}\u03EA\u043C\xD0i\u03EB\u03EC\x07\x7F\u03EC\u043C\xE0q\u03ED\u03EE\x07H\u03EE\u043C\xE0q\u03EF\u03F0\x07,\u03F0\u03F1\x07l\u03F1\u03F2\xE0q\u03F2\u03F3\x07&\u03F3\u03F4\xDEp\u03F4\u03F5\x07m\u03F5\u043C\u03F6\u03F7\x07.\u03F7\u03F8\x07l\u03F8\u03F9\x072\u03F9\u03FA\xE0q\u03FA\u03FB\x07m\u03FB\u043C\u03FC\u03FD\x07S\u03FD\u03FF\x07w\u03FE\u03FC\u03FE\u03FF\u03FF\u0400\u0400\u0401\xC4c\u0401\u0404\x07l\u0402\u0405\xE0q\u0403\u0405\x07\x80\u0404\u0402\u0404\u0403\u0404\u0405\u0405\u0406\u0406\u0407\x07m\u0407\u043C\u0408\u0409\xF8}\u0409\u040A\x07w\u040A\u040B\xC4c\u040B\u040D\x07l\u040C\u040E\xE0q\u040D\u040C\u040D\u040E\u040E\u040F\u040F\u0410\x07m\u0410\u043C\u0411\u0412\x07l\u0412\u0413\xE2r\u0413\u0414\x07m\u0414\u043C\u0415\u0416\xF8}\u0416\u0417\x07w\u0417\u0418\xD8m\u0418\u041A\x07l\u0419\u041B\xE8u\u041A\u0419\u041A\u041B\u041B\u041C\u041C\u041D\x07m\u041D\u043C\u041E\u0423\xD8m\u041F\u0421\x07t\u0420\u0422\xC6d\u0421\u0420\u0421\u0422\u0422\u0424\u0423\u041F\u0423\u0424\u0424\u0427\u0425\u0427\xDAn\u0426\u041E\u0426\u0425\u0427\u0428\u0428\u042A\x07l\u0429\u042B\xE8u\u042A\u0429\u042A\u042B\u042B\u042C\u042C\u042D\x07m\u042D\u043C\u042E\u043C\xE4s\u042F\u0430\xDCo\u0430\u0431\x07l\u0431\u0436\xE0q\u0432\u0433\x07v\u0433\u0435\xFC\x7F\u0434\u0432\u0435\u0438\u0436\u0434\u0436\u0437\u0437\u0439\u0438\u0436\u0439\u043A\x07m\u043A\u043C\u043B\u03E8\u043B\u03EA\u043B\u03EB\u043B\u03ED\u043B\u03EF\u043B\u03F6\u043B\u03FE\u043B\u0408\u043B\u0411\u043B\u0415\u043B\u0426\u043B\u042E\u043B\u042F\u043C\u0470\u043D\u043E\f\u043E\u043F	\u043F\u046F\xE0q\u0440\u0441\f\u0441\u0442	\u0442\u046F\xE0q\u0443\u0444\f\u0444\u0445\x07Z\u0445\u046F\xE0q\u0446\u0447\f\u0447\u0448\xC8e\u0448\u0449\xE0q\u0449\u046F\u044A\u044B\f\u044B\u044C\x07%\u044C\u046F\xE0q\u044D\u044E\f\r\u044E\u044F\x07M\u044F\u046F\xE0q\u0450\u0451\f\f\u0451\u0452\x07\x88\u0452\u046F\xE0q\r\u0453\u0454\f\u0454\u046Fz>";
-      MalloyParser._serializedATNSegment2 = "\u0455\u0456\f\u0456\u046F\xDAn\u0457\u0458\f\x1B\u0458\u0459\x07w\u0459\u046F\xDAn\u045A\u045B\f\u045B\u045C\x07r\u045C\u046F\xDEp\u045D\u045E\f\u045E\u045F\x07s\u045F\u046F\xDEp\u0460\u0461\f\u0461\u0462\x079\u0462\u0463\xE0q\u0463\u0464\xDAn\u0464\u046F\u0465\u0466\f\u0466\u0467\x07i\u0467\u046F\xE2r\u0468\u0469\f\u0469\u046A\x07\x83\u046A\u046F\xE2r\u046B\u046C\f\u046C\u046D\x07\x89\u046D\u046F\xE2r\u046E\u043D\u046E\u0440\u046E\u0443\u046E\u0446\u046E\u044A\u046E\u044D\u046E\u0450\u046E\u0453\u046E\u0455\u046E\u0457\u046E\u045A\u046E\u045D\u046E\u0460\u046E\u0465\u046E\u0468\u046E\u046B\u046F\u0472\u0470\u046E\u0470\u0471\u0471\xE1\u0472\u0470\u0473\u0475\x07l\u0474\u0476\xC8e\u0475\u0474\u0475\u0476\u0476\u0477\u0477\u0478\xE0q\u0478\u0479\x07m\u0479\u047F\u047A\u047C\xC8e\u047B\u047A\u047B\u047C\u047C\u047D\u047D\u047F\xE0q\u047E\u0473\u047E\u047B\u047F\xE3\u0480\u0482\xE6t\u0481\u0480\u0482\u0483\u0483\u0481\u0483\u0484\u0484\u0487\u0485\u0486\x073\u0486\u0488\xE0q\u0487\u0485\u0487\u0488\u0488\xE5\u0489\u048B\x07N\u048A\u048C\xE0q\u048B\u048A\u048B\u048C\u048C\u048D\u048D\u048E\x07^\u048E\u048F\xE2r\u048F\xE7\u0490\u0495\xE0q\u0491\u0492\x07v\u0492\u0494\xE0q\u0493\u0491\u0494\u0497\u0495\u0493\u0495\u0496\u0496\u0499\u0497\u0495\u0498\u049A\x07v\u0499\u0498\u0499\u049A\u049A\xE9\u049B\u04A2\xFC\x7F\u049C\u049E\x07v\u049D\u049C\u049D\u049E\u049E\u049F\u049F\u04A1\xFC\x7F\u04A0\u049D\u04A1\u04A4\u04A2\u04A0\u04A2\u04A3\u04A3\xEB\u04A4\u04A2\u04A5\u04AC\xF6|\u04A6\u04A8\x07v\u04A7\u04A6\u04A7\u04A8\u04A8\u04A9\u04A9\u04AB\xF6|\u04AA\u04A7\u04AB\u04AE\u04AC\u04AA\u04AC\u04AD\u04AD\u04B0\u04AE\u04AC\u04AF\u04B1\x07v\u04B0\u04AF\u04B0\u04B1\u04B1\xED\u04B2\u04B3\xF8}\u04B3\u04B4\x07w\u04B4\u04B6\u04B5\u04B2\u04B5\u04B6\u04B6\u04B7\u04B7\u04B9\x07\x80\u04B8\u04BA\xF0y\u04B9\u04B8\u04B9\u04BA\u04BA\xEF\u04BB\u04BF\x07p\u04BC\u04BD\x07\n\u04BD\u04C0\xEAv\u04BE\u04C0\x07v\u04BF\u04BC\u04BF\u04BE\u04C0\u04C1\u04C1\u04BF\u04C1\u04C2\u04C2\u04C3\u04C3\u04C4\x07q\u04C4\xF1\u04C5\u04C6\f\x07\u04C6\u04C8\xF8}\u04C7\u04C9\xF4{\u04C8\u04C7\u04C8\u04C9\u04C9\xF3\u04CA\u04CB\x07w\u04CB\u04D2\xDAn\u04CC\u04CD\x07w\u04CD\u04CE\xC4c\u04CE\u04CF\x07l\u04CF\u04D0\x07m\u04D0\u04D2\u04D1\u04CA\u04D1\u04CC\u04D2\xF5\u04D3\u04D7\xF2z\u04D4\u04D7\xEEx\u04D5\u04D7V,\u04D6\u04D3\u04D6\u04D4\u04D6\u04D5\u04D7\xF7\u04D8\u04DD\xFC\x7F\u04D9\u04DA\x07w\u04DA\u04DC\xFC\x7F\u04DB\u04D9\u04DC\u04DF\u04DD\u04DB\u04DD\u04DE\u04DE\xF9\u04DF\u04DD\u04E0\u04E1\xD8m\u04E1\xFB\u04E2\u04E3\xD8m\u04E3\xFD\u04E4\u04E5\xE0q\u04E5\u04E6\x07\u04E6\xFF\u04E7\u04E8\xD8m\u04E8\u0101\u04E9\u04EA\xD8m\u04EA\u0103\u04EB\u04EC\xCAf\u04EC\u0105\u04ED\u04EE\x07\x84\u04EE\u04EF\x07\x84\u04EF\u04F0\x07n\u04F0\u04F1\xCAf\u04F1\u04F2\x07o\u04F2\u0107\x86\u010A\u010C\u0119\u0124\u012C\u0140\u0148\u014E\u0159\u0163\u016C\u0173\u0178\u017D\u0183\u0188\u018C\u019D\u01AD\u01B5\u01B7\u01BB\u01C6\u01CB\u01CF\u01DF\u01E1\u01E6\u01FB\u01FE\u020A\u020F\u0213\u021B\u0220\u0224\u023E\u0246\u0250\u025B\u025D\u0267\u026E\u0276\u027B\u0280\u0282\u0289\u028E\u0292\u029E\u02A3\u02A6\u02AE\u02B3\u02B6\u02BA\u02BC\u02C2\u02C7\u02C9\u02D3\u02D7\u02DB\u02E6\u02ED\u02F1\u02FB\u0300\u0304\u030B\u0324\u032E\u0333\u0337\u033B\u0343\u0348\u034C\u0352\u0359\u036D\u0371\u0378\u037D\u0381\u0385\u0388\u0391\u0396\u039B\u039E\u03A2\u03A7\u03AE\u03C2\u03CF\u03D8\u03E6\u03FE\u0404\u040D\u041A\u0421\u0423\u0426\u042A\u0436\u043B\u046E\u0470\u0475\u047B\u047E\u0483\u0487\u048B\u0495\u0499\u049D\u04A2\u04A7\u04AC\u04B0\u04B5\u04B9\u04BF\u04C1\u04C8\u04D1\u04D6\u04DD";
+      MalloyParser._serializedATNSegment0 = "\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x9D\u04F3					\x07	\x07\b	\b			\n	\n\v	\v\f	\f\r	\r													\x1B	\x1B				 	 !	!\"	\"#	#$	$%	%&	&'	'(	()	)*	*+	+,	,-	-.	./	/0	01	12	23	34	45	56	67	78	89	9:	:;	;<	<=	=>	>?	?@	@A	AB	BC	CD	DE	EF	FG	GH	HI	IJ	JK	KL	LM	MN	NO	OP	PQ	QR	RS	ST	TU	UV	VW	WX	XY	YZ	Z[	[\\	\\]	]^	^_	_`	`a	ab	bc	cd	de	ef	fg	gh	hi	ij	jk	kl	lm	mn	no	op	pq	qr	rs	st	tu	uv	vw	wx	xy	yz	z{	{|	|}	}~	~\x7F	\x7F\x80	\x80\x81	\x81\x82	\x82\x83	\x83\x84	\x84\x07\u010B\n\f\u010E\v\u011A\n\u0125\n\x07\x07\x07\u012B\n\x07\f\x07\x07\u012E\v\x07\b\b\b\b				\n\n\n\n\n\v\v\v\u013F\n\v\r\v\v\u0140\v\v\f\f\f\f\f\u0149\n\f\r\r\x07\r\u014D\n\r\f\r\r\u0150\v\r\r\r\u015A\n\x07\u0162\n\f\u0165\v\u016D\n\u0172\n\r\u0173\u0177\n\r\u0178\u017C\n\r\u017D\u0184\n\x07\u0187\n\f\u018A\v\u018D\n\u019E\n\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\x1B\u01AE\n\x1B\x07\u01B6\n\f\u01B9\v\u01BC\n   \u01C7\n  \x07 \u01CA\n \f  \u01CD\v   \u01D0\n !!!!!\"\"##$$%%%\x07%\u01E0\n%\f%%\u01E3\v%%%%\u01E7\n%&&&&&&&&&&&&&&&&&&\u01FA\n&\r&&\u01FB&&\u01FF\n&''''(((()))\u020B\n))\x07)\u020E\n)\f))\u0211\v)))\u0214\n)****+++\u021C\n++\x07+\u021F\n+\f++\u0222\v+++\u0225\n+,,,,,--..///0000000000000\u023F\n01112222\u0247\n2333333333\u0251\n3333333333\x073\u025C\n3\f33\u025F\v344444444\u0268\n4444\x074\u026D\n4\f44\u0270\v4555555\u0277\n56666\u027C\n6777\x077\u0281\n7\f77\u0284\v777888\u028A\n88\x078\u028D\n8\f88\u0290\v888\u0293\n899999::;\x07;\u029D\n;\f;;\u02A0\v;;;;\u02A4\n;;;\u02A7\n;;;;;\x07;\u02AD\n;\f;;\u02B0\v;;;;\u02B4\n;;;\u02B7\n;;;;\u02BB\n;;\u02BD\n;<<===\u02C3\n=>>>\x07>\u02C8\n>\f>>\u02CB\v>>>???\x07?\u02D2\n?\f??\u02D5\v???\u02D8\n?@@@\u02DC\n@@@@\u02E0\n@AAABBCCCCC\u02EB\nCDDD\x07D\u02F0\nD\fDD\u02F3\vDDD\u02F6\nDEEEFFFGGG\u0300\nGG\x07G\u0303\nG\fGG\u0306\vGGG\u0309\nGHHI\x07I\u030E\nI\fII\u0311\vIIIIIJJJJJJJJJJJJJJJJJJJ\u0329\nJKKLLLLMMM\u0333\nMM\x07M\u0336\nM\fMM\u0339\vMMM\u033C\nMNNN\u0340\nNOOOOPPP\u0348\nPP\x07P\u034B\nP\fPP\u034E\vPPP\u0351\nPQQQQQ\u0357\nQQQRRRRSSSSTTTTUUUU\x07U\u036B\nU\fUU\u036E\vUUU\u0371\nUVVVWWW\u0378\nWW\x07W\u037B\nW\fWW\u037E\vWWW\u0381\nWXXX\u0385\nXXX\u0388\nXYYYZZZZZ\u0391\nZ[[[[\u0396\n[\\\\\\\\\u039B\n\\\\\\\u039E\n\\]]]\u03A2\n]]\x07]\u03A5\n]\f]]\u03A8\v]^^^^^\u03AE\n^___```aabbccddeefff\u03C2\nfgghhiiiiiiii\u03CF\nijjjjjjjj\u03D8\njkkllmmnnooppp\u03E6\npqqqqqqqqqqqqqqqqqqqqqqq\u03FE\nqqqqqq\u0404\nqqqqqqqqq\u040D\nqqqqqqqqqqqqq\u041A\nqqqqqqq\u0421\nqq\u0423\nqqq\u0426\nqqqq\u042A\nqqqqqqqqq\x07q\u0434\nq\fqq\u0437\vqqqq\u043B\nqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq\x07q\u046E\nq\fqq\u0471\vqrrr\u0475\nrrrrrr\u047B\nrrr\u047E\nrss\u0481\ns\rss\u0482sss\u0487\nsttt\u048B\nttttuuu\x07u\u0493\nu\fuu\u0496\vuuu\u0499\nuvvv\u049D\nvv\x07v\u04A0\nv\fvv\u04A3\vvwww\u04A7\nww\x07w\u04AA\nw\fww\u04AD\vwww\u04B0\nwxxxx\u04B5\nxxxx\u04B9\nxyyyyy\u04BF\ny\ryy\u04C0yyzzzz\u04C8\nz{{{{{{{{\u04D1\n{||||\u04D6\n|}}}\x07}\u04DB\n}\f}}\u04DE\v}~~\x7F\x7F\x80\x80\x80\x81\x81\x82\x82\x83\x83\x84\x84\x84\x84\x84\x84\x84df\xE0\x85\b\n\f \"$&(*,.02468:<>@BDFHJLNPRTVXZ\\^`bdfhjlnprtvxz|~\x80\x82\x84\x86\x88\x8A\x8C\x8E\x90\x92\x94\x96\x98\x9A\x9C\x9E\xA0\xA2\xA4\xA6\xA8\xAA\xAC\xAE\xB0\xB2\xB4\xB6\xB8\xBA\xBC\xBE\xC0\xC2\xC4\xC6\xC8\xCA\xCC\xCE\xD0\xD2\xD4\xD6\xD8\xDA\xDC\xDE\xE0\xE2\xE4\xE6\xE8\xEA\xEC\xEE\xF0\xF2\xF4\xF6\xF8\xFA\xFC\xFE\u0100\u0102\u0104\u0106qq\x99\x99\n\n\"\"88??CCPP''1177[[\x92\x92\x94\x94((..DETT\x07))//KKRRYYx}\x85\x86de\x93\x9477[[ff\x91\x91	00==FGOOQQ]]``$$55\x80\x80\x82\x82\x87\x87~\x7F\u0542\u010C\u0119\u011B\b\u0124\n\u0126\f\u012C\u012F\u0133\u0137\u013C\u0148\u014A\u0153\u0157\u015D \u0169\"\u016E$\u0171&\u0176(\u017B*\u017F,\u018E.\u01930\u01952\u01974\u01AD6\u01AF8\u01BB:\u01BD<\u01C2>\u01C4@\u01D1B\u01D6D\u01D8F\u01DAH\u01E6J\u01FEL\u0200N\u0204P\u0208R\u0215T\u0219V\u0226X\u022BZ\u022D\\\u022F^\u023E`\u0240b\u0246d\u0250f\u0267h\u0276j\u027Bl\u027Dn\u0287p\u0294r\u0299t\u02BCv\u02BEx\u02C2z\u02C4|\u02CE~\u02DF\x80\u02E1\x82\u02E4\x84\u02EA\x86\u02EC\x88\u02F7\x8A\u02FA\x8C\u02FD\x8E\u030A\x90\u030F\x92\u0328\x94\u032A\x96\u032C\x98\u0330\x9A\u033F\x9C\u0341\x9E\u0345\xA0\u0352\xA2\u035A\xA4\u035E\xA6\u0362\xA8\u0366\xAA\u0372\xAC\u0375\xAE\u0384\xB0\u0389\xB2\u0390\xB4\u0392\xB6\u039D\xB8\u039F\xBA\u03A9\xBC\u03AF\xBE\u03B2\xC0\u03B5\xC2\u03B7\xC4\u03B9\xC6\u03BB\xC8\u03BD\xCA\u03C1\xCC\u03C3\xCE\u03C5\xD0\u03CE\xD2\u03D7\xD4\u03D9\xD6\u03DB\xD8\u03DD\xDA\u03DF\xDC\u03E1\xDE\u03E5\xE0\u043A\xE2\u047D\xE4\u0480\xE6\u0488\xE8\u048F\xEA\u049A\xEC\u04A4\xEE\u04B4\xF0\u04BA\xF2\u04C4\xF4\u04D0\xF6\u04D5\xF8\u04D7\xFA\u04DF\xFC\u04E1\xFE\u04E3\u0100\u04E6\u0102\u04E8\u0104\u04EA\u0106\u04EC\u0108\u010B\u0109\u010B\x07\x84\u010A\u0108\u010A\u0109\u010B\u010E\u010C\u010A\u010C\u010D\u010D\u010F\u010E\u010C\u010F\u0110\x07\u0110\u0111\u011A\u0112\u011A\n\u0113\u011A\b\u0114\u011A\u0115\u011A	\u0116\u011A$\u0117\u011A&\u0118\u011A\u0106\x84\u0119\u0111\u0119\u0112\u0119\u0113\u0119\u0114\u0119\u0115\u0119\u0116\u0119\u0117\u0119\u0118\u011A\u011B\u011C\f\x07\u011C\u011D\x07\u011D\u011E> \u011E\x07\u011F\u0125*\u0120\u0121\f\x07\u0121\u0122\x07\u0122\u0123\n\u0123\u0125\u0124\u011F\u0124\u0120\u0125	\u0126\u0127\f\x07\u0127\u0128d3\u0128\v\u0129\u012B\x07h\u012A\u0129\u012B\u012E\u012C\u012A\u012C\u012D\u012D\r\u012E\u012C\u012F\u0130\f\x07\u0130\u0131\x07@\u0131\u0132\f\x07\u0132\u0133\u0134\f\x07\u0134\u0135\x07\x1B\u0135\u0136\n\u0136\u0137\u0138\x07\u0138\u0139\u0102\x82\u0139\u013A\b\u013A\u013B\v\u013B\u013C\u013E\x07p\u013D\u013F\f\u013E\u013D\u013F\u0140\u0140\u013E\u0140\u0141\u0141\u0142\u0142\u0143\x07q\u0143\u0144\u0145\x07\x07\u0145\u0149\u0104\x83\u0146\u0147\x07\u0147\u0149\r\u0148\u0144\u0148\u0146\u0149\u014A\u014E\x07\x98\u014B\u014D\u014C\u014B\u014D\u0150\u014E\u014C\u014E\u014F\u014F\u0151\u0150\u014E\u0151\u0152\x07\x9D\u0152\u0153\u0154\x07\x9C\u0154\u0155d3\u0155\u0156	\u0156\x1B\u0157\u0159\x07>\u0158\u015A\u0159\u0158\u0159\u015A\u015A\u015B\u015B\u015C\"\u015C\u015D\u015E\x07p\u015E\u0163 \u015F\u0160\x07v\u0160\u0162 \u0161\u015F\u0162\u0165\u0163\u0161\u0163\u0164\u0164\u0166\u0165\u0163\u0166\u0167\x07q\u0167\u0168\x07:\u0168\u0169\u016C\xD8m\u016A\u016B\x07@\u016B\u016D\xD8m\u016C\u016A\u016C\u016D\u016D!\u016E\u016F\xCAf\u016F#\u0170\u0172\x07g\u0171\u0170\u0172\u0173\u0173\u0171\u0173\u0174\u0174%\u0175\u0177\x07h\u0176\u0175\u0177\u0178\u0178\u0176\u0178\u0179\u0179'\u017A\u017C\x07g\u017B\u017A\u017C\u017D\u017D\u017B\u017D\u017E\u017E)\u017F\u0180\f\x07\u0180\u0181\x07\u0181\u0188,\u0182\u0184\x07v\u0183\u0182\u0183\u0184\u0184\u0185\u0185\u0187,\u0186\u0183\u0187\u018A\u0188\u0186\u0188\u0189\u0189\u018C\u018A\u0188\u018B\u018D\x07v\u018C\u018B\u018C\u018D\u018D+\u018E\u018F\f\x07\u018F\u0190<\u0190\u0191\b\u0191\u0192d3\u0192-\u0193\u0194\x07~\u0194/\u0195\u0196\xD8m\u01961\u0197\u01986\u0198\u0199\x07w\u0199\u019A\x07U\u019A\u019D\x07l\u019B\u019E\r\u019C\u019E\xCCg\u019D\u019B\u019D\u019C\u019E\u019F\u019F\u01A0\x07m\u01A03\u01A1\u01A2\x07V\u01A2\u01A3\x07l\u01A3\u01A4\xD6l\u01A4\u01A5\x07m\u01A5\u01AE\u01A6\u01A76\u01A7\u01A8\x07w";
+      MalloyParser._serializedATNSegment1 = "\u01A8\u01A9\x07V\u01A9\u01AA\x07l\u01AA\u01AB\xD4k\u01AB\u01AC\x07m\u01AC\u01AE\u01AD\u01A1\u01AD\u01A6\u01AE5\u01AF\u01B0\xD8m\u01B07\u01B1\u01BC:\u01B2\u01B7\x07p\u01B3\u01B6\x92J\u01B4\u01B6\x07\x84\u01B5\u01B3\u01B5\u01B4\u01B6\u01B9\u01B7\u01B5\u01B7\u01B8\u01B8\u01BA\u01B9\u01B7\u01BA\u01BC\x07q\u01BB\u01B1\u01BB\u01B2\u01BC9\u01BD\u01BE\x07p\u01BE\u01BF\x07\x89\u01BF\u01C0\xE0q\u01C0\u01C1\x07q\u01C1;\u01C2\u01C3\xD8m\u01C3=\u01C4\u01CB@!\u01C5\u01C7\x07v\u01C6\u01C5\u01C6\u01C7\u01C7\u01C8\u01C8\u01CA@!\u01C9\u01C6\u01CA\u01CD\u01CB\u01C9\u01CB\u01CC\u01CC\u01CF\u01CD\u01CB\u01CE\u01D0\x07v\u01CF\u01CE\u01CF\u01D0\u01D0?\u01D1\u01D2\f\x07\u01D2\u01D3D#\u01D3\u01D4\b\u01D4\u01D5B\"\u01D5A\u01D6\u01D7d3\u01D7C\u01D8\u01D9\xD8m\u01D9E\u01DA\u01DB\xD8m\u01DBG\u01DC\u01E1\x07p\u01DD\u01E0J&\u01DE\u01E0\x07\x84\u01DF\u01DD\u01DF\u01DE\u01E0\u01E3\u01E1\u01DF\u01E1\u01E2\u01E2\u01E4\u01E3\u01E1\u01E4\u01E7\x07q\u01E5\u01E7:\u01E6\u01DC\u01E6\u01E5\u01E7I\u01E8\u01FFN(\u01E9\u01FFL'\u01EA\u01FF\\/\u01EB\u01FF^0\u01EC\u01FF\x88E\u01ED\u01EE\x07\u01EE\u01FF\xFC\x7F\u01EF\u01F0\x07\u01F0\u01FFP)\u01F1\u01F2	\u01F2\u01FF\xEAv\u01F3\u01F4\f\x07\u01F4\u01F5	\u01F5\u01F6\x8CG\u01F6\u01FF\u01F7\u01FF\xBE`\u01F8\u01FA\x07h\u01F9\u01F8\u01FA\u01FB\u01FB\u01F9\u01FB\u01FC\u01FC\u01FF\u01FD\u01FF(\u01FE\u01E8\u01FE\u01E9\u01FE\u01EA\u01FE\u01EB\u01FE\u01EC\u01FE\u01ED\u01FE\u01EF\u01FE\u01F1\u01FE\u01F3\u01FE\u01F7\u01FE\u01F9\u01FE\u01FD\u01FFK\u0200\u0201\f\x07\u0201\u0202\x07\u0202\u0203T+\u0203M\u0204\u0205\f\x07\u0205\u0206\x07	\u0206\u0207T+\u0207O\u0208\u020FR*\u0209\u020B\x07v\u020A\u0209\u020A\u020B\u020B\u020C\u020C\u020ER*\u020D\u020A\u020E\u0211\u020F\u020D\u020F\u0210\u0210\u0213\u0211\u020F\u0212\u0214\x07v\u0213\u0212\u0213\u0214\u0214Q\u0215\u0216\xFC\x7F\u0216\u0217\b\u0217\u0218\xFC\x7F\u0218S\u0219\u0220V,\u021A\u021C\x07v\u021B\u021A\u021B\u021C\u021C\u021D\u021D\u021FV,\u021E\u021B\u021F\u0222\u0220\u021E\u0220\u0221\u0221\u0224\u0222\u0220\u0223\u0225\x07v\u0224\u0223\u0224\u0225\u0225U\u0226\u0227\f\x07\u0227\u0228X-\u0228\u0229\b\u0229\u022A\xE0q\u022AW\u022B\u022C\xD8m\u022CY\u022D\u022E\xD8m\u022E[\u022F\u0230\x07\b\u0230\u0231T+\u0231]\u0232\u0233\f\x07\u0233\u0234\x07\u0234\u0235n8\u0235\u023F\u0236\u0237\f\x07\u0237\u0238\x07\u0238\u0239n8\u0239\u023F\u023A\u023B\f\x07\u023B\u023C\x07\u023C\u023Dn8\u023D\u023F\u023E\u0232\u023E\u0236\u023E\u023A\u023F_\u0240\u0241\x07\v\u0241\u0242l7\u0242a\u0243\u0247^0\u0244\u0247\x88E\u0245\u0247\\/\u0246\u0243\u0246\u0244\u0246\u0245\u0247c\u0248\u0249\b3
\u0249\u0251\xD8m\u024A\u024B\x07l\u024B\u024Cd3\u024C\u024D\x07m\u024D\u0251\u024E\u02514\x1B\u024F\u02512\u0250\u0248\u0250\u024A\u0250\u024E\u0250\u024F\u0251\u025D\u0252\u0253\f\x07\u0253\u0254\x07~\u0254\u025Cf4\u0255\u0256\f\u0256\u0257\x07j\u0257\u025Cf4\u0258\u0259\f\u0259\u025A\x076\u025A\u025CH%\u025B\u0252\u025B\u0255\u025B\u0258\u025C\u025F\u025D\u025B\u025D\u025E\u025Ee\u025F\u025D\u0260\u0261\b4
\u0261\u0268\xF8}\u0262\u02688\u0263\u0264\x07l\u0264\u0265h5\u0265\u0266\x07m\u0266\u0268\u0267\u0260\u0267\u0262\u0267\u0263\u0268\u026E\u0269\u026A\f\u026A\u026B\x07~\u026B\u026Df4\u026C\u0269\u026D\u0270\u026E\u026C\u026E\u026F\u026Fg\u0270\u026E\u0271\u0277f4\u0272\u0273f4\u0273\u0274\x07j\u0274\u0275h5\u0275\u0277\u0276\u0271\u0276\u0272\u0277i\u0278\u027CN(\u0279\u027CL'\u027A\u027C^0\u027B\u0278\u027B\u0279\u027B\u027A\u027Ck\u027D\u0282\x07p\u027E\u0281j6\u027F\u0281\x07\x84\u0280\u027E\u0280\u027F\u0281\u0284\u0282\u0280\u0282\u0283\u0283\u0285\u0284\u0282\u0285\u0286\x07q\u0286m\u0287\u028Et;\u0288\u028A\x07v\u0289\u0288\u0289\u028A\u028A\u028B\u028B\u028Dt;\u028C\u0289\u028D\u0290\u028E\u028C\u028E\u028F\u028F\u0292\u0290\u028E\u0291\u0293\x07v\u0292\u0291\u0292\u0293\u0293o\u0294\u0295\f\x07\u0295\u0296\x07@\u0296\u0297\f\x07\u0297\u0298d3\u0298q\u0299\u029A	\u029As\u029B\u029D\x07h\u029C\u029B\u029D\u02A0\u029E\u029C\u029E\u029F\u029F\u02A1\u02A0\u029E\u02A1\u02A3Z.\u02A2\u02A4p9\u02A3\u02A2\u02A3\u02A4\u02A4\u02A6\u02A5\u02A7r:\u02A6\u02A5\u02A6\u02A7\u02A7\u02A8\u02A8\u02A9\x07_\u02A9\u02AA\xE0q\u02AA\u02BD\u02AB\u02AD\x07h\u02AC\u02AB\u02AD\u02B0\u02AE\u02AC\u02AE\u02AF\u02AF\u02B1\u02B0\u02AE\u02B1\u02B3Z.\u02B2\u02B4p9\u02B3\u02B2\u02B3\u02B4\u02B4\u02BA\u02B5\u02B7r:\u02B6\u02B5\u02B6\u02B7\u02B7\u02B8\u02B8\u02B9\x07L\u02B9\u02BBv<\u02BA\u02B6\u02BA\u02BB\u02BB\u02BD\u02BC\u029E\u02BC\u02AE\u02BDu\u02BE\u02BF\xE0q\u02BFw\u02C0\u02C3\x88E\u02C1\u02C3\x8AF\u02C2\u02C0\u02C2\u02C1\u02C3y\u02C4\u02C9\x07p\u02C5\u02C8\x84C\u02C6\u02C8\x07\x84\u02C7\u02C5\u02C7\u02C6\u02C8\u02CB\u02C9\u02C7\u02C9\u02CA\u02CA\u02CC\u02CB\u02C9\u02CC\u02CD\x07q\u02CD{\u02CE\u02D3~@\u02CF\u02D0\x07v\u02D0\u02D2~@\u02D1\u02CF\u02D2\u02D5\u02D3\u02D1\u02D3\u02D4\u02D4\u02D7\u02D5\u02D3\u02D6\u02D8\x07v\u02D7\u02D6\u02D7\u02D8\u02D8}\u02D9\u02DB\xE0q\u02DA\u02DC	\u02DB\u02DA\u02DB\u02DC\u02DC\u02E0\u02DD\u02E0\x07'\u02DE\u02E0\x071\u02DF\u02D9\u02DF\u02DD\u02DF\u02DE\u02E0\x7F\u02E1\u02E2\x07\u02E2\u02E3|?\u02E3\x81\u02E4\u02E5\xB0Y\u02E5\x83\u02E6\u02EB\x88E\u02E7\u02EB\xA8U\u02E8\u02EB\x80A\u02E9\u02EB\x82B\u02EA\u02E6\u02EA\u02E7\u02EA\u02E8\u02EA\u02E9\u02EB\x85\u02EC\u02F1\xE0q\u02ED\u02EE\x07v\u02EE\u02F0\xE0q\u02EF\u02ED\u02F0\u02F3\u02F1\u02EF\u02F1\u02F2\u02F2\u02F5\u02F3\u02F1\u02F4\u02F6\x07v\u02F5\u02F4\u02F5\u02F6\u02F6\x87\u02F7\u02F8\x07!\u02F8\u02F9\x86D\u02F9\x89\u02FA\u02FB\x07\r\u02FB\u02FC\x86D\u02FC\x8B\u02FD\u0304\x90I\u02FE\u0300\x07v\u02FF\u02FE\u02FF\u0300\u0300\u0301\u0301\u0303\x90I\u0302\u02FF\u0303\u0306\u0304\u0302\u0304\u0305\u0305\u0308\u0306\u0304\u0307\u0309\x07v\u0308\u0307\u0308\u0309\u0309\x8D\u030A\u030B\xD8m\u030B\x8F\u030C\u030E\x07h\u030D\u030C\u030E\u0311\u030F\u030D\u030F\u0310\u0310\u0312\u0311\u030F\u0312\u0313\x8EH\u0313\u0314\b\u0314\u0315h5\u0315\x91\u0316\u0329\x96L\u0317\u0329\\/\u0318\u0329\x94K\u0319\u0329`1\u031A\u0329\xA6T\u031B\u0329\xBA^\u031C\u0329\xA2R\u031D\u0329\xA4S\u031E\u0329\xB4[\u031F\u0329\xB0Y\u0320\u0329\xAAV\u0321\u0329\x88E\u0322\u0329\x8AF\u0323\u0329\x9CO\u0324\u0329\xBC_\u0325\u0329\xBE`\u0326\u0329\xC0a\u0327\u0329(\u0328\u0316\u0328\u0317\u0328\u0318\u0328\u0319\u0328\u031A\u0328\u031B\u0328\u031C\u0328\u031D\u0328\u031E\u0328\u031F\u0328\u0320\u0328\u0321\u0328\u0322\u0328\u0323\u0328\u0324\u0328\u0325\u0328\u0326\u0328\u0327\u0329\x93\u032A\u032B^0\u032B\x95\u032C\u032D\f\x07\u032D\u032E\x07\f\u032E\u032F\x98M\u032F\x97\u0330\u0337\x9AN\u0331\u0333\x07v\u0332\u0331\u0332\u0333\u0333\u0334\u0334\u0336\x9AN\u0335\u0332\u0336\u0339\u0337\u0335\u0337\u0338\u0338\u033B\u0339\u0337\u033A\u033C\x07v\u033B\u033A\u033B\u033C\u033C\x99\u033D\u0340\xF2z\u033E\u0340V,\u033F\u033D\u033F\u033E\u0340\x9B\u0341\u0342\f\x07\u0342\u0343\x07\u0343\u0344\x9EP\u0344\x9D\u0345\u034C\xA0Q\u0346\u0348\x07v\u0347\u0346\u0347\u0348\u0348\u0349\u0349\u034B\xA0Q\u034A\u0347\u034B\u034E\u034C\u034A\u034C\u034D\u034D\u0350\u034E\u034C\u034F\u0351\x07v\u0350\u034F\u0350\u0351\u0351\x9F\u0352\u0356\f\x07\u0353\u0354<\u0354\u0355\b\u0355\u0357\u0356\u0353\u0356\u0357\u0357\u0358\u0358\u0359h5\u0359\xA1\u035A\u035B\f\x07\u035B\u035C\x07\u035C\u035D\x98M\u035D\xA3\u035E\u035F\f\x07\u035F\u0360\x07\u0360\u0361\x98M\u0361\xA5\u0362\u0363\f\x07\u0363\u0364	\x07\u0364\u0365\xECw\u0365\xA7\u0366\u0367\x07\u0367\u036C\xD8m\u0368\u0369\x07v\u0369\u036B\xD8m\u036A\u0368\u036B\u036E\u036C\u036A\u036C\u036D\u036D\u0370\u036E\u036C\u036F\u0371\x07v\u0370\u036F\u0370\u0371\u0371\xA9\u0372\u0373\x07\u0373\u0374\xACW\u0374\xAB\u0375\u037C\xAEX\u0376\u0378\x07v\u0377\u0376\u0377\u0378\u0378\u0379\u0379\u037B\xAEX\u037A\u0377\u037B\u037E\u037C\u037A\u037C\u037D\u037D\u0380\u037E\u037C\u037F\u0381\x07v\u0380\u037F\u0380\u0381\u0381\xAD\u0382\u0385\x07\x94\u0383\u0385\xFC\x7F\u0384\u0382\u0384\u0383\u0385\u0387\u0386\u0388	\u0387\u0386\u0387\u0388\u0388\xAF\u0389\u038A\x07\u038A\u038B\x07\x94\u038B\xB1\u038C\u038D\x07*\u038D\u0391\xFC\x7F\u038E\u038F\x07*\u038F\u0391\xE0q\u0390\u038C\u0390\u038E\u0391\xB3\u0392\u0393\x07 \u0393\u0395\x07\x94\u0394\u0396\xB2Z\u0395\u0394\u0395\u0396\u0396\xB5\u0397\u039A\xF8}\u0398\u0399\x07w\u0399\u039B\x07\x80\u039A\u0398\u039A\u039B\u039B\u039E\u039C\u039E\x07\x80\u039D\u0397\u039D\u039C\u039E\xB7\u039F\u03A6\xB6\\\u03A0\u03A2\x07v\u03A1\u03A0\u03A1\u03A2\u03A2\u03A3\u03A3\u03A5\xB6\\\u03A4\u03A1\u03A5\u03A8\u03A6\u03A4\u03A6\u03A7\u03A7\xB9\u03A8\u03A6\u03A9\u03AA\x07\u03AA\u03AD\xB8]\u03AB\u03AC\x07*\u03AC\u03AE\xFC\x7F\u03AD\u03AB\u03AD\u03AE\u03AE\xBB\u03AF\u03B0\x07\u03B0\u03B1\xC2b\u03B1\xBD\u03B2\u03B3\x07#\u03B3\u03B4\xCAf\u03B4\xBF\u03B5\u03B6\x07h\u03B6\xC1\u03B7\u03B8	\b\u03B8\xC3\u03B9\u03BA		\u03BA\xC5\u03BB\u03BC	\n\u03BC\xC7\u03BD\u03BE	\v\u03BE\xC9\u03BF\u03C2\xCCg\u03C0\u03C2\r\u03C1\u03BF\u03C1\u03C0\u03C2\xCB\u03C3\u03C4	\f\u03C4\xCD\u03C5\u03C6	\r\u03C6\xCF\u03C7\u03CF\xCAf\u03C8\u03CF\xCEh\u03C9\u03CF\xD2j\u03CA\u03CF\x07J\u03CB\u03CF	\u03CC\u03CF\x07c\u03CD\u03CF\x07I\u03CE\u03C7\u03CE\u03C8\u03CE\u03C9\u03CE\u03CA\u03CE\u03CB\u03CE\u03CC\u03CE\u03CD\u03CF\xD1\u03D0\u03D8\x07\x8A\u03D1\u03D8\x07\x8B\u03D2\u03D8\x07\x8C\u03D3\u03D8\x07\x8F\u03D4\u03D8\x07\x8E\u03D5\u03D8\x07\x8D\u03D6\u03D8\x07\x90\u03D7\u03D0\u03D7\u03D1\u03D7\u03D2\u03D7\u03D3\u03D7\u03D4\u03D7\u03D5\u03D7\u03D6\u03D8\xD3\u03D9\u03DA\xCAf\u03DA\xD5\u03DB\u03DC\xCAf\u03DC\xD7\u03DD\u03DE	\u03DE\xD9\u03DF\u03E0	\u03E0\xDB\u03E1\u03E2	\u03E2\xDD\u03E3\u03E6\xC6d\u03E4\u03E6\xCAf\u03E5\u03E3\u03E5\u03E4\u03E6\xDF\u03E7\u03E8\bq
\u03E8\u043B\xF8}\u03E9\u043B\xD0i\u03EA\u03EB\x07\x7F\u03EB\u043B\xE0q\u03EC\u03ED\x07H\u03ED\u043B\xE0q\u03EE\u03EF\x07,\u03EF\u03F0\x07l\u03F0\u03F1\xE0q\u03F1\u03F2\x07&\u03F2\u03F3\xDEp\u03F3\u03F4\x07m\u03F4\u043B\u03F5\u03F6\x07.\u03F6\u03F7\x07l\u03F7\u03F8\x072\u03F8\u03F9\xE0q\u03F9\u03FA\x07m\u03FA\u043B\u03FB\u03FC\x07S\u03FC\u03FE\x07w\u03FD\u03FB\u03FD\u03FE\u03FE\u03FF\u03FF\u0400\xC4c\u0400\u0403\x07l\u0401\u0404\xE0q\u0402\u0404\x07\x80\u0403\u0401\u0403\u0402\u0403\u0404\u0404\u0405\u0405\u0406\x07m\u0406\u043B\u0407\u0408\xF8}\u0408\u0409\x07w\u0409\u040A\xC4c\u040A\u040C\x07l\u040B\u040D\xE0q\u040C\u040B\u040C\u040D\u040D\u040E\u040E\u040F\x07m\u040F\u043B\u0410\u0411\x07l\u0411\u0412\xE2r\u0412\u0413\x07m\u0413\u043B\u0414\u0415\xF8}\u0415\u0416\x07w\u0416\u0417\xD8m\u0417\u0419\x07l\u0418\u041A\xE8u\u0419\u0418\u0419\u041A\u041A\u041B\u041B\u041C\x07m\u041C\u043B\u041D\u0422\xD8m\u041E\u0420\x07t\u041F\u0421\xC6d\u0420\u041F\u0420\u0421\u0421\u0423\u0422\u041E\u0422\u0423\u0423\u0426\u0424\u0426\xDAn\u0425\u041D\u0425\u0424\u0426\u0427\u0427\u0429\x07l\u0428\u042A\xE8u\u0429\u0428\u0429\u042A\u042A\u042B\u042B\u042C\x07m\u042C\u043B\u042D\u043B\xE4s\u042E\u042F\xDCo\u042F\u0430\x07l\u0430\u0435\xE0q\u0431\u0432\x07v\u0432\u0434\xFC\x7F\u0433\u0431\u0434\u0437\u0435\u0433\u0435\u0436\u0436\u0438\u0437\u0435\u0438\u0439\x07m\u0439\u043B\u043A\u03E7\u043A\u03E9\u043A\u03EA\u043A\u03EC\u043A\u03EE\u043A\u03F5\u043A\u03FD\u043A\u0407\u043A\u0410\u043A\u0414\u043A\u0425\u043A\u042D\u043A\u042E\u043B\u046F\u043C\u043D\f\u043D\u043E	\u043E\u046E\xE0q\u043F\u0440\f\u0440\u0441	\u0441\u046E\xE0q\u0442\u0443\f\u0443\u0444\x07Z\u0444\u046E\xE0q\u0445\u0446\f\u0446\u0447\xC8e\u0447\u0448\xE0q\u0448\u046E\u0449\u044A\f\u044A\u044B\x07%\u044B\u046E\xE0q\u044C\u044D\f\r\u044D\u044E\x07M\u044E\u046E\xE0q\u044F\u0450\f\f\u0450\u0451\x07\x88\u0451\u046E\xE0q\r\u0452\u0453\f\u0453\u046Ez>\u0454\u0455";
+      MalloyParser._serializedATNSegment2 = "\f\u0455\u046E\xDAn\u0456\u0457\f\x1B\u0457\u0458\x07w\u0458\u046E\xDAn\u0459\u045A\f\u045A\u045B\x07r\u045B\u046E\xDEp\u045C\u045D\f\u045D\u045E\x07s\u045E\u046E\xDEp\u045F\u0460\f\u0460\u0461\x079\u0461\u0462\xE0q\u0462\u0463\xDAn\u0463\u046E\u0464\u0465\f\u0465\u0466\x07i\u0466\u046E\xE2r\u0467\u0468\f\u0468\u0469\x07\x83\u0469\u046E\xE2r\u046A\u046B\f\u046B\u046C\x07\x89\u046C\u046E\xE2r\u046D\u043C\u046D\u043F\u046D\u0442\u046D\u0445\u046D\u0449\u046D\u044C\u046D\u044F\u046D\u0452\u046D\u0454\u046D\u0456\u046D\u0459\u046D\u045C\u046D\u045F\u046D\u0464\u046D\u0467\u046D\u046A\u046E\u0471\u046F\u046D\u046F\u0470\u0470\xE1\u0471\u046F\u0472\u0474\x07l\u0473\u0475\xC8e\u0474\u0473\u0474\u0475\u0475\u0476\u0476\u0477\xE0q\u0477\u0478\x07m\u0478\u047E\u0479\u047B\xC8e\u047A\u0479\u047A\u047B\u047B\u047C\u047C\u047E\xE0q\u047D\u0472\u047D\u047A\u047E\xE3\u047F\u0481\xE6t\u0480\u047F\u0481\u0482\u0482\u0480\u0482\u0483\u0483\u0486\u0484\u0485\x073\u0485\u0487\xE0q\u0486\u0484\u0486\u0487\u0487\xE5\u0488\u048A\x07N\u0489\u048B\xE0q\u048A\u0489\u048A\u048B\u048B\u048C\u048C\u048D\x07^\u048D\u048E\xE2r\u048E\xE7\u048F\u0494\xE0q\u0490\u0491\x07v\u0491\u0493\xE0q\u0492\u0490\u0493\u0496\u0494\u0492\u0494\u0495\u0495\u0498\u0496\u0494\u0497\u0499\x07v\u0498\u0497\u0498\u0499\u0499\xE9\u049A\u04A1\xFC\x7F\u049B\u049D\x07v\u049C\u049B\u049C\u049D\u049D\u049E\u049E\u04A0\xFC\x7F\u049F\u049C\u04A0\u04A3\u04A1\u049F\u04A1\u04A2\u04A2\xEB\u04A3\u04A1\u04A4\u04AB\xF6|\u04A5\u04A7\x07v\u04A6\u04A5\u04A6\u04A7\u04A7\u04A8\u04A8\u04AA\xF6|\u04A9\u04A6\u04AA\u04AD\u04AB\u04A9\u04AB\u04AC\u04AC\u04AF\u04AD\u04AB\u04AE\u04B0\x07v\u04AF\u04AE\u04AF\u04B0\u04B0\xED\u04B1\u04B2\xF8}\u04B2\u04B3\x07w\u04B3\u04B5\u04B4\u04B1\u04B4\u04B5\u04B5\u04B6\u04B6\u04B8\x07\x80\u04B7\u04B9\xF0y\u04B8\u04B7\u04B8\u04B9\u04B9\xEF\u04BA\u04BE\x07p\u04BB\u04BC\x07\n\u04BC\u04BF\xEAv\u04BD\u04BF\x07v\u04BE\u04BB\u04BE\u04BD\u04BF\u04C0\u04C0\u04BE\u04C0\u04C1\u04C1\u04C2\u04C2\u04C3\x07q\u04C3\xF1\u04C4\u04C5\f\x07\u04C5\u04C7\xF8}\u04C6\u04C8\xF4{\u04C7\u04C6\u04C7\u04C8\u04C8\xF3\u04C9\u04CA\x07w\u04CA\u04D1\xDAn\u04CB\u04CC\x07w\u04CC\u04CD\xC4c\u04CD\u04CE\x07l\u04CE\u04CF\x07m\u04CF\u04D1\u04D0\u04C9\u04D0\u04CB\u04D1\xF5\u04D2\u04D6\xF2z\u04D3\u04D6\xEEx\u04D4\u04D6V,\u04D5\u04D2\u04D5\u04D3\u04D5\u04D4\u04D6\xF7\u04D7\u04DC\xFC\x7F\u04D8\u04D9\x07w\u04D9\u04DB\xFC\x7F\u04DA\u04D8\u04DB\u04DE\u04DC\u04DA\u04DC\u04DD\u04DD\xF9\u04DE\u04DC\u04DF\u04E0\xD8m\u04E0\xFB\u04E1\u04E2\xD8m\u04E2\xFD\u04E3\u04E4\xE0q\u04E4\u04E5\x07\u04E5\xFF\u04E6\u04E7\xD8m\u04E7\u0101\u04E8\u04E9\xD8m\u04E9\u0103\u04EA\u04EB\xCAf\u04EB\u0105\u04EC\u04ED\x07\x84\u04ED\u04EE\x07\x84\u04EE\u04EF\x07n\u04EF\u04F0\xCAf\u04F0\u04F1\x07o\u04F1\u0107\x86\u010A\u010C\u0119\u0124\u012C\u0140\u0148\u014E\u0159\u0163\u016C\u0173\u0178\u017D\u0183\u0188\u018C\u019D\u01AD\u01B5\u01B7\u01BB\u01C6\u01CB\u01CF\u01DF\u01E1\u01E6\u01FB\u01FE\u020A\u020F\u0213\u021B\u0220\u0224\u023E\u0246\u0250\u025B\u025D\u0267\u026E\u0276\u027B\u0280\u0282\u0289\u028E\u0292\u029E\u02A3\u02A6\u02AE\u02B3\u02B6\u02BA\u02BC\u02C2\u02C7\u02C9\u02D3\u02D7\u02DB\u02DF\u02EA\u02F1\u02F5\u02FF\u0304\u0308\u030F\u0328\u0332\u0337\u033B\u033F\u0347\u034C\u0350\u0356\u036C\u0370\u0377\u037C\u0380\u0384\u0387\u0390\u0395\u039A\u039D\u03A1\u03A6\u03AD\u03C1\u03CE\u03D7\u03E5\u03FD\u0403\u040C\u0419\u0420\u0422\u0425\u0429\u0435\u043A\u046D\u046F\u0474\u047A\u047D\u0482\u0486\u048A\u0494\u0498\u049C\u04A1\u04A6\u04AB\u04AF\u04B4\u04B8\u04BE\u04C0\u04C7\u04D0\u04D5\u04DC";
       MalloyParser._serializedATN = Utils.join([
         MalloyParser._serializedATNSegment0,
         MalloyParser._serializedATNSegment1,
@@ -44053,7 +44189,7 @@ ${struct.dialect.sqlFinalStage("__stage0", [
       exports.AggregateOrderingContext = AggregateOrderingContext;
       var AggregateOrderBySpecContext = class extends ParserRuleContext_1.ParserRuleContext {
         fieldExpr() {
-          return this.getRuleContext(0, FieldExprContext);
+          return this.tryGetRuleContext(0, FieldExprContext);
         }
         ASC() {
           return this.tryGetToken(MalloyParser.ASC, 0);
@@ -44772,57 +44908,18 @@ ${struct.dialect.sqlFinalStage("__stage0", [
         }
       };
       exports.NestEntryContext = NestEntryContext;
-      var NestExistingContext = class extends NestEntryContext {
+      var NestDefContext = class extends NestEntryContext {
         tags() {
           return this.getRuleContext(0, TagsContext);
         }
-        fieldPath() {
-          return this.getRuleContext(0, FieldPathContext);
-        }
-        PLUS() {
-          return this.tryGetToken(MalloyParser.PLUS, 0);
-        }
         vExpr() {
-          return this.tryGetRuleContext(0, VExprContext);
-        }
-        constructor(ctx) {
-          super(ctx.parent, ctx.invokingState);
-          this.copyFrom(ctx);
-        }
-        // @Override
-        enterRule(listener2) {
-          if (listener2.enterNestExisting) {
-            listener2.enterNestExisting(this);
-          }
-        }
-        // @Override
-        exitRule(listener2) {
-          if (listener2.exitNestExisting) {
-            listener2.exitNestExisting(this);
-          }
-        }
-        // @Override
-        accept(visitor) {
-          if (visitor.visitNestExisting) {
-            return visitor.visitNestExisting(this);
-          } else {
-            return visitor.visitChildren(this);
-          }
-        }
-      };
-      exports.NestExistingContext = NestExistingContext;
-      var NestDefContext = class extends NestEntryContext {
-        tags() {
-          return this.getRuleContext(0, TagsContext);
+          return this.getRuleContext(0, VExprContext);
         }
         queryName() {
-          return this.getRuleContext(0, QueryNameContext);
+          return this.tryGetRuleContext(0, QueryNameContext);
         }
         isDefine() {
-          return this.getRuleContext(0, IsDefineContext);
-        }
-        vExpr() {
-          return this.getRuleContext(0, VExprContext);
+          return this.tryGetRuleContext(0, IsDefineContext);
         }
         constructor(ctx) {
           super(ctx.parent, ctx.invokingState);
@@ -54672,9 +54769,14 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           this.field = field3;
           this.dir = dir;
           this.elementType = "orderBy";
-          this.has({ field: field3 });
+          if (field3)
+            this.has({ field: field3 });
         }
         getAnalyticOrderBy(fs) {
+          if (!this.field) {
+            this.log("analytic `order_by` must specify an aggregate expression or output field reference");
+            return { e: ["error"], dir: this.dir };
+          }
           const expr2 = this.field.getExpression(fs);
           if ((0, malloy_types_1.expressionIsAggregate)(expr2.expressionType)) {
           } else if ((0, malloy_types_1.expressionIsScalar)(expr2.expressionType)) {
@@ -54686,12 +54788,23 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           }
           return { e: expr2.value, dir: this.dir };
         }
-        getAggregateOrderBy(fs) {
-          const expr2 = this.field.getExpression(fs);
-          if (!(0, malloy_types_1.expressionIsScalar)(expr2.expressionType)) {
-            this.field.log("aggregate `order_by` must be scalar");
+        getAggregateOrderBy(fs, allowExpression) {
+          if (this.field) {
+            const expr2 = this.field.getExpression(fs);
+            if (!(0, malloy_types_1.expressionIsScalar)(expr2.expressionType)) {
+              this.field.log("aggregate `order_by` must be scalar");
+            }
+            if (!allowExpression) {
+              this.field.log("`order_by` must be only `asc` or `desc` with no expression");
+            }
+            return { e: expr2.value, dir: this.dir };
+          } else {
+            if (this.dir === void 0) {
+              this.log("field or order direction must be specified");
+              return { e: void 0, dir: "asc" };
+            }
+            return { e: void 0, dir: this.dir };
           }
-          return { e: expr2.value, dir: this.dir };
         }
       };
       exports.FunctionOrderBy = FunctionOrderBy;
@@ -54703,8 +54816,8 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         getAnalyticOrderBy(fs) {
           return this.list.map((el) => el.getAnalyticOrderBy(fs));
         }
-        getAggregateOrderBy(fs) {
-          return this.list.map((el) => el.getAggregateOrderBy(fs));
+        getAggregateOrderBy(fs, allowExpression) {
+          return this.list.map((el) => el.getAggregateOrderBy(fs, allowExpression));
         }
       };
       exports.FunctionOrdering = FunctionOrdering;
@@ -55207,7 +55320,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                 };
                 structPath = this.source.path;
                 const joinUsage = this.getJoinUsage(inputFS);
-                const allUsagesSame = joinUsage.length === 1 || joinUsage.slice(1).every((p3) => joinPathEq(p3, joinUsage[0]));
+                const allUsagesSame = joinUsage.length === 1 || joinUsage.length > 1 && joinUsage.slice(1).every((p3) => joinPathEq(p3, joinUsage[0]));
                 if (allUsagesSame) {
                   structPath = joinUsage[0].map((p3) => p3.name);
                   sourceRelationship = joinUsage[0];
@@ -55349,6 +55462,13 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                   result.push(def2.relationship);
                 }
               }
+            } else if (frag.type === "source-reference") {
+              if (frag.path) {
+                const def2 = lookup6(fs, frag.path);
+                result.push(def2.relationship);
+              } else {
+                result.push([]);
+              }
             }
           }
         });
@@ -55835,6 +55955,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           const frag = {
             type: "function_call",
             overload,
+            name: this.name,
             args: argExprs.map((x6) => x6.value),
             expressionType,
             structPath
@@ -55848,7 +55969,8 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             if ((props === null || props === void 0 ? void 0 : props.orderBys) && props.orderBys.length > 0) {
               const isAnalytic = (0, malloy_types_1.expressionIsAnalytic)(overload.returnType.expressionType);
               if (dialectOverload.supportsOrderBy || isAnalytic) {
-                const allObs = props.orderBys.flatMap((orderBy) => isAnalytic ? orderBy.getAnalyticOrderBy(fs) : orderBy.getAggregateOrderBy(fs));
+                const allowExpression = dialectOverload.supportsOrderBy !== "only_default";
+                const allObs = props.orderBys.flatMap((orderBy) => isAnalytic ? orderBy.getAnalyticOrderBy(fs) : orderBy.getAggregateOrderBy(fs, allowExpression));
                 frag.orderBy = allObs;
               } else {
                 props.orderBys[0].log(`Function ${this.name} does not support order_by`);
@@ -63698,6 +63820,9 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           this.log("A multi-segment view cannot be used as a refinement");
           return [];
         }
+        getImplicitName() {
+          return this.operation.getImplicitName();
+        }
       };
       exports.ViewArrow = ViewArrow;
     }
@@ -63810,6 +63935,9 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           }
           return (0, refine_utils_1.refine)(this, pipeline, refineFrom[0]);
         }
+        getImplicitName() {
+          return this.base.getImplicitName();
+        }
       };
       exports.ViewRefine = ViewRefine;
     }
@@ -63927,6 +64055,9 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           }
           return pipeline;
         }
+        getImplicitName() {
+          return this.reference.nameString;
+        }
       };
       exports.ReferenceView = ReferenceView;
     }
@@ -64669,6 +64800,9 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           }
           return pipeline;
         }
+        getImplicitName() {
+          return void 0;
+        }
       };
       exports.QOpDescView = QOpDescView;
     }
@@ -66229,7 +66363,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
               if (aggFunc === "sum") {
                 expr2 = new ast.ExprSum(void 0, ref3);
               } else {
-                this.contextError(agg, "'${aggFunc}' is not legal in a reference-only aggregation");
+                this.contextError(agg, `\`${aggFunc}\` is not legal in a reference-only aggregation`);
                 return ref3;
               }
             }
@@ -66314,7 +66448,8 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         }
         visitAggregateOrderBySpec(pcx) {
           const dir = pcx.ASC() ? "asc" : pcx.DESC() ? "desc" : void 0;
-          const f4 = this.getFieldExpr(pcx.fieldExpr());
+          const fCx = pcx.fieldExpr();
+          const f4 = fCx ? this.getFieldExpr(fCx) : void 0;
           return this.astAt(new ast.FunctionOrderBy(f4, dir), pcx);
         }
         visitAggregateOrderByStatement(pcx) {
@@ -66410,27 +66545,23 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         visitNestedQueryList(pcx) {
           return new ast.Nests(this.only(pcx.nestEntry().map((cx) => this.visit(cx)), (x6) => x6 instanceof ast.NestFieldDeclaration && x6, "query"));
         }
-        visitNestExisting(pcx) {
-          const nameCx = pcx.fieldPath();
-          const name = this.getFieldPath(nameCx, ast.ViewOrScalarFieldReference);
-          const referenceView = this.astAt(new ast.ReferenceView(name), nameCx);
-          const refineCx = pcx.vExpr();
-          const notes = this.getNotes(pcx.tags());
-          if (refineCx) {
-            const nestRefine = new ast.NestFieldDeclaration(name.nameString, new ast.ViewRefine(referenceView, this.getVExpr(refineCx)));
-            nestRefine.extendNote({ notes });
-            return this.astAt(nestRefine, pcx);
-          }
-          const nestReference = new ast.NestFieldDeclaration(name.nameString, referenceView);
-          nestReference.extendNote({ notes });
-          return this.astAt(nestReference, pcx);
-        }
         visitNestDef(pcx) {
-          const name = (0, parse_utils_1.getId)(pcx.queryName());
+          const nameCx = pcx.queryName();
+          let name;
           const vExpr = this.getVExpr(pcx.vExpr());
+          if (nameCx) {
+            name = (0, parse_utils_1.getId)(nameCx);
+          } else {
+            const implicitName = vExpr.getImplicitName();
+            if (implicitName === void 0) {
+              this.contextError(pcx, "`nest:` view requires a name (add `nest_name is ...`)");
+            }
+            name = implicitName !== null && implicitName !== void 0 ? implicitName : "__unnamed__";
+          }
           const nestDef = new ast.NestFieldDeclaration(name, vExpr);
+          const isDefineCx = pcx.isDefine();
           nestDef.extendNote({
-            notes: this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()))
+            notes: this.getNotes(pcx.tags()).concat(isDefineCx ? this.getIsNotes(isDefineCx) : [])
           });
           return this.astAt(nestDef, pcx);
         }
@@ -67029,42 +67160,9 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
   var require_document_symbol_walker = __commonJS({
     "../malloy/dist/lang/parse-tree-walkers/document-symbol-walker.js"(exports) {
       "use strict";
-      var __createBinding = exports && exports.__createBinding || (Object.create ? function(o5, m4, k2, k22) {
-        if (k22 === void 0)
-          k22 = k2;
-        var desc = Object.getOwnPropertyDescriptor(m4, k2);
-        if (!desc || ("get" in desc ? !m4.__esModule : desc.writable || desc.configurable)) {
-          desc = { enumerable: true, get: function() {
-            return m4[k2];
-          } };
-        }
-        Object.defineProperty(o5, k22, desc);
-      } : function(o5, m4, k2, k22) {
-        if (k22 === void 0)
-          k22 = k2;
-        o5[k22] = m4[k2];
-      });
-      var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? function(o5, v6) {
-        Object.defineProperty(o5, "default", { enumerable: true, value: v6 });
-      } : function(o5, v6) {
-        o5["default"] = v6;
-      });
-      var __importStar = exports && exports.__importStar || function(mod) {
-        if (mod && mod.__esModule)
-          return mod;
-        var result = {};
-        if (mod != null) {
-          for (var k2 in mod)
-            if (k2 !== "default" && Object.prototype.hasOwnProperty.call(mod, k2))
-              __createBinding(result, mod, k2);
-        }
-        __setModuleDefault(result, mod);
-        return result;
-      };
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.walkForDocumentSymbols = void 0;
       var ParseTreeWalker_1 = require_ParseTreeWalker();
-      var parser3 = __importStar(require_MalloyParser());
       var parse_utils_1 = require_parse_utils();
       var DocumentSymbolWalker = class {
         constructor(translator, tokens, scopes, symbols4) {
@@ -67164,10 +67262,48 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         exitExploreQueryDef(_pcx) {
           this.popScope();
         }
+        getNestDefName(pcx) {
+          const nameCx = pcx.queryName();
+          if (nameCx) {
+            return nameCx.id().text;
+          }
+          let result = void 0;
+          let done = false;
+          const vExprListen = {
+            enterVArrow(pcx2) {
+              pcx2.vExpr().enterRule(vExprListen);
+            },
+            enterVSeg(pcx2) {
+              pcx2.segExpr().enterRule(segExprListen);
+            }
+          };
+          const segExprListen = {
+            enterSegField(pcx2) {
+              const names = pcx2.fieldPath().fieldName();
+              if (!done)
+                result !== null && result !== void 0 ? result : result = names[names.length - 1].id().text;
+            },
+            enterSegParen(pcx2) {
+              pcx2.vExpr().enterRule(vExprListen);
+            },
+            enterSegRefine(pcx2) {
+              pcx2._lhs.enterRule(segExprListen);
+            },
+            enterSegOps() {
+              result = void 0;
+              done = true;
+            }
+          };
+          pcx.vExpr().enterRule(vExprListen);
+          return result;
+        }
         handleNestEntry(pcx) {
+          const name = this.getNestDefName(pcx);
+          if (name === void 0)
+            return;
           const symbol2 = {
             range: this.translator.rangeFromContext(pcx),
-            name: pcx instanceof parser3.NestExistingContext ? pcx.fieldPath().text : pcx.queryName().id().text,
+            name,
             type: "query",
             children: []
           };
@@ -67177,12 +67313,11 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           }
           return symbol2;
         }
-        enterNestExisting(pcx) {
-          this.handleNestEntry(pcx);
-        }
         enterNestDef(pcx) {
           const symbol2 = this.handleNestEntry(pcx);
-          this.scopes.push(symbol2);
+          if (symbol2) {
+            this.scopes.push(symbol2);
+          }
         }
         exitNestDef(_pcx) {
           this.popScope();