@malloydata/malloy-interfaces 0.0.277 → 0.0.279

package/dist/types.d.ts

@@ -225,7 +225,9 @@ export type FilterWithFilterString = {
 export type FilterExpressionLiteral = {
     filter_expression_value: string;
 };
-export type FilterExpressionType = {};
+export type FilterExpressionType = {
+    filter_type: FilterableType;
+};
 export type FilterOperation = {
     filter: Filter;
 };
@@ -233,6 +235,23 @@ export type FilterStringApplication = {
     field_reference: Reference;
     filter: string;
 };
+export type FilterableTypeType = 'string_type' | 'boolean_type' | 'number_type' | 'date_type' | 'timestamp_type';
+export type FilterableType = FilterableTypeWithStringType | FilterableTypeWithBooleanType | FilterableTypeWithNumberType | FilterableTypeWithDateType | FilterableTypeWithTimestampType;
+export type FilterableTypeWithStringType = {
+    kind: 'string_type';
+} & StringType;
+export type FilterableTypeWithBooleanType = {
+    kind: 'boolean_type';
+} & BooleanType;
+export type FilterableTypeWithNumberType = {
+    kind: 'number_type';
+} & NumberType;
+export type FilterableTypeWithDateType = {
+    kind: 'date_type';
+} & DateType;
+export type FilterableTypeWithTimestampType = {
+    kind: 'timestamp_type';
+} & TimestampType;
 export type FilteredField = {
     field_reference: Reference;
     where: Array<FilterOperation>;

package/dist/types.js

@@ -535,7 +535,13 @@ exports.MALLOY_INTERFACE_TYPES = {
     'FilterExpressionType': {
         'type': 'struct',
         'name': 'FilterExpressionType',
-        'fields': {},
+        'fields': {
+            'filter_type': {
+                'type': 'FilterableType',
+                'optional': false,
+                'array': false,
+            },
+        },
     },
     'FilterOperation': {
         'type': 'struct',
@@ -564,6 +570,17 @@ exports.MALLOY_INTERFACE_TYPES = {
             },
         },
     },
+    'FilterableType': {
+        'type': 'union',
+        'name': 'FilterableType',
+        'options': {
+            'string_type': 'StringType',
+            'boolean_type': 'BooleanType',
+            'number_type': 'NumberType',
+            'date_type': 'DateType',
+            'timestamp_type': 'TimestampType',
+        },
+    },
     'FilteredField': {
         'type': 'struct',
         'name': 'FilteredField',

package/package.json

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

package/thrift/malloy.thrift

@@ -177,8 +177,16 @@ struct RecordType {
 }
 
 struct FilterExpressionType {
+  1: required FilterableType filter_type;
 }
 
+union FilterableType {
+  1: required StringType string_type;
+  2: required BooleanType boolean_type;
+  3: required NumberType number_type;
+  6: required DateType date_type;
+  7: required TimestampType timestamp_type;
+}
 
 union AtomicType {
   1: required StringType string_type,