@malloydata/malloy 0.0.304 → 0.0.305

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

@@ -64,7 +64,7 @@ const field_references_1 = require("../query-items/field-references");
 const refined_space_1 = require("./refined-space");
 const static_space_1 = require("./static-space");
 const query_input_space_1 = require("./query-input-space");
-const composite_source_utils_1 = require("../../../model/composite_source_utils");
+const composite_source_utils_1 = require("../../composite-source-utils");
 const error_factory_1 = require("../error-factory");
 const reference_field_1 = require("./reference-field");
 const refine_from_space_field_1 = require("./refine-from-space-field");
@@ -245,10 +245,18 @@ class QuerySpace extends QueryOperationSpace {
         return fields.map(f => f.queryFieldDef);
     }
     getOutputFieldDef(queryFieldDef, typeDesc) {
-        var _a, _b;
-        const name = queryFieldDef.type === 'fieldref'
-            ? queryFieldDef.path[queryFieldDef.path.length - 1]
-            : (_a = queryFieldDef.as) !== null && _a !== void 0 ? _a : queryFieldDef.name;
+        var _a, _b, _c;
+        let location = undefined;
+        let name;
+        if (queryFieldDef.type === 'fieldref') {
+            name = queryFieldDef.path[queryFieldDef.path.length - 1];
+            location = queryFieldDef.at;
+        }
+        else {
+            name = (_a = queryFieldDef.as) !== null && _a !== void 0 ? _a : queryFieldDef.name;
+            location = queryFieldDef.location;
+        }
+        let ret;
         if (typeDesc.type === 'turtle') {
             const pipeline = typeDesc.pipeline;
             const lastSegment = pipeline[pipeline.length - 1];
@@ -259,7 +267,7 @@ class QuerySpace extends QueryOperationSpace {
                     : true
                 : true;
             if (isRepeated) {
-                return {
+                ret = {
                     ...outputStruct,
                     elementTypeDef: { type: 'record_element' },
                     name: name,
@@ -269,7 +277,7 @@ class QuerySpace extends QueryOperationSpace {
                 };
             }
             else {
-                return {
+                ret = {
                     ...outputStruct,
                     name: name,
                     type: 'record',
@@ -279,16 +287,17 @@ class QuerySpace extends QueryOperationSpace {
             }
         }
         else if (model.TD.isAtomic(typeDesc)) {
-            const td = model.mkFieldDef(typeDesc, name);
-            return {
-                ...td,
+            ret = {
+                ...model.mkFieldDef(typeDesc, name),
                 expressionType: 'scalar',
-                e: undefined,
+                location,
             };
         }
         else {
             throw new Error('Invalid type for fieldref');
         }
+        ret.location = (_c = ret.location) !== null && _c !== void 0 ? _c : this.astEl.location;
+        return ret;
     }
     // Gets the primary key field for the output struct of this query;
     // If there is exactly one scalar field, that is the primary key

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

@@ -30,7 +30,7 @@ const indexing_1 = require("../query-properties/indexing");
 const limit_1 = require("../query-properties/limit");
 const sampling_1 = require("../query-properties/sampling");
 const index_field_space_1 = require("../field-space/index-field-space");
-const composite_source_utils_1 = require("../../../model/composite_source_utils");
+const composite_source_utils_1 = require("../../composite-source-utils");
 class IndexBuilder {
     constructor(inputFS, refineThis, isNestIn, astEl) {
         this.filters = [];

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

@@ -30,7 +30,7 @@ const limit_1 = require("../query-properties/limit");
 const ordering_1 = require("../query-properties/ordering");
 const query_spaces_1 = require("../field-space/query-spaces");
 const definition_list_1 = require("../types/definition-list");
-const composite_source_utils_1 = require("../../../model/composite_source_utils");
+const composite_source_utils_1 = require("../../composite-source-utils");
 function queryFieldName(qf) {
     if (qf.type === 'fieldref') {
         return qf.path[qf.path.length - 1];

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

@@ -27,7 +27,7 @@ const malloy_types_1 = require("../../../model/malloy_types");
 const source_1 = require("../source-elements/source");
 const static_space_1 = require("../field-space/static-space");
 const query_base_1 = require("./query-base");
-const composite_source_utils_1 = require("../../../model/composite_source_utils");
+const composite_source_utils_1 = require("../../composite-source-utils");
 /**
  * A query operation that adds segments to a LHS source or query.
  *
@@ -69,14 +69,14 @@ class QueryArrow extends query_base_1.QueryBase {
             inputStruct = lhsQuery.outputStruct;
             fieldSpace = new static_space_1.StaticSourceSpace(lhsQuery.outputStruct, 'public');
         }
-        const { pipeline, annotation, outputStruct, name } = this.view.pipelineComp(fieldSpace);
+        const { pipeline: rhsPipeline, annotation, outputStruct, name, } = this.view.pipelineComp(fieldSpace);
         const query = {
             ...queryBase,
             name,
             annotation,
-            pipeline: [...queryBase.pipeline, ...pipeline],
+            pipeline: [...queryBase.pipeline, ...rhsPipeline],
         };
-        const compositeResolvedSourceDef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : this.resolveCompositeSource(inputStruct, pipeline);
+        const compositeResolvedSourceDef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : this.resolveCompositeSource(inputStruct, rhsPipeline);
         const segment = query.pipeline[0];
         if (segment !== undefined) {
             const unsatisfiedGroupBys = (0, composite_source_utils_1.checkRequiredGroupBys)(compositeResolvedSourceDef !== null && compositeResolvedSourceDef !== void 0 ? compositeResolvedSourceDef : inputStruct, segment);
@@ -86,10 +86,20 @@ 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
+                ? // If `source ->` then use the composite resolved struct,
+                    compositeResolvedSourceDef !== null && compositeResolvedSourceDef !== void 0 ? compositeResolvedSourceDef : inputStruct
+                : // Otherwise just use the `inputStruct`
+                    inputStruct, rhsPipeline),
+        ];
         return {
             query: {
                 ...query,
                 compositeResolvedSourceDef,
+                pipeline: pipelineWithExpandedFieldUsage,
             },
             outputStruct,
             inputStruct,

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

@@ -3,6 +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 resolveCompositeSource(inputSource: SourceDef, pipeline: PipeSegment[]): SourceDef | undefined;
     query(): Query;
 }

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

@@ -23,13 +23,24 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryBase = void 0;
-const composite_source_utils_1 = require("../../../model/composite_source_utils");
+const composite_source_utils_1 = require("../../composite-source-utils");
 const malloy_types_1 = require("../../../model/malloy_types");
+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) {
+        const ret = [];
+        let stageInput = inputSource;
+        for (const segment of pipeline) {
+            const newSegment = (0, composite_source_utils_1.getExpandedSegment)(segment, stageInput);
+            ret.push(newSegment);
+            // Get the output struct for the next stage
+            stageInput = newSegment.outputStruct || error_factory_1.ErrorFactory.structDef;
+        }
+        return ret;
+    }
     resolveCompositeSource(inputSource, pipeline) {
-        var _a;
         const stage1 = pipeline[0];
         if (stage1 === undefined)
             return undefined;
@@ -38,8 +49,7 @@ class QueryBase extends malloy_element_1.MalloyElement {
         // which hides the fact that this code doesn't handle sources in `extend:`.
         if (((0, malloy_types_1.isQuerySegment)(stage1) || (0, malloy_types_1.isIndexSegment)(stage1)) &&
             (0, composite_source_utils_1.hasCompositesAnywhere)(inputSource)) {
-            const fieldUsage = (_a = stage1.fieldUsage) !== null && _a !== void 0 ? _a : (0, composite_source_utils_1.emptyFieldUsage)();
-            const resolved = (0, composite_source_utils_1.resolveCompositeSources)(inputSource, stage1, fieldUsage);
+            const resolved = (0, composite_source_utils_1.resolveCompositeSources)(inputSource, stage1);
             if (resolved.error) {
                 (0, composite_source_utils_1.logCompositeError)(resolved.error, this);
             }

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

@@ -46,10 +46,12 @@ 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);
         return {
             query: {
                 ...query,
                 compositeResolvedSourceDef,
+                pipeline: pipelineWithExpandedFieldUsage,
             },
             // TODO bleh
             outputStruct: pipeline[pipeline.length - 1].outputStruct,

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

@@ -9,7 +9,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 composite_source_utils_1 = require("../../composite-source-utils");
 const malloy_types_1 = require("../../../model/malloy_types");
 const utils_1 = require("../../utils");
 const expr_compare_1 = require("../expressions/expr-compare");

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

@@ -30,6 +30,7 @@ const malloy_element_1 = require("../types/malloy-element");
 const noteable_1 = require("../types/noteable");
 const error_factory_1 = require("../error-factory");
 const query_property_interface_1 = require("../types/query-property-interface");
+const composite_source_utils_1 = require("../../composite-source-utils");
 class Join extends malloy_element_1.MalloyElement {
     constructor() {
         super(...arguments);
@@ -87,19 +88,22 @@ class KeyJoin extends Join {
             const pkey = inStruct.fields.find(f => (f.as || f.name) === inStruct.primaryKey);
             if (pkey) {
                 if (pkey.type === exprX.type) {
+                    const keyPath = [this.name.refString, inStruct.primaryKey];
                     inStruct.join = 'one';
                     inStruct.onExpression = {
                         node: '=',
                         kids: {
                             left: {
                                 node: 'field',
-                                path: [this.name.refString, inStruct.primaryKey],
+                                path: keyPath,
                                 at: this.keyExpr.location,
                             },
                             right: exprX.value,
                         },
                     };
-                    inStruct.fieldUsage = exprX.fieldUsage;
+                    inStruct.fieldUsage = (0, composite_source_utils_1.mergeFieldUsage)(exprX.fieldUsage, [
+                        { path: keyPath },
+                    ]);
                     return;
                 }
                 else {

package/dist/lang/ast/statements/define-source.js

@@ -26,7 +26,7 @@ exports.DefineSourceList = exports.DefineSource = void 0;
 const error_factory_1 = require("../error-factory");
 const malloy_element_1 = require("../types/malloy-element");
 const noteable_1 = require("../types/noteable");
-const composite_source_utils_1 = require("../../../model/composite_source_utils");
+const composite_source_utils_1 = require("../../composite-source-utils");
 class DefineSource extends malloy_element_1.MalloyElement {
     constructor(name, sourceExpr, exported, parameters) {
         super();

package/dist/lang/ast/types/expr-value.js

@@ -30,7 +30,7 @@ exports.literalTimeResult = literalTimeResult;
 exports.mergeGroupedBys = mergeGroupedBys;
 exports.mergeUngroupings = mergeUngroupings;
 const model_1 = require("../../../model");
-const composite_source_utils_1 = require("../../../model/composite_source_utils");
+const composite_source_utils_1 = require("../../composite-source-utils");
 function computedExprValue({ value, dataType, from, }) {
     return {
         ...dataType,

package/dist/lang/ast/view-elements/reference-view.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferenceView = void 0;
+const composite_source_utils_1 = require("../../composite-source-utils");
 const malloy_types_1 = require("../../../model/malloy_types");
 const error_factory_1 = require("../error-factory");
 const drill_1 = require("../query-properties/drill");
@@ -82,7 +83,9 @@ class ReferenceView extends view_1.View {
             const newSegment = {
                 type: 'reduce',
                 queryFields: [this.reference.refToField],
-                fieldUsage: fieldDef.fieldUsage,
+                fieldUsage: (0, composite_source_utils_1.mergeFieldUsage)(fieldDef.fieldUsage, [
+                    { path: this.reference.refToField.path, at: this.reference.location },
+                ]),
                 outputStruct,
                 // An atomic lens results in a array segment if it is a scalar
                 isRepeated: (0, malloy_types_1.expressionIsScalar)(fieldDef.expressionType),

package/dist/lang/ast/view-elements/refine-utils.js

@@ -24,7 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refine = refine;
 const model_1 = require("../../../model");
-const composite_source_utils_1 = require("../../../model/composite_source_utils");
+const composite_source_utils_1 = require("../../composite-source-utils");
 const field_utils_1 = require("../../field-utils");
 function refine(logTo, refineTo, refineFrom) {
     var _a, _b;

package/dist/{model/composite_source_utils.d.ts → lang/composite-source-utils.d.ts}

@@ -1,6 +1,5 @@
-import type { BooleanFilter, NumberFilter, StringFilter, TemporalFilter } from '@malloydata/malloy-filter';
-import type { MalloyElement } from '../lang/ast';
-import type { FieldUsage, PipeSegment, SourceDef, Expr, RequiredGroupBy, Annotation, PartitionCompositeDesc, StructDef } from './malloy_types';
+import type { MalloyElement } from './ast';
+import type { FieldUsage, PipeSegment, SourceDef, RequiredGroupBy, Annotation, PartitionCompositeDesc, StructDef } from '../model/malloy_types';
 type CompositeCouldNotFindFieldError = {
     code: 'could_not_find_field';
     data: {
@@ -51,6 +50,7 @@ interface CompositeFailure {
     source: SourceDef;
     issues: CompositeIssue[];
 }
+export declare function getExpandedSegment(segment: PipeSegment, inputSource: SourceDef): PipeSegment;
 export declare function getPartitionCompositeDesc(annotation: Annotation | undefined, structDef: StructDef, logTo: MalloyElement): PartitionCompositeDesc | undefined;
 type SingleNarrowedCompositeFieldResolution = {
     source: SourceDef;
@@ -63,7 +63,7 @@ export interface NarrowedCompositeFieldResolution {
     source: SingleNarrowedCompositeFieldResolution | undefined;
     joined: NarrowedCompositeFieldResolutionByJoinName;
 }
-export declare function resolveCompositeSources(source: SourceDef, segment: PipeSegment, fieldUsage: FieldUsage[]): {
+export declare function resolveCompositeSources(source: SourceDef, segment: PipeSegment): {
     sourceDef: SourceDef | undefined;
     error: undefined;
 } | {
@@ -87,17 +87,4 @@ export declare function pathEq(a: string[], b: string[]): boolean;
 export declare function pathBegins(path: string[], prefix: string[]): boolean;
 export declare function hasCompositesAnywhere(source: SourceDef): boolean;
 export declare function logCompositeError(error: CompositeError, logTo: MalloyElement): void;
-export declare function compileFilterExpression(ft: string, fexpr: Expr): {
-    kind: 'date' | 'timestamp';
-    parsed: TemporalFilter;
-} | {
-    kind: 'string';
-    parsed: StringFilter;
-} | {
-    kind: 'boolean';
-    parsed: BooleanFilter;
-} | {
-    kind: 'number';
-    parsed: NumberFilter;
-} | undefined;
 export {};