@hypequery/datasets 0.1.0 → 0.2.0

package/dist/in-memory-backend.js

@@ -0,0 +1,221 @@
+function valueForField(row, field) {
+    return row[field];
+}
+function compareFilter(actual, filter) {
+    switch (filter.operator) {
+        case 'eq':
+            return actual === filter.value;
+        case 'neq':
+            return actual !== filter.value;
+        case 'gt':
+            return Number(actual) > Number(filter.value);
+        case 'gte':
+            return Number(actual) >= Number(filter.value);
+        case 'lt':
+            return Number(actual) < Number(filter.value);
+        case 'lte':
+            return Number(actual) <= Number(filter.value);
+        case 'in':
+            return Array.isArray(filter.value) && filter.value.includes(actual);
+        case 'notIn':
+            return Array.isArray(filter.value) && !filter.value.includes(actual);
+        case 'between':
+            return Array.isArray(filter.value)
+                && filter.value.length === 2
+                && Number(actual) >= Number(filter.value[0])
+                && Number(actual) <= Number(filter.value[1]);
+        case 'like':
+            return typeof actual === 'string'
+                && typeof filter.value === 'string'
+                && actual.includes(filter.value.replaceAll('%', ''));
+        default:
+            return false;
+    }
+}
+function applyFilters(rows, filters) {
+    return rows.filter((row) => filters.every((filter) => compareFilter(valueForField(row, filter.field), filter)));
+}
+function applyTenant(rows, tenant) {
+    if (!tenant) {
+        return rows;
+    }
+    if (tenant.operator === 'in') {
+        return rows.filter((row) => tenant.value.includes(String(row[tenant.field])));
+    }
+    return rows.filter((row) => row[tenant.field] === tenant.value);
+}
+function periodForValue(value, grain) {
+    const date = new Date(String(value));
+    if (Number.isNaN(date.getTime())) {
+        return String(value);
+    }
+    if (grain.unit === 'year') {
+        return `${date.getUTCFullYear()}-01-01`;
+    }
+    if (grain.unit === 'quarter') {
+        const quarterStartMonth = Math.floor(date.getUTCMonth() / 3) * 3;
+        return new Date(Date.UTC(date.getUTCFullYear(), quarterStartMonth, 1)).toISOString().slice(0, 10);
+    }
+    if (grain.unit === 'month') {
+        return new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), 1)).toISOString().slice(0, 10);
+    }
+    if (grain.unit === 'week') {
+        const day = date.getUTCDay();
+        const weekStart = grain.weekStart ?? 1;
+        const diff = (day - weekStart + 7) % 7;
+        const start = new Date(Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate() - diff));
+        return start.toISOString().slice(0, 10);
+    }
+    return date.toISOString().slice(0, 10);
+}
+function groupKey(row, plan) {
+    const parts = plan.dimensions.map((dimension) => row[dimension.field]);
+    if (plan.grain) {
+        parts.unshift(periodForValue(row[plan.grain.field], plan.grain));
+    }
+    return JSON.stringify(parts);
+}
+function aggregateRows(rows, aggregation) {
+    const filteredRows = applyFilters(rows, aggregation.filters ?? []);
+    const values = filteredRows.map((row) => row[aggregation.field]);
+    switch (aggregation.aggregation) {
+        case 'sum':
+            return values.reduce((total, value) => total + Number(value ?? 0), 0);
+        case 'count':
+            return filteredRows.length;
+        case 'countDistinct':
+            return new Set(values).size;
+        case 'avg':
+            return values.length === 0
+                ? 0
+                : values.reduce((total, value) => total + Number(value ?? 0), 0) / values.length;
+        case 'min':
+            return Math.min(...values.map((value) => Number(value)));
+        case 'max':
+            return Math.max(...values.map((value) => Number(value)));
+        default:
+            return 0;
+    }
+}
+function evaluateExpression(expression, row) {
+    switch (expression.kind) {
+        case 'ref':
+            return row[expression.name];
+        case 'literal':
+            return expression.value;
+        case 'binary': {
+            const left = Number(evaluateExpression(expression.left, row));
+            const right = Number(evaluateExpression(expression.right, row));
+            if (expression.operator === 'add')
+                return left + right;
+            if (expression.operator === 'subtract')
+                return left - right;
+            if (expression.operator === 'multiply')
+                return left * right;
+            return right === 0 ? null : left / right;
+        }
+        case 'function': {
+            const [first, second] = expression.args.map((arg) => evaluateExpression(arg, row));
+            if (expression.name === 'nullIfZero')
+                return Number(first) === 0 ? null : first;
+            if (expression.name === 'coalesce')
+                return first == null ? second : first;
+            if (expression.name === 'round') {
+                const decimals = Number(second ?? 0);
+                const factor = 10 ** decimals;
+                return Math.round(Number(first) * factor) / factor;
+            }
+            if (expression.name === 'floor')
+                return Math.floor(Number(first));
+            return Math.ceil(Number(first));
+        }
+        default:
+            return undefined;
+    }
+}
+function compareRows(orderBy) {
+    return (a, b) => {
+        for (const order of orderBy) {
+            const av = a[order.field];
+            const bv = b[order.field];
+            if (av === bv)
+                continue;
+            const result = av > bv ? 1 : -1;
+            return order.direction === 'desc' ? -result : result;
+        }
+        return 0;
+    };
+}
+function applyOrderLimitOffset(rows, plan) {
+    let result = [...rows];
+    if (plan.orderBy?.length) {
+        result = result.sort(compareRows(plan.orderBy));
+    }
+    if (plan.offset != null) {
+        result = result.slice(plan.offset);
+    }
+    if (plan.limit != null) {
+        result = result.slice(0, plan.limit);
+    }
+    return result;
+}
+export function createInMemoryBackend(tables) {
+    function executeAggregate(plan) {
+        const table = tables[plan.source] ?? [];
+        const filteredRows = applyFilters(applyTenant(table, plan.tenant), plan.filters);
+        const groups = new Map();
+        for (const row of filteredRows) {
+            const key = groupKey(row, plan);
+            groups.set(key, [...(groups.get(key) ?? []), row]);
+        }
+        if (groups.size === 0 && plan.dimensions.length === 0 && !plan.grain) {
+            groups.set('[]', []);
+        }
+        const output = Array.from(groups.values()).map((rows) => {
+            const first = rows[0] ?? {};
+            const record = {};
+            if (plan.grain) {
+                record[plan.grain.output] = periodForValue(first[plan.grain.field], plan.grain);
+            }
+            for (const dimension of plan.dimensions) {
+                record[dimension.name] = first[dimension.field];
+            }
+            for (const aggregation of plan.aggregations) {
+                record[aggregation.name] = aggregateRows(rows, aggregation);
+            }
+            return record;
+        });
+        return applyOrderLimitOffset(output, plan);
+    }
+    async function execute(plan) {
+        const start = Date.now();
+        let data;
+        if (plan.kind === 'aggregate') {
+            data = executeAggregate(plan);
+        }
+        else {
+            const input = (await execute(plan.input)).data;
+            data = input.map((row) => {
+                const next = {};
+                if (plan.input.kind === 'aggregate') {
+                    if (plan.input.grain) {
+                        next[plan.input.grain.output] = row[plan.input.grain.output];
+                    }
+                    for (const dimension of plan.input.dimensions) {
+                        next[dimension.name] = row[dimension.name];
+                    }
+                }
+                for (const metric of plan.metrics) {
+                    next[metric.name] = evaluateExpression(metric.expression, row);
+                }
+                return next;
+            });
+            data = applyOrderLimitOffset(data, plan);
+        }
+        return {
+            data: data,
+            meta: { timingMs: Date.now() - start },
+        };
+    }
+    return { execute };
+}

package/dist/index.d.ts

@@ -6,13 +6,15 @@ export { sum, count, countDistinct, avg, min, max } from './aggregations.js';
 export { divide, multiply, subtract, add, nullIfZero, coalesce, round, floor, ceil, } from './formulas.js';
 export { eq, neq, gt, gte, lt, lte, inList, notInList, between, like, asc, desc, filter, order, } from './query-helpers.js';
 export { createDatasetRegistry } from './registry.js';
-export { MetricExecutor } from './executor.js';
-export type { MetricExecutorOptions } from './executor.js';
+export { createDatasetClient } from './executor.js';
+export type { DatasetClient, CreateDatasetClientOptions } from './executor.js';
+export { createInMemoryBackend } from './in-memory-backend.js';
+export type { InMemoryTable, InMemoryTables } from './in-memory-backend.js';
+export type { PlanNode, SemanticBackend, SemanticBackendResult, SemanticExpression, SemanticAggregationPlan, SemanticDimensionPlan, SemanticGrainPlan, } from './semantic-plan.js';
 export type { ValidationResult } from './validation.js';
 export { validateFilterValue, matchesFieldType } from './validation.js';
 export type { QueryBuilderLike, QueryBuilderFactoryLike } from './query-builder-protocol.js';
 export { validateSQLIdentifier, isSafeSQLIdentifier, quoteSQLIdentifier } from './sql-utils.js';
 export { GRAIN_FUNCTIONS } from './constants.js';
-export { resolveDimensionExpression, resolveFilterField, buildDimensionSelectionPlan, applyAggregationSpec, applyMeasureDefinition, appendOrderLimitOffset, resolveTenantFilterColumn, } from './query-planner.js';
-export type { FieldType, DimensionType, DimensionOptions, DimensionDefinition, MeasureOptions, MeasureDefinition, InferDimensionType, RelationshipKind, RelationshipDefinition, AggregationType, MeasureAggregation, AggregationSpec, FormulaExpr, DerivedMetricSpec, TimeGrain, MetricRef, GrainedMetricRef, MetricContract, MetricFilter, MetricOrderBy, MetricQuery, MetricResultMeta, MetricResult, MetricHandle, ExecutionContext, SemanticExecutionRuntime, SemanticTenantRuntime, SemanticFilterDefinition, SemanticFiltersDefinition, DatasetConfig, DatasetQueryConfig, DatasetQueryContract, DatasetQueryRef, DatasetLimits, DatasetInstance, BaseMetricConfig, DerivedMetricConfig, DatasetRegistryInstance, DatasetFieldNames, } from './types.js';
+export type { FieldType, DimensionType, DimensionOptions, DimensionDefinition, MeasureOptions, MeasureDefinition, InferDimensionType, RelationshipKind, RelationshipDefinition, AggregationType, MeasureAggregation, AggregationSpec, FormulaExpr, DerivedMetricSpec, TimeGrain, MetricRef, BaseMetricRef, DerivedMetricRef, GrainedMetricRef, MetricContract, MetricFilter, MetricOrderBy, MetricQuery, DatasetQuery, MetricResultMeta, MetricResult, DatasetQueryResult, MetricHandle, ExecutionContext, SemanticExecutionRuntime, SemanticTenantRuntime, SemanticFilterDefinition, SemanticFiltersDefinition, DatasetConfig, DatasetLimits, DatasetInstance, AnyDatasetInstance, BaseMetricConfig, DerivedMetricConfig, DatasetRegistryInstance, DatasetFieldNames, DatasetDimensionNames, DatasetMeasureNames, DatasetOrderableNames, DatasetQueryFor, DatasetRow, DatasetQueryResultFor, MetricQueryFor, MetricRow, MetricResultFor, } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAGhE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAG7E,OAAO,EACL,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAC/B,UAAU,EAAE,QAAQ,EACpB,KAAK,EAAE,KAAK,EAAE,IAAI,GACnB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EACzB,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAChC,GAAG,EAAE,IAAI,EACT,MAAM,EAAE,KAAK,GACd,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGtD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAG3D,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxE,YAAY,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAG7F,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGhG,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,EAClB,2BAA2B,EAC3B,oBAAoB,EACpB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAG5B,YAAY,EACV,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,wBAAwB,EACxB,yBAAyB,EACzB,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,eAAe,EACf,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,EACvB,iBAAiB,GAClB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAGhE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAG7E,OAAO,EACL,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAC/B,UAAU,EAAE,QAAQ,EACpB,KAAK,EAAE,KAAK,EAAE,IAAI,GACnB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EACzB,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAChC,GAAG,EAAE,IAAI,EACT,MAAM,EAAE,KAAK,GACd,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAGtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,aAAa,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC5E,YAAY,EACV,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,uBAAuB,EACvB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAG5B,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxE,YAAY,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAG7F,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGhG,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,YAAY,EACV,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,SAAS,EACT,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,aAAa,EACb,WAAW,EACX,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,wBAAwB,EACxB,yBAAyB,EACzB,aAAa,EACb,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,qBAAqB,EACrB,cAAc,EACd,SAAS,EACT,eAAe,GAChB,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -14,12 +14,11 @@ export { divide, multiply, subtract, add, nullIfZero, coalesce, round, floor, ce
 export { eq, neq, gt, gte, lt, lte, inList, notInList, between, like, asc, desc, filter, order, } from './query-helpers.js';
 // Registry
 export { createDatasetRegistry } from './registry.js';
-// Executor
-export { MetricExecutor } from './executor.js';
+// Dataset client
+export { createDatasetClient } from './executor.js';
+export { createInMemoryBackend } from './in-memory-backend.js';
 export { validateFilterValue, matchesFieldType } from './validation.js';
 // SQL utilities
 export { validateSQLIdentifier, isSafeSQLIdentifier, quoteSQLIdentifier } from './sql-utils.js';
 // Constants
 export { GRAIN_FUNCTIONS } from './constants.js';
-// Query planning helpers
-export { resolveDimensionExpression, resolveFilterField, buildDimensionSelectionPlan, applyAggregationSpec, applyMeasureDefinition, appendOrderLimitOffset, resolveTenantFilterColumn, } from './query-planner.js';

package/dist/internal.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Internal APIs for @hypequery/serve package only.
+ *
+ * These exports are NOT part of the public API and should not be used
+ * by end users. They are implementation details that the serve package
+ * needs to create endpoints.
+ *
+ * DO NOT import from this file in user code!
+ */
+export { createDatasetClient, DatasetClientImpl, MetricQueryEngine } from './executor.js';
+export type { DatasetClient, CreateDatasetClientOptions, MetricQueryEngineOptions } from './executor.js';
+export { createInMemoryBackend } from './in-memory-backend.js';
+export type { InMemoryTable, InMemoryTables } from './in-memory-backend.js';
+export type { PlanNode, SemanticBackend, SemanticBackendResult, SemanticExpression, SemanticAggregationPlan, SemanticDimensionPlan, SemanticGrainPlan, } from './semantic-plan.js';
+export type { QueryBuilderLike, QueryBuilderFactoryLike } from './query-builder-protocol.js';
+export type { ValidationResult } from './validation.js';
+export { validateFilterValue, matchesFieldType } from './validation.js';
+export { validateSQLIdentifier, isSafeSQLIdentifier, quoteSQLIdentifier } from './sql-utils.js';
+export { runDatasetQuery, buildDatasetQueryBuilder, validateDatasetQuery } from './dataset-query.js';
+export type { DatasetQueryExecutionOptions } from './dataset-query.js';
+export { GRAIN_FUNCTIONS } from './constants.js';
+export type { AnyDatasetInstance, DatasetQuery, DatasetQueryResult, } from './types.js';
+//# sourceMappingURL=internal.d.ts.map

package/dist/internal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../src/internal.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC1F,YAAY,EAAE,aAAa,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzG,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC5E,YAAY,EACV,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,uBAAuB,EACvB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAG5B,YAAY,EACV,gBAAgB,EAChB,uBAAuB,EACxB,MAAM,6BAA6B,CAAC;AAGrC,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxE,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACL,eAAe,EACf,wBAAwB,EACxB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAGvE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,YAAY,EACV,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,GACnB,MAAM,YAAY,CAAC"}

package/dist/internal.js

@@ -0,0 +1,19 @@
+/**
+ * Internal APIs for @hypequery/serve package only.
+ *
+ * These exports are NOT part of the public API and should not be used
+ * by end users. They are implementation details that the serve package
+ * needs to create endpoints.
+ *
+ * DO NOT import from this file in user code!
+ */
+// Dataset client internals - used by serve to create metric/dataset endpoints
+export { createDatasetClient, DatasetClientImpl, MetricQueryEngine } from './executor.js';
+export { createInMemoryBackend } from './in-memory-backend.js';
+export { validateFilterValue, matchesFieldType } from './validation.js';
+// SQL utilities - used by serve for SQL generation
+export { validateSQLIdentifier, isSafeSQLIdentifier, quoteSQLIdentifier } from './sql-utils.js';
+// Dataset query execution - used by serve for dataset endpoints
+export { runDatasetQuery, buildDatasetQueryBuilder, validateDatasetQuery } from './dataset-query.js';
+// Constants - used by serve
+export { GRAIN_FUNCTIONS } from './constants.js';

package/dist/measure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measure.d.ts","sourceRoot":"","sources":["../src/measure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAsB,MAAM,YAAY,CAAC;AAaxF,eAAO,MAAM,OAAO;0BAVH,MAAM,SAAS,cAAc,KAAG,iBAAiB;4BAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;oCAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;0BAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;0BAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;0BAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;CAiBxD,CAAC"}
+{"version":3,"file":"measure.d.ts","sourceRoot":"","sources":["../src/measure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAsB,MAAM,YAAY,CAAC;AAcxF,eAAO,MAAM,OAAO;0BAXH,MAAM,SAAS,cAAc,KAAG,iBAAiB;4BAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;oCAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;0BAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;0BAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;0BAAjD,MAAM,SAAS,cAAc,KAAG,iBAAiB;CAkBxD,CAAC"}

package/dist/measure.js

@@ -6,6 +6,7 @@ function createMeasureHelper(aggregation) {
         sql: opts?.sql,
         label: opts?.label,
         description: opts?.description,
+        filters: opts?.filters,
     });
 }
 export const measure = {

package/dist/query-builder-protocol.d.ts

@@ -2,7 +2,7 @@
  * Duck-typed protocol interfaces for query builders.
  *
  * These interfaces define the minimal contract that a query builder must satisfy
- * to work with the MetricExecutor. The @hypequery/clickhouse `createQueryBuilder`
+ * to work with the semantic dataset client. The @hypequery/clickhouse `createQueryBuilder`
  * return value satisfies `QueryBuilderFactoryLike` structurally — no explicit
  * `implements` is needed.
  *
@@ -26,7 +26,7 @@ export interface QueryBuilderLike {
         sql: string;
         parameters: unknown[];
     };
-    execute(): Promise<Record<string, unknown>[]>;
+    execute<T = Record<string, unknown>>(): Promise<T[]>;
 }
 /** A query builder factory (what `createQueryBuilder(config)` returns). */
 export interface QueryBuilderFactoryLike {

package/dist/query-builder-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder-protocol.d.ts","sourceRoot":"","sources":["../src/query-builder-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,wEAAwE;AACxE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,gBAAgB,CAAC;IAGrD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACxD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IAChE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IAGtD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAAC;IAG1E,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,gBAAgB,CAAC;IAGtD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,gBAAgB,CAAC;IACtE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACvC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAAC;IAGxC,eAAe,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,EAAE,CAAA;KAAE,CAAC;IAC1D,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;CAC/C;AAED,2EAA2E;AAC3E,MAAM,WAAW,uBAAuB;IACtC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtC,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;CACtF"}
+{"version":3,"file":"query-builder-protocol.d.ts","sourceRoot":"","sources":["../src/query-builder-protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,wEAAwE;AACxE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,gBAAgB,CAAC;IAGrD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACxD,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IAChE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;IAGtD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,gBAAgB,CAAC;IAG1E,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,gBAAgB,CAAC;IAGtD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,gBAAgB,CAAC;IACtE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACvC,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAAC;IAGxC,eAAe,IAAI;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,EAAE,CAAA;KAAE,CAAC;IAC1D,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;CACtD;AAED,2EAA2E;AAC3E,MAAM,WAAW,uBAAuB;IACtC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAC;IACtC,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;CACtF"}

package/dist/query-builder-protocol.js

@@ -2,7 +2,7 @@
  * Duck-typed protocol interfaces for query builders.
  *
  * These interfaces define the minimal contract that a query builder must satisfy
- * to work with the MetricExecutor. The @hypequery/clickhouse `createQueryBuilder`
+ * to work with the semantic dataset client. The @hypequery/clickhouse `createQueryBuilder`
  * return value satisfies `QueryBuilderFactoryLike` structurally — no explicit
  * `implements` is needed.
  *

package/dist/query-helpers.d.ts

@@ -1,16 +1,16 @@
 import type { MetricFilter, MetricOrderBy } from './types.js';
-export declare function eq<TField extends string>(field: TField, value: unknown): MetricFilter;
-export declare function neq<TField extends string>(field: TField, value: unknown): MetricFilter;
-export declare function gt<TField extends string>(field: TField, value: unknown): MetricFilter;
-export declare function gte<TField extends string>(field: TField, value: unknown): MetricFilter;
-export declare function lt<TField extends string>(field: TField, value: unknown): MetricFilter;
-export declare function lte<TField extends string>(field: TField, value: unknown): MetricFilter;
-export declare function inList<TField extends string>(field: TField, value: unknown[]): MetricFilter;
-export declare function notInList<TField extends string>(field: TField, value: unknown[]): MetricFilter;
-export declare function between<TField extends string>(field: TField, lower: unknown, upper: unknown): MetricFilter;
-export declare function like<TField extends string>(field: TField, value: string): MetricFilter;
-export declare function asc<TField extends string>(field: TField): MetricOrderBy;
-export declare function desc<TField extends string>(field: TField): MetricOrderBy;
+export declare function eq<const TField extends string, const TValue>(field: TField, value: TValue): MetricFilter<TField, TValue>;
+export declare function neq<const TField extends string, const TValue>(field: TField, value: TValue): MetricFilter<TField, TValue>;
+export declare function gt<const TField extends string, const TValue>(field: TField, value: TValue): MetricFilter<TField, TValue>;
+export declare function gte<const TField extends string, const TValue>(field: TField, value: TValue): MetricFilter<TField, TValue>;
+export declare function lt<const TField extends string, const TValue>(field: TField, value: TValue): MetricFilter<TField, TValue>;
+export declare function lte<const TField extends string, const TValue>(field: TField, value: TValue): MetricFilter<TField, TValue>;
+export declare function inList<const TField extends string, const TValue>(field: TField, value: TValue[]): MetricFilter<TField, TValue[]>;
+export declare function notInList<const TField extends string, const TValue>(field: TField, value: TValue[]): MetricFilter<TField, TValue[]>;
+export declare function between<const TField extends string, const TLower, const TUpper>(field: TField, lower: TLower, upper: TUpper): MetricFilter<TField, [TLower, TUpper]>;
+export declare function like<const TField extends string>(field: TField, value: string): MetricFilter<TField, string>;
+export declare function asc<const TField extends string>(field: TField): MetricOrderBy<TField>;
+export declare function desc<const TField extends string>(field: TField): MetricOrderBy<TField>;
 export declare const filter: {
     readonly eq: typeof eq;
     readonly neq: typeof neq;

package/dist/query-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-helpers.d.ts","sourceRoot":"","sources":["../src/query-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAU9D,wBAAgB,EAAE,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CAErF;AAED,wBAAgB,GAAG,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CAEtF;AAED,wBAAgB,EAAE,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CAErF;AAED,wBAAgB,GAAG,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CAEtF;AAED,wBAAgB,EAAE,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CAErF;AAED,wBAAgB,GAAG,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CAEtF;AAED,wBAAgB,MAAM,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,YAAY,CAE3F;AAED,wBAAgB,SAAS,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,YAAY,CAE9F;AAED,wBAAgB,OAAO,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CAE1G;AAED,wBAAgB,IAAI,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAEtF;AAED,wBAAgB,GAAG,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAEvE;AAED,wBAAgB,IAAI,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAExE;AAED,eAAO,MAAM,MAAM;;;;;;;;;;;CAWT,CAAC;AAEX,eAAO,MAAM,KAAK;;;CAGR,CAAC"}
+{"version":3,"file":"query-helpers.d.ts","sourceRoot":"","sources":["../src/query-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAU9D,wBAAgB,EAAE,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAExH;AAED,wBAAgB,GAAG,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAEzH;AAED,wBAAgB,EAAE,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAExH;AAED,wBAAgB,GAAG,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAEzH;AAED,wBAAgB,EAAE,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAExH;AAED,wBAAgB,GAAG,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAEzH;AAED,wBAAgB,MAAM,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAEhI;AAED,wBAAgB,SAAS,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAEnI;AAED,wBAAgB,OAAO,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAEpK;AAED,wBAAgB,IAAI,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAE5G;AAED,wBAAgB,GAAG,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAErF;AAED,wBAAgB,IAAI,CAAC,KAAK,CAAC,MAAM,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAEtF;AAED,eAAO,MAAM,MAAM;;;;;;;;;;;CAWT,CAAC;AAEX,eAAO,MAAM,KAAK;;;CAGR,CAAC"}

package/dist/query-planner.d.ts

@@ -1,13 +1,15 @@
-import type { AggregationSpec, DatasetInstance, ExecutionContext, MeasureDefinition, MetricOrderBy, TimeGrain } from "./types.js";
+import type { AggregationSpec, AnyDatasetInstance, ExecutionContext, MeasureDefinition, MetricOrderBy, TimeGrain } from "./types.js";
 import type { QueryBuilderLike } from "./query-builder-protocol.js";
-export declare function resolveDimensionExpression(ds: DatasetInstance, dimensionName: string): string;
-export declare function resolveFilterField(ds: DatasetInstance, filterField: string): string;
-export declare function buildDimensionSelectionPlan(ds: DatasetInstance, dimensions: string[], grain: TimeGrain | undefined): {
+type DatasetShape = AnyDatasetInstance;
+export declare function resolveDimensionExpression(ds: DatasetShape, dimensionName: string): string;
+export declare function resolveFilterField(ds: DatasetShape, filterField: string): string;
+export declare function buildDimensionSelectionPlan(ds: DatasetShape, dimensions: string[], grain: TimeGrain | undefined): {
     selectParts: string[];
     groupByParts: string[];
 };
-export declare function applyAggregationSpec(qb: QueryBuilderLike, ds: DatasetInstance, spec: AggregationSpec, alias: string): QueryBuilderLike;
-export declare function applyMeasureDefinition(qb: QueryBuilderLike, ds: DatasetInstance, name: string, definition: MeasureDefinition): QueryBuilderLike;
+export declare function applyAggregationSpec(qb: QueryBuilderLike, ds: DatasetShape, spec: AggregationSpec, alias: string): QueryBuilderLike;
+export declare function applyMeasureDefinition(qb: QueryBuilderLike, ds: DatasetShape, name: string, definition: MeasureDefinition): QueryBuilderLike;
 export declare function appendOrderLimitOffset(qb: QueryBuilderLike, orderBy: MetricOrderBy[] | undefined, grain: TimeGrain | undefined, limit?: number, offset?: number): QueryBuilderLike;
-export declare function resolveTenantFilterColumn(_ds: DatasetInstance, context?: ExecutionContext): string | undefined;
+export declare function resolveTenantFilterColumn(ds: DatasetShape, context?: ExecutionContext): string | undefined;
+export {};
 //# sourceMappingURL=query-planner.d.ts.map

package/dist/query-planner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-planner.d.ts","sourceRoot":"","sources":["../src/query-planner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,SAAS,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAGpE,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,eAAe,EACnB,aAAa,EAAE,MAAM,GACpB,MAAM,CAGR;AAED,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,eAAe,EACnB,WAAW,EAAE,MAAM,GAClB,MAAM,CAGR;AAED,wBAAgB,2BAA2B,CACzC,EAAE,EAAE,eAAe,EACnB,UAAU,EAAE,MAAM,EAAE,EACpB,KAAK,EAAE,SAAS,GAAG,SAAS,GAC3B;IAAE,WAAW,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAAE,CAqBnD;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,gBAAgB,EACpB,EAAE,EAAE,eAAe,EACnB,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,MAAM,GACZ,gBAAgB,CAmBlB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,gBAAgB,EACpB,EAAE,EAAE,eAAe,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,iBAAiB,GAC5B,gBAAgB,CAmBlB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,aAAa,EAAE,GAAG,SAAS,EACpC,KAAK,EAAE,SAAS,GAAG,SAAS,EAC5B,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,gBAAgB,CAiBlB;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,eAAe,EACpB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,GAAG,SAAS,CAEpB"}
+{"version":3,"file":"query-planner.d.ts","sourceRoot":"","sources":["../src/query-planner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,SAAS,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAKpE,KAAK,YAAY,GAAG,kBAAkB,CAAC;AAMvC,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,YAAY,EAChB,aAAa,EAAE,MAAM,GACpB,MAAM,CAGR;AAED,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,YAAY,EAChB,WAAW,EAAE,MAAM,GAClB,MAAM,CAGR;AAED,wBAAgB,2BAA2B,CACzC,EAAE,EAAE,YAAY,EAChB,UAAU,EAAE,MAAM,EAAE,EACpB,KAAK,EAAE,SAAS,GAAG,SAAS,GAC3B;IAAE,WAAW,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAAE,CAwBnD;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,gBAAgB,EACpB,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,eAAe,EACrB,KAAK,EAAE,MAAM,GACZ,gBAAgB,CAuBlB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,gBAAgB,EACpB,EAAE,EAAE,YAAY,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,iBAAiB,GAC5B,gBAAgB,CA6BlB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,aAAa,EAAE,GAAG,SAAS,EACpC,KAAK,EAAE,SAAS,GAAG,SAAS,EAC5B,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,GACd,gBAAgB,CAiBlB;AAED,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,YAAY,EAChB,OAAO,CAAC,EAAE,gBAAgB,GACzB,MAAM,GAAG,SAAS,CAMpB"}

package/dist/query-planner.js

@@ -1,4 +1,9 @@
 import { GRAIN_FUNCTIONS } from "./constants.js";
+import { applyFilteredAggregationExpression } from './utils/filtered-aggregation-sql.js';
+import { getRuntimeTenantPredicate } from './utils/tenant-runtime.js';
+function toOrderDirection(direction) {
+    return direction === 'asc' ? 'ASC' : 'DESC';
+}
 export function resolveDimensionExpression(ds, dimensionName) {
     const definition = ds.dimensions[dimensionName];
     return definition?.sql ?? definition?.column ?? dimensionName;
@@ -9,11 +14,14 @@ export function resolveFilterField(ds, filterField) {
 }
 export function buildDimensionSelectionPlan(ds, dimensions, grain) {
     const selectParts = [];
-    const groupByParts = [];
+    const groupByParts = new Set();
     if (grain) {
         const fn = GRAIN_FUNCTIONS[grain];
+        if (!fn) {
+            throw new Error(`Unsupported time grain "${grain}".`);
+        }
         selectParts.push(`${fn}(${ds.timeKey}) AS period`);
-        groupByParts.push("period");
+        groupByParts.add("period");
     }
     for (const dimensionName of dimensions) {
         const expression = resolveDimensionExpression(ds, dimensionName);
@@ -23,12 +31,12 @@ export function buildDimensionSelectionPlan(ds, dimensions, grain) {
         else {
             selectParts.push(`${expression} AS ${dimensionName}`);
         }
-        groupByParts.push(dimensionName);
+        groupByParts.add(dimensionName);
     }
-    return { selectParts, groupByParts };
+    return { selectParts, groupByParts: Array.from(groupByParts) };
 }
 export function applyAggregationSpec(qb, ds, spec, alias) {
-    const fieldOrExpr = resolveDimensionExpression(ds, spec.field);
+    const fieldOrExpr = applyFilteredAggregationExpression(ds, spec, spec.sql ?? resolveDimensionExpression(ds, spec.field));
     switch (spec.aggregation) {
         case "sum":
             return qb.sum(fieldOrExpr, alias);
@@ -47,7 +55,13 @@ export function applyAggregationSpec(qb, ds, spec, alias) {
     }
 }
 export function applyMeasureDefinition(qb, ds, name, definition) {
-    const fieldOrExpr = definition.sql ?? resolveDimensionExpression(ds, definition.field);
+    const baseFieldOrExpr = definition.sql ?? resolveDimensionExpression(ds, definition.field);
+    const fieldOrExpr = applyFilteredAggregationExpression(ds, {
+        __type: 'aggregation_spec',
+        aggregation: definition.aggregation,
+        field: definition.field,
+        filters: definition.filters,
+    }, baseFieldOrExpr);
     switch (definition.aggregation) {
         case "sum":
             return qb.sum(fieldOrExpr, name);
@@ -68,7 +82,7 @@ export function applyMeasureDefinition(qb, ds, name, definition) {
 export function appendOrderLimitOffset(qb, orderBy, grain, limit, offset) {
     if (orderBy && orderBy.length > 0) {
         for (const order of orderBy) {
-            qb = qb.orderBy(order.field, order.direction.toUpperCase());
+            qb = qb.orderBy(order.field, toOrderDirection(order.direction));
         }
     }
     else if (grain) {
@@ -82,6 +96,9 @@ export function appendOrderLimitOffset(qb, orderBy, grain, limit, offset) {
     }
     return qb;
 }
-export function resolveTenantFilterColumn(_ds, context) {
-    return context?.runtime?.tenant?.column;
+export function resolveTenantFilterColumn(ds, context) {
+    if (!getRuntimeTenantPredicate(context)) {
+        return undefined;
+    }
+    return ds.tenantKey;
 }

package/dist/registry.d.ts

@@ -1,7 +1,7 @@
 /**
  * DatasetRegistry — runtime registry of defined datasets.
  *
- * Used by MetricExecutor and serve() to discover datasets at startup.
+ * Used by serve() and semantic clients to discover datasets at startup.
  */
 import type { DatasetRegistryInstance } from './types.js';
 export declare function createDatasetRegistry(): DatasetRegistryInstance;

package/dist/registry.js

@@ -1,7 +1,7 @@
 /**
  * DatasetRegistry — runtime registry of defined datasets.
  *
- * Used by MetricExecutor and serve() to discover datasets at startup.
+ * Used by serve() and semantic clients to discover datasets at startup.
  */
 export function createDatasetRegistry() {
     const datasets = new Map();

package/dist/relationships.d.ts

@@ -2,7 +2,7 @@
  * Relationship helpers for dataset definitions.
  *
  * These helpers currently define semantic model metadata only. The shipped
- * executor does not yet resolve relationship paths into joined dataset queries
+ * semantic client does not yet resolve relationship paths into joined dataset queries
  * or cross-dataset metrics.
  *
  * @example

package/dist/relationships.js

@@ -2,7 +2,7 @@
  * Relationship helpers for dataset definitions.
  *
  * These helpers currently define semantic model metadata only. The shipped
- * executor does not yet resolve relationship paths into joined dataset queries
+ * semantic client does not yet resolve relationship paths into joined dataset queries
  * or cross-dataset metrics.
  *
  * @example