@hypequery/protocol 0.15.0 → 0.17.0

package/dist/deployments/validate.js

@@ -2,16 +2,23 @@ import { ProtocolExpressionError, validateProtocolExpression } from '../expressi
 import { ProtocolIdentifierError, parseProtocolIdentifier, parseProtocolQualifiedIdentifier, } from '../identifiers/index.js';
 import { validateProtocolSqlExpression } from '../sql-expressions/validate.js';
 import { deploymentError } from './errors.js';
+import { expressionReferences, isSegmentPredicate, isSegmentReference } from './segments.js';
 import { resolveDeploymentLimits } from './limits.js';
 const textEncoder = new TextEncoder();
 const AGGREGATIONS = new Set([
     'sum', 'count', 'countDistinct', 'avg', 'min', 'max',
     'argMax', 'argMin', 'percentile', 'stddev', 'variance',
 ]);
+const AGGREGATIONS_V3 = new Set([...AGGREGATIONS, 'approxCountDistinct']);
+const APPROXIMATE_AGGREGATIONS = new Set(['approxCountDistinct']);
 const OPERATORS = new Set([
     'eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'in', 'notIn', 'between', 'like',
 ]);
 const GRAINS = new Set(['day', 'week', 'month', 'quarter', 'year']);
+const GRAINS_V3 = new Set(['minute', 'hour', ...GRAINS]);
+const SUB_DAY_GRAINS = new Set(['minute', 'hour']);
+/** Aggregations a `cumulative` window may wrap: a running total of bucket partials. */
+const CUMULATIVE_AGGREGATIONS = new Set(['sum', 'count', 'min', 'max']);
 const SENSITIVITIES = new Set(['public', 'internal', 'confidential', 'restricted']);
 const SEMANTIC_METADATA_FIELDS = [
     'examples', 'synonyms', 'format', 'unit', 'currency', 'timezone', 'sensitivity',
@@ -259,12 +266,24 @@ function validateDimension(input, path, limits) {
     validateSemanticMetadata(value, result, path, limits);
     return freezeRecord(result);
 }
-function validateMeasure(input, path, limits) {
+function validateMeasure(input, path, limits, version = 2) {
     const value = requireRecord(input, path);
-    exactFields(value, ['name', 'aggregation', 'field', 'filters'], ['argField', 'level', 'sql', 'label', 'description', ...SEMANTIC_METADATA_FIELDS], path);
-    if (typeof value.aggregation !== 'string' || !AGGREGATIONS.has(value.aggregation)) {
+    exactFields(value, ['name', 'aggregation', 'field', 'filters'], [
+        'argField', 'level', 'sql', 'label', 'description', ...SEMANTIC_METADATA_FIELDS,
+        ...(version === 3 ? ['approximate'] : []),
+    ], path);
+    if (typeof value.aggregation !== 'string'
+        || !(version === 3 ? AGGREGATIONS_V3 : AGGREGATIONS).has(value.aggregation)) {
         deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.aggregation`);
     }
+    // The marker is not free: present, as `true`, exactly for an approximate aggregation.
+    const approximate = APPROXIMATE_AGGREGATIONS.has(value.aggregation);
+    if (value.approximate !== undefined && value.approximate !== true) {
+        deploymentError('HQ_DEPLOYMENT_TYPE', `${path}.approximate`);
+    }
+    if (approximate !== (value.approximate === true)) {
+        deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.approximate`);
+    }
     const needsArg = value.aggregation === 'argMax' || value.aggregation === 'argMin';
     if (needsArg !== (value.argField !== undefined)) {
         deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.argField`);
@@ -282,8 +301,10 @@ function validateMeasure(input, path, limits) {
         aggregation: value.aggregation,
         field: identifier(value.field, `${path}.field`, true),
         filters: Object.freeze(requireArray(value.filters, `${path}.filters`, limits.maxDatasetItems)
-            .map((filter, index) => nested(() => validateProtocolExpression(filter), `${path}.filters[${index}]`))),
+            .map((filter, index) => nested(() => validateProtocolExpression(filter, { extension: version === 3 ? 2 : 1 }), `${path}.filters[${index}]`))),
     };
+    if (approximate)
+        result.approximate = true;
     if (value.argField !== undefined)
         result.argField = identifier(value.argField, `${path}.argField`, true);
     if (value.level !== undefined)
@@ -545,7 +566,7 @@ function validateFreshness(input, path) {
         maxAgeSeconds: positiveInteger(value.maxAgeSeconds, `${path}.maxAgeSeconds`),
     });
 }
-function validateDefaults(input, path, limits) {
+function validateDefaults(input, path, limits, version) {
     const value = requireRecord(input, path);
     exactFields(value, [], ['dimensions', 'timeGrain'], path);
     const result = {};
@@ -553,7 +574,7 @@ function validateDefaults(input, path, limits) {
         result.dimensions = uniqueStrings(value.dimensions, `${path}.dimensions`, limits.maxSemanticMetadataItems, (dimension, dimensionPath) => identifier(dimension, dimensionPath));
     }
     if (value.timeGrain !== undefined) {
-        if (typeof value.timeGrain !== 'string' || !GRAINS.has(value.timeGrain)) {
+        if (typeof value.timeGrain !== 'string' || !(version === 3 ? GRAINS_V3 : GRAINS).has(value.timeGrain)) {
             deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.timeGrain`);
         }
         result.timeGrain = value.timeGrain;
@@ -570,23 +591,46 @@ function namedItems(input, path, maxItems, validate) {
     }
     return Object.freeze(items);
 }
-function validateDataset(input, path, limits, measureIndices) {
+function validateSegment(input, path, limits, dimensions, tenant) {
+    const value = requireRecord(input, path);
+    exactFields(value, ['name', 'predicate'], ['label', 'description', ...SEMANTIC_METADATA_FIELDS], path);
+    const name = identifier(value.name, `${path}.name`);
+    const predicate = nested(() => validateProtocolExpression(value.predicate, { extension: 2 }), `${path}.predicate`);
+    if (!isSegmentPredicate(predicate)
+        || expressionReferences(predicate).some(reference => !isSegmentReference(reference, dimensions, tenant))) {
+        deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.predicate`);
+    }
+    const result = { name, predicate };
+    optionalText(value.label, 'label', result, path, limits);
+    optionalText(value.description, 'description', result, path, limits);
+    validateSemanticMetadata(value, result, path, limits);
+    return freezeRecord(result);
+}
+function validateDataset(input, path, limits, measureIndices, version = 2) {
     const value = requireRecord(input, path);
-    exactFields(value, ['name', 'source', 'tenant', 'dimensions', 'measures', 'filters', 'metrics', 'relationships'], [
+    // Contract 3 renames the allow-list; the old name is then an unknown field.
+    const filtersKey = version === 3 ? 'allowedFilters' : 'filters';
+    exactFields(value, [
+        'name', 'source', 'tenant', 'dimensions', 'measures', filtersKey, 'metrics', 'relationships',
+    ], [
         'description', 'freshness', 'owner', 'defaults',
         ...SEMANTIC_METADATA_FIELDS,
         'timeField', 'limits', 'endpoint',
+        ...(version === 3 ? ['segments'] : []),
     ], path);
     const result = {
         name: identifier(value.name, `${path}.name`),
         source: boundedText(value.source, `${path}.source`, limits.maxSourceBytes),
         tenant: validateTenant(value.tenant, `${path}.tenant`, limits),
         dimensions: namedItems(value.dimensions, `${path}.dimensions`, limits.maxDatasetItems, (item, itemPath) => validateDimension(item, itemPath, limits)),
-        measures: namedItems(value.measures, `${path}.measures`, limits.maxDatasetItems, (item, itemPath, index) => validateMeasure(item, measureIndices === undefined ? itemPath : `${path}.measures[${measureIndices[index]}]`, limits)),
-        filters: namedItems(value.filters, `${path}.filters`, limits.maxDatasetItems, (item, itemPath) => validateFilter(item, itemPath, limits)),
+        measures: namedItems(value.measures, `${path}.measures`, limits.maxDatasetItems, (item, itemPath, index) => validateMeasure(item, measureIndices === undefined ? itemPath : `${path}.measures[${measureIndices[index]}]`, limits, version)),
+        [filtersKey]: namedItems(value[filtersKey], `${path}.${filtersKey}`, limits.maxDatasetItems, (item, itemPath) => validateFilter(item, itemPath, limits)),
         metrics: namedItems(value.metrics, `${path}.metrics`, limits.maxDatasetItems, (item, itemPath) => validateMetric(item, itemPath, limits)),
         relationships: namedItems(value.relationships, `${path}.relationships`, limits.maxDatasetItems, (item, itemPath) => validateRelationship(item, itemPath)),
     };
+    if (version === 3 && value.segments !== undefined) {
+        result.segments = namedItems(value.segments, `${path}.segments`, limits.maxDatasetItems, (item, itemPath) => validateSegment(item, itemPath, limits, result.dimensions, result.tenant));
+    }
     if (value.timeField !== undefined)
         result.timeField = identifier(value.timeField, `${path}.timeField`, true);
     optionalText(value.description, 'description', result, path, limits);
@@ -596,7 +640,7 @@ function validateDataset(input, path, limits, measureIndices) {
         result.freshness = validateFreshness(value.freshness, `${path}.freshness`);
     }
     if (value.defaults !== undefined) {
-        result.defaults = validateDefaults(value.defaults, `${path}.defaults`, limits);
+        result.defaults = validateDefaults(value.defaults, `${path}.defaults`, limits, version);
     }
     if (value.limits !== undefined)
         result.limits = validateLimits(value.limits, `${path}.limits`);
@@ -644,11 +688,15 @@ function formulaReferences(expression, names) {
             return;
     }
 }
-function validateDatasetDerivedMeasure(input, path, limits) {
+function validateDatasetDerivedMeasure(input, path, limits, version) {
     const value = requireRecord(input, path);
     exactFields(value, ['kind', 'name', 'uses', 'expression'], [
         'label', 'description', ...SEMANTIC_METADATA_FIELDS,
+        ...(version === 3 ? ['approximate'] : []),
     ], path);
+    if (value.approximate !== undefined && value.approximate !== true) {
+        deploymentError('HQ_DEPLOYMENT_TYPE', `${path}.approximate`);
+    }
     if (value.kind !== 'derived')
         deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.kind`);
     const uses = requireArray(value.uses, `${path}.uses`, limits.maxDatasetItems)
@@ -680,40 +728,144 @@ function validateDatasetDerivedMeasure(input, path, limits) {
         uses: Object.freeze(uses),
         expression,
     };
+    // Checked against the base measures by the dataset, once they are known.
+    if (value.approximate === true)
+        result.approximate = true;
     optionalText(value.label, 'label', result, path, limits);
     optionalText(value.description, 'description', result, path, limits);
     validateSemanticMetadata(value, result, path, limits);
     return freezeRecord(result);
 }
-function validateDeploymentDataset(input, path, limits) {
+function validateInterval(input, path) {
     const value = requireRecord(input, path);
-    exactFields(value, ['name', 'source', 'tenant', 'dimensions', 'measures', 'filters', 'relationships'], [
+    exactFields(value, ['amount', 'unit'], [], path);
+    const amount = positiveInteger(value.amount, `${path}.amount`);
+    if (typeof value.unit !== 'string' || !GRAINS_V3.has(value.unit)) {
+        deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.unit`);
+    }
+    return freezeRecord({ amount, unit: value.unit });
+}
+/**
+ * Validates the shape of a contract 3 `window` or `shift` measure. Rules that
+ * need the rest of the dataset (the wrapped base measure, the time field, and
+ * approximation) are checked by the dataset. Rules that need the query grain
+ * (whole-bucket intervals, the bucket bound) are enforced at query time.
+ */
+function validateTimeMeasure(value, path, limits) {
+    const window = value.kind === 'window';
+    exactFields(value, window
+        ? ['kind', 'name', 'measure', 'requiresTimeRange']
+        : ['kind', 'name', 'measure', 'interval', 'requiresTimeRange'], [
+        ...(window ? ['trailing', 'toDate', 'cumulative'] : []),
+        'approximate', 'label', 'description', ...SEMANTIC_METADATA_FIELDS,
+    ], path);
+    if (value.approximate !== undefined && value.approximate !== true) {
+        deploymentError('HQ_DEPLOYMENT_TYPE', `${path}.approximate`);
+    }
+    if (value.requiresTimeRange !== true) {
+        deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.requiresTimeRange`);
+    }
+    const result = {
+        kind: value.kind,
+        name: identifier(value.name, `${path}.name`),
+        measure: identifier(value.measure, `${path}.measure`),
+        requiresTimeRange: true,
+    };
+    if (window) {
+        const frames = ['trailing', 'toDate', 'cumulative'].filter(key => value[key] !== undefined);
+        if (frames.length !== 1)
+            deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', path);
+        if (value.trailing !== undefined)
+            result.trailing = validateInterval(value.trailing, `${path}.trailing`);
+        if (value.toDate !== undefined) {
+            // A to-date period must be coarser than some bucket, so `minute` has none.
+            if (typeof value.toDate !== 'string' || !GRAINS_V3.has(value.toDate) || value.toDate === 'minute') {
+                deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.toDate`);
+            }
+            result.toDate = value.toDate;
+        }
+        if (value.cumulative !== undefined) {
+            if (value.cumulative !== true)
+                deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.cumulative`);
+            result.cumulative = true;
+        }
+    }
+    else {
+        result.interval = validateInterval(value.interval, `${path}.interval`);
+    }
+    if (value.approximate === true)
+        result.approximate = true;
+    optionalText(value.label, 'label', result, path, limits);
+    optionalText(value.description, 'description', result, path, limits);
+    validateSemanticMetadata(value, result, path, limits);
+    return freezeRecord(result);
+}
+function validateDeploymentDataset(input, path, limits, version = 2) {
+    const value = requireRecord(input, path);
+    exactFields(value, [
+        'name', 'source', 'tenant', 'dimensions', 'measures',
+        version === 3 ? 'allowedFilters' : 'filters', 'relationships',
+    ], [
         'description', 'freshness', 'owner', 'defaults',
         ...SEMANTIC_METADATA_FIELDS, 'timeField', 'limits', 'endpoint',
+        ...(version === 3 ? ['segments'] : []),
     ], path);
     const measures = requireArray(value.measures, `${path}.measures`, limits.maxDatasetItems)
         .map((measure, index) => requireRecord(measure, `${path}.measures[${index}]`));
+    // Base measures are validated by the dataset; composite ones (derived, and in
+    // contract 3 window and shift) reference them and are validated here.
+    const isComposite = (measure) => measure.kind === 'derived'
+        || (version === 3 && (measure.kind === 'window' || measure.kind === 'shift'));
     // Preserve original indices when validating base measures separately.
-    const baseEntries = measures.flatMap((measure, index) => (measure.kind === 'derived'
-        ? [] : [{ measure, index }]));
-    const validated = validateDataset({ ...value, measures: baseEntries.map(entry => entry.measure), metrics: [] }, path, limits, baseEntries.map(entry => entry.index));
-    const derived = measures.map((measure, index) => (measure.kind === 'derived'
-        ? validateDatasetDerivedMeasure(measure, `${path}.measures[${index}]`, limits)
-        : undefined));
+    const baseEntries = measures.flatMap((measure, index) => (isComposite(measure) ? [] : [{ measure, index }]));
+    const validated = validateDataset({ ...value, measures: baseEntries.map(entry => entry.measure), metrics: [] }, path, limits, baseEntries.map(entry => entry.index), version);
+    const composite = measures.map((measure, index) => {
+        const measurePath = `${path}.measures[${index}]`;
+        if (measure.kind === 'derived') {
+            return validateDatasetDerivedMeasure(measure, measurePath, limits, version);
+        }
+        return isComposite(measure) ? validateTimeMeasure(measure, measurePath, limits) : undefined;
+    });
+    const derived = composite.map(item => (item?.kind === 'derived' ? item : undefined));
     const baseByName = new Map(validated.measures.map(measure => [measure.name, measure]));
     let baseIndex = 0;
-    const ordered = measures.map((_, index) => (derived[index] ?? validated.measures[baseIndex++]));
+    const ordered = measures.map((_, index) => (composite[index] ?? validated.measures[baseIndex++]));
     if (new Set(ordered.map(measure => measure.name)).size !== measures.length) {
         deploymentError('HQ_DEPLOYMENT_INVALID_REFERENCE', `${path}.measures`);
     }
+    const isApproximate = (measure) => measure?.approximate === true;
+    // A time measure wraps exactly one base measure and needs the dataset's time axis.
+    const timeByName = new Map();
+    for (const [index, item] of composite.entries()) {
+        if (!item || item.kind === 'derived')
+            continue;
+        const timeMeasure = item;
+        const measurePath = `${path}.measures[${index}]`;
+        const wrapped = baseByName.get(timeMeasure.measure);
+        if (!wrapped)
+            deploymentError('HQ_DEPLOYMENT_INVALID_REFERENCE', `${measurePath}.measure`);
+        if (validated.timeField === undefined)
+            deploymentError('HQ_DEPLOYMENT_INVALID_REFERENCE', `${measurePath}.kind`);
+        if (timeMeasure.cumulative === true && !CUMULATIVE_AGGREGATIONS.has(wrapped.aggregation)) {
+            deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${measurePath}.cumulative`);
+        }
+        if (isApproximate(wrapped) !== isApproximate(timeMeasure)) {
+            deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${measurePath}.approximate`);
+        }
+        timeByName.set(timeMeasure.name, timeMeasure);
+    }
     for (const [index, item] of derived.entries()) {
         if (!item)
             continue;
         for (const [useIndex, use] of item.uses.entries()) {
-            if (!baseByName.has(use.measure)) {
+            if (!baseByName.has(use.measure) && !timeByName.has(use.measure)) {
                 deploymentError('HQ_DEPLOYMENT_INVALID_REFERENCE', `${path}.measures[${index}].uses[${useIndex}].measure`);
             }
         }
+        const approximate = item.uses.some(use => (isApproximate(baseByName.get(use.measure) ?? timeByName.get(use.measure))));
+        if (approximate !== isApproximate(item)) {
+            deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', `${path}.measures[${index}].approximate`);
+        }
     }
     const { metrics: _metrics, ...dataset } = validated;
     return freezeRecord({ ...dataset, measures: Object.freeze(ordered) });
@@ -731,3 +883,34 @@ export function validateProtocolDeploymentContract(input, options = {}) {
     validateDatasetReferences(datasets);
     return freezeRecord({ kind: 'hypequery-deployment', version: 2, datasets });
 }
+/** True when a contract 3 dataset uses anything contract 2 cannot express. */
+function usesContract3Feature(dataset) {
+    return (dataset.segments?.length ?? 0) > 0
+        || dataset.measures.some(measure => (('aggregation' in measure && APPROXIMATE_AGGREGATIONS.has(measure.aggregation))
+            || ('kind' in measure && (measure.kind === 'window' || measure.kind === 'shift'))))
+        || (dataset.defaults?.timeGrain !== undefined && SUB_DAY_GRAINS.has(dataset.defaults.timeGrain));
+}
+/**
+ * Validate a deployment contract 3 (RFC 0015). Contract 3 renames the dataset
+ * filter allow-list to `allowedFilters` and adds segments, `approxCountDistinct`,
+ * window and shift measures, and sub-day default grains.
+ *
+ * Under the lowest-version rule, a contract that uses none of those is only
+ * valid as contract 2. Rejecting it here keeps a deployment's identity a
+ * function of its content rather than of which producer emitted it.
+ */
+export function validateProtocolDeploymentContractV3(input, options = {}) {
+    const limits = resolveDeploymentLimits(options);
+    const value = requireRecord(input, '$');
+    exactFields(value, ['kind', 'version', 'datasets'], [], '$');
+    if (value.kind !== 'hypequery-deployment')
+        deploymentError('HQ_DEPLOYMENT_INVALID_VALUE', '$.kind');
+    if (value.version !== 3)
+        deploymentError('HQ_DEPLOYMENT_INVALID_VERSION', '$.version');
+    const datasets = namedItems(value.datasets, '$.datasets', limits.maxDatasets, (item, path) => validateDeploymentDataset(item, path, limits, 3));
+    validateDatasetReferences(datasets);
+    if (!datasets.some(usesContract3Feature)) {
+        deploymentError('HQ_DEPLOYMENT_INVALID_VERSION', '$.version');
+    }
+    return freezeRecord({ kind: 'hypequery-deployment', version: 3, datasets });
+}

package/dist/expressions/index.d.ts

@@ -1,5 +1,5 @@
 export { ProtocolExpressionError } from './errors.js';
 export { DEFAULT_PROTOCOL_EXPRESSION_LIMITS } from './limits.js';
 export { validateProtocolExpression, validateProtocolSemanticQuery } from './validate.js';
-export type { ProtocolAggregation, ProtocolBinaryOperator, ProtocolComparisonOperator, ProtocolDatasetQuery, ProtocolExpression, ProtocolExpressionErrorCode, ProtocolExpressionLimits, ProtocolExpressionOptions, ProtocolFunctionName, ProtocolMetricQuery, ProtocolOrderBy, ProtocolSemanticQuery, ProtocolTimeGrain, } from './types.js';
+export type { ProtocolAggregation, ProtocolBinaryOperator, ProtocolComparisonOperator, ProtocolDatasetQuery, ProtocolExpression, ProtocolExpressionErrorCode, ProtocolExpressionExtension, ProtocolExpressionLimits, ProtocolExpressionOptions, ProtocolFunctionName, ProtocolMetricQuery, ProtocolOrderBy, ProtocolSemanticQuery, ProtocolQueryTimeGrain, ProtocolTimeGrain, } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/expressions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/expressions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,kCAAkC,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAC1F,YAAY,EACV,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,EAClB,2BAA2B,EAC3B,wBAAwB,EACxB,yBAAyB,EACzB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/expressions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,kCAAkC,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,MAAM,eAAe,CAAC;AAC1F,YAAY,EACV,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,EAClB,2BAA2B,EAC3B,2BAA2B,EAC3B,wBAAwB,EACxB,yBAAyB,EACzB,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,YAAY,CAAC"}

package/dist/expressions/types.d.ts

@@ -3,7 +3,12 @@ import type { CanonicalValue } from '../values/index.js';
 export type ProtocolBinaryOperator = 'add' | 'subtract' | 'multiply' | 'divide';
 export type ProtocolFunctionName = 'nullIfZero' | 'coalesce' | 'round' | 'floor' | 'ceil';
 export type ProtocolComparisonOperator = 'eq' | 'neq' | 'gt' | 'gte' | 'lt' | 'lte' | 'in' | 'notIn' | 'between' | 'like';
-export type ProtocolAggregation = 'sum' | 'count' | 'countDistinct' | 'avg' | 'min' | 'max' | 'argMax' | 'argMin' | 'percentile' | 'stddev' | 'variance';
+/**
+ * Every aggregation any supported expression extension accepts.
+ * `approxCountDistinct` is extension 2 (RFC 0015); the validator rejects it
+ * under extension 1.
+ */
+export type ProtocolAggregation = 'sum' | 'count' | 'countDistinct' | 'avg' | 'min' | 'max' | 'argMax' | 'argMin' | 'percentile' | 'stddev' | 'variance' | 'approxCountDistinct';
 export type ProtocolExpression = {
     readonly kind: 'reference';
     readonly name: ProtocolQualifiedIdentifier;
@@ -40,7 +45,16 @@ export type ProtocolExpression = {
     readonly level?: number;
     readonly filters?: readonly ProtocolExpression[];
 };
+/** Expression extension 1 grains, also the deployment contract 2 grain set. */
 export type ProtocolTimeGrain = 'day' | 'week' | 'month' | 'quarter' | 'year';
+/**
+ * Every grain a semantic query may carry under any supported extension.
+ * `minute` and `hour` are extension 2 (RFC 0015); the validator rejects them
+ * under extension 1.
+ */
+export type ProtocolQueryTimeGrain = 'minute' | 'hour' | ProtocolTimeGrain;
+/** Expression extension versions this implementation validates. */
+export type ProtocolExpressionExtension = 1 | 2;
 export interface ProtocolOrderBy {
     readonly field: ProtocolQualifiedIdentifier;
     readonly direction: 'asc' | 'desc';
@@ -49,15 +63,21 @@ interface ProtocolQueryCommon {
     readonly dataset: ProtocolIdentifier;
     readonly dimensions?: readonly ProtocolQualifiedIdentifier[];
     readonly filters?: readonly ProtocolExpression[];
+    /** Named segments, AND-combined with `filters`. Extension 2 only. */
+    readonly segments?: readonly ProtocolIdentifier[];
     readonly orderBy?: readonly ProtocolOrderBy[];
     readonly limit?: number;
     readonly offset?: number;
-    readonly by?: ProtocolTimeGrain;
+    readonly by?: ProtocolQueryTimeGrain;
     readonly includeMeta?: boolean;
 }
 export interface ProtocolDatasetQuery extends ProtocolQueryCommon {
     readonly kind: 'dataset';
-    readonly measures?: readonly ProtocolIdentifier[];
+    /**
+     * Simple measure names. Extension 2 also accepts one-hop relationship
+     * measures such as `customer.customerCount`.
+     */
+    readonly measures?: readonly ProtocolQualifiedIdentifier[];
 }
 export interface ProtocolMetricQuery extends ProtocolQueryCommon {
     readonly kind: 'metric';
@@ -71,6 +91,12 @@ export interface ProtocolExpressionLimits {
 }
 export interface ProtocolExpressionOptions {
     readonly limits?: Partial<ProtocolExpressionLimits>;
+    /**
+     * Expression extension to validate against. Defaults to 1. The containing
+     * artifact selects it (RFC 0015): deployment contract 3 and semantic
+     * invocation 2 use extension 2.
+     */
+    readonly extension?: ProtocolExpressionExtension;
 }
 export type ProtocolExpressionErrorCode = 'HQ_EXPRESSION_TYPE' | 'HQ_EXPRESSION_UNKNOWN_FIELD' | 'HQ_EXPRESSION_UNKNOWN_KIND' | 'HQ_EXPRESSION_INVALID_IDENTIFIER' | 'HQ_EXPRESSION_INVALID_VALUE' | 'HQ_EXPRESSION_INVALID_OPERATOR' | 'HQ_EXPRESSION_INVALID_ARITY' | 'HQ_EXPRESSION_INVALID_AGGREGATION' | 'HQ_EXPRESSION_INVALID_QUERY' | 'HQ_EXPRESSION_TOO_DEEP' | 'HQ_EXPRESSION_TOO_MANY_NODES' | 'HQ_EXPRESSION_TOO_MANY_ITEMS' | 'HQ_EXPRESSION_UNSAFE_OBJECT';
 export {};

package/dist/expressions/types.d.ts.map

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

package/dist/expressions/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/expressions/validate.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAEV,kBAAkB,EAElB,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AA4PpB,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,kBAAkB,CAEpB;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,qBAAqB,CAiDvB"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/expressions/validate.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAEV,kBAAkB,EAGlB,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAsQpB,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,kBAAkB,CAEpB;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,yBAA8B,GACtC,qBAAqB,CAwDvB"}

package/dist/expressions/validate.js

@@ -4,11 +4,15 @@ import { expressionError } from './errors.js';
 import { resolveExpressionLimits } from './limits.js';
 const BINARY = new Set(['add', 'subtract', 'multiply', 'divide']);
 const COMPARISONS = new Set(['eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'in', 'notIn', 'between', 'like']);
-const AGGREGATIONS = new Set([
+const AGGREGATIONS_V1 = new Set([
     'sum', 'count', 'countDistinct', 'avg', 'min', 'max',
     'argMax', 'argMin', 'percentile', 'stddev', 'variance',
 ]);
-const GRAINS = new Set(['day', 'week', 'month', 'quarter', 'year']);
+const AGGREGATIONS_V2 = new Set([
+    ...AGGREGATIONS_V1, 'approxCountDistinct',
+]);
+const GRAINS_V1 = new Set(['day', 'week', 'month', 'quarter', 'year']);
+const GRAINS_V2 = new Set(['minute', 'hour', ...GRAINS_V1]);
 const CALL_ARITY = Object.freeze({
     nullIfZero: [1, 1],
     coalesce: [2, 2],
@@ -218,7 +222,8 @@ function validateComparisonOperands(operator, right, path) {
 function validateAggregate(value, path, depth, state) {
     exactFields(value, ['kind', 'aggregation', 'field'], ['argField', 'level', 'filters'], path);
     const aggregation = stringValue(value.aggregation, `${path}.aggregation`);
-    if (!AGGREGATIONS.has(aggregation))
+    const aggregations = state.extension === 2 ? AGGREGATIONS_V2 : AGGREGATIONS_V1;
+    if (!aggregations.has(aggregation))
         expressionError('HQ_EXPRESSION_INVALID_AGGREGATION', `${path}.aggregation`);
     const isArg = aggregation === 'argMax' || aggregation === 'argMin';
     const isPercentile = aggregation === 'percentile';
@@ -244,7 +249,11 @@ function validateAggregate(value, path, depth, state) {
     });
 }
 function newState(options) {
-    return { limits: resolveExpressionLimits(options), active: new WeakSet(), nodes: 0 };
+    const extension = options.extension ?? 1;
+    if (extension !== 1 && extension !== 2) {
+        throw new RangeError('extension must be 1 or 2');
+    }
+    return { limits: resolveExpressionLimits(options), extension, active: new WeakSet(), nodes: 0 };
 }
 export function validateProtocolExpression(input, options = {}) {
     return validateExpression(input, '$', 1, newState(options));
@@ -256,30 +265,38 @@ export function validateProtocolSemanticQuery(input, options = {}) {
     try {
         const kind = stringValue(value.kind, '$.kind');
         const metric = kind === 'metric';
+        const v2 = state.extension === 2;
         if (!metric && kind !== 'dataset')
             expressionError('HQ_EXPRESSION_INVALID_QUERY', '$.kind');
-        exactFields(value, metric ? ['kind', 'dataset', 'metric'] : ['kind', 'dataset'], metric
-            ? ['dimensions', 'filters', 'orderBy', 'limit', 'offset', 'by', 'includeMeta']
-            : ['dimensions', 'measures', 'filters', 'orderBy', 'limit', 'offset', 'by', 'includeMeta'], '$');
+        exactFields(value, metric ? ['kind', 'dataset', 'metric'] : ['kind', 'dataset'], [
+            'dimensions',
+            ...(metric ? [] : ['measures']),
+            'filters',
+            ...(v2 ? ['segments'] : []),
+            'orderBy', 'limit', 'offset', 'by', 'includeMeta',
+        ], '$');
         const result = {
             kind,
             dataset: identifier(value.dataset, '$.dataset', false),
             ...(metric ? { metric: identifier(value.metric, '$.metric', false) } : {}),
         };
         copyIdentifierArray(value, result, 'dimensions', true, state);
+        // Extension 2 admits one-hop relationship measures (`customer.count`).
         if (!metric)
-            copyIdentifierArray(value, result, 'measures', false, state);
+            copyIdentifierArray(value, result, 'measures', v2, state);
         if (value.filters !== undefined) {
             const filters = arrayValue(value.filters, '$.filters', state);
             result.filters = Object.freeze(filters.map((filter, index) => validatePredicate(filter, `$.filters[${index}]`, 1, state, 'HQ_EXPRESSION_INVALID_QUERY')));
         }
+        if (value.segments !== undefined)
+            result.segments = validateSegments(value.segments, state);
         if (value.orderBy !== undefined)
             result.orderBy = validateOrderBy(value.orderBy, state);
         copyInteger(value, result, 'limit', 0);
         copyInteger(value, result, 'offset', 0);
         if (value.by !== undefined) {
             const grain = stringValue(value.by, '$.by');
-            if (!GRAINS.has(grain))
+            if (!(v2 ? GRAINS_V2 : GRAINS_V1).has(grain))
                 expressionError('HQ_EXPRESSION_INVALID_QUERY', '$.by');
             result.by = grain;
         }
@@ -336,3 +353,15 @@ function validateOrderBy(input, state) {
         return freezeRecord({ field: identifier(value.field, `${path}.field`), direction });
     }));
 }
+function validateSegments(input, state) {
+    const values = arrayValue(input, '$.segments', state);
+    const seen = new Set();
+    return Object.freeze(values.map((item, index) => {
+        const path = `$.segments[${index}]`;
+        const name = identifier(item, path, false);
+        if (seen.has(name))
+            expressionError('HQ_EXPRESSION_INVALID_QUERY', path);
+        seen.add(name);
+        return name;
+    }));
+}

package/dist/index.d.ts

@@ -2,23 +2,25 @@ export { DEFAULT_CANONICAL_VALUE_LIMITS, ProtocolValueError, decodeCanonicalValu
 export type { ArrayTaggedValue, BytesTaggedValue, CanonicalValue, CanonicalValueLimits, CanonicalValueOptions, DateTaggedValue, DatetimeTaggedValue, DecimalTaggedValue, EnumTaggedValue, IntegerTaggedValue, MapTaggedValue, ProtocolValueErrorCode, TaggedValue, TupleTaggedValue, UuidTaggedValue, } from './values/index.js';
 export { PROTOCOL_IDENTIFIER_LIMITS, ProtocolIdentifierError, isProtocolIdentifier, isProtocolQualifiedIdentifier, joinProtocolQualifiedIdentifier, parseProtocolIdentifier, parseProtocolQualifiedIdentifier, splitProtocolQualifiedIdentifier, } from './identifiers/index.js';
 export { PROTOCOL_CACHE_KEY_LIMITS, ProtocolCacheKeyError, deriveProtocolCacheKey, deriveProtocolCacheNamespaceToken, } from './cache-keys/index.js';
+export { ProtocolCachePreimageError, buildProtocolCachePreimage, deriveProtocolTenantFingerprint, } from './cache-preimages/index.js';
 export { DEFAULT_PROTOCOL_EXPRESSION_LIMITS, ProtocolExpressionError, validateProtocolExpression, validateProtocolSemanticQuery, } from './expressions/index.js';
 export { DEFAULT_PROTOCOL_SCHEMA_LIMITS, DEFAULT_PROTOCOL_SCHEMA_VALUE_LIMITS, ProtocolSchemaError, ProtocolSchemaValueError, applyProtocolSchemaValue, createProtocolSchemaValueParser, resolveProtocolSchemaValueLimits, validateProtocolSchema, } from './schemas/index.js';
 export type { ProtocolSchema, ProtocolSchemaErrorCode, ProtocolSchemaLimits, ProtocolSchemaOptions, ProtocolSchemaValueLimits, ProtocolSchemaValueOptions, ProtocolSchemaValueParser, } from './schemas/index.js';
-export type { ProtocolAggregation, ProtocolBinaryOperator, ProtocolComparisonOperator, ProtocolDatasetQuery, ProtocolExpression, ProtocolExpressionErrorCode, ProtocolExpressionLimits, ProtocolExpressionOptions, ProtocolFunctionName, ProtocolMetricQuery, ProtocolOrderBy, ProtocolSemanticQuery, ProtocolTimeGrain, } from './expressions/index.js';
+export type { ProtocolAggregation, ProtocolBinaryOperator, ProtocolComparisonOperator, ProtocolDatasetQuery, ProtocolExpression, ProtocolExpressionErrorCode, ProtocolExpressionExtension, ProtocolExpressionLimits, ProtocolExpressionOptions, ProtocolFunctionName, ProtocolMetricQuery, ProtocolOrderBy, ProtocolSemanticQuery, ProtocolQueryTimeGrain, ProtocolTimeGrain, } from './expressions/index.js';
 export type { DeriveProtocolCacheKeyOptions, ProtocolCacheKeyErrorCode, ProtocolCacheKeyNamespace, } from './cache-keys/index.js';
+export type { BuildProtocolCachePreimageOptions, ProtocolCachePreimageErrorCode, ProtocolCacheTenantScope, } from './cache-preimages/index.js';
 export type { ProtocolIdentifier, ProtocolIdentifierErrorCode, ProtocolQualifiedIdentifier, } from './identifiers/index.js';
 export { DEFAULT_PROTOCOL_QUERY_IMPLEMENTATION_LIMITS, ProtocolQueryImplementationError, validateProtocolQueryImplementation, validateProtocolSqlExpression, } from './query-implementations/index.js';
 export { DEFAULT_PROTOCOL_QUERY_EVENT_LIMITS, ProtocolQueryDiagnosticsError, ProtocolQueryEventError, validateProtocolQueryDiagnostics, validateProtocolQueryEvent, } from './events/index.js';
 export type { ProtocolQueryDiagnostics, ProtocolQueryDiagnosticsErrorCode, ProtocolQueryErrorCategory, ProtocolQueryEvent, ProtocolQueryEventErrorCode, ProtocolQueryEventLimits, ProtocolQueryEventOptions, ProtocolQueryEventOutcome, ProtocolQueryEventTarget, ProtocolQueryOperation, ProtocolQueryTerminalReason, } from './events/index.js';
-export { DEFAULT_PROTOCOL_SEMANTIC_INVOCATION_LIMITS, ProtocolSemanticInvocationError, validateProtocolSemanticInvocation, validateProtocolSemanticInvocationFailure, validateProtocolSemanticInvocationResult, } from './invocations/index.js';
-export type { ProtocolSemanticInvocation, ProtocolSemanticInvocationBudget, ProtocolSemanticInvocationErrorCode, ProtocolSemanticInvocationFailure, ProtocolSemanticInvocationFailureCategory, ProtocolSemanticInvocationLimits, ProtocolSemanticInvocationMeta, ProtocolSemanticInvocationOptions, ProtocolSemanticInvocationPagination, ProtocolSemanticInvocationResult, ProtocolSemanticInvocationRow, ProtocolSemanticInvocationTarget, ProtocolSemanticInvocationValue, } from './invocations/index.js';
+export { DEFAULT_PROTOCOL_SEMANTIC_INVOCATION_LIMITS, ProtocolSemanticInvocationError, validateProtocolSemanticInvocation, validateProtocolSemanticInvocationFailure, validateProtocolSemanticInvocationResult, validateProtocolSemanticInvocationV2, } from './invocations/index.js';
+export type { ProtocolSemanticInvocation, ProtocolSemanticInvocationV2, ProtocolSemanticInvocationBudget, ProtocolSemanticInvocationErrorCode, ProtocolSemanticInvocationFailure, ProtocolSemanticInvocationFailureCategory, ProtocolSemanticInvocationLimits, ProtocolSemanticInvocationMeta, ProtocolSemanticInvocationOptions, ProtocolSemanticInvocationPagination, ProtocolSemanticInvocationResult, ProtocolSemanticInvocationRow, ProtocolSemanticInvocationTarget, ProtocolSemanticInvocationValue, } from './invocations/index.js';
 export { DEFAULT_PROTOCOL_DEPLOYMENT_BUNDLE_LIMITS, PROTOCOL_DEPLOYMENT_BUNDLE_IDENTITY_DOMAIN, ProtocolDeploymentBundleError, encodeProtocolDeploymentBundleManifest, encodeProtocolDeploymentBundleManifestToString, hashProtocolDeploymentBundleManifest, prepareProtocolDeploymentBundleManifest, validateProtocolDeploymentBundleManifest, } from './bundles/index.js';
 export { DEFAULT_PROTOCOL_DEPLOYMENT_RELEASE_LIMITS, PROTOCOL_DEPLOYMENT_RELEASE_IDENTITY_DOMAIN, ProtocolDeploymentReleaseError, encodeProtocolDeploymentReleaseEnvelope, encodeProtocolDeploymentReleaseEnvelopeToString, hashProtocolDeploymentReleaseEnvelope, prepareProtocolDeploymentReleaseEnvelope, validateProtocolDeploymentReleaseEnvelope, validateProtocolDeploymentReleaseTarget, } from './releases/index.js';
 export type { PreparedProtocolDeploymentReleaseEnvelope, ProtocolDeploymentReleaseEnvelope, ProtocolDeploymentReleaseErrorCode, ProtocolDeploymentReleaseLimits, ProtocolDeploymentReleaseOptions, ProtocolDeploymentReleaseTarget, } from './releases/index.js';
 export type { PreparedProtocolDeploymentBundleManifest, ProtocolDeploymentBundleArtifact, ProtocolDeploymentBundleDeployment, ProtocolDeploymentBundleErrorCode, ProtocolDeploymentBundleFile, ProtocolDeploymentBundleLimits, ProtocolDeploymentBundleManifest, ProtocolDeploymentBundleOptions, } from './bundles/index.js';
-export { DEFAULT_PROTOCOL_DEPLOYMENT_LIMITS, PROTOCOL_DEPLOYMENT_IDENTITY_DOMAIN, ProtocolDeploymentError, encodeProtocolDeploymentContract, encodeProtocolDeploymentContractToString, hashProtocolDeploymentContract, prepareProtocolDeploymentContract, validateProtocolDatasetContract, validateProtocolDeploymentContract, } from './deployments/index.js';
-export type { ProtocolDatasetDerivedMeasure, ProtocolDeploymentDataset, ProtocolDeploymentMeasure, PreparedProtocolDeploymentContract, ProtocolAccessPolicy, ProtocolDatasetContract, ProtocolDatasetDefaults, ProtocolDatasetDimension, ProtocolDatasetFieldSource, ProtocolDatasetFieldType, ProtocolDatasetFilter, ProtocolDatasetFreshness, ProtocolDatasetLimits, ProtocolDatasetMeasure, ProtocolDatasetMetric, ProtocolDatasetRelationship, ProtocolDatasetTenantPolicy, ProtocolSemanticMetadata, ProtocolSemanticSensitivity, ProtocolDeploymentContract, ProtocolDeploymentErrorCode, ProtocolDeploymentLimits, ProtocolDeploymentOptions, ProtocolEndpointPolicy, ProtocolEndpointTenantPolicy, ProtocolMetricDerivation, ProtocolMetricInput, } from './deployments/index.js';
+export { DEFAULT_PROTOCOL_DEPLOYMENT_LIMITS, PROTOCOL_DEPLOYMENT_IDENTITY_DOMAIN, PROTOCOL_DEPLOYMENT_V3_IDENTITY_DOMAIN, ProtocolDeploymentError, encodeProtocolDeploymentContract, encodeProtocolDeploymentContractToString, hashProtocolDeploymentContract, prepareProtocolDeploymentContract, prepareProtocolDeploymentContractV3, validateProtocolDatasetContract, validateProtocolDeploymentContract, validateProtocolDeploymentContractV3, } from './deployments/index.js';
+export type { ProtocolDatasetDerivedMeasure, ProtocolDeploymentDataset, ProtocolDeploymentMeasure, PreparedProtocolDeploymentContract, PreparedProtocolDeploymentContractV3, ProtocolAccessPolicy, ProtocolDatasetContract, ProtocolDatasetDefaults, ProtocolDatasetDimension, ProtocolDatasetFieldSource, ProtocolDatasetFieldType, ProtocolDatasetFilter, ProtocolDatasetFreshness, ProtocolDatasetLimits, ProtocolDatasetMeasure, ProtocolDatasetMetric, ProtocolDatasetRelationship, ProtocolDatasetTenantPolicy, ProtocolSemanticMetadata, ProtocolSemanticSensitivity, ProtocolDeploymentContract, ProtocolDeploymentContractV3, ProtocolDeploymentDatasetV3, ProtocolDeploymentMeasureV3, ProtocolDatasetDerivedMeasureV3, ProtocolDatasetMeasureV3, ProtocolDatasetSegment, ProtocolDatasetShiftMeasure, ProtocolDatasetWindowMeasure, ProtocolTimeInterval, ProtocolDeploymentErrorCode, ProtocolDeploymentLimits, ProtocolDeploymentOptions, ProtocolEndpointPolicy, ProtocolEndpointTenantPolicy, ProtocolMetricDerivation, ProtocolMetricInput, } from './deployments/index.js';
 export type { ProtocolQueryImplementation, ProtocolQueryImplementationErrorCode, ProtocolQueryImplementationLimits, ProtocolQueryImplementationOptions, ProtocolSqlDialect, ProtocolSqlExpression, ProtocolSqlParameter, ProtocolSqlParameterSource, ProtocolSqlTenantPolicy, } from './query-implementations/index.js';
 export { PROTOCOL_SEMANTIC_FAILURE_MESSAGES } from './invocations/failure-messages.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":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}