@hypequery/datasets 0.20.0 → 0.21.0

package/dist/utils/window-query-signature.js

@@ -1,3 +1,4 @@
+import { measureDependencyNames } from './measure-dependencies.js';
 import { getBaseMeasure, getDerivedMeasure } from './dataset-measures.js';
 import { selectedTimeMeasures } from './time-query-measures.js';
 import { windowCatalogMetadata } from './window-catalog-metadata.js';
@@ -5,16 +6,25 @@ import { measureToAggregationSpec } from './dataset-normalization.js';
 /** Preserve existing cache keys; add execution dependencies for windows and shifts. */
 export function windowQuerySignature(ds, query) {
     const timeMeasures = selectedTimeMeasures(ds, query);
-    if (!timeMeasures.size)
+    const dependencies = measureDependencyNames(ds.measures, query.measures ?? []);
+    const nestedFormula = dependencies.some(name => {
+        const formula = getDerivedMeasure(ds.measures, name);
+        return formula && Object.values(formula.uses).some(input => getDerivedMeasure(ds.measures, input));
+    });
+    if (!timeMeasures.size && !nestedFormula)
         return {};
     return {
         windowTimeKey: ds.timeKey,
         windowTimeDimension: ds.timeKey ? ds.dimensions[ds.timeKey] : undefined,
+        baseInputs: dependencies.flatMap(name => {
+            const base = getBaseMeasure(ds.measures, name);
+            return base ? [{ name, ...measureToAggregationSpec(name, base) }] : [];
+        }),
         windows: [...timeMeasures].sort(([a], [b]) => a.localeCompare(b)).map(([name, definition]) => {
             const base = getBaseMeasure(ds.measures, definition.measure);
             return { name, ...windowCatalogMetadata(definition), base: base ? measureToAggregationSpec(definition.measure, base) : undefined };
         }),
-        windowFormulas: (query.measures ?? []).flatMap(name => {
+        windowFormulas: dependencies.flatMap(name => {
             const derived = getDerivedMeasure(ds.measures, name);
             if (!derived)
                 return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/datasets",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Code-first TypeScript semantic layer for ClickHouse datasets, metrics, multi-tenancy, and AI agents",
   "keywords": [
     "semantic-layer",
@@ -42,10 +42,10 @@
     "dist"
   ],
   "dependencies": {
-    "@hypequery/protocol": "^0.17.0",
+    "@hypequery/protocol": "^0.18.0",
     "@noble/hashes": "^1.8.0",
     "zod": "^3.22.4",
-    "zod-to-json-schema": "^3.23.5"
+    "zod-to-json-schema": "^3.25.2"
   },
   "peerDependencies": {
     "zod": "^3.22.4"
@@ -58,9 +58,9 @@
   "devDependencies": {
     "@types/node": "^18.19.80",
     "typescript": "^5.7.3",
-    "@vitest/coverage-v8": "^3.2.6",
-    "vitest": "^3.2.6",
-    "@hypequery/protocol-conformance": "^0.14.0"
+    "@vitest/coverage-v8": "^5.0.2",
+    "vitest": "^5.0.2",
+    "@hypequery/protocol-conformance": "^0.15.0"
   },
   "repository": {
     "type": "git",
@@ -83,6 +83,6 @@
     "test:types": "tsc --project tsconfig.type-tests.json",
     "test:watch": "vitest watch",
     "test:coverage": "vitest run --coverage",
-    "lint": "eslint --ext .ts \"src/**/*.ts\""
+    "lint": "eslint \"src/**/*.ts\""
   }
 }