@malloydata/malloy 0.0.116-dev231213173224 → 0.0.116-dev231218202606

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { DuckDBDialect, StandardSQLDialect, PostgresDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, sqlFragment, param, spread, Dialect, FUNCTIONS, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, } from './dialect';
 export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, QueryValue, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldAtomicDef, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FieldValueType, ExpressionTypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, TypecastFragment, Annotation, FieldAtomicTypeDef, } from './model';
-export { Segment, isFilteredAliasedName, isSamplingEnable, isSamplingPercent, isSamplingRows, mkExpr, flattenQuery, expressionIsCalculation, indent, } from './model';
+export { Segment, isFilteredAliasedName, isSamplingEnable, isSamplingPercent, isSamplingRows, mkExpr, expressionIsCalculation, indent, } from './model';
 export { HighlightType, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
 export { Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, } from './malloy';

package/dist/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.indent = exports.expressionIsCalculation = exports.flattenQuery = exports.mkExpr = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isFilteredAliasedName = exports.Segment = exports.FUNCTIONS = exports.Dialect = exports.spread = exports.param = exports.sqlFragment = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.PostgresDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.Tag = void 0;
+exports.Tag = exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.indent = exports.expressionIsCalculation = exports.mkExpr = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isFilteredAliasedName = exports.Segment = exports.FUNCTIONS = exports.Dialect = exports.spread = exports.param = exports.sqlFragment = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.PostgresDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -51,7 +50,6 @@ Object.defineProperty(exports, "isSamplingEnable", { enumerable: true, get: func
 Object.defineProperty(exports, "isSamplingPercent", { enumerable: true, get: function () { return model_1.isSamplingPercent; } });
 Object.defineProperty(exports, "isSamplingRows", { enumerable: true, get: function () { return model_1.isSamplingRows; } });
 Object.defineProperty(exports, "mkExpr", { enumerable: true, get: function () { return model_1.mkExpr; } });
-Object.defineProperty(exports, "flattenQuery", { enumerable: true, get: function () { return model_1.flattenQuery; } });
 Object.defineProperty(exports, "expressionIsCalculation", { enumerable: true, get: function () { return model_1.expressionIsCalculation; } });
 Object.defineProperty(exports, "indent", { enumerable: true, get: function () { return model_1.indent; } });
 var lang_1 = require("./lang");

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

@@ -0,0 +1,11 @@
+import { QueryFieldDef, TurtleDef } from '../../../model/malloy_types';
+import { ViewFieldDeclaration } from '../source-properties/view-field-declaration';
+import { FieldSpace } from '../types/field-space';
+import { ViewField } from './view-field';
+export declare class ASTViewField extends ViewField {
+    readonly view: ViewFieldDeclaration;
+    protected name: string;
+    constructor(fs: FieldSpace, view: ViewFieldDeclaration, name: string);
+    getQueryFieldDef(fs: FieldSpace): QueryFieldDef;
+    fieldDef(): TurtleDef;
+}

package/dist/lang/ast/field-space/{wild-space-field.js → ast-view-field.js}

@@ -22,19 +22,20 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WildSpaceField = void 0;
-const space_field_1 = require("../types/space-field");
-class WildSpaceField extends space_field_1.SpaceField {
-    constructor(wildText) {
-        super();
-        this.wildText = wildText;
+exports.ASTViewField = void 0;
+const view_field_1 = require("./view-field");
+class ASTViewField extends view_field_1.ViewField {
+    constructor(fs, view, name) {
+        super(fs);
+        this.view = view;
+        this.name = name;
     }
-    typeDesc() {
-        throw new Error('should never ask a wild field for its type');
+    getQueryFieldDef(fs) {
+        return this.view.getFieldDef(fs);
     }
-    getQueryFieldDef(_fs) {
-        return this.wildText;
+    fieldDef() {
+        return this.view.getFieldDef(this.inSpace);
     }
 }
-exports.WildSpaceField = WildSpaceField;
-//# sourceMappingURL=wild-space-field.js.map
+exports.ASTViewField = ASTViewField;
+//# sourceMappingURL=ast-view-field.js.map

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

@@ -31,7 +31,7 @@ const field_utils_1 = require("../../field-utils");
 const error_factory_1 = require("../error-factory");
 const space_field_1 = require("../types/space-field");
 const join_space_field_1 = require("./join-space-field");
-const query_space_field_1 = require("./query-space-field");
+const view_field_1 = require("./view-field");
 const space_param_1 = require("../types/space-param");
 const space_seed_1 = require("../space-seed");
 const static_space_1 = require("./static-space");
@@ -93,7 +93,7 @@ class DynamicSpace extends static_space_1.StaticSpace {
                 if (spaceEntry instanceof struct_space_field_base_1.StructSpaceFieldBase) {
                     joins.push([name, spaceEntry]);
                 }
-                else if (spaceEntry instanceof query_space_field_1.QueryField) {
+                else if (spaceEntry instanceof view_field_1.ViewField) {
                     turtles.push([name, spaceEntry]);
                 }
                 else if (spaceEntry instanceof space_field_1.SpaceField) {

package/dist/lang/ast/field-space/{query-field-struct.d.ts → ir-view-field.d.ts}

@@ -1,7 +1,7 @@
 import { QueryFieldDef, TurtleDef } from '../../../model/malloy_types';
-import { QueryField } from './query-space-field';
+import { ViewField } from './view-field';
 import { FieldSpace } from '../types/field-space';
-export declare class QueryFieldStruct extends QueryField {
+export declare class IRViewField extends ViewField {
     protected turtleDef: TurtleDef;
     constructor(fs: FieldSpace, turtleDef: TurtleDef);
     rename(name: string): void;

package/dist/lang/ast/field-space/{query-field-struct.js → ir-view-field.js}

@@ -22,9 +22,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryFieldStruct = void 0;
-const query_space_field_1 = require("./query-space-field");
-class QueryFieldStruct extends query_space_field_1.QueryField {
+exports.IRViewField = void 0;
+const view_field_1 = require("./view-field");
+class IRViewField extends view_field_1.ViewField {
     constructor(fs, turtleDef) {
         super(fs);
         this.turtleDef = turtleDef;
@@ -43,5 +43,5 @@ class QueryFieldStruct extends query_space_field_1.QueryField {
         return this.fieldDef();
     }
 }
-exports.QueryFieldStruct = QueryFieldStruct;
-//# sourceMappingURL=query-field-struct.js.map
+exports.IRViewField = IRViewField;
+//# sourceMappingURL=ir-view-field.js.map

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

@@ -1,4 +1,4 @@
-import { Join } from '../query-properties/joins';
+import { Join } from '../source-properties/joins';
 import { StructSpaceField } from './static-space';
 export declare class JoinSpaceField extends StructSpaceField {
     readonly join: Join;

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

@@ -5,10 +5,11 @@
  * expressions in the query is called the "input space". There is a
  * specialized QuerySpace for each type of query operation.
  */
-import { FieldDeclaration } from '../query-items/field-declaration';
-import { Join } from '../query-properties/joins';
+import { AtomicFieldDeclaration } from '../query-items/field-declaration';
+import { Join } from '../source-properties/joins';
 import { SourceSpec } from '../space-seed';
-import { FieldSpace, QueryFieldSpace } from '../types/field-space';
+import { QueryFieldSpace } from '../types/field-space';
+import { QuerySpace } from './query-spaces';
 import { RefinedSpace } from './refined-space';
 export declare class QueryInputSpace extends RefinedSpace implements QueryFieldSpace {
     private queryOutput;
@@ -19,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: FieldSpace);
-    extendSource(extendField: Join | FieldDeclaration): void;
+    constructor(input: SourceSpec, queryOutput: QuerySpace);
+    extendSource(extendField: Join | AtomicFieldDeclaration): void;
     isQueryFieldSpace(): boolean;
-    outputSpace(): FieldSpace;
+    outputSpace(): QuerySpace;
     inputSpace(): this;
 }

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

@@ -23,7 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryInputSpace = void 0;
-const joins_1 = require("../query-properties/joins");
+const joins_1 = require("../source-properties/joins");
 const space_seed_1 = require("../space-seed");
 const refined_space_1 = require("./refined-space");
 class QueryInputSpace extends refined_space_1.RefinedSpace {

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

@@ -13,12 +13,12 @@ import { QueryInputSpace } from './query-input-space';
  */
 export declare abstract class QuerySpace extends RefinedSpace implements QueryFieldSpace {
     readonly queryInputSpace: FieldSpace;
+    readonly nestParent: QuerySpace | undefined;
+    readonly astEl: MalloyElement;
     private exprSpace;
-    astEl?: MalloyElement | undefined;
     abstract readonly segmentType: 'reduce' | 'project' | 'index';
     expandedWild: Record<string, string[]>;
-    nestParent?: QuerySpace;
-    constructor(queryInputSpace: FieldSpace, refineThis: model.PipeSegment | undefined);
+    constructor(queryInputSpace: FieldSpace, refineThis: model.PipeSegment | undefined, nestParent: QuerySpace | undefined, astEl: MalloyElement);
     private addRefineFromFields;
     log(s: string): void;
     pushFields(...defs: MalloyElement[]): void;

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

@@ -50,7 +50,6 @@ const model = __importStar(require("../../../model/malloy_types"));
 const field_utils_1 = require("../../field-utils");
 const space_field_1 = require("../types/space-field");
 const field_references_1 = require("../query-items/field-references");
-const wild_space_field_1 = require("./wild-space-field");
 const refined_space_1 = require("./refined-space");
 const column_space_field_1 = require("./column-space-field");
 const static_space_1 = require("./static-space");
@@ -62,9 +61,11 @@ const query_input_space_1 = require("./query-input-space");
  * QuerySpace is created.
  */
 class QuerySpace extends refined_space_1.RefinedSpace {
-    constructor(queryInputSpace, refineThis) {
+    constructor(queryInputSpace, refineThis, nestParent, astEl) {
         super(queryInputSpace.emptyStructDef());
         this.queryInputSpace = queryInputSpace;
+        this.nestParent = nestParent;
+        this.astEl = astEl;
         this.expandedWild = {};
         this.exprSpace = new query_input_space_1.QueryInputSpace(queryInputSpace, this);
         if (refineThis)
@@ -169,19 +170,16 @@ class QuerySpace extends refined_space_1.RefinedSpace {
                 }
                 const fieldQueryDef = field.getQueryFieldDef(this.exprSpace);
                 if (fieldQueryDef) {
-                    if (field instanceof wild_space_field_1.WildSpaceField) {
+                    const typeDesc = field.typeDesc();
+                    // 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,
+                    // maybe by adding a logable element to SpaceFields.
+                    if (typeDesc.dataType !== 'error' &&
+                        this.canContain(typeDesc) &&
+                        !isEmptyNest(fieldQueryDef)) {
                         fields.push(fieldQueryDef);
                     }
-                    else {
-                        const typeDesc = field.typeDesc();
-                        // 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,
-                        // maybe by adding a logable element to SpaceFields.
-                        if (typeDesc.dataType !== 'error' && this.canContain(typeDesc)) {
-                            fields.push(fieldQueryDef);
-                        }
-                    }
                 }
                 // TODO I removed the error here because during calculation of the refinement space,
                 // (see creation of a QuerySpace) we add references to all the fields from
@@ -262,4 +260,10 @@ class ReduceFieldSpace extends QuerySpace {
     }
 }
 exports.ReduceFieldSpace = ReduceFieldSpace;
+function isEmptyNest(fd) {
+    return (typeof fd !== 'string' &&
+        !model.isFilteredAliasedName(fd) &&
+        fd.type === 'turtle' &&
+        fd.pipeline.length === 0);
+}
 //# sourceMappingURL=query-spaces.js.map

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

@@ -29,7 +29,7 @@ const space_param_1 = require("../types/space-param");
 const space_field_1 = require("../types/space-field");
 const struct_space_field_base_1 = require("./struct-space-field-base");
 const column_space_field_1 = require("./column-space-field");
-const query_field_struct_1 = require("./query-field-struct");
+const ir_view_field_1 = require("./ir-view-field");
 class StaticSpace {
     constructor(sourceStructDef) {
         this.type = 'fieldSpace';
@@ -48,7 +48,7 @@ class StaticSpace {
             return new StructSpaceField(from);
         }
         else if ((0, malloy_types_1.isTurtleDef)(from)) {
-            return new query_field_struct_1.QueryFieldStruct(this, from);
+            return new ir_view_field_1.IRViewField(this, from);
         }
         return new column_space_field_1.ColumnSpaceField(from);
     }

package/dist/lang/ast/field-space/{query-space-field.d.ts → view-field.d.ts}

@@ -1,7 +1,7 @@
 import { FieldDef, QueryFieldDef, TypeDesc } from '../../../model/malloy_types';
 import { FieldSpace } from '../types/field-space';
 import { SpaceField } from '../types/space-field';
-export declare abstract class QueryField extends SpaceField {
+export declare abstract class ViewField extends SpaceField {
     protected inSpace: FieldSpace;
     constructor(inSpace: FieldSpace);
     abstract getQueryFieldDef(fs: FieldSpace): QueryFieldDef | undefined;

package/dist/lang/ast/field-space/{query-space-field.js → view-field.js}

@@ -22,9 +22,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryField = void 0;
+exports.ViewField = void 0;
 const space_field_1 = require("../types/space-field");
-class QueryField extends space_field_1.SpaceField {
+class ViewField extends space_field_1.SpaceField {
     constructor(inSpace) {
         super();
         this.inSpace = inSpace;
@@ -33,5 +33,5 @@ class QueryField extends space_field_1.SpaceField {
         return { dataType: 'turtle', expressionType: 'scalar', evalSpace: 'input' };
     }
 }
-exports.QueryField = QueryField;
-//# sourceMappingURL=query-space-field.js.map
+exports.ViewField = ViewField;
+//# sourceMappingURL=view-field.js.map

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

@@ -1,14 +1,18 @@
 export * from './query-properties/nest';
-export * from './elements/define-source';
-export * from './elements/define-query';
-export * from './elements/source';
-export * from './elements/refined-source';
-export * from './elements/source-query';
-export * from './elements/source-query-nodes';
+export * from './statements/define-source';
+export * from './statements/define-query';
+export * from './source-elements/source';
+export * from './source-elements/refined-source';
+export * from './source-query-elements/source-query-element';
+export * from './source-query-elements/sq-arrow';
+export * from './source-query-elements/sq-refine';
+export * from './source-query-elements/sq-source';
+export * from './source-query-elements/sq-reference';
+export * from './source-query-elements/sq-extend';
 export * from './source-properties/field-list-edit';
 export * from './source-properties/primary-key';
 export * from './source-properties/renames';
-export * from './source-properties/turtles';
+export * from './source-properties/views';
 export * from './source-properties/timezone-statement';
 export * from './expressions/apply';
 export * from './expressions/binary-numeric';
@@ -51,25 +55,31 @@ export * from './expressions/time-frame';
 export * from './expressions/top-by';
 export * from './expressions/unary';
 export * from './expressions/utils';
-export * from './elements/import-statement';
+export * from './statements/import-statement';
 export * from './query-properties/extend';
 export * from './parameters/has-parameter';
 export * from './query-elements/anonymous-query';
-export * from './query-elements/existing-query';
-export * from './query-elements/full-query';
+export * from './query-elements/query-refine';
+export * from './query-elements/query-arrow';
+export * from './view-elements/view';
+export * from './view-elements/view-arrow';
+export * from './view-elements/view-refine';
+export * from './view-elements/reference-view';
+export * from './view-elements/qop-desc-view';
 export * from './query-items/field-declaration';
 export * from './query-items/field-references';
 export * from './query-properties/aggregate';
 export * from './query-properties/calculate';
 export * from './query-properties/declare-fields';
-export * from './query-properties/dimensions';
+export * from './source-properties/dimensions';
 export * from './query-properties/extend';
 export * from './query-properties/filters';
 export * from './query-properties/group-by';
 export * from './query-properties/indexing';
-export * from './query-properties/joins';
+export * from './source-properties/joins';
+export * from './source-properties/view-field-declaration';
 export * from './query-properties/limit';
-export * from './query-properties/measures';
+export * from './source-properties/measures';
 export * from './query-properties/nest';
 export * from './query-properties/nests';
 export * from './query-properties/ordering';
@@ -77,11 +87,11 @@ export * from './query-properties/project-statement';
 export * from './query-properties/qop-desc';
 export * from './query-properties/sampling';
 export * from './query-properties/top';
-export * from './sources/named-source';
-export * from './sources/query-source';
-export * from './sources/from-sql-source';
-export * from './sources/sql-source';
-export * from './sources/table-source';
+export * from './source-elements/named-source';
+export * from './source-elements/query-source';
+export * from './source-elements/from-sql-source';
+export * from './source-elements/sql-source';
+export * from './source-elements/table-source';
 export * from './sql-elements/sql-statement';
 export * from './sql-elements/sql-string';
 export * from './types/annotation-elements';
@@ -95,5 +105,4 @@ export * from './types/malloy-element';
 export * from './types/query-element';
 export * from './types/query-item';
 export * from './types/query-property';
-export * from './types/turtle-headed-pipe';
 export * from './types/query-extend-property';

package/dist/lang/ast/index.js

@@ -37,16 +37,20 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./query-properties/nest"), exports);
-__exportStar(require("./elements/define-source"), exports);
-__exportStar(require("./elements/define-query"), exports);
-__exportStar(require("./elements/source"), exports);
-__exportStar(require("./elements/refined-source"), exports);
-__exportStar(require("./elements/source-query"), exports);
-__exportStar(require("./elements/source-query-nodes"), exports);
+__exportStar(require("./statements/define-source"), exports);
+__exportStar(require("./statements/define-query"), exports);
+__exportStar(require("./source-elements/source"), exports);
+__exportStar(require("./source-elements/refined-source"), exports);
+__exportStar(require("./source-query-elements/source-query-element"), exports);
+__exportStar(require("./source-query-elements/sq-arrow"), exports);
+__exportStar(require("./source-query-elements/sq-refine"), exports);
+__exportStar(require("./source-query-elements/sq-source"), exports);
+__exportStar(require("./source-query-elements/sq-reference"), exports);
+__exportStar(require("./source-query-elements/sq-extend"), exports);
 __exportStar(require("./source-properties/field-list-edit"), exports);
 __exportStar(require("./source-properties/primary-key"), exports);
 __exportStar(require("./source-properties/renames"), exports);
-__exportStar(require("./source-properties/turtles"), exports);
+__exportStar(require("./source-properties/views"), exports);
 __exportStar(require("./source-properties/timezone-statement"), exports);
 __exportStar(require("./expressions/apply"), exports);
 __exportStar(require("./expressions/binary-numeric"), exports);
@@ -89,25 +93,31 @@ __exportStar(require("./expressions/time-frame"), exports);
 __exportStar(require("./expressions/top-by"), exports);
 __exportStar(require("./expressions/unary"), exports);
 __exportStar(require("./expressions/utils"), exports);
-__exportStar(require("./elements/import-statement"), exports);
+__exportStar(require("./statements/import-statement"), exports);
 __exportStar(require("./query-properties/extend"), exports);
 __exportStar(require("./parameters/has-parameter"), exports);
 __exportStar(require("./query-elements/anonymous-query"), exports);
-__exportStar(require("./query-elements/existing-query"), exports);
-__exportStar(require("./query-elements/full-query"), exports);
+__exportStar(require("./query-elements/query-refine"), exports);
+__exportStar(require("./query-elements/query-arrow"), exports);
+__exportStar(require("./view-elements/view"), exports);
+__exportStar(require("./view-elements/view-arrow"), exports);
+__exportStar(require("./view-elements/view-refine"), exports);
+__exportStar(require("./view-elements/reference-view"), exports);
+__exportStar(require("./view-elements/qop-desc-view"), exports);
 __exportStar(require("./query-items/field-declaration"), exports);
 __exportStar(require("./query-items/field-references"), exports);
 __exportStar(require("./query-properties/aggregate"), exports);
 __exportStar(require("./query-properties/calculate"), exports);
 __exportStar(require("./query-properties/declare-fields"), exports);
-__exportStar(require("./query-properties/dimensions"), exports);
+__exportStar(require("./source-properties/dimensions"), exports);
 __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("./query-properties/joins"), exports);
+__exportStar(require("./source-properties/joins"), exports);
+__exportStar(require("./source-properties/view-field-declaration"), exports);
 __exportStar(require("./query-properties/limit"), exports);
-__exportStar(require("./query-properties/measures"), exports);
+__exportStar(require("./source-properties/measures"), exports);
 __exportStar(require("./query-properties/nest"), exports);
 __exportStar(require("./query-properties/nests"), exports);
 __exportStar(require("./query-properties/ordering"), exports);
@@ -115,11 +125,11 @@ __exportStar(require("./query-properties/project-statement"), exports);
 __exportStar(require("./query-properties/qop-desc"), exports);
 __exportStar(require("./query-properties/sampling"), exports);
 __exportStar(require("./query-properties/top"), exports);
-__exportStar(require("./sources/named-source"), exports);
-__exportStar(require("./sources/query-source"), exports);
-__exportStar(require("./sources/from-sql-source"), exports);
-__exportStar(require("./sources/sql-source"), exports);
-__exportStar(require("./sources/table-source"), exports);
+__exportStar(require("./source-elements/named-source"), exports);
+__exportStar(require("./source-elements/query-source"), exports);
+__exportStar(require("./source-elements/from-sql-source"), exports);
+__exportStar(require("./source-elements/sql-source"), exports);
+__exportStar(require("./source-elements/table-source"), exports);
 __exportStar(require("./sql-elements/sql-statement"), exports);
 __exportStar(require("./sql-elements/sql-string"), exports);
 __exportStar(require("./types/annotation-elements"), exports);
@@ -133,6 +143,5 @@ __exportStar(require("./types/malloy-element"), exports);
 __exportStar(require("./types/query-element"), exports);
 __exportStar(require("./types/query-item"), exports);
 __exportStar(require("./types/query-property"), exports);
-__exportStar(require("./types/turtle-headed-pipe"), exports);
 __exportStar(require("./types/query-extend-property"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -5,6 +5,8 @@ import { IndexFieldSpace } from '../field-space/index-field-space';
 import { QueryProperty } from '../types/query-property';
 import { QueryBuilder } from '../types/query-builder';
 import { QueryInputSpace } from '../field-space/query-input-space';
+import { QuerySpace } from '../field-space/query-spaces';
+import { MalloyElement } from '../types/malloy-element';
 export declare class IndexBuilder implements QueryBuilder {
     filters: FilterExpression[];
     limit?: Limit;
@@ -13,7 +15,7 @@ export declare class IndexBuilder implements QueryBuilder {
     resultFS: IndexFieldSpace;
     inputFS: QueryInputSpace;
     readonly type = "index";
-    constructor(inputFS: FieldSpace, refineThis: PipeSegment | undefined);
+    constructor(inputFS: FieldSpace, refineThis: PipeSegment | undefined, isNestIn: QuerySpace | undefined, astEl: MalloyElement);
     execute(qp: QueryProperty): void;
     finalize(from: PipeSegment | undefined): PipeSegment;
 }

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

@@ -31,10 +31,10 @@ 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");
 class IndexBuilder {
-    constructor(inputFS, refineThis) {
+    constructor(inputFS, refineThis, isNestIn, astEl) {
         this.filters = [];
         this.type = 'index';
-        this.resultFS = new index_field_space_1.IndexFieldSpace(inputFS, refineThis);
+        this.resultFS = new index_field_space_1.IndexFieldSpace(inputFS, refineThis, isNestIn, astEl);
         this.inputFS = this.resultFS.inputSpace();
     }
     execute(qp) {

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

@@ -3,9 +3,11 @@ import { FieldSpace } from '../types/field-space';
 import { ProjectFieldSpace } from '../field-space/project-field-space';
 import { QueryProperty } from '../types/query-property';
 import { ReduceBuilder } from './reduce-builder';
+import { QuerySpace } from '../field-space/query-spaces';
+import { MalloyElement } from '../types/malloy-element';
 export declare class ProjectBuilder extends ReduceBuilder {
     readonly type = "project";
-    getResultSpace(fs: FieldSpace, refineThis: PipeSegment | undefined): ProjectFieldSpace;
+    getResultSpace(fs: FieldSpace, refineThis: PipeSegment | undefined, isNestIn: QuerySpace | undefined, astEl: MalloyElement): ProjectFieldSpace;
     execute(qp: QueryProperty): void;
     finalize(fromSeg: PipeSegment | undefined): PipeSegment;
 }

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

@@ -33,8 +33,8 @@ class ProjectBuilder extends reduce_builder_1.ReduceBuilder {
         super(...arguments);
         this.type = 'project';
     }
-    getResultSpace(fs, refineThis) {
-        return new project_field_space_1.ProjectFieldSpace(fs, refineThis);
+    getResultSpace(fs, refineThis, isNestIn, astEl) {
+        return new project_field_space_1.ProjectFieldSpace(fs, refineThis, isNestIn, astEl);
     }
     execute(qp) {
         if (qp.elementType === 'having' || qp instanceof group_by_1.GroupBy) {

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

@@ -6,6 +6,7 @@ import { QueryProperty } from '../types/query-property';
 import { QueryBuilder } from '../types/query-builder';
 import { QuerySpace } from '../field-space/query-spaces';
 import { QueryInputSpace } from '../field-space/query-input-space';
+import { MalloyElement } from '../types/malloy-element';
 export declare class ReduceBuilder implements QueryBuilder {
     inputFS: QueryInputSpace;
     resultFS: QuerySpace;
@@ -13,8 +14,8 @@ export declare class ReduceBuilder implements QueryBuilder {
     order?: Top | Ordering;
     limit?: number;
     type: 'grouping' | 'project';
-    constructor(baseFS: FieldSpace, refineThis: PipeSegment | undefined);
-    getResultSpace(fs: FieldSpace, refineThis: PipeSegment | undefined): QuerySpace;
+    constructor(baseFS: FieldSpace, refineThis: PipeSegment | undefined, isNestIn: QuerySpace | undefined, astEl: MalloyElement);
+    getResultSpace(fs: FieldSpace, refineThis: PipeSegment | undefined, isNestIn: QuerySpace | undefined, astEl: MalloyElement): QuerySpace;
     execute(qp: QueryProperty): void;
     refineFrom(from: PipeSegment | undefined, to: QuerySegment): void;
     finalize(fromSeg: PipeSegment | undefined): PipeSegment;

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

@@ -32,14 +32,14 @@ const top_1 = require("../query-properties/top");
 const query_spaces_1 = require("../field-space/query-spaces");
 const definition_list_1 = require("../types/definition-list");
 class ReduceBuilder {
-    constructor(baseFS, refineThis) {
+    constructor(baseFS, refineThis, isNestIn, astEl) {
         this.filters = [];
-        this.resultFS = this.getResultSpace(baseFS, refineThis);
+        this.resultFS = this.getResultSpace(baseFS, refineThis, isNestIn, astEl);
         this.inputFS = this.resultFS.inputSpace();
         this.type = 'grouping';
     }
-    getResultSpace(fs, refineThis) {
-        return new query_spaces_1.ReduceFieldSpace(fs, refineThis);
+    getResultSpace(fs, refineThis, isNestIn, astEl) {
+        return new query_spaces_1.ReduceFieldSpace(fs, refineThis, isNestIn, astEl);
     }
     execute(qp) {
         if (qp.queryExecute) {
@@ -87,7 +87,7 @@ class ReduceBuilder {
         }
     }
     refineFrom(from, to) {
-        if (from && from.type !== 'index') {
+        if (from && from.type !== 'index' && from.type !== 'raw') {
             if (!this.order) {
                 if (from.orderBy) {
                     to.orderBy = from.orderBy;

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

@@ -1,11 +1,11 @@
 import { Annotation } from '../../../model';
 import { DocStatement, Document, MalloyElement } from '../types/malloy-element';
 import { Noteable, extendNoteMethod } from '../types/noteable';
-import { SourceQueryNode } from '../elements/source-query';
+import { SourceQueryElement } from '../source-query-elements/source-query-element';
 export declare class AnonymousQuery extends MalloyElement implements DocStatement, Noteable {
-    readonly queryExpr: SourceQueryNode;
+    readonly queryExpr: SourceQueryElement;
     elementType: string;
-    constructor(queryExpr: SourceQueryNode);
+    constructor(queryExpr: SourceQueryElement);
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
     note?: Annotation;

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

@@ -0,0 +1,17 @@
+import { Source } from '../source-elements/source';
+import { QueryComp } from '../types/query-comp';
+import { QueryElement } from '../types/query-element';
+import { QueryBase } from './query-base';
+import { View } from '../view-elements/view';
+/**
+ * A query operation that adds segments to a LHS source or query.
+ *
+ * e.g. `flights -> by_carrier`
+ */
+export declare class QueryArrow extends QueryBase implements QueryElement {
+    readonly source: Source | QueryElement;
+    readonly view: View;
+    elementType: string;
+    constructor(source: Source | QueryElement, view: View);
+    queryComp(isRefOk: boolean): QueryComp;
+}