@malloydata/malloy 0.0.391 → 0.0.393

package/dist/lang/ast/field-space/query-spaces.js

@@ -75,11 +75,21 @@ const refine_from_space_field_1 = require("./refine-from-space-field");
  * created and paired when a QueryOperationSpace is created.
  */
 class QueryOperationSpace extends refined_space_1.RefinedSpace {
-    get fieldUsage() {
-        if (this._fieldUsage === undefined) {
-            throw new Error('Field usage accessed before computed');
+    get refSummary() {
+        if (!this._refSummaryComputed) {
+            throw new Error('Ref summary accessed before computed');
         }
-        return this._fieldUsage;
+        return this._refSummary;
+    }
+    set refSummary(rs) {
+        this._refSummary = rs;
+        this._refSummaryComputed = true;
+    }
+    get fieldUsage() {
+        return model.fieldUsageFrom(this.refSummary);
+    }
+    get givenUsage() {
+        return model.givenUsageFrom(this.refSummary);
     }
     constructor(queryInputSpace, refineThis, nestParent, astEl) {
         super(queryInputSpace.emptyStructDef());
@@ -88,10 +98,13 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
         this.expandedWild = new Map();
         this.drillDimensions = [];
         this.compositeFieldUsers = [];
-        // Composite field usage is not computed until `queryFieldDefs` is called
-        // (or `getPipeSegment` for index segments); if anyone
-        // tries to access it before that, they'll get an error
-        this._fieldUsage = undefined;
+        // Reference summary is not computed until `queryFieldDefs` is called
+        // (or `getPipeSegment` for index segments). Reading it before that throws;
+        // assigning to it (via the setter) flips the computed flag.
+        // `undefined` is a valid post-computation value, so the flag is what
+        // distinguishes "not yet computed" from "computed and empty".
+        this._refSummary = undefined;
+        this._refSummaryComputed = false;
         this.exprSpace = new query_input_space_1.QueryInputSpace(queryInputSpace.structDef(), this, queryInputSpace.accessProtectionLevel());
         if (refineThis)
             this.addRefineFromFields(refineThis);
@@ -181,7 +194,7 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
         }
     }
     addFieldUserFromFilter(filter) {
-        if (filter.fieldUsage !== undefined) {
+        if (filter.refSummary !== undefined) {
             this.compositeFieldUsers.push({ type: 'filter', filter });
         }
     }
@@ -333,18 +346,15 @@ class QuerySpace extends QueryOperationSpace {
         return sourceDef;
     }
     translateQueryFields() {
-        var _a;
         if (this.translatedQueryFields) {
             return this.translatedQueryFields;
         }
         const fields = [];
-        let fieldUsage = (0, composite_source_utils_1.emptyFieldUsage)();
+        let refSummary = undefined;
         for (const user of this.compositeFieldUsers) {
-            let nextFieldUsage = undefined;
+            let nextRefSummary = undefined;
             if (user.type === 'filter') {
-                if (user.filter.fieldUsage) {
-                    nextFieldUsage = user.filter.fieldUsage;
-                }
+                nextRefSummary = user.filter.refSummary;
             }
             else {
                 const { name, field } = user;
@@ -359,13 +369,13 @@ class QuerySpace extends QueryOperationSpace {
                         },
                         typeDesc,
                     });
-                    nextFieldUsage = typeDesc.fieldUsage;
+                    nextRefSummary = typeDesc.refSummary;
                 }
                 else {
                     const queryFieldDef = field.getQueryFieldDef(this.exprSpace);
                     if (queryFieldDef) {
                         const typeDesc = field.typeDesc();
-                        nextFieldUsage = typeDesc.fieldUsage;
+                        nextRefSummary = typeDesc.refSummary;
                         // Filter out fields whose type is 'error', which means that a totally bad field
                         // isn't sent to the compiler, where it will wig out.
                         // TODO Figure out how to make errors generated by `canContain` go in the right place,
@@ -382,9 +392,9 @@ class QuerySpace extends QueryOperationSpace {
                     }
                 }
             }
-            fieldUsage = (_a = (0, composite_source_utils_1.mergeFieldUsage)(fieldUsage, nextFieldUsage)) !== null && _a !== void 0 ? _a : [];
+            refSummary = (0, composite_source_utils_1.mergeRefSummaries)(refSummary, nextRefSummary);
         }
-        this._fieldUsage = fieldUsage;
+        this.refSummary = refSummary;
         for (const drillDimension of this.drillDimensions) {
             if (!drillDimension.satisfied) {
                 drillDimension.firstDrill.logError('illegal-drill', `Must provide a value for all dimensions in a view when drilling: missing \`${drillDimension.dimensionPath.join('.')}\``);

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

@@ -139,7 +139,7 @@ class ReferenceField extends space_field_1.SpaceField {
             };
             this.memoTypeDesc = {
                 ...typeDesc,
-                fieldUsage: [usage],
+                refSummary: { fieldUsage: [usage] },
                 requiresGroupBy: (_a = typeDesc.requiresGroupBy) === null || _a === void 0 ? void 0 : _a.map(gb => ({
                     ...gb,
                     path: [...joinPath, ...gb.path],

package/dist/lang/ast/field-space/rename-space-field.d.ts

@@ -7,5 +7,5 @@ export declare class RenameSpaceField extends SpaceField {
     private note;
     constructor(otherField: SpaceField, newName: string, location: DocumentLocation, note: Annotation | undefined);
     fieldDef(): FieldDef | undefined;
-    typeDesc(): import("../../../model/malloy_types").TypeDesc;
+    typeDesc(): import("../../..").TypeDesc;
 }

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

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenameSpaceField = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
 const space_field_1 = require("../types/space-field");
 class RenameSpaceField extends space_field_1.SpaceField {
     constructor(otherField, newName, location, note) {
@@ -33,7 +34,6 @@ class RenameSpaceField extends space_field_1.SpaceField {
         this.note = note;
     }
     fieldDef() {
-        var _a;
         const returnFieldDef = this.otherField.fieldDef();
         if (returnFieldDef === undefined) {
             return undefined;
@@ -53,7 +53,7 @@ class RenameSpaceField extends space_field_1.SpaceField {
             ...returnFieldDef,
             as: this.newName,
             location: this.location,
-            fieldUsage: (_a = returnFieldDef.fieldUsage) === null || _a === void 0 ? void 0 : _a.map(u => {
+            refSummary: (0, malloy_types_1.mapFieldUsage)(returnFieldDef.refSummary, u => {
                 var _a;
                 return ({
                     ...u,

package/dist/lang/ast/field-space/struct-space-field-base.js

@@ -75,20 +75,19 @@ class StructSpaceFieldBase extends space_field_1.SpaceField {
         };
     }
     typeDesc() {
-        var _a, _b;
         if ((0, malloy_types_1.isSourceDef)(this.structDef)) {
             return {
                 type: this.structDef.type,
                 evalSpace: 'input',
                 expressionType: 'scalar',
-                fieldUsage: (_a = this.structDef.fieldUsage) !== null && _a !== void 0 ? _a : [],
+                refSummary: this.structDef.refSummary,
             };
         }
         return {
             ...TDU.atomicDef(this.structDef),
             evalSpace: 'input',
             expressionType: 'scalar',
-            fieldUsage: (_b = this.structDef.fieldUsage) !== null && _b !== void 0 ? _b : [],
+            refSummary: this.structDef.refSummary,
         };
     }
 }

package/dist/lang/ast/index.d.ts

@@ -70,6 +70,8 @@ export * from './statements/import-statement';
 export * from './query-properties/extend';
 export * from './parameters/argument';
 export * from './parameters/has-parameter';
+export * from './statements/define-given';
+export * from './expressions/expr-given';
 export * from './query-elements/anonymous-query';
 export * from './query-elements/query-refine';
 export * from './query-elements/query-arrow';

package/dist/lang/ast/index.js

@@ -108,6 +108,8 @@ __exportStar(require("./statements/import-statement"), exports);
 __exportStar(require("./query-properties/extend"), exports);
 __exportStar(require("./parameters/argument"), exports);
 __exportStar(require("./parameters/has-parameter"), exports);
+__exportStar(require("./statements/define-given"), exports);
+__exportStar(require("./expressions/expr-given"), exports);
 __exportStar(require("./query-elements/anonymous-query"), exports);
 __exportStar(require("./query-elements/query-refine"), exports);
 __exportStar(require("./query-elements/query-arrow"), exports);

package/dist/lang/ast/query-builders/index-builder.d.ts

@@ -19,6 +19,6 @@ export declare class IndexBuilder implements QueryBuilder {
     readonly type = "index";
     constructor(inputFS: SourceFieldSpace, refineThis: PipeSegment | undefined, isNestIn: QueryOperationSpace | undefined, astEl: MalloyElement);
     execute(qp: QueryProperty): void;
-    get fieldUsage(): FieldUsage[];
+    get fieldUsage(): FieldUsage;
     finalize(from: PipeSegment | undefined): PipeSegment;
 }

package/dist/lang/ast/query-builders/index-builder.js

@@ -102,16 +102,17 @@ class IndexBuilder {
             indexSegment.alwaysJoins = [...this.alwaysJoins];
         }
         const fromFieldUsage = from && from.type === 'index'
-            ? (_a = from.fieldUsage) !== null && _a !== void 0 ? _a : (0, composite_source_utils_1.emptyFieldUsage)()
+            ? (0, malloy_types_1.fieldUsageFrom)(from.refSummary)
             : (0, composite_source_utils_1.emptyFieldUsage)();
-        indexSegment.fieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(fromFieldUsage, this.fieldUsage);
+        const fieldUsage = (_a = (0, composite_source_utils_1.mergeFieldUsage)(fromFieldUsage, this.fieldUsage)) !== null && _a !== void 0 ? _a : [];
         // Index queries always compute an aggregate for weight (at minimum COUNT(*)).
         // The compiler needs a uniqueKeyRequirement on the base path so that
         // symmetric aggregation is enabled when joins are present.
-        indexSegment.fieldUsage.push({
+        fieldUsage.push({
             path: [],
             uniqueKeyRequirement: { isCount: true },
         });
+        (0, malloy_types_1.setFieldUsage)(indexSegment, fieldUsage);
         return indexSegment;
     }
 }

package/dist/lang/ast/query-builders/reduce-builder.d.ts

@@ -1,4 +1,4 @@
-import type { FieldUsage, FilterCondition, PipeSegment, QuerySegment } from '../../../model/malloy_types';
+import type { FilterCondition, PipeSegment, QuerySegment, RefSummary } from '../../../model/malloy_types';
 import type { SourceFieldSpace } from '../types/field-space';
 import { Ordering } from '../query-properties/ordering';
 import type { QueryProperty } from '../types/query-property';
@@ -18,7 +18,7 @@ export declare abstract class QuerySegmentBuilder implements QueryBuilder {
     filters: FilterCondition[];
     execute(qp: QueryProperty): void;
     abstract finalize(fromSeg: PipeSegment | undefined): PipeSegment;
-    get fieldUsage(): FieldUsage[];
+    get refSummary(): RefSummary | undefined;
     refineFrom(from: PipeSegment | undefined, to: QuerySegment): void;
 }
 export declare class ReduceBuilder extends QuerySegmentBuilder implements QueryBuilder {

package/dist/lang/ast/query-builders/reduce-builder.js

@@ -68,11 +68,10 @@ class QuerySegmentBuilder {
             }
         }
     }
-    get fieldUsage() {
-        return this.resultFS.fieldUsage;
+    get refSummary() {
+        return this.resultFS.refSummary;
     }
     refineFrom(from, to) {
-        var _a;
         if (from && from.type !== 'index' && from.type !== 'raw') {
             if (!this.limit && from.orderBy && !from.defaultOrderBy) {
                 to.orderBy = from.orderBy;
@@ -99,8 +98,8 @@ class QuerySegmentBuilder {
         if (this.alwaysJoins.length > 0) {
             to.alwaysJoins = [...this.alwaysJoins];
         }
-        const fromFieldUsage = from && (0, malloy_types_1.isQuerySegment)(from) ? (_a = from.fieldUsage) !== null && _a !== void 0 ? _a : [] : [];
-        to.fieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(fromFieldUsage, this.fieldUsage);
+        const fromRefSummary = from && (0, malloy_types_1.isQuerySegment)(from) ? from.refSummary : undefined;
+        to.refSummary = (0, composite_source_utils_1.mergeRefSummaries)(fromRefSummary, this.refSummary);
     }
 }
 exports.QuerySegmentBuilder = QuerySegmentBuilder;

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

@@ -89,9 +89,9 @@ class QueryArrow extends query_base_1.QueryBase {
         const pipelineWithExpandedFieldUsage = [
             // The base query (if it exists) will already have its `expandedFieldUsage` computed
             ...queryBase.pipeline,
-            ...this.expandFieldUsage(this.source instanceof source_1.Source
+            ...this.expandRefUsage(this.source instanceof source_1.Source
                 ? // If `source ->` then use the composite resolved struct,
-                    compositeResolvedSourceDef !== null && compositeResolvedSourceDef !== void 0 ? compositeResolvedSourceDef : inputStruct
+                    (compositeResolvedSourceDef !== null && compositeResolvedSourceDef !== void 0 ? compositeResolvedSourceDef : inputStruct)
                 : // Otherwise just use the `inputStruct`
                     inputStruct, rhsPipeline),
         ];
@@ -100,6 +100,7 @@ class QueryArrow extends query_base_1.QueryBase {
                 ...query,
                 compositeResolvedSourceDef,
                 pipeline: pipelineWithExpandedFieldUsage,
+                givenUsage: (0, composite_source_utils_1.computeQueryGivenUsage)(pipelineWithExpandedFieldUsage),
             },
             outputStruct,
             inputStruct,

package/dist/lang/ast/query-elements/query-base.d.ts

@@ -3,7 +3,7 @@ import { MalloyElement } from '../types/malloy-element';
 import type { QueryComp } from '../types/query-comp';
 export declare abstract class QueryBase extends MalloyElement {
     abstract queryComp(isRefOk: boolean): QueryComp;
-    protected expandFieldUsage(inputSource: SourceDef, pipeline: PipeSegment[]): PipeSegment[];
+    protected expandRefUsage(inputSource: SourceDef, pipeline: PipeSegment[]): PipeSegment[];
     protected resolveCompositeSource(inputSource: SourceDef, pipeline: PipeSegment[]): SourceDef | undefined;
     query(isRefOk?: boolean): Query;
 }

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

@@ -29,7 +29,7 @@ const error_factory_1 = require("../error-factory");
 const query_utils_1 = require("../query-utils");
 const malloy_element_1 = require("../types/malloy-element");
 class QueryBase extends malloy_element_1.MalloyElement {
-    expandFieldUsage(inputSource, pipeline) {
+    expandRefUsage(inputSource, pipeline) {
         const ret = [];
         let stageInput = inputSource;
         for (const segment of pipeline) {

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

@@ -25,6 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryRefine = void 0;
 const static_space_1 = require("../field-space/static-space");
 const query_base_1 = require("./query-base");
+const composite_source_utils_1 = require("../../composite-source-utils");
 /**
  * A query operation that consists of an exisitng query with refinements.
  *
@@ -46,12 +47,13 @@ class QueryRefine extends query_base_1.QueryBase {
             pipeline,
         };
         const compositeResolvedSourceDef = this.resolveCompositeSource(q.inputStruct, pipeline);
-        const pipelineWithExpandedFieldUsage = this.expandFieldUsage(compositeResolvedSourceDef !== null && compositeResolvedSourceDef !== void 0 ? compositeResolvedSourceDef : q.inputStruct, pipeline);
+        const pipelineWithExpandedFieldUsage = this.expandRefUsage(compositeResolvedSourceDef !== null && compositeResolvedSourceDef !== void 0 ? compositeResolvedSourceDef : q.inputStruct, pipeline);
         return {
             query: {
                 ...query,
                 compositeResolvedSourceDef,
                 pipeline: pipelineWithExpandedFieldUsage,
+                givenUsage: (0, composite_source_utils_1.computeQueryGivenUsage)(pipelineWithExpandedFieldUsage),
             },
             // TODO bleh
             outputStruct: pipeline[pipeline.length - 1].outputStruct,

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

@@ -118,7 +118,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
                 value: exprValue.value,
                 expressionType: exprValue.expressionType,
                 evalSpace: exprValue.evalSpace,
-                fieldUsage: exprValue.fieldUsage,
+                refSummary: exprValue.refSummary,
                 requiresGroupBy: exprValue.requiresGroupBy,
             };
             exprValue = nullAsNumber;
@@ -147,7 +147,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
                 ret.e = exprValue.value;
             }
             ret.drillExpression = this.expr.drillExpression();
-            ret.fieldUsage = exprValue.fieldUsage;
+            ret.refSummary = exprValue.refSummary;
             ret.ungroupings = exprValue.ungroupings;
             ret.requiresGroupBy = exprValue.requiresGroupBy;
             if (exprValue.expressionType) {

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

@@ -43,7 +43,7 @@ class Drill extends filters_1.Filter {
         this.queryRefinementStage = query_property_interface_1.LegalRefinementStage.Head;
     }
     checkedDrillCondition(fs, filter, reference, value) {
-        var _a, _b, _c;
+        var _a, _b;
         const permissiveFS = new permissive_space_1.PermissiveSpace(fs);
         const normalLookup = fs.lookup(reference.list);
         if (normalLookup.found) {
@@ -144,7 +144,7 @@ class Drill extends filters_1.Filter {
                         continue;
                     if (collectedWheres === undefined) {
                         collectedWheres = filter.e;
-                        collectedWhereFieldUsage = filter.fieldUsage;
+                        collectedWhereFieldUsage = (0, malloy_types_1.fieldUsageFrom)(filter.refSummary);
                     }
                     else {
                         collectedWheres = {
@@ -154,7 +154,7 @@ class Drill extends filters_1.Filter {
                                 right: filter.e,
                             },
                         };
-                        collectedWhereFieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(collectedWhereFieldUsage, filter.fieldUsage);
+                        collectedWhereFieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(collectedWhereFieldUsage, (0, malloy_types_1.fieldUsageFrom)(filter.refSummary));
                     }
                 }
             }
@@ -272,7 +272,7 @@ class Drill extends filters_1.Filter {
             ...fieldDef,
             evalSpace: 'output',
             expressionType: (_b = fieldDef.expressionType) !== null && _b !== void 0 ? _b : 'scalar',
-            fieldUsage: (_c = fieldDef.fieldUsage) !== null && _c !== void 0 ? _c : [],
+            refSummary: fieldDef.refSummary,
         });
         filter.has({ drillField });
         const fExpression = new expr_compare_1.ExprCompare(drillField, '=', value);
@@ -290,7 +290,7 @@ class Drill extends filters_1.Filter {
                     kids: { left: collectedWheres, right: fExpr.value },
                 },
             expressionType: fExpr.expressionType,
-            fieldUsage: (0, composite_source_utils_1.mergeFieldUsage)(fExpr.fieldUsage, collectedWhereFieldUsage),
+            refSummary: (0, composite_source_utils_1.mergeRefSummaries)(fExpr.refSummary, (0, malloy_types_1.mkRefSummary)({ fieldUsage: collectedWhereFieldUsage })),
             stableFilter: {
                 kind: 'literal_equality',
                 expression: {
@@ -364,7 +364,7 @@ function attachDrillPaths(pipeline, nestName) {
                 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;
+                const fieldName = f.type === 'fieldref' ? f.path[f.path.length - 1] : ((_a = f.as) !== null && _a !== void 0 ? _a : f.name);
                 return {
                     ...f,
                     drillExpression: {

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

@@ -74,7 +74,7 @@ class FilterElement extends malloy_element_1.MalloyElement {
                 code: this.exprSrc,
                 e: { node: 'false' },
                 expressionType: 'scalar',
-                fieldUsage: exprVal.fieldUsage,
+                refSummary: exprVal.refSummary,
                 isSourceFilter: false,
             };
         }
@@ -84,7 +84,7 @@ class FilterElement extends malloy_element_1.MalloyElement {
             code: this.exprSrc,
             e: exprVal.value,
             expressionType: exprVal.expressionType,
-            fieldUsage: exprVal.fieldUsage,
+            refSummary: exprVal.refSummary,
             stableFilter,
             isSourceFilter: false,
         };

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

@@ -77,8 +77,8 @@ class NestFieldDeclaration extends view_field_declaration_1.ViewFieldDeclaration
             return this.turtleDef;
         if (fs.isQueryFieldSpace()) {
             const { pipeline, annotation } = this.view.pipelineComp(fs, fs.outputSpace());
-            const fieldUsage = pipeline[0] && model.isQuerySegment(pipeline[0])
-                ? pipeline[0].fieldUsage
+            const refSummary = pipeline[0] && model.isQuerySegment(pipeline[0])
+                ? pipeline[0].refSummary
                 : undefined;
             const checkedPipeline = (0, query_utils_1.detectAndRemovePartialStages)(pipeline, this);
             const pipelineWithDrillPaths = (0, drill_1.attachDrillPaths)(checkedPipeline, this.name);
@@ -88,7 +88,7 @@ class NestFieldDeclaration extends view_field_declaration_1.ViewFieldDeclaration
                 pipeline: pipelineWithDrillPaths,
                 annotation: { ...this.note, inherits: annotation },
                 location: this.location,
-                fieldUsage,
+                refSummary,
             };
             return this.turtleDef;
         }

package/dist/lang/ast/source-elements/composite-source.js

@@ -92,9 +92,11 @@ function composeSources(sources, compositeCodeSource) {
                         name: fieldName,
                         as: undefined,
                         e: { node: 'compositeField' },
-                        fieldUsage: [
-                            { path: [fieldName], at: compositeCodeSource.codeLocation },
-                        ],
+                        refSummary: {
+                            fieldUsage: [
+                                { path: [fieldName], at: compositeCodeSource.codeLocation },
+                            ],
+                        },
                         code: undefined,
                         location: compositeCodeSource.codeLocation,
                         // A composite field's grouping may differ from slice to slice

package/dist/lang/ast/source-elements/named-source.js

@@ -103,6 +103,10 @@ class NamedSource extends source_1.Source {
             this.logError('invalid-source-from-user-type', `Cannot construct a source from a user type '${this.refName}'`);
             return;
         }
+        else if (entry.type === 'given') {
+            this.logError('invalid-source-from-given', `Cannot construct a source from given '${this.refName}'`);
+            return;
+        }
         else {
             (_a = this.document()) === null || _a === void 0 ? void 0 : _a.checkExperimentalDialect(this, entry.dialect);
             if ((0, malloy_types_1.isSourceDef)(entry)) {

package/dist/lang/ast/source-elements/sql-source.js

@@ -125,7 +125,7 @@ class SQLSource extends source_1.Source {
         }
         else if (lookup.status === 'present') {
             const location = this.select.location;
-            // Create a base struct with updated fields (adding location and fieldUsage)
+            // Create a base struct with updated fields (adding location and refSummary)
             const baseStruct = {
                 ...lookup.value,
                 fields: lookup.value.fields.map(f => {
@@ -133,7 +133,7 @@ class SQLSource extends source_1.Source {
                     return ({
                         ...f,
                         location,
-                        fieldUsage: [{ path: [(_a = f.as) !== null && _a !== void 0 ? _a : f.name], at: location }],
+                        refSummary: { fieldUsage: [{ path: [(_a = f.as) !== null && _a !== void 0 ? _a : f.name], at: location }] },
                     });
                 }),
                 location: this.location,

package/dist/lang/ast/source-elements/table-source.js

@@ -51,7 +51,9 @@ class TableSource extends source_1.Source {
                         return ({
                             ...field,
                             location: this.location,
-                            fieldUsage: [{ path: [(_a = field.as) !== null && _a !== void 0 ? _a : field.name], at: this.location }],
+                            refSummary: {
+                                fieldUsage: [{ path: [(_a = field.as) !== null && _a !== void 0 ? _a : field.name], at: this.location }],
+                            },
                         });
                     }),
                     location: this.location,

package/dist/lang/ast/source-properties/join.js

@@ -101,9 +101,9 @@ class KeyJoin extends Join {
                             right: exprX.value,
                         },
                     };
-                    inStruct.fieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(exprX.fieldUsage, [
-                        { path: keyPath },
-                    ]);
+                    inStruct.refSummary = (0, composite_source_utils_1.mergeRefSummaries)(exprX.refSummary, {
+                        fieldUsage: [{ path: keyPath }],
+                    });
                     return;
                 }
                 else {
@@ -146,7 +146,7 @@ class ExpressionJoin extends Join {
             return;
         }
         inStruct.onExpression = exprX.value;
-        inStruct.fieldUsage = exprX.fieldUsage;
+        inStruct.refSummary = exprX.refSummary;
     }
     getStructDef(parameterSpace) {
         var _a;

package/dist/lang/ast/source-query-elements/sq-reference.js

@@ -52,7 +52,8 @@ class SQReference extends source_query_element_1.SourceQueryElement {
                 return query;
             }
             else {
-                this.sqLog('cannot-use-as-query', `Illegal reference to '${entry.as || entry.name}', query expected`);
+                const label = entry.type === 'given' ? entry.name : entry.as || entry.name;
+                this.sqLog('cannot-use-as-query', `Illegal reference to '${label}', query expected`);
             }
         }
         else {

package/dist/lang/ast/statements/define-given.d.ts

@@ -0,0 +1,23 @@
+import type { Annotation, GivenTypeDef } from '../../../model/malloy_types';
+import type { ConstantExpression } from '../expressions/constant-expression';
+import type { DocStatement, Document } from '../types/malloy-element';
+import { DocStatementList, MalloyElement } from '../types/malloy-element';
+import type { Noteable } from '../types/noteable';
+import { extendNoteMethod } from '../types/noteable';
+export declare class GivenDeclaration extends MalloyElement implements DocStatement, Noteable {
+    readonly name: string;
+    readonly typeDef: GivenTypeDef;
+    elementType: string;
+    readonly isNoteableObj = true;
+    extendNote: typeof extendNoteMethod;
+    note?: Annotation;
+    readonly default?: ConstantExpression;
+    constructor(name: string, typeDef: GivenTypeDef, defaultExpr?: ConstantExpression);
+    protected varInfo(): string;
+    execute(doc: Document): void;
+}
+export declare class DefineGivens extends DocStatementList {
+    elementType: string;
+    readonly givens: GivenDeclaration[];
+    constructor(givens: GivenDeclaration[]);
+}