@malloydata/malloy 0.0.308 → 0.0.310

package/README.md

@@ -1,6 +1,6 @@
 # Malloy
 
-Malloy is an experimental language for describing data relationships and transformations. It is both a semantic modeling language and a querying language that runs queries against a relational database. Malloy currently connects to BigQuery and Postgres, and natively supports DuckDB. We've built a Visual Studio Code extension to facilitate building Malloy data models, querying and transforming data, and creating simple visualizations and dashboards.
+Malloy is a modern open source language for describing data relationships and transformations. It is both a semantic modeling language and a querying language that runs queries against a relational database. Malloy currently connects to BigQuery and Postgres, and natively supports DuckDB. We've built a Visual Studio Code extension to facilitate building Malloy data models, querying and transforming data, and creating simple visualizations and dashboards.
 
 ## Building applications or products in javascript with @malloydata/malloy
 

package/dist/dialect/mysql/mysql.js

@@ -65,6 +65,23 @@ const mysqlToMalloyTypes = {
     // TODO: Check if we need special handling for boolean.
     'tinyint(1)': { type: 'boolean' },
 };
+function malloyTypeToJSONTableType(malloyType) {
+    switch (malloyType.type) {
+        case 'number':
+            return malloyType.numberType === 'integer' ? 'INT' : 'DOUBLE';
+        case 'string':
+            return 'CHAR(255)'; // JSON_TABLE needs a length
+        case 'boolean':
+            return 'INT'; // or TINYINT(1) if you prefer
+        case 'record':
+        case 'array':
+            return 'JSON';
+        case 'timestamp':
+            return 'DATETIME';
+        default:
+            return malloyType.type.toUpperCase();
+    }
+}
 class MySQLDialect extends dialect_1.Dialect {
     constructor() {
         super(...arguments);
@@ -99,14 +116,16 @@ class MySQLDialect extends dialect_1.Dialect {
     malloyTypeToSQLType(malloyType) {
         switch (malloyType.type) {
             case 'number':
-                return malloyType.numberType === 'integer' ? 'BIGINT' : 'DOUBLE';
+                return malloyType.numberType === 'integer' ? 'SIGNED' : 'DOUBLE';
             case 'string':
-                return 'TEXT';
+                return 'CHAR';
+            case 'boolean':
+                return 'SIGNED';
             case 'record':
             case 'array':
                 return 'JSON';
-            case 'date':
             case 'timestamp':
+                return 'DATETIME';
             default:
                 return malloyType.type;
         }
@@ -177,7 +196,7 @@ class MySQLDialect extends dialect_1.Dialect {
         var _a;
         const fields = [];
         for (const f of fieldList) {
-            let fType = this.malloyTypeToSQLType(f.typeDef);
+            let fType = malloyTypeToJSONTableType(f.typeDef);
             if (f.typeDef.type === 'sql native' &&
                 f.typeDef.rawType &&
                 ((_a = f.typeDef.rawType) === null || _a === void 0 ? void 0 : _a.match(/json/))) {

package/dist/dialect/postgres/postgres.d.ts

@@ -1,6 +1,6 @@
-import type { Sampling, AtomicTypeDef, TimeDeltaExpr, TypecastExpr, MeasureTimeExpr, BasicAtomicTypeDef, RecordLiteralNode, ArrayLiteralNode } from '../../model/malloy_types';
+import type { Sampling, AtomicTypeDef, TimeDeltaExpr, TypecastExpr, MeasureTimeExpr, BasicAtomicTypeDef, RecordLiteralNode, ArrayLiteralNode, TimeExtractExpr } from '../../model/malloy_types';
 import type { DialectFunctionOverloadDef } from '../functions';
-import type { DialectFieldList, FieldReferenceType, QueryInfo } from '../dialect';
+import { type DialectFieldList, type FieldReferenceType, type QueryInfo } from '../dialect';
 import { PostgresBase } from '../pg_impl';
 export declare class PostgresDialect extends PostgresBase {
     name: string;
@@ -66,4 +66,5 @@ export declare class PostgresDialect extends PostgresBase {
     validateTypeName(sqlType: string): boolean;
     sqlLiteralRecord(lit: RecordLiteralNode): string;
     sqlLiteralArray(lit: ArrayLiteralNode): string;
+    sqlTimeExtractExpr(qi: QueryInfo, from: TimeExtractExpr): string;
 }

package/dist/dialect/postgres/postgres.js

@@ -26,6 +26,7 @@ exports.PostgresDialect = void 0;
 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 pg_impl_1 = require("../pg_impl");
 const dialect_functions_1 = require("./dialect_functions");
 const function_overrides_1 = require("./function_overrides");
@@ -80,7 +81,7 @@ class PostgresDialect extends pg_impl_1.PostgresBase {
         this.udfPrefix = 'pg_temp.__udf';
         this.hasFinalStage = true;
         this.divisionIsInteger = true;
-        this.supportsSumDistinctFunction = false;
+        this.supportsSumDistinctFunction = true;
         this.unnestWithNumbers = false;
         this.defaultSampling = { rows: 50000 };
         this.supportUnnestArrayAgg = true;
@@ -242,14 +243,33 @@ class PostgresDialect extends pg_impl_1.PostgresBase {
         }
         throw new Error(`Unknown or unhandled postgres time unit: ${df.units}`);
     }
+    // This looks like a partial implementation of a method similar to how DuckDB
+    // does symmetric aggregates, which was abandoned. Leaving it in here for now
+    // in case the original author wants to pick it up again.
+    // sqlSumDistinct(key: string, value: string, funcName: string): string {
+    //   // return `sum_distinct(list({key:${key}, val: ${value}}))`;
+    //   return `(
+    //     SELECT ${funcName}((a::json->>'f2')::DOUBLE PRECISION) as value
+    //     FROM (
+    //       SELECT UNNEST(array_agg(distinct row_to_json(row(${key},${value}))::text)) a
+    //     ) a
+    //   )`;
+    // }
     sqlSumDistinct(key, value, funcName) {
-        // return `sum_distinct(list({key:${key}, val: ${value}}))`;
-        return `(
-      SELECT ${funcName}((a::json->>'f2')::DOUBLE PRECISION) as value
-      FROM (
-        SELECT UNNEST(array_agg(distinct row_to_json(row(${key},${value}))::text)) a
-      ) a
-    )`;
+        const hashKey = this.sqlSumDistinctHashedKey(key);
+        // PostgreSQL requires CAST to NUMERIC before ROUND, which is different
+        // than the generic implementation of sqlSumDistinct, but is OK in
+        // PostgreSQL because NUMERIC has arbitrary precision.
+        const roundedValue = `ROUND(CAST(COALESCE(${value}, 0) AS NUMERIC), 9)`;
+        const sumSQL = `SUM(DISTINCT ${roundedValue} + ${hashKey}) - SUM(DISTINCT ${hashKey})`;
+        const ret = `CAST(${sumSQL} AS DOUBLE PRECISION)`;
+        if (funcName === 'SUM') {
+            return ret;
+        }
+        else if (funcName === 'AVG') {
+            return `(${ret})/NULLIF(COUNT(DISTINCT CASE WHEN ${value} IS NOT NULL THEN ${key} END), 0)`;
+        }
+        throw new Error(`Unknown Symmetric Aggregate function ${funcName}`);
     }
     // 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
@@ -339,6 +359,20 @@ class PostgresDialect extends pg_impl_1.PostgresBase {
         const array = lit.kids.values.map(val => val.sql);
         return 'JSONB_BUILD_ARRAY(' + array.join(',') + ')';
     }
+    sqlTimeExtractExpr(qi, from) {
+        const units = pg_impl_1.timeExtractMap[from.units] || from.units;
+        let extractFrom = from.e.sql;
+        if (malloy_types_1.TD.isTimestamp(from.e.typeDef)) {
+            const tz = (0, dialect_1.qtz)(qi);
+            if (tz) {
+                extractFrom = `(${extractFrom}::TIMESTAMPTZ AT TIME ZONE '${tz}')`;
+            }
+        }
+        // PostgreSQL before 14 returns a double precision for EXTRACT, cast to integer
+        // since it is common to pass an extraction to mod ( like in fitler expressions )
+        const extracted = `EXTRACT(${units} FROM ${extractFrom})::integer`;
+        return from.units === 'day_of_week' ? `(${extracted}+1)` : `(${extracted})`;
+    }
 }
 exports.PostgresDialect = PostgresDialect;
 //# sourceMappingURL=postgres.js.map

package/dist/dialect/trino/trino.js

@@ -519,7 +519,7 @@ ${(0, utils_1.indent)(sql)}
                 const name = (_a = f.as) !== null && _a !== void 0 ? _a : f.name;
                 rowVals.push((_b = lit.kids[name].sql) !== null && _b !== void 0 ? _b : 'internal-error-record-literal');
                 const elType = this.malloyTypeToSQLType(f);
-                rowTypes.push(`${name} ${elType}`);
+                rowTypes.push(`${this.sqlMaybeQuoteIdentifier(name)} ${elType}`);
             }
         }
         return `CAST(ROW(${rowVals.join(',')}) AS ROW(${rowTypes.join(',')}))`;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { DuckDBDialect, StandardSQLDialect, TrinoDialect, PostgresDialect, SnowflakeDialect, MySQLDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, param, variadicParam, literal, spread, Dialect, TinyParser, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, MalloyStandardFunctionImplementations, DefinitionBlueprint, DefinitionBlueprintMap, OverloadedDefinitionBlueprint, TinyToken, } from './dialect';
-export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, } from './model';
-export { isSourceDef, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, } from './model';
+export type { QueryDataRow, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, TimeLiteralNode, TypecastExpr, } from './model';
+export { isSourceDef, isBasicAtomic, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, constantExprToSQL, } from './model';
 export { malloyToQuery, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
 export { Model, Malloy, Runtime, AtomicFieldType, ConnectionRuntime, SingleConnectionRuntime, EmptyURLReader, InMemoryURLReader, FixedConnectionMap, MalloyError, JoinRelationship, SourceRelationship, DateTimeframe, TimestampTimeframe, PreparedResult, Result, QueryMaterializer, CSVWriter, JSONWriter, Parse, DataWriter, Explore, InMemoryModelCache, CacheManager, } from './malloy';

package/dist/index.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isBasicAtomic = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.extractMalloyObjectFromTag = exports.writeMalloyObjectToTag = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = void 0;
+exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.constantExprToSQL = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isBasicAtomic = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
+exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.extractMalloyObjectFromTag = exports.writeMalloyObjectToTag = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -102,6 +102,8 @@ Object.defineProperty(exports, "indent", { enumerable: true, get: function () {
 Object.defineProperty(exports, "composeSQLExpr", { enumerable: true, get: function () { return model_1.composeSQLExpr; } });
 Object.defineProperty(exports, "isTimestampUnit", { enumerable: true, get: function () { return model_1.isTimestampUnit; } });
 Object.defineProperty(exports, "isDateUnit", { enumerable: true, get: function () { return model_1.isDateUnit; } });
+// Used in testing, not really public API
+Object.defineProperty(exports, "constantExprToSQL", { enumerable: true, get: function () { return model_1.constantExprToSQL; } });
 var lang_1 = require("./lang");
 Object.defineProperty(exports, "malloyToQuery", { enumerable: true, get: function () { return lang_1.malloyToQuery; } });
 // Needed for tests only

package/dist/lang/composite-source-utils.js

@@ -39,7 +39,7 @@ sources) {
     let anyComposites = false;
     let joinsProcessed = false;
     const nonCompositeFields = getNonCompositeFields(source);
-    const expandedForError = onlyCompositeUsage(_expandFieldUsage(fieldUsage, rootFields).result, source.fields);
+    const expandedForError = onlyCompositeUsage(expandFieldUsage(fieldUsage, rootFields).result, source.fields);
     if (source.type === 'composite') {
         let found = false;
         anyComposites = true;
@@ -66,7 +66,7 @@ sources) {
             }
             const fieldUsageWithWheres = (_b = mergeFieldUsage(getFieldUsageFromFilterList(inputSource), fieldUsage)) !== null && _b !== void 0 ? _b : [];
             const fieldsForLookup = [...nonCompositeFields, ...inputSource.fields];
-            const expanded = _expandFieldUsage(fieldUsageWithWheres, fieldsForLookup);
+            const expanded = expandFieldUsage(fieldUsageWithWheres, fieldsForLookup);
             if (expanded.missingFields.length > 0) {
                 // A lookup failed while expanding, which means this source certainly won't work
                 for (const missingField of expanded.missingFields) {
@@ -177,7 +177,7 @@ sources) {
     }
     else if (source.partitionComposite !== undefined) {
         anyComposites = true;
-        const expanded = _expandFieldUsage(fieldUsage, rootFields).result;
+        const expanded = expandFieldUsage(fieldUsage, rootFields).result;
         // TODO possibly abort if expanded has missing fields...
         const expandedCategorized = categorizeFieldUsage(expanded);
         const { partitionFilter, issues } = getPartitionCompositeFilter(source.partitionComposite, expandedCategorized.sourceUsage);
@@ -199,7 +199,7 @@ sources) {
         };
     }
     if (!joinsProcessed) {
-        const expanded = _expandFieldUsage(fieldUsage, getJoinFields(rootFields, path));
+        const expanded = expandFieldUsage(fieldUsage, getJoinFields(rootFields, path));
         if (expanded.missingFields.length > 0) {
             return {
                 error: {
@@ -278,7 +278,7 @@ function getExpandedSegment(segment, inputSource) {
         updatedSegment = { ...segment, queryFields: updatedQueryFields };
     }
     const allFieldUsage = mergeFieldUsage(getFieldUsageFromFilterList(inputSource), segment.fieldUsage);
-    const expanded = _expandFieldUsage(allFieldUsage || [], fields);
+    const expanded = expandFieldUsage(allFieldUsage || [], fields);
     // Merge ungroupings from direct collection and field expansion
     const allUngroupings = [...collectedUngroupings, ...expanded.ungroupings];
     return {
@@ -334,7 +334,7 @@ function findActiveJoins(dependencies) {
  * - `missingFields`: References to fields which could not be resolved
  * - `activeJoins`: Topologically sorted list of joins needed to resolve these uses
  */
-function _expandFieldUsage(fieldUsage, fields) {
+function expandFieldUsage(fieldUsage, fields) {
     var _a, _b, _c;
     const seen = {};
     const missingFields = [];

package/dist/model/expression_compiler.js

@@ -33,16 +33,15 @@ function sqlSumDistinct(dialect, sqlExp, sqlDistintKey) {
     const precision = 9;
     const uniqueInt = dialect.sqlSumDistinctHashedKey(sqlDistintKey);
     const multiplier = 10 ** (precision - NUMERIC_DECIMAL_PRECISION);
-    const sumSQL = `
-  (
-    SUM(DISTINCT
-      (CAST(ROUND(COALESCE(${sqlExp},0)*(${multiplier}*1.0), ${NUMERIC_DECIMAL_PRECISION}) AS ${dialect.defaultDecimalType}) +
-      ${uniqueInt}
-    ))
-    -
-     SUM(DISTINCT ${uniqueInt})
+    // Ensure value is numeric and handle nulls
+    const safeValue = `CAST(COALESCE(${sqlExp}, 0) AS ${dialect.defaultDecimalType})`;
+    // Scale and round to eliminate floating point differences
+    const roundedValue = `ROUND(${safeValue}*${multiplier}, ${NUMERIC_DECIMAL_PRECISION})`;
+    const sumSQL = `(
+    SUM(DISTINCT ${roundedValue} + ${uniqueInt})
+    - SUM(DISTINCT ${uniqueInt})
   )`;
-    let ret = `(${sumSQL}/(${multiplier}*1.0))`;
+    let ret = `(${sumSQL}/${multiplier})`;
     ret = `CAST(${ret} AS ${dialect.defaultNumberType})`;
     return ret;
 }

package/dist/model/filter_compilers.d.ts

@@ -33,4 +33,5 @@ export declare class TemporalFilterCompiler {
     mod7(n: string): string;
     private moment;
     private isIn;
+    private weekdayMoment;
 }

package/dist/model/filter_compilers.js

@@ -521,51 +521,20 @@ class TemporalFilterCompiler {
                 return this.lastUnit(m.units);
             case 'next':
                 return this.nextUnit(m.units);
+            case 'sunday':
+                return this.weekdayMoment(1, m.which);
             case 'monday':
+                return this.weekdayMoment(2, m.which);
             case 'tuesday':
+                return this.weekdayMoment(3, m.which);
             case 'wednesday':
+                return this.weekdayMoment(4, m.which);
             case 'thursday':
+                return this.weekdayMoment(5, m.which);
             case 'friday':
+                return this.weekdayMoment(6, m.which);
             case 'saturday':
-            case 'sunday': {
-                const destDay = [
-                    'sunday',
-                    'monday',
-                    'tuesday',
-                    'wednesday',
-                    'thursday',
-                    'friday',
-                    'saturday',
-                ].indexOf(m.moment);
-                const dow = this.dayofWeek(this.nowExpr()).sql;
-                if (m.which === 'next') {
-                    const nForwards = `${this.mod7(`${destDay}-(${dow}-1)+6`)}+1`;
-                    const begin = this.delta(this.thisUnit('day').begin, '+', nForwards, 'day');
-                    const end = this.delta(this.thisUnit('day').begin, '+', `${nForwards}+1`, 'day');
-                    // console.log(
-                    //   `SELECT ${
-                    //     this.nowExpr().sql
-                    //   } as now,\n  ${destDay} as destDay,\n  ${dow} as dow,\n  ${nForwards} as nForwards,\n  ${
-                    //     begin.sql
-                    //   } as begin,\n   ${end.sql} as end`
-                    // );
-                    return { begin, end: end.sql };
-                }
-                // dacks back = mod((daw0 - dst) + 6, 7) + 1;
-                // dacks back = mod(((daw - 1) - dst) + 6, 7) + 1;
-                // dacks back = mod(((daw) - dst) + 7, 7) + 1;
-                const nBack = `${this.mod7(`(${dow}-1)-${destDay}+6`)}+1`;
-                const begin = this.delta(this.thisUnit('day').begin, '-', nBack, 'day');
-                const end = this.delta(this.thisUnit('day').begin, '-', `(${nBack})-1`, 'day');
-                // console.log(
-                //   `SELECT ${
-                //     this.nowExpr().sql
-                //   } as now,\n  ${destDay} as destDay,\n  ${dow} as dow,\n  ${nBack} as nBack,\n  ${
-                //     begin.sql
-                //   } as begin,\n   ${end.sql} as end`
-                // );
-                return { begin, end: end.sql };
-            }
+                return this.weekdayMoment(7, m.which);
         }
     }
     isIn(notIn, begin, end) {
@@ -581,6 +550,27 @@ class TemporalFilterCompiler {
         end = this.time(end);
         return `${this.expr} ${begOp} ${begin} ${joinOp} ${this.expr} ${endOp} ${end}`;
     }
+    weekdayMoment(destDay, which) {
+        const direction = which || 'last';
+        const dow = this.dayofWeek(this.nowExpr());
+        const todayBegin = this.thisUnit('day').begin;
+        // destDay comes in as 1-7 (Malloy format), convert to 0-6
+        const destDayZeroBased = destDay - 1;
+        // dow is 1-7, convert to 0-6 for the arithmetic
+        const dowZeroBased = `(${dow.sql}-1)`;
+        let daysOffset;
+        if (direction === 'next') {
+            // Days forward: ((destDay - dow + 6) % 7) + 1
+            daysOffset = `${this.mod7(`${destDayZeroBased}-${dowZeroBased}+6`)}+1`;
+        }
+        else {
+            // Days back: ((dow - destDay + 6) % 7) + 1
+            daysOffset = `${this.mod7(`${dowZeroBased}-${destDayZeroBased}+6`)}+1`;
+        }
+        const begin = this.delta(todayBegin, direction === 'next' ? '+' : '-', daysOffset, 'day');
+        const end = this.delta(begin, '+', '1', 'day');
+        return { begin, end: end.sql };
+    }
 }
 exports.TemporalFilterCompiler = TemporalFilterCompiler;
 //# sourceMappingURL=filter_compilers.js.map

package/dist/model/query_node.d.ts

@@ -80,7 +80,7 @@ export declare class QueryStruct {
     /**
      * For fields which are a record, but the value is an expression
      * we capture the context needed to generate the expression in
-     * QueryQuery.expandFields. Later in the compilation if a
+     * QueryQuery.expandRecordExpressions. Later in the compilation if a
      * reference passes through this struct, this will call
      * the expression compiler with the correct context
      * to compute the record value.

package/dist/model/query_query.d.ts

@@ -54,11 +54,11 @@ export declare class QueryQuery extends QueryField {
      * @param resultStruct - The FieldInstanceResult containing compilation context
      * @param source - The QueryStruct to traverse (initially the query's parent/input)
      */
-    expandSource(resultStruct: FieldInstanceResult, source: QueryStruct): void;
+    expandRecordExpressions(resultStruct: FieldInstanceResult, source: QueryStruct): void;
     generateSQLFilters(resultStruct: FieldInstanceResult, which: 'where' | 'having'): AndChain;
     prepare(_stageWriter: StageWriter | undefined): void;
     private findJoins;
-    addAlwaysJoins(rootResult: FieldInstanceResultRoot): void;
+    addAlwaysJoins(): void;
     getResultMetadata(fi: FieldInstance): ResultStructMetadataDef | ResultMetadataDef | undefined;
     /**  returns a fields and primary key of a struct for this query */
     getResultStructDef(resultStruct?: FieldInstanceResult, isRoot?: boolean): QueryResultDef;

package/dist/model/query_query.js

@@ -93,83 +93,52 @@ class QueryQuery extends query_node_1.QueryField {
         const as = field.getIdentifier();
         return { as, field };
     }
-    addDependantPath(resultStruct, context, path, uniqueKeyRequirement) {
-        if (path.length === 0) {
-            return;
-        }
-        // Loop through path segments, ensuring each join exists
-        let currentContext = context;
-        for (const segment of path.slice(0, -1)) {
-            // Try to get the field at this path segment
-            let segmentField;
-            try {
-                segmentField = currentContext.getFieldByName([segment]);
-            }
-            catch {
-                // Field doesn't exist, need to add the join
-                // This is where we'd need to figure out how to create the missing join
-                // Maybe we need more context about what join we're trying to add?
-                throw new Error(`Cannot find join '${segment}' in ${path.join('.')} to add to query`);
-            }
-            if (segmentField instanceof query_node_1.QueryFieldStruct) {
-                if ((0, malloy_types_1.isJoinedSource)(segmentField.fieldDef)) {
-                    resultStruct
-                        .root()
-                        .addStructToJoin(segmentField.queryStruct, undefined);
-                    currentContext = segmentField.queryStruct;
-                }
-                else {
-                    // Can't navigate deeper into non-joined sources like records
-                    break;
-                }
-            }
-        }
-        // Now handle the full path for the final dependency
-        const node = context.getFieldByName(path);
+    addDependantPath(path, uniqueKeyRequirement) {
+        const node = this.parent.getFieldByName(path);
         const joinableParent = node instanceof query_node_1.QueryFieldStruct
             ? node.queryStruct.getJoinableParent()
             : node.parent.getJoinableParent();
-        resultStruct.root().addStructToJoin(joinableParent, uniqueKeyRequirement);
+        this.rootResult.addStructToJoin(joinableParent, uniqueKeyRequirement);
     }
-    dependenciesFromFieldUsage(resultStruct) {
+    dependenciesFromFieldUsage() {
+        const resultRoot = this.rootResult;
         // Only QuerySegment and IndexSegment have fieldUsage, RawSegment does not
         if (this.firstSegment.type === 'raw' ||
             this.firstSegment.type === 'partial') {
             throw new Error('QueryQuery attempt to load a raw or partial segment');
         }
         for (const joinUsage of this.firstSegment.activeJoins || []) {
-            this.addDependantPath(resultStruct, this.parent, joinUsage.path, undefined);
+            this.addDependantPath(joinUsage.path, undefined);
         }
         for (const usage of this.firstSegment.expandedFieldUsage || []) {
             if (usage.analyticFunctionUse) {
-                resultStruct.root().queryUsesPartitioning = true;
+                resultRoot.queryUsesPartitioning = true;
                 // BigQuery-specific handling
                 if (this.parent.dialect.cantPartitionWindowFunctionsOnExpressions &&
-                    resultStruct.firstSegment.type === 'reduce') {
+                    resultRoot.firstSegment.type === 'reduce') {
                     // force the use of a lateral_join_bag
-                    resultStruct.root().isComplexQuery = true;
-                    resultStruct.root().queryUsesPartitioning = true;
+                    resultRoot.isComplexQuery = true;
+                    resultRoot.queryUsesPartitioning = true;
                 }
                 continue;
             }
             if (usage.uniqueKeyRequirement) {
                 if (usage.path.length === 0) {
-                    resultStruct.addStructToJoin(this.parent, usage.uniqueKeyRequirement);
+                    resultRoot.addStructToJoin(this.parent, usage.uniqueKeyRequirement);
                 }
                 else {
-                    this.addDependantPath(resultStruct, this.parent, usage.path, usage.uniqueKeyRequirement);
+                    this.addDependantPath(usage.path, usage.uniqueKeyRequirement);
                 }
-                continue;
             }
         }
         const expandedUngroupings = 'expandedUngroupings' in this.firstSegment
             ? this.firstSegment.expandedUngroupings || []
             : [];
         for (const ungrouping of expandedUngroupings) {
-            resultStruct.root().isComplexQuery = true;
-            resultStruct.root().queryUsesPartitioning = true;
+            resultRoot.isComplexQuery = true;
+            resultRoot.queryUsesPartitioning = true;
             // Navigate to correct result struct using ungrouping's path
-            let destResult = resultStruct;
+            let destResult = resultRoot;
             for (const pathSegment of ungrouping.path) {
                 const nextStruct = destResult.allFields.get(pathSegment);
                 if (!(nextStruct instanceof field_instance_1.FieldInstanceResult)) {
@@ -264,7 +233,7 @@ class QueryQuery extends query_node_1.QueryField {
      * @param resultStruct - The FieldInstanceResult containing compilation context
      * @param source - The QueryStruct to traverse (initially the query's parent/input)
      */
-    expandSource(resultStruct, source) {
+    expandRecordExpressions(resultStruct, source) {
         for (const field of source.nameMap.values()) {
             if (field instanceof query_node_1.QueryFieldStruct) {
                 const qs = field.queryStruct;
@@ -277,7 +246,7 @@ class QueryQuery extends query_node_1.QueryField {
                     qs.computeRecordExpression = () => (0, expression_compiler_1.exprToSQL)(resultStruct, parent, e);
                 }
                 // Recurse into this structure
-                this.expandSource(resultStruct, qs);
+                this.expandRecordExpressions(resultStruct, qs);
             }
         }
     }
@@ -304,15 +273,15 @@ class QueryQuery extends query_node_1.QueryField {
     }
     prepare(_stageWriter) {
         if (!this.prepared) {
-            this.expandSource(this.rootResult, this.parent);
+            this.expandRecordExpressions(this.rootResult, this.parent);
             // Add the root base join to the joins map
             this.rootResult.addStructToJoin(this.parent, undefined);
             // Expand fields (just adds them to result, no dependency tracking)
             this.expandFields(this.rootResult);
             // Process all dependencies from translator's fieldUsage
-            this.dependenciesFromFieldUsage(this.rootResult);
+            this.dependenciesFromFieldUsage();
             // Handle always joins
-            this.addAlwaysJoins(this.rootResult);
+            this.addAlwaysJoins();
             // Calculate symmetric aggregates based on the joins
             this.rootResult.calculateSymmetricAggregates();
             this.prepared = true;
@@ -328,7 +297,7 @@ class QueryQuery extends query_node_1.QueryField {
             this.findJoins(s);
         }
     }
-    addAlwaysJoins(rootResult) {
+    addAlwaysJoins() {
         var _a;
         const stage = this.fieldDef.pipeline[0];
         if (stage.type !== 'raw') {
@@ -336,7 +305,7 @@ class QueryQuery extends query_node_1.QueryField {
             for (const joinName of alwaysJoins) {
                 const qs = this.parent.getChildByName(joinName);
                 if (qs instanceof query_node_1.QueryFieldStruct) {
-                    rootResult.addStructToJoin(qs.queryStruct, undefined);
+                    this.rootResult.addStructToJoin(qs.queryStruct, undefined);
                 }
             }
         }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.308";
+export declare const MALLOY_VERSION = "0.0.310";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.308';
+exports.MALLOY_VERSION = '0.0.310';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.308",
+  "version": "0.0.310",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.308",
-    "@malloydata/malloy-interfaces": "0.0.308",
-    "@malloydata/malloy-tag": "0.0.308",
+    "@malloydata/malloy-filter": "0.0.310",
+    "@malloydata/malloy-interfaces": "0.0.310",
+    "@malloydata/malloy-tag": "0.0.310",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",