@hypequery/datasets 0.28.0 → 0.29.0

package/dist/semantic-query-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"semantic-query-schema.d.ts","sourceRoot":"","sources":["../src/semantic-query-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"semantic-query-schema.d.ts","sourceRoot":"","sources":["../src/semantic-query-schema.ts"],"names":[],"mappings":"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"}

package/dist/semantic-query-schema.js

@@ -8,6 +8,7 @@ import { zodToProtocolSchema } from './protocol-schema-adapter.js';
 import { compareStrings, stableStringify, uniqueSorted } from './utils/canonical-json.js';
 import { zodToDraft7JsonSchema } from './utils/zod-json-schema.js';
 import { datasetTimeKeys } from './utils/dataset-time-keys.js';
+import { effectiveFilters } from './utils/effective-filters.js';
 export const DEFAULT_SEMANTIC_QUERY_SCHEMA_LIMITS = Object.freeze({
     maxResultSize: 10_000,
     maxOffset: 10_000,
@@ -24,6 +25,11 @@ function resolveCatalog(source) {
         ? source
         : getDatasetCatalog(source);
 }
+function localFilterPolicy(source) {
+    return isDatasetCatalog(source)
+        ? effectiveFilters(source)
+        : effectiveFilters(source);
+}
 function relationshipFilterPolicy(source) {
     const fields = new Map();
     // A serialized catalog has no target filter allowlist. Do not infer one
@@ -34,8 +40,9 @@ function relationshipFilterPolicy(source) {
         if (relationship.kind === 'hasMany')
             continue;
         const target = relationship.target();
+        const filters = effectiveFilters(target);
         for (const [field, dimension] of Object.entries(target.dimensions)) {
-            const definition = target.filters[field];
+            const definition = filters[field];
             if (!dimension.sql && definition?.field === field) {
                 fields.set(`${name}.${field}`, definition.operators
                     ? [...definition.operators]
@@ -59,13 +66,13 @@ function boundedArray(item, maximum) {
     const array = z.array(item);
     return (maximum === undefined ? array : array.max(maximum)).optional();
 }
-function filterSchema(catalog, fields, relationshipOperators) {
+function filterSchema(localFilters, fields, relationshipOperators) {
     const filterValue = z.unknown().refine(value => value !== undefined, 'Required');
     // A null check takes no value (RFC 0023), so it gets its own value-free shape.
     const variants = uniqueSorted(fields).flatMap((field) => {
         const operators = relationshipOperators.has(field)
             ? relationshipOperators.get(field) ?? []
-            : catalog.filters[field]?.operators ?? [...SEMANTIC_FILTER_OPERATORS];
+            : localFilters[field]?.operators ?? [...SEMANTIC_FILTER_OPERATORS];
         const valueOperators = operators.filter(operator => !isNullCheckFilterOperator(operator));
         const nullChecks = operators.filter(isNullCheckFilterOperator);
         return [
@@ -105,7 +112,7 @@ function havingSchema(measures, maximum) {
     return conditions.describe('Conditions on aggregated measure values, applied after grouping (SQL HAVING). '
         + 'Each condition must name a measure selected in this query.');
 }
-function queryShape(catalog, metricName, options, relationshipOperators, metric, localRelationshipFields = []) {
+function queryShape(catalog, metricName, options, relationshipOperators, localFilters = effectiveFilters(catalog), metric, localRelationshipFields = []) {
     const limits = { ...DEFAULT_SEMANTIC_QUERY_SCHEMA_LIMITS, ...options };
     const relationshipFields = getQueryableRelationshipFields(catalog);
     const filterableRelationshipFields = [...relationshipOperators.keys()];
@@ -129,16 +136,17 @@ function queryShape(catalog, metricName, options, relationshipOperators, metric,
             ...Object.keys(catalog.dimensions).filter(isGroupable),
             ...relationshipFields.filter(isGroupable),
         ]);
-    const declaredFilters = Object.keys(catalog.filters);
-    const declaredFilterSet = new Set(declaredFilters);
+    const localFilterNames = Object.keys(localFilters);
+    const localFilterSet = new Set(localFilterNames);
+    // A metric's own filter list stays authoritative: a hosted catalog may narrow it.
     const filterFields = metric
         ? uniqueSorted([
             ...metric.filters.filter(field => field.includes('.')
                 ? filterableRelationshipSet.has(field)
-                : declaredFilterSet.has(field)),
+                : localFilterSet.has(field)),
             ...localRelationshipFields.filter(field => filterableRelationshipSet.has(field)),
         ])
-        : uniqueSorted([...declaredFilters, ...filterableRelationshipFields]);
+        : uniqueSorted([...localFilterNames, ...filterableRelationshipFields]);
     const grains = metric
         ? metric.grain ? [metric.grain] : metric.grains
         : catalog.supportedGrains;
@@ -170,7 +178,7 @@ function queryShape(catalog, metricName, options, relationshipOperators, metric,
         ...(metricName ? {} : {
             measures: boundedArray(fieldEnum(selectableMeasures), lowerLimit(catalog.limits?.maxMeasures, limits.maxMeasures)),
         }),
-        filters: boundedArray(filterSchema(catalog, filterFields, relationshipOperators), lowerLimit(catalog.limits?.maxFilters, limits.maxFilters)),
+        filters: boundedArray(filterSchema(localFilters, filterFields, relationshipOperators), lowerLimit(catalog.limits?.maxFilters, limits.maxFilters)),
         // Opt-in, so existing schemas and manifest hashes are unchanged and a
         // surface only advertises conditions its executor can run.
         ...(!metricName && options.having ? {
@@ -202,7 +210,7 @@ function queryShape(catalog, metricName, options, relationshipOperators, metric,
     };
 }
 export function buildDatasetInputSchema(dataset, options = {}) {
-    const schema = z.object(queryShape(resolveCatalog(dataset), undefined, options, relationshipFilterPolicy(dataset))).strict();
+    const schema = z.object(queryShape(resolveCatalog(dataset), undefined, options, relationshipFilterPolicy(dataset), localFilterPolicy(dataset))).strict();
     if (options.requireSelection === false)
         return schema;
     return requireSelection(schema);
@@ -213,7 +221,7 @@ export function buildMetricInputSchema(dataset, metricName, options = {}, metric
     const localRelationshipFields = isDatasetCatalog(dataset)
         ? []
         : getQueryableRelationshipFields(catalog);
-    return z.object(queryShape(catalog, metricName, options, relationshipFilterPolicy(dataset), metric, localRelationshipFields)).strict();
+    return z.object(queryShape(catalog, metricName, options, relationshipFilterPolicy(dataset), localFilterPolicy(dataset), metric, localRelationshipFields)).strict();
 }
 function unionSchemas(schemas, emptyShape) {
     if (schemas.length === 0)

package/dist/utils/dataset-filter-types.d.ts

@@ -1,14 +1,39 @@
 import type { DatasetInstance, DimensionDefinition, MetricFilter, MetricFilterOperator, MetricValueFilterOperator, RelationshipDefinition, SemanticFilterDefinition, SemanticFiltersDefinition } from '../types.js';
+type GeneratedFilter<K extends string> = Omit<SemanticFilterDefinition, 'operators'> & {
+    field: K;
+    /** Generated filters list no operators, so they admit no null checks (RFC 0023). */
+    operators?: undefined;
+};
 /** The generated allowlist mirrors normalizeFilters; explicit maps replace it. */
 export type NormalizedDatasetFilters<TDimensions extends Record<string, DimensionDefinition>, TFilters extends SemanticFiltersDefinition | undefined> = TFilters extends SemanticFiltersDefinition ? TFilters : {
     [K in keyof TDimensions as TDimensions[K] extends {
         filterable: false;
-    } ? never : K]: Omit<SemanticFilterDefinition, 'operators'> & {
-        field: K & string;
-        /** Generated filters list no operators, so they admit no null checks (RFC 0023). */
-        operators?: undefined;
-    };
+    } ? never : K]: GeneratedFilter<K & string>;
+};
+/** The declared filters whose field is `K`. */
+type DeclaredFiltersOn<TFilters extends SemanticFiltersDefinition, K> = {
+    [F in keyof TFilters]: TFilters[F] extends {
+        field: K;
+    } ? TFilters[F] : never;
+}[keyof TFilters];
+type DimensionFilter<K extends string, TDeclared> = [TDeclared] extends [never] ? GeneratedFilter<K> : [Exclude<TDeclared, {
+    operators: readonly unknown[];
+}>] extends [never] ? Omit<SemanticFilterDefinition, 'field' | 'operators'> & {
+    field: K;
+    operators: TDeclared extends {
+        operators: infer TOperators;
+    } ? TOperators : never;
+} : GeneratedFilter<K>;
+/**
+ * The filters a caller may apply, mirroring effectiveFilters: the declared
+ * filters plus one per filterable dimension no declared filter is named after.
+ */
+export type EffectiveDatasetFilters<TDimensions extends Record<string, DimensionDefinition>, TFilters extends SemanticFiltersDefinition> = TFilters & {
+    [K in keyof TDimensions as K extends keyof TFilters ? never : TDimensions[K] extends {
+        filterable: false;
+    } ? never : K]: DimensionFilter<K & string, DeclaredFiltersOn<TFilters, K>>;
 };
+type FiltersOf<TDataset extends DatasetInstance<any, any, any, any>> = EffectiveDatasetFilters<TDataset['dimensions'], TDataset['filters']>;
 type FilterOperators<TDefinition> = TDefinition extends {
     operators: readonly (infer TOperator extends MetricFilterOperator)[];
 } ? TOperator : TDefinition extends {
@@ -19,14 +44,14 @@ type LocalFilterFor<TFilters extends SemanticFiltersDefinition> = {
 }[keyof TFilters & string];
 type RelationshipFilterFor<TRelationships extends Record<string, RelationshipDefinition>> = {
     [R in keyof TRelationships & string]: TRelationships[R] extends RelationshipDefinition<infer TTarget, infer TKind> ? TKind extends 'hasMany' ? never : TTarget extends DatasetInstance<any, any, any, any> ? {
-        [K in keyof TTarget['filters'] & keyof TTarget['dimensions'] & string]: TTarget['dimensions'][K] extends {
+        [K in keyof FiltersOf<TTarget> & keyof TTarget['dimensions'] & string]: TTarget['dimensions'][K] extends {
             sql: string;
-        } ? never : K extends TTarget['filters'][K]['field'] ? MetricFilter<`${R}.${K}`, unknown, FilterOperators<TTarget['filters'][K]>> : never;
-    }[keyof TTarget['filters'] & keyof TTarget['dimensions'] & string] : never : never;
+        } ? never : K extends FiltersOf<TTarget>[K]['field'] ? MetricFilter<`${R}.${K}`, unknown, FilterOperators<FiltersOf<TTarget>[K]>> : never;
+    }[keyof FiltersOf<TTarget> & keyof TTarget['dimensions'] & string] : never : never;
 }[keyof TRelationships & string];
 /** Filter names and operator policies exposed by a dataset and its to-one targets. */
-export type DatasetFilterFor<TDataset extends DatasetInstance<any, any, any, any>> = LocalFilterFor<TDataset['filters']> | RelationshipFilterFor<TDataset['relationships']>;
-/** Names in the normalized filter allowlist, including one-hop relationship filters. */
+export type DatasetFilterFor<TDataset extends DatasetInstance<any, any, any, any>> = LocalFilterFor<FiltersOf<TDataset>> | RelationshipFilterFor<TDataset['relationships']>;
+/** Names a caller may filter on, including one-hop relationship filters. */
 export type DatasetFilterNames<TDataset extends DatasetInstance<any, any, any, any>> = DatasetFilterFor<TDataset>['field'];
 export {};
 //# sourceMappingURL=dataset-filter-types.d.ts.map

package/dist/utils/dataset-filter-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataset-filter-types.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-filter-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACtB,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAErB,kFAAkF;AAClF,MAAM,MAAM,wBAAwB,CAClC,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,EACvD,QAAQ,SAAS,yBAAyB,GAAG,SAAS,IACpD,QAAQ,SAAS,yBAAyB,GAAG,QAAQ,GAAG;KACzD,CAAC,IAAI,MAAM,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,SAAS;QAAE,UAAU,EAAE,KAAK,CAAA;KAAE,GAAG,KAAK,GAAG,CAAC,GACjF,IAAI,CAAC,wBAAwB,EAAE,WAAW,CAAC,GAAG;QAC5C,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC;QAClB,oFAAoF;QACpF,SAAS,CAAC,EAAE,SAAS,CAAC;KACvB;CACJ,CAAC;AAKF,KAAK,eAAe,CAAC,WAAW,IAAI,WAAW,SAAS;IACtD,SAAS,EAAE,SAAS,CAAC,MAAM,SAAS,SAAS,oBAAoB,CAAC,EAAE,CAAC;CACtE,GAAG,SAAS,GACT,WAAW,SAAS;IAAE,SAAS,CAAC,EAAE,MAAM,KAAK,CAAA;CAAE,GAC7C,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,yBAAyB,GAAG,oBAAoB,GAEvF,yBAAyB,CAAC;AAEhC,KAAK,cAAc,CAAC,QAAQ,SAAS,yBAAyB,IAAI;KAC/D,CAAC,IAAI,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,SAAS,GAAG,MAAM,IAAI,MAAM,EAAE,GAC3D,KAAK,GACL,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;CAC3D,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC;AAE3B,KAAK,qBAAqB,CAAC,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACzF,CAAC,IAAI,MAAM,cAAc,GAAG,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,SAAS,sBAAsB,CAAC,MAAM,OAAO,EAAE,MAAM,KAAK,CAAC,GAC9G,KAAK,SAAS,SAAS,GAAG,KAAK,GAC7B,OAAO,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GACjD;SACC,CAAC,IAAI,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,MAAM,GACnE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,GAAG,KAAK,GACpD,CAAC,SAAS,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GACtC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC1E,KAAK;KACd,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,GAChE,KAAK,GACT,KAAK;CACV,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC;AAEjC,sFAAsF;AACtF,MAAM,MAAM,gBAAgB,CAAC,QAAQ,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAC7E,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,GACnC,qBAAqB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;AAErD,wFAAwF;AACxF,MAAM,MAAM,kBAAkB,CAAC,QAAQ,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IACjF,gBAAgB,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"dataset-filter-types.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-filter-types.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"dataset-query-validation.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-query-validation.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAsB9E,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAqLlB"}
+{"version":3,"file":"dataset-query-validation.d.ts","sourceRoot":"","sources":["../../src/utils/dataset-query-validation.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,gBAAgB,EACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAuB9E,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAsLlB"}

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

@@ -15,6 +15,7 @@ import { enforcedConstraintErrors } from './enforced-constraints.js';
 import { analyzeTimeMeasureAxis } from './time-measure-axis.js';
 import { datasetHavingErrors } from './dataset-having.js';
 import { datasetOnTimeKey, selectedTimeKeyError } from './dataset-time-keys.js';
+import { effectiveFilters } from './effective-filters.js';
 export function validateDatasetQueryInput(dataset, query, context) {
     // Validate against the selected time axis, so grain and window checks see it.
     const timeKeyError = selectedTimeKeyError(dataset, query.timeKey);
@@ -33,7 +34,8 @@ export function validateDatasetQueryInput(dataset, query, context) {
             errors.push(`Output "${name}" cannot be selected as both a dimension and a measure. Select one or give the definitions distinct names.`);
         }
     }
-    const filterNames = Object.keys(ds.filters);
+    const filters = effectiveFilters(ds);
+    const filterNames = Object.keys(filters);
     const orderableFields = new Set([
         ...selectedDimensions,
         ...selectedMeasures,
@@ -100,12 +102,12 @@ export function validateDatasetQueryInput(dataset, query, context) {
                 errors.push(`Unknown filter fields: ${filter.field}. Available: ${filterNames.join(', ')}`);
                 continue;
             }
-            const filterDefinition = ds.filters[filter.field];
+            const filterDefinition = filters[filter.field];
             if (!filterAllowsOperator(filterDefinition, filter.operator)) {
                 errors.push(`Filter "${filter.field}" does not allow operator "${filter.operator}". Allowed: ${(filterDefinition?.operators ?? SEMANTIC_FILTER_OPERATORS).join(', ')}`);
                 continue;
             }
-            const resolvedField = ds.filters[filter.field]?.field ?? filter.field;
+            const resolvedField = filterDefinition.field;
             const resolvedDimension = ds.dimensions[resolvedField];
             const resolvedColumn = resolvedDimension?.sql
                 ? undefined

package/dist/utils/effective-filters.d.ts

@@ -0,0 +1,27 @@
+import type { SemanticFilterDefinition } from '../types.js';
+/** The parts of a filter definition that decide what a caller may filter on. */
+export interface FilterPolicy {
+    readonly field: string;
+    readonly operators?: readonly string[];
+}
+interface FilterPolicySource<TFilter extends FilterPolicy> {
+    readonly filters: Readonly<Record<string, TFilter>>;
+    readonly dimensions: Readonly<Record<string, {
+        readonly filterable?: boolean;
+    }>>;
+}
+/**
+ * The filters a caller may apply: the declared filters, plus one per
+ * filterable dimension that no declared filter is named after.
+ *
+ * Declared filters add to the dimensions marked filterable rather than
+ * replacing them. A declared filter keeps its own name, field and operators,
+ * and can expose a dimension marked `filterable: false`. A dimension's own
+ * filter takes the operators of the declared filters on its field, so a
+ * declaration that narrows a field's operators cannot be bypassed by naming
+ * the dimension directly. Without one it gets the default list, which has no
+ * null checks (RFC 0023).
+ */
+export declare function effectiveFilters<TFilter extends FilterPolicy>(source: FilterPolicySource<TFilter>): Record<string, TFilter | SemanticFilterDefinition>;
+export {};
+//# sourceMappingURL=effective-filters.d.ts.map

package/dist/utils/effective-filters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"effective-filters.d.ts","sourceRoot":"","sources":["../../src/utils/effective-filters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE5D,gFAAgF;AAChF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAED,UAAU,kBAAkB,CAAC,OAAO,SAAS,YAAY;IACvD,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACpD,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC,CAAC;CAClF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,YAAY,EAC3D,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,wBAAwB,CAAC,CAYpD"}

package/dist/utils/effective-filters.js

@@ -0,0 +1,36 @@
+/**
+ * The filters a caller may apply: the declared filters, plus one per
+ * filterable dimension that no declared filter is named after.
+ *
+ * Declared filters add to the dimensions marked filterable rather than
+ * replacing them. A declared filter keeps its own name, field and operators,
+ * and can expose a dimension marked `filterable: false`. A dimension's own
+ * filter takes the operators of the declared filters on its field, so a
+ * declaration that narrows a field's operators cannot be bypassed by naming
+ * the dimension directly. Without one it gets the default list, which has no
+ * null checks (RFC 0023).
+ */
+export function effectiveFilters(source) {
+    const filters = { ...source.filters };
+    for (const [name, dimension] of Object.entries(source.dimensions)) {
+        if (dimension.filterable === false || Object.hasOwn(filters, name))
+            continue;
+        const operators = declaredOperators(Object.values(source.filters), name);
+        filters[name] = {
+            __type: 'filter_definition',
+            field: name,
+            ...(operators ? { operators: operators } : {}),
+        };
+    }
+    return filters;
+}
+/**
+ * The operators the declared filters on `field` allow between them, or
+ * undefined when none is declared or one allows the default list.
+ */
+function declaredOperators(filters, field) {
+    const declared = filters.filter(filter => filter.field === field);
+    if (declared.length === 0 || declared.some(filter => !filter.operators))
+        return undefined;
+    return [...new Set(declared.flatMap(filter => filter.operators ?? []))];
+}

package/dist/utils/enforced-constraints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enforced-constraints.d.ts","sourceRoot":"","sources":["../../src/utils/enforced-constraints.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAgB,MAAM,aAAa,CAAC;AAMtF,oFAAoF;AACpF,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAiB3C;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,EAAE,EAAE,kBAAkB,EACtB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,aAAa,EAAE,MAAM,GACpB,MAAM,EAAE,CAaV;AAED,yEAAyE;AACzE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAGlG"}
+{"version":3,"file":"enforced-constraints.d.ts","sourceRoot":"","sources":["../../src/utils/enforced-constraints.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAgB,MAAM,aAAa,CAAC;AAOtF,oFAAoF;AACpF,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAkB3C;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,EAAE,EAAE,kBAAkB,EACtB,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,aAAa,EAAE,MAAM,GACpB,MAAM,EAAE,CAaV;AAED,yEAAyE;AACzE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAGlG"}

package/dist/utils/enforced-constraints.js

@@ -1,6 +1,7 @@
 import { isSemanticFilterOperator } from '../constants.js';
 import { validateFilterValue } from '../validation.js';
 import { filterAllowsOperator } from './filter-operator-policy.js';
+import { effectiveFilters } from './effective-filters.js';
 import { isQualifiedField, resolveQualifiedField } from './relationship-fields.js';
 import { validateQualifiedFilter } from './relationship-validation.js';
 /** Constraints are policy, not queries; a handful per call is plenty (RFC 0019). */
@@ -16,12 +17,13 @@ function constraintError(ds, constraint, context) {
             return true;
         return validateQualifiedFilter(ds, filter, context) !== null;
     }
-    if (!Object.hasOwn(ds.filters, filter.field))
+    const filters = effectiveFilters(ds);
+    if (!Object.hasOwn(filters, filter.field))
         return true;
-    const definition = ds.filters[filter.field];
+    const definition = filters[filter.field];
     if (!filterAllowsOperator(definition, filter.operator))
         return true;
-    const fieldType = ds.dimensions[definition.field ?? filter.field]?.fieldType;
+    const fieldType = ds.dimensions[definition.field]?.fieldType;
     return !!fieldType && validateFilterValue(filter, fieldType) !== null;
 }
 /**

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;AAU3G,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAuIlB"}
+{"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;AAW3G,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,gBAAgB,GACzB,gBAAgB,CAwIlB"}

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

@@ -13,6 +13,7 @@ import { datasetOnTimeKey, selectedTimeKeyError } from './dataset-time-keys.js';
 import { enforcedConstraintErrors } from './enforced-constraints.js';
 import { filterAllowsOperator } from './filter-operator-policy.js';
 import { SEMANTIC_FILTER_OPERATORS } from '../constants.js';
+import { effectiveFilters } from './effective-filters.js';
 export function validateMetricQueryInput(metric, query, context) {
     const errors = [...semanticQuerySyntaxErrors(query), ...protocolMetricCapabilityErrors(metric, query), ...queryTimezoneErrors(query.timezone)];
     const ref = getMetricRef(metric);
@@ -21,7 +22,8 @@ export function validateMetricQueryInput(metric, query, context) {
         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 filters = effectiveFilters(ds);
+    const filterNames = Object.keys(filters);
     const grain = getMetricGrain(metric, query);
     const orderableFields = new Set([
         ...(query.dimensions ?? []),
@@ -72,12 +74,12 @@ export function validateMetricQueryInput(metric, query, context) {
             errors.push(`Unknown filter field "${filter.field}". Available: ${filterNames.join(', ')}`);
             continue;
         }
-        const filterDefinition = ds.filters[filter.field];
+        const filterDefinition = filters[filter.field];
         if (!filterAllowsOperator(filterDefinition, filter.operator)) {
             errors.push(`Filter "${filter.field}" does not allow operator "${filter.operator}". Allowed: ${(filterDefinition?.operators ?? SEMANTIC_FILTER_OPERATORS).join(', ')}`);
             continue;
         }
-        const resolvedField = ds.filters[filter.field]?.field ?? filter.field;
+        const resolvedField = filterDefinition.field;
         if (isTenantScopedFilter(ds, filter, context)) {
             errors.push(`Cannot filter on tenant field "${filter.field}" when runtime tenancy enforcement is active.`);
             continue;

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":"AAEA;;;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"}
+{"version":3,"file":"relationship-validation.d.ts","sourceRoot":"","sources":["../../src/utils/relationship-validation.ts"],"names":[],"mappings":"AAGA;;;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,5 +1,6 @@
 import { resolveRelationshipReference } from './relationship-measures.js';
 import { filterAllowsOperator } from './filter-operator-policy.js';
+import { effectiveFilters } from './effective-filters.js';
 import { validateFilterValue } from '../validation.js';
 import { getRuntimeTenantPredicate, hasTenantRuntime, } from './tenant-runtime.js';
 import { runtimeConstraints } from './row-scope.js';
@@ -48,10 +49,10 @@ export function validateQualifiedFilter(ds, filter, context) {
     if (getRuntimeTenantPredicate(context) && target.tenantKey && targetColumn === target.tenantKey) {
         return `Cannot filter on tenant field "${filter.field}" when runtime tenancy enforcement is active.`;
     }
-    // A relationship does not turn every target dimension into an exposed
-    // filter. Apply the target's explicit or generated filter allowlist and
-    // operator policy. An explicit filter can override filterable: false.
-    const definition = target.filters[targetDimensionName];
+    // A relationship exposes the target's filters named after a dimension:
+    // its filterable dimensions, and declared filters, which can override
+    // filterable: false. A filter alias is not reachable through the hop.
+    const definition = effectiveFilters(target)[targetDimensionName];
     if (!definition
         || definition.field !== targetDimensionName) {
         return `Filter "${filter.field}" is not exposed by target dataset "${target.name}".`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/datasets",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "Code-first TypeScript semantic layer for ClickHouse datasets, metrics, multi-tenancy, and AI agents",
   "keywords": [
     "semantic-layer",