@hypequery/datasets 0.24.0 → 0.25.0

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

@@ -1,23 +1,23 @@
-import { datasetSourceBuilder } from './dataset-source.js';
+import { scopedDatasetSource } from './scoped-dataset-source.js';
 import { semanticQuerySyntaxErrors } from './semantic-query-syntax.js';
 /** Metric SQL compilation; factory selection and execution belong to the client. */
 import { resolveDatasetSqlDialect } from './dataset-sql-dialect.js';
 import { assertRawSqlForDialect } from './raw-sql-dialect-check.js';
-import { applyAggregationSpec, appendOrderLimitOffset, buildDimensionSelectionPlan, resolveDimensionExpression, resolveFilterField, resolveTenantFilterColumn, } from '../query-planner.js';
+import { applyAggregationSpec, appendOrderLimitOffset, buildDimensionSelectionPlan, resolveDimensionExpression, resolveFilterField, } from '../query-planner.js';
 import { queryTimeFilter } from './query-timezone.js';
 import { isTenantScopedFilter } from './metric-handle.js';
-import { getRuntimeTenantPredicate } from './tenant-runtime.js';
-import { applyRelationshipJoins, buildRelationshipBuilderContext, qualifyBaseColumn, } from './relationship-builder-plan.js';
+import { buildRelationshipBuilderContext } from './relationship-builder-plan.js';
 import { segmentFilters } from './segments.js';
-export function buildMetricQueryBuilder(ref, spec, ds, query, grain, builderFactory, context) {
+import { datasetOnTimeKey } from './dataset-time-keys.js';
+export function buildMetricQueryBuilder(ref, spec, dataset, query, grain, builderFactory, context) {
     const syntaxErrors = semanticQuerySyntaxErrors(query);
     if (syntaxErrors.length)
         throw new Error(syntaxErrors.join('; '));
+    const ds = datasetOnTimeKey(dataset, query.timeKey);
     const dialect = resolveDatasetSqlDialect(builderFactory);
     assertRawSqlForDialect(ds, dialect);
     const joinCtx = buildRelationshipBuilderContext(ds, query, context, dialect);
-    let qb = datasetSourceBuilder(builderFactory, ds);
-    qb = applyRelationshipJoins(qb, joinCtx);
+    let qb = scopedDatasetSource({ builderFactory, ds, context, joinCtx, dialect, timezone: query.timezone });
     const { selectParts, groupByParts } = buildDimensionSelectionPlan(ds, query.dimensions ?? [], grain, joinCtx, query.timezone, dialect);
     if (selectParts.length > 0) {
         qb = qb.select(selectParts);
@@ -28,12 +28,6 @@ export function buildMetricQueryBuilder(ref, spec, ds, query, grain, builderFact
         qb = qb.groupBy(groupByParts);
     }
     qb = applyAggregationSpec(qb, ds, spec, ref.name, joinCtx, dialect);
-    // Tenant auto-injection
-    const tenantColumn = resolveTenantFilterColumn(ds, context);
-    const tenantPredicate = getRuntimeTenantPredicate(context);
-    if (tenantPredicate && tenantColumn) {
-        qb = qb.where(qualifyBaseColumn(joinCtx, tenantColumn), tenantPredicate.operator, tenantPredicate.value);
-    }
     // User filters
     for (const filter of query.filters ?? []) {
         if (isTenantScopedFilter(ds, filter, context)) {

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

@@ -1 +1 @@
-{"version":3,"file":"metric-query-validation.d.ts","sourceRoot":"","sources":["../../src/utils/metric-query-validation.ts"],"names":[],"mappings":"AAEA,gFAAgF;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAI9E,OAAO,EAAsD,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAM3G,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAoIlB"}
+{"version":3,"file":"metric-query-validation.d.ts","sourceRoot":"","sources":["../../src/utils/metric-query-validation.ts"],"names":[],"mappings":"AAEA,gFAAgF;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAI9E,OAAO,EAAsD,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQ3G,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAuIlB"}

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

@@ -9,10 +9,15 @@ 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';
+import { datasetOnTimeKey, selectedTimeKeyError } from './dataset-time-keys.js';
+import { enforcedConstraintErrors } from './enforced-constraints.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 timeKeyError = selectedTimeKeyError(ref.dataset, query.timeKey);
+    if (timeKeyError)
+        errors.push(timeKeyError);
+    const ds = timeKeyError ? ref.dataset : datasetOnTimeKey(ref.dataset, query.timeKey);
     const dimensionNames = Object.keys(ds.dimensions);
     const filterNames = Object.keys(ds.filters);
     const grain = getMetricGrain(metric, query);
@@ -29,6 +34,7 @@ export function validateMetricQueryInput(metric, query, context) {
     if (relationshipTenantError) {
         errors.push(relationshipTenantError);
     }
+    errors.push(...enforcedConstraintErrors(ds, context, query.filters?.length ?? 0));
     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}".`);
     }

package/dist/utils/query-timezone.d.ts

@@ -5,7 +5,7 @@ export declare function isQueryTimezone(value: unknown): value is string;
 export declare function queryTimezoneErrors(timezone: unknown): string[];
 /** Conversion preserves timestamp instants and interprets Date values as local dates. */
 export declare function queryTimeSql(dialect: DatasetSqlDialectRules, expression: string, timezone: string | undefined): string;
-/** True when a local filter field reads the dataset's time-key column. */
+/** True when a local filter field reads one of the dataset's time-axis columns. */
 export declare function isTimeKeyFilter(ds: AnyDatasetInstance, field: string): boolean;
 /** Apply the query zone to time-key predicates, including semantic filter aliases. */
 export declare function queryTimeFilterSql(dialect: DatasetSqlDialectRules, ds: AnyDatasetInstance, field: string, expression: string, timezone: string | undefined): string;

package/dist/utils/query-timezone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-timezone.d.ts","sourceRoot":"","sources":["../../src/utils/query-timezone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAK1F,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAS/D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,EAAE,CAG/D;AASD,yFAAyF;AACzF,wBAAgB,YAAY,CAAC,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAEtH;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAM9E;AAED,sFAAsF;AACtF,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,sBAAsB,EAC/B,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GACtF,MAAM,CAER;AAED,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,sFAAsF;IACtF,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IACxC,iFAAiF;IACjF,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;CACzC;AAID;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,sBAAsB,EAC/B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,OAAO,GAAE,sBAA2B,GACnC,kBAAkB,EAAE,CAwCtB"}
+{"version":3,"file":"query-timezone.d.ts","sourceRoot":"","sources":["../../src/utils/query-timezone.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAM1F,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAS/D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,EAAE,CAG/D;AASD,yFAAyF;AACzF,wBAAgB,YAAY,CAAC,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAEtH;AAED,mFAAmF;AACnF,wBAAgB,eAAe,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAK9E;AAED,sFAAsF;AACtF,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,sBAAsB,EAC/B,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GACtF,MAAM,CAER;AAED,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,sFAAsF;IACtF,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IACxC,iFAAiF;IACjF,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACrC;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;CACzC;AAID;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,sBAAsB,EAC/B,EAAE,EAAE,kBAAkB,EACtB,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,OAAO,GAAE,sBAA2B,GACnC,kBAAkB,EAAE,CAwCtB"}

package/dist/utils/query-timezone.js

@@ -1,6 +1,7 @@
 import { resolveDimensionFieldType, resolveFilterFieldType } from './filter-field-type.js';
 import { instantWallClock, parseTimestampInstant } from './timestamp-instants.js';
 import { mixedInstantListError } from '../validation.js';
+import { datasetTimeKeys } from './dataset-time-keys.js';
 /** Named zones only: reject fixed offsets, invalid zones, and SQL fragments. */
 export function isQueryTimezone(value) {
     if (typeof value !== 'string' || value.length > 100
@@ -29,14 +30,13 @@ function canonicalTimezone(timezone) {
 export function queryTimeSql(dialect, expression, timezone) {
     return dialect.toQueryTimezone(expression, canonicalTimezone(timezone));
 }
-/** True when a local filter field reads the dataset's time-key column. */
+/** True when a local filter field reads one of the dataset's time-axis columns. */
 export function isTimeKeyFilter(ds, field) {
     if (!ds.timeKey || field.includes('.'))
         return false;
     const resolved = ds.filters[field]?.field ?? field;
     const column = ds.dimensions[resolved]?.column ?? resolved;
-    const timeColumn = ds.dimensions[ds.timeKey]?.column ?? ds.timeKey;
-    return column === timeColumn;
+    return datasetTimeKeys(ds).some(timeKey => (ds.dimensions[timeKey]?.column ?? timeKey) === column);
 }
 /** Apply the query zone to time-key predicates, including semantic filter aliases. */
 export function queryTimeFilterSql(dialect, ds, field, expression, timezone) {

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

@@ -19,7 +19,7 @@ import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
  */
 import type { AnyDatasetInstance, DatasetQuery, ExecutionContext, MetricQuery } from '../types.js';
 import type { QueryBuilderLike } from '../query-builder-protocol.js';
-import { type TenantPredicate } from './tenant-runtime.js';
+import { type RowScopePredicate } from './row-scope.js';
 export interface ResolvedBuilderJoin {
     /** Relationship name, used as the joined table's SQL alias. */
     relationship: string;
@@ -32,10 +32,10 @@ export interface ResolvedBuilderJoin {
     from: string;
     /** Target join column (unqualified). */
     to: string;
-    /** Tenant predicate applied to the joined target, when active. */
-    tenant?: TenantPredicate & {
-        field: string;
-    };
+    /** The target's own row scope (RFC 0020), applied in the join condition. */
+    scope: RowScopePredicate[];
+    /** The target is read with `FINAL` (RFC 0021), so the query needs the PREWHERE pin. */
+    final: boolean;
 }
 export interface RelationshipBuilderContext {
     baseSource: string;
@@ -46,9 +46,10 @@ export interface RelationshipBuilderContext {
 }
 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.
+ * Builds the join context for a query, or returns undefined when neither the
+ * query nor the call's enforced constraints reference a relationship-qualified
+ * field. 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, dialect?: DatasetSqlDialectRules): RelationshipBuilderContext | undefined;
 /** Qualifies a base physical column with the base source when joins are active. */
@@ -68,8 +69,9 @@ export declare function qualifyBaseColumn(ctx: RelationshipBuilderContext | unde
 export declare function resolveQualifiedExpression(ds: AnyDatasetInstance, name: string, ctx: RelationshipBuilderContext): string;
 /**
  * Applies each relationship join to the builder as a single-match LEFT JOIN
- * (`leftAnyJoin`, e.g. ClickHouse `LEFT ANY JOIN`) and, when runtime tenancy
- * is active on a target, scopes the joined rows with the tenant predicate.
+ * (`leftAnyJoin`, e.g. ClickHouse `LEFT ANY JOIN`), scoping the joined rows
+ * with the target's own row scope: an out-of-scope target row behaves exactly
+ * like a missing one.
  *
  * A builder without `leftAnyJoin` is refused rather than downgraded to a plain
  * `leftJoin`: duplicate target keys would fan out base rows and silently

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":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAGxE;;;;;;;;;;;;;;;;GAgBG;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,iEAAiE;IACjE,MAAM,EAAE,MAAM,CAAC;IACf,wEAAwE;IACxE,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IAClC,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;IACrD,oEAAoE;IACpE,OAAO,EAAE,sBAAsB,CAAC;CACjC;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,sBAAoD,GAC5D,0BAA0B,GAAG,SAAS,CAgDxC;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,0BAA0B,GAAG,SAAS,EAC3C,MAAM,EAAE,MAAM,GACb,MAAM,CAER;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,0BAA0B,GAC9B,MAAM,CAaR;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,gBAAgB,EACpB,GAAG,EAAE,0BAA0B,GAAG,SAAS,GAC1C,gBAAgB,CAoClB"}
+{"version":3,"file":"relationship-builder-plan.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-builder-plan.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAGxE;;;;;;;;;;;;;;;;GAgBG;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,EAAuC,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAG7F,MAAM,WAAW,mBAAmB;IAClC,+DAA+D;IAC/D,YAAY,EAAE,MAAM,CAAC;IACrB,iEAAiE;IACjE,MAAM,EAAE,MAAM,CAAC;IACf,wEAAwE;IACxE,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;IAClC,sCAAsC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,4EAA4E;IAC5E,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,uFAAuF;IACvF,KAAK,EAAE,OAAO,CAAC;CAChB;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;IACrD,oEAAoE;IACpE,OAAO,EAAE,sBAAsB,CAAC;CACjC;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;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,SAAS,EAChB,OAAO,CAAC,EAAE,gBAAgB,EAC1B,OAAO,GAAE,sBAAoD,GAC5D,0BAA0B,GAAG,SAAS,CA+CxC;AAED,mFAAmF;AACnF,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,0BAA0B,GAAG,SAAS,EAC3C,MAAM,EAAE,MAAM,GACb,MAAM,CAER;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,kBAAkB,EACtB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,0BAA0B,GAC9B,MAAM,CAaR;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,gBAAgB,EACpB,GAAG,EAAE,0BAA0B,GAAG,SAAS,GAC1C,gBAAgB,CAoClB"}

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

@@ -2,12 +2,13 @@ import { relationshipKeys } from './relationship-keys.js';
 import { relationshipJoinSource } 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 { datasetRowScope, runtimeConstraints } from './row-scope.js';
 import { isQualifiedField, resolveQualifiedField } from './relationship-fields.js';
 /**
- * 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.
+ * Builds the join context for a query, or returns undefined when neither the
+ * query nor the call's enforced constraints reference a relationship-qualified
+ * field. Validation runs first, so any qualified name that fails to resolve
+ * here is skipped defensively.
  */
 export function buildRelationshipBuilderContext(ds, query, context, dialect = clickhouseDatasetSqlDialect) {
     const referenced = [
@@ -15,11 +16,11 @@ export function buildRelationshipBuilderContext(ds, query, context, dialect = cl
         ...(query.measures ?? []),
         ...(query.filters ?? []).map((filter) => filter.field),
         ...(query.orderBy ?? []).map((order) => order.field),
+        ...runtimeConstraints(context).map((constraint) => constraint.field),
     ].filter(isQualifiedField);
     if (referenced.length === 0) {
         return undefined;
     }
-    const tenantPredicate = getRuntimeTenantPredicate(context);
     const joinByRelationship = new Map();
     for (const name of referenced) {
         const resolution = resolveRelationshipReference(ds, name, query.measures);
@@ -42,9 +43,8 @@ export function buildRelationshipBuilderContext(ds, query, context, dialect = cl
             from: relationship.from,
             to: relationship.to,
             keys,
-            tenant: tenantPredicate && target.tenantKey
-                ? { field: target.tenantKey, ...tenantPredicate }
-                : undefined,
+            scope: datasetRowScope(target, context),
+            final: Boolean(target.rowResolution),
         });
     }
     return {
@@ -86,8 +86,9 @@ export function resolveQualifiedExpression(ds, name, ctx) {
 }
 /**
  * Applies each relationship join to the builder as a single-match LEFT JOIN
- * (`leftAnyJoin`, e.g. ClickHouse `LEFT ANY JOIN`) and, when runtime tenancy
- * is active on a target, scopes the joined rows with the tenant predicate.
+ * (`leftAnyJoin`, e.g. ClickHouse `LEFT ANY JOIN`), scoping the joined rows
+ * with the target's own row scope: an out-of-scope target row behaves exactly
+ * like a missing one.
  *
  * A builder without `leftAnyJoin` is refused rather than downgraded to a plain
  * `leftJoin`: duplicate target keys would fan out base rows and silently
@@ -104,20 +105,20 @@ export function applyRelationshipJoins(qb, ctx) {
                 'would fan out duplicate target keys and inflate aggregates, so relationship-qualified fields ' +
                 'are unavailable with this builder.');
         }
-        const tenant = join.tenant
-            ? {
-                column: `${join.relationship}.${join.tenant.field}`,
-                operator: join.tenant.operator,
-                value: join.tenant.value,
-            }
-            : undefined;
+        const conditions = join.scope.map(predicate => ({
+            column: `${join.relationship}.${predicate.column}`,
+            operator: predicate.operator,
+            value: predicate.value,
+        }));
+        // A single condition keeps the object form older builders accept.
+        const scope = conditions.length > 1 ? conditions : conditions[0];
         if (join.keys && join.keys.length > 1) {
             // Key-pair form; @hypequery/clickhouse >= 2.13.0.
             const pairs = join.keys.map(key => [`${ctx.baseSource}.${key.from}`, `${join.relationship}.${key.to}`]);
-            qb = qb.leftAnyJoin(join.source, [pairs[0], ...pairs.slice(1)], join.relationship, tenant);
+            qb = qb.leftAnyJoin(join.source, [pairs[0], ...pairs.slice(1)], join.relationship, scope);
             continue;
         }
-        qb = qb.leftAnyJoin(join.source, `${ctx.baseSource}.${join.from}`, `${join.relationship}.${join.to}`, join.relationship, tenant);
+        qb = qb.leftAnyJoin(join.source, `${ctx.baseSource}.${join.from}`, `${join.relationship}.${join.to}`, join.relationship, scope);
     }
     return qb;
 }

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

@@ -1 +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,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,sBAAsB;;;EAkBlJ;AAeD,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B,EAAE,OAAO,EAAE,sBAAsB;;;;EAexJ"}
+{"version":3,"file":"relationship-measure-sql.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-measure-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AAEvE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAIjF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,EAAE,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,sBAAsB;;;EAoBlJ;AAeD,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B,EAAE,OAAO,EAAE,sBAAsB;;;;EAexJ"}

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

@@ -1,3 +1,4 @@
+import { currentRowPredicate } from './dataset-source.js';
 import { resolveRelationshipMeasure } from './relationship-measures.js';
 import { resolveDimensionExpression } from '../query-planner.js';
 import { measureToAggregationSpec } from './dataset-normalization.js';
@@ -35,15 +36,17 @@ export function relationshipJoinSource(target, to, names, dialect) {
     // Sorted so the SQL is byte-identical however the target's dimensions are
     // ordered (authored vs. rehydrated catalogs declare them differently).
     const projection = [...columns].sort().map(quote);
-    return { source: `(SELECT ${[...projection, `${dialect.toNullable('1')} AS ${quote(marker)}`].join(', ')} FROM ${source})`, marker };
+    const current = currentRowPredicate(target);
+    const where = current ? ` WHERE ${quote(current.column)} = ${current.value}` : '';
+    return { source: `(SELECT ${[...projection, `${dialect.toNullable('1')} AS ${quote(marker)}`].join(', ')} FROM ${source}${where})`, marker };
 }
 /** The target's quoted table, read with `FINAL` when the target dataset requires it. */
 function relationshipTargetTable(target, dialect) {
     const quoted = dialect.quoteQualifiedName(target.source);
-    if (!target.final)
+    if (!target.rowResolution)
         return quoted;
     if (!dialect.finalTable) {
-        throw new Error(`Dataset "${target.name}" is declared final: true, but the "${dialect.name}" SQL dialect has no FINAL ` +
+        throw new Error(`Dataset "${target.name}" reads its source with FINAL, but the "${dialect.name}" SQL dialect has no FINAL ` +
             'modifier, so it cannot be joined without counting unmerged row versions.');
     }
     return dialect.finalTable(quoted);

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":"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"}
+{"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;AAYrB,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,CAqBpB;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,6 +1,7 @@
 import { resolveRelationshipReference } from './relationship-measures.js';
 import { validateFilterValue } from '../validation.js';
 import { getRuntimeTenantPredicate, hasTenantRuntime, } from './tenant-runtime.js';
+import { runtimeConstraints } from './row-scope.js';
 import { isQualifiedField, resolveQualifiedField, } from './relationship-fields.js';
 /**
  * Tenant-less base datasets may still reach tenant-scoped data through a
@@ -16,6 +17,7 @@ export function validateRelationshipTenantRuntime(ds, query, context) {
         ...(query.measures ?? []),
         ...(query.filters ?? []).map((filter) => filter.field),
         ...(query.orderBy ?? []).map((order) => order.field),
+        ...runtimeConstraints(context).map((constraint) => constraint.field),
     ].filter(isQualifiedField);
     for (const name of referenced) {
         const resolution = resolveRelationshipReference(ds, name, query.measures);

package/dist/utils/row-scope.d.ts

@@ -0,0 +1,23 @@
+import type { AnyDatasetInstance, ExecutionContext, MetricFilter } from '../types.js';
+import type { QueryBuilderLike } from '../query-builder-protocol.js';
+import { type TenantPredicate } from './tenant-runtime.js';
+/** A trusted predicate on one of a dataset's own physical columns. */
+export type RowScopePredicate = TenantPredicate & {
+    readonly column: string;
+};
+/**
+ * The trusted predicates restricting which source rows of `ds` any query may
+ * read (RFC 0020). They apply to the queried dataset and to every joined
+ * relationship target alike. `tenantKey` with a runtime tenant lowers to one
+ * predicate; the trusted cross-tenant scope (`scope: 'all'`) lowers to none.
+ */
+export declare function datasetRowScope(ds: Pick<AnyDatasetInstance, 'tenantKey'>, context?: ExecutionContext): RowScopePredicate[];
+/**
+ * The call's RFC 0019 enforced constraints, from trusted context only. They
+ * apply to the queried dataset, in its filter vocabulary, never to joined
+ * targets.
+ */
+export declare function runtimeConstraints(context?: ExecutionContext): readonly MetricFilter[];
+/** ANDs each row-scope predicate onto `qb`, with columns qualified by `qualify`. */
+export declare function applyRowScope(qb: QueryBuilderLike, scope: readonly RowScopePredicate[], qualify?: (column: string) => string): QueryBuilderLike;
+//# sourceMappingURL=row-scope.d.ts.map

package/dist/utils/row-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"row-scope.d.ts","sourceRoot":"","sources":["../../src/utils/row-scope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtF,sEAAsE;AACtE,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9E;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,EAAE,EAAE,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,EACzC,OAAO,CAAC,EAAE,gBAAgB,GACzB,iBAAiB,EAAE,CAGrB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,YAAY,EAAE,CAEtF;AAED,oFAAoF;AACpF,wBAAgB,aAAa,CAC3B,EAAE,EAAE,gBAAgB,EACpB,KAAK,EAAE,SAAS,iBAAiB,EAAE,EACnC,OAAO,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAyB,GACrD,gBAAgB,CAKlB"}

package/dist/utils/row-scope.js

@@ -0,0 +1,26 @@
+import { getRuntimeTenantPredicate } from './tenant-runtime.js';
+/**
+ * The trusted predicates restricting which source rows of `ds` any query may
+ * read (RFC 0020). They apply to the queried dataset and to every joined
+ * relationship target alike. `tenantKey` with a runtime tenant lowers to one
+ * predicate; the trusted cross-tenant scope (`scope: 'all'`) lowers to none.
+ */
+export function datasetRowScope(ds, context) {
+    const tenant = getRuntimeTenantPredicate(context);
+    return tenant && ds.tenantKey ? [{ column: ds.tenantKey, ...tenant }] : [];
+}
+/**
+ * The call's RFC 0019 enforced constraints, from trusted context only. They
+ * apply to the queried dataset, in its filter vocabulary, never to joined
+ * targets.
+ */
+export function runtimeConstraints(context) {
+    return context?.runtime?.constraints ?? [];
+}
+/** ANDs each row-scope predicate onto `qb`, with columns qualified by `qualify`. */
+export function applyRowScope(qb, scope, qualify = column => column) {
+    for (const predicate of scope) {
+        qb = qb.where(qualify(predicate.column), predicate.operator, predicate.value);
+    }
+    return qb;
+}

package/dist/utils/scoped-dataset-source.d.ts

@@ -0,0 +1,23 @@
+import type { AnyDatasetInstance, ExecutionContext } from '../types.js';
+import type { QueryBuilderFactoryLike, QueryBuilderLike } from '../query-builder-protocol.js';
+import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
+import { type RelationshipBuilderContext } from './relationship-builder-plan.js';
+export interface ScopedDatasetSourceOptions {
+    builderFactory: Pick<QueryBuilderFactoryLike, 'table'>;
+    ds: AnyDatasetInstance;
+    context?: ExecutionContext;
+    joinCtx: RelationshipBuilderContext | undefined;
+    dialect: DatasetSqlDialectRules;
+    timezone: string | undefined;
+}
+/**
+ * The dataset's source as a builder with every trusted row restriction
+ * applied (RFC 0020): `FINAL`, relationship joins scoped by each target's own
+ * row scope, the dataset's row scope, and the call's enforced constraints.
+ *
+ * Every builder-path query shape reads its source through here, so none can
+ * read rows the context does not allow. Callers add their own selections,
+ * filters and aggregations on top; every predicate here is ANDed with them.
+ */
+export declare function scopedDatasetSource(options: ScopedDatasetSourceOptions): QueryBuilderLike;
+//# sourceMappingURL=scoped-dataset-source.d.ts.map

package/dist/utils/scoped-dataset-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scoped-dataset-source.d.ts","sourceRoot":"","sources":["../../src/utils/scoped-dataset-source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAIxE,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,gCAAgC,CAAC;AAIxC,MAAM,WAAW,0BAA0B;IACzC,cAAc,EAAE,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IACvD,EAAE,EAAE,kBAAkB,CAAC;IACvB,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,0BAA0B,GAAG,SAAS,CAAC;IAChD,OAAO,EAAE,sBAAsB,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,gBAAgB,CAiBzF"}

package/dist/utils/scoped-dataset-source.js

@@ -0,0 +1,34 @@
+import { resolveFilterField } from '../query-planner.js';
+import { FINAL_SAFETY_SETTINGS, datasetSourceBuilder, queryReadsFinal } from './dataset-source.js';
+import { queryTimeFilter } from './query-timezone.js';
+import { applyRelationshipJoins, qualifyBaseColumn, } from './relationship-builder-plan.js';
+import { assertEnforcedConstraints } from './enforced-constraints.js';
+import { applyRowScope, datasetRowScope, runtimeConstraints } from './row-scope.js';
+/**
+ * The dataset's source as a builder with every trusted row restriction
+ * applied (RFC 0020): `FINAL`, relationship joins scoped by each target's own
+ * row scope, the dataset's row scope, and the call's enforced constraints.
+ *
+ * Every builder-path query shape reads its source through here, so none can
+ * read rows the context does not allow. Callers add their own selections,
+ * filters and aggregations on top; every predicate here is ANDed with them.
+ */
+export function scopedDatasetSource(options) {
+    const { ds, context, joinCtx, dialect, timezone } = options;
+    // Validators report this too; checked here so no path can skip it.
+    assertEnforcedConstraints(ds, context);
+    let qb = applyRelationshipJoins(datasetSourceBuilder(options.builderFactory, ds), joinCtx);
+    // A resolved join target is read with FINAL even when this dataset isn't.
+    if (queryReadsFinal(ds, joinCtx) && qb.settings)
+        qb = qb.settings(FINAL_SAFETY_SETTINGS);
+    qb = applyRowScope(qb, datasetRowScope(ds, context), column => qualifyBaseColumn(joinCtx, column));
+    // Constraints are filters in the dataset's vocabulary, applied exactly as a
+    // caller filter on the same field would be.
+    for (const constraint of runtimeConstraints(context)) {
+        const expression = resolveFilterField(ds, constraint.field, joinCtx);
+        for (const predicate of queryTimeFilter(dialect, ds, constraint, expression, timezone)) {
+            qb = qb.where(predicate.expression, predicate.operator, predicate.value);
+        }
+    }
+    return qb;
+}

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

@@ -1 +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"}
+{"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,CAgBjG"}

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

@@ -9,6 +9,9 @@ export function snapshotExecutionContext(context) {
                 ...context.runtime,
                 // Copy tenant objects and ID lists; retain adapter and AbortSignal identity.
                 tenant: structuredClone(context.runtime.tenant),
+                ...(context.runtime.constraints === undefined
+                    ? {}
+                    : { constraints: structuredClone(context.runtime.constraints) }),
             },
         }),
         ...(context.cache && { cache: { ...context.cache } }),

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

@@ -1,6 +1,6 @@
 import type { StatementParameters } from './statement-parameters.js';
 import type { TimeMeasureAxis } from './time-measure-axis.js';
-import type { TimeMeasureSqlSource } from './time-measure-source-sql.js';
+import { type TimeMeasureSqlSource } from './time-measure-source-sql.js';
 import type { ShiftMeasureDefinition } from '../types.js';
 export interface TimeMeasureSqlAxis {
     ctes: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"time-measure-axis-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-axis-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,6DAA6D;AAC7D,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,eAAe,EACrB,MAAM,GAAE,SAAS,sBAAsB,EAAO,GAC7C,kBAAkB,CA2CpB"}
+{"version":3,"file":"time-measure-axis-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-axis-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAqB,KAAK,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAE5F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,6DAA6D;AAC7D,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,eAAe,EACrB,MAAM,GAAE,SAAS,sBAAsB,EAAO,GAC7C,kBAAkB,CA2CpB"}

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

@@ -1,3 +1,4 @@
+import { sourceTimezoneSql } from './time-measure-source-sql.js';
 import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
 import { shiftCalendarGuardSql, shiftWallTimeSeriesGuardSql } from './shift-measure-sql.js';
 /** Build bounded output buckets using the query timezone. */
@@ -24,7 +25,7 @@ export function buildTimeMeasureAxisSql(statement, source, axis, shifts = []) {
     const postSeriesGuard = shifts.map(shift => shiftWallTimeSeriesGuardSql(dialect, shift, axis.grain)).join(' + ') || '0';
     // A zero-row scalar retains the converted timestamp type and query timezone.
     // Reading any(time) here would scan the entire population just for its type.
-    const timezone = dialect.timezoneOf(dialect.assumeNotNull('(SELECT _hq_time FROM _hq_source LIMIT 0)'));
+    const timezone = sourceTimezoneSql(dialect);
     const bounds = [
         // The bounds come from the caller's time filter: bind them, never inline them.
         `${dialect.parseTimestamp(statement.bind(axis.lower, 'string'), timezone)} AS _hq_lower`,

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

@@ -1,7 +1,7 @@
 import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
 import type { WindowMeasureDefinition } from '../types.js';
 import type { TimeMeasureAxis } from './time-measure-axis.js';
-import type { TimeMeasureSqlBase, TimeMeasureSqlDimension } from './time-measure-source-sql.js';
+import { type TimeMeasureSqlBase, type TimeMeasureSqlDimension } from './time-measure-source-sql.js';
 /** Keyed source membership retains distinct/average semantics and row multiplicity. */
 export declare function timeMeasureLeafSql(dialect: DatasetSqlDialectRules, id: number, context: number, base: TimeMeasureSqlBase, window: WindowMeasureDefinition | undefined, axis: TimeMeasureAxis, dims: readonly TimeMeasureSqlDimension[]): {
     ctes: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"time-measure-leaf-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-leaf-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKhG,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,uBAAuB,EAAE;;;;;;;;EA8CtO"}
+{"version":3,"file":"time-measure-leaf-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-leaf-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAqB,KAAK,kBAAkB,EAAE,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKxH,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,uBAAuB,EAAE;;;;;;;;EA+CtO"}

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

@@ -1,3 +1,4 @@
+import { sourceTimezoneSql } from './time-measure-source-sql.js';
 import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
 import { shiftRangePredicateSql } from './shift-measure-sql.js';
 import { isCountAggregation } from './count-aggregations.js';
@@ -27,7 +28,8 @@ export function timeMeasureLeafSql(dialect, id, context, base, window, axis, dim
         };
     }
     const lower = window?.trailing ? dialect.subtractTime('_hq_eval_end', window.trailing.amount, window.trailing.unit)
-        : window?.toDate ? dialect.truncateTime('_hq_eval_period', window.toDate) : '_hq_eval_lower';
+        // Keep the to-date start zoned: a calendar Date would bucket in server time.
+        : window?.toDate ? dialect.truncateTimeInZone('_hq_eval_period', window.toDate, sourceTimezoneSql(dialect)) : '_hq_eval_lower';
     const upper = window ? '_hq_eval_end' : '_hq_eval_upper';
     const lowerInclusive = window ? '1' : '_hq_lower_inclusive';
     const upperInclusive = window ? '0' : '_hq_upper_inclusive';

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

@@ -1,6 +1,7 @@
 import type { AnyDatasetInstance, DatasetQuery, MeasureDefinition, MetricFilter } from '../types.js';
 import type { DatasetQueryExecutionOptions } from '../dataset-query.js';
 import type { StatementParameters } from './statement-parameters.js';
+import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
 export interface TimeMeasureSqlDimension {
     name: string;
     alias: string;
@@ -17,6 +18,8 @@ export interface TimeMeasureSqlSource {
     bases: TimeMeasureSqlBase[];
     rowAlias: string;
 }
+/** The query timezone carried by `_hq_source` time, read from a zero-row scalar without scanning. */
+export declare function sourceTimezoneSql(dialect: DatasetSqlDialectRules): string;
 /** Isolate authored expressions, joins, tenancy and filters from internal SQL aliases. */
 export declare function buildTimeMeasureSourceSql(ds: AnyDatasetInstance, query: DatasetQuery, baseNames: Iterable<string>, filters: readonly MetricFilter[], options: DatasetQueryExecutionOptions, statement: StatementParameters): TimeMeasureSqlSource;
 //# sourceMappingURL=time-measure-source-sql.d.ts.map

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":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AASxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,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,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,EACrC,SAAS,EAAE,mBAAmB,GAC7B,oBAAoB,CAqEtB"}
+{"version":3,"file":"time-measure-source-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-source-sql.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAQxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE,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,uBAAuB,EAAE,CAAC;IACtC,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qGAAqG;AACrG,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM,CAEzE;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,EACrC,SAAS,EAAE,mBAAmB,GAC7B,oBAAoB,CAoEtB"}

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

@@ -1,15 +1,18 @@
-import { datasetSourceBuilder } from './dataset-source.js';
+import { scopedDatasetSource } from './scoped-dataset-source.js';
 import { resolveRelationshipMeasure } from './relationship-measures.js';
 import { relationshipMeasureExpressions } from './relationship-measure-sql.js';
 import { queryTimeFilter, queryTimeSql } from './query-timezone.js';
-import { resolveDimensionExpression, resolveFilterField, resolveTenantFilterColumn } from '../query-planner.js';
-import { applyRelationshipJoins, buildRelationshipBuilderContext, qualifyBaseColumn } from './relationship-builder-plan.js';
-import { getRuntimeTenantPredicate } from './tenant-runtime.js';
+import { resolveDimensionExpression, resolveFilterField } from '../query-planner.js';
+import { buildRelationshipBuilderContext } from './relationship-builder-plan.js';
 import { segmentFilters } from './segments.js';
 import { getBaseMeasure } from './dataset-measures.js';
 import { measureToAggregationSpec } from './dataset-normalization.js';
 import { applyFilteredAggregationExpression } from './filtered-aggregation-sql.js';
 import { assertNoRawSqlUnderJoins } from './sql-under-joins.js';
+/** The query timezone carried by `_hq_source` time, read from a zero-row scalar without scanning. */
+export function sourceTimezoneSql(dialect) {
+    return dialect.timezoneOf(dialect.assumeNotNull('(SELECT _hq_time FROM _hq_source LIMIT 0)'));
+}
 /** Isolate authored expressions, joins, tenancy and filters from internal SQL aliases. */
 export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options, statement) {
     const { dialect } = statement;
@@ -17,7 +20,9 @@ export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options
     const joinCtx = buildRelationshipBuilderContext(ds, query, options.context, dialect);
     // Keep source expressions in their own SELECT scope: internal aliases cannot
     // capture authored SQL identifiers, even if a physical column shares a name.
-    let raw = applyRelationshipJoins(datasetSourceBuilder(options.builderFactory, ds), joinCtx);
+    let raw = scopedDatasetSource({
+        builderFactory: options.builderFactory, ds, context: options.context, joinCtx, dialect, timezone: query.timezone,
+    });
     const dims = (query.dimensions ?? []).map((name, i) => ({ name, alias: `_hq_d${i}` }));
     const sourceParts = [resolveDimensionExpression(ds, ds.timeKey, joinCtx)];
     for (const dimension of dims)
@@ -50,10 +55,6 @@ export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options
     while (sourceIdentifiers.some(text => text.includes(rowAlias)))
         rowAlias += '_';
     raw = raw.select([`${dialect.packRow(sourceParts)} AS ${rowAlias}`]);
-    const tenant = getRuntimeTenantPredicate(options.context);
-    const tenantColumn = resolveTenantFilterColumn(ds, options.context);
-    if (tenant && tenantColumn)
-        raw = raw.where(qualifyBaseColumn(joinCtx, tenantColumn), tenant.operator, tenant.value);
     // The time axis already consumed every time-key bound, so these are the
     // remaining caller filters.
     for (const filter of filters) {