@malloydata/malloy 0.0.39-dev230613161129 → 0.0.39

package/dist/dialect/{postgres.js → postgres/postgres.js}

@@ -23,9 +23,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgresDialect = void 0;
-const utils_1 = require("../model/utils");
-const malloy_types_1 = require("../model/malloy_types");
-const dialect_1 = require("./dialect");
+const utils_1 = require("../../model/utils");
+const malloy_types_1 = require("../../model/malloy_types");
+const functions_1 = require("./functions");
+const dialect_1 = require("../dialect");
 const castMap = {
     'number': 'double precision',
     'string': 'varchar',
@@ -63,12 +64,11 @@ class PostgresDialect extends dialect_1.Dialect {
         this.unnestWithNumbers = false;
         this.defaultSampling = { rows: 50000 };
         this.supportUnnestArrayAgg = true;
+        this.supportsAggDistinct = true;
         this.supportsCTEinCoorelatedSubQueries = true;
         this.dontUnionIndex = false;
         this.supportsQualify = false;
-        this.functionInfo = {
-            'concat': { returnType: 'string' },
-        };
+        this.globalFunctions = functions_1.POSTGRES_FUNCTIONS;
     }
     quoteTablePath(tablePath) {
         return tablePath
@@ -218,7 +218,7 @@ class PostgresDialect extends dialect_1.Dialect {
         throw new Error('Not implemented Yet');
     }
     sqlNow() {
-        return (0, malloy_types_1.mkExpr) `CURRENT_TIMESTAMP`;
+        return (0, malloy_types_1.mkExpr) `LOCALTIMESTAMP`;
     }
     sqlTrunc(qi, sqlTime, units) {
         // adjusting for monday/sunday weeks
@@ -292,9 +292,6 @@ class PostgresDialect extends dialect_1.Dialect {
         }
         return `TIMESTAMP '${timeString}'`;
     }
-    getFunctionInfo(functionName) {
-        return this.functionInfo[functionName];
-    }
     sqlMeasureTime(from, to, units) {
         let lVal = from.value;
         let rVal = to.value;
@@ -317,6 +314,17 @@ class PostgresDialect extends dialect_1.Dialect {
       ) a
     )`;
     }
+    // TODO this does not preserve the types of the arguments, meaning we have to hack
+    // around this in the definitions of functions that use this to cast back to the correct
+    // type (from text). See the postgres implementation of stddev.
+    sqlAggDistinct(key, values, func) {
+        return `(
+      SELECT ${func(values.map((v, i) => `(a::json->>'f${i + 2}')`))} as value
+      FROM (
+        SELECT UNNEST(array_agg(distinct row_to_json(row(${key},${values.join(',')}))::text)) a
+      ) a
+    )`;
+    }
     sqlSampleTable(tableSQL, sample) {
         if (sample !== undefined) {
             if ((0, malloy_types_1.isSamplingEnable)(sample) && sample.enable) {
@@ -337,6 +345,12 @@ class PostgresDialect extends dialect_1.Dialect {
     sqlLiteralString(literal) {
         return "'" + literal.replace(/'/g, "''") + "'";
     }
+    sqlLiteralRegexp(literal) {
+        return "'" + literal.replace(/'/g, "''") + "'";
+    }
+    getGlobalFunctionDef(name) {
+        return functions_1.POSTGRES_FUNCTIONS.get(name);
+    }
 }
 exports.PostgresDialect = PostgresDialect;
 //# sourceMappingURL=postgres.js.map

package/dist/dialect/standardsql/functions/chr.d.ts

@@ -0,0 +1,2 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare function fnChr(): DialectFunctionOverloadDef[];

package/dist/dialect/standardsql/functions/chr.js

@@ -0,0 +1,37 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnChr = void 0;
+const util_1 = require("../../functions/util");
+function fnChr() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.anyExprType)('number'));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('string'), [value.param], 
+        // Need to explicitly have a case for when the arg is 0, to return ''
+        // Also, cannot compare literal null with = in BigQuery, so we wrap in an IFNULL
+        (0, util_1.sql) `CASE WHEN IFNULL(${value.arg}, 1) = 0 THEN '' ELSE CHR(${value.arg}) END`),
+    ];
+}
+exports.fnChr = fnChr;
+//# sourceMappingURL=chr.js.map

package/dist/dialect/standardsql/functions/index.d.ts

@@ -0,0 +1 @@
+export { STANDARDSQL_FUNCTIONS } from './standardsql_functions';

package/dist/dialect/standardsql/functions/index.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STANDARDSQL_FUNCTIONS = void 0;
+var standardsql_functions_1 = require("./standardsql_functions");
+Object.defineProperty(exports, "STANDARDSQL_FUNCTIONS", { enumerable: true, get: function () { return standardsql_functions_1.STANDARDSQL_FUNCTIONS; } });
+//# sourceMappingURL=index.js.map

package/dist/dialect/standardsql/functions/pi.d.ts

@@ -0,0 +1,2 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare function fnPi(): DialectFunctionOverloadDef[];

package/dist/dialect/standardsql/functions/pi.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnPi = void 0;
+const util_1 = require("../../functions/util");
+function fnPi() {
+    // There's no built-in PI function, but we can compute it easily.
+    return [(0, util_1.overload)((0, util_1.minScalar)('number'), [], (0, util_1.sql) `ACOS(-1)`)];
+}
+exports.fnPi = fnPi;
+//# sourceMappingURL=pi.js.map

package/dist/dialect/standardsql/functions/standardsql_functions.d.ts

@@ -0,0 +1 @@
+export declare const STANDARDSQL_FUNCTIONS: import("../../functions/function_map").FunctionMap;

package/dist/dialect/standardsql/functions/standardsql_functions.js

@@ -0,0 +1,33 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STANDARDSQL_FUNCTIONS = void 0;
+const functions_1 = require("../../functions");
+const chr_1 = require("./chr");
+const pi_1 = require("./pi");
+exports.STANDARDSQL_FUNCTIONS = functions_1.FUNCTIONS.clone();
+exports.STANDARDSQL_FUNCTIONS.add('pi', pi_1.fnPi);
+exports.STANDARDSQL_FUNCTIONS.add('chr', chr_1.fnChr);
+exports.STANDARDSQL_FUNCTIONS.seal();
+//# sourceMappingURL=standardsql_functions.js.map

package/dist/dialect/standardsql/index.d.ts

@@ -0,0 +1 @@
+export * from './standardsql';

package/dist/dialect/standardsql/index.js

@@ -0,0 +1,40 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./standardsql"), exports);
+//# sourceMappingURL=index.js.map

package/dist/dialect/{standardsql.d.ts → standardsql/standardsql.d.ts}

@@ -1,5 +1,6 @@
-import { Expr, ExtractUnit, Sampling, TimeValue, TimestampUnit, TypecastFragment } from '../model/malloy_types';
-import { Dialect, DialectFieldList, FunctionInfo, QueryInfo } from './dialect';
+import { Expr, ExtractUnit, Sampling, TimeValue, TimestampUnit, TypecastFragment } from '../../model/malloy_types';
+import { DialectFunctionOverloadDef } from '../functions';
+import { Dialect, DialectFieldList, QueryInfo } from '../dialect';
 export declare class StandardSQLDialect extends Dialect {
     name: string;
     defaultNumberType: string;
@@ -13,10 +14,10 @@ export declare class StandardSQLDialect extends Dialect {
         enable: boolean;
     };
     supportUnnestArrayAgg: boolean;
+    supportsAggDistinct: boolean;
     supportsCTEinCoorelatedSubQueries: boolean;
     dontUnionIndex: boolean;
     supportsQualify: boolean;
-    functionInfo: Record<string, FunctionInfo>;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     sqlAnyValue(groupSet: number, fieldName: string): string;
@@ -41,9 +42,11 @@ export declare class StandardSQLDialect extends Dialect {
     sqlAlterTime(op: '+' | '-', expr: TimeValue, n: Expr, timeframe: TimestampUnit): Expr;
     ignoreInProject(fieldName: string): boolean;
     sqlCast(qi: QueryInfo, cast: TypecastFragment): Expr;
-    sqlRegexpMatch(expr: Expr, regexp: string): Expr;
+    sqlRegexpMatch(expr: Expr, regexp: Expr): Expr;
     sqlLiteralTime(qi: QueryInfo, timeString: string, type: 'date' | 'timestamp', timezone: string | undefined): string;
     sqlMeasureTime(from: TimeValue, to: TimeValue, units: string): Expr;
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
     sqlLiteralString(literal: string): string;
+    sqlLiteralRegexp(literal: string): string;
+    getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
 }

package/dist/dialect/{standardsql.js → standardsql/standardsql.js}

@@ -23,9 +23,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StandardSQLDialect = void 0;
-const utils_1 = require("../model/utils");
-const malloy_types_1 = require("../model/malloy_types");
-const dialect_1 = require("./dialect");
+const utils_1 = require("../../model/utils");
+const malloy_types_1 = require("../../model/malloy_types");
+const functions_1 = require("./functions");
+const dialect_1 = require("../dialect");
 const castMap = {
     'number': 'float64',
 };
@@ -69,16 +70,10 @@ class StandardSQLDialect extends dialect_1.Dialect {
         this.unnestWithNumbers = false;
         this.defaultSampling = { enable: false };
         this.supportUnnestArrayAgg = false;
+        this.supportsAggDistinct = false;
         this.supportsCTEinCoorelatedSubQueries = false;
         this.dontUnionIndex = true; // bigquery can't use a sample table more than once in a query.
         this.supportsQualify = true;
-        // I think we want an optional list of parameters types that we force a cast to.
-        this.functionInfo = {
-            'timestamp_seconds': {
-                returnType: 'timestamp',
-            },
-            'concat': { returnType: 'string' },
-        };
         this.keywords = `
   ALL
   AND
@@ -344,7 +339,7 @@ ${(0, utils_1.indent)(sql)}
         return cast.expr;
     }
     sqlRegexpMatch(expr, regexp) {
-        return (0, malloy_types_1.mkExpr) `REGEXP_CONTAINS(${expr}, r${regexp})`;
+        return (0, malloy_types_1.mkExpr) `REGEXP_CONTAINS(${expr}, ${regexp})`;
     }
     sqlLiteralTime(qi, timeString, type, timezone) {
         if (type === 'date') {
@@ -412,6 +407,13 @@ ${(0, utils_1.indent)(sql)}
         const noVirgule = literal.replace(/\\/g, '\\\\');
         return "'" + noVirgule.replace(/'/g, "\\'") + "'";
     }
+    sqlLiteralRegexp(literal) {
+        const noVirgule = literal.replace(/\\/g, '\\\\');
+        return "r'" + noVirgule.replace(/'/g, "\\'") + "'";
+    }
+    getGlobalFunctionDef(name) {
+        return functions_1.STANDARDSQL_FUNCTIONS.get(name);
+    }
 }
 exports.StandardSQLDialect = StandardSQLDialect;
 //# sourceMappingURL=standardsql.js.map

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, DocumentLocation, DocumentRange, DocumentPosition, } from './model';
+export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FieldValueType, ExpressionTypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, } from './model';
 export { Segment, isFilteredAliasedName, flattenQuery, expressionIsCalculation, } from './model';
 export { HighlightType, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';

package/dist/lang/ast/ast-utils.js

@@ -36,6 +36,7 @@ function errorFor(reason) {
         dataType: 'unknown',
         expressionType: 'scalar',
         value: [`_ERROR_${reason.replace(/ /g, '_')}`],
+        evalSpace: 'constant',
     };
 }
 exports.errorFor = errorFor;

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

@@ -34,7 +34,7 @@ class DefineQuery extends malloy_element_1.MalloyElement {
     execute(doc) {
         const existing = doc.getEntry(this.name);
         if (existing) {
-            this.log(`Query '${this.name}' is already defined, cannot redefine`);
+            this.log(`'${this.name}' is already defined, cannot redefine`);
             return;
         }
         const entry = {

package/dist/lang/ast/elements/import-statement.js

@@ -57,7 +57,12 @@ class ImportStatement extends malloy_element_1.MalloyElement {
                     return childNeeds;
                 }
                 for (const [importing, entry] of Object.entries(trans.getChildExports(this.fullURL))) {
-                    doc.setEntry(importing, { entry, exported: false });
+                    if (doc.getEntry(importing)) {
+                        this.log(`Cannot redefine '${importing}'`);
+                    }
+                    else {
+                        doc.setEntry(importing, { entry, exported: false });
+                    }
                 }
             }
             else if (src.status === 'error') {

package/dist/lang/ast/executors/index-executor.d.ts

@@ -12,7 +12,7 @@ export declare class IndexExecutor implements Executor {
     sample?: Sampling;
     resultFS: IndexFieldSpace;
     inputFS: QueryInputSpace;
-    constructor(inputFS: FieldSpace);
+    constructor(inputFS: FieldSpace, refineThis: PipeSegment | undefined);
     execute(qp: QueryProperty): void;
     finalize(from: PipeSegment | undefined): PipeSegment;
 }

package/dist/lang/ast/executors/index-executor.js

@@ -30,9 +30,9 @@ 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 IndexExecutor {
-    constructor(inputFS) {
+    constructor(inputFS, refineThis) {
         this.filters = [];
-        this.resultFS = new index_field_space_1.IndexFieldSpace(inputFS);
+        this.resultFS = new index_field_space_1.IndexFieldSpace(inputFS, refineThis);
         this.inputFS = this.resultFS.exprSpace;
     }
     execute(qp) {

package/dist/lang/ast/executors/project-executor.d.ts

@@ -4,7 +4,7 @@ import { ProjectFieldSpace } from '../field-space/project-field-space';
 import { QueryProperty } from '../types/query-property';
 import { ReduceExecutor } from './reduce-executor';
 export declare class ProjectExecutor extends ReduceExecutor {
-    getResultSpace(fs: FieldSpace): ProjectFieldSpace;
+    getResultSpace(fs: FieldSpace, refineThis: PipeSegment | undefined): ProjectFieldSpace;
     execute(qp: QueryProperty): void;
     finalize(fromSeg: PipeSegment | undefined): PipeSegment;
 }

package/dist/lang/ast/executors/project-executor.js

@@ -32,8 +32,8 @@ const project_statement_1 = require("../query-properties/project-statement");
 const project_field_space_1 = require("../field-space/project-field-space");
 const reduce_executor_1 = require("./reduce-executor");
 class ProjectExecutor extends reduce_executor_1.ReduceExecutor {
-    getResultSpace(fs) {
-        return new project_field_space_1.ProjectFieldSpace(fs);
+    getResultSpace(fs, refineThis) {
+        return new project_field_space_1.ProjectFieldSpace(fs, refineThis);
     }
     execute(qp) {
         if (qp instanceof project_statement_1.ProjectStatement) {

package/dist/lang/ast/executors/reduce-executor.d.ts

@@ -5,16 +5,14 @@ import { Top } from '../query-properties/top';
 import { QueryProperty } from '../types/query-property';
 import { Executor } from '../types/executor';
 import { QueryInputSpace, QuerySpace } from '../field-space/query-spaces';
-import { DynamicSpace } from '../field-space/dynamic-space';
 export declare class ReduceExecutor implements Executor {
     inputFS: QueryInputSpace;
     resultFS: QuerySpace;
     filters: FilterExpression[];
     order?: Top | Ordering;
     limit?: number;
-    refinedInputFS?: DynamicSpace;
-    constructor(baseFS: FieldSpace);
-    getResultSpace(fs: FieldSpace): QuerySpace;
+    constructor(baseFS: FieldSpace, refineThis: PipeSegment | undefined);
+    getResultSpace(fs: FieldSpace, refineThis: PipeSegment | undefined): QuerySpace;
     execute(qp: QueryProperty): void;
     refineFrom(from: PipeSegment | undefined, to: QuerySegment): void;
     finalize(fromSeg: PipeSegment | undefined): PipeSegment;

package/dist/lang/ast/executors/reduce-executor.js

@@ -36,15 +36,16 @@ const top_1 = require("../query-properties/top");
 const nests_1 = require("../query-properties/nests");
 const nest_1 = require("../query-properties/nest");
 const query_spaces_1 = require("../field-space/query-spaces");
+const calculate_1 = require("../query-properties/calculate");
 const timezone_statement_1 = require("../source-properties/timezone-statement");
 class ReduceExecutor {
-    constructor(baseFS) {
+    constructor(baseFS, refineThis) {
         this.filters = [];
-        this.resultFS = this.getResultSpace(baseFS);
+        this.resultFS = this.getResultSpace(baseFS, refineThis);
         this.inputFS = this.resultFS.exprSpace;
     }
-    getResultSpace(fs) {
-        return new query_spaces_1.ReduceFieldSpace(fs);
+    getResultSpace(fs, refineThis) {
+        return new query_spaces_1.ReduceFieldSpace(fs, refineThis);
     }
     execute(qp) {
         if (qp instanceof group_by_1.GroupBy ||
@@ -52,6 +53,9 @@ class ReduceExecutor {
             qp instanceof nests_1.Nests) {
             this.resultFS.addQueryItems(...qp.list);
         }
+        else if (qp instanceof calculate_1.Calculate) {
+            this.resultFS.addQueryItems(...qp.list);
+        }
         else if ((0, nest_1.isNestedQuery)(qp)) {
             this.resultFS.addQueryItems(qp);
         }

package/dist/lang/ast/expressions/binary-boolean.d.ts

@@ -6,7 +6,7 @@ export declare abstract class BinaryBoolean<opType extends string> extends Expre
     readonly op: opType;
     readonly right: ExpressionDef;
     elementType: string;
-    legalChildTypes: import("../types/type-desc").TypeDesc[];
+    legalChildTypes: import("../../../model/malloy_types").TypeDesc[];
     constructor(left: ExpressionDef, op: opType, right: ExpressionDef);
     getExpression(fs: FieldSpace): ExprValue;
 }

package/dist/lang/ast/expressions/binary-boolean.js

@@ -41,9 +41,11 @@ class BinaryBoolean extends expression_def_1.ExpressionDef {
         const left = this.left.getExpression(fs);
         const right = this.right.getExpression(fs);
         if (this.typeCheck(this.left, left) && this.typeCheck(this.right, right)) {
+            const evalSpace = (0, malloy_types_1.mergeEvalSpaces)(left.evalSpace, right.evalSpace);
             return {
                 dataType: 'boolean',
                 expressionType: (0, malloy_types_1.maxExpressionType)(left.expressionType, right.expressionType),
+                evalSpace,
                 value: (0, utils_1.compose)(left.value, this.op, right.value),
             };
         }

package/dist/lang/ast/expressions/constant-sub-expression.js

@@ -43,12 +43,21 @@ class ConstantFieldSpace {
             found: undefined,
         };
     }
+    entries() {
+        return [];
+    }
+    entry() {
+        return undefined;
+    }
     dialectObj() {
         return undefined;
     }
     whenComplete(step) {
         step();
     }
+    isQueryFieldSpace() {
+        return false;
+    }
 }
 class DollarReference extends expression_def_1.ExpressionDef {
     constructor(refType) {
@@ -61,6 +70,7 @@ class DollarReference extends expression_def_1.ExpressionDef {
             dataType: this.refType,
             value: [{ type: 'applyVal' }],
             expressionType: 'scalar',
+            evalSpace: 'constant',
         };
     }
 }

package/dist/lang/ast/expressions/expr-aggregate-function.d.ts

@@ -1,14 +1,14 @@
+import { FieldValueType } from '../../../model/malloy_types';
 import { FieldReference } from '../query-items/field-references';
 import { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
 import { FieldSpace } from '../types/field-space';
-import { FieldValueType } from '../types/type-desc';
 export declare abstract class ExprAggregateFunction extends ExpressionDef {
     readonly func: string;
     elementType: string;
     source?: FieldReference;
     expr?: ExpressionDef;
-    legalChildTypes: import("../types/type-desc").TypeDesc[];
+    legalChildTypes: import("../../../model/malloy_types").TypeDesc[];
     constructor(func: string, expr?: ExpressionDef);
     returns(_forExpression: ExprValue): FieldValueType;
     getExpression(fs: FieldSpace): ExprValue;

package/dist/lang/ast/expressions/expr-aggregate-function.js

@@ -25,6 +25,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprAggregateFunction = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
+const query_spaces_1 = require("../field-space/query-spaces");
+const reference_field_1 = require("../field-space/reference-field");
 const struct_space_field_base_1 = require("../field-space/struct-space-field-base");
 const fragtype_utils_1 = require("../fragtype-utils");
 const expression_def_1 = require("../types/expression-def");
@@ -54,9 +56,28 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
                     exprVal = {
                         dataType: footType.dataType,
                         expressionType: footType.expressionType,
-                        value: [{ type: 'field', path: this.source.refString }],
+                        value: [
+                            footType.evalSpace === 'output'
+                                ? {
+                                    type: 'outputField',
+                                    name: this.source.refString,
+                                }
+                                : {
+                                    type: 'field',
+                                    path: this.source.refString,
+                                },
+                        ],
+                        evalSpace: footType.evalSpace,
                     };
-                    structPath = this.source.sourceString;
+                    // If you reference an output field as the foot, then we need to get the
+                    // source from that field, rather than using the default source.
+                    if (sourceFoot instanceof query_spaces_1.OutputSpaceEntry &&
+                        sourceFoot.inputSpaceEntry instanceof reference_field_1.ReferenceField) {
+                        structPath = sourceFoot.inputSpaceEntry.fieldRef.sourceString;
+                    }
+                    else {
+                        structPath = this.source.sourceString;
+                    }
                 }
                 else {
                     if (!(sourceFoot instanceof struct_space_field_base_1.StructSpaceFieldBase)) {
@@ -74,6 +95,10 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
             this.log('Missing expression for aggregate function');
             return (0, ast_utils_1.errorFor)('agggregate without expression');
         }
+        if ((0, malloy_types_1.expressionIsAggregate)(exprVal.expressionType)) {
+            this.log('Aggregate expression cannot be aggregate');
+            return (0, ast_utils_1.errorFor)('reagggregate');
+        }
         if (this.typeCheck(this.expr || this, {
             ...exprVal,
             expressionType: 'scalar',
@@ -90,6 +115,7 @@ class ExprAggregateFunction extends expression_def_1.ExpressionDef {
                 dataType: this.returns(exprVal),
                 expressionType: 'aggregate',
                 value: [f],
+                evalSpace: 'output',
             };
         }
         return (0, ast_utils_1.errorFor)('aggregate type check');

package/dist/lang/ast/expressions/expr-alternation-tree.js

@@ -39,6 +39,7 @@ class ExprAlternationTree extends binary_boolean_1.BinaryBoolean {
         return {
             dataType: 'boolean',
             expressionType: (0, malloy_types_1.maxExpressionType)(choice1.expressionType, choice2.expressionType),
+            evalSpace: (0, malloy_types_1.mergeEvalSpaces)(choice1.evalSpace, choice2.evalSpace),
             value: (0, utils_1.compose)(choice1.value, this.op === '&' ? 'and' : 'or', choice2.value),
         };
     }