@hypequery/datasets 0.18.0 → 0.20.0

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":"AAEA,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,64 +1,21 @@
+import { derivedProjection } 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)));
+    const selected = query.measures ?? baseMeasureNames(ds.measures);
+    const baseMeasures = new Set(selected.filter(name => getBaseMeasure(ds.measures, name) !== undefined));
     for (const name of selected) {
-        const derived = Object.hasOwn(ds.derivedMeasures, name) ? ds.derivedMeasures[name] : undefined;
+        const derived = getDerivedMeasure(ds.measures, name);
         if (derived)
             Object.values(derived.uses).forEach(base => baseMeasures.add(base));
     }
@@ -76,7 +33,7 @@ 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)
             : quoteSQLIdentifier(name));

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;AAIrB,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,CAkCvD;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-metric-ref.js

@@ -1,5 +1,6 @@
 import { buildMetricContract } from './dataset-contract.js';
 import { snapshotSemanticMetadata } from './semantic-metadata.js';
+import { unsupportedTimeGrainError } from './dataset-time-grains.js';
 export function isDerivedMetricConfig(config) {
     return 'uses' in config && 'formula' in config;
 }
@@ -17,6 +18,10 @@ export function createMetricRef(ds, name, spec, label, description, metadata = {
             if (!ds.timeKey) {
                 throw new Error(`Cannot apply .by("${grain}") to metric "${name}" — dataset "${ds.name}" has no timeKey defined.`);
             }
+            const grainError = unsupportedTimeGrainError(ds, grain);
+            if (grainError) {
+                throw new Error(`Cannot apply .by("${grain}") to metric "${name}": ${grainError}.`);
+            }
             return {
                 __type: 'grained_metric_ref',
                 metric: ref,

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;AAe9E,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CA8JlB"}
+{"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,14 +1,18 @@
+import { queryTimezoneErrors } from './query-timezone.js';
+import { baseMeasureNames } from './dataset-measures.js';
 import { validateFilterValue } from '../validation.js';
-import { SUPPORTED_TIME_GRAINS, isSupportedTimeGrain } from '../constants.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,
@@ -113,8 +117,11 @@ export function validateDatasetQueryInput(ds, query, context) {
     if (query.by && !ds.timeKey) {
         errors.push(`Cannot use "by" grain — dataset "${ds.name}" has no timeKey.`);
     }
-    if (query.by && !isSupportedTimeGrain(query.by)) {
-        errors.push(`Unsupported time grain "${query.by}". Supported: ${SUPPORTED_TIME_GRAINS.join(', ')}`);
+    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) {
+        errors.push(grainError);
     }
     if (query.limit != null && (!Number.isInteger(query.limit) || query.limit < 0)) {
         errors.push(`Invalid limit: expected a non-negative integer.`);

package/dist/utils/dataset-time-grains.d.ts

@@ -0,0 +1,15 @@
+/**
+ * The time grains a dataset supports: none without a `timeKey`, otherwise its
+ * declared `timeGrains`, or every grain the planner can bucket on.
+ */
+import type { TimeGrain } from '../types.js';
+export declare function datasetTimeGrains(dataset: {
+    readonly timeKey?: string;
+    readonly timeGrains?: readonly TimeGrain[];
+}): readonly TimeGrain[];
+/** Validation message for a grain the dataset does not support, or undefined. */
+export declare function unsupportedTimeGrainError(dataset: {
+    readonly timeKey?: string;
+    readonly timeGrains?: readonly TimeGrain[];
+}, grain: unknown): string | undefined;
+//# sourceMappingURL=dataset-time-grains.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dataset-time-grains.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-time-grains.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,GACjF,SAAS,SAAS,EAAE,CAGtB;AAED,iFAAiF;AACjF,wBAAgB,yBAAyB,CACvC,OAAO,EAAE;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,EAClF,KAAK,EAAE,OAAO,GACb,MAAM,GAAG,SAAS,CAIpB"}

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

@@ -0,0 +1,17 @@
+/**
+ * The time grains a dataset supports: none without a `timeKey`, otherwise its
+ * declared `timeGrains`, or every grain the planner can bucket on.
+ */
+import { SUPPORTED_TIME_GRAINS } from '../constants.js';
+export function datasetTimeGrains(dataset) {
+    if (!dataset.timeKey)
+        return [];
+    return dataset.timeGrains ?? SUPPORTED_TIME_GRAINS;
+}
+/** Validation message for a grain the dataset does not support, or undefined. */
+export function unsupportedTimeGrainError(dataset, grain) {
+    const supported = datasetTimeGrains(dataset);
+    if (typeof grain === 'string' && supported.includes(grain))
+        return undefined;
+    return `Unsupported time grain "${String(grain)}". Supported: ${supported.join(', ')}`;
+}

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

@@ -0,0 +1,3 @@
+import type { DerivedMeasureDefinition } from '../types.js';
+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,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,wBAAwB,GAAG,MAAM,CAG5F"}

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

@@ -0,0 +1,46 @@
+import { quoteSQLIdentifier } from '../sql-utils.js';
+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.');
+            }
+        }
+    }
+}
+export 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)}`;
+}

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":"AAAA,OAAO,KAAK,EACV,wBAAwB,EAGzB,MAAM,aAAa,CAAC;AAmHrB,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,GACjD,IAAI,CAmDN"}

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

@@ -1,5 +1,5 @@
 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}`);
 }
@@ -90,8 +90,8 @@ function assertAcyclic(datasetName, derivedMeasures) {
     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 { base: baseMeasures, derived: derivedMeasures, windows, shifts } = splitDatasetMeasures(measures);
+    const timeMeasureNames = new Set([...Object.keys(windows), ...Object.keys(shifts)]);
     for (const [measureName, definition] of Object.entries(derivedMeasures)) {
         if (!isSafeSQLIdentifier(measureName)) {
             fail(datasetName, measureName, 'name is not a safe identifier.');
@@ -107,7 +107,7 @@ export function validateDerivedMeasures(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) {
@@ -119,8 +119,9 @@ export function validateDerivedMeasures(datasetName, measures) {
             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(baseMeasures, dependencyName) && !timeMeasureNames.has(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/filtered-aggregation-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filtered-aggregation-sql.d.ts","sourceRoot":"","sources":["../../src/utils/filtered-aggregation-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAgB,MAAM,aAAa,CAAC;AAErF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,KAAK,YAAY,GAAG,kBAAkB,CAAC;AAqEvC,wBAAgB,kCAAkC,CAChD,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,0BAA0B,GACnC,MAAM,CA+BR"}
+{"version":3,"file":"filtered-aggregation-sql.d.ts","sourceRoot":"","sources":["../../src/utils/filtered-aggregation-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAgB,MAAM,aAAa,CAAC;AAErF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAEjF,KAAK,YAAY,GAAG,kBAAkB,CAAC;AAqEvC,wBAAgB,kCAAkC,CAChD,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,eAAe,EACrB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,0BAA0B,GACnC,MAAM,CAgCR"}

package/dist/utils/filtered-aggregation-sql.js

@@ -74,6 +74,7 @@ export function applyFilteredAggregationExpression(ds, spec, fieldOrExpr, joinCt
         case 'percentile':
         case 'stddev':
         case 'variance':
+        case 'approxCountDistinct':
             return `if(${combinedCondition}, ${fieldOrExpr}, NULL)`;
         case 'argMax':
         case 'argMin':

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

@@ -0,0 +1,4 @@
+import type { DatasetMeasureDefinition, TimeGrain } from '../types.js';
+/** Intersect time-measure requirements with the dataset's declared grains. */
+export declare function measureSupportedGrains(measures: Readonly<Record<string, DatasetMeasureDefinition>>, name: string, grains: readonly TimeGrain[]): TimeGrain[];
+//# sourceMappingURL=measure-time-grains.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,16 @@
+import { getDerivedMeasure, isShiftMeasure, isWindowMeasure } from './dataset-measures.js';
+import { intervalBuckets, windowGrainErrors } from './time-axis-intervals.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);
+    }
+    if (isWindowMeasure(definition))
+        return grains.filter(grain => !windowGrainErrors(name, definition, grain).length);
+    const derived = getDerivedMeasure(measures, name);
+    if (!derived)
+        return [...grains];
+    const inputs = Object.values(derived.uses).map(input => measureSupportedGrains(measures, input, grains));
+    return grains.filter(grain => inputs.every(supported => supported.includes(grain)));
+}

package/dist/utils/portable-aggregations.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Aggregations that the published deployment contract can carry.
+ *
+ * `approxCountDistinct` runs locally, but it is an expression extension 2 and
+ * deployment contract 3 feature (RFC 0015). Publishing emits contract 2 until
+ * it can emit contract 3, so it refuses the measure with an error naming it.
+ */
+import type { ProtocolAggregation } from '@hypequery/protocol';
+import type { AggregationType } from '../types.js';
+type PortableAggregation = Exclude<ProtocolAggregation, 'approxCountDistinct'>;
+/** Returns `aggregation` when publishing can carry it; otherwise throws naming `owner`. */
+export declare function requirePortableAggregation(aggregation: AggregationType, owner: string): PortableAggregation;
+export {};
+//# sourceMappingURL=portable-aggregations.d.ts.map

package/dist/utils/portable-aggregations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"portable-aggregations.d.ts","sourceRoot":"","sources":["../../src/utils/portable-aggregations.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,KAAK,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,CAAC;AAE/E,2FAA2F;AAC3F,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,eAAe,EAC5B,KAAK,EAAE,MAAM,GACZ,mBAAmB,CAQrB"}

package/dist/utils/portable-aggregations.js

@@ -0,0 +1,15 @@
+/**
+ * Aggregations that the published deployment contract can carry.
+ *
+ * `approxCountDistinct` runs locally, but it is an expression extension 2 and
+ * deployment contract 3 feature (RFC 0015). Publishing emits contract 2 until
+ * it can emit contract 3, so it refuses the measure with an error naming it.
+ */
+/** Returns `aggregation` when publishing can carry it; otherwise throws naming `owner`. */
+export function requirePortableAggregation(aggregation, owner) {
+    if (aggregation === 'approxCountDistinct') {
+        throw new Error(`${owner} uses approxCountDistinct, which cannot be published yet: approximate aggregations ` +
+            'need deployment contract 3 (RFC 0015). Use it for local queries, or publish countDistinct instead.');
+    }
+    return aggregation;
+}

package/dist/utils/portable-grains.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Time grains that the published deployment contract can carry.
+ *
+ * `minute` and `hour` run locally, but they are expression extension 2 and
+ * deployment contract 3 features (RFC 0015). Publishing emits contract 2 until
+ * it can emit contract 3, so a dataset that pins a sub-day grain is refused
+ * with an error naming what needs it, rather than failing later as an opaque
+ * contract validation error.
+ */
+import type { ProtocolTimeGrain } from '@hypequery/protocol';
+import type { TimeGrain } from '../types.js';
+/** Grains deployment contract 2 and invocation 1 carry, in ascending order. */
+export declare const PORTABLE_TIME_GRAINS: readonly ProtocolTimeGrain[];
+export declare function isPortableTimeGrain(grain: TimeGrain): grain is ProtocolTimeGrain;
+/** Returns `grain` when publishing can carry it; otherwise throws naming `owner`. */
+export declare function requirePortableTimeGrain(grain: TimeGrain, owner: string): ProtocolTimeGrain;
+/** Contract 2 cannot represent a dataset-level restriction on portable grains. */
+export declare function assertPublishableTimeGrains(dataset: {
+    readonly name: string;
+    readonly timeGrains?: readonly TimeGrain[];
+}): void;
+//# sourceMappingURL=portable-grains.d.ts.map

package/dist/utils/portable-grains.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"portable-grains.d.ts","sourceRoot":"","sources":["../../src/utils/portable-grains.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,+EAA+E;AAC/E,eAAO,MAAM,oBAAoB,EAAE,SAAS,iBAAiB,EAE3D,CAAC;AAIH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,IAAI,iBAAiB,CAEhF;AAED,qFAAqF;AACrF,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAQ3F;AAED,kFAAkF;AAClF,wBAAgB,2BAA2B,CACzC,OAAO,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,SAAS,EAAE,CAAA;CAAE,GAC7E,IAAI,CASN"}

package/dist/utils/portable-grains.js

@@ -0,0 +1,35 @@
+/**
+ * Time grains that the published deployment contract can carry.
+ *
+ * `minute` and `hour` run locally, but they are expression extension 2 and
+ * deployment contract 3 features (RFC 0015). Publishing emits contract 2 until
+ * it can emit contract 3, so a dataset that pins a sub-day grain is refused
+ * with an error naming what needs it, rather than failing later as an opaque
+ * contract validation error.
+ */
+/** Grains deployment contract 2 and invocation 1 carry, in ascending order. */
+export const PORTABLE_TIME_GRAINS = Object.freeze([
+    'day', 'week', 'month', 'quarter', 'year',
+]);
+const CONTRACT_2_GRAINS = new Set(PORTABLE_TIME_GRAINS);
+export function isPortableTimeGrain(grain) {
+    return CONTRACT_2_GRAINS.has(grain);
+}
+/** Returns `grain` when publishing can carry it; otherwise throws naming `owner`. */
+export function requirePortableTimeGrain(grain, owner) {
+    if (!isPortableTimeGrain(grain)) {
+        throw new Error(`${owner} uses the "${grain}" time grain, which cannot be published yet: sub-day grains ` +
+            'need deployment contract 3 (RFC 0015). Use it for local queries, or pin a grain of a day or longer.');
+    }
+    return grain;
+}
+/** Contract 2 cannot represent a dataset-level restriction on portable grains. */
+export function assertPublishableTimeGrains(dataset) {
+    if (dataset.timeGrains === undefined)
+        return;
+    const missing = PORTABLE_TIME_GRAINS.filter(grain => !dataset.timeGrains?.includes(grain));
+    if (missing.length > 0) {
+        throw new Error(`Dataset "${dataset.name}" timeGrains excludes ${missing.join(', ')}, but deployment contract 2 ` +
+            'cannot preserve dataset-level grain restrictions. Use all day-through-year grains or keep this dataset local.');
+    }
+}