@hypequery/datasets 0.21.0 → 0.22.0

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

@@ -0,0 +1,116 @@
+import { semanticQuerySyntaxErrors } from './semantic-query-syntax.js';
+import { validateFilterValue } from '../validation.js';
+import { queryTimezoneErrors } from './query-timezone.js';
+import { protocolMetricCapabilityErrors } from './protocol-metric-capabilities.js';
+import { unsupportedTimeGrainError } from './dataset-time-grains.js';
+import { getMetricGrain, getMetricRef, isTenantScopedFilter } from './metric-handle.js';
+import { validateTenantRuntime } from './tenant-runtime.js';
+import { isQualifiedField, resolveQualifiedField } from './relationship-fields.js';
+import { validateQualifiedFilter, validateRelationshipTenantRuntime } from './relationship-validation.js';
+import { segmentSelectionErrors } from './segments.js';
+export function validateMetricQueryInput(metric, query, context) {
+    const errors = [...semanticQuerySyntaxErrors(query), ...protocolMetricCapabilityErrors(metric, query), ...queryTimezoneErrors(query.timezone)];
+    const ref = getMetricRef(metric);
+    const ds = ref.dataset;
+    const dimensionNames = Object.keys(ds.dimensions);
+    const filterNames = Object.keys(ds.filters);
+    const grain = getMetricGrain(metric, query);
+    const orderableFields = new Set([
+        ...(query.dimensions ?? []),
+        ref.name,
+        ...(grain ? ['period'] : []),
+    ]);
+    const tenantRuntimeError = validateTenantRuntime(ds, context);
+    if (tenantRuntimeError) {
+        errors.push(tenantRuntimeError);
+    }
+    const relationshipTenantError = validateRelationshipTenantRuntime(ds, query, context);
+    if (relationshipTenantError) {
+        errors.push(relationshipTenantError);
+    }
+    if (metric.__type === 'grained_metric_ref' && query.by && query.by !== metric.grain) {
+        errors.push(`Metric "${ref.name}" is already grained by "${metric.grain}" and cannot be queried with by="${query.by}".`);
+    }
+    // Validate dimensions
+    for (const dim of query.dimensions ?? []) {
+        if (isQualifiedField(dim)) {
+            const resolution = resolveQualifiedField(ds, dim);
+            if (resolution?.error) {
+                errors.push(resolution.error);
+            }
+            continue;
+        }
+        if (!dimensionNames.includes(dim)) {
+            errors.push(`Unknown dimension "${dim}". Available: ${dimensionNames.join(', ')}`);
+        }
+    }
+    // Validate filters
+    for (const filter of query.filters ?? []) {
+        if (isQualifiedField(filter.field)) {
+            const filterError = validateQualifiedFilter(ds, filter, context);
+            if (filterError) {
+                errors.push(filterError);
+            }
+            continue;
+        }
+        if (!filterNames.includes(filter.field)) {
+            errors.push(`Unknown filter field "${filter.field}". Available: ${filterNames.join(', ')}`);
+            continue;
+        }
+        const filterDefinition = ds.filters[filter.field];
+        if (filterDefinition?.operators && !filterDefinition.operators.includes(filter.operator)) {
+            errors.push(`Filter "${filter.field}" does not allow operator "${filter.operator}". Allowed: ${filterDefinition.operators.join(', ')}`);
+            continue;
+        }
+        const resolvedField = ds.filters[filter.field]?.field ?? filter.field;
+        if (isTenantScopedFilter(ds, filter, context)) {
+            errors.push(`Cannot filter on tenant field "${filter.field}" when runtime tenancy enforcement is active.`);
+            continue;
+        }
+        const fieldType = ds.dimensions[resolvedField]?.fieldType;
+        if (fieldType) {
+            const filterError = validateFilterValue(filter, fieldType);
+            if (filterError) {
+                errors.push(filterError);
+            }
+        }
+    }
+    // Validate order by fields against the metric output shape
+    for (const order of query.orderBy ?? []) {
+        if (!orderableFields.has(order.field)) {
+            errors.push(`Unknown orderBy field "${order.field}". Available: ${Array.from(orderableFields).join(', ')}`);
+        }
+    }
+    // Validate grain requires timeKey
+    if (query.by && !ds.timeKey) {
+        errors.push(`Cannot use "by" grain — dataset "${ds.name}" has no timeKey.`);
+    }
+    // Validate grain is one the planner can bucket on
+    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.`);
+    }
+    if (query.offset != null && (!Number.isInteger(query.offset) || query.offset < 0)) {
+        errors.push(`Invalid offset: expected a non-negative integer.`);
+    }
+    // Validate limits
+    if (ds.limits) {
+        if (ds.limits.maxDimensions && (query.dimensions?.length ?? 0) > ds.limits.maxDimensions) {
+            errors.push(`Too many dimensions (${query.dimensions?.length}). Max: ${ds.limits.maxDimensions}`);
+        }
+        if (ds.limits.maxMeasures && 1 > ds.limits.maxMeasures) {
+            errors.push(`Too many measures (1). Max: ${ds.limits.maxMeasures}`);
+        }
+        if (ds.limits.maxFilters && (query.filters?.length ?? 0) > ds.limits.maxFilters) {
+            errors.push(`Too many filters (${query.filters?.length}). Max: ${ds.limits.maxFilters}`);
+        }
+        if (ds.limits.maxResultSize && query.limit != null && query.limit > ds.limits.maxResultSize) {
+            errors.push(`Too many results requested (${query.limit}). Max: ${ds.limits.maxResultSize}`);
+        }
+    }
+    return { valid: errors.length === 0, errors };
+}

package/dist/utils/relationship-builder-plan.d.ts

@@ -1,3 +1,4 @@
+import type { DatasetSqlDialect } from '../dataset-sql-dialect.js';
 /**
  * Query-builder-path planning for to-one relationship joins.
  *
@@ -16,6 +17,7 @@ export interface ResolvedBuilderJoin {
     relationship: string;
     /** Physical target source table. */
     source: string;
+    matchMarker?: string;
     /** Base join column (unqualified). */
     from: string;
     /** Target join column (unqualified). */
@@ -30,13 +32,13 @@ export interface RelationshipBuilderContext {
     joins: ResolvedBuilderJoin[];
     joinByRelationship: Map<string, ResolvedBuilderJoin>;
 }
-type QueryLike = Pick<DatasetQuery & MetricQuery, 'dimensions' | 'filters' | 'orderBy'>;
+type QueryLike = Pick<DatasetQuery & MetricQuery, 'dimensions' | 'filters' | 'orderBy'> & Pick<DatasetQuery, 'measures'>;
 /**
  * Builds the join context for a query, or returns undefined when the query
  * references no relationship-qualified fields. Validation runs first, so any
  * qualified name that fails to resolve here is skipped defensively.
  */
-export declare function buildRelationshipBuilderContext(ds: AnyDatasetInstance, query: QueryLike, context?: ExecutionContext): RelationshipBuilderContext | undefined;
+export declare function buildRelationshipBuilderContext(ds: AnyDatasetInstance, query: QueryLike, context?: ExecutionContext, dialect?: DatasetSqlDialect): RelationshipBuilderContext | undefined;
 /** Qualifies a base physical column with the base source when joins are active. */
 export declare function qualifyBaseColumn(ctx: RelationshipBuilderContext | undefined, column: string): string;
 /**

package/dist/utils/relationship-builder-plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relationship-builder-plan.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-builder-plan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtF,MAAM,WAAW,mBAAmB;IAClC,+DAA+D;IAC/D,YAAY,EAAE,MAAM,CAAC;IACrB,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,kEAAkE;IAClE,MAAM,CAAC,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC7B,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CACtD;AAED,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,GAAG,WAAW,EAAE,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC,CAAC;AAExF;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,SAAS,EAChB,OAAO,CAAC,EAAE,gBAAgB,GACzB,0BAA0B,GAAG,SAAS,CAuCxC;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,0BAA0B,GAAG,SAAS,EAC3C,MAAM,EAAE,MAAM,GACb,MAAM,CAER;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,MAAM,GACX,MAAM,CAOR;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,gBAAgB,EACpB,GAAG,EAAE,0BAA0B,GAAG,SAAS,GAC1C,gBAAgB,CA4BlB"}
+{"version":3,"file":"relationship-builder-plan.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-builder-plan.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAGnE;;;;;;;;;GASG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACZ,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtF,MAAM,WAAW,mBAAmB;IAClC,+DAA+D;IAC/D,YAAY,EAAE,MAAM,CAAC;IACrB,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,kEAAkE;IAClE,MAAM,CAAC,EAAE,eAAe,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC7B,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CACtD;AAED,KAAK,SAAS,GAAG,IAAI,CAAC,YAAY,GAAG,WAAW,EAAE,YAAY,GAAG,SAAS,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AAEzH;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,SAAS,EAChB,OAAO,CAAC,EAAE,gBAAgB,EAC1B,OAAO,GAAE,iBAA+C,GACvD,0BAA0B,GAAG,SAAS,CA2CxC;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,0BAA0B,GAAG,SAAS,EAC3C,MAAM,EAAE,MAAM,GACb,MAAM,CAER;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,MAAM,GACX,MAAM,CAOR;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,gBAAgB,EACpB,GAAG,EAAE,0BAA0B,GAAG,SAAS,GAC1C,gBAAgB,CA4BlB"}

package/dist/utils/relationship-builder-plan.js

@@ -1,13 +1,6 @@
-/**
- * Query-builder-path planning for to-one relationship joins.
- *
- * When a dataset/metric query references relationship-qualified fields
- * (`<relationship>.<field>`), the builder path aliases the joined target with
- * the relationship name, table-qualifies base columns with the base source
- * name, and aliases joined selections back to their quoted qualified name. When
- * no qualified field is referenced, no context is produced and the builder path
- * behaves exactly as before.
- */
+import { relationshipMeasureSource } from './relationship-measure-sql.js';
+import { clickhouseDatasetSqlDialect } from './clickhouse-dataset-sql-dialect.js';
+import { resolveRelationshipReference } from './relationship-measures.js';
 import { getRuntimeTenantPredicate } from './tenant-runtime.js';
 import { isQualifiedField, resolveQualifiedField } from './relationship-fields.js';
 /**
@@ -15,9 +8,10 @@ import { isQualifiedField, resolveQualifiedField } from './relationship-fields.j
  * references no relationship-qualified fields. Validation runs first, so any
  * qualified name that fails to resolve here is skipped defensively.
  */
-export function buildRelationshipBuilderContext(ds, query, context) {
+export function buildRelationshipBuilderContext(ds, query, context, dialect = clickhouseDatasetSqlDialect) {
     const referenced = [
         ...(query.dimensions ?? []),
+        ...(query.measures ?? []),
         ...(query.filters ?? []).map((filter) => filter.field),
         ...(query.orderBy ?? []).map((order) => order.field),
     ].filter(isQualifiedField);
@@ -27,7 +21,7 @@ export function buildRelationshipBuilderContext(ds, query, context) {
     const tenantPredicate = getRuntimeTenantPredicate(context);
     const joinByRelationship = new Map();
     for (const name of referenced) {
-        const resolution = resolveQualifiedField(ds, name);
+        const resolution = resolveRelationshipReference(ds, name, query.measures);
         if (!resolution || !resolution.resolved) {
             continue;
         }
@@ -35,9 +29,12 @@ export function buildRelationshipBuilderContext(ds, query, context) {
         if (joinByRelationship.has(relationshipName)) {
             continue;
         }
+        const measureNames = (query.measures ?? []).filter(name => name.startsWith(`${relationshipName}.`)).map(name => name.slice(relationshipName.length + 1));
+        const projected = measureNames.length ? relationshipMeasureSource(target, relationship.to, measureNames, dialect) : undefined;
         joinByRelationship.set(relationshipName, {
             relationship: relationshipName,
-            source: target.source,
+            source: projected?.source ?? target.source,
+            matchMarker: projected?.marker,
             from: relationship.from,
             to: relationship.to,
             tenant: tenantPredicate && target.tenantKey

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

@@ -0,0 +1,14 @@
+import type { AnyDatasetInstance } from '../types.js';
+import type { RelationshipBuilderContext } from './relationship-builder-plan.js';
+import type { DatasetSqlDialect } from '../dataset-sql-dialect.js';
+/** Explicit projection avoids marker collisions and makes absent targets detectable under join_use_nulls=0. */
+export declare function relationshipMeasureSource(target: AnyDatasetInstance, to: string, names: readonly string[], dialect: DatasetSqlDialect): {
+    source: string;
+    marker: string;
+};
+export declare function relationshipMeasureExpressions(ds: AnyDatasetInstance, name: string, joinCtx: RelationshipBuilderContext): {
+    definition: import("../types.js").MeasureDefinition;
+    field: string;
+    arg: string | undefined;
+};
+//# sourceMappingURL=relationship-measure-sql.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"relationship-measure-sql.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-measure-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AAEvE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAIjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,+GAA+G;AAC/G,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,iBAAiB;;;EAgBrI;AAED,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B;;;;EAevH"}

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

@@ -0,0 +1,44 @@
+import { resolveRelationshipMeasure } from './relationship-measures.js';
+import { resolveDimensionExpression } from '../query-planner.js';
+import { measureToAggregationSpec } from './dataset-normalization.js';
+import { applyFilteredAggregationExpression } from './filtered-aggregation-sql.js';
+/** Explicit projection avoids marker collisions and makes absent targets detectable under join_use_nulls=0. */
+export function relationshipMeasureSource(target, to, names, dialect) {
+    const columns = new Set([to, ...(target.tenantKey ? [target.tenantKey] : [])]);
+    for (const [name, dimension] of Object.entries(target.dimensions))
+        if (!dimension.sql)
+            columns.add(dimension.column ?? name);
+    for (const name of names) {
+        const measure = target.measures[name];
+        if (measure.__type !== 'measure_definition')
+            continue;
+        for (const field of [measure.field, measure.argField, ...(measure.filters ?? []).map(filter => target.filters[filter.field]?.field ?? filter.field)]) {
+            if (field && field !== '*')
+                columns.add(target.dimensions[field]?.column ?? field);
+        }
+    }
+    let marker = '_hq_match';
+    while (columns.has(marker))
+        marker += '_';
+    const quote = dialect.quoteIdentifier;
+    const source = target.source.split('.').map(quote).join('.');
+    const projection = [...columns].map(quote);
+    return { source: `(SELECT ${[...projection, `toNullable(1) AS ${quote(marker)}`].join(', ')} FROM ${source})`, marker };
+}
+export function relationshipMeasureExpressions(ds, name, joinCtx) {
+    const resolved = resolveRelationshipMeasure(ds, name);
+    const { relationshipName, target, definition } = resolved;
+    const marker = joinCtx.joinByRelationship.get(relationshipName)?.matchMarker;
+    if (!marker)
+        throw new Error(`Missing match marker for relationship measure "${name}".`);
+    const ownerContext = { ...joinCtx, baseSource: relationshipName };
+    const spec = measureToAggregationSpec(name, definition);
+    const matched = `isNotNull(${relationshipName}.${marker})`;
+    const field = definition.field === '*' ? `${relationshipName}.${marker}` : resolveDimensionExpression(target, definition.field, ownerContext);
+    const filtered = applyFilteredAggregationExpression(target, spec, field, ownerContext);
+    return {
+        definition,
+        field: `if(${matched}, ${filtered}, NULL)`,
+        arg: definition.argField ? `if(${matched}, ${resolveDimensionExpression(target, definition.argField, ownerContext)}, NULL)` : undefined,
+    };
+}

package/dist/utils/relationship-measure-types.d.ts

@@ -0,0 +1,36 @@
+import type { DatasetInstance, MeasureDefinition, RelationshipDefinition } from '../types.js';
+type SafeAggregation = 'countDistinct' | 'approxCountDistinct' | 'min' | 'max' | 'argMax' | 'argMin';
+type SqlDimensions<TDimensions> = {
+    [K in keyof TDimensions & string]: TDimensions[K] extends {
+        sql: string;
+    } ? K : never;
+}[keyof TDimensions & string];
+/** Fixed filters use their owner's allowlist aliases before dimension resolution. */
+type FixedFilterInputs<TMeasure, TFilters> = TMeasure extends {
+    filters: readonly (infer TFilter)[];
+} ? TFilter extends {
+    field: infer TName extends string;
+} ? TName extends keyof TFilters ? TFilters[TName] extends {
+    field: infer TField extends string;
+} ? TField : TName : TName : never : never;
+type SafeMeasureNames<TMeasures, TKind, TDimensions, TFilters> = {
+    [K in keyof TMeasures & string]: TMeasures[K] extends MeasureDefinition ? TMeasures[K] extends {
+        sql: string;
+    } ? never : TMeasures[K] extends {
+        field: infer F;
+        argField?: infer A;
+    } ? (Extract<F, SqlDimensions<TDimensions>> | Extract<A, SqlDimensions<TDimensions>> | Extract<FixedFilterInputs<TMeasures[K], TFilters>, SqlDimensions<TDimensions>>) extends never ? TKind extends 'hasOne' ? K : TMeasures[K] extends {
+        aggregation: SafeAggregation;
+    } ? K : never : never : never : never;
+}[keyof TMeasures & string];
+/** One-hop base aggregates whose cardinality is safe for the declared relationship. */
+export type QueryableRelationshipMeasureNames<TRelationships> = {
+    [K in keyof TRelationships & string]: TRelationships[K] extends RelationshipDefinition<infer TTarget, infer TKind> ? TKind extends 'hasMany' ? never : TTarget extends DatasetInstance<infer TDimensions, infer TMeasures, any, any> ? `${K}.${SafeMeasureNames<TMeasures, TKind, TDimensions, TTarget['filters']>}` : never : never;
+}[keyof TRelationships & string];
+export type RelationshipMeasureDefinition<TDataset, TName extends string> = TDataset extends {
+    relationships: infer TRelationships;
+} ? TName extends `${infer R}.${infer M}` ? R extends keyof TRelationships ? TRelationships[R] extends RelationshipDefinition<infer TTarget> ? TTarget extends {
+    measures: infer TMeasures;
+} ? M extends keyof TMeasures ? TMeasures[M] : never : never : never : never : never : never;
+export {};
+//# sourceMappingURL=relationship-measure-types.d.ts.map

package/dist/utils/relationship-measure-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"relationship-measure-types.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-measure-types.ts"],"names":[],"mappings":"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"}

package/dist/utils/relationship-measure-types.js

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,23 @@
+import type { AnyDatasetInstance, MeasureDefinition, RelationshipDefinition } from '../types.js';
+export interface ResolvedRelationshipMeasure {
+    relationshipName: string;
+    relationship: RelationshipDefinition;
+    target: AnyDatasetInstance;
+    definition: MeasureDefinition;
+}
+/** Resolve only the one-hop, duplicate-safe aggregate vocabulary of RFC 0015. */
+export declare function resolveRelationshipMeasure(ds: AnyDatasetInstance, name: string): ResolvedRelationshipMeasure;
+export declare function listRelationshipMeasures(name: string, relationship: RelationshipDefinition): Record<string, MeasureDefinition>;
+/** Expand selected relationship aggregates for dependency graphs without changing author definitions. */
+export declare function queryMeasureDefinitions(ds: AnyDatasetInstance, selected: readonly string[]): Record<string, import("../types.js").DatasetMeasureDefinition>;
+/** Resolve a selected measure or a dimension reference while collecting joins. */
+export declare function resolveRelationshipReference(ds: AnyDatasetInstance, name: string, measures?: readonly string[]): {
+    resolved: import("./relationship-fields.js").ResolvedQualifiedField;
+    error?: undefined;
+} | {
+    resolved?: undefined;
+    error: string;
+} | {
+    resolved: ResolvedRelationshipMeasure;
+} | null;
+//# sourceMappingURL=relationship-measures.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"relationship-measures.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-measures.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAMjG,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,sBAAsB,CAAC;IACrC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,UAAU,EAAE,iBAAiB,CAAC;CAC/B;AAED,iFAAiF;AACjF,wBAAgB,0BAA0B,CAAC,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,GAAG,2BAA2B,CAkB5G;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAS9H;AAED,yGAAyG;AACzG,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,kBAAkB,EAAE,QAAQ,EAAE,SAAS,MAAM,EAAE,kEAM1F;AAED,kFAAkF;AAClF,wBAAgB,4BAA4B,CAAC,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,SAAS,MAAM,EAAO;;;;;;;;SAIlH"}

package/dist/utils/relationship-measures.js

@@ -0,0 +1,62 @@
+import { isBaseMeasure } from './dataset-measures.js';
+import { parseQualifiedField, resolveQualifiedField } from './relationship-fields.js';
+const DUPLICATE_INSENSITIVE = new Set(['countDistinct', 'approxCountDistinct', 'min', 'max', 'argMax', 'argMin']);
+/** Resolve only the one-hop, duplicate-safe aggregate vocabulary of RFC 0015. */
+export function resolveRelationshipMeasure(ds, name) {
+    const parsed = parseQualifiedField(name);
+    if (!parsed || parsed.field.includes('.'))
+        throw new Error(`Measure "${name}" must use a one-hop relationship path.`);
+    const relationship = Object.hasOwn(ds.relationships, parsed.relationship) ? ds.relationships[parsed.relationship] : undefined;
+    if (!relationship)
+        throw new Error(`Unknown relationship "${parsed.relationship}" in measure "${name}".`);
+    if (relationship.kind === 'hasMany')
+        throw new Error(`Measure "${name}" cannot traverse hasMany: it would fan out aggregates.`);
+    const target = relationship.target();
+    const definition = Object.hasOwn(target.measures, parsed.field) ? target.measures[parsed.field] : undefined;
+    if (!definition)
+        throw new Error(`Unknown measure "${parsed.field}" on relationship target "${target.name}".`);
+    if (!isBaseMeasure(definition))
+        throw new Error(`Measure "${name}" must reference a base aggregate; derived, window, and shift measures are not selectable through relationships.`);
+    if (relationship.kind === 'belongsTo' && !DUPLICATE_INSENSITIVE.has(definition.aggregation)) {
+        throw new Error(`Measure "${name}" cannot use ${definition.aggregation} through belongsTo: repeated target rows would inflate the aggregation. Use a duplicate-insensitive measure or query the target dataset.`);
+    }
+    const referenced = [definition.field, definition.argField, ...(definition.filters ?? []).map(filter => target.filters[filter.field]?.field ?? filter.field)];
+    if (definition.sql || referenced.some(field => field && target.dimensions[field]?.sql)) {
+        throw new Error(`SQL-backed measure "${name}" or its inputs cannot be traversed through relationships.`);
+    }
+    return { relationshipName: parsed.relationship, relationship, target, definition };
+}
+export function listRelationshipMeasures(name, relationship) {
+    if (relationship.kind === 'hasMany')
+        return {};
+    const ds = { relationships: { [name]: relationship } };
+    const target = relationship.target();
+    return Object.fromEntries(Object.keys(target.measures).flatMap(measure => {
+        const qualified = `${name}.${measure}`;
+        try {
+            return [[qualified, resolveRelationshipMeasure(ds, qualified).definition]];
+        }
+        catch {
+            return [];
+        }
+    }));
+}
+/** Expand selected relationship aggregates for dependency graphs without changing author definitions. */
+export function queryMeasureDefinitions(ds, selected) {
+    const qualified = selected.filter(name => name.includes('.'));
+    return qualified.length ? {
+        ...ds.measures,
+        ...Object.fromEntries(qualified.map(name => [name, resolveRelationshipMeasure(ds, name).definition])),
+    } : ds.measures;
+}
+/** Resolve a selected measure or a dimension reference while collecting joins. */
+export function resolveRelationshipReference(ds, name, measures = []) {
+    if (!measures.includes(name))
+        return resolveQualifiedField(ds, name);
+    try {
+        return { resolved: resolveRelationshipMeasure(ds, name) };
+    }
+    catch (error) {
+        return { error: error.message };
+    }
+}

package/dist/utils/relationship-validation.d.ts

@@ -3,7 +3,7 @@
  * dataset-query and metric-query validators.
  */
 import type { AnyDatasetInstance, DatasetQuery, ExecutionContext, MetricFilter, MetricQuery } from '../types.js';
-type RelationshipQuery = Pick<DatasetQuery & MetricQuery, 'dimensions' | 'filters' | 'orderBy'>;
+type RelationshipQuery = Pick<DatasetQuery & MetricQuery, 'dimensions' | 'filters' | 'orderBy'> & Pick<DatasetQuery, 'measures'>;
 /**
  * Tenant-less base datasets may still reach tenant-scoped data through a
  * relationship. Require either a concrete runtime tenant or the trusted

package/dist/utils/relationship-validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relationship-validation.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-validation.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACZ,MAAM,aAAa,CAAC;AAWrB,KAAK,iBAAiB,GAAG,IAAI,CAC3B,YAAY,GAAG,WAAW,EAC1B,YAAY,GAAG,SAAS,GAAG,SAAS,CACrC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,iBAAiB,EACxB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,GAAG,SAAS,CAmBpB;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,GAAG,IAAI,CA4Bf"}
+{"version":3,"file":"relationship-validation.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-validation.ts"],"names":[],"mappings":"AACA;;;GAGG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACZ,MAAM,aAAa,CAAC;AAWrB,KAAK,iBAAiB,GAAG,IAAI,CAC3B,YAAY,GAAG,WAAW,EAC1B,YAAY,GAAG,SAAS,GAAG,SAAS,CACrC,GAAG,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,iBAAiB,EACxB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,GAAG,SAAS,CAoBpB;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,YAAY,EACpB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,GAAG,IAAI,CA4Bf"}

package/dist/utils/relationship-validation.js

@@ -1,7 +1,4 @@
-/**
- * Shared validation for relationship-qualified filters, used by both the
- * dataset-query and metric-query validators.
- */
+import { resolveRelationshipReference } from './relationship-measures.js';
 import { validateFilterValue } from '../validation.js';
 import { getRuntimeTenantPredicate, hasTenantRuntime, } from './tenant-runtime.js';
 import { isQualifiedField, resolveQualifiedField, } from './relationship-fields.js';
@@ -16,11 +13,12 @@ export function validateRelationshipTenantRuntime(ds, query, context) {
     }
     const referenced = [
         ...(query.dimensions ?? []),
+        ...(query.measures ?? []),
         ...(query.filters ?? []).map((filter) => filter.field),
         ...(query.orderBy ?? []).map((order) => order.field),
     ].filter(isQualifiedField);
     for (const name of referenced) {
-        const resolution = resolveQualifiedField(ds, name);
+        const resolution = resolveRelationshipReference(ds, name, query.measures);
         if (resolution?.resolved?.target.tenantKey) {
             return `Dataset "${ds.name}" requires runtime tenant scoping because relationship "${resolution.resolved.relationshipName}" targets a tenant-scoped dataset.`;
         }

package/dist/utils/semantic-query-syntax.d.ts

@@ -0,0 +1,6 @@
+import type { DatasetQuery, MetricQuery } from '../types.js';
+/** Reject SQL structure outside the semantic contract before reaching a builder. */
+export declare function semanticQuerySyntaxErrors(query: DatasetQuery | MetricQuery): string[];
+/** Never interpolate a caller-provided direction into raw SQL. */
+export declare function semanticOrderDirection(direction: unknown): 'ASC' | 'DESC';
+//# sourceMappingURL=semantic-query-syntax.d.ts.map

package/dist/utils/semantic-query-syntax.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"semantic-query-syntax.d.ts","sourceRoot":"","sources":["../../src/utils/semantic-query-syntax.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI7D,oFAAoF;AACpF,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,YAAY,GAAG,WAAW,GAAG,MAAM,EAAE,CAarF;AAED,kEAAkE;AAClE,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,OAAO,GAAG,KAAK,GAAG,MAAM,CAIzE"}

package/dist/utils/semantic-query-syntax.js

@@ -0,0 +1,25 @@
+import { SEMANTIC_FILTER_OPERATORS } from '../constants.js';
+const FILTER_OPERATORS = new Set(SEMANTIC_FILTER_OPERATORS);
+/** Reject SQL structure outside the semantic contract before reaching a builder. */
+export function semanticQuerySyntaxErrors(query) {
+    const errors = [];
+    for (const filter of query.filters ?? []) {
+        if (!FILTER_OPERATORS.has(filter.operator)) {
+            errors.push(`Unsupported semantic filter operator "${String(filter.operator)}".`);
+        }
+    }
+    for (const order of query.orderBy ?? []) {
+        if (order.direction !== 'asc' && order.direction !== 'desc') {
+            errors.push('Invalid order direction: expected "asc" or "desc".');
+        }
+    }
+    return errors;
+}
+/** Never interpolate a caller-provided direction into raw SQL. */
+export function semanticOrderDirection(direction) {
+    if (direction === 'asc')
+        return 'ASC';
+    if (direction === 'desc')
+        return 'DESC';
+    throw new Error('Invalid order direction: expected "asc" or "desc".');
+}

package/dist/utils/snapshot-execution-context.d.ts

@@ -0,0 +1,4 @@
+import type { ExecutionContext } from '../types.js';
+/** Bind cache identity and deferred execution to the same request-owned scope. */
+export declare function snapshotExecutionContext(context?: ExecutionContext): ExecutionContext | undefined;
+//# sourceMappingURL=snapshot-execution-context.d.ts.map

package/dist/utils/snapshot-execution-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"snapshot-execution-context.d.ts","sourceRoot":"","sources":["../../src/utils/snapshot-execution-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,SAAS,CAajG"}

package/dist/utils/snapshot-execution-context.js

@@ -0,0 +1,16 @@
+/** Bind cache identity and deferred execution to the same request-owned scope. */
+export function snapshotExecutionContext(context) {
+    if (context === undefined)
+        return undefined;
+    return {
+        ...context,
+        ...(context.runtime === undefined ? {} : {
+            runtime: {
+                ...context.runtime,
+                // Copy tenant objects and ID lists; retain adapter and AbortSignal identity.
+                tenant: structuredClone(context.runtime.tenant),
+            },
+        }),
+        ...(context.cache && { cache: { ...context.cache } }),
+    };
+}

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":"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"}
+{"version":3,"file":"time-measure-dataset-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-dataset-sql.ts"],"names":[],"mappings":"AAGA,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,3 +1,4 @@
+import { queryMeasureDefinitions } from './relationship-measures.js';
 import { buildCompositeTimeMeasureSql } from './composite-time-measure-sql.js';
 import { measureDependencyNames } from './measure-dependencies.js';
 import { getBaseMeasure, getDerivedMeasure, isShiftMeasure, isWindowMeasure } from './dataset-measures.js';
@@ -18,7 +19,7 @@ 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 dependencies = measureDependencyNames(queryMeasureDefinitions(ds, query.measures ?? []), query.measures ?? []);
     const composite = dependencies.some(name => {
         const definition = ds.measures[name];
         if (isShiftMeasure(definition))
@@ -49,7 +50,7 @@ export function buildTimeMeasureDatasetSql(ds, query, options) {
     // Scan only requested populations: intervening rows must not introduce dimensions.
     const end = add('_hq_last', 1, axis.grain);
     const populations = [];
-    if ([...needed].some(name => getBaseMeasure(ds.measures, name))) {
+    if ([...needed].some(name => name.includes('.') || getBaseMeasure(ds.measures, name))) {
         populations.push(`(_hq_time >= _hq_first AND _hq_time < ${end})`);
     }
     if (windows.length) {

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,EACvB,iBAAiB,UAAQ,GACxB,MAAM,CAuBR"}
+{"version":3,"file":"time-measure-result-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-result-sql.ts"],"names":[],"mappings":"AACA,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

@@ -1,3 +1,4 @@
+import { semanticOrderDirection } from './semantic-query-syntax.js';
 import { quoteSQLIdentifier } from '../sql-utils.js';
 import { getDerivedMeasure } from './dataset-measures.js';
 import { derivedProjection } from './derived-measure-sql.js';
@@ -20,7 +21,7 @@ export function buildTimeMeasureResultSql(ds, query, options, dims, ctes, valida
         + ` UNION ALL SELECT ${nullProjections} FROM _hq_bounds WHERE ${validationGuard} = 1)`;
     let sql = `WITH ${[...ctes, resultCte].join(',\n')} SELECT ${outputNames.map(quoteSQLIdentifier).join(', ')} FROM _hq_result`;
     const order = query.orderBy?.length ? query.orderBy : [{ field: 'period', direction: 'asc' }];
-    sql += ` ORDER BY ${order.map(item => `${quoteSQLIdentifier(item.field)} ${item.direction === 'asc' ? 'ASC' : 'DESC'}`).join(', ')}`;
+    sql += ` ORDER BY ${order.map(item => `${quoteSQLIdentifier(item.field)} ${semanticOrderDirection(item.direction)}`).join(', ')}`;
     const limit = options.executionLimit ?? query.limit;
     if (limit !== undefined)
         sql += ` LIMIT ${limit}`;

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

@@ -1 +1 @@
-{"version":3,"file":"time-measure-source-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-source-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAUxE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,OAAO,EAAE,CAAC;IACtB,UAAU,EAAE,uBAAuB,EAAE,CAAC;IACtC,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,0FAA0F;AAC1F,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,4BAA4B,GACpC,oBAAoB,CA2DtB"}
+{"version":3,"file":"time-measure-source-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-source-sql.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAUxE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,OAAO,EAAE,CAAC;IACtB,UAAU,EAAE,uBAAuB,EAAE,CAAC;IACtC,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,0FAA0F;AAC1F,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,4BAA4B,GACpC,oBAAoB,CA6DtB"}

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

@@ -1,3 +1,5 @@
+import { resolveRelationshipMeasure } from './relationship-measures.js';
+import { relationshipMeasureExpressions } from './relationship-measure-sql.js';
 import { queryTimeSql } from './query-timezone.js';
 import { resolveDimensionExpression, resolveFilterField, resolveTenantFilterColumn } from '../query-planner.js';
 import { applyRelationshipJoins, buildRelationshipBuilderContext, qualifyBaseColumn } from './relationship-builder-plan.js';
@@ -19,7 +21,8 @@ export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options
     for (const dimension of dims)
         sourceParts.push(resolveDimensionExpression(ds, dimension.name, joinCtx));
     for (const name of baseNames) {
-        const definition = getBaseMeasure(ds.measures, name);
+        const related = name.includes('.') ? resolveRelationshipMeasure(ds, name) : undefined;
+        const definition = related?.definition ?? getBaseMeasure(ds.measures, name);
         if (!definition)
             throw new Error(`Window input "${name}" is not a base measure.`);
         const spec = measureToAggregationSpec(name, definition);
@@ -28,9 +31,10 @@ export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options
         const value = `_hq_v${bases.length}`;
         const arg = `_hq_a${bases.length}`;
         bases.push({ name, definition, value, arg });
-        const expression = spec.sql ?? resolveDimensionExpression(ds, spec.field, joinCtx);
-        sourceParts.push(applyFilteredAggregationExpression(ds, spec, expression, joinCtx));
-        sourceParts.push(spec.argField ? resolveDimensionExpression(ds, spec.argField, joinCtx) : 'NULL');
+        const expressions = related ? relationshipMeasureExpressions(ds, name, joinCtx) : undefined;
+        const expression = expressions?.field ?? spec.sql ?? resolveDimensionExpression(ds, spec.field, joinCtx);
+        sourceParts.push(expressions ? expression : applyFilteredAggregationExpression(ds, spec, expression, joinCtx));
+        sourceParts.push(expressions?.arg ?? (spec.argField ? resolveDimensionExpression(ds, spec.argField, joinCtx) : 'NULL'));
     }
     // A positional tuple isolates internal names from the source table's names.
     const sourceIdentifiers = [

package/dist/validation.js

@@ -68,6 +68,6 @@ export function validateFilterValue(filter, fieldType) {
                 ? null
                 : `"between" expects ${fieldType} values for field "${filter.field}".`;
         default:
-            return null;
+            return `Unsupported semantic filter operator "${String(filter.operator)}".`;
     }
 }