@malloydata/malloy-interfaces 0.0.261-dev250411164723 → 0.0.261-dev250411181206

package/dist/to_malloy.js

@@ -273,6 +273,8 @@ function groupedOperationsToFragments(operations) {
             return limitToFragments(operations);
         case 'where':
             return whereToFragments(operations);
+        case 'having':
+            return havingToFragments(operations);
     }
 }
 function formatBlock(label, items, separator = '') {
@@ -407,7 +409,10 @@ function limitToFragments(limits) {
     return fragments;
 }
 function whereToFragments(where) {
-    return formatBlock('where', where.map(whereItemToFragments), ',');
+    return formatBlock('where', where.map(filterOperationItemToFragments), ',');
+}
+function havingToFragments(having) {
+    return formatBlock('having', having.map(filterOperationItemToFragments), ',');
 }
 const FILTER_QUOTES = ['`', "'", '"']; // technically , '"""', "'''" are valid too, but they're ugly
 function quoteFilter(filter) {
@@ -441,7 +446,7 @@ function escapeFilter(filter, quote) {
     }
     return result;
 }
-function whereItemToFragments(whereItem) {
+function filterOperationItemToFragments(whereItem) {
     switch (whereItem.filter.kind) {
         case 'filter_string':
             return [

package/dist/types.d.ts

@@ -220,6 +220,9 @@ export type Filter = FilterWithFilterString;
 export type FilterWithFilterString = {
     kind: 'filter_string';
 } & FilterStringApplication;
+export type FilterOperation = {
+    filter: Filter;
+};
 export type FilterStringApplication = {
     field_reference: Reference;
     filter: string;
@@ -490,8 +493,8 @@ export type ViewInfo = {
     annotations?: Array<Annotation>;
     definition?: View;
 };
-export type ViewOperationType = 'group_by' | 'aggregate' | 'order_by' | 'limit' | 'where' | 'nest';
-export type ViewOperation = ViewOperationWithGroupBy | ViewOperationWithAggregate | ViewOperationWithOrderBy | ViewOperationWithLimit | ViewOperationWithWhere | ViewOperationWithNest;
+export type ViewOperationType = 'group_by' | 'aggregate' | 'order_by' | 'limit' | 'where' | 'nest' | 'having';
+export type ViewOperation = ViewOperationWithGroupBy | ViewOperationWithAggregate | ViewOperationWithOrderBy | ViewOperationWithLimit | ViewOperationWithWhere | ViewOperationWithNest | ViewOperationWithHaving;
 export type ViewOperationWithGroupBy = {
     kind: 'group_by';
 } & GroupBy;
@@ -506,10 +509,13 @@ export type ViewOperationWithLimit = {
 } & Limit;
 export type ViewOperationWithWhere = {
     kind: 'where';
-} & Where;
+} & FilterOperation;
 export type ViewOperationWithNest = {
     kind: 'nest';
 } & Nest;
+export type ViewOperationWithHaving = {
+    kind: 'having';
+} & FilterOperation;
 export type ViewRefinement = {
     base: ViewDefinition;
     refinement: ViewDefinition;

package/dist/types.js

@@ -511,6 +511,17 @@ exports.MALLOY_INTERFACE_TYPES = {
             'filter_string': 'FilterStringApplication',
         },
     },
+    'FilterOperation': {
+        'type': 'struct',
+        'name': 'FilterOperation',
+        'fields': {
+            'filter': {
+                'type': 'Filter',
+                'optional': false,
+                'array': false,
+            },
+        },
+    },
     'FilterStringApplication': {
         'type': 'struct',
         'name': 'FilterStringApplication',
@@ -1447,8 +1458,9 @@ exports.MALLOY_INTERFACE_TYPES = {
             'aggregate': 'Aggregate',
             'order_by': 'OrderBy',
             'limit': 'Limit',
-            'where': 'Where',
+            'where': 'FilterOperation',
             'nest': 'Nest',
+            'having': 'FilterOperation',
         },
     },
     'ViewRefinement': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-interfaces",
-  "version": "0.0.261-dev250411164723",
+  "version": "0.0.261-dev250411181206",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/thrift/malloy.thrift

@@ -236,8 +236,9 @@ union ViewOperation {
   2: required Aggregate aggregate,
   3: OrderBy order_by,
   4: required Limit limit,
-  5: required Where where,
+  5: required FilterOperation where,
   6: required Nest nest,
+  7: required FilterOperation having,
 }
 
 struct GroupBy {
@@ -279,6 +280,10 @@ struct Where {
   1: required Filter filter,
 }
 
+struct FilterOperation {
+  1: required Filter filter,
+}
+
 union Filter {
   1: required FilterStringApplication filter_string,
 }