@malloydata/malloy 0.0.281 → 0.0.283

package/dist/model/malloy_query.js

@@ -1716,7 +1716,7 @@ class QueryQuery extends QueryField {
     // get a field ref and expand it.
     expandField(f) {
         const field = f.type === 'fieldref'
-            ? this.parent.getQueryFieldReference(f.path, f.annotation)
+            ? this.parent.getQueryFieldReference(f)
             : this.parent.makeQueryField(f);
         const as = field.getIdentifier();
         return { as, field };
@@ -1984,6 +1984,7 @@ class QueryQuery extends QueryField {
             const lastSegment = fi.turtleDef.pipeline[fi.turtleDef.pipeline.length - 1];
             const limit = (0, malloy_types_1.isRawSegment)(lastSegment) ? undefined : lastSegment.limit;
             let orderBy = undefined;
+            const drillable = (0, malloy_types_1.isQuerySegment)(lastSegment) && fi.turtleDef.pipeline.length === 1;
             if ((0, malloy_types_1.isQuerySegment)(lastSegment)) {
                 orderBy = lastSegment.orderBy;
             }
@@ -1995,6 +1996,7 @@ class QueryQuery extends QueryField {
                     fieldKind: 'struct',
                     limit,
                     orderBy,
+                    drillable,
                 };
             }
         }
@@ -2018,6 +2020,7 @@ class QueryQuery extends QueryField {
                         join: 'many',
                         name,
                         resultMetadata,
+                        drillView: fi.turtleDef.drillView,
                     };
                     fields.push(multiLineNest);
                 }
@@ -2028,6 +2031,7 @@ class QueryQuery extends QueryField {
                         join: 'one',
                         name,
                         resultMetadata,
+                        drillView: fi.turtleDef.drillView,
                     };
                     fields.push(oneLineNest);
                 }
@@ -2056,6 +2060,13 @@ 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) {
                         case 'boolean':
@@ -2064,9 +2075,7 @@ class QueryQuery extends QueryField {
                             fields.push({
                                 name,
                                 type: fOut.type,
-                                resultMetadata,
-                                location,
-                                annotation,
+                                ...common,
                             });
                             break;
                         case 'date':
@@ -2079,9 +2088,7 @@ class QueryQuery extends QueryField {
                             fields.push({
                                 name,
                                 ...fd,
-                                resultMetadata,
-                                location,
-                                annotation,
+                                ...common,
                             });
                             break;
                         }
@@ -2090,15 +2097,13 @@ class QueryQuery extends QueryField {
                                 name,
                                 numberType: fOut.numberType,
                                 type: 'number',
-                                resultMetadata,
-                                location,
-                                annotation,
+                                ...common,
                             });
                             break;
                         case 'sql native':
                         case 'record':
                         case 'array': {
-                            fields.push({ ...fOut, resultMetadata });
+                            fields.push({ ...fOut, ...common });
                             break;
                         }
                         default:
@@ -2830,6 +2835,7 @@ class QueryQuery extends QueryField {
                 type: 'turtle',
                 name: 'starthere',
                 pipeline,
+                drillView: fi.turtleDef.drillView,
             };
             const inputStruct = {
                 type: 'nest_source',
@@ -3254,11 +3260,10 @@ class QueryStruct {
                 ? null
                 : (0, utils_1.exprMap)(param.value, frag => {
                     if (frag.node === 'parameter') {
-                        if (this.parent === undefined) {
-                            throw new Error('No parent from which to retrieve parameter value');
-                        }
-                        const resolved1 = this.parent.arguments()[frag.path[0]];
-                        const resolved2 = this.parent.resolveParentParameterReferences(resolved1);
+                        const resolved1 = (this.parent ? this.parent.arguments() : this.arguments())[frag.path[0]];
+                        const resolved2 = this.parent
+                            ? this.parent.resolveParentParameterReferences(resolved1)
+                            : resolved1;
                         if (resolved2.value === null) {
                             throw new Error('Invalid parameter value');
                         }
@@ -3609,20 +3614,21 @@ class QueryStruct {
         }
         return field;
     }
-    getQueryFieldReference(path, annotation) {
+    getQueryFieldReference(f) {
+        const { path, annotation, drillView } = f;
         const field = this.getFieldByName(path);
-        if (annotation) {
+        if (annotation || drillView) {
             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 };
+                const newDef = { ...field.fieldDef, annotation, drillView };
                 return new QueryFieldStruct(newDef, undefined, field.parent, {}, field.referenceId);
             }
             else {
-                const newDef = { ...field.fieldDef, annotation };
+                const newDef = { ...field.fieldDef, annotation, drillView };
                 return field.parent.makeQueryField(newDef, field.referenceId);
             }
         }
@@ -3677,6 +3683,7 @@ class QueryStruct {
             pipeline,
             annotation,
             location: turtleDef.location,
+            drillView: turtleDef.drillView,
         };
         return flatTurtleDef;
     }
@@ -3795,7 +3802,7 @@ class QueryModel {
         };
     }
     compileQuery(query, prepareResultOptions, finalize = true) {
-        var _a, _b;
+        var _a, _b, _c;
         let newModel;
         const addDefaultRowLimit = this.addDefaultRowLimit(query, prepareResultOptions === null || prepareResultOptions === void 0 ? void 0 : prepareResultOptions.defaultRowLimit);
         query = addDefaultRowLimit.query;
@@ -3806,6 +3813,7 @@ class QueryModel {
         const sourceExplore = typeof structRef === 'string'
             ? structRef
             : structRef.as || structRef.name;
+        const sourceArguments = (_b = query.sourceArguments) !== null && _b !== void 0 ? _b : (typeof structRef === 'string' ? undefined : structRef.arguments);
         // LTNote:  I don't understand why this might be here.  It should have happened in loadQuery...
         if (finalize && this.dialect.hasFinalStage) {
             ret.lastStageName = ret.stageWriter.addStage(
@@ -3818,11 +3826,12 @@ class QueryModel {
             sql: ret.stageWriter.generateSQLStages(),
             dependenciesToMaterialize: ret.stageWriter.dependenciesToMaterialize,
             materialization: (0, utils_2.shouldMaterialize)(query.annotation)
-                ? (0, utils_2.buildQueryMaterializationSpec)((_b = query.location) === null || _b === void 0 ? void 0 : _b.url, query.name, prepareResultOptions === null || prepareResultOptions === void 0 ? void 0 : prepareResultOptions.materializedTablePrefix)
+                ? (0, utils_2.buildQueryMaterializationSpec)((_c = query.location) === null || _c === void 0 ? void 0 : _c.url, query.name, prepareResultOptions === null || prepareResultOptions === void 0 ? void 0 : prepareResultOptions.materializedTablePrefix)
                 : undefined,
             structs: ret.structs,
             sourceExplore,
             sourceFilters: query.filterList,
+            sourceArguments,
             queryName: query.name,
             connectionName: ret.connectionName,
             annotation: query.annotation,

package/dist/model/malloy_types.d.ts

@@ -1,3 +1,4 @@
+import type { Filter } 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
@@ -59,6 +60,8 @@ export interface FilterCondition extends ExprE {
     code: string;
     expressionType: ExpressionType;
     fieldUsage?: FieldUsage[];
+    drillView?: string;
+    stableFilter?: Filter;
 }
 export interface FilteredExpr extends ExprWithKids {
     node: 'filteredExpr';
@@ -339,6 +342,7 @@ export interface ResultMetadataDef {
     filterList?: FilterCondition[];
     fieldKind: 'measure' | 'dimension' | 'struct';
     referenceId?: string;
+    drillable?: boolean;
 }
 export interface Ordered {
     orderBy?: OrderBy[];
@@ -384,6 +388,7 @@ export interface FieldBase extends NamedObject, Expression, ResultMetadata {
     accessModifier?: NonDefaultAccessModifierLabel | undefined;
     requiresGroupBy?: RequiredGroupBy[];
     ungroupings?: AggregateUngrouping[];
+    drillView?: string;
 }
 export declare function fieldIsIntrinsic(f: FieldDef): f is AtomicFieldDef;
 export interface StringTypeDef {
@@ -604,6 +609,7 @@ export interface TurtleDef extends NamedObject, Pipeline {
     accessModifier?: NonDefaultAccessModifierLabel | undefined;
     fieldUsage?: FieldUsage[];
     requiredGroupBys?: string[][];
+    drillView?: string;
 }
 interface StructDefBase extends HasLocation, NamedObject {
     type: string;
@@ -781,6 +787,7 @@ export interface RefToField {
     path: string[];
     annotation?: Annotation;
     at?: DocumentLocation;
+    drillView?: string;
 }
 export type QueryFieldDef = AtomicFieldDef | TurtleDef | RefToField;
 export type TypedDef = AtomicTypeDef | JoinFieldDef | TurtleDef | RefToField | StructDef;
@@ -841,6 +848,7 @@ export type MalloyQueryData = {
 export interface DrillSource {
     sourceExplore: string;
     sourceFilters?: FilterCondition[];
+    sourceArguments?: Record<string, Argument>;
 }
 export type QueryToMaterialize = {
     id: string;

package/dist/to_stable.d.ts

@@ -1,6 +1,8 @@
 import type * 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;
 export declare function modelDefToModelInfo(modelDef: ModelDef): Malloy.ModelInfo;
 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;

package/dist/to_stable.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sourceDefToSourceInfo = sourceDefToSourceInfo;
 exports.modelDefToModelInfo = modelDefToModelInfo;
 exports.convertFieldInfos = convertFieldInfos;
+exports.writeLiteralToTag = writeLiteralToTag;
 exports.getResultStructMetadataAnnotation = getResultStructMetadataAnnotation;
 const model_1 = require("./model");
 const malloy_query_1 = require("./model/malloy_query");
@@ -205,6 +206,7 @@ function convertFieldInfos(source, fields) {
     return result;
 }
 function getResultMetadataAnnotation(field, resultMetadata) {
+    var _a;
     const tag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
     let hasAny = false;
     if (resultMetadata.referenceId !== undefined) {
@@ -215,11 +217,19 @@ function getResultMetadataAnnotation(field, resultMetadata) {
         tag.set(['calculation']);
         hasAny = true;
     }
-    if (resultMetadata.filterList) {
-        const drillFilters = resultMetadata.filterList
-            .filter(f => f.expressionType === 'scalar')
-            .map(f => f.code);
-        tag.set(['drill_filters'], drillFilters);
+    if (resultMetadata.drillable) {
+        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;
+        }
+    }
+    const drillFilters = (_a = resultMetadata.filterList) === null || _a === void 0 ? void 0 : _a.filter(f => f.expressionType === 'scalar');
+    if (drillFilters) {
+        addDrillFiltersTag(tag, drillFilters);
         hasAny = true;
     }
     if (resultMetadata.fieldKind === 'dimension') {
@@ -239,6 +249,57 @@ function getResultMetadataAnnotation(field, resultMetadata) {
         }
         : undefined;
 }
+function addDrillFiltersTag(tag, drillFilters) {
+    var _a;
+    for (let i = 0; i < drillFilters.length; i++) {
+        const filter = drillFilters[i];
+        tag.set(['drill_filters', i, 'code'], filter.code);
+        if (filter.drillView) {
+            tag.set(['drill_filters', i, 'drill_view'], filter.drillView);
+        }
+        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.stableFilter.kind === 'filter_string') {
+                tag.set(['drill_filters', i, 'kind'], 'filter_expression');
+                tag.set(['drill_filters', i, 'filter_expression'], filter.stableFilter.filter);
+            }
+            else {
+                tag.set(['drill_filters', i, 'kind'], 'literal_equality');
+                writeLiteralToTag(tag, ['drill_filters', i, 'value'], filter.stableFilter.value);
+            }
+        }
+    }
+}
+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;
+    }
+}
 function escapeIdentifier(str) {
     return str.replace(/\\/g, '\\\\').replace(/`/g, '\\`');
 }
@@ -248,29 +309,29 @@ function identifierCode(name) {
     return `\`${escapeIdentifier(name)}\``;
 }
 function getResultStructMetadataAnnotation(field, resultMetadata) {
-    var _a, _b;
+    var _a, _b, _c;
     const tag = malloy_tag_1.Tag.withPrefix('#(malloy) ');
     let hasAny = false;
     if (resultMetadata.limit !== undefined) {
         tag.set(['limit'], resultMetadata.limit);
         hasAny = true;
     }
-    if (resultMetadata.filterList) {
-        const drillFilters = resultMetadata.filterList
-            .filter(f => f.expressionType === 'scalar')
-            .map(f => f.code);
-        if (drillFilters.length > 0) {
-            tag.set(['drill_filters'], drillFilters);
-            hasAny = true;
-        }
+    const drillFilters = (_a = resultMetadata.filterList) === null || _a === void 0 ? void 0 : _a.filter(f => f.expressionType === 'scalar');
+    if (drillFilters) {
+        addDrillFiltersTag(tag, drillFilters);
+        hasAny = true;
+    }
+    if (resultMetadata.drillable) {
+        tag.set(['drillable']);
+        hasAny = true;
     }
     if (resultMetadata.orderBy) {
         for (let i = 0; i < resultMetadata.orderBy.length; i++) {
             const orderBy = resultMetadata.orderBy[i];
             const orderByField = typeof orderBy.field === 'number'
-                ? (_a = field.fields[orderBy.field - 1].as) !== null && _a !== void 0 ? _a : field.fields[orderBy.field - 1].name
+                ? (_b = field.fields[orderBy.field - 1].as) !== null && _b !== void 0 ? _b : field.fields[orderBy.field - 1].name
                 : orderBy.field;
-            const direction = (_b = orderBy.dir) !== null && _b !== void 0 ? _b : null;
+            const direction = (_c = orderBy.dir) !== null && _c !== void 0 ? _c : null;
             tag.set(['ordered_by', i, orderByField], direction);
         }
         hasAny = true;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.281";
+export declare const MALLOY_VERSION = "0.0.283";

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.281';
+exports.MALLOY_VERSION = '0.0.283';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.281",
+  "version": "0.0.283",
   "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.281",
-    "@malloydata/malloy-interfaces": "0.0.281",
-    "@malloydata/malloy-tag": "0.0.281",
+    "@malloydata/malloy-filter": "0.0.283",
+    "@malloydata/malloy-interfaces": "0.0.283",
+    "@malloydata/malloy-tag": "0.0.283",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",