@hypequery/protocol-conformance 0.16.1 → 0.16.2

package/fixtures/deployments-v2/identity.json

@@ -28,5 +28,10 @@
     "id": "resolved-rows-versioned-collapsing",
     "canonical": "{\"datasets\":[{\"dimensions\":[],\"filters\":[],\"measures\":[],\"name\":\"users\",\"relationships\":[],\"rowResolution\":{\"engine\":\"versioned-collapsing\",\"kind\":\"final\",\"signColumn\":\"sign\"},\"source\":\"users\",\"tenant\":{\"kind\":\"not-required\"}}],\"kind\":\"hypequery-deployment\",\"version\":2}",
     "sha256": "d1391f36746a216d6fac7e4350c94bd7dec8dc6298e90033d2f476df1625ac6f"
+  },
+  {
+    "id": "merge-measures",
+    "canonical": "{\"datasets\":[{\"dimensions\":[{\"filterable\":true,\"groupable\":true,\"name\":\"day\",\"source\":{\"column\":\"day\",\"kind\":\"column\"},\"type\":\"timestamp\"}],\"filters\":[],\"measures\":[{\"aggregation\":\"merge\",\"field\":\"users\",\"filters\":[],\"name\":\"active_users\",\"stateFunction\":\"uniq\"},{\"aggregation\":\"merge\",\"field\":\"events\",\"filters\":[],\"name\":\"events\",\"stateFunction\":\"sum\"}],\"name\":\"daily_active_users\",\"relationships\":[],\"source\":\"daily_active_users\",\"tenant\":{\"kind\":\"not-required\"}}],\"kind\":\"hypequery-deployment\",\"version\":2}",
+    "sha256": "525e0df757d4056b1f370ae3666b56fc7ac9e18346506ade77a63b8968ba16da"
   }
 ]

package/fixtures/deployments-v2/rejections.json

@@ -1412,5 +1412,258 @@
       ]
     },
     "error": "HQ_DEPLOYMENT_INVALID_IDENTIFIER"
+  },
+  {
+    "id": "merge-missing-state-function",
+    "value": {
+      "kind": "hypequery-deployment",
+      "version": 2,
+      "datasets": [
+        {
+          "name": "daily_active_users",
+          "source": "daily_active_users",
+          "tenant": {
+            "kind": "not-required"
+          },
+          "dimensions": [
+            {
+              "name": "day",
+              "type": "timestamp",
+              "source": {
+                "kind": "column",
+                "column": "day"
+              },
+              "filterable": true,
+              "groupable": true
+            }
+          ],
+          "measures": [
+            {
+              "name": "active_users",
+              "aggregation": "merge",
+              "field": "users",
+              "filters": []
+            }
+          ],
+          "filters": [],
+          "relationships": []
+        }
+      ]
+    },
+    "error": "HQ_DEPLOYMENT_INVALID_VALUE"
+  },
+  {
+    "id": "merge-unlisted-state-function",
+    "value": {
+      "kind": "hypequery-deployment",
+      "version": 2,
+      "datasets": [
+        {
+          "name": "daily_active_users",
+          "source": "daily_active_users",
+          "tenant": {
+            "kind": "not-required"
+          },
+          "dimensions": [
+            {
+              "name": "day",
+              "type": "timestamp",
+              "source": {
+                "kind": "column",
+                "column": "day"
+              },
+              "filterable": true,
+              "groupable": true
+            }
+          ],
+          "measures": [
+            {
+              "name": "active_users",
+              "aggregation": "merge",
+              "field": "users",
+              "filters": [],
+              "stateFunction": "quantile"
+            }
+          ],
+          "filters": [],
+          "relationships": []
+        }
+      ]
+    },
+    "error": "HQ_DEPLOYMENT_INVALID_VALUE"
+  },
+  {
+    "id": "merge-state-function-injection",
+    "value": {
+      "kind": "hypequery-deployment",
+      "version": 2,
+      "datasets": [
+        {
+          "name": "daily_active_users",
+          "source": "daily_active_users",
+          "tenant": {
+            "kind": "not-required"
+          },
+          "dimensions": [
+            {
+              "name": "day",
+              "type": "timestamp",
+              "source": {
+                "kind": "column",
+                "column": "day"
+              },
+              "filterable": true,
+              "groupable": true
+            }
+          ],
+          "measures": [
+            {
+              "name": "active_users",
+              "aggregation": "merge",
+              "field": "users",
+              "filters": [],
+              "stateFunction": "uniq(users)) OR 1=1 --"
+            }
+          ],
+          "filters": [],
+          "relationships": []
+        }
+      ]
+    },
+    "error": "HQ_DEPLOYMENT_INVALID_VALUE"
+  },
+  {
+    "id": "state-function-without-merge",
+    "value": {
+      "kind": "hypequery-deployment",
+      "version": 2,
+      "datasets": [
+        {
+          "name": "daily_active_users",
+          "source": "daily_active_users",
+          "tenant": {
+            "kind": "not-required"
+          },
+          "dimensions": [
+            {
+              "name": "day",
+              "type": "timestamp",
+              "source": {
+                "kind": "column",
+                "column": "day"
+              },
+              "filterable": true,
+              "groupable": true
+            }
+          ],
+          "measures": [
+            {
+              "name": "total",
+              "aggregation": "sum",
+              "field": "users",
+              "stateFunction": "sum",
+              "filters": []
+            }
+          ],
+          "filters": [],
+          "relationships": []
+        }
+      ]
+    },
+    "error": "HQ_DEPLOYMENT_INVALID_VALUE"
+  },
+  {
+    "id": "merge-with-filters",
+    "value": {
+      "kind": "hypequery-deployment",
+      "version": 2,
+      "datasets": [
+        {
+          "name": "daily_active_users",
+          "source": "daily_active_users",
+          "tenant": {
+            "kind": "not-required"
+          },
+          "dimensions": [
+            {
+              "name": "day",
+              "type": "timestamp",
+              "source": {
+                "kind": "column",
+                "column": "day"
+              },
+              "filterable": true,
+              "groupable": true
+            }
+          ],
+          "measures": [
+            {
+              "name": "active_users",
+              "aggregation": "merge",
+              "field": "users",
+              "filters": [
+                {
+                  "kind": "comparison",
+                  "operator": "eq",
+                  "left": {
+                    "kind": "reference",
+                    "name": "day"
+                  },
+                  "right": {
+                    "kind": "literal",
+                    "value": "2026-10-01"
+                  }
+                }
+              ],
+              "stateFunction": "uniq"
+            }
+          ],
+          "filters": [],
+          "relationships": []
+        }
+      ]
+    },
+    "error": "HQ_DEPLOYMENT_INVALID_VALUE"
+  },
+  {
+    "id": "merge-approximate-marker-in-v2",
+    "value": {
+      "kind": "hypequery-deployment",
+      "version": 2,
+      "datasets": [
+        {
+          "name": "daily_active_users",
+          "source": "daily_active_users",
+          "tenant": {
+            "kind": "not-required"
+          },
+          "dimensions": [
+            {
+              "name": "day",
+              "type": "timestamp",
+              "source": {
+                "kind": "column",
+                "column": "day"
+              },
+              "filterable": true,
+              "groupable": true
+            }
+          ],
+          "measures": [
+            {
+              "name": "active_users",
+              "aggregation": "merge",
+              "field": "users",
+              "filters": [],
+              "stateFunction": "uniq",
+              "approximate": true
+            }
+          ],
+          "filters": [],
+          "relationships": []
+        }
+      ]
+    },
+    "error": "HQ_DEPLOYMENT_UNKNOWN_FIELD"
   }
 ]

package/fixtures/deployments-v2/success.json

@@ -211,5 +211,51 @@
         }
       ]
     }
+  },
+  {
+    "id": "merge-measures",
+    "value": {
+      "kind": "hypequery-deployment",
+      "version": 2,
+      "datasets": [
+        {
+          "name": "daily_active_users",
+          "source": "daily_active_users",
+          "tenant": {
+            "kind": "not-required"
+          },
+          "dimensions": [
+            {
+              "name": "day",
+              "type": "timestamp",
+              "source": {
+                "kind": "column",
+                "column": "day"
+              },
+              "filterable": true,
+              "groupable": true
+            }
+          ],
+          "measures": [
+            {
+              "name": "active_users",
+              "aggregation": "merge",
+              "field": "users",
+              "filters": [],
+              "stateFunction": "uniq"
+            },
+            {
+              "name": "events",
+              "aggregation": "merge",
+              "stateFunction": "sum",
+              "field": "events",
+              "filters": []
+            }
+          ],
+          "filters": [],
+          "relationships": []
+        }
+      ]
+    }
   }
 ]

package/fixtures/deployments-v3/identity.json

@@ -8,5 +8,6 @@
   {"id": "tenant-dataset-segment", "canonical": "{\"datasets\":[{\"allowedFilters\":[{\"field\":\"status\",\"name\":\"status\",\"operators\":[\"eq\",\"in\"]}],\"dimensions\":[{\"filterable\":true,\"groupable\":true,\"name\":\"tier\",\"source\":{\"column\":\"tier\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"tenantId\",\"source\":{\"column\":\"tenant_id\",\"kind\":\"column\"},\"type\":\"string\"}],\"measures\":[{\"aggregation\":\"sum\",\"field\":\"amount\",\"filters\":[],\"name\":\"revenue\"}],\"name\":\"orders\",\"relationships\":[],\"segments\":[{\"description\":\"Enterprise-tier customers\",\"name\":\"enterprise\",\"predicate\":{\"kind\":\"comparison\",\"left\":{\"kind\":\"reference\",\"name\":\"tier\"},\"operator\":\"eq\",\"right\":{\"kind\":\"literal\",\"value\":\"enterprise\"}}}],\"source\":\"orders\",\"tenant\":{\"field\":\"tenant_id\",\"kind\":\"required\"}}],\"kind\":\"hypequery-deployment\",\"version\":3}", "sha256": "931bc22705679ac4d9ab38d7b805e82cded1a8bce02c22ef6814382e09a3df66"},
   {"id":"window-and-shift-measures","canonical":"{\"datasets\":[{\"allowedFilters\":[{\"field\":\"status\",\"name\":\"status\",\"operators\":[\"eq\",\"in\"]}],\"dimensions\":[{\"filterable\":true,\"groupable\":true,\"name\":\"tier\",\"source\":{\"column\":\"tier\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"status\",\"source\":{\"column\":\"status\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"amount\",\"source\":{\"column\":\"amount\",\"kind\":\"column\"},\"type\":\"number\"},{\"filterable\":true,\"groupable\":true,\"name\":\"createdAt\",\"source\":{\"column\":\"created_at\",\"kind\":\"column\"},\"type\":\"timestamp\"}],\"measures\":[{\"aggregation\":\"sum\",\"field\":\"amount\",\"filters\":[],\"name\":\"revenue\"},{\"kind\":\"window\",\"measure\":\"revenue\",\"name\":\"revenue7d\",\"requiresTimeRange\":true,\"trailing\":{\"amount\":7,\"unit\":\"day\"}},{\"kind\":\"window\",\"measure\":\"revenue\",\"name\":\"revenueMtd\",\"requiresTimeRange\":true,\"toDate\":\"month\"},{\"cumulative\":true,\"kind\":\"window\",\"measure\":\"revenue\",\"name\":\"revenueRunning\",\"requiresTimeRange\":true},{\"interval\":{\"amount\":1,\"unit\":\"year\"},\"kind\":\"shift\",\"measure\":\"revenue\",\"name\":\"revenuePriorYear\",\"requiresTimeRange\":true},{\"expression\":{\"kind\":\"binary\",\"left\":{\"kind\":\"binary\",\"left\":{\"kind\":\"reference\",\"name\":\"now\"},\"operator\":\"subtract\",\"right\":{\"kind\":\"reference\",\"name\":\"before\"}},\"operator\":\"divide\",\"right\":{\"args\":[{\"kind\":\"reference\",\"name\":\"before\"}],\"function\":\"nullIfZero\",\"kind\":\"call\"}},\"kind\":\"derived\",\"name\":\"revenueGrowth\",\"uses\":[{\"alias\":\"now\",\"measure\":\"revenue\"},{\"alias\":\"before\",\"measure\":\"revenuePriorYear\"}]}],\"name\":\"orders\",\"relationships\":[],\"segments\":[],\"source\":\"orders\",\"tenant\":{\"kind\":\"not-required\"},\"timeField\":\"created_at\"}],\"kind\":\"hypequery-deployment\",\"version\":3}","sha256":"0fa473a785d5699f086b3512f7206ec1280dc8aefdbadacf2e3fbb903327a9b7"},
   {"id":"approximate-window","canonical":"{\"datasets\":[{\"allowedFilters\":[{\"field\":\"status\",\"name\":\"status\",\"operators\":[\"eq\",\"in\"]}],\"dimensions\":[{\"filterable\":true,\"groupable\":true,\"name\":\"tier\",\"source\":{\"column\":\"tier\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"status\",\"source\":{\"column\":\"status\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"amount\",\"source\":{\"column\":\"amount\",\"kind\":\"column\"},\"type\":\"number\"},{\"filterable\":true,\"groupable\":true,\"name\":\"createdAt\",\"source\":{\"column\":\"created_at\",\"kind\":\"column\"},\"type\":\"timestamp\"}],\"measures\":[{\"aggregation\":\"approxCountDistinct\",\"approximate\":true,\"field\":\"user_id\",\"filters\":[],\"name\":\"activeUsers\"},{\"approximate\":true,\"kind\":\"window\",\"measure\":\"activeUsers\",\"name\":\"activeUsers7d\",\"requiresTimeRange\":true,\"trailing\":{\"amount\":7,\"unit\":\"day\"}},{\"approximate\":true,\"interval\":{\"amount\":1,\"unit\":\"week\"},\"kind\":\"shift\",\"measure\":\"activeUsers\",\"name\":\"activeUsersLastWeek\",\"requiresTimeRange\":true}],\"name\":\"orders\",\"relationships\":[],\"segments\":[],\"source\":\"orders\",\"tenant\":{\"kind\":\"not-required\"},\"timeField\":\"created_at\"}],\"kind\":\"hypequery-deployment\",\"version\":3}","sha256":"38248c985f7157ec7cf8fbbb1fe8257272e8930033401c18775f4ad8f7a2eb35"},
-  {"id":"approx-count-distinct-without-segments","canonical":"{\"datasets\":[{\"allowedFilters\":[{\"field\":\"status\",\"name\":\"status\",\"operators\":[\"eq\",\"in\"]}],\"dimensions\":[{\"filterable\":true,\"groupable\":true,\"name\":\"tier\",\"source\":{\"column\":\"tier\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"status\",\"source\":{\"column\":\"status\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"amount\",\"source\":{\"column\":\"amount\",\"kind\":\"column\"},\"type\":\"number\"},{\"filterable\":true,\"groupable\":true,\"name\":\"createdAt\",\"source\":{\"column\":\"created_at\",\"kind\":\"column\"},\"type\":\"timestamp\"}],\"measures\":[{\"aggregation\":\"approxCountDistinct\",\"approximate\":true,\"field\":\"user_id\",\"filters\":[],\"name\":\"activeUsers\"},{\"aggregation\":\"approxCountDistinct\",\"approximate\":true,\"field\":\"user_id\",\"filters\":[{\"kind\":\"comparison\",\"left\":{\"kind\":\"reference\",\"name\":\"status\"},\"operator\":\"eq\",\"right\":{\"kind\":\"literal\",\"value\":\"paid\"}}],\"name\":\"approxActiveFiltered\"}],\"name\":\"orders\",\"relationships\":[],\"source\":\"orders\",\"tenant\":{\"kind\":\"not-required\"}}],\"kind\":\"hypequery-deployment\",\"version\":3}","sha256":"6759733b17f8901ffe4a0421246406cdfff8c04bad71e989d1d8af1239515ab2"}
+  {"id":"approx-count-distinct-without-segments","canonical":"{\"datasets\":[{\"allowedFilters\":[{\"field\":\"status\",\"name\":\"status\",\"operators\":[\"eq\",\"in\"]}],\"dimensions\":[{\"filterable\":true,\"groupable\":true,\"name\":\"tier\",\"source\":{\"column\":\"tier\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"status\",\"source\":{\"column\":\"status\",\"kind\":\"column\"},\"type\":\"string\"},{\"filterable\":true,\"groupable\":true,\"name\":\"amount\",\"source\":{\"column\":\"amount\",\"kind\":\"column\"},\"type\":\"number\"},{\"filterable\":true,\"groupable\":true,\"name\":\"createdAt\",\"source\":{\"column\":\"created_at\",\"kind\":\"column\"},\"type\":\"timestamp\"}],\"measures\":[{\"aggregation\":\"approxCountDistinct\",\"approximate\":true,\"field\":\"user_id\",\"filters\":[],\"name\":\"activeUsers\"},{\"aggregation\":\"approxCountDistinct\",\"approximate\":true,\"field\":\"user_id\",\"filters\":[{\"kind\":\"comparison\",\"left\":{\"kind\":\"reference\",\"name\":\"status\"},\"operator\":\"eq\",\"right\":{\"kind\":\"literal\",\"value\":\"paid\"}}],\"name\":\"approxActiveFiltered\"}],\"name\":\"orders\",\"relationships\":[],\"source\":\"orders\",\"tenant\":{\"kind\":\"not-required\"}}],\"kind\":\"hypequery-deployment\",\"version\":3}","sha256":"6759733b17f8901ffe4a0421246406cdfff8c04bad71e989d1d8af1239515ab2"},
+  {"id":"merge-measures","canonical":"{\"datasets\":[{\"allowedFilters\":[],\"dimensions\":[{\"filterable\":true,\"groupable\":true,\"name\":\"day\",\"source\":{\"column\":\"day\",\"kind\":\"column\"},\"type\":\"timestamp\"}],\"measures\":[{\"aggregation\":\"merge\",\"approximate\":true,\"field\":\"users\",\"filters\":[],\"name\":\"active_users\",\"stateFunction\":\"uniq\"},{\"aggregation\":\"merge\",\"field\":\"users\",\"filters\":[],\"name\":\"exact_users\",\"stateFunction\":\"uniqExact\"},{\"aggregation\":\"approxCountDistinct\",\"approximate\":true,\"field\":\"user_id\",\"filters\":[],\"name\":\"approx_users\"}],\"name\":\"daily_active_users\",\"relationships\":[],\"source\":\"daily_active_users\",\"tenant\":{\"kind\":\"not-required\"}}],\"kind\":\"hypequery-deployment\",\"version\":3}","sha256":"43c972e9913d33e6acff3c612f57e2c65fb9eba25c5c2179b7fe885a13955d8d"}
 ]

package/fixtures/deployments-v3/rejections.json

@@ -32,5 +32,7 @@
   {"id": "shift-with-window-frame", "value": {"kind": "hypequery-deployment", "version": 3, "datasets": [{"name": "orders", "source": "orders", "tenant": {"kind": "not-required"}, "dimensions": [{"name": "tier", "type": "string", "source": {"kind": "column", "column": "tier"}, "filterable": true, "groupable": true}, {"name": "status", "type": "string", "source": {"kind": "column", "column": "status"}, "filterable": true, "groupable": true}, {"name": "amount", "type": "number", "source": {"kind": "column", "column": "amount"}, "filterable": true, "groupable": true}, {"name": "createdAt", "type": "timestamp", "source": {"kind": "column", "column": "created_at"}, "filterable": true, "groupable": true}], "measures": [{"name": "revenue", "aggregation": "sum", "field": "amount", "filters": []}, {"kind": "shift", "requiresTimeRange": true, "name": "s", "measure": "revenue", "interval": {"amount": 1, "unit": "year"}, "cumulative": true}], "allowedFilters": [{"name": "status", "field": "status", "operators": ["eq", "in"]}], "segments": [], "relationships": [], "timeField": "created_at"}]}, "error": "HQ_DEPLOYMENT_UNKNOWN_FIELD"},
   {"id": "default-grain-still-closed", "value": {"kind": "hypequery-deployment", "version": 3, "datasets": [{"name": "orders", "source": "orders", "tenant": {"kind": "not-required"}, "dimensions": [{"name": "tier", "type": "string", "source": {"kind": "column", "column": "tier"}, "filterable": true, "groupable": true}, {"name": "status", "type": "string", "source": {"kind": "column", "column": "status"}, "filterable": true, "groupable": true}, {"name": "amount", "type": "number", "source": {"kind": "column", "column": "amount"}, "filterable": true, "groupable": true}, {"name": "createdAt", "type": "timestamp", "source": {"kind": "column", "column": "created_at"}, "filterable": true, "groupable": true}], "measures": [{"name": "revenue", "aggregation": "sum", "field": "amount", "filters": []}], "allowedFilters": [{"name": "status", "field": "status", "operators": ["eq", "in"]}], "segments": [{"name": "enterprise", "predicate": {"kind": "comparison", "operator": "eq", "left": {"kind": "reference", "name": "tier"}, "right": {"kind": "literal", "value": "enterprise"}}, "description": "Enterprise-tier customers"}], "relationships": [], "timeField": "created_at", "defaults": {"timeGrain": "second"}}]}, "error": "HQ_DEPLOYMENT_INVALID_VALUE"},
   {"id":"window-missing-time-range-marker","value":{"kind":"hypequery-deployment","version":3,"datasets":[{"name":"orders","source":"orders","tenant":{"kind":"not-required"},"dimensions":[{"name":"tier","type":"string","source":{"kind":"column","column":"tier"},"filterable":true,"groupable":true},{"name":"status","type":"string","source":{"kind":"column","column":"status"},"filterable":true,"groupable":true},{"name":"amount","type":"number","source":{"kind":"column","column":"amount"},"filterable":true,"groupable":true},{"name":"createdAt","type":"timestamp","source":{"kind":"column","column":"created_at"},"filterable":true,"groupable":true}],"measures":[{"name":"revenue","aggregation":"sum","field":"amount","filters":[]},{"kind":"window","name":"revenue7d","measure":"revenue","trailing":{"amount":7,"unit":"day"}},{"kind":"window","requiresTimeRange":true,"name":"revenueMtd","measure":"revenue","toDate":"month"},{"kind":"window","requiresTimeRange":true,"name":"revenueRunning","measure":"revenue","cumulative":true},{"kind":"shift","requiresTimeRange":true,"name":"revenuePriorYear","measure":"revenue","interval":{"amount":1,"unit":"year"}},{"kind":"derived","name":"revenueGrowth","uses":[{"alias":"now","measure":"revenue"},{"alias":"before","measure":"revenuePriorYear"}],"expression":{"kind":"binary","operator":"divide","left":{"kind":"binary","operator":"subtract","left":{"kind":"reference","name":"now"},"right":{"kind":"reference","name":"before"}},"right":{"kind":"call","function":"nullIfZero","args":[{"kind":"reference","name":"before"}]}}}],"allowedFilters":[{"name":"status","field":"status","operators":["eq","in"]}],"segments":[],"relationships":[],"timeField":"created_at"}]},"error":"HQ_DEPLOYMENT_TYPE"},
-  {"id":"shift-false-time-range-marker","value":{"kind":"hypequery-deployment","version":3,"datasets":[{"name":"orders","source":"orders","tenant":{"kind":"not-required"},"dimensions":[{"name":"tier","type":"string","source":{"kind":"column","column":"tier"},"filterable":true,"groupable":true},{"name":"status","type":"string","source":{"kind":"column","column":"status"},"filterable":true,"groupable":true},{"name":"amount","type":"number","source":{"kind":"column","column":"amount"},"filterable":true,"groupable":true},{"name":"createdAt","type":"timestamp","source":{"kind":"column","column":"created_at"},"filterable":true,"groupable":true}],"measures":[{"name":"revenue","aggregation":"sum","field":"amount","filters":[]},{"kind":"window","requiresTimeRange":true,"name":"revenue7d","measure":"revenue","trailing":{"amount":7,"unit":"day"}},{"kind":"window","requiresTimeRange":true,"name":"revenueMtd","measure":"revenue","toDate":"month"},{"kind":"window","requiresTimeRange":true,"name":"revenueRunning","measure":"revenue","cumulative":true},{"kind":"shift","requiresTimeRange":false,"name":"revenuePriorYear","measure":"revenue","interval":{"amount":1,"unit":"year"}},{"kind":"derived","name":"revenueGrowth","uses":[{"alias":"now","measure":"revenue"},{"alias":"before","measure":"revenuePriorYear"}],"expression":{"kind":"binary","operator":"divide","left":{"kind":"binary","operator":"subtract","left":{"kind":"reference","name":"now"},"right":{"kind":"reference","name":"before"}},"right":{"kind":"call","function":"nullIfZero","args":[{"kind":"reference","name":"before"}]}}}],"allowedFilters":[{"name":"status","field":"status","operators":["eq","in"]}],"segments":[],"relationships":[],"timeField":"created_at"}]},"error":"HQ_DEPLOYMENT_INVALID_VALUE"}
+  {"id":"shift-false-time-range-marker","value":{"kind":"hypequery-deployment","version":3,"datasets":[{"name":"orders","source":"orders","tenant":{"kind":"not-required"},"dimensions":[{"name":"tier","type":"string","source":{"kind":"column","column":"tier"},"filterable":true,"groupable":true},{"name":"status","type":"string","source":{"kind":"column","column":"status"},"filterable":true,"groupable":true},{"name":"amount","type":"number","source":{"kind":"column","column":"amount"},"filterable":true,"groupable":true},{"name":"createdAt","type":"timestamp","source":{"kind":"column","column":"created_at"},"filterable":true,"groupable":true}],"measures":[{"name":"revenue","aggregation":"sum","field":"amount","filters":[]},{"kind":"window","requiresTimeRange":true,"name":"revenue7d","measure":"revenue","trailing":{"amount":7,"unit":"day"}},{"kind":"window","requiresTimeRange":true,"name":"revenueMtd","measure":"revenue","toDate":"month"},{"kind":"window","requiresTimeRange":true,"name":"revenueRunning","measure":"revenue","cumulative":true},{"kind":"shift","requiresTimeRange":false,"name":"revenuePriorYear","measure":"revenue","interval":{"amount":1,"unit":"year"}},{"kind":"derived","name":"revenueGrowth","uses":[{"alias":"now","measure":"revenue"},{"alias":"before","measure":"revenuePriorYear"}],"expression":{"kind":"binary","operator":"divide","left":{"kind":"binary","operator":"subtract","left":{"kind":"reference","name":"now"},"right":{"kind":"reference","name":"before"}},"right":{"kind":"call","function":"nullIfZero","args":[{"kind":"reference","name":"before"}]}}}],"allowedFilters":[{"name":"status","field":"status","operators":["eq","in"]}],"segments":[],"relationships":[],"timeField":"created_at"}]},"error":"HQ_DEPLOYMENT_INVALID_VALUE"},
+  {"id":"merge-estimate-missing-approximate","value":{"kind":"hypequery-deployment","version":3,"datasets":[{"name":"daily_active_users","source":"daily_active_users","tenant":{"kind":"not-required"},"dimensions":[{"name":"day","type":"timestamp","source":{"kind":"column","column":"day"},"filterable":true,"groupable":true}],"measures":[{"name":"active_users","aggregation":"merge","field":"users","filters":[],"stateFunction":"uniq"},{"name":"approx_users","aggregation":"approxCountDistinct","field":"user_id","filters":[],"approximate":true}],"allowedFilters":[],"relationships":[]}]},"error":"HQ_DEPLOYMENT_INVALID_VALUE"},
+  {"id":"merge-exact-with-approximate","value":{"kind":"hypequery-deployment","version":3,"datasets":[{"name":"daily_active_users","source":"daily_active_users","tenant":{"kind":"not-required"},"dimensions":[{"name":"day","type":"timestamp","source":{"kind":"column","column":"day"},"filterable":true,"groupable":true}],"measures":[{"name":"active_users","aggregation":"merge","field":"users","filters":[],"stateFunction":"uniqExact","approximate":true},{"name":"approx_users","aggregation":"approxCountDistinct","field":"user_id","filters":[],"approximate":true}],"allowedFilters":[],"relationships":[]}]},"error":"HQ_DEPLOYMENT_INVALID_VALUE"}
 ]

package/fixtures/deployments-v3/success.json

@@ -8,5 +8,6 @@
   {"id": "tenant-dataset-segment", "value": {"kind": "hypequery-deployment", "version": 3, "datasets": [{"name": "orders", "source": "orders", "tenant": {"kind": "required", "field": "tenant_id"}, "dimensions": [{"name": "tier", "type": "string", "source": {"kind": "column", "column": "tier"}, "filterable": true, "groupable": true}, {"name": "tenantId", "type": "string", "source": {"kind": "column", "column": "tenant_id"}, "filterable": true, "groupable": true}], "measures": [{"name": "revenue", "aggregation": "sum", "field": "amount", "filters": []}], "allowedFilters": [{"name": "status", "field": "status", "operators": ["eq", "in"]}], "segments": [{"name": "enterprise", "predicate": {"kind": "comparison", "operator": "eq", "left": {"kind": "reference", "name": "tier"}, "right": {"kind": "literal", "value": "enterprise"}}, "description": "Enterprise-tier customers"}], "relationships": []}]}},
   {"id": "window-and-shift-measures", "value": {"kind": "hypequery-deployment", "version": 3, "datasets": [{"name": "orders", "source": "orders", "tenant": {"kind": "not-required"}, "dimensions": [{"name": "tier", "type": "string", "source": {"kind": "column", "column": "tier"}, "filterable": true, "groupable": true}, {"name": "status", "type": "string", "source": {"kind": "column", "column": "status"}, "filterable": true, "groupable": true}, {"name": "amount", "type": "number", "source": {"kind": "column", "column": "amount"}, "filterable": true, "groupable": true}, {"name": "createdAt", "type": "timestamp", "source": {"kind": "column", "column": "created_at"}, "filterable": true, "groupable": true}], "measures": [{"name": "revenue", "aggregation": "sum", "field": "amount", "filters": []}, {"kind": "window", "requiresTimeRange": true, "name": "revenue7d", "measure": "revenue", "trailing": {"amount": 7, "unit": "day"}}, {"kind": "window", "requiresTimeRange": true, "name": "revenueMtd", "measure": "revenue", "toDate": "month"}, {"kind": "window", "requiresTimeRange": true, "name": "revenueRunning", "measure": "revenue", "cumulative": true}, {"kind": "shift", "requiresTimeRange": true, "name": "revenuePriorYear", "measure": "revenue", "interval": {"amount": 1, "unit": "year"}}, {"kind": "derived", "name": "revenueGrowth", "uses": [{"alias": "now", "measure": "revenue"}, {"alias": "before", "measure": "revenuePriorYear"}], "expression": {"kind": "binary", "operator": "divide", "left": {"kind": "binary", "operator": "subtract", "left": {"kind": "reference", "name": "now"}, "right": {"kind": "reference", "name": "before"}}, "right": {"kind": "call", "function": "nullIfZero", "args": [{"kind": "reference", "name": "before"}]}}}], "allowedFilters": [{"name": "status", "field": "status", "operators": ["eq", "in"]}], "segments": [], "relationships": [], "timeField": "created_at"}]}},
   {"id": "approximate-window", "value": {"kind": "hypequery-deployment", "version": 3, "datasets": [{"name": "orders", "source": "orders", "tenant": {"kind": "not-required"}, "dimensions": [{"name": "tier", "type": "string", "source": {"kind": "column", "column": "tier"}, "filterable": true, "groupable": true}, {"name": "status", "type": "string", "source": {"kind": "column", "column": "status"}, "filterable": true, "groupable": true}, {"name": "amount", "type": "number", "source": {"kind": "column", "column": "amount"}, "filterable": true, "groupable": true}, {"name": "createdAt", "type": "timestamp", "source": {"kind": "column", "column": "created_at"}, "filterable": true, "groupable": true}], "measures": [{"name": "activeUsers", "aggregation": "approxCountDistinct", "field": "user_id", "filters": [], "approximate": true}, {"kind": "window", "requiresTimeRange": true, "name": "activeUsers7d", "measure": "activeUsers", "trailing": {"amount": 7, "unit": "day"}, "approximate": true}, {"kind": "shift", "requiresTimeRange": true, "name": "activeUsersLastWeek", "measure": "activeUsers", "interval": {"amount": 1, "unit": "week"}, "approximate": true}], "allowedFilters": [{"name": "status", "field": "status", "operators": ["eq", "in"]}], "segments": [], "relationships": [], "timeField": "created_at"}]}},
-  {"id":"approx-count-distinct-without-segments","value":{"kind":"hypequery-deployment","version":3,"datasets":[{"name":"orders","source":"orders","tenant":{"kind":"not-required"},"dimensions":[{"name":"tier","type":"string","source":{"kind":"column","column":"tier"},"filterable":true,"groupable":true},{"name":"status","type":"string","source":{"kind":"column","column":"status"},"filterable":true,"groupable":true},{"name":"amount","type":"number","source":{"kind":"column","column":"amount"},"filterable":true,"groupable":true},{"name":"createdAt","type":"timestamp","source":{"kind":"column","column":"created_at"},"filterable":true,"groupable":true}],"measures":[{"name":"activeUsers","aggregation":"approxCountDistinct","field":"user_id","filters":[],"approximate":true},{"name":"approxActiveFiltered","aggregation":"approxCountDistinct","field":"user_id","filters":[{"kind":"comparison","operator":"eq","left":{"kind":"reference","name":"status"},"right":{"kind":"literal","value":"paid"}}],"approximate":true}],"allowedFilters":[{"name":"status","field":"status","operators":["eq","in"]}],"relationships":[]}]}}
+  {"id":"approx-count-distinct-without-segments","value":{"kind":"hypequery-deployment","version":3,"datasets":[{"name":"orders","source":"orders","tenant":{"kind":"not-required"},"dimensions":[{"name":"tier","type":"string","source":{"kind":"column","column":"tier"},"filterable":true,"groupable":true},{"name":"status","type":"string","source":{"kind":"column","column":"status"},"filterable":true,"groupable":true},{"name":"amount","type":"number","source":{"kind":"column","column":"amount"},"filterable":true,"groupable":true},{"name":"createdAt","type":"timestamp","source":{"kind":"column","column":"created_at"},"filterable":true,"groupable":true}],"measures":[{"name":"activeUsers","aggregation":"approxCountDistinct","field":"user_id","filters":[],"approximate":true},{"name":"approxActiveFiltered","aggregation":"approxCountDistinct","field":"user_id","filters":[{"kind":"comparison","operator":"eq","left":{"kind":"reference","name":"status"},"right":{"kind":"literal","value":"paid"}}],"approximate":true}],"allowedFilters":[{"name":"status","field":"status","operators":["eq","in"]}],"relationships":[]}]}},
+  {"id":"merge-measures","value":{"kind":"hypequery-deployment","version":3,"datasets":[{"name":"daily_active_users","source":"daily_active_users","tenant":{"kind":"not-required"},"dimensions":[{"name":"day","type":"timestamp","source":{"kind":"column","column":"day"},"filterable":true,"groupable":true}],"measures":[{"name":"active_users","aggregation":"merge","field":"users","filters":[],"stateFunction":"uniq","approximate":true},{"name":"exact_users","aggregation":"merge","stateFunction":"uniqExact","field":"users","filters":[]},{"name":"approx_users","aggregation":"approxCountDistinct","field":"user_id","filters":[],"approximate":true}],"allowedFilters":[],"relationships":[]}]}}
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/protocol-conformance",
-  "version": "0.16.1",
+  "version": "0.16.2",
   "description": "Cross-language conformance runner for the Hypequery analytics security protocol",
   "keywords": [
     "hypequery",
@@ -31,7 +31,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@hypequery/protocol": "^0.22.0"
+    "@hypequery/protocol": "^0.23.0"
   },
   "devDependencies": {
     "@types/node": "^22.5.0",