@hypequery/datasets 0.20.0 → 0.21.0

package/dist/utils/measure-evaluation-graph.d.ts

@@ -0,0 +1,23 @@
+import type { DatasetMeasureDefinition, DerivedMeasureDefinition, MeasureTimeInterval } from '../types.js';
+export interface MeasureEvaluationContext {
+    id: number;
+    parent?: number;
+    interval?: MeasureTimeInterval;
+}
+export interface MeasureEvaluationNode {
+    id: number;
+    name: string;
+    context: number;
+    definition: DatasetMeasureDefinition;
+    inputs?: Record<string, number>;
+}
+/** A shift changes evaluation context; formulas combine values in that context. */
+export declare function buildMeasureEvaluationGraph(measures: Readonly<Record<string, DatasetMeasureDefinition>>, selected: readonly string[]): {
+    contexts: MeasureEvaluationContext[];
+    nodes: MeasureEvaluationNode[];
+    outputs: {
+        [k: string]: number;
+    };
+};
+export declare function evaluationFormula(node: MeasureEvaluationNode): DerivedMeasureDefinition;
+//# sourceMappingURL=measure-evaluation-graph.d.ts.map

package/dist/utils/measure-evaluation-graph.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"measure-evaluation-graph.d.ts","sourceRoot":"","sources":["../../src/utils/measure-evaluation-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAG3G,MAAM,WAAW,wBAAwB;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,mBAAmB,CAAA;CAAE;AACzG,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,wBAAwB,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED,mFAAmF;AACnF,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE;;;;;;EA+BpI;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,wBAAwB,CAIvF"}

package/dist/utils/measure-evaluation-graph.js

@@ -0,0 +1,38 @@
+import { isDerivedMeasure, isShiftMeasure } from './dataset-measures.js';
+/** A shift changes evaluation context; formulas combine values in that context. */
+export function buildMeasureEvaluationGraph(measures, selected) {
+    const contexts = [{ id: 0 }];
+    const nodes = [];
+    const memo = new Map();
+    const contextMemo = new Map();
+    const visit = (name, context) => {
+        const key = `${context}:${name}`;
+        const existing = memo.get(key);
+        if (existing !== undefined)
+            return existing;
+        const definition = measures[name];
+        if (isShiftMeasure(definition)) {
+            const contextKey = `${context}:${definition.interval.amount}:${definition.interval.unit}`;
+            let shifted = contextMemo.get(contextKey);
+            if (shifted === undefined) {
+                shifted = contexts.length;
+                contexts.push({ id: shifted, parent: context, interval: definition.interval });
+                contextMemo.set(contextKey, shifted);
+            }
+            const input = visit(definition.measure, shifted);
+            memo.set(key, input);
+            return input;
+        }
+        const inputs = isDerivedMeasure(definition)
+            ? Object.fromEntries(Object.entries(definition.uses).map(([alias, input]) => [alias, visit(input, context)])) : undefined;
+        const id = nodes.length;
+        nodes.push({ id, name, context, definition, inputs });
+        memo.set(key, id);
+        return id;
+    };
+    const outputs = Object.fromEntries(selected.map(name => [name, visit(name, 0)]));
+    return { contexts, nodes, outputs };
+}
+export function evaluationFormula(node) {
+    return { ...node.definition, uses: Object.fromEntries(Object.entries(node.inputs ?? {}).map(([alias, id]) => [alias, `_hq_value${id}`])) };
+}

package/dist/utils/measure-time-grains.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measure-time-grains.d.ts","sourceRoot":"","sources":["../../src/utils/measure-time-grains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIvE,8EAA8E;AAC9E,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,SAAS,EAAE,GACvG,SAAS,EAAE,CAUb"}
+{"version":3,"file":"measure-time-grains.d.ts","sourceRoot":"","sources":["../../src/utils/measure-time-grains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAKvE,8EAA8E;AAC9E,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,SAAS,EAAE,GACvG,SAAS,EAAE,CAWb"}

package/dist/utils/measure-time-grains.js

@@ -1,10 +1,12 @@
 import { getDerivedMeasure, isShiftMeasure, isWindowMeasure } from './dataset-measures.js';
-import { intervalBuckets, windowGrainErrors } from './time-axis-intervals.js';
+import { windowGrainErrors } from './time-axis-intervals.js';
+import { supportsShiftGrain } from './shift-measure-grains.js';
 /** Intersect time-measure requirements with the dataset's declared grains. */
 export function measureSupportedGrains(measures, name, grains) {
     const definition = measures[name];
     if (isShiftMeasure(definition)) {
-        return grains.filter(grain => intervalBuckets(definition.interval.amount, definition.interval.unit, grain) !== undefined);
+        return measureSupportedGrains(measures, definition.measure, grains)
+            .filter(grain => supportsShiftGrain(definition.interval, grain));
     }
     if (isWindowMeasure(definition))
         return grains.filter(grain => !windowGrainErrors(name, definition, grain).length);

package/dist/utils/shift-measure-grains.d.ts

@@ -0,0 +1,5 @@
+import type { MeasureTimeInterval, TimeGrain } from '../types.js';
+/** Calendar shifts preserve dates; they do not convert months into fixed durations. */
+export declare function calendarShiftAtFineGrain(interval: MeasureTimeInterval, grain: TimeGrain): boolean;
+export declare function supportsShiftGrain(interval: MeasureTimeInterval, grain: TimeGrain): boolean;
+//# sourceMappingURL=shift-measure-grains.d.ts.map

package/dist/utils/shift-measure-grains.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shift-measure-grains.d.ts","sourceRoot":"","sources":["../../src/utils/shift-measure-grains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGlE,uFAAuF;AACvF,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAGjG;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAG3F"}

package/dist/utils/shift-measure-grains.js

@@ -0,0 +1,10 @@
+import { intervalBuckets } from './time-axis-intervals.js';
+/** Calendar shifts preserve dates; they do not convert months into fixed durations. */
+export function calendarShiftAtFineGrain(interval, grain) {
+    return ['month', 'quarter', 'year'].includes(interval.unit)
+        && ['minute', 'hour', 'day', 'week'].includes(grain);
+}
+export function supportsShiftGrain(interval, grain) {
+    return calendarShiftAtFineGrain(interval, grain)
+        || intervalBuckets(interval.amount, interval.unit, grain) !== undefined;
+}

package/dist/utils/shift-measure-sql.d.ts

@@ -1,4 +1,4 @@
-import type { ShiftMeasureDefinition, TimeGrain } from '../types.js';
+import type { ShiftMeasureDefinition } from '../types.js';
 import type { TimeMeasureAxis } from './time-measure-axis.js';
 /** Preserve the selected portion of a bucket and both authored endpoint operators. */
 export declare function shiftRangeSql(shift: ShiftMeasureDefinition, axis: TimeMeasureAxis, period?: string): {
@@ -9,10 +9,13 @@ export declare function shiftRangeSql(shift: ShiftMeasureDefinition, axis: TimeM
 };
 export declare function shiftRangePredicateSql(time: string, range: ReturnType<typeof shiftRangeSql>): string;
 /** Check the shifted scan independently of whether it contains source rows. */
-export declare function shiftCalendarGuardSql(shift: ShiftMeasureDefinition, grain: TimeGrain, axisGuard: string): string;
+export declare function shiftCalendarGuardSql(shift: ShiftMeasureDefinition, axis: TimeMeasureAxis, axisGuard: string): string;
+/** Validate each output bucket after the series exists, including empty source populations. */
+export declare function shiftWallTimeSeriesGuardSql(shift: ShiftMeasureDefinition, grain: TimeMeasureAxis['grain']): string;
 /** Map output buckets to their earlier half-open ranges, retaining calendar arithmetic. */
 export declare function shiftBucketCtes(shift: ShiftMeasureDefinition, axis: TimeMeasureAxis, index: number): {
     ctes: string[];
     rowsSql: string;
+    sourceTimesSql: string;
 };
 //# sourceMappingURL=shift-measure-sql.d.ts.map

package/dist/utils/shift-measure-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shift-measure-sql.d.ts","sourceRoot":"","sources":["../../src/utils/shift-measure-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,sFAAsF;AACtF,wBAAgB,aAAa,CAAC,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;EAQlG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,GAAG,MAAM,CAGpG;AAED,+EAA+E;AAC/E,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,sBAAsB,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAOhH;AAED,2FAA2F;AAC3F,wBAAgB,eAAe,CAAC,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAkBxI"}
+{"version":3,"file":"shift-measure-sql.d.ts","sourceRoot":"","sources":["../../src/utils/shift-measure-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAI1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,sFAAsF;AACtF,wBAAgB,aAAa,CAAC,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;EAclG;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,GAAG,MAAM,CAGpG;AAED,+EAA+E;AAC/E,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAOrH;AAED,+FAA+F;AAC/F,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,sBAAsB,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,MAAM,CAMlH;AAED,2FAA2F;AAC3F,wBAAgB,eAAe,CAAC,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,CAsBhK"}

package/dist/utils/shift-measure-sql.js

@@ -1,14 +1,22 @@
 import { GRAIN_FUNCTIONS } from '../constants.js';
 import { addTimeSql, subtractTimeSql } from './time-arithmetic-sql.js';
 import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
+import { calendarShiftAtFineGrain } from './shift-measure-grains.js';
+import { shiftWallTimeGuardSql } from './shift-wall-time-sql.js';
 /** Preserve the selected portion of a bucket and both authored endpoint operators. */
 export function shiftRangeSql(shift, axis, period) {
-    const end = period ? addTimeSql(period, 1, axis.grain) : undefined;
+    const first = period ?? '_hq_first';
+    const last = period ?? '_hq_last';
+    const end = addTimeSql(last, 1, axis.grain);
+    const upper = subtractTimeSql(`least(${end}, _hq_upper)`, shift.interval.amount, shift.interval.unit);
+    // Clamp the bucket anchor, then retain its width. Independently clamping both
+    // dates would turn March 30–31 into February 28–28, dropping an entire day.
+    const shiftedEnd = addTimeSql(subtractTimeSql(last, shift.interval.amount, shift.interval.unit), 1, axis.grain);
     return {
-        lower: subtractTimeSql(period ? `greatest(${period}, _hq_lower)` : '_hq_lower', shift.interval.amount, shift.interval.unit),
-        upper: subtractTimeSql(end ? `least(${end}, _hq_upper)` : '_hq_upper', shift.interval.amount, shift.interval.unit),
+        lower: subtractTimeSql(`greatest(${first}, _hq_lower)`, shift.interval.amount, shift.interval.unit),
+        upper: calendarShiftAtFineGrain(shift.interval, axis.grain) ? `if(_hq_upper >= ${end}, ${shiftedEnd}, ${upper})` : upper,
         lowerInclusive: period ? `(${period} > _hq_lower OR ${Number(axis.lowerInclusive)})` : String(Number(axis.lowerInclusive)),
-        upperInclusive: end ? `(_hq_upper < ${end} AND ${Number(axis.upperInclusive)})` : String(Number(axis.upperInclusive)),
+        upperInclusive: `(_hq_upper < ${end} AND ${Number(axis.upperInclusive)})`,
     };
 }
 export function shiftRangePredicateSql(time, range) {
@@ -16,14 +24,19 @@ export function shiftRangePredicateSql(time, range) {
         + ` AND (${time} < ${range.upper} OR (${range.upperInclusive} AND ${time} = ${range.upper}))`;
 }
 /** Check the shifted scan independently of whether it contains source rows. */
-export function shiftCalendarGuardSql(shift, grain, axisGuard) {
-    const lower = subtractTimeSql('_hq_first', shift.interval.amount, shift.interval.unit);
-    const upper = subtractTimeSql(addTimeSql('_hq_last', 1, grain), shift.interval.amount, shift.interval.unit);
+export function shiftCalendarGuardSql(shift, axis, axisGuard) {
+    const { grain } = axis;
+    const { lower, upper } = shiftRangeSql(shift, axis);
     const first = `${GRAIN_FUNCTIONS[grain]}(${lower})`;
     const last = `${GRAIN_FUNCTIONS[grain]}(${upper})`;
     const count = `dateDiff('${grain}', ${first}, ${last}) + ${axisGuard}`;
     return calendarBucketGuardSql(first, count, grain);
 }
+/** Validate each output bucket after the series exists, including empty source populations. */
+export function shiftWallTimeSeriesGuardSql(shift, grain) {
+    const end = addTimeSql('_hq_period', 1, grain);
+    return shiftWallTimeGuardSql(shift.interval, grain, '_hq_series CROSS JOIN _hq_bounds', '_hq_period', 'greatest(_hq_period, _hq_lower)', `least(${end}, _hq_upper)`, end);
+}
 /** Map output buckets to their earlier half-open ranges, retaining calendar arithmetic. */
 export function shiftBucketCtes(shift, axis, index) {
     const { grain } = axis;
@@ -33,7 +46,11 @@ export function shiftBucketCtes(shift, axis, index) {
     const bucket = `${GRAIN_FUNCTIONS[grain]}(_hq_shift_lower)`;
     const upperBucket = `${GRAIN_FUNCTIONS[grain]}(_hq_shift_upper)`;
     const count = `greatest(0, dateDiff('${grain}', ${bucket}, ${upperBucket}) + if(_hq_shift_upper > ${upperBucket} OR _hq_shift_upper_inclusive, 1, 0))`;
+    const join = ` AS r INNER JOIN ${keys} AS b ON ${GRAIN_FUNCTIONS[grain]}(r._hq_time) = b._hq_source_period WHERE ${shiftRangePredicateSql('r._hq_time', { lower: 'b._hq_shift_lower', upper: 'b._hq_shift_upper', lowerInclusive: 'b._hq_shift_lower_inclusive', upperInclusive: 'b._hq_shift_upper_inclusive' })}`;
     return {
+        // Membership preserves duplicate source rows while excluding dates and
+        // partial ranges that no output bucket maps to, including clamped overlaps.
+        sourceTimesSql: `SELECT r._hq_time FROM _hq_source${join}`,
         ctes: [
             `${ranges} AS (SELECT _hq_period, ${range.lower} AS _hq_shift_lower, ${range.upper} AS _hq_shift_upper, ${range.lowerInclusive} AS _hq_shift_lower_inclusive, ${range.upperInclusive} AS _hq_shift_upper_inclusive FROM _hq_series CROSS JOIN _hq_bounds)`,
             // A DST transition can map a one-hour output bucket to zero or two
@@ -41,6 +58,6 @@ export function shiftBucketCtes(shift, axis, index) {
             // The equality join avoids a source-rows × output-series Cartesian product.
             `${keys} AS (SELECT *, ${addTimeSql(bucket, `arrayJoin(range(toUInt64(${count})))`, grain)} AS _hq_source_period FROM ${ranges})`,
         ],
-        rowsSql: `SELECT r.*, b._hq_period FROM _hq_scanned AS r INNER JOIN ${keys} AS b ON ${GRAIN_FUNCTIONS[grain]}(r._hq_time) = b._hq_source_period WHERE ${shiftRangePredicateSql('r._hq_time', { lower: 'b._hq_shift_lower', upper: 'b._hq_shift_upper', lowerInclusive: 'b._hq_shift_lower_inclusive', upperInclusive: 'b._hq_shift_upper_inclusive' })}`,
+        rowsSql: `SELECT r.*, b._hq_period FROM _hq_scanned${join}`,
     };
 }

package/dist/utils/shift-measure-validation.js

@@ -1,6 +1,6 @@
 import { isSafeSQLIdentifier } from '../sql-utils.js';
 import { isSupportedTimeGrain } from '../constants.js';
-import { getBaseMeasure, isShiftMeasure } from './dataset-measures.js';
+import { isShiftMeasure } from './dataset-measures.js';
 export function validateShiftMeasures(datasetName, timeKey, measures) {
     for (const [name, definition] of Object.entries(measures)) {
         if (!isShiftMeasure(definition))
@@ -10,8 +10,8 @@ export function validateShiftMeasures(datasetName, timeKey, measures) {
             throw new Error(`${prefix} name is not a safe identifier.`);
         if (!timeKey)
             throw new Error(`${prefix} requires a timeKey.`);
-        if (!getBaseMeasure(measures, definition.measure))
-            throw new Error(`${prefix} must wrap a base measure; "${String(definition.measure)}" is not one.`);
+        if (!Object.hasOwn(measures, definition.measure))
+            throw new Error(`${prefix} references missing measure "${String(definition.measure)}".`);
         const interval = definition.interval;
         if (!interval || !Number.isSafeInteger(interval.amount) || interval.amount <= 0 || !isSupportedTimeGrain(interval.unit)) {
             throw new Error(`${prefix} interval needs a positive safe integer and supported unit.`);

package/dist/utils/shift-wall-time-sql.d.ts

@@ -0,0 +1,4 @@
+import type { MeasureTimeInterval, TimeGrain } from '../types.js';
+/** Reject DST normalization that moves a shifted sub-day bucket to another local time. */
+export declare function shiftWallTimeGuardSql(interval: MeasureTimeInterval, grain: TimeGrain, source: string, period: string, lower: string, upper: string, end: string): string;
+//# sourceMappingURL=shift-wall-time-sql.d.ts.map

package/dist/utils/shift-wall-time-sql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shift-wall-time-sql.d.ts","sourceRoot":"","sources":["../../src/utils/shift-wall-time-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIlE,0FAA0F;AAC1F,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,mBAAmB,EAC7B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GACV,MAAM,CAYR"}

package/dist/utils/shift-wall-time-sql.js

@@ -0,0 +1,17 @@
+import { subtractTimeSql } from './time-arithmetic-sql.js';
+import { calendarShiftAtFineGrain } from './shift-measure-grains.js';
+/** Reject DST normalization that moves a shifted sub-day bucket to another local time. */
+export function shiftWallTimeGuardSql(interval, grain, source, period, lower, upper, end) {
+    if (!calendarShiftAtFineGrain(interval, grain) || (grain !== 'minute' && grain !== 'hour'))
+        return '0';
+    const changesWallTime = (value) => {
+        const shifted = subtractTimeSql(value, interval.amount, interval.unit);
+        return ['Hour', 'Minute', 'Second']
+            .map(part => `to${part}(${value}) != to${part}(${shifted})`)
+            .join(' OR ');
+    };
+    const changed = `(${changesWallTime(period)}) OR (${changesWallTime(lower)})`
+        + ` OR (${upper} != ${end} AND (${changesWallTime(upper)}))`;
+    return `(SELECT throwIf(countIf(${changed}) > 0, `
+        + `'Calendar shift lands on a nonexistent local time; use a UTC query timezone.') FROM ${source})`;
+}

package/dist/utils/time-measure-axis-sql.d.ts

@@ -6,6 +6,7 @@ export interface TimeMeasureSqlAxis {
     timeAxisSql: string;
     guard: string;
     rangeGuard: string;
+    postSeriesGuard: string;
 }
 /** Build bounded output buckets using the query timezone. */
 export declare function buildTimeMeasureAxisSql(source: TimeMeasureSqlSource, axis: TimeMeasureAxis, shifts?: readonly ShiftMeasureDefinition[]): TimeMeasureSqlAxis;

package/dist/utils/time-measure-axis-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-axis-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-axis-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAMD,6DAA6D;AAC7D,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,eAAe,EACrB,MAAM,GAAE,SAAS,sBAAsB,EAAO,GAC7C,kBAAkB,CAwCpB"}
+{"version":3,"file":"time-measure-axis-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-axis-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAGzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB;AAMD,6DAA6D;AAC7D,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,eAAe,EACrB,MAAM,GAAE,SAAS,sBAAsB,EAAO,GAC7C,kBAAkB,CAyCpB"}

package/dist/utils/time-measure-axis-sql.js

@@ -1,7 +1,7 @@
 import { GRAIN_FUNCTIONS } from '../constants.js';
 import { addTimeSql as add, subtractTimeSql as subtract } from './time-arithmetic-sql.js';
 import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
-import { shiftCalendarGuardSql } from './shift-measure-sql.js';
+import { shiftCalendarGuardSql, shiftWallTimeSeriesGuardSql } from './shift-measure-sql.js';
 function literal(value) {
     return `'${value.replace(/\\/g, '\\\\').replace(/'/g, "''")}'`;
 }
@@ -23,8 +23,9 @@ export function buildTimeMeasureAxisSql(source, axis, shifts = []) {
     const physicalGuard = axis.grain === 'minute' || axis.grain === 'hour'
         ? `throwIf(position(${physicalTimeType}, 'Date') > 0 AND position(${physicalTimeType}, 'DateTime') = 0, 'Sub-day time measures require a time-of-day column; Date and Date32 are not supported.')`
         : '0';
-    const shiftGuards = shifts.map(shift => shiftCalendarGuardSql(shift, axis.grain, `${limitGuard} + ${rangeGuard}`));
+    const shiftGuards = shifts.map(shift => shiftCalendarGuardSql(shift, axis, `${limitGuard} + ${rangeGuard}`));
     const guard = [limitGuard, physicalGuard, calendarGuard, ...shiftGuards].join(' + ');
+    const postSeriesGuard = shifts.map(shift => shiftWallTimeSeriesGuardSql(shift, axis.grain)).join(' + ') || '0';
     // A zero-row scalar retains the converted timestamp type and query timezone.
     // Reading any(time) here would scan the entire population just for its type.
     const timezone = 'timezoneOf(assumeNotNull((SELECT _hq_time FROM _hq_source LIMIT 0)))';
@@ -42,6 +43,6 @@ export function buildTimeMeasureAxisSql(source, axis, shifts = []) {
     ];
     // Always check the singleton axis before aggregating. ClickHouse can skip
     // a series guard when a dimensional CROSS JOIN has an empty population.
-    const timeAxisSql = `WITH ${[...source.ctes, ctes[0]].join(',\n')} SELECT ${guard} + ${rangeGuard} AS _hq_validated FROM _hq_bounds`;
-    return { ctes, timeAxisSql, guard, rangeGuard };
+    const timeAxisSql = `WITH ${[...source.ctes, ...ctes].join(',\n')} SELECT ${guard} + ${rangeGuard} + ${postSeriesGuard} AS _hq_validated FROM _hq_bounds`;
+    return { ctes, timeAxisSql, guard, rangeGuard, postSeriesGuard };
 }

package/dist/utils/time-measure-axis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-axis.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-axis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAQ7F,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE3E,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,uEAAuE;IACvE,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qFAAqF;AACrF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,YAAY,GAClB;IAAE,IAAI,CAAC,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAmC9C"}
+{"version":3,"file":"time-measure-axis.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-axis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAS7F,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE3E,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,uEAAuE;IACvE,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qFAAqF;AACrF,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,YAAY,GAClB;IAAE,IAAI,CAAC,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAmC9C"}

package/dist/utils/time-measure-axis.js

@@ -2,7 +2,8 @@ import { isSupportedTimeGrain } from '../constants.js';
 import { selectedTimeMeasures } from './time-query-measures.js';
 import { isShiftMeasure } from './dataset-measures.js';
 import { resolveTimeAxisRange, isDefinitelyEmptyTimeRange } from './time-axis-bounds.js';
-import { intervalBuckets, windowGrainErrors, estimateTimeAxisBuckets, exceedsEstimatedTimeAxisLimit } from './time-axis-intervals.js';
+import { windowGrainErrors, estimateTimeAxisBuckets, exceedsEstimatedTimeAxisLimit } from './time-axis-intervals.js';
+import { supportsShiftGrain } from './shift-measure-grains.js';
 export { intervalBuckets, utcBucketStart } from './time-axis-intervals.js';
 /** Validate time-measure grains, resolve bounds, then estimate the output series. */
 export function analyzeTimeMeasureAxis(dataset, query) {
@@ -16,7 +17,7 @@ export function analyzeTimeMeasureAxis(dataset, query) {
     const grain = query.by;
     for (const [name, window] of timeMeasures) {
         if (isShiftMeasure(window)) {
-            if (intervalBuckets(window.interval.amount, window.interval.unit, grain) === undefined)
+            if (!supportsShiftGrain(window.interval, grain))
                 errors.push(`Shift measure "${name}" must span whole "${grain}" buckets.`);
             continue;
         }

package/dist/utils/time-measure-context-sql.d.ts

@@ -0,0 +1,6 @@
+import type { MeasureEvaluationContext } from './measure-evaluation-graph.js';
+import type { TimeMeasureAxis } from './time-measure-axis.js';
+/** Keep output coordinates separate from each shifted evaluation interval. */
+export declare function timeMeasureContextCtes(contexts: readonly MeasureEvaluationContext[], axis: TimeMeasureAxis): string[];
+export declare function timeMeasureContextGuard(context: MeasureEvaluationContext, axis: TimeMeasureAxis): string;
+//# sourceMappingURL=time-measure-context-sql.d.ts.map

package/dist/utils/time-measure-context-sql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"time-measure-context-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-context-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,8EAA8E;AAC9E,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,SAAS,wBAAwB,EAAE,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,EAAE,CAUrH;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,CAOxG"}

package/dist/utils/time-measure-context-sql.js

@@ -0,0 +1,21 @@
+import { addTimeSql as add, subtractTimeSql as subtract } from './time-arithmetic-sql.js';
+import { calendarShiftAtFineGrain } from './shift-measure-grains.js';
+import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
+import { shiftWallTimeGuardSql } from './shift-wall-time-sql.js';
+/** Keep output coordinates separate from each shifted evaluation interval. */
+export function timeMeasureContextCtes(contexts, axis) {
+    const end = add('_hq_period', 1, axis.grain);
+    const root = `_hq_context0 AS (SELECT _hq_period, _hq_period AS _hq_eval_period, ${end} AS _hq_eval_end, greatest(_hq_period, _hq_lower) AS _hq_eval_lower, least(${end}, _hq_upper) AS _hq_eval_upper, (_hq_period > _hq_lower OR ${Number(axis.lowerInclusive)}) AS _hq_lower_inclusive, (_hq_upper < ${end} AND ${Number(axis.upperInclusive)}) AS _hq_upper_inclusive FROM _hq_series CROSS JOIN _hq_bounds)`;
+    return [root, ...contexts.slice(1).map(context => {
+            const interval = context.interval;
+            const shift = (value) => subtract(`p.${value}`, interval.amount, interval.unit);
+            const period = shift('_hq_eval_period');
+            const shiftedEnd = calendarShiftAtFineGrain(interval, axis.grain) ? add(period, 1, axis.grain) : shift('_hq_eval_end');
+            return `_hq_context${context.id} AS (SELECT p._hq_period, ${period} AS _hq_eval_period, ${shiftedEnd} AS _hq_eval_end, ${shift('_hq_eval_lower')} AS _hq_eval_lower, if(p._hq_eval_upper = p._hq_eval_end, ${shiftedEnd}, ${shift('_hq_eval_upper')}) AS _hq_eval_upper, p._hq_lower_inclusive, p._hq_upper_inclusive FROM _hq_context${context.parent} AS p)`;
+        })];
+}
+export function timeMeasureContextGuard(context, axis) {
+    const guard = calendarBucketGuardSql('_hq_eval_period', '1', axis.grain);
+    const wallTimeGuard = context.interval === undefined ? '0' : shiftWallTimeGuardSql(context.interval, axis.grain, `_hq_context${context.parent} AS p`, 'p._hq_eval_period', 'p._hq_eval_lower', 'p._hq_eval_upper', 'p._hq_eval_end');
+    return `(SELECT coalesce(max(${guard}), 0) FROM _hq_context${context.id}) + ${wallTimeGuard}`;
+}

package/dist/utils/time-measure-dataset-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-dataset-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-dataset-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAYxE,+EAA+E;AAC/E,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,GACpC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAuD7D"}
+{"version":3,"file":"time-measure-dataset-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-dataset-sql.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAYxE,+EAA+E;AAC/E,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,GACpC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAmE7D"}

package/dist/utils/time-measure-dataset-sql.js

@@ -1,9 +1,11 @@
+import { buildCompositeTimeMeasureSql } from './composite-time-measure-sql.js';
+import { measureDependencyNames } from './measure-dependencies.js';
 import { getBaseMeasure, getDerivedMeasure, isShiftMeasure, isWindowMeasure } from './dataset-measures.js';
 import { selectedTimeMeasures } from './time-query-measures.js';
 import { analyzeTimeMeasureAxis } from './time-measure-axis.js';
 import { validateDatasetQueryInput } from './dataset-query-validation.js';
 import { addTimeSql as add } from './time-arithmetic-sql.js';
-import { shiftBucketCtes, shiftRangeSql, shiftRangePredicateSql } from './shift-measure-sql.js';
+import { shiftBucketCtes } from './shift-measure-sql.js';
 import { buildTimeMeasureSourceSql } from './time-measure-source-sql.js';
 import { buildTimeMeasureAxisSql } from './time-measure-axis-sql.js';
 import { buildTimeMeasureValuesSql, windowMeasureRowsSql, windowScanStartSql } from './time-measure-values-sql.js';
@@ -16,6 +18,16 @@ export function buildTimeMeasureDatasetSql(ds, query, options) {
     const { axis } = analyzeTimeMeasureAxis(ds, query);
     if (!axis || !ds.timeKey)
         throw new Error('Window measures require a bounded time axis.');
+    const dependencies = measureDependencyNames(ds.measures, query.measures ?? []);
+    const composite = dependencies.some(name => {
+        const definition = ds.measures[name];
+        if (isShiftMeasure(definition))
+            return !getBaseMeasure(ds.measures, definition.measure);
+        const derived = getDerivedMeasure(ds.measures, name);
+        return derived && Object.values(derived.uses).some(input => getDerivedMeasure(ds.measures, input));
+    });
+    if (composite)
+        return buildCompositeTimeMeasureSql(ds, query, options, axis);
     const timeMeasures = selectedTimeMeasures(ds, query);
     const windows = [...timeMeasures.values()].filter(isWindowMeasure);
     const shifts = [...timeMeasures.values()].filter(isShiftMeasure);
@@ -28,6 +40,12 @@ export function buildTimeMeasureDatasetSql(ds, query, options) {
     const baseNames = new Set([...needed].map(name => timeMeasures.get(name)?.measure ?? name));
     const source = buildTimeMeasureSourceSql(ds, query, baseNames, axis.filters, options);
     const timeAxis = buildTimeMeasureAxisSql(source, axis, shifts);
+    const shiftedInputs = new Map();
+    [...needed].forEach((name, index) => {
+        const measure = timeMeasures.get(name);
+        if (isShiftMeasure(measure))
+            shiftedInputs.set(name, shiftBucketCtes(measure, axis, index));
+    });
     // Scan only requested populations: intervening rows must not introduce dimensions.
     const end = add('_hq_last', 1, axis.grain);
     const populations = [];
@@ -41,23 +59,22 @@ export function buildTimeMeasureDatasetSql(ds, query, options) {
             ? '' : ` AND _hq_time >= least(${starts.join(', ')})`;
         populations.push(`(_hq_time < ${end}${lower})`);
     }
-    for (const shift of shifts) {
-        populations.push(`(${shiftRangePredicateSql('_hq_time', shiftRangeSql(shift, axis))})`);
-    }
+    for (const shifted of shiftedInputs.values())
+        populations.push(`(_hq_time IN (${shifted.sourceTimesSql}))`);
     const scanCte = `_hq_scanned AS (SELECT * FROM _hq_source CROSS JOIN _hq_bounds WHERE ${populations.join(' OR ')})`;
-    const inputs = [...needed].map((name, index) => {
+    const inputs = [...needed].map(name => {
         const timeMeasure = timeMeasures.get(name);
         const window = isWindowMeasure(timeMeasure) ? timeMeasure : undefined;
         const base = source.bases.find(base => base.name === (timeMeasure?.measure ?? name));
         if (!base)
             throw new Error(`Missing base input for measure "${name}".`);
         if (isShiftMeasure(timeMeasure)) {
-            const shifted = shiftBucketCtes(timeMeasure, axis, index);
-            return { name, base, rowsSql: shifted.rowsSql, rowCtes: shifted.ctes, restrictToAxis: false };
+            const shifted = shiftedInputs.get(name);
+            return { name, base, rowsSql: shifted.rowsSql, restrictToAxis: false };
         }
         return { name, base, window, rowsSql: windowMeasureRowsSql(window, axis) };
     });
     const values = buildTimeMeasureValuesSql(source.dimensions, inputs, axis);
-    const sql = buildTimeMeasureResultSql(ds, query, options, source.dimensions, [...source.ctes, ...timeAxis.ctes, scanCte, ...values], `${timeAxis.guard} + ${timeAxis.rangeGuard}`);
+    const sql = buildTimeMeasureResultSql(ds, query, options, source.dimensions, [...source.ctes, ...timeAxis.ctes, ...[...shiftedInputs.values()].flatMap(input => input.ctes), scanCte, ...values], `${timeAxis.guard} + ${timeAxis.rangeGuard} + ${timeAxis.postSeriesGuard}`);
     return { sql, parameters: source.parameters, timeAxisSql: timeAxis.timeAxisSql };
 }

package/dist/utils/time-measure-leaf-sql.d.ts

@@ -0,0 +1,14 @@
+import type { WindowMeasureDefinition } from '../types.js';
+import type { TimeMeasureAxis } from './time-measure-axis.js';
+import type { TimeMeasureSqlBase, TimeMeasureSqlDimension } from './time-measure-source-sql.js';
+/** Keyed source membership retains distinct/average semantics and row multiplicity. */
+export declare function timeMeasureLeafSql(id: number, context: number, base: TimeMeasureSqlBase, window: WindowMeasureDefinition | undefined, axis: TimeMeasureAxis, dims: readonly TimeMeasureSqlDimension[]): {
+    ctes: string[];
+    population: string;
+    aggregate: string;
+    context: number;
+    cumulative: boolean;
+    guard: string;
+    count: boolean;
+};
+//# sourceMappingURL=time-measure-leaf-sql.d.ts.map

package/dist/utils/time-measure-leaf-sql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"time-measure-leaf-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-leaf-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAMhG,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,uBAAuB,EAAE;;;;;;;;EA6CrM"}

package/dist/utils/time-measure-leaf-sql.js

@@ -0,0 +1,52 @@
+import { GRAIN_FUNCTIONS } from '../constants.js';
+import { addTimeSql as add, subtractTimeSql as subtract } from './time-arithmetic-sql.js';
+import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
+import { shiftRangePredicateSql } from './shift-measure-sql.js';
+import { isCountAggregation, windowAggregateSql } from './window-aggregation-sql.js';
+/** Keyed source membership retains distinct/average semantics and row multiplicity. */
+export function timeMeasureLeafSql(id, context, base, window, axis, dims) {
+    const keys = dims.map(dim => dim.alias);
+    const ranges = `_hq_ranges${id}`;
+    const rows = `_hq_rows${id}`;
+    const aggregate = `_hq_leaf${id}`;
+    const value = `_hq_value${id}`;
+    const group = `_hq_period${keys.length ? `, ${keys.join(', ')}` : ''}`;
+    const expression = windowAggregateSql(base.definition, base.value, base.arg);
+    if (window?.cumulative) {
+        const population = `_hq_history${id}`;
+        const partial = `_hq_partial${id}`;
+        const operation = base.definition.aggregation === 'count' ? 'sum' : base.definition.aggregation;
+        const partition = keys.length ? `tuple(${keys.join(', ')})` : 'tuple(0)';
+        const historyGroup = `_hq_time${keys.length ? `, ${keys.join(', ')}` : ''}`;
+        return {
+            ctes: [
+                `${population} AS (SELECT * FROM _hq_source WHERE _hq_time < (SELECT max(_hq_eval_end) FROM _hq_context${context}))`,
+                `${partial} AS (SELECT ${historyGroup}, ${partition} AS _hq_partition, toNullable(${expression}) AS _hq_partial FROM ${population} GROUP BY ${historyGroup})`,
+                `${aggregate} AS (SELECT _hq_time, _hq_partition, ${operation}OrNull(_hq_partial) OVER (PARTITION BY _hq_partition ORDER BY _hq_time ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS ${value} FROM ${partial})`,
+            ],
+            population, aggregate, context, cumulative: true, guard: '0',
+            count: isCountAggregation(base.definition),
+        };
+    }
+    const lower = window?.trailing ? subtract('_hq_eval_end', window.trailing.amount, window.trailing.unit)
+        : window?.toDate ? `${GRAIN_FUNCTIONS[window.toDate]}(_hq_eval_period)` : '_hq_eval_lower';
+    const upper = window ? '_hq_eval_end' : '_hq_eval_upper';
+    const lowerInclusive = window ? '1' : '_hq_lower_inclusive';
+    const upperInclusive = window ? '0' : '_hq_upper_inclusive';
+    const first = `${GRAIN_FUNCTIONS[axis.grain]}(_hq_scan_lower)`;
+    const last = `${GRAIN_FUNCTIONS[axis.grain]}(_hq_scan_upper)`;
+    const count = `greatest(0, dateDiff('${axis.grain}', ${first}, ${last}) + if(_hq_scan_upper > ${last} OR _hq_scan_upper_inclusive, 1, 0))`;
+    const fanout = window ? `throwIf(${count} > 1000, 'A window row contributes to more than 1000 buckets.')` : '0';
+    const guard = `${fanout} + ${calendarBucketGuardSql(first, `${count} + ${fanout}`, axis.grain)}`;
+    const predicate = shiftRangePredicateSql('r._hq_time', { lower: 'b._hq_scan_lower', upper: 'b._hq_scan_upper', lowerInclusive: 'b._hq_scan_lower_inclusive', upperInclusive: 'b._hq_scan_upper_inclusive' });
+    return {
+        ctes: [
+            `${ranges} AS (SELECT _hq_period, ${lower} AS _hq_scan_lower, ${upper} AS _hq_scan_upper, ${lowerInclusive} AS _hq_scan_lower_inclusive, ${upperInclusive} AS _hq_scan_upper_inclusive FROM _hq_context${context})`,
+            `_hq_keys${id} AS (SELECT *, ${add(first, `arrayJoin(range(toUInt64(${count} + ${guard})))`, axis.grain)} AS _hq_source_period FROM ${ranges})`,
+            `${rows} AS (SELECT r.*, b._hq_period FROM _hq_source AS r INNER JOIN _hq_keys${id} AS b ON ${GRAIN_FUNCTIONS[axis.grain]}(r._hq_time) = b._hq_source_period WHERE ${predicate})`,
+            `${aggregate} AS (SELECT ${group}, toNullable(${expression}) AS ${value} FROM ${rows} GROUP BY ${group})`,
+        ],
+        population: rows, aggregate, context, cumulative: false,
+        guard: `(SELECT coalesce(max(${guard}), 0) FROM ${ranges})`, count: isCountAggregation(base.definition),
+    };
+}

package/dist/utils/time-measure-result-sql.d.ts

@@ -2,5 +2,5 @@ import type { AnyDatasetInstance, DatasetQuery } from '../types.js';
 import type { DatasetQueryExecutionOptions } from '../dataset-query.js';
 import type { TimeMeasureSqlDimension } from './time-measure-source-sql.js';
 /** Evaluate formulas after aggregation, then apply output ordering and pagination. */
-export declare function buildTimeMeasureResultSql(ds: AnyDatasetInstance, query: DatasetQuery, options: DatasetQueryExecutionOptions, dims: readonly TimeMeasureSqlDimension[], ctes: readonly string[], validationGuard: string): string;
+export declare function buildTimeMeasureResultSql(ds: AnyDatasetInstance, query: DatasetQuery, options: DatasetQueryExecutionOptions, dims: readonly TimeMeasureSqlDimension[], ctes: readonly string[], validationGuard: string, formulasEvaluated?: boolean): string;
 //# sourceMappingURL=time-measure-result-sql.d.ts.map

package/dist/utils/time-measure-result-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-result-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-result-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAIxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAE5E,sFAAsF;AACtF,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,EACrC,IAAI,EAAE,SAAS,uBAAuB,EAAE,EACxC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,eAAe,EAAE,MAAM,GACtB,MAAM,CAuBR"}
+{"version":3,"file":"time-measure-result-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-result-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAIxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAE5E,sFAAsF;AACtF,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,EACrC,IAAI,EAAE,SAAS,uBAAuB,EAAE,EACxC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,eAAe,EAAE,MAAM,EACvB,iBAAiB,UAAQ,GACxB,MAAM,CAuBR"}

package/dist/utils/time-measure-result-sql.js

@@ -2,14 +2,14 @@ import { quoteSQLIdentifier } from '../sql-utils.js';
 import { getDerivedMeasure } from './dataset-measures.js';
 import { derivedProjection } from './derived-measure-sql.js';
 /** Evaluate formulas after aggregation, then apply output ordering and pagination. */
-export function buildTimeMeasureResultSql(ds, query, options, dims, ctes, validationGuard) {
+export function buildTimeMeasureResultSql(ds, query, options, dims, ctes, validationGuard, formulasEvaluated = false) {
     const selected = query.measures ?? [];
     const projections = [
         quoteSQLIdentifier('period'),
         ...dims.map(dimension => quoteSQLIdentifier(dimension.name)),
         ...selected.map(name => {
             const derived = getDerivedMeasure(ds.measures, name);
-            return derived ? derivedProjection(name, derived) : quoteSQLIdentifier(name);
+            return derived && !formulasEvaluated ? derivedProjection(name, derived) : quoteSQLIdentifier(name);
         }),
     ];
     // Keep toSQL independently guarded too. This branch produces no valid

package/dist/utils/time-query-measures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-query-measures.d.ts","sourceRoot":"","sources":["../../src/utils/time-query-measures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAGzK,MAAM,MAAM,qBAAqB,GAAG,uBAAuB,GAAG,sBAAsB,CAAC;AAErF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAYzH;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,wBAAwB,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,GAAG,OAAO,CAE3I;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CAOlG"}
+{"version":3,"file":"time-query-measures.d.ts","sourceRoot":"","sources":["../../src/utils/time-query-measures.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAGzK,MAAM,MAAM,qBAAqB,GAAG,uBAAuB,GAAG,sBAAsB,CAAC;AAErF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAQzH;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,wBAAwB,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,GAAG,OAAO,CAE3I;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CAOlG"}

package/dist/utils/time-query-measures.js

@@ -1,11 +1,7 @@
-import { getDerivedMeasure, isShiftMeasure, isWindowMeasure } from './dataset-measures.js';
+import { measureDependencyNames } from './measure-dependencies.js';
+import { isShiftMeasure, isWindowMeasure } from './dataset-measures.js';
 export function selectedTimeMeasures(dataset, query) {
-    const names = new Set(query.measures ?? []);
-    for (const name of query.measures ?? []) {
-        const derived = getDerivedMeasure(dataset.measures, name);
-        if (derived)
-            Object.values(derived.uses).forEach(input => names.add(input));
-    }
+    const names = measureDependencyNames(dataset.measures, query.measures ?? []);
     const measures = new Map();
     for (const name of names) {
         const definition = Object.hasOwn(dataset.measures, name) ? dataset.measures[name] : undefined;
@@ -15,7 +11,7 @@ export function selectedTimeMeasures(dataset, query) {
     return measures;
 }
 export function usesTimeMeasure(definition, measures) {
-    return Object.values(definition.uses).some(name => Object.hasOwn(measures, name) && (isWindowMeasure(measures[name]) || isShiftMeasure(measures[name])));
+    return measureDependencyNames(measures, Object.values(definition.uses)).some(name => isWindowMeasure(measures[name]) || isShiftMeasure(measures[name]));
 }
 export function rejectTimeMeasuresOnBackend(dataset, query) {
     const measures = [...selectedTimeMeasures(dataset, query).values()];

package/dist/utils/window-query-signature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"window-query-signature.d.ts","sourceRoot":"","sources":["../../src/utils/window-query-signature.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMpE,uFAAuF;AACvF,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBzG"}
+{"version":3,"file":"window-query-signature.d.ts","sourceRoot":"","sources":["../../src/utils/window-query-signature.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMpE,uFAAuF;AACvF,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzG"}