@hypequery/datasets 0.20.0 → 0.22.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (172) hide show
  1. package/README.md +6 -0
  2. package/dist/api.type-test.js +7 -1
  3. package/dist/catalog.d.ts +7 -3
  4. package/dist/catalog.d.ts.map +1 -1
  5. package/dist/catalog.js +15 -3
  6. package/dist/contract.d.ts +1 -1
  7. package/dist/contract.d.ts.map +1 -1
  8. package/dist/dataset-compilation.d.ts +45 -0
  9. package/dist/dataset-compilation.d.ts.map +1 -0
  10. package/dist/dataset-compilation.js +1 -0
  11. package/dist/dataset-query.d.ts +3 -3
  12. package/dist/dataset-query.d.ts.map +1 -1
  13. package/dist/dataset-query.js +7 -71
  14. package/dist/dataset-sql-dialect.d.ts +11 -0
  15. package/dist/dataset-sql-dialect.d.ts.map +1 -0
  16. package/dist/dataset-sql-dialect.js +1 -0
  17. package/dist/dataset.d.ts +3 -2
  18. package/dist/dataset.d.ts.map +1 -1
  19. package/dist/execution-capabilities.d.ts +28 -0
  20. package/dist/execution-capabilities.d.ts.map +1 -0
  21. package/dist/execution-capabilities.js +17 -0
  22. package/dist/execution-capabilities.json +13 -0
  23. package/dist/executor.d.ts +17 -38
  24. package/dist/executor.d.ts.map +1 -1
  25. package/dist/executor.js +37 -400
  26. package/dist/index.d.ts +9 -4
  27. package/dist/index.d.ts.map +1 -1
  28. package/dist/index.js +3 -2
  29. package/dist/internal.d.ts +3 -0
  30. package/dist/internal.d.ts.map +1 -1
  31. package/dist/internal.js +2 -0
  32. package/dist/measure.d.ts +56 -19
  33. package/dist/measure.d.ts.map +1 -1
  34. package/dist/measure.js +5 -65
  35. package/dist/metric-query-engine.d.ts +29 -0
  36. package/dist/metric-query-engine.d.ts.map +1 -0
  37. package/dist/metric-query-engine.js +106 -0
  38. package/dist/portable-executor.d.ts +20 -6
  39. package/dist/portable-executor.d.ts.map +1 -1
  40. package/dist/portable-executor.js +29 -9
  41. package/dist/query-builder-protocol.d.ts +4 -0
  42. package/dist/query-builder-protocol.d.ts.map +1 -1
  43. package/dist/query-helpers.d.ts +10 -10
  44. package/dist/query-helpers.d.ts.map +1 -1
  45. package/dist/query-helpers.js +1 -3
  46. package/dist/query-planner.d.ts +7 -3
  47. package/dist/query-planner.d.ts.map +1 -1
  48. package/dist/query-planner.js +10 -12
  49. package/dist/semantic-planner.d.ts.map +1 -1
  50. package/dist/semantic-planner.js +2 -0
  51. package/dist/semantic-query-schema.d.ts.map +1 -1
  52. package/dist/semantic-query-schema.js +3 -3
  53. package/dist/types.d.ts +22 -16
  54. package/dist/types.d.ts.map +1 -1
  55. package/dist/utils/agent-catalog-projection.d.ts +1 -0
  56. package/dist/utils/agent-catalog-projection.d.ts.map +1 -1
  57. package/dist/utils/agent-catalog-projection.js +2 -1
  58. package/dist/utils/approximate-measures.d.ts +1 -0
  59. package/dist/utils/approximate-measures.d.ts.map +1 -1
  60. package/dist/utils/approximate-measures.js +10 -4
  61. package/dist/utils/base-measure-definition.d.ts +23 -0
  62. package/dist/utils/base-measure-definition.d.ts.map +1 -0
  63. package/dist/utils/base-measure-definition.js +65 -0
  64. package/dist/utils/build-dataset-query-builder.d.ts +5 -0
  65. package/dist/utils/build-dataset-query-builder.d.ts.map +1 -0
  66. package/dist/utils/build-dataset-query-builder.js +62 -0
  67. package/dist/utils/clickhouse-dataset-sql-dialect.d.ts +4 -0
  68. package/dist/utils/clickhouse-dataset-sql-dialect.d.ts.map +1 -0
  69. package/dist/utils/clickhouse-dataset-sql-dialect.js +6 -0
  70. package/dist/utils/compile-dataset-query.d.ts +10 -0
  71. package/dist/utils/compile-dataset-query.d.ts.map +1 -0
  72. package/dist/utils/compile-dataset-query.js +71 -0
  73. package/dist/utils/composite-time-measure-sql.d.ts +10 -0
  74. package/dist/utils/composite-time-measure-sql.d.ts.map +1 -0
  75. package/dist/utils/composite-time-measure-sql.js +61 -0
  76. package/dist/utils/dataset-derived-query.d.ts +1 -2
  77. package/dist/utils/dataset-derived-query.d.ts.map +1 -1
  78. package/dist/utils/dataset-derived-query.js +16 -30
  79. package/dist/utils/dataset-filter-types.d.ts +28 -0
  80. package/dist/utils/dataset-filter-types.d.ts.map +1 -0
  81. package/dist/utils/dataset-filter-types.js +1 -0
  82. package/dist/utils/dataset-query-validation.d.ts.map +1 -1
  83. package/dist/utils/dataset-query-validation.js +15 -3
  84. package/dist/utils/dataset-sql-dialect.d.ts +5 -0
  85. package/dist/utils/dataset-sql-dialect.d.ts.map +1 -0
  86. package/dist/utils/dataset-sql-dialect.js +5 -0
  87. package/dist/utils/dataset-target.d.ts +3 -0
  88. package/dist/utils/dataset-target.d.ts.map +1 -0
  89. package/dist/utils/dataset-target.js +3 -0
  90. package/dist/utils/derived-measure-sql.d.ts +1 -0
  91. package/dist/utils/derived-measure-sql.d.ts.map +1 -1
  92. package/dist/utils/derived-measure-sql.js +9 -6
  93. package/dist/utils/derived-measure-validation.d.ts.map +1 -1
  94. package/dist/utils/derived-measure-validation.js +4 -25
  95. package/dist/utils/filter-definition.d.ts +3 -0
  96. package/dist/utils/filter-definition.d.ts.map +1 -0
  97. package/dist/utils/filter-definition.js +3 -0
  98. package/dist/utils/measure-dependencies.d.ts +8 -0
  99. package/dist/utils/measure-dependencies.d.ts.map +1 -0
  100. package/dist/utils/measure-dependencies.js +44 -0
  101. package/dist/utils/measure-evaluation-graph.d.ts +23 -0
  102. package/dist/utils/measure-evaluation-graph.d.ts.map +1 -0
  103. package/dist/utils/measure-evaluation-graph.js +38 -0
  104. package/dist/utils/measure-time-grains.d.ts.map +1 -1
  105. package/dist/utils/measure-time-grains.js +4 -2
  106. package/dist/utils/metric-derived-query.d.ts +8 -0
  107. package/dist/utils/metric-derived-query.d.ts.map +1 -0
  108. package/dist/utils/metric-derived-query.js +106 -0
  109. package/dist/utils/metric-query-builder.d.ts +5 -0
  110. package/dist/utils/metric-query-builder.d.ts.map +1 -0
  111. package/dist/utils/metric-query-builder.js +50 -0
  112. package/dist/utils/metric-query-result.d.ts +10 -0
  113. package/dist/utils/metric-query-result.d.ts.map +1 -0
  114. package/dist/utils/metric-query-result.js +18 -0
  115. package/dist/utils/metric-query-validation.d.ts +6 -0
  116. package/dist/utils/metric-query-validation.d.ts.map +1 -0
  117. package/dist/utils/metric-query-validation.js +116 -0
  118. package/dist/utils/relationship-builder-plan.d.ts +4 -2
  119. package/dist/utils/relationship-builder-plan.d.ts.map +1 -1
  120. package/dist/utils/relationship-builder-plan.js +10 -13
  121. package/dist/utils/relationship-measure-sql.d.ts +14 -0
  122. package/dist/utils/relationship-measure-sql.d.ts.map +1 -0
  123. package/dist/utils/relationship-measure-sql.js +44 -0
  124. package/dist/utils/relationship-measure-types.d.ts +36 -0
  125. package/dist/utils/relationship-measure-types.d.ts.map +1 -0
  126. package/dist/utils/relationship-measure-types.js +1 -0
  127. package/dist/utils/relationship-measures.d.ts +23 -0
  128. package/dist/utils/relationship-measures.d.ts.map +1 -0
  129. package/dist/utils/relationship-measures.js +62 -0
  130. package/dist/utils/relationship-validation.d.ts +1 -1
  131. package/dist/utils/relationship-validation.d.ts.map +1 -1
  132. package/dist/utils/relationship-validation.js +3 -5
  133. package/dist/utils/semantic-query-syntax.d.ts +6 -0
  134. package/dist/utils/semantic-query-syntax.d.ts.map +1 -0
  135. package/dist/utils/semantic-query-syntax.js +25 -0
  136. package/dist/utils/shift-measure-grains.d.ts +5 -0
  137. package/dist/utils/shift-measure-grains.d.ts.map +1 -0
  138. package/dist/utils/shift-measure-grains.js +10 -0
  139. package/dist/utils/shift-measure-sql.d.ts +5 -2
  140. package/dist/utils/shift-measure-sql.d.ts.map +1 -1
  141. package/dist/utils/shift-measure-sql.js +25 -8
  142. package/dist/utils/shift-measure-validation.js +3 -3
  143. package/dist/utils/shift-wall-time-sql.d.ts +4 -0
  144. package/dist/utils/shift-wall-time-sql.d.ts.map +1 -0
  145. package/dist/utils/shift-wall-time-sql.js +17 -0
  146. package/dist/utils/snapshot-execution-context.d.ts +4 -0
  147. package/dist/utils/snapshot-execution-context.d.ts.map +1 -0
  148. package/dist/utils/snapshot-execution-context.js +16 -0
  149. package/dist/utils/time-measure-axis-sql.d.ts +1 -0
  150. package/dist/utils/time-measure-axis-sql.d.ts.map +1 -1
  151. package/dist/utils/time-measure-axis-sql.js +5 -4
  152. package/dist/utils/time-measure-axis.d.ts.map +1 -1
  153. package/dist/utils/time-measure-axis.js +3 -2
  154. package/dist/utils/time-measure-context-sql.d.ts +6 -0
  155. package/dist/utils/time-measure-context-sql.d.ts.map +1 -0
  156. package/dist/utils/time-measure-context-sql.js +21 -0
  157. package/dist/utils/time-measure-dataset-sql.d.ts.map +1 -1
  158. package/dist/utils/time-measure-dataset-sql.js +27 -9
  159. package/dist/utils/time-measure-leaf-sql.d.ts +14 -0
  160. package/dist/utils/time-measure-leaf-sql.d.ts.map +1 -0
  161. package/dist/utils/time-measure-leaf-sql.js +52 -0
  162. package/dist/utils/time-measure-result-sql.d.ts +1 -1
  163. package/dist/utils/time-measure-result-sql.d.ts.map +1 -1
  164. package/dist/utils/time-measure-result-sql.js +4 -3
  165. package/dist/utils/time-measure-source-sql.d.ts.map +1 -1
  166. package/dist/utils/time-measure-source-sql.js +8 -4
  167. package/dist/utils/time-query-measures.d.ts.map +1 -1
  168. package/dist/utils/time-query-measures.js +4 -8
  169. package/dist/utils/window-query-signature.d.ts.map +1 -1
  170. package/dist/utils/window-query-signature.js +12 -2
  171. package/dist/validation.js +1 -1
  172. package/package.json +8 -7
@@ -0,0 +1,38 @@
1
+ import { isDerivedMeasure, isShiftMeasure } from './dataset-measures.js';
2
+ /** A shift changes evaluation context; formulas combine values in that context. */
3
+ export function buildMeasureEvaluationGraph(measures, selected) {
4
+ const contexts = [{ id: 0 }];
5
+ const nodes = [];
6
+ const memo = new Map();
7
+ const contextMemo = new Map();
8
+ const visit = (name, context) => {
9
+ const key = `${context}:${name}`;
10
+ const existing = memo.get(key);
11
+ if (existing !== undefined)
12
+ return existing;
13
+ const definition = measures[name];
14
+ if (isShiftMeasure(definition)) {
15
+ const contextKey = `${context}:${definition.interval.amount}:${definition.interval.unit}`;
16
+ let shifted = contextMemo.get(contextKey);
17
+ if (shifted === undefined) {
18
+ shifted = contexts.length;
19
+ contexts.push({ id: shifted, parent: context, interval: definition.interval });
20
+ contextMemo.set(contextKey, shifted);
21
+ }
22
+ const input = visit(definition.measure, shifted);
23
+ memo.set(key, input);
24
+ return input;
25
+ }
26
+ const inputs = isDerivedMeasure(definition)
27
+ ? Object.fromEntries(Object.entries(definition.uses).map(([alias, input]) => [alias, visit(input, context)])) : undefined;
28
+ const id = nodes.length;
29
+ nodes.push({ id, name, context, definition, inputs });
30
+ memo.set(key, id);
31
+ return id;
32
+ };
33
+ const outputs = Object.fromEntries(selected.map(name => [name, visit(name, 0)]));
34
+ return { contexts, nodes, outputs };
35
+ }
36
+ export function evaluationFormula(node) {
37
+ return { ...node.definition, uses: Object.fromEntries(Object.entries(node.inputs ?? {}).map(([alias, id]) => [alias, `_hq_value${id}`])) };
38
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"measure-time-grains.d.ts","sourceRoot":"","sources":["../../src/utils/measure-time-grains.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIvE,8EAA8E;AAC9E,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,SAAS,EAAE,GACvG,SAAS,EAAE,CAUb"}
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;AAKvE,8EAA8E;AAC9E,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,SAAS,EAAE,GACvG,SAAS,EAAE,CAWb"}
@@ -1,10 +1,12 @@
1
1
  import { getDerivedMeasure, isShiftMeasure, isWindowMeasure } from './dataset-measures.js';
2
- import { intervalBuckets, windowGrainErrors } from './time-axis-intervals.js';
2
+ import { windowGrainErrors } from './time-axis-intervals.js';
3
+ import { supportsShiftGrain } from './shift-measure-grains.js';
3
4
  /** Intersect time-measure requirements with the dataset's declared grains. */
4
5
  export function measureSupportedGrains(measures, name, grains) {
5
6
  const definition = measures[name];
6
7
  if (isShiftMeasure(definition)) {
7
- return grains.filter(grain => intervalBuckets(definition.interval.amount, definition.interval.unit, grain) !== undefined);
8
+ return measureSupportedGrains(measures, definition.measure, grains)
9
+ .filter(grain => supportsShiftGrain(definition.interval, grain));
8
10
  }
9
11
  if (isWindowMeasure(definition))
10
12
  return grains.filter(grain => !windowGrainErrors(name, definition, grain).length);
@@ -0,0 +1,8 @@
1
+ import type { MetricRef, MetricQuery, ExecutionContext, TimeGrain } from '../types.js';
2
+ import type { QueryBuilderFactoryLike } from '../query-builder-protocol.js';
3
+ import type { DerivedMetricSpec } from '../types.js';
4
+ export declare function buildDerivedMetricSql(ref: MetricRef, spec: DerivedMetricSpec, query: MetricQuery, grain: TimeGrain | undefined, builderFactory: QueryBuilderFactoryLike, context?: ExecutionContext): {
5
+ sql: string;
6
+ params: unknown[];
7
+ };
8
+ //# sourceMappingURL=metric-derived-query.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"metric-derived-query.d.ts","sourceRoot":"","sources":["../../src/utils/metric-derived-query.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACvF,OAAO,KAAK,EAAE,uBAAuB,EAAoB,MAAM,8BAA8B,CAAC;AAiB9F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKrD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,SAAS,GAAG,SAAS,EAC5B,cAAc,EAAE,uBAAuB,EACvC,OAAO,CAAC,EAAE,gBAAgB,GACzB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAiHpC"}
@@ -0,0 +1,106 @@
1
+ import { semanticQuerySyntaxErrors, semanticOrderDirection } from './semantic-query-syntax.js';
2
+ /** Metric SQL compilation; factory selection and execution belong to the client. */
3
+ import { resolveDatasetSqlDialect } from './dataset-sql-dialect.js';
4
+ import { applyAggregationSpec, buildDimensionSelectionPlan, resolveDimensionExpression, resolveFilterField, resolveTenantFilterColumn, } from '../query-planner.js';
5
+ import { queryTimeFilterSql } from './query-timezone.js';
6
+ import { isTenantScopedFilter } from './metric-handle.js';
7
+ import { getRuntimeTenantPredicate } from './tenant-runtime.js';
8
+ import { applyRelationshipJoins, buildRelationshipBuilderContext, qualifyBaseColumn, } from './relationship-builder-plan.js';
9
+ import { segmentFilters } from './segments.js';
10
+ import { validateSQLIdentifier } from '../sql-utils.js';
11
+ import { isQualifiedField } from './relationship-fields.js';
12
+ import { validateDerivedCteGrouping } from './derived-cte-validation.js';
13
+ export function buildDerivedMetricSql(ref, spec, query, grain, builderFactory, context) {
14
+ const syntaxErrors = semanticQuerySyntaxErrors(query);
15
+ if (syntaxErrors.length)
16
+ throw new Error(syntaxErrors.join('; '));
17
+ const dialect = resolveDatasetSqlDialect(builderFactory);
18
+ const ds = ref.dataset;
19
+ const joinCtx = buildRelationshipBuilderContext(ds, query, context);
20
+ // Build the CTE inner query using the builder
21
+ let cteBuilder = builderFactory.table(ds.source);
22
+ cteBuilder = applyRelationshipJoins(cteBuilder, joinCtx);
23
+ const { selectParts, groupByParts } = buildDimensionSelectionPlan(ds, query.dimensions ?? [], grain, joinCtx, query.timezone, dialect);
24
+ if (selectParts.length > 0) {
25
+ cteBuilder = cteBuilder.select(selectParts);
26
+ }
27
+ // Base aggregations
28
+ const refAliases = {};
29
+ const aggregateAliases = [];
30
+ for (const [alias, baseMetric] of Object.entries(spec.uses)) {
31
+ const baseSpec = baseMetric.spec;
32
+ if (baseSpec.__type !== 'aggregation_spec') {
33
+ throw new Error(`Derived metric "${ref.name}" references non-base metric "${alias}".`);
34
+ }
35
+ cteBuilder = applyAggregationSpec(cteBuilder, ds, baseSpec, alias, joinCtx);
36
+ refAliases[alias] = alias;
37
+ aggregateAliases.push(alias);
38
+ }
39
+ if (groupByParts.length > 0) {
40
+ cteBuilder = cteBuilder.groupBy(groupByParts);
41
+ }
42
+ // Filters on CTE
43
+ const tenantColumn = resolveTenantFilterColumn(ds, context);
44
+ const tenantPredicate = getRuntimeTenantPredicate(context);
45
+ if (tenantPredicate && tenantColumn) {
46
+ cteBuilder = cteBuilder.where(qualifyBaseColumn(joinCtx, tenantColumn), tenantPredicate.operator, tenantPredicate.value);
47
+ }
48
+ for (const filter of query.filters ?? []) {
49
+ if (isTenantScopedFilter(ds, filter, context)) {
50
+ throw new Error(`Cannot filter on tenant field "${filter.field}" when runtime tenancy enforcement is active.`);
51
+ }
52
+ const resolvedField = resolveFilterField(ds, filter.field, joinCtx);
53
+ cteBuilder = cteBuilder.where(queryTimeFilterSql(ds, filter.field, resolvedField, query.timezone), filter.operator, filter.value);
54
+ }
55
+ for (const filter of segmentFilters(ds, query.segments)) {
56
+ cteBuilder = cteBuilder.where(resolveDimensionExpression(ds, filter.field, joinCtx), filter.operator, filter.value);
57
+ }
58
+ const { sql: cteSql, parameters: cteParams } = cteBuilder.toSQLWithParams();
59
+ const groupingErrors = validateDerivedCteGrouping(cteSql, aggregateAliases, groupByParts);
60
+ if (groupingErrors.length > 0) {
61
+ throw new Error(groupingErrors.join('; '));
62
+ }
63
+ // Outer query: trivial SELECT from the CTE — stays as string concat
64
+ // because table('base') would fail schema typing
65
+ const outerSelectParts = [];
66
+ if (grain)
67
+ outerSelectParts.push('period');
68
+ for (const dim of query.dimensions ?? []) {
69
+ // Joined dimensions surface from the CTE under their quoted qualified alias.
70
+ if (joinCtx && isQualifiedField(dim)) {
71
+ outerSelectParts.push(dialect.quoteIdentifier(dim));
72
+ continue;
73
+ }
74
+ validateSQLIdentifier(dim, 'dimension name');
75
+ outerSelectParts.push(dim);
76
+ }
77
+ const formulaExpr = spec.formula(refAliases);
78
+ validateSQLIdentifier(ref.name, 'metric name');
79
+ outerSelectParts.push(`${formulaExpr.toSQL()} AS ${ref.name}`);
80
+ let sql = `WITH base AS (${cteSql}) SELECT ${outerSelectParts.join(', ')} FROM base`;
81
+ // ORDER BY
82
+ if (query.orderBy && query.orderBy.length > 0) {
83
+ const orderParts = query.orderBy.map(o => {
84
+ if (joinCtx && isQualifiedField(o.field)) {
85
+ return `${dialect.quoteIdentifier(o.field)} ${semanticOrderDirection(o.direction)}`;
86
+ }
87
+ validateSQLIdentifier(o.field, 'order by field');
88
+ return `${o.field} ${semanticOrderDirection(o.direction)}`;
89
+ });
90
+ sql += ` ORDER BY ${orderParts.join(', ')}`;
91
+ }
92
+ else if (grain) {
93
+ sql += ' ORDER BY period';
94
+ }
95
+ if (query.limit != null) {
96
+ // Ensure limit is a safe integer
97
+ const limit = Math.floor(Math.abs(query.limit));
98
+ sql += ` LIMIT ${limit}`;
99
+ }
100
+ if (query.offset != null) {
101
+ // Ensure offset is a safe integer
102
+ const offset = Math.floor(Math.abs(query.offset));
103
+ sql += ` OFFSET ${offset}`;
104
+ }
105
+ return { sql, params: cteParams };
106
+ }
@@ -0,0 +1,5 @@
1
+ import type { MetricRef, MetricQuery, ExecutionContext, TimeGrain } from '../types.js';
2
+ import type { QueryBuilderFactoryLike, QueryBuilderLike } from '../query-builder-protocol.js';
3
+ import type { AggregationSpec, AnyDatasetInstance } from '../types.js';
4
+ export declare function buildMetricQueryBuilder(ref: MetricRef, spec: AggregationSpec, ds: AnyDatasetInstance, query: MetricQuery, grain: TimeGrain | undefined, builderFactory: QueryBuilderFactoryLike, context?: ExecutionContext): QueryBuilderLike;
5
+ //# sourceMappingURL=metric-query-builder.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"metric-query-builder.d.ts","sourceRoot":"","sources":["../../src/utils/metric-query-builder.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACvF,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAkB9F,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEvE,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,SAAS,EACd,IAAI,EAAE,eAAe,EACrB,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,SAAS,GAAG,SAAS,EAC5B,cAAc,EAAE,uBAAuB,EACvC,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAwDlB"}
@@ -0,0 +1,50 @@
1
+ import { semanticQuerySyntaxErrors } from './semantic-query-syntax.js';
2
+ /** Metric SQL compilation; factory selection and execution belong to the client. */
3
+ import { resolveDatasetSqlDialect } from './dataset-sql-dialect.js';
4
+ import { applyAggregationSpec, appendOrderLimitOffset, buildDimensionSelectionPlan, resolveDimensionExpression, resolveFilterField, resolveTenantFilterColumn, } from '../query-planner.js';
5
+ import { queryTimeFilterSql } from './query-timezone.js';
6
+ import { isTenantScopedFilter } from './metric-handle.js';
7
+ import { getRuntimeTenantPredicate } from './tenant-runtime.js';
8
+ import { applyRelationshipJoins, buildRelationshipBuilderContext, qualifyBaseColumn, } from './relationship-builder-plan.js';
9
+ import { segmentFilters } from './segments.js';
10
+ export function buildMetricQueryBuilder(ref, spec, ds, query, grain, builderFactory, context) {
11
+ const syntaxErrors = semanticQuerySyntaxErrors(query);
12
+ if (syntaxErrors.length)
13
+ throw new Error(syntaxErrors.join('; '));
14
+ const dialect = resolveDatasetSqlDialect(builderFactory);
15
+ const joinCtx = buildRelationshipBuilderContext(ds, query, context);
16
+ let qb = builderFactory.table(ds.source);
17
+ qb = applyRelationshipJoins(qb, joinCtx);
18
+ const { selectParts, groupByParts } = buildDimensionSelectionPlan(ds, query.dimensions ?? [], grain, joinCtx, query.timezone, dialect);
19
+ if (selectParts.length > 0) {
20
+ qb = qb.select(selectParts);
21
+ }
22
+ // Aggregation (appends to select, auto-sets groupBy on non-agg columns)
23
+ qb = applyAggregationSpec(qb, ds, spec, ref.name, joinCtx);
24
+ // Explicit groupBy (ensures period + dims are grouped even if aggregation auto-groupBy misses them)
25
+ if (groupByParts.length > 0) {
26
+ qb = qb.groupBy(groupByParts);
27
+ }
28
+ // Tenant auto-injection
29
+ const tenantColumn = resolveTenantFilterColumn(ds, context);
30
+ const tenantPredicate = getRuntimeTenantPredicate(context);
31
+ if (tenantPredicate && tenantColumn) {
32
+ qb = qb.where(qualifyBaseColumn(joinCtx, tenantColumn), tenantPredicate.operator, tenantPredicate.value);
33
+ }
34
+ // User filters
35
+ for (const filter of query.filters ?? []) {
36
+ if (isTenantScopedFilter(ds, filter, context)) {
37
+ throw new Error(`Cannot filter on tenant field "${filter.field}" when runtime tenancy enforcement is active.`);
38
+ }
39
+ const resolvedField = resolveFilterField(ds, filter.field, joinCtx);
40
+ qb = qb.where(queryTimeFilterSql(ds, filter.field, resolvedField, query.timezone), filter.operator, filter.value);
41
+ }
42
+ // Segments: author-defined, so they resolve dimensions directly rather
43
+ // than through the caller-facing filter allow-list.
44
+ for (const filter of segmentFilters(ds, query.segments)) {
45
+ qb = qb.where(resolveDimensionExpression(ds, filter.field, joinCtx), filter.operator, filter.value);
46
+ }
47
+ // Order, limit, offset
48
+ qb = appendOrderLimitOffset(qb, query.orderBy, grain, query.limit, query.offset, joinCtx, dialect);
49
+ return qb;
50
+ }
@@ -0,0 +1,10 @@
1
+ import type { ExecutionContext, MetricQuery, MetricResult } from '../types.js';
2
+ /** Keep base and derived metric execution on the same result contract. */
3
+ export declare function toMetricQueryResult<T>(rows: T[], options: {
4
+ metric: string;
5
+ query: MetricQuery;
6
+ sql: string;
7
+ timingMs: number;
8
+ context?: ExecutionContext;
9
+ }): MetricResult<T>;
10
+ //# sourceMappingURL=metric-query-result.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"metric-query-result.d.ts","sourceRoot":"","sources":["../../src/utils/metric-query-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK/E,0EAA0E;AAC1E,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,IAAI,EAAE,CAAC,EAAE,EACT,OAAO,EAAE;IACP,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,WAAW,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B,GACA,YAAY,CAAC,CAAC,CAAC,CAajB"}
@@ -0,0 +1,18 @@
1
+ import { applyPagination } from './pagination.js';
2
+ import { serializeSemanticMeasureValues } from './semantic-result-serialization.js';
3
+ import { getRuntimeTenantId } from './tenant-runtime.js';
4
+ /** Keep base and derived metric execution on the same result contract. */
5
+ export function toMetricQueryResult(rows, options) {
6
+ const { data, pagination } = applyPagination(rows, options.query.limit, options.query.offset);
7
+ const serializedData = serializeSemanticMeasureValues(data, [options.metric]);
8
+ return {
9
+ data: serializedData,
10
+ meta: {
11
+ sql: options.sql,
12
+ timingMs: options.timingMs,
13
+ tenant: getRuntimeTenantId(options.context),
14
+ rowCount: serializedData.length,
15
+ pagination,
16
+ },
17
+ };
18
+ }
@@ -0,0 +1,6 @@
1
+ /** Semantic metric validation; independent of SQL compilation and execution. */
2
+ import type { MetricQuery, ExecutionContext } from '../types.js';
3
+ import { type ValidationResult } from '../validation.js';
4
+ import { type MetricHandle } from './metric-handle.js';
5
+ export declare function validateMetricQueryInput(metric: MetricHandle, query: MetricQuery, context?: ExecutionContext): ValidationResult;
6
+ //# sourceMappingURL=metric-query-validation.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"metric-query-validation.d.ts","sourceRoot":"","sources":["../../src/utils/metric-query-validation.ts"],"names":[],"mappings":"AACA,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,CAgIlB"}
@@ -0,0 +1,116 @@
1
+ import { semanticQuerySyntaxErrors } from './semantic-query-syntax.js';
2
+ import { validateFilterValue } from '../validation.js';
3
+ import { queryTimezoneErrors } from './query-timezone.js';
4
+ import { protocolMetricCapabilityErrors } from './protocol-metric-capabilities.js';
5
+ import { unsupportedTimeGrainError } from './dataset-time-grains.js';
6
+ import { getMetricGrain, getMetricRef, isTenantScopedFilter } from './metric-handle.js';
7
+ import { validateTenantRuntime } from './tenant-runtime.js';
8
+ import { isQualifiedField, resolveQualifiedField } from './relationship-fields.js';
9
+ import { validateQualifiedFilter, validateRelationshipTenantRuntime } from './relationship-validation.js';
10
+ import { segmentSelectionErrors } from './segments.js';
11
+ export function validateMetricQueryInput(metric, query, context) {
12
+ const errors = [...semanticQuerySyntaxErrors(query), ...protocolMetricCapabilityErrors(metric, query), ...queryTimezoneErrors(query.timezone)];
13
+ const ref = getMetricRef(metric);
14
+ const ds = ref.dataset;
15
+ const dimensionNames = Object.keys(ds.dimensions);
16
+ const filterNames = Object.keys(ds.filters);
17
+ const grain = getMetricGrain(metric, query);
18
+ const orderableFields = new Set([
19
+ ...(query.dimensions ?? []),
20
+ ref.name,
21
+ ...(grain ? ['period'] : []),
22
+ ]);
23
+ const tenantRuntimeError = validateTenantRuntime(ds, context);
24
+ if (tenantRuntimeError) {
25
+ errors.push(tenantRuntimeError);
26
+ }
27
+ const relationshipTenantError = validateRelationshipTenantRuntime(ds, query, context);
28
+ if (relationshipTenantError) {
29
+ errors.push(relationshipTenantError);
30
+ }
31
+ if (metric.__type === 'grained_metric_ref' && query.by && query.by !== metric.grain) {
32
+ errors.push(`Metric "${ref.name}" is already grained by "${metric.grain}" and cannot be queried with by="${query.by}".`);
33
+ }
34
+ // Validate dimensions
35
+ for (const dim of query.dimensions ?? []) {
36
+ if (isQualifiedField(dim)) {
37
+ const resolution = resolveQualifiedField(ds, dim);
38
+ if (resolution?.error) {
39
+ errors.push(resolution.error);
40
+ }
41
+ continue;
42
+ }
43
+ if (!dimensionNames.includes(dim)) {
44
+ errors.push(`Unknown dimension "${dim}". Available: ${dimensionNames.join(', ')}`);
45
+ }
46
+ }
47
+ // Validate filters
48
+ for (const filter of query.filters ?? []) {
49
+ if (isQualifiedField(filter.field)) {
50
+ const filterError = validateQualifiedFilter(ds, filter, context);
51
+ if (filterError) {
52
+ errors.push(filterError);
53
+ }
54
+ continue;
55
+ }
56
+ if (!filterNames.includes(filter.field)) {
57
+ errors.push(`Unknown filter field "${filter.field}". Available: ${filterNames.join(', ')}`);
58
+ continue;
59
+ }
60
+ const filterDefinition = ds.filters[filter.field];
61
+ if (filterDefinition?.operators && !filterDefinition.operators.includes(filter.operator)) {
62
+ errors.push(`Filter "${filter.field}" does not allow operator "${filter.operator}". Allowed: ${filterDefinition.operators.join(', ')}`);
63
+ continue;
64
+ }
65
+ const resolvedField = ds.filters[filter.field]?.field ?? filter.field;
66
+ if (isTenantScopedFilter(ds, filter, context)) {
67
+ errors.push(`Cannot filter on tenant field "${filter.field}" when runtime tenancy enforcement is active.`);
68
+ continue;
69
+ }
70
+ const fieldType = ds.dimensions[resolvedField]?.fieldType;
71
+ if (fieldType) {
72
+ const filterError = validateFilterValue(filter, fieldType);
73
+ if (filterError) {
74
+ errors.push(filterError);
75
+ }
76
+ }
77
+ }
78
+ // Validate order by fields against the metric output shape
79
+ for (const order of query.orderBy ?? []) {
80
+ if (!orderableFields.has(order.field)) {
81
+ errors.push(`Unknown orderBy field "${order.field}". Available: ${Array.from(orderableFields).join(', ')}`);
82
+ }
83
+ }
84
+ // Validate grain requires timeKey
85
+ if (query.by && !ds.timeKey) {
86
+ errors.push(`Cannot use "by" grain — dataset "${ds.name}" has no timeKey.`);
87
+ }
88
+ // Validate grain is one the planner can bucket on
89
+ errors.push(...segmentSelectionErrors(ds, query.segments));
90
+ const grainError = query.by && ds.timeKey ? unsupportedTimeGrainError(ds, query.by) : undefined;
91
+ if (grainError) {
92
+ errors.push(grainError);
93
+ }
94
+ if (query.limit != null && (!Number.isInteger(query.limit) || query.limit < 0)) {
95
+ errors.push(`Invalid limit: expected a non-negative integer.`);
96
+ }
97
+ if (query.offset != null && (!Number.isInteger(query.offset) || query.offset < 0)) {
98
+ errors.push(`Invalid offset: expected a non-negative integer.`);
99
+ }
100
+ // Validate limits
101
+ if (ds.limits) {
102
+ if (ds.limits.maxDimensions && (query.dimensions?.length ?? 0) > ds.limits.maxDimensions) {
103
+ errors.push(`Too many dimensions (${query.dimensions?.length}). Max: ${ds.limits.maxDimensions}`);
104
+ }
105
+ if (ds.limits.maxMeasures && 1 > ds.limits.maxMeasures) {
106
+ errors.push(`Too many measures (1). Max: ${ds.limits.maxMeasures}`);
107
+ }
108
+ if (ds.limits.maxFilters && (query.filters?.length ?? 0) > ds.limits.maxFilters) {
109
+ errors.push(`Too many filters (${query.filters?.length}). Max: ${ds.limits.maxFilters}`);
110
+ }
111
+ if (ds.limits.maxResultSize && query.limit != null && query.limit > ds.limits.maxResultSize) {
112
+ errors.push(`Too many results requested (${query.limit}). Max: ${ds.limits.maxResultSize}`);
113
+ }
114
+ }
115
+ return { valid: errors.length === 0, errors };
116
+ }
@@ -1,3 +1,4 @@
1
+ import type { DatasetSqlDialect } from '../dataset-sql-dialect.js';
1
2
  /**
2
3
  * Query-builder-path planning for to-one relationship joins.
3
4
  *
@@ -16,6 +17,7 @@ export interface ResolvedBuilderJoin {
16
17
  relationship: string;
17
18
  /** Physical target source table. */
18
19
  source: string;
20
+ matchMarker?: string;
19
21
  /** Base join column (unqualified). */
20
22
  from: string;
21
23
  /** Target join column (unqualified). */
@@ -30,13 +32,13 @@ export interface RelationshipBuilderContext {
30
32
  joins: ResolvedBuilderJoin[];
31
33
  joinByRelationship: Map<string, ResolvedBuilderJoin>;
32
34
  }
33
- type QueryLike = Pick<DatasetQuery & MetricQuery, 'dimensions' | 'filters' | 'orderBy'>;
35
+ type QueryLike = Pick<DatasetQuery & MetricQuery, 'dimensions' | 'filters' | 'orderBy'> & Pick<DatasetQuery, 'measures'>;
34
36
  /**
35
37
  * Builds the join context for a query, or returns undefined when the query
36
38
  * references no relationship-qualified fields. Validation runs first, so any
37
39
  * qualified name that fails to resolve here is skipped defensively.
38
40
  */
39
- export declare function buildRelationshipBuilderContext(ds: AnyDatasetInstance, query: QueryLike, context?: ExecutionContext): RelationshipBuilderContext | undefined;
41
+ export declare function buildRelationshipBuilderContext(ds: AnyDatasetInstance, query: QueryLike, context?: ExecutionContext, dialect?: DatasetSqlDialect): RelationshipBuilderContext | undefined;
40
42
  /** Qualifies a base physical column with the base source when joins are active. */
41
43
  export declare function qualifyBaseColumn(ctx: RelationshipBuilderContext | undefined, column: string): string;
42
44
  /**
@@ -1 +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"}
1
+ {"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"}
@@ -1,13 +1,6 @@
1
- /**
2
- * Query-builder-path planning for to-one relationship joins.
3
- *
4
- * When a dataset/metric query references relationship-qualified fields
5
- * (`<relationship>.<field>`), the builder path aliases the joined target with
6
- * the relationship name, table-qualifies base columns with the base source
7
- * name, and aliases joined selections back to their quoted qualified name. When
8
- * no qualified field is referenced, no context is produced and the builder path
9
- * behaves exactly as before.
10
- */
1
+ import { relationshipMeasureSource } from './relationship-measure-sql.js';
2
+ import { clickhouseDatasetSqlDialect } from './clickhouse-dataset-sql-dialect.js';
3
+ import { resolveRelationshipReference } from './relationship-measures.js';
11
4
  import { getRuntimeTenantPredicate } from './tenant-runtime.js';
12
5
  import { isQualifiedField, resolveQualifiedField } from './relationship-fields.js';
13
6
  /**
@@ -15,9 +8,10 @@ import { isQualifiedField, resolveQualifiedField } from './relationship-fields.j
15
8
  * references no relationship-qualified fields. Validation runs first, so any
16
9
  * qualified name that fails to resolve here is skipped defensively.
17
10
  */
18
- export function buildRelationshipBuilderContext(ds, query, context) {
11
+ export function buildRelationshipBuilderContext(ds, query, context, dialect = clickhouseDatasetSqlDialect) {
19
12
  const referenced = [
20
13
  ...(query.dimensions ?? []),
14
+ ...(query.measures ?? []),
21
15
  ...(query.filters ?? []).map((filter) => filter.field),
22
16
  ...(query.orderBy ?? []).map((order) => order.field),
23
17
  ].filter(isQualifiedField);
@@ -27,7 +21,7 @@ export function buildRelationshipBuilderContext(ds, query, context) {
27
21
  const tenantPredicate = getRuntimeTenantPredicate(context);
28
22
  const joinByRelationship = new Map();
29
23
  for (const name of referenced) {
30
- const resolution = resolveQualifiedField(ds, name);
24
+ const resolution = resolveRelationshipReference(ds, name, query.measures);
31
25
  if (!resolution || !resolution.resolved) {
32
26
  continue;
33
27
  }
@@ -35,9 +29,12 @@ export function buildRelationshipBuilderContext(ds, query, context) {
35
29
  if (joinByRelationship.has(relationshipName)) {
36
30
  continue;
37
31
  }
32
+ const measureNames = (query.measures ?? []).filter(name => name.startsWith(`${relationshipName}.`)).map(name => name.slice(relationshipName.length + 1));
33
+ const projected = measureNames.length ? relationshipMeasureSource(target, relationship.to, measureNames, dialect) : undefined;
38
34
  joinByRelationship.set(relationshipName, {
39
35
  relationship: relationshipName,
40
- source: target.source,
36
+ source: projected?.source ?? target.source,
37
+ matchMarker: projected?.marker,
41
38
  from: relationship.from,
42
39
  to: relationship.to,
43
40
  tenant: tenantPredicate && target.tenantKey
@@ -0,0 +1,14 @@
1
+ import type { AnyDatasetInstance } from '../types.js';
2
+ import type { RelationshipBuilderContext } from './relationship-builder-plan.js';
3
+ import type { DatasetSqlDialect } from '../dataset-sql-dialect.js';
4
+ /** Explicit projection avoids marker collisions and makes absent targets detectable under join_use_nulls=0. */
5
+ export declare function relationshipMeasureSource(target: AnyDatasetInstance, to: string, names: readonly string[], dialect: DatasetSqlDialect): {
6
+ source: string;
7
+ marker: string;
8
+ };
9
+ export declare function relationshipMeasureExpressions(ds: AnyDatasetInstance, name: string, joinCtx: RelationshipBuilderContext): {
10
+ definition: import("../types.js").MeasureDefinition;
11
+ field: string;
12
+ arg: string | undefined;
13
+ };
14
+ //# sourceMappingURL=relationship-measure-sql.d.ts.map
@@ -0,0 +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,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"}
@@ -0,0 +1,44 @@
1
+ import { resolveRelationshipMeasure } from './relationship-measures.js';
2
+ import { resolveDimensionExpression } from '../query-planner.js';
3
+ import { measureToAggregationSpec } from './dataset-normalization.js';
4
+ import { applyFilteredAggregationExpression } from './filtered-aggregation-sql.js';
5
+ /** Explicit projection avoids marker collisions and makes absent targets detectable under join_use_nulls=0. */
6
+ export function relationshipMeasureSource(target, to, names, dialect) {
7
+ const columns = new Set([to, ...(target.tenantKey ? [target.tenantKey] : [])]);
8
+ for (const [name, dimension] of Object.entries(target.dimensions))
9
+ if (!dimension.sql)
10
+ columns.add(dimension.column ?? name);
11
+ for (const name of names) {
12
+ const measure = target.measures[name];
13
+ if (measure.__type !== 'measure_definition')
14
+ continue;
15
+ for (const field of [measure.field, measure.argField, ...(measure.filters ?? []).map(filter => target.filters[filter.field]?.field ?? filter.field)]) {
16
+ if (field && field !== '*')
17
+ columns.add(target.dimensions[field]?.column ?? field);
18
+ }
19
+ }
20
+ let marker = '_hq_match';
21
+ while (columns.has(marker))
22
+ marker += '_';
23
+ const quote = dialect.quoteIdentifier;
24
+ const source = target.source.split('.').map(quote).join('.');
25
+ const projection = [...columns].map(quote);
26
+ return { source: `(SELECT ${[...projection, `toNullable(1) AS ${quote(marker)}`].join(', ')} FROM ${source})`, marker };
27
+ }
28
+ export function relationshipMeasureExpressions(ds, name, joinCtx) {
29
+ const resolved = resolveRelationshipMeasure(ds, name);
30
+ const { relationshipName, target, definition } = resolved;
31
+ const marker = joinCtx.joinByRelationship.get(relationshipName)?.matchMarker;
32
+ if (!marker)
33
+ throw new Error(`Missing match marker for relationship measure "${name}".`);
34
+ const ownerContext = { ...joinCtx, baseSource: relationshipName };
35
+ const spec = measureToAggregationSpec(name, definition);
36
+ const matched = `isNotNull(${relationshipName}.${marker})`;
37
+ const field = definition.field === '*' ? `${relationshipName}.${marker}` : resolveDimensionExpression(target, definition.field, ownerContext);
38
+ const filtered = applyFilteredAggregationExpression(target, spec, field, ownerContext);
39
+ return {
40
+ definition,
41
+ field: `if(${matched}, ${filtered}, NULL)`,
42
+ arg: definition.argField ? `if(${matched}, ${resolveDimensionExpression(target, definition.argField, ownerContext)}, NULL)` : undefined,
43
+ };
44
+ }
@@ -0,0 +1,36 @@
1
+ import type { DatasetInstance, MeasureDefinition, RelationshipDefinition } from '../types.js';
2
+ type SafeAggregation = 'countDistinct' | 'approxCountDistinct' | 'min' | 'max' | 'argMax' | 'argMin';
3
+ type SqlDimensions<TDimensions> = {
4
+ [K in keyof TDimensions & string]: TDimensions[K] extends {
5
+ sql: string;
6
+ } ? K : never;
7
+ }[keyof TDimensions & string];
8
+ /** Fixed filters use their owner's allowlist aliases before dimension resolution. */
9
+ type FixedFilterInputs<TMeasure, TFilters> = TMeasure extends {
10
+ filters: readonly (infer TFilter)[];
11
+ } ? TFilter extends {
12
+ field: infer TName extends string;
13
+ } ? TName extends keyof TFilters ? TFilters[TName] extends {
14
+ field: infer TField extends string;
15
+ } ? TField : TName : TName : never : never;
16
+ type SafeMeasureNames<TMeasures, TKind, TDimensions, TFilters> = {
17
+ [K in keyof TMeasures & string]: TMeasures[K] extends MeasureDefinition ? TMeasures[K] extends {
18
+ sql: string;
19
+ } ? never : TMeasures[K] extends {
20
+ field: infer F;
21
+ argField?: infer A;
22
+ } ? (Extract<F, SqlDimensions<TDimensions>> | Extract<A, SqlDimensions<TDimensions>> | Extract<FixedFilterInputs<TMeasures[K], TFilters>, SqlDimensions<TDimensions>>) extends never ? TKind extends 'hasOne' ? K : TMeasures[K] extends {
23
+ aggregation: SafeAggregation;
24
+ } ? K : never : never : never : never;
25
+ }[keyof TMeasures & string];
26
+ /** One-hop base aggregates whose cardinality is safe for the declared relationship. */
27
+ export type QueryableRelationshipMeasureNames<TRelationships> = {
28
+ [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;
29
+ }[keyof TRelationships & string];
30
+ export type RelationshipMeasureDefinition<TDataset, TName extends string> = TDataset extends {
31
+ relationships: infer TRelationships;
32
+ } ? TName extends `${infer R}.${infer M}` ? R extends keyof TRelationships ? TRelationships[R] extends RelationshipDefinition<infer TTarget> ? TTarget extends {
33
+ measures: infer TMeasures;
34
+ } ? M extends keyof TMeasures ? TMeasures[M] : never : never : never : never : never : never;
35
+ export {};
36
+ //# sourceMappingURL=relationship-measure-types.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"relationship-measure-types.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-measure-types.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,23 @@
1
+ import type { AnyDatasetInstance, MeasureDefinition, RelationshipDefinition } from '../types.js';
2
+ export interface ResolvedRelationshipMeasure {
3
+ relationshipName: string;
4
+ relationship: RelationshipDefinition;
5
+ target: AnyDatasetInstance;
6
+ definition: MeasureDefinition;
7
+ }
8
+ /** Resolve only the one-hop, duplicate-safe aggregate vocabulary of RFC 0015. */
9
+ export declare function resolveRelationshipMeasure(ds: AnyDatasetInstance, name: string): ResolvedRelationshipMeasure;
10
+ export declare function listRelationshipMeasures(name: string, relationship: RelationshipDefinition): Record<string, MeasureDefinition>;
11
+ /** Expand selected relationship aggregates for dependency graphs without changing author definitions. */
12
+ export declare function queryMeasureDefinitions(ds: AnyDatasetInstance, selected: readonly string[]): Record<string, import("../types.js").DatasetMeasureDefinition>;
13
+ /** Resolve a selected measure or a dimension reference while collecting joins. */
14
+ export declare function resolveRelationshipReference(ds: AnyDatasetInstance, name: string, measures?: readonly string[]): {
15
+ resolved: import("./relationship-fields.js").ResolvedQualifiedField;
16
+ error?: undefined;
17
+ } | {
18
+ resolved?: undefined;
19
+ error: string;
20
+ } | {
21
+ resolved: ResolvedRelationshipMeasure;
22
+ } | null;
23
+ //# sourceMappingURL=relationship-measures.d.ts.map