@malloydata/malloy 0.0.294 → 0.0.295

package/dist/index.d.ts

@@ -10,7 +10,7 @@ export type { QueryOptionsReader, RunSQLOptions } from './run_sql_options';
 export type { EventStream, ModelString, ModelURL, QueryString, QueryURL, URLReader, InvalidationKey, } from './runtime_types';
 export type { Connection, ConnectionConfig, ConnectionFactory, ConnectionParameter, ConnectionParameterValue, ConnectionConfigSchema, FetchSchemaOptions, InfoConnection, LookupConnection, PersistSQLResults, PooledConnection, TestableConnection, StreamingConnection, } from './connection/types';
 export { toAsyncGenerator } from './connection_utils';
-export { modelDefToModelInfo, sourceDefToSourceInfo } from './to_stable';
+export { modelDefToModelInfo, sourceDefToSourceInfo, writeMalloyObjectToTag, extractMalloyObjectFromTag, } from './to_stable';
 export * as API from './api';
 export type { SQLSourceRequest } from './lang/translate-response';
 export { sqlKey } from './model/sql_block';

package/dist/index.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isBasicAtomic = exports.Segment = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = void 0;
+exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.extractMalloyObjectFromTag = exports.writeMalloyObjectToTag = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -137,6 +137,8 @@ Object.defineProperty(exports, "toAsyncGenerator", { enumerable: true, get: func
 var to_stable_1 = require("./to_stable");
 Object.defineProperty(exports, "modelDefToModelInfo", { enumerable: true, get: function () { return to_stable_1.modelDefToModelInfo; } });
 Object.defineProperty(exports, "sourceDefToSourceInfo", { enumerable: true, get: function () { return to_stable_1.sourceDefToSourceInfo; } });
+Object.defineProperty(exports, "writeMalloyObjectToTag", { enumerable: true, get: function () { return to_stable_1.writeMalloyObjectToTag; } });
+Object.defineProperty(exports, "extractMalloyObjectFromTag", { enumerable: true, get: function () { return to_stable_1.extractMalloyObjectFromTag; } });
 exports.API = __importStar(require("./api"));
 var sql_block_1 = require("./model/sql_block");
 Object.defineProperty(exports, "sqlKey", { enumerable: true, get: function () { return sql_block_1.sqlKey; } });

package/dist/lang/ast/expressions/expr-granular-time.d.ts

@@ -3,6 +3,7 @@ import type { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
 import type { FieldSpace } from '../types/field-space';
 import { Range } from './range';
+import type * as Malloy from '@malloydata/malloy-interfaces';
 /**
  * GranularTime is a moment in time which ALSO has a "granularity"
  * commonly this are created by applying ".datePart" to an expression
@@ -18,6 +19,7 @@ export declare class ExprGranularTime extends ExpressionDef {
     legalChildTypes: import("../../../model/malloy_types").TypeDesc[];
     constructor(expr: ExpressionDef, units: TimestampUnit, truncate: boolean);
     granular(): boolean;
+    drillExpression(): Malloy.Expression | undefined;
     getExpression(fs: FieldSpace): ExprValue;
     toRange(fs: FieldSpace): Range;
 }

package/dist/lang/ast/expressions/expr-granular-time.js

@@ -82,6 +82,19 @@ class ExprGranularTime extends expression_def_1.ExpressionDef {
     granular() {
         return true;
     }
+    drillExpression() {
+        const lhs = this.expr.drillExpression();
+        if ((lhs === null || lhs === void 0 ? void 0 : lhs.kind) !== 'field_reference')
+            return undefined;
+        return {
+            kind: 'time_truncation',
+            field_reference: {
+                name: lhs.name,
+                path: lhs.path,
+            },
+            truncation: this.units,
+        };
+    }
     getExpression(fs) {
         const timeframe = this.units;
         const exprVal = this.expr.getExpression(fs);

package/dist/lang/ast/expressions/expr-id-reference.d.ts

@@ -2,10 +2,12 @@ import type { ExprValue } from '../types/expr-value';
 import type { FieldReference } from '../query-items/field-references';
 import type { FieldSpace } from '../types/field-space';
 import { ExpressionDef } from '../types/expression-def';
+import type * as Malloy from '@malloydata/malloy-interfaces';
 export declare class ExprIdReference extends ExpressionDef {
     readonly fieldReference: FieldReference;
     elementType: string;
     constructor(fieldReference: FieldReference);
     get refString(): string;
+    drillExpression(): Malloy.Expression | undefined;
     getExpression(fs: FieldSpace): ExprValue;
 }

package/dist/lang/ast/expressions/expr-id-reference.js

@@ -35,6 +35,13 @@ class ExprIdReference extends expression_def_1.ExpressionDef {
     get refString() {
         return this.fieldReference.refString;
     }
+    drillExpression() {
+        return {
+            kind: 'field_reference',
+            name: this.fieldReference.nameString,
+            path: this.fieldReference.path.slice(0, -1),
+        };
+    }
     getExpression(fs) {
         const def = this.fieldReference.getField(fs);
         if (def.found) {

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

@@ -101,6 +101,11 @@ class ReferenceField extends space_field_1.SpaceField {
                     type: 'fieldref',
                     path,
                     at: this.fieldRef.location,
+                    drillExpression: {
+                        kind: 'field_reference',
+                        name: path[path.length - 1],
+                        path: path.slice(0, -1),
+                    },
                 };
             }
             const refTo = this.referenceTo;

package/dist/lang/ast/query-items/field-declaration.js

@@ -147,6 +147,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
             else {
                 ret.e = exprValue.value;
             }
+            ret.drillExpression = this.expr.drillExpression();
             ret.fieldUsage = exprValue.fieldUsage;
             ret.ungroupings = exprValue.ungroupings;
             ret.requiresGroupBy = exprValue.requiresGroupBy;

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

@@ -1,4 +1,4 @@
-import type { Expr, FilterCondition, PipeSegment, TypeDesc } from '../../../model/malloy_types';
+import type { Expr, FilterCondition, PipeSegment, TurtleDef, TypeDesc } from '../../../model/malloy_types';
 import type { FieldReference } from '../query-items/field-references';
 import type { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
@@ -22,4 +22,5 @@ export declare class Drill extends Filter implements QueryPropertyInterface {
     protected checkedDrillCondition(fs: FieldSpace, filter: FilterElement, reference: FieldReference, value: Literal): FilterCondition | undefined;
     protected checkedFilterCondition(fs: FieldSpace, filter: FilterElement): FilterCondition | undefined;
 }
-export declare function attachDrillPaths(pipeline: PipeSegment[], name: string): PipeSegment[];
+export declare function updateNestedDrillPaths(nest: TurtleDef, name: string): TurtleDef;
+export declare function attachDrillPaths(pipeline: PipeSegment[], nestName: string): PipeSegment[];

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

@@ -7,6 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Drill = exports.DrillField = void 0;
+exports.updateNestedDrillPaths = updateNestedDrillPaths;
 exports.attachDrillPaths = attachDrillPaths;
 const composite_source_utils_1 = require("../../../model/composite_source_utils");
 const malloy_types_1 = require("../../../model/malloy_types");
@@ -292,7 +293,8 @@ class Drill extends filters_1.Filter {
             fieldUsage: (0, composite_source_utils_1.mergeFieldUsage)(fExpr.fieldUsage, collectedWhereFieldUsage),
             stableFilter: {
                 kind: 'literal_equality',
-                field_reference: {
+                expression: {
+                    kind: 'field_reference',
                     name: fieldName.refString,
                     path: reference.list.slice(0, -1).map(f => f.name),
                 },
@@ -312,7 +314,39 @@ class Drill extends filters_1.Filter {
     }
 }
 exports.Drill = Drill;
-function attachDrillPaths(pipeline, name) {
+function updateNestedDrillPaths(nest, name) {
+    if (nest.pipeline.length !== 1 || !(0, malloy_types_1.isQuerySegment)(nest.pipeline[0])) {
+        return nest;
+    }
+    return {
+        ...nest,
+        pipeline: [
+            {
+                ...nest.pipeline[0],
+                queryFields: nest.pipeline[0].queryFields.map(f => {
+                    var _a;
+                    if (f.type === 'turtle') {
+                        return updateNestedDrillPaths(f, name);
+                    }
+                    const existing = f.drillExpression;
+                    if (existing === undefined)
+                        return f;
+                    if (existing.kind !== 'field_reference') {
+                        return { ...f, drillExpression: undefined };
+                    }
+                    return {
+                        ...f,
+                        drillExpression: {
+                            ...existing,
+                            path: [name, ...((_a = existing.path) !== null && _a !== void 0 ? _a : [])],
+                        },
+                    };
+                }),
+            },
+        ],
+    };
+}
+function attachDrillPaths(pipeline, nestName) {
     var _a;
     if (pipeline.length !== 1)
         return pipeline;
@@ -323,12 +357,23 @@ function attachDrillPaths(pipeline, name) {
             ...pipeline[0],
             filterList: (_a = pipeline[0].filterList) === null || _a === void 0 ? void 0 : _a.map(f => ({
                 ...f,
-                drillView: name,
-            })),
-            queryFields: pipeline[0].queryFields.map(f => ({
-                ...f,
-                drillView: name,
+                filterView: nestName,
             })),
+            queryFields: pipeline[0].queryFields.map(f => {
+                var _a;
+                if (f.type === 'turtle') {
+                    return updateNestedDrillPaths(f, nestName);
+                }
+                const fieldName = f.type === 'fieldref' ? f.path[f.path.length - 1] : (_a = f.as) !== null && _a !== void 0 ? _a : f.name;
+                return {
+                    ...f,
+                    drillExpression: {
+                        kind: 'field_reference',
+                        name: fieldName,
+                        path: [nestName],
+                    },
+                };
+            }),
         },
     ];
 }

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

@@ -39,28 +39,28 @@ class FilterElement extends malloy_element_1.MalloyElement {
         this.elementType = 'filterElement';
     }
     getStableFilter() {
-        const drillFilter = this.drillFilter();
-        if (drillFilter !== undefined) {
+        if (this.expr instanceof expr_compare_1.ExprEquality &&
+            this.expr.op === '=' &&
+            (0, literal_1.isLiteral)(this.expr.right)) {
+            const lhs = this.expr.left.drillExpression();
+            if (lhs === undefined)
+                return undefined;
             return {
                 kind: 'literal_equality',
-                field_reference: {
-                    name: drillFilter.reference.nameString,
-                    path: drillFilter.reference.list.map(f => f.name).slice(0, -1),
-                },
-                value: drillFilter.value.getStableLiteral(),
+                expression: lhs,
+                value: this.expr.right.getStableLiteral(),
             };
         }
-        const filterExpressionFilter = this.filterExpressionFilter();
-        if (filterExpressionFilter !== undefined) {
+        else if (this.expr instanceof expr_compare_1.ExprCompare &&
+            this.expr.op === '~' &&
+            this.expr.right instanceof expr_filter_expr_1.ExprFilterExpression) {
+            const lhs = this.expr.left.drillExpression();
+            if (lhs === undefined)
+                return undefined;
             return {
                 kind: 'filter_string',
-                field_reference: {
-                    name: filterExpressionFilter.reference.nameString,
-                    path: filterExpressionFilter.reference.list
-                        .map(f => f.name)
-                        .slice(0, -1),
-                },
-                filter: filterExpressionFilter.filterExpression,
+                expression: lhs,
+                filter: this.expr.right.filterText,
             };
         }
         return undefined;

package/dist/lang/ast/types/expression-def.d.ts

@@ -1,3 +1,4 @@
+import type * as Malloy from '@malloydata/malloy-interfaces';
 import type { Expr, TimestampUnit } from '../../../model/malloy_types';
 import type { ExprValue } from './expr-value';
 import type { FieldSpace } from './field-space';
@@ -42,6 +43,7 @@ export declare abstract class ExpressionDef extends MalloyElement {
      * @param eVal ...list of expressions that must match legalChildTypes
      */
     typeCheck(eNode: ExpressionDef, eVal: ExprValue): boolean;
+    drillExpression(): Malloy.Expression | undefined;
     /**
      * This is the operation which makes partial comparison and value trees work
      * The default implementation merely constructs LEFT OP RIGHT, but specialized

package/dist/lang/ast/types/expression-def.js

@@ -124,6 +124,9 @@ class ExpressionDef extends malloy_element_1.MalloyElement {
         }
         return true;
     }
+    drillExpression() {
+        return undefined;
+    }
     /**
      * This is the operation which makes partial comparison and value trees work
      * The default implementation merely constructs LEFT OP RIGHT, but specialized

package/dist/lang/malloy-to-stable-query.js

@@ -736,7 +736,8 @@ class MalloyToQuery extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor
                         return {
                             filter: {
                                 kind: 'filter_string',
-                                field_reference: {
+                                expression: {
+                                    kind: 'field_reference',
                                     name,
                                     path,
                                 },
@@ -759,7 +760,8 @@ class MalloyToQuery extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor
                     return {
                         filter: {
                             kind: 'literal_equality',
-                            field_reference: {
+                            expression: {
+                                kind: 'field_reference',
                                 name,
                                 path,
                             },

package/dist/model/malloy_query.d.ts

@@ -1,3 +1,4 @@
+import type * as Malloy from '@malloydata/malloy-interfaces';
 import type { QueryInfo, Dialect, DialectFieldList } from '../dialect';
 import type { AggregateFunctionType, CompiledQuery, Expr, FieldDef, Filtered, FunctionOverloadDef, FunctionParameterDef, JoinRelationship, ModelDef, OrderBy, OutputFieldNode, ParameterNode, PipeSegment, Query, QueryFieldDef, QuerySegment, RefToField, ResultMetadataDef, ResultStructMetadataDef, SearchIndexResult, SegmentFieldDef, StructDef, StructRef, TurtleDef, FunctionOrderBy, Argument, AggregateExpr, FilterCondition, GenericSQLExpr, FieldnameNode, FunctionCallNode, UngroupNode, SourceReferenceNode, SpreadExpr, FilteredExpr, SourceDef, BooleanFieldDef, QueryResultDef, QueryToMaterialize, PrepareResultOptions, CaseExpr, BasicAtomicDef, AtomicFieldDef, FilterMatchExpr } from './malloy_types';
 import type { Connection } from '../connection/types';
@@ -126,11 +127,12 @@ declare class FieldInstanceField implements FieldInstance {
     f: QueryField;
     fieldUsage: FieldUsage;
     parent: FieldInstanceResult;
+    readonly drillExpression: Malloy.Expression | undefined;
     type: FieldInstanceType;
     additionalGroupSets: number[];
     analyticalSQL: string | undefined;
     partitionSQL: string | undefined;
-    constructor(f: QueryField, fieldUsage: FieldUsage, parent: FieldInstanceResult);
+    constructor(f: QueryField, fieldUsage: FieldUsage, parent: FieldInstanceResult, drillExpression: Malloy.Expression | undefined);
     root(): FieldInstanceResultRoot;
     getSQL(): string;
     getAnalyticalSQL(forPartition: boolean): string;
@@ -161,7 +163,7 @@ declare class FieldInstanceResult implements FieldInstance {
      * @returns QueryInfo
      */
     getQueryInfo(): QueryInfo;
-    addField(as: string, field: QueryField, usage: FieldUsage): void;
+    addField(as: string, field: QueryField, usage: FieldUsage, drillExpression: Malloy.Expression | undefined): void;
     parentGroupSet(): number;
     add(name: string, f: FieldInstance): void;
     hasField(name: string): boolean;
@@ -259,6 +261,7 @@ declare class QueryQuery extends QueryField {
     addDependantExpr(resultStruct: FieldInstanceResult, context: QueryStruct, e: Expr, joinStack: string[]): void;
     addDependancies(resultStruct: FieldInstanceResult, field: QueryField): void;
     getSegmentFields(resultStruct: FieldInstanceResult): SegmentFieldDef[];
+    private getDrillExpression;
     expandFields(resultStruct: FieldInstanceResult): void;
     expandFilters(resultStruct: FieldInstanceResult): void;
     generateSQLFilters(resultStruct: FieldInstanceResult, which: 'where' | 'having'): AndChain;

package/dist/model/malloy_query.js

@@ -1,8 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryModel = exports.Segment = void 0;
-exports.getResultStructDefForView = getResultStructDefForView;
-exports.getResultStructDefForQuery = getResultStructDefForQuery;
 /*
  * Copyright 2023 Google LLC
  *
@@ -25,6 +21,10 @@ exports.getResultStructDefForQuery = getResultStructDefForQuery;
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryModel = exports.Segment = void 0;
+exports.getResultStructDefForView = getResultStructDefForView;
+exports.getResultStructDefForQuery = getResultStructDefForQuery;
 const uuid_1 = require("uuid");
 const dialect_1 = require("../dialect");
 const standardsql_1 = require("../dialect/standardsql/standardsql");
@@ -1124,10 +1124,11 @@ function sqlSumDistinct(dialect, sqlExp, sqlDistintKey) {
     return ret;
 }
 class FieldInstanceField {
-    constructor(f, fieldUsage, parent) {
+    constructor(f, fieldUsage, parent, drillExpression) {
         this.f = f;
         this.fieldUsage = fieldUsage;
         this.parent = parent;
+        this.drillExpression = drillExpression;
         this.type = 'field';
         this.additionalGroupSets = [];
     }
@@ -1186,7 +1187,7 @@ class FieldInstanceResult {
         }
         return {};
     }
-    addField(as, field, usage) {
+    addField(as, field, usage, drillExpression) {
         const fi = this.allFields.get(as);
         if (fi) {
             if (fi.type === 'query') {
@@ -1203,7 +1204,7 @@ class FieldInstanceResult {
                 }
             }
         }
-        this.add(as, new FieldInstanceField(field, usage, this));
+        this.add(as, new FieldInstanceField(field, usage, this, drillExpression));
     }
     parentGroupSet() {
         if (this.parent) {
@@ -1828,10 +1829,16 @@ class QueryQuery extends QueryField {
                 ? fs.queryFields
                 : [];
     }
+    getDrillExpression(f) {
+        if ((0, malloy_types_1.isAtomic)(f) || f.type === 'fieldref')
+            return f.drillExpression;
+        return undefined;
+    }
     expandFields(resultStruct) {
         let resultIndex = 1;
         for (const f of this.getSegmentFields(resultStruct)) {
             const { as, field } = this.expandField(f);
+            const drillExpression = this.getDrillExpression(f);
             if (field instanceof QueryQuery) {
                 if (this.firstSegment.type === 'project') {
                     throw new Error(`Nested views cannot be used in select - '${field.fieldDef.name}'`);
@@ -1844,7 +1851,7 @@ class QueryQuery extends QueryField {
                 resultStruct.addField(as, field, {
                     resultIndex,
                     type: 'result',
-                });
+                }, drillExpression);
                 this.addDependancies(resultStruct, field);
                 if (isBasicAggregate(field)) {
                     if (this.firstSegment.type === 'project') {
@@ -1859,7 +1866,7 @@ class QueryQuery extends QueryField {
                 resultStruct.addField(as, field, {
                     resultIndex,
                     type: 'result',
-                });
+                }, drillExpression);
             }
             // else if (
             //   this.firstSegment.type === "project" &&
@@ -1950,11 +1957,13 @@ class QueryQuery extends QueryField {
                     : undefined;
                 const sourceClasses = [sourceField];
                 const referenceId = fi.f.referenceId;
+                const drillExpression = fi.drillExpression;
                 const base = {
                     sourceField,
                     sourceExpression,
                     sourceClasses,
                     referenceId,
+                    drillExpression,
                 };
                 if (isBasicCalculation(fi.f)) {
                     filterList = fi.f.getFilterList();
@@ -2020,7 +2029,6 @@ class QueryQuery extends QueryField {
                         join: 'many',
                         name,
                         resultMetadata,
-                        drillView: fi.turtleDef.drillView,
                     };
                     fields.push(multiLineNest);
                 }
@@ -2031,7 +2039,6 @@ class QueryQuery extends QueryField {
                         join: 'one',
                         name,
                         resultMetadata,
-                        drillView: fi.turtleDef.drillView,
                     };
                     fields.push(oneLineNest);
                 }
@@ -2060,12 +2067,10 @@ class QueryQuery extends QueryField {
                     }
                     const location = fOut.location;
                     const annotation = fOut.annotation;
-                    const drillView = (0, malloy_types_1.isAtomic)(fOut) || (0, malloy_types_1.isTurtle)(fOut) ? fOut.drillView : undefined;
                     const common = {
                         resultMetadata,
                         location,
                         annotation,
-                        drillView,
                     };
                     // build out the result fields...
                     switch (fOut.type) {
@@ -2835,7 +2840,6 @@ class QueryQuery extends QueryField {
                 type: 'turtle',
                 name: 'starthere',
                 pipeline,
-                drillView: fi.turtleDef.drillView,
             };
             const inputStruct = {
                 type: 'nest_source',
@@ -2942,11 +2946,12 @@ class QueryQueryIndexStage extends QueryQuery {
         this.maxGroupSet = groupIndex;
         for (const f of this.firstSegment.indexFields) {
             const { as, field } = this.expandField(f);
-            this.indexPaths[as] = f.path;
+            const referencePath = f.path;
+            this.indexPaths[as] = referencePath;
             resultStruct.addField(as, field, {
                 resultIndex,
                 type: 'result',
-            });
+            }, undefined);
             if (field instanceof QueryAtomicField) {
                 this.addDependancies(resultStruct, field);
             }
@@ -2958,7 +2963,7 @@ class QueryQueryIndexStage extends QueryQuery {
             resultStruct.addField(measure, f, {
                 resultIndex,
                 type: 'result',
-            });
+            }, undefined);
             this.addDependancies(resultStruct, f);
         }
         this.expandFilters(resultStruct);
@@ -3615,20 +3620,20 @@ class QueryStruct {
         return field;
     }
     getQueryFieldReference(f) {
-        const { path, annotation, drillView } = f;
+        const { path, annotation, drillExpression } = f;
         const field = this.getFieldByName(path);
-        if (annotation || drillView) {
+        if (annotation || drillExpression) {
             if (field.parent === undefined) {
                 throw new Error('Inconcievable, field reference to orphaned query field');
             }
             // Made a field object from the source, but the annotations were computed by the compiler
             // when it generated the reference, and has both the source and reference annotations included.
             if (field instanceof QueryFieldStruct) {
-                const newDef = { ...field.fieldDef, annotation, drillView };
+                const newDef = { ...field.fieldDef, annotation, drillExpression };
                 return new QueryFieldStruct(newDef, undefined, field.parent, {}, field.referenceId);
             }
             else {
-                const newDef = { ...field.fieldDef, annotation, drillView };
+                const newDef = { ...field.fieldDef, annotation, drillExpression };
                 return field.parent.makeQueryField(newDef, field.referenceId);
             }
         }
@@ -3683,7 +3688,6 @@ class QueryStruct {
             pipeline,
             annotation,
             location: turtleDef.location,
-            drillView: turtleDef.drillView,
         };
         return flatTurtleDef;
     }

package/dist/model/malloy_types.d.ts

@@ -1,4 +1,4 @@
-import type { Filter } from '@malloydata/malloy-interfaces';
+import type * as Malloy from '@malloydata/malloy-interfaces';
 /**
  * Field computations are compiled into an expression tree of "Expr"
  * type nodes. Each node is one of these three interfaces. The
@@ -60,8 +60,8 @@ export interface FilterCondition extends ExprE {
     code: string;
     expressionType: ExpressionType;
     fieldUsage?: FieldUsage[];
-    drillView?: string;
-    stableFilter?: Filter;
+    filterView?: string;
+    stableFilter?: Malloy.Filter;
     isSourceFilter?: boolean;
 }
 export interface FilteredExpr extends ExprWithKids {
@@ -265,6 +265,7 @@ export interface Expression {
     fieldUsage?: FieldUsage[];
     expressionType?: ExpressionType;
     code?: string;
+    drillExpression?: Malloy.Expression;
 }
 type ConstantExpr = Expr;
 interface ParameterInfo {
@@ -343,6 +344,7 @@ export interface ResultMetadataDef {
     filterList?: FilterCondition[];
     fieldKind: 'measure' | 'dimension' | 'struct';
     referenceId?: string;
+    drillExpression?: Malloy.Expression | undefined;
     drillable?: boolean;
 }
 export interface Ordered {
@@ -389,7 +391,7 @@ export interface FieldBase extends NamedObject, Expression, ResultMetadata {
     accessModifier?: NonDefaultAccessModifierLabel | undefined;
     requiresGroupBy?: RequiredGroupBy[];
     ungroupings?: AggregateUngrouping[];
-    drillView?: string;
+    drillExpression?: Malloy.Expression | undefined;
 }
 export declare function fieldIsIntrinsic(f: FieldDef): f is AtomicFieldDef;
 export interface StringTypeDef {
@@ -610,7 +612,6 @@ export interface TurtleDef extends NamedObject, Pipeline {
     accessModifier?: NonDefaultAccessModifierLabel | undefined;
     fieldUsage?: FieldUsage[];
     requiredGroupBys?: string[][];
-    drillView?: string;
 }
 interface StructDefBase extends HasLocation, NamedObject {
     type: string;
@@ -799,7 +800,7 @@ export interface RefToField {
     path: string[];
     annotation?: Annotation;
     at?: DocumentLocation;
-    drillView?: string;
+    drillExpression?: Malloy.Expression | undefined;
 }
 export type QueryFieldDef = AtomicFieldDef | TurtleDef | RefToField;
 export type TypedDef = AtomicTypeDef | JoinFieldDef | TurtleDef | RefToField | StructDef;

package/dist/to_stable.d.ts

@@ -1,4 +1,4 @@
-import type * as Malloy from '@malloydata/malloy-interfaces';
+import * as Malloy from '@malloydata/malloy-interfaces';
 import type { FieldDef, ModelDef, ResultStructMetadataDef, SourceDef } from './model';
 import { Tag } from '@malloydata/malloy-tag';
 export declare function sourceDefToSourceInfo(sourceDef: SourceDef): Malloy.SourceInfo;
@@ -6,3 +6,15 @@ export declare function modelDefToModelInfo(modelDef: ModelDef): Malloy.ModelInf
 export declare function convertFieldInfos(source: SourceDef, fields: FieldDef[]): Malloy.FieldInfo[];
 export declare function writeLiteralToTag(tag: Tag, path: (string | number)[], literal: Malloy.LiteralValue): void;
 export declare function getResultStructMetadataAnnotation(field: SourceDef, resultMetadata: ResultStructMetadataDef): Malloy.Annotation | undefined;
+/**
+ * Writes a Malloy interface object to a tag at a given path.
+ *
+ * E.g. `writeMalloyObjectToTag(tag, ['expr'], 'Expression', {kind: 'field_reference', name: 'carrier'})`
+ *
+ * produces the tag `#(malloy) expr { kind = field_reference name = carrier }`
+ */
+export declare function writeMalloyObjectToTag(tag: Tag, path: (string | number)[], obj: unknown, type: string): void;
+/**
+ * Extracts a Malloy interface object from a tag at a given path; the inverse of `writeMalloyObjectToTag`.
+ */
+export declare function extractMalloyObjectFromTag(tag: Tag, type: string): unknown;

package/dist/to_stable.js

@@ -5,12 +5,48 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sourceDefToSourceInfo = sourceDefToSourceInfo;
 exports.modelDefToModelInfo = modelDefToModelInfo;
 exports.convertFieldInfos = convertFieldInfos;
 exports.writeLiteralToTag = writeLiteralToTag;
 exports.getResultStructMetadataAnnotation = getResultStructMetadataAnnotation;
+exports.writeMalloyObjectToTag = writeMalloyObjectToTag;
+exports.extractMalloyObjectFromTag = extractMalloyObjectFromTag;
+const Malloy = __importStar(require("@malloydata/malloy-interfaces"));
 const model_1 = require("./model");
 const malloy_query_1 = require("./model/malloy_query");
 const annotation_1 = require("./annotation");
@@ -220,25 +256,23 @@ function getResultMetadataAnnotation(field, resultMetadata) {
         tag.set(['drillable']);
         hasAny = true;
     }
-    if ((0, model_1.isAtomic)(field) || (0, model_1.isTurtle)(field)) {
-        if (field.drillView !== undefined) {
-            tag.set(['drill_view'], field.drillView);
-            hasAny = true;
-        }
-    }
     if (resultMetadata.filterList) {
         addDrillFiltersTag(tag, resultMetadata.filterList);
         hasAny = true;
     }
+    if (resultMetadata.drillExpression) {
+        writeExpressionToTag(tag, ['drill_expression'], resultMetadata.drillExpression);
+        hasAny = true;
+    }
     if (resultMetadata.fieldKind === 'dimension') {
         const dot = '.';
         // If field is joined-in from another table i.e. of type `tableName.columnName`,
         // return sourceField, else return name because this could be a renamed field.
-        const drillExpression = (resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceExpression) ||
+        const drillExpressionCode = (resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceExpression) ||
             ((resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceField.includes(dot))
                 ? resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceField
                 : identifierCode(field.name));
-        tag.set(['drill_expression'], drillExpression);
+        tag.set(['drill_expression', 'code'], drillExpressionCode);
         hasAny = true;
     }
     return hasAny
@@ -248,20 +282,16 @@ function getResultMetadataAnnotation(field, resultMetadata) {
         : undefined;
 }
 function addDrillFiltersTag(tag, drillFilters) {
-    var _a;
     for (let i = 0; i < drillFilters.length; i++) {
         const filter = drillFilters[i];
         if (filter.expressionType !== 'scalar' || filter.isSourceFilter)
             continue;
         tag.set(['drill_filters', i, 'code'], filter.code);
-        if (filter.drillView) {
-            tag.set(['drill_filters', i, 'drill_view'], filter.drillView);
+        if (filter.filterView) {
+            tag.set(['drill_filters', i, 'filter_view'], filter.filterView);
         }
-        if (filter.drillView === undefined && filter.stableFilter !== undefined) {
-            tag.set(['drill_filters', i, 'field_reference'], [
-                ...((_a = filter.stableFilter.field_reference.path) !== null && _a !== void 0 ? _a : []),
-                filter.stableFilter.field_reference.name,
-            ]);
+        if (filter.filterView === undefined && filter.stableFilter !== undefined) {
+            writeExpressionToTag(tag, ['drill_filters', i, 'expression'], filter.stableFilter.expression);
             if (filter.stableFilter.kind === 'filter_string') {
                 tag.set(['drill_filters', i, 'kind'], 'filter_expression');
                 tag.set(['drill_filters', i, 'filter_expression'], filter.stableFilter.filter);
@@ -273,32 +303,11 @@ function addDrillFiltersTag(tag, drillFilters) {
         }
     }
 }
+function writeExpressionToTag(tag, path, expression) {
+    writeMalloyObjectToTag(tag, path, expression, 'Expression');
+}
 function writeLiteralToTag(tag, path, literal) {
-    tag.set([...path, 'kind'], literal.kind);
-    switch (literal.kind) {
-        case 'string_literal':
-            tag.set([...path, 'string_value'], literal.string_value);
-            break;
-        case 'number_literal':
-            tag.set([...path, 'number_value'], literal.number_value);
-            break;
-        case 'boolean_literal':
-            tag.set([...path, 'boolean_value'], literal.boolean_value.toString());
-            break;
-        case 'date_literal':
-            tag.set([...path, 'date_value'], literal.date_value);
-            tag.set([...path, 'timezone'], literal.timezone);
-            tag.set([...path, 'granularity'], literal.granularity);
-            break;
-        case 'timestamp_literal':
-            tag.set([...path, 'timestamp_value'], literal.timestamp_value);
-            tag.set([...path, 'timezone'], literal.timezone);
-            tag.set([...path, 'granularity'], literal.granularity);
-            break;
-        case 'filter_expression_literal':
-            tag.set([...path, 'filter_expression_value'], literal.filter_expression_value);
-            break;
-    }
+    writeMalloyObjectToTag(tag, path, literal, 'LiteralValue');
 }
 function escapeIdentifier(str) {
     return str.replace(/\\/g, '\\\\').replace(/`/g, '\\`');
@@ -469,4 +478,142 @@ function convertTimestampTimeframe(timeframe) {
 function convertJoinType(type) {
     return type;
 }
+/**
+ * Writes a Malloy interface object to a tag at a given path.
+ *
+ * E.g. `writeMalloyObjectToTag(tag, ['expr'], 'Expression', {kind: 'field_reference', name: 'carrier'})`
+ *
+ * produces the tag `#(malloy) expr { kind = field_reference name = carrier }`
+ */
+function writeMalloyObjectToTag(tag, path, obj, type) {
+    if (type === 'string') {
+        tag.set(path, obj);
+        return;
+    }
+    else if (type === 'number') {
+        tag.set(path, obj);
+        return;
+    }
+    else if (type === 'boolean') {
+        tag.set(path, obj.toString());
+        return;
+    }
+    const typelookup = Malloy.MALLOY_INTERFACE_TYPES[type];
+    if (typelookup === undefined) {
+        throw new Error(`Unknown Malloy interface type ${type}`);
+    }
+    if (typelookup.type === 'enum') {
+        if (typeof obj === 'string') {
+            tag.set(path, obj);
+        }
+        else {
+            throw new Error(`Expected string for enum ${type}`);
+        }
+    }
+    else if (typelookup.type === 'struct') {
+        for (const key in typelookup.fields) {
+            const valueType = typelookup.fields[key];
+            const value = obj[key];
+            if (value === undefined) {
+                if (!valueType.optional) {
+                    throw new Error(`Mising value for non-optional field ${key} in type ${type}`);
+                }
+            }
+            else if (valueType.array) {
+                if (Array.isArray(value)) {
+                    for (let i = 0; i < value.length; i++) {
+                        writeMalloyObjectToTag(tag, [...path, key, i], value[i], valueType.type);
+                    }
+                }
+                else {
+                    throw new Error(`Expected array for field ${key} of type ${type} but got ${typeof obj}`);
+                }
+            }
+            else {
+                writeMalloyObjectToTag(tag, [...path, key], value, valueType.type);
+            }
+        }
+    }
+    else {
+        // enum
+        const kind = obj.kind;
+        tag.set([...path, 'kind'], kind);
+        const unionType = typelookup.options[kind];
+        if (unionType === undefined) {
+            throw new Error(`Unknown Malloy interface union kind ${kind} for type ${type}`);
+        }
+        writeMalloyObjectToTag(tag, path, obj, unionType);
+    }
+}
+/**
+ * Extracts a Malloy interface object from a tag at a given path; the inverse of `writeMalloyObjectToTag`.
+ */
+function extractMalloyObjectFromTag(tag, type) {
+    if (type === 'string') {
+        return tag.text();
+    }
+    else if (type === 'number') {
+        return tag.numeric();
+    }
+    else if (type === 'boolean') {
+        return tag.text() === 'true';
+    }
+    const typeDef = Malloy.MALLOY_INTERFACE_TYPES[type];
+    if (typeDef === undefined) {
+        throw new Error(`Unknown Malloy interface type ${type}`);
+    }
+    if (typeDef.type === 'enum') {
+        const value = tag.text();
+        if (value === undefined) {
+            throw new Error(`Missing value for enum ${type}`);
+        }
+        if (value in typeDef.values) {
+            return value;
+        }
+        throw new Error(`Unknown value ${value} for enum ${type}`);
+    }
+    else if (typeDef.type === 'struct') {
+        const result = {};
+        for (const [key, type] of Object.entries(typeDef.fields)) {
+            const valueTag = tag.tag(key);
+            if (valueTag === undefined) {
+                if (type.optional)
+                    continue;
+                else {
+                    throw new Error(`Missing value for key ${key} of type ${type}`);
+                }
+            }
+            if (type.array) {
+                const arr = [];
+                const values = valueTag.array();
+                if (values === undefined) {
+                    throw new Error(`Missing array value for key ${key} of type ${type}`);
+                }
+                for (const value of values) {
+                    arr.push(extractMalloyObjectFromTag(value, type.type));
+                }
+                result[key] = arr;
+            }
+            else {
+                const value = extractMalloyObjectFromTag(valueTag, type.type);
+                if (value !== undefined && value !== null) {
+                    result[key] = value;
+                }
+            }
+        }
+        return result;
+    } /* (typeDef.type === 'union') */
+    else {
+        const kind = tag.text('kind');
+        if (kind === undefined) {
+            throw new Error(`Missing kind for union ${type}`);
+        }
+        const unionType = typeDef.options[kind];
+        if (unionType === undefined) {
+            throw new Error(`Unknown kind ${kind} for union ${type}`);
+        }
+        const value = extractMalloyObjectFromTag(tag, unionType);
+        return { kind, ...value };
+    }
+}
 //# sourceMappingURL=to_stable.js.map

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.294";
+export declare const MALLOY_VERSION = "0.0.295";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.294';
+exports.MALLOY_VERSION = '0.0.295';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.294",
+  "version": "0.0.295",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.294",
-    "@malloydata/malloy-interfaces": "0.0.294",
-    "@malloydata/malloy-tag": "0.0.294",
+    "@malloydata/malloy-filter": "0.0.295",
+    "@malloydata/malloy-interfaces": "0.0.295",
+    "@malloydata/malloy-tag": "0.0.295",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",