@malloydata/malloy 0.0.195-dev241003204905 → 0.0.195-dev241007154000

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

@@ -13,6 +13,7 @@ export declare class ParameterSpace implements FieldSpace {
     entry(name: string): SpaceEntry | undefined;
     lookup(symbol: FieldName[]): LookupResult;
     entries(): [string, SpaceEntry][];
+    dialectName(): string;
     dialectObj(): Dialect | undefined;
     isQueryFieldSpace(): this is QueryFieldSpace;
 }

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

@@ -60,13 +60,16 @@ class ParameterSpace {
         return {
             found: entry,
             error: undefined,
-            relationship: [],
+            joinPath: [],
             isOutputField: false,
         };
     }
     entries() {
         return Object.entries(this._map);
     }
+    dialectName() {
+        return '~parameter-space-unknown-dialect~';
+    }
     dialectObj() {
         return undefined;
     }

package/dist/lang/ast/field-space/query-input-space.d.ts

@@ -5,9 +5,9 @@
  * expressions in the query is called the "input space". There is a
  * specialized QuerySpace for each type of query operation.
  */
+import { SourceDef } from '../../../model';
 import { AtomicFieldDeclaration } from '../query-items/field-declaration';
-import { Join } from '../source-properties/joins';
-import { SourceSpec } from '../space-seed';
+import { Join } from '../source-properties/join';
 import { QueryFieldSpace } from '../types/field-space';
 import { QueryOperationSpace } from './query-spaces';
 import { RefinedSpace } from './refined-space';
@@ -20,9 +20,9 @@ export declare class QueryInputSpace extends RefinedSpace implements QueryFieldS
      * @param input The source which might be extended
      * @param queryOutput MUST BE A QuerySpace
      */
-    constructor(input: SourceSpec, queryOutput: QueryOperationSpace);
+    constructor(input: SourceDef, queryOutput: QueryOperationSpace);
     extendSource(extendField: Join | AtomicFieldDeclaration): void;
-    isQueryFieldSpace(): boolean;
+    isQueryFieldSpace(): this is QueryFieldSpace;
     outputSpace(): QueryOperationSpace;
     inputSpace(): this;
 }

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

@@ -23,8 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryInputSpace = void 0;
-const joins_1 = require("../source-properties/joins");
-const space_seed_1 = require("../space-seed");
+const join_1 = require("../source-properties/join");
 const refined_space_1 = require("./refined-space");
 class QueryInputSpace extends refined_space_1.RefinedSpace {
     /**
@@ -34,14 +33,13 @@ class QueryInputSpace extends refined_space_1.RefinedSpace {
      * @param queryOutput MUST BE A QuerySpace
      */
     constructor(input, queryOutput) {
-        const inputSpace = new space_seed_1.SpaceSeed(input);
-        super(inputSpace.structDef);
+        super(input);
         this.queryOutput = queryOutput;
         this.extendList = [];
     }
     extendSource(extendField) {
         this.pushFields(extendField);
-        if (extendField instanceof joins_1.Join) {
+        if (extendField instanceof join_1.Join) {
             this.extendList.push(extendField.name.refString);
         }
         else {

package/dist/lang/ast/field-space/query-spaces.d.ts

@@ -1,5 +1,5 @@
 import * as model from '../../../model/malloy_types';
-import { FieldName, FieldSpace, QueryFieldSpace } from '../types/field-space';
+import { FieldName, QueryFieldSpace, SourceFieldSpace } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
 import { WildcardFieldReference } from '../query-items/field-references';
 import { RefinedSpace } from './refined-space';
@@ -13,13 +13,13 @@ import { LogMessageOptions, MessageCode, MessageParameterType } from '../../pars
  * created and paired when a QueryOperationSpace is created.
  */
 export declare abstract class QueryOperationSpace extends RefinedSpace implements QueryFieldSpace {
-    readonly queryInputSpace: FieldSpace;
+    readonly queryInputSpace: SourceFieldSpace;
     readonly nestParent: QueryOperationSpace | undefined;
     readonly astEl: MalloyElement;
     protected exprSpace: QueryInputSpace;
     abstract readonly segmentType: 'reduce' | 'project' | 'index';
     expandedWild: Record<string, string[]>;
-    constructor(queryInputSpace: FieldSpace, refineThis: model.PipeSegment | undefined, nestParent: QueryOperationSpace | undefined, astEl: MalloyElement);
+    constructor(queryInputSpace: SourceFieldSpace, refineThis: model.PipeSegment | undefined, nestParent: QueryOperationSpace | undefined, astEl: MalloyElement);
     abstract addRefineFromFields(refineThis: model.PipeSegment): void;
     logError<T extends MessageCode>(code: T, parameters: MessageParameterType<T>, options?: Omit<LogMessageOptions, 'severity'>): T;
     inputSpace(): QueryInputSpace;
@@ -34,7 +34,7 @@ export declare abstract class QuerySpace extends QueryOperationSpace {
     getQuerySegment(rf: model.QuerySegment | undefined): model.QuerySegment;
     getPipeSegment(refineFrom: model.QuerySegment | undefined): model.PipeSegment;
     lookup(path: FieldName[]): LookupResult;
-    isQueryFieldSpace(): boolean;
+    isQueryFieldSpace(): this is QueryFieldSpace;
 }
 export declare class ReduceFieldSpace extends QuerySpace {
     readonly segmentType = "reduce";

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

@@ -68,7 +68,7 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
         this.nestParent = nestParent;
         this.astEl = astEl;
         this.expandedWild = {};
-        this.exprSpace = new query_input_space_1.QueryInputSpace(queryInputSpace, this);
+        this.exprSpace = new query_input_space_1.QueryInputSpace(queryInputSpace.structDef(), this);
         if (refineThis)
             this.addRefineFromFields(refineThis);
     }

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

@@ -58,15 +58,17 @@ class ReferenceField extends space_field_1.SpaceField {
                 : { type: 'fieldref', path };
             this.queryFieldDef = queryFieldDef;
             const refTo = this.referenceTo;
-            if (refTo instanceof space_field_1.SpaceField && refTo.haveFieldDef) {
-                const origFd = refTo.haveFieldDef;
-                const notes = this.fieldRef.note;
-                if (origFd.annotation || notes) {
-                    const annotation = notes || {};
-                    if (origFd.annotation) {
-                        annotation.inherits = origFd.annotation;
+            if (refTo instanceof space_field_1.SpaceField) {
+                const origFd = refTo.constructorFieldDef();
+                if (origFd) {
+                    const notes = this.fieldRef.note;
+                    if (origFd.annotation || notes) {
+                        const annotation = notes || {};
+                        if (origFd.annotation) {
+                            annotation.inherits = origFd.annotation;
+                        }
+                        this.queryFieldDef.annotation = annotation;
                     }
-                    this.queryFieldDef.annotation = annotation;
                 }
             }
         }

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

@@ -1,4 +1,4 @@
-import { StructDef } from '../../../model/malloy_types';
+import { SourceDef } from '../../../model/malloy_types';
 import { FieldListEdit } from '../source-properties/field-list-edit';
 import { DynamicSpace } from './dynamic-space';
 import { MalloyElement } from '../types/malloy-element';
@@ -9,6 +9,6 @@ export declare class RefinedSpace extends DynamicSpace {
      * @param from A structdef which seeds this space
      * @param choose A accept/except edit of the "from" fields
      */
-    static filteredFrom(from: StructDef, choose: FieldListEdit | undefined, parameters: ParameterSpace | undefined): RefinedSpace;
+    static filteredFrom(from: SourceDef, choose: FieldListEdit | undefined, parameters: ParameterSpace | undefined): RefinedSpace;
     pushFields(...defs: MalloyElement[]): void;
 }

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

@@ -1,15 +1,17 @@
 import { Dialect } from '../../../dialect/dialect';
-import { FieldDef, StructDef } from '../../../model/malloy_types';
+import { FieldDef, StructDef, SourceDef, JoinFieldDef } from '../../../model/malloy_types';
 import { SpaceEntry } from '../types/space-entry';
 import { LookupResult } from '../types/lookup-result';
-import { FieldName, FieldSpace, QueryFieldSpace } from '../types/field-space';
+import { FieldName, FieldSpace, QueryFieldSpace, SourceFieldSpace } from '../types/field-space';
 import { SpaceField } from '../types/space-field';
 import { StructSpaceFieldBase } from './struct-space-field-base';
 export declare class StaticSpace implements FieldSpace {
+    protected fromStruct: StructDef;
     readonly type = "fieldSpace";
     private memoMap?;
-    protected fromStruct: StructDef;
-    constructor(sourceStructDef: StructDef);
+    get dialect(): string;
+    constructor(fromStruct: StructDef);
+    dialectName(): string;
     dialectObj(): Dialect | undefined;
     defToSpaceField(from: FieldDef): SpaceField;
     private get map();
@@ -24,6 +26,13 @@ export declare class StaticSpace implements FieldSpace {
     isQueryFieldSpace(): this is QueryFieldSpace;
 }
 export declare class StructSpaceField extends StructSpaceFieldBase {
-    constructor(def: StructDef);
+    private parentDialect;
+    constructor(def: JoinFieldDef, dialect: string);
     get fieldSpace(): FieldSpace;
 }
+export declare class StaticSourceSpace extends StaticSpace implements SourceFieldSpace {
+    protected source: SourceDef;
+    constructor(source: SourceDef);
+    structDef(): SourceDef;
+    emptyStructDef(): SourceDef;
+}

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

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StructSpaceField = exports.StaticSpace = void 0;
+exports.StaticSourceSpace = exports.StructSpaceField = exports.StaticSpace = void 0;
 const dialect_map_1 = require("../../../dialect/dialect_map");
 const malloy_types_1 = require("../../../model/malloy_types");
 const space_param_1 = require("../types/space-param");
@@ -31,9 +31,15 @@ const struct_space_field_base_1 = require("./struct-space-field-base");
 const column_space_field_1 = require("./column-space-field");
 const ir_view_field_1 = require("./ir-view-field");
 class StaticSpace {
-    constructor(sourceStructDef) {
+    get dialect() {
+        return this.fromStruct.dialect;
+    }
+    constructor(fromStruct) {
+        this.fromStruct = fromStruct;
         this.type = 'fieldSpace';
-        this.fromStruct = sourceStructDef;
+    }
+    dialectName() {
+        return this.fromStruct.dialect;
     }
     dialectObj() {
         try {
@@ -44,8 +50,8 @@ class StaticSpace {
         }
     }
     defToSpaceField(from) {
-        if (from.type === 'struct') {
-            return new StructSpaceField(from);
+        if ((0, malloy_types_1.isJoined)(from)) {
+            return new StructSpaceField(from, this.fromStruct.dialect);
         }
         else if ((0, malloy_types_1.isTurtleDef)(from)) {
             return new ir_view_field_1.IRViewField(this, from);
@@ -59,10 +65,12 @@ class StaticSpace {
                 const name = f.as || f.name;
                 this.memoMap[name] = this.defToSpaceField(f);
             }
-            if (this.fromStruct.parameters) {
-                for (const [paramName, paramDef] of Object.entries(this.fromStruct.parameters)) {
-                    if (!(paramName in this.memoMap)) {
-                        this.memoMap[paramName] = new space_param_1.DefinedParameter(paramDef);
+            if ((0, malloy_types_1.isSourceDef)(this.fromStruct)) {
+                if (this.fromStruct.parameters) {
+                    for (const [paramName, paramDef] of Object.entries(this.fromStruct.parameters)) {
+                        if (!(paramName in this.memoMap)) {
+                            this.memoMap[paramName] = new space_param_1.DefinedParameter(paramDef);
+                        }
                     }
                 }
             }
@@ -89,7 +97,12 @@ class StaticSpace {
         return this.fromStruct;
     }
     emptyStructDef() {
-        return { ...this.fromStruct, fields: [], parameters: {} };
+        const ret = { ...this.fromStruct };
+        if ((0, malloy_types_1.isSourceDef)(ret)) {
+            ret.parameters = {};
+        }
+        ret.fields = [];
+        return ret;
     }
     lookup(path) {
         const head = path[0];
@@ -117,13 +130,8 @@ class StaticSpace {
                 });
             }
         }
-        const relationship = found instanceof struct_space_field_base_1.StructSpaceFieldBase
-            ? [
-                {
-                    name: head.refString,
-                    structRelationship: found.structRelationship,
-                },
-            ]
+        const joinPath = found instanceof struct_space_field_base_1.StructSpaceFieldBase
+            ? [{ ...found.joinPathElement, name: head.refString }]
             : [];
         if (rest.length) {
             if (found instanceof struct_space_field_base_1.StructSpaceFieldBase) {
@@ -131,7 +139,7 @@ class StaticSpace {
                 if (restResult.found) {
                     return {
                         ...restResult,
-                        relationship: [...relationship, ...restResult.relationship],
+                        joinPath: [...joinPath, ...restResult.joinPath],
                     };
                 }
                 else {
@@ -146,7 +154,7 @@ class StaticSpace {
                 found: undefined,
             };
         }
-        return { found, error: undefined, relationship, isOutputField: false };
+        return { found, error: undefined, joinPath, isOutputField: false };
     }
     isQueryFieldSpace() {
         return false;
@@ -154,12 +162,29 @@ class StaticSpace {
 }
 exports.StaticSpace = StaticSpace;
 class StructSpaceField extends struct_space_field_base_1.StructSpaceFieldBase {
-    constructor(def) {
+    constructor(def, dialect) {
         super(def);
+        this.parentDialect = dialect;
     }
     get fieldSpace() {
         return new StaticSpace(this.sourceDef);
     }
 }
 exports.StructSpaceField = StructSpaceField;
+class StaticSourceSpace extends StaticSpace {
+    constructor(source) {
+        super(source);
+        this.source = source;
+    }
+    structDef() {
+        return this.source;
+    }
+    emptyStructDef() {
+        const ret = { ...this.source };
+        ret.parameters = {};
+        ret.fields = [];
+        return ret;
+    }
+}
+exports.StaticSourceSpace = StaticSourceSpace;
 //# sourceMappingURL=static-space.js.map

package/dist/lang/ast/field-space/struct-space-field-base.d.ts

@@ -1,11 +1,12 @@
-import { FieldDef, StructDef, StructRelationship, TypeDesc } from '../../../model/malloy_types';
+import { JoinFieldDef, TypeDesc } from '../../../model/malloy_types';
 import { FieldSpace } from '../types/field-space';
+import { JoinPathElement } from '../types/lookup-result';
 import { SpaceField } from '../types/space-field';
 export declare abstract class StructSpaceFieldBase extends SpaceField {
-    protected sourceDef: StructDef;
-    constructor(sourceDef: StructDef);
+    protected sourceDef: JoinFieldDef;
+    constructor(sourceDef: JoinFieldDef);
     abstract get fieldSpace(): FieldSpace;
-    get structRelationship(): StructRelationship;
-    fieldDef(): FieldDef;
+    fieldDef(): JoinFieldDef;
+    get joinPathElement(): JoinPathElement;
     typeDesc(): TypeDesc;
 }

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

@@ -29,14 +29,22 @@ class StructSpaceFieldBase extends space_field_1.SpaceField {
         super();
         this.sourceDef = sourceDef;
     }
-    get structRelationship() {
-        return this.sourceDef.structRelationship;
-    }
     fieldDef() {
         return this.sourceDef;
     }
+    get joinPathElement() {
+        return {
+            name: this.sourceDef.as || this.sourceDef.name,
+            joinType: this.sourceDef.join,
+            joinElementType: this.sourceDef.type,
+        };
+    }
     typeDesc() {
-        return { dataType: 'struct', expressionType: 'scalar', evalSpace: 'input' };
+        return {
+            dataType: this.sourceDef.type,
+            expressionType: 'scalar',
+            evalSpace: 'input',
+        };
     }
 }
 exports.StructSpaceFieldBase = StructSpaceFieldBase;

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

@@ -52,6 +52,7 @@ export * from './expressions/time-literal';
 export * from './expressions/partial-compare';
 export * from './expressions/partition_by';
 export * from './expressions/pick-when';
+export * from './expressions/expr-record-literal';
 export * from './expressions/range';
 export * from './expressions/time-frame';
 export * from './expressions/top-by';
@@ -78,7 +79,7 @@ export * from './query-properties/extend';
 export * from './query-properties/filters';
 export * from './query-properties/group-by';
 export * from './query-properties/indexing';
-export * from './source-properties/joins';
+export * from './source-properties/join';
 export * from './source-properties/view-field-declaration';
 export * from './query-properties/limit';
 export * from './source-properties/measures';

package/dist/lang/ast/index.js

@@ -90,6 +90,7 @@ __exportStar(require("./expressions/time-literal"), exports);
 __exportStar(require("./expressions/partial-compare"), exports);
 __exportStar(require("./expressions/partition_by"), exports);
 __exportStar(require("./expressions/pick-when"), exports);
+__exportStar(require("./expressions/expr-record-literal"), exports);
 __exportStar(require("./expressions/range"), exports);
 __exportStar(require("./expressions/time-frame"), exports);
 __exportStar(require("./expressions/top-by"), exports);
@@ -116,7 +117,7 @@ __exportStar(require("./query-properties/extend"), exports);
 __exportStar(require("./query-properties/filters"), exports);
 __exportStar(require("./query-properties/group-by"), exports);
 __exportStar(require("./query-properties/indexing"), exports);
-__exportStar(require("./source-properties/joins"), exports);
+__exportStar(require("./source-properties/join"), exports);
 __exportStar(require("./source-properties/view-field-declaration"), exports);
 __exportStar(require("./query-properties/limit"), exports);
 __exportStar(require("./source-properties/measures"), exports);

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

@@ -1,5 +1,5 @@
 import { FilterCondition, PipeSegment, Sampling } from '../../../model/malloy_types';
-import { FieldName, FieldSpace } from '../types/field-space';
+import { FieldName, SourceFieldSpace } from '../types/field-space';
 import { Limit } from '../query-properties/limit';
 import { IndexFieldSpace } from '../field-space/index-field-space';
 import { QueryProperty } from '../types/query-property';
@@ -15,7 +15,7 @@ export declare class IndexBuilder implements QueryBuilder {
     resultFS: IndexFieldSpace;
     inputFS: QueryInputSpace;
     readonly type = "index";
-    constructor(inputFS: FieldSpace, refineThis: PipeSegment | undefined, isNestIn: QueryOperationSpace | undefined, astEl: MalloyElement);
+    constructor(inputFS: SourceFieldSpace, refineThis: PipeSegment | undefined, isNestIn: QueryOperationSpace | undefined, astEl: MalloyElement);
     execute(qp: QueryProperty): void;
     finalize(from: PipeSegment | undefined): PipeSegment;
 }

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

@@ -1,5 +1,5 @@
 import { PipeSegment } from '../../../model/malloy_types';
-import { FieldSpace } from '../types/field-space';
+import { SourceFieldSpace } from '../types/field-space';
 import { ProjectFieldSpace } from '../field-space/project-field-space';
 import { QueryProperty } from '../types/query-property';
 import { QuerySegmentBuilder } from './reduce-builder';
@@ -11,7 +11,7 @@ export declare class ProjectBuilder extends QuerySegmentBuilder implements Query
     resultFS: ProjectFieldSpace;
     inputFS: QueryInputSpace;
     readonly type = "project";
-    constructor(baseFS: FieldSpace, refineThis: PipeSegment | undefined, isNestIn: QueryOperationSpace | undefined, astEl: MalloyElement);
+    constructor(baseFS: SourceFieldSpace, refineThis: PipeSegment | undefined, isNestIn: QueryOperationSpace | undefined, astEl: MalloyElement);
     execute(qp: QueryProperty): void;
     finalize(fromSeg: PipeSegment | undefined): PipeSegment;
 }

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

@@ -1,5 +1,5 @@
 import { FilterCondition, PipeSegment, QuerySegment } from '../../../model/malloy_types';
-import { FieldSpace } from '../types/field-space';
+import { SourceFieldSpace } from '../types/field-space';
 import { Ordering } from '../query-properties/ordering';
 import { Top } from '../query-properties/top';
 import { QueryProperty } from '../types/query-property';
@@ -22,6 +22,6 @@ export declare class ReduceBuilder extends QuerySegmentBuilder implements QueryB
     inputFS: QueryInputSpace;
     resultFS: ReduceFieldSpace;
     readonly type = "grouping";
-    constructor(baseFS: FieldSpace, refineThis: PipeSegment | undefined, isNestIn: QueryOperationSpace | undefined, astEl: MalloyElement);
+    constructor(baseFS: SourceFieldSpace, refineThis: PipeSegment | undefined, isNestIn: QueryOperationSpace | undefined, astEl: MalloyElement);
     finalize(fromSeg: PipeSegment | undefined): PipeSegment;
 }

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

@@ -48,7 +48,7 @@ class QueryArrow extends query_base_1.QueryBase {
             // the view as the head, or the scalar as the head (if scalar lenses is enabled)
             const invoked = isRefOk
                 ? this.source.structRef(undefined)
-                : { structRef: this.source.structDef(undefined) };
+                : { structRef: this.source.getSourceDef(undefined) };
             queryBase = {
                 type: 'query',
                 ...invoked,
@@ -57,7 +57,7 @@ class QueryArrow extends query_base_1.QueryBase {
             };
             inputStruct = (0, malloy_types_1.refIsStructDef)(invoked.structRef)
                 ? invoked.structRef
-                : this.source.structDef(undefined);
+                : this.source.getSourceDef(undefined);
             fieldSpace = new static_space_1.StaticSpace(inputStruct);
         }
         else {

package/dist/lang/ast/query-elements/query-head-struct.d.ts

@@ -1,4 +1,4 @@
-import { Argument, InvokedStructRef, StructDef, StructRef } from '../../../model/malloy_types';
+import { Argument, InvokedStructRef, SourceDef, StructRef } from '../../../model/malloy_types';
 import { Source } from '../source-elements/source';
 import { ParameterSpace } from '../field-space/parameter-space';
 export declare class QueryHeadStruct extends Source {
@@ -7,5 +7,5 @@ export declare class QueryHeadStruct extends Source {
     elementType: string;
     constructor(fromRef: StructRef, sourceArguments: Record<string, Argument> | undefined);
     structRef(): InvokedStructRef;
-    structDef(parameterSpace: ParameterSpace | undefined): StructDef;
+    getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef;
 }

package/dist/lang/ast/query-elements/query-head-struct.js

@@ -36,13 +36,13 @@ class QueryHeadStruct extends source_1.Source {
     structRef() {
         return { structRef: this.fromRef };
     }
-    structDef(parameterSpace) {
+    getSourceDef(parameterSpace) {
         if ((0, malloy_types_1.refIsStructDef)(this.fromRef)) {
             return this.fromRef;
         }
         const ns = new named_source_1.NamedSource(this.fromRef, this.sourceArguments, undefined);
         this.has({ exploreReference: ns });
-        return ns.structDef(parameterSpace);
+        return ns.getSourceDef(parameterSpace);
     }
 }
 exports.QueryHeadStruct = QueryHeadStruct;

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

@@ -42,10 +42,10 @@ class QueryRaw extends malloy_element_1.MalloyElement {
     queryComp(isRefOk) {
         const invoked = isRefOk
             ? this.source.structRef(undefined)
-            : { structRef: this.source.structDef(undefined) };
+            : { structRef: this.source.getSourceDef(undefined) };
         const structDef = (0, malloy_types_1.refIsStructDef)(invoked.structRef)
             ? invoked.structRef
-            : this.source.structDef(undefined);
+            : this.source.getSourceDef(undefined);
         return {
             query: {
                 type: 'query',

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

@@ -56,7 +56,7 @@ class QueryReference extends malloy_element_1.MalloyElement {
         if (query.type === 'query') {
             const queryHead = new query_head_struct_1.QueryHeadStruct(query.structRef, query.sourceArguments);
             this.has({ queryHead: queryHead });
-            const inputStruct = queryHead.structDef(undefined);
+            const inputStruct = queryHead.getSourceDef(undefined);
             const outputStruct = (0, struct_utils_1.getFinalStruct)(this, inputStruct, query.pipeline);
             const unRefedQuery = isRefOk
                 ? query

package/dist/lang/ast/query-items/field-declaration.d.ts

@@ -1,5 +1,5 @@
 import { Dialect } from '../../../dialect/dialect';
-import { Annotation, FieldTypeDef, StructDef, TypeDesc, FieldDef, QueryFieldDef } from '../../../model/malloy_types';
+import { Annotation, StructDef, TypeDesc, FieldDef, AtomicFieldDef } from '../../../model/malloy_types';
 import { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
 import { FieldName, FieldSpace, QueryFieldSpace } from '../types/field-space';
@@ -18,10 +18,10 @@ export declare abstract class AtomicFieldDeclaration extends MalloyElement imple
     extendNote: typeof extendNoteMethod;
     note?: Annotation;
     constructor(expr: ExpressionDef, defineName: string, exprSrc?: string | undefined);
-    fieldDef(fs: FieldSpace, exprName: string): FieldTypeDef;
+    fieldDef(fs: FieldSpace, exprName: string): FieldDef;
     abstract typecheckExprValue(expr: ExprValue): void;
     executesInOutputSpace(): boolean;
-    queryFieldDef(exprFS: FieldSpace, exprName: string): FieldTypeDef;
+    queryFieldDef(exprFS: FieldSpace, exprName: string): AtomicFieldDef;
     makeEntry(fs: DynamicSpace): void;
 }
 export declare class CalculateFieldDeclaration extends AtomicFieldDeclaration {
@@ -67,10 +67,11 @@ export declare class DefSpace implements FieldSpace {
     entry(name: string): SpaceEntry | undefined;
     lookup(symbol: FieldName[]): LookupResult;
     entries(): [string, SpaceEntry][];
+    dialectName(): string;
     dialectObj(): Dialect | undefined;
     isQueryFieldSpace(): this is QueryFieldSpace;
     outputSpace(): import("../field-space/query-spaces").QueryOperationSpace;
-    inputSpace(): FieldSpace;
+    inputSpace(): import("../types/field-space").SourceFieldSpace;
 }
 export declare class FieldDefinitionValue extends SpaceField {
     readonly space: FieldSpace;
@@ -78,8 +79,9 @@ export declare class FieldDefinitionValue extends SpaceField {
     fieldName: string;
     constructor(space: FieldSpace, exprDef: AtomicFieldDeclaration);
     get name(): string;
+    private defInSource?;
     fieldDef(): FieldDef;
-    private qfd?;
-    getQueryFieldDef(fs: FieldSpace): QueryFieldDef;
+    private defInQuery?;
+    getQueryFieldDef(fs: FieldSpace): AtomicFieldDef;
     typeDesc(): TypeDesc;
 }