@hypequery/datasets 0.19.0 → 0.21.0

package/dist/utils/approximate-measures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approximate-measures.d.ts","sourceRoot":"","sources":["../../src/utils/approximate-measures.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhG,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,eAAe,GAAG,OAAO,CAE9E;AAED,oEAAoE;AACpE,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,EACrD,UAAU,EAAE,wBAAwB,GACnC,OAAO,CAKT"}
+{"version":3,"file":"approximate-measures.d.ts","sourceRoot":"","sources":["../../src/utils/approximate-measures.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvG,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,eAAe,GAAG,OAAO,CAE9E;AAED,oEAAoE;AACpE,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAC5D,UAAU,EAAE,wBAAwB,GACnC,OAAO,CAKT;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAKxH"}

package/dist/utils/approximate-measures.js

@@ -1,15 +1,18 @@
-/**
- * Which measures return estimates. Catalogs mark them `approximate` so a
- * consumer, and in particular an agent, can say a value is an estimate
- * (RFC 0015).
- */
+import { measureDependencyNames } from './measure-dependencies.js';
+import { getBaseMeasure } from './dataset-measures.js';
 export function isApproximateAggregation(aggregation) {
     return aggregation === 'approxCountDistinct';
 }
 /** A derived measure is approximate when any measure it uses is. */
 export function isApproximateDerivedMeasure(measures, definition) {
-    return Object.values(definition.uses).some(name => {
-        const measure = Object.hasOwn(measures, name) ? measures[name] : undefined;
-        return measure !== undefined && isApproximateAggregation(measure.aggregation);
+    return measureDependencyNames(measures, Object.values(definition.uses)).some(name => {
+        const base = getBaseMeasure(measures, name);
+        return base !== undefined && isApproximateAggregation(base.aggregation);
+    });
+}
+export function isApproximateMeasure(measures, name) {
+    return measureDependencyNames(measures, [name]).some(input => {
+        const base = getBaseMeasure(measures, input);
+        return base !== undefined && isApproximateAggregation(base.aggregation);
     });
 }

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

@@ -0,0 +1,10 @@
+import type { AnyDatasetInstance, DatasetQuery } from '../types.js';
+import type { DatasetQueryExecutionOptions } from '../dataset-query.js';
+import type { TimeMeasureAxis } from './time-measure-axis.js';
+/** Aggregate each dependency in its evaluation context, then evaluate formulas. */
+export declare function buildCompositeTimeMeasureSql(ds: AnyDatasetInstance, query: DatasetQuery, options: DatasetQueryExecutionOptions, axis: TimeMeasureAxis): {
+    sql: string;
+    parameters: unknown[];
+    timeAxisSql: string;
+};
+//# sourceMappingURL=composite-time-measure-sql.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"composite-time-measure-sql.d.ts","sourceRoot":"","sources":["../../src/utils/composite-time-measure-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAW9D,mFAAmF;AACnF,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,4BAA4B,EAAE,IAAI,EAAE,eAAe;;;;EAgDrJ"}

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

@@ -0,0 +1,60 @@
+import { quoteSQLIdentifier } from '../sql-utils.js';
+import { isDerivedMeasure, isWindowMeasure } from './dataset-measures.js';
+import { buildMeasureEvaluationGraph, evaluationFormula } from './measure-evaluation-graph.js';
+import { buildTimeMeasureSourceSql } from './time-measure-source-sql.js';
+import { buildTimeMeasureAxisSql } from './time-measure-axis-sql.js';
+import { timeMeasureContextCtes, timeMeasureContextGuard } from './time-measure-context-sql.js';
+import { timeMeasureLeafSql } from './time-measure-leaf-sql.js';
+import { derivedProjection } from './derived-measure-sql.js';
+import { buildTimeMeasureResultSql } from './time-measure-result-sql.js';
+/** Aggregate each dependency in its evaluation context, then evaluate formulas. */
+export function buildCompositeTimeMeasureSql(ds, query, options, axis) {
+    const graph = buildMeasureEvaluationGraph(ds.measures, query.measures ?? []);
+    const leaves = graph.nodes.filter(node => !isDerivedMeasure(node.definition));
+    const baseNames = new Set(leaves.map(node => isWindowMeasure(node.definition) ? node.definition.measure : node.name));
+    const source = buildTimeMeasureSourceSql(ds, query, baseNames, axis.filters, options);
+    const timeAxis = buildTimeMeasureAxisSql(source, axis);
+    const contexts = timeMeasureContextCtes(graph.contexts, axis);
+    const inputs = leaves.map(node => {
+        const window = isWindowMeasure(node.definition) ? node.definition : undefined;
+        const base = source.bases.find(base => base.name === (window?.measure ?? node.name));
+        return { node, ...timeMeasureLeafSql(node.id, node.context, base, window, axis, source.dimensions) };
+    });
+    const keys = source.dimensions.map(dim => dim.alias);
+    const combinations = keys.length ? ` CROSS JOIN (SELECT DISTINCT ${keys.join(', ')} FROM (${inputs.map(input => `SELECT ${keys.join(', ')} FROM ${input.population}`).join(' UNION ALL ')})) AS _hq_combinations` : '';
+    const guardCtes = [...source.ctes, ...timeAxis.ctes, ...contexts, ...inputs.flatMap(input => input.ctes)];
+    const ctes = [...guardCtes,
+        `_hq_skeleton AS (SELECT * FROM _hq_series${combinations})`];
+    let previous = '_hq_skeleton';
+    for (const input of inputs) {
+        const { node } = input;
+        const output = `_hq_value${node.id}`;
+        const next = `_hq_evaluated${node.id}`;
+        const value = input.count ? `coalesce(m.${output}, 0)` : `m.${output}`;
+        if (input.cumulative) {
+            const partition = keys.length ? `tuple(${keys.map(key => `s.${key}`).join(', ')})` : 'tuple(0)';
+            const lookup = `_hq_lookup${node.id}`;
+            ctes.push(`${lookup} AS (SELECT s.*, c._hq_eval_end, ${partition} AS _hq_partition FROM ${previous} AS s INNER JOIN _hq_context${input.context} AS c ON s._hq_period = c._hq_period)`);
+            ctes.push(`${next} AS (SELECT s.* EXCEPT (_hq_eval_end, _hq_partition), ${value} AS ${output} FROM ${lookup} AS s LEFT ASOF JOIN ${input.aggregate} AS m ON s._hq_partition = m._hq_partition AND s._hq_eval_end > m._hq_time)`);
+        }
+        else {
+            const condition = ['s._hq_period = m._hq_period', ...keys.map(key => `isNotDistinctFrom(s.${key}, m.${key})`)];
+            ctes.push(`${next} AS (SELECT s.*, ${value} AS ${output} FROM ${previous} AS s LEFT JOIN ${input.aggregate} AS m ON ${condition.join(' AND ')})`);
+        }
+        previous = next;
+    }
+    for (const node of graph.nodes.filter(node => isDerivedMeasure(node.definition))) {
+        const next = `_hq_formula${node.id}`;
+        ctes.push(`${next} AS (SELECT *, ${derivedProjection(`_hq_value${node.id}`, evaluationFormula(node))} FROM ${previous})`);
+        previous = next;
+    }
+    const projections = ['v._hq_period AS period', ...source.dimensions.map(dim => `v.${dim.alias} AS ${quoteSQLIdentifier(dim.name)}`),
+        ...Object.entries(graph.outputs).map(([name, id]) => `v._hq_value${id} AS ${quoteSQLIdentifier(name)}`)];
+    ctes.push(`_hq_values AS (SELECT ${projections.join(', ')} FROM ${previous} AS v)`);
+    const guard = [timeAxis.guard, timeAxis.rangeGuard, ...graph.contexts.map(context => timeMeasureContextGuard(context, axis)), ...inputs.map(input => input.guard)].join(' + ');
+    return {
+        sql: buildTimeMeasureResultSql(ds, query, options, source.dimensions, ctes, guard, true),
+        parameters: source.parameters,
+        timeAxisSql: `WITH ${guardCtes.join(',\n')} SELECT ${guard} AS _hq_validated FROM _hq_bounds`,
+    };
+}

package/dist/utils/dataset-contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-contract.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,SAAS,EACV,MAAM,aAAa,CAAC;AAIrB,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,eAAe,GAAG,iBAAiB,EACzC,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,GAAE,gBAAqB,EAC/B,KAAK,CAAC,EAAE,SAAS,GAChB,cAAc,CA8BhB"}
+{"version":3,"file":"dataset-contract.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-contract.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,SAAS,EACV,MAAM,aAAa,CAAC;AAIrB,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,eAAe,GAAG,iBAAiB,EACzC,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,GAAE,gBAAqB,EAC/B,KAAK,CAAC,EAAE,SAAS,GAChB,cAAc,CA8BhB"}

package/dist/utils/dataset-contract.js

@@ -1,8 +1,9 @@
+import { baseMeasureNames } from './dataset-measures.js';
 import { datasetTimeGrains } from './dataset-time-grains.js';
 import { snapshotSemanticMetadata } from './semantic-metadata.js';
 export function buildMetricContract(metricName, ds, spec, label, description, metadata = {}, grain) {
     const dimensionNames = Object.keys(ds.dimensions);
-    const measureNames = Object.keys(ds.measures);
+    const measureNames = baseMeasureNames(ds.measures);
     const filterNames = Object.keys(ds.filters).length > 0
         ? Object.keys(ds.filters)
         : dimensionNames.filter(name => ds.dimensions[name]?.filterable !== false);

package/dist/utils/dataset-definition-validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-definition-validation.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-definition-validation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAMrB,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AACzD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;AAC5D,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AA+M/D;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,aAAa,CAAC,aAAa,EAAE,WAAW,EAAE,gBAAgB,CAAC,GAClE,IAAI,CAwDN"}
+{"version":3,"file":"dataset-definition-validation.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-definition-validation.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAOrB,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AACzD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;AAC5D,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AA+M/D;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,aAAa,CAAC,aAAa,EAAE,WAAW,EAAE,gBAAgB,CAAC,GAClE,IAAI,CA0DN"}

package/dist/utils/dataset-definition-validation.js

@@ -1,28 +1,8 @@
-/**
- * Definition-time structural validation for `dataset()`.
- *
- * Every check here runs when the dataset is *constructed*, not when it is
- * queried. A dataset is normally defined at module scope, so a malformed model
- * fails at import — in the build, in CI, and in the first test that touches the
- * module — instead of on the first request that happens to exercise the broken
- * part. The alternative is a typo in `tenantKey` that constructs cleanly, passes
- * review, and is discovered by a query that quietly returns another tenant's
- * rows.
- *
- * Two categories of check live here:
- *
- * - **Identifier safety.** `source`, `tenantKey`, `timeKey`, dimension columns
- *   and measure fields are all interpolated into SQL as identifiers. They are
- *   validated once here rather than trusted at every call site that builds a
- *   predicate from them.
- * - **Raw SQL shape.** The `sql` escape hatch on dimensions and measures is an
- *   expression, never a statement. A value carrying a statement terminator or a
- *   comment is rejected structurally, so it cannot become a second statement or
- *   comment out the rest of a clause.
- */
+import { validateShiftMeasures } from './shift-measure-validation.js';
 import { escapeRegExp, isSafeSQLIdentifier, stripSqlLiterals } from '../sql-utils.js';
 import { validateDerivedMeasures } from './derived-measure-validation.js';
-import { isDerivedMeasure } from './dataset-measures.js';
+import { isDerivedMeasure, isWindowMeasure, isShiftMeasure } from './dataset-measures.js';
+import { validateWindowMeasures } from './window-measure-validation.js';
 import { validateDatasetAgentMetadata } from './semantic-metadata-validation.js';
 /**
  * Statement terminators and comment openers.
@@ -139,7 +119,7 @@ function validateMeasures(datasetName, measures, dimensions) {
         if (typeof definition !== 'object' || definition === null) {
             fail(datasetName, `measure "${name}" must be created with measure.*().`);
         }
-        if (isDerivedMeasure(definition))
+        if (isDerivedMeasure(definition) || isWindowMeasure(definition) || isShiftMeasure(definition))
             continue;
         if (definition.__type !== 'measure_definition') {
             fail(datasetName, `measure "${name}" must be created with measure.*().`);
@@ -220,6 +200,8 @@ export function validateDatasetDefinition(name, config) {
     const dimensions = config.dimensions ?? {};
     validateDimensions(name, dimensions);
     const measures = config.measures ?? {};
+    validateWindowMeasures(name, config.timeKey, measures);
+    validateShiftMeasures(name, config.timeKey, measures);
     validateDerivedMeasures(name, measures);
     validateMeasures(name, measures, dimensions);
     validateLimits(name, config.limits);

package/dist/utils/dataset-derived-query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-derived-query.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-derived-query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,kBAAkB,EAA4B,MAAM,aAAa,CAAC;AAClH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAKrE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAExE,KAAK,cAAc,GAAG,CACpB,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,KAClC,gBAAgB,CAAC;AAEtB,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAE9F;AA6CD,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,EACrC,cAAc,EAAE,cAAc,GAC7B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,EAAE,CAAA;CAAE,CA2CxC;AAED,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,EACrC,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CAgB7B"}
+{"version":3,"file":"dataset-derived-query.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-derived-query.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAKrE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAExE,KAAK,cAAc,GAAG,CACpB,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,KAClC,gBAAgB,CAAC;AAEtB,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAE9F;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,EACrC,cAAc,EAAE,cAAc,GAC7B;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,EAAE,CAAA;CAAE,CA2CxC;AAED,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,EACrC,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CAgB7B"}

package/dist/utils/dataset-derived-query.js

@@ -1,67 +1,24 @@
+import { measureDependencyNames } from './measure-dependencies.js';
+import { derivedExpressionSql } from './derived-measure-sql.js';
+import { baseMeasureNames, getBaseMeasure, getDerivedMeasure } from './dataset-measures.js';
 import { quoteSQLIdentifier } from '../sql-utils.js';
 import { validateDatasetQueryInput } from './dataset-query-validation.js';
 import { overfetchLimit } from './pagination.js';
 import { toDatasetQueryResult } from './dataset-query-result.js';
 export function hasSelectedDerivedMeasure(ds, query) {
-    return (query.measures ?? []).some(name => Object.hasOwn(ds.derivedMeasures, name));
-}
-function expressionSql(expression, uses) {
-    switch (expression.kind) {
-        case 'ref': {
-            if (!Object.hasOwn(uses, expression.name)) {
-                throw new Error(`Formula references undeclared input "${expression.name}".`);
-            }
-            const measureName = uses[expression.name];
-            return quoteSQLIdentifier(measureName);
-        }
-        case 'literal': {
-            if (expression.value === null)
-                return 'NULL';
-            if (typeof expression.value === 'number') {
-                if (!Number.isFinite(expression.value))
-                    throw new Error('Formula contains a non-finite number.');
-                return String(expression.value);
-            }
-            if (typeof expression.value === 'boolean')
-                return expression.value ? 'true' : 'false';
-            return `'${expression.value.replace(/\\/g, '\\\\').replace(/'/g, "''")}'`;
-        }
-        case 'binary': {
-            const operators = { add: '+', subtract: '-', multiply: '*', divide: '/' };
-            const operator = operators[expression.operator];
-            if (!operator)
-                throw new Error('Formula contains an unsupported binary operator.');
-            return `(${expressionSql(expression.left, uses)} ${operator} ${expressionSql(expression.right, uses)})`;
-        }
-        case 'function': {
-            const args = expression.args.map(arg => expressionSql(arg, uses));
-            switch (expression.name) {
-                case 'nullIfZero': return `NULLIF(${args[0]}, 0)`;
-                case 'coalesce': return `COALESCE(${args.join(', ')})`;
-                case 'round': return `ROUND(${args.join(', ')})`;
-                case 'floor': return `FLOOR(${args[0]})`;
-                case 'ceil': return `CEIL(${args[0]})`;
-                default: throw new Error('Formula contains an unsupported function.');
-            }
-        }
-    }
-}
-function derivedProjection(name, definition) {
-    const aliases = Object.fromEntries(Object.keys(definition.uses).map(alias => [alias, alias]));
-    return `${expressionSql(definition.formula(aliases).expression, definition.uses)} AS ${quoteSQLIdentifier(name)}`;
+    return (query.measures ?? []).some(name => getDerivedMeasure(ds.measures, name) !== undefined);
 }
 export function buildDerivedDatasetSql(ds, query, options, buildBaseQuery) {
     const validation = validateDatasetQueryInput(ds, query, options.context);
     if (!validation.valid) {
         throw new Error(`Invalid dataset query: ${validation.errors.join('; ')}`);
     }
-    const selected = query.measures ?? Object.keys(ds.measures);
-    const baseMeasures = new Set(selected.filter(name => Object.hasOwn(ds.measures, name)));
-    for (const name of selected) {
-        const derived = Object.hasOwn(ds.derivedMeasures, name) ? ds.derivedMeasures[name] : undefined;
-        if (derived)
-            Object.values(derived.uses).forEach(base => baseMeasures.add(base));
-    }
+    const selected = query.measures ?? baseMeasureNames(ds.measures);
+    const baseMeasures = measureDependencyNames(ds.measures, selected).filter(name => getBaseMeasure(ds.measures, name));
+    const resolve = (name) => {
+        const derived = getDerivedMeasure(ds.measures, name);
+        return derived ? `(${derivedExpressionSql(derived, resolve)})` : quoteSQLIdentifier(name);
+    };
     const inner = buildBaseQuery(ds, {
         ...query,
         measures: [...baseMeasures],
@@ -76,9 +33,9 @@ export function buildDerivedDatasetSql(ds, query, options, buildBaseQuery) {
     for (const dimension of query.dimensions ?? [])
         projections.push(quoteSQLIdentifier(dimension));
     for (const name of selected) {
-        const derived = Object.hasOwn(ds.derivedMeasures, name) ? ds.derivedMeasures[name] : undefined;
+        const derived = getDerivedMeasure(ds.measures, name);
         projections.push(derived
-            ? derivedProjection(name, derived)
+            ? `${derivedExpressionSql(derived, resolve)} AS ${quoteSQLIdentifier(name)}`
             : quoteSQLIdentifier(name));
     }
     let sql = `WITH base AS (${innerSql}) SELECT ${projections.join(', ')} FROM base`;

package/dist/utils/dataset-measures.d.ts

@@ -1,10 +1,17 @@
-import type { BaseMeasures, DatasetMeasureDefinition, DerivedMeasureDefinition, DerivedMeasures, MeasureDefinition } from '../types.js';
-export declare function isDerivedMeasure(definition: DatasetMeasureDefinition): definition is DerivedMeasureDefinition;
-export declare function isBaseMeasure(definition: DatasetMeasureDefinition): definition is MeasureDefinition;
+import type { DatasetMeasureDefinition, DerivedMeasureDefinition, DerivedMeasures, MeasureDefinition, WindowMeasureDefinition, ShiftMeasureDefinition } from '../types.js';
+export declare function isDerivedMeasure(definition: DatasetMeasureDefinition | null | undefined): definition is DerivedMeasureDefinition;
+export declare function isBaseMeasure(definition: DatasetMeasureDefinition | null | undefined): definition is MeasureDefinition;
+export declare function isWindowMeasure(definition: DatasetMeasureDefinition | null | undefined): definition is WindowMeasureDefinition;
+export declare function isShiftMeasure(definition: DatasetMeasureDefinition | null | undefined): definition is ShiftMeasureDefinition;
 export declare function baseMeasureNames(measures: Record<string, DatasetMeasureDefinition>): string[];
-export declare function splitDatasetMeasures<TMeasures extends Record<string, DatasetMeasureDefinition>>(measures: TMeasures | undefined): {
-    base: BaseMeasures<TMeasures>;
-    derived: DerivedMeasures<TMeasures>;
+export declare function getBaseMeasure(measures: Record<string, DatasetMeasureDefinition>, name: string): MeasureDefinition | undefined;
+export declare function splitDatasetMeasures(measures: Record<string, DatasetMeasureDefinition> | undefined): {
+    base: Record<string, MeasureDefinition>;
+    derived: Record<string, DerivedMeasureDefinition>;
+    windows: Record<string, WindowMeasureDefinition>;
+    shifts: Record<string, ShiftMeasureDefinition>;
 };
+/** Preserve the literal keys and formula aliases of the deprecated typed view. */
+export declare function derivedMeasuresView<TMeasures extends Record<string, DatasetMeasureDefinition>>(measures: TMeasures): DerivedMeasures<TMeasures>;
 export declare function getDerivedMeasure(measures: Record<string, DatasetMeasureDefinition>, name: string): DerivedMeasureDefinition | undefined;
 //# sourceMappingURL=dataset-measures.d.ts.map

package/dist/utils/dataset-measures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-measures.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-measures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,wBAAwB,EACxB,eAAe,EACf,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAErB,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,wBAAwB,GACnC,UAAU,IAAI,wBAAwB,CAExC;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,wBAAwB,GACnC,UAAU,IAAI,iBAAiB,CAEjC;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAAG,MAAM,EAAE,CAI7F;AAED,wBAAgB,oBAAoB,CAAC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,EAC7F,QAAQ,EAAE,SAAS,GAAG,SAAS,GAC9B;IAAE,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IAAC,OAAO,EAAE,eAAe,CAAC,SAAS,CAAC,CAAA;CAAE,CAMxE;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,EAClD,IAAI,EAAE,MAAM,GACX,wBAAwB,GAAG,SAAS,CAItC"}
+{"version":3,"file":"dataset-measures.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-measures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,wBAAwB,EACxB,eAAe,EACf,iBAAiB,EACjB,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAErB,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,wBAAwB,GAAG,IAAI,GAAG,SAAS,GACtD,UAAU,IAAI,wBAAwB,CAExC;AAED,wBAAgB,aAAa,CAC3B,UAAU,EAAE,wBAAwB,GAAG,IAAI,GAAG,SAAS,GACtD,UAAU,IAAI,iBAAiB,CAEjC;AAED,wBAAgB,eAAe,CAC7B,UAAU,EAAE,wBAAwB,GAAG,IAAI,GAAG,SAAS,GACtD,UAAU,IAAI,uBAAuB,CAEvC;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,wBAAwB,GAAG,IAAI,GAAG,SAAS,GAAG,UAAU,IAAI,sBAAsB,CAE5H;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAAG,MAAM,EAAE,CAI7F;AAED,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,EAClD,IAAI,EAAE,MAAM,GACX,iBAAiB,GAAG,SAAS,CAI/B;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,GAAG,SAAS,GAC7D;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;IAClD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;IACjD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;CAChD,CAQA;AAED,kFAAkF;AAClF,wBAAgB,mBAAmB,CAAC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,EAC5F,QAAQ,EAAE,SAAS,GAClB,eAAe,CAAC,SAAS,CAAC,CAK5B;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,EAClD,IAAI,EAAE,MAAM,GACX,wBAAwB,GAAG,SAAS,CAItC"}

package/dist/utils/dataset-measures.js

@@ -1,21 +1,42 @@
 export function isDerivedMeasure(definition) {
-    return definition.__type === 'derived_measure_definition';
+    return definition?.__type === 'derived_measure_definition';
 }
 export function isBaseMeasure(definition) {
-    return definition.__type === 'measure_definition';
+    return definition?.__type === 'measure_definition';
+}
+export function isWindowMeasure(definition) {
+    return definition?.__type === 'window_measure_definition';
+}
+export function isShiftMeasure(definition) {
+    return definition?.__type === 'shift_measure_definition';
 }
 export function baseMeasureNames(measures) {
     return Object.entries(measures)
         .filter(([, definition]) => isBaseMeasure(definition))
         .map(([name]) => name);
 }
+export function getBaseMeasure(measures, name) {
+    if (!Object.hasOwn(measures, name))
+        return undefined;
+    const definition = measures[name];
+    return isBaseMeasure(definition) ? definition : undefined;
+}
 export function splitDatasetMeasures(measures) {
     const entries = Object.entries(measures ?? {});
     return {
-        base: Object.fromEntries(entries.filter(([, definition]) => isBaseMeasure(definition))),
-        derived: Object.fromEntries(entries.filter(([, definition]) => isDerivedMeasure(definition))),
+        base: Object.fromEntries(entries.filter((entry) => isBaseMeasure(entry[1]))),
+        derived: Object.fromEntries(entries.filter((entry) => isDerivedMeasure(entry[1]))),
+        shifts: Object.fromEntries(entries.filter((entry) => isShiftMeasure(entry[1]))),
+        windows: Object.fromEntries(entries.filter((entry) => isWindowMeasure(entry[1]))),
     };
 }
+/** Preserve the literal keys and formula aliases of the deprecated typed view. */
+export function derivedMeasuresView(measures) {
+    // TypeScript narrows each entry's value, but cannot reconstruct the mapped
+    // subset of generic keys after Object.fromEntries. The filtering above
+    // establishes that correspondence; preserve it at this single boundary.
+    return splitDatasetMeasures(measures).derived;
+}
 export function getDerivedMeasure(measures, name) {
     if (!Object.hasOwn(measures, name))
         return undefined;

package/dist/utils/dataset-metric-ref.d.ts

@@ -1,6 +1,6 @@
-import type { AggregationSpec, BaseMetricConfig, BaseMetricRef, DatasetInstance, DerivedMetricConfig, DerivedMetricRef, DerivedMetricSpec, DimensionDefinition, MeasureDefinition, MetricRef, RelationshipDefinition, SemanticMetadata } from '../types.js';
+import type { AggregationSpec, BaseMetricConfig, BaseMetricRef, DatasetInstance, DerivedMetricConfig, DerivedMetricRef, DerivedMetricSpec, DimensionDefinition, DatasetMeasureDefinition, MeasureDefinition, MetricRef, RelationshipDefinition, SemanticMetadata } from '../types.js';
 type AnyDimensions = Record<string, DimensionDefinition>;
-type AnyMeasures = Record<string, MeasureDefinition>;
+type AnyMeasures = Record<string, DatasetMeasureDefinition>;
 type AnyRelationships = Record<string, RelationshipDefinition>;
 export declare function isDerivedMetricConfig<TMeasures extends Record<string, MeasureDefinition>, TDatasetName extends string>(config: BaseMetricConfig<TMeasures> | DerivedMetricConfig<TDatasetName>): config is DerivedMetricConfig<TDatasetName>;
 export declare function createMetricRef<TDatasetName extends string, TMetricName extends string, TSpec extends AggregationSpec | DerivedMetricSpec<TDatasetName>, TDataset extends DatasetInstance<AnyDimensions, AnyMeasures, AnyRelationships, TDatasetName>>(ds: TDataset, name: TMetricName, spec: TSpec, label?: string, description?: string, metadata?: SemanticMetadata): MetricRef<TDatasetName, TMetricName, TSpec, TDataset>;

package/dist/utils/dataset-metric-ref.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-metric-ref.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-metric-ref.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,iBAAiB,EACjB,SAAS,EACT,sBAAsB,EACtB,gBAAgB,EAEjB,MAAM,aAAa,CAAC;AAKrB,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AACzD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AACrD,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AAE/D,wBAAgB,qBAAqB,CACnC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACnD,YAAY,SAAS,MAAM,EAE3B,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAAC,GAAG,mBAAmB,CAAC,YAAY,CAAC,GACtE,MAAM,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAE7C;AAED,wBAAgB,eAAe,CAC7B,YAAY,SAAS,MAAM,EAC3B,WAAW,SAAS,MAAM,EAC1B,KAAK,SAAS,eAAe,GAAG,iBAAiB,CAAC,YAAY,CAAC,EAC/D,QAAQ,SAAS,eAAe,CAAC,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,CAAC,EAE5F,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,KAAK,EACX,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,GAAE,gBAAqB,GAC9B,SAAS,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,CAsCvD;AAED,wBAAgB,uBAAuB,CAAC,YAAY,SAAS,MAAM,EACjE,MAAM,EAAE,mBAAmB,CAAC,YAAY,CAAC,GACxC,iBAAiB,CAAC,YAAY,CAAC,CAMjC;AAED,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"dataset-metric-ref.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-metric-ref.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EAEnB,wBAAwB,EACxB,iBAAiB,EACjB,SAAS,EACT,sBAAsB,EACtB,gBAAgB,EAEjB,MAAM,aAAa,CAAC;AAKrB,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AACzD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;AAC5D,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AAE/D,wBAAgB,qBAAqB,CACnC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACnD,YAAY,SAAS,MAAM,EAE3B,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAAC,GAAG,mBAAmB,CAAC,YAAY,CAAC,GACtE,MAAM,IAAI,mBAAmB,CAAC,YAAY,CAAC,CAE7C;AAED,wBAAgB,eAAe,CAC7B,YAAY,SAAS,MAAM,EAC3B,WAAW,SAAS,MAAM,EAC1B,KAAK,SAAS,eAAe,GAAG,iBAAiB,CAAC,YAAY,CAAC,EAC/D,QAAQ,SAAS,eAAe,CAAC,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,CAAC,EAE5F,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,KAAK,EACX,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,GAAE,gBAAqB,GAC9B,SAAS,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,CAsCvD;AAED,wBAAgB,uBAAuB,CAAC,YAAY,SAAS,MAAM,EACjE,MAAM,EAAE,mBAAmB,CAAC,YAAY,CAAC,GACxC,iBAAiB,CAAC,YAAY,CAAC,CAMjC;AAED,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/utils/dataset-query-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-query-result.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-query-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAKrB,oFAAoF;AACpF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC/B,OAAO,EAAE;IACP,OAAO,EAAE,kBAAkB,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B,GACA,kBAAkB,CAgBpB"}
+{"version":3,"file":"dataset-query-result.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-query-result.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAKrB,oFAAoF;AACpF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC/B,OAAO,EAAE;IACP,OAAO,EAAE,kBAAkB,CAAC;IAC5B,KAAK,EAAE,YAAY,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B,GACA,kBAAkB,CAgBpB"}

package/dist/utils/dataset-query-result.js

@@ -1,10 +1,11 @@
+import { baseMeasureNames } from './dataset-measures.js';
 import { applyPagination } from './pagination.js';
 import { serializeSemanticMeasureValues } from './semantic-result-serialization.js';
 import { getRuntimeTenantId } from './tenant-runtime.js';
 /** Apply the same result contract to builder-backed and derived dataset queries. */
 export function toDatasetQueryResult(rows, options) {
     const { dataset, query, sql, timingMs, context } = options;
-    const selectedMeasures = query.measures ?? Object.keys(dataset.measures);
+    const selectedMeasures = query.measures ?? baseMeasureNames(dataset.measures);
     const { data, pagination } = applyPagination(rows, query.limit, query.offset);
     const serializedData = serializeSemanticMeasureValues(data, selectedMeasures);
     return {

package/dist/utils/dataset-query-validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-query-validation.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-query-validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAgB9E,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAiKlB"}
+{"version":3,"file":"dataset-query-validation.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-query-validation.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAiB9E,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAmKlB"}

package/dist/utils/dataset-query-validation.js

@@ -1,15 +1,18 @@
+import { queryTimezoneErrors } from './query-timezone.js';
+import { baseMeasureNames } from './dataset-measures.js';
 import { validateFilterValue } from '../validation.js';
 import { unsupportedTimeGrainError } from './dataset-time-grains.js';
 import { getRuntimeTenantPredicate, validateTenantRuntime, } from './tenant-runtime.js';
 import { isQualifiedField, resolveQualifiedField, } from './relationship-fields.js';
 import { validateQualifiedFilter, validateRelationshipTenantRuntime, } from './relationship-validation.js';
 import { segmentSelectionErrors } from './segments.js';
+import { analyzeTimeMeasureAxis } from './time-measure-axis.js';
 export function validateDatasetQueryInput(ds, query, context) {
-    const errors = [];
+    const errors = queryTimezoneErrors(query.timezone);
     const dimensionNames = Object.keys(ds.dimensions);
-    const measureNames = [...Object.keys(ds.measures), ...Object.keys(ds.derivedMeasures ?? {})];
+    const measureNames = Object.keys(ds.measures);
     const selectedDimensions = query.dimensions ?? [];
-    const selectedMeasures = query.measures ?? Object.keys(ds.measures);
+    const selectedMeasures = query.measures ?? baseMeasureNames(ds.measures);
     const filterNames = Object.keys(ds.filters);
     const orderableFields = new Set([
         ...selectedDimensions,
@@ -114,6 +117,7 @@ export function validateDatasetQueryInput(ds, query, context) {
     if (query.by && !ds.timeKey) {
         errors.push(`Cannot use "by" grain — dataset "${ds.name}" has no timeKey.`);
     }
+    errors.push(...analyzeTimeMeasureAxis(ds, query).errors);
     errors.push(...segmentSelectionErrors(ds, query.segments));
     const grainError = query.by && ds.timeKey ? unsupportedTimeGrainError(ds, query.by) : undefined;
     if (grainError) {

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

@@ -0,0 +1,4 @@
+import type { DerivedMeasureDefinition } from '../types.js';
+export declare function derivedExpressionSql(definition: DerivedMeasureDefinition, resolve?: (name: string) => string): string;
+export declare function derivedProjection(name: string, definition: DerivedMeasureDefinition): string;
+//# sourceMappingURL=derived-measure-sql.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"derived-measure-sql.d.ts","sourceRoot":"","sources":["../../src/utils/derived-measure-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAyC5D,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,wBAAwB,EAAE,OAAO,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAA2B,GAAG,MAAM,CAGzI;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,GAAG,MAAM,CAE5F"}

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

@@ -0,0 +1,49 @@
+import { quoteSQLIdentifier } from '../sql-utils.js';
+function expressionSql(expression, uses, resolve) {
+    switch (expression.kind) {
+        case 'ref': {
+            if (!Object.hasOwn(uses, expression.name)) {
+                throw new Error(`Formula references undeclared input "${expression.name}".`);
+            }
+            const measureName = uses[expression.name];
+            return resolve(measureName);
+        }
+        case 'literal': {
+            if (expression.value === null)
+                return 'NULL';
+            if (typeof expression.value === 'number') {
+                if (!Number.isFinite(expression.value))
+                    throw new Error('Formula contains a non-finite number.');
+                return String(expression.value);
+            }
+            if (typeof expression.value === 'boolean')
+                return expression.value ? 'true' : 'false';
+            return `'${expression.value.replace(/\\/g, '\\\\').replace(/'/g, "''")}'`;
+        }
+        case 'binary': {
+            const operators = { add: '+', subtract: '-', multiply: '*', divide: '/' };
+            const operator = operators[expression.operator];
+            if (!operator)
+                throw new Error('Formula contains an unsupported binary operator.');
+            return `(${expressionSql(expression.left, uses, resolve)} ${operator} ${expressionSql(expression.right, uses, resolve)})`;
+        }
+        case 'function': {
+            const args = expression.args.map(arg => expressionSql(arg, uses, resolve));
+            switch (expression.name) {
+                case 'nullIfZero': return `NULLIF(${args[0]}, 0)`;
+                case 'coalesce': return `COALESCE(${args.join(', ')})`;
+                case 'round': return `ROUND(${args.join(', ')})`;
+                case 'floor': return `FLOOR(${args[0]})`;
+                case 'ceil': return `CEIL(${args[0]})`;
+                default: throw new Error('Formula contains an unsupported function.');
+            }
+        }
+    }
+}
+export function derivedExpressionSql(definition, resolve = quoteSQLIdentifier) {
+    const aliases = Object.fromEntries(Object.keys(definition.uses).map(alias => [alias, alias]));
+    return expressionSql(definition.formula(aliases).expression, definition.uses, resolve);
+}
+export function derivedProjection(name, definition) {
+    return `${derivedExpressionSql(definition)} AS ${quoteSQLIdentifier(name)}`;
+}

package/dist/utils/derived-measure-validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derived-measure-validation.d.ts","sourceRoot":"","sources":["../../src/utils/derived-measure-validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EAIzB,MAAM,aAAa,CAAC;AAmHrB,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACjD,IAAI,CAqDN"}
+{"version":3,"file":"derived-measure-validation.d.ts","sourceRoot":"","sources":["../../src/utils/derived-measure-validation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,wBAAwB,EAGzB,MAAM,aAAa,CAAC;AA8FrB,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACjD,IAAI,CAgDN"}

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

@@ -1,5 +1,6 @@
+import { assertMeasureDependenciesAcyclic } from './measure-dependencies.js';
 import { isSafeSQLIdentifier } from '../sql-utils.js';
-import { isBaseMeasure, isDerivedMeasure } from './dataset-measures.js';
+import { splitDatasetMeasures } from './dataset-measures.js';
 function fail(datasetName, measureName, detail) {
     throw new Error(`Invalid dataset "${datasetName}": derived measure "${measureName}" ${detail}`);
 }
@@ -71,27 +72,8 @@ function evaluateFormula(datasetName, measureName, definition) {
     }
     return formula;
 }
-function assertAcyclic(datasetName, derivedMeasures) {
-    const visiting = new Set();
-    const visited = new Set();
-    const visit = (name) => {
-        if (visiting.has(name))
-            fail(datasetName, name, 'contains a dependency cycle.');
-        if (visited.has(name))
-            return;
-        if (!Object.hasOwn(derivedMeasures, name))
-            return;
-        const definition = derivedMeasures[name];
-        visiting.add(name);
-        Object.values(definition.uses).forEach(dependency => visit(dependency));
-        visiting.delete(name);
-        visited.add(name);
-    };
-    Object.keys(derivedMeasures).forEach(visit);
-}
 export function validateDerivedMeasures(datasetName, measures) {
-    const baseMeasures = Object.fromEntries(Object.entries(measures).filter(([, definition]) => definition && isBaseMeasure(definition)));
-    const derivedMeasures = Object.fromEntries(Object.entries(measures).filter(([, definition]) => definition && isDerivedMeasure(definition)));
+    const { derived: derivedMeasures } = splitDatasetMeasures(measures);
     for (const [measureName, definition] of Object.entries(derivedMeasures)) {
         if (!isSafeSQLIdentifier(measureName)) {
             fail(datasetName, measureName, 'name is not a safe identifier.');
@@ -103,11 +85,11 @@ export function validateDerivedMeasures(datasetName, measures) {
             fail(datasetName, measureName, 'must declare an input map.');
         }
     }
-    assertAcyclic(datasetName, derivedMeasures);
+    assertMeasureDependenciesAcyclic(datasetName, measures);
     for (const [measureName, definition] of Object.entries(derivedMeasures)) {
         const uses = Object.entries(definition.uses);
         if (uses.length === 0)
-            fail(datasetName, measureName, 'must reference at least one base measure.');
+            fail(datasetName, measureName, 'must reference at least one base, window, or shift measure.');
         if (typeof definition.formula !== 'function')
             fail(datasetName, measureName, 'must define a formula function.');
         for (const [alias, dependencyName] of uses) {
@@ -116,11 +98,9 @@ export function validateDerivedMeasures(datasetName, measures) {
             if (typeof dependencyName !== 'string' || dependencyName.includes('.')) {
                 fail(datasetName, measureName, `references cross-dataset measure "${String(dependencyName)}".`);
             }
-            if (Object.hasOwn(derivedMeasures, dependencyName)) {
-                fail(datasetName, measureName, `references derived measure "${dependencyName}"; v1 inputs must be base measures.`);
-            }
-            if (!Object.hasOwn(baseMeasures, dependencyName))
+            if (!Object.hasOwn(measures, dependencyName)) {
                 fail(datasetName, measureName, `references missing measure "${dependencyName}".`);
+            }
         }
         const references = new Set();
         collectReferences(datasetName, measureName, evaluateFormula(datasetName, measureName, definition).expression, references, { nodes: 0 });

package/dist/utils/measure-dependencies.d.ts

@@ -0,0 +1,8 @@
+import type { DatasetMeasureDefinition, MeasureDefinition } from '../types.js';
+export declare function measureDependencies(definition: DatasetMeasureDefinition): string[];
+/** Dependency order, with each shared input visited once. */
+export declare function measureDependencyNames(measures: Readonly<Record<string, DatasetMeasureDefinition>>, selected: readonly string[]): string[];
+export declare function assertMeasureDependenciesAcyclic(dataset: string, measures: Readonly<Record<string, DatasetMeasureDefinition>>): void;
+/** Wrappers inherit aggregation metadata only when their input has one. */
+export declare function inheritedBaseMeasure(measures: Readonly<Record<string, DatasetMeasureDefinition>>, name: string): MeasureDefinition | undefined;
+//# sourceMappingURL=measure-dependencies.d.ts.map

package/dist/utils/measure-dependencies.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"measure-dependencies.d.ts","sourceRoot":"","sources":["../../src/utils/measure-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAG/E,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,wBAAwB,GAAG,MAAM,EAAE,CAIlF;AAED,6DAA6D;AAC7D,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAe1I;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,GAAG,IAAI,CAGpI;AAED,2EAA2E;AAC3E,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAK9I"}