@pushwoosh/rpc-v2-http-api-data 0.1.404 → 0.1.406

package/pushwoosh_objects_filters_v1.d.ts

@@ -96,85 +96,89 @@ export type LogicExpression_Field_Updated = {
     values: Date[];
 };
 export type LogicExpression_Field_kind_CondID = {
-    $: 'CondID';
-    CondID: LogicExpression_Field_ID;
+    type: 'CondID';
+    data: LogicExpression_Field_ID;
 };
 export type LogicExpression_Field_kind_CondCode = {
-    $: 'CondCode';
-    CondCode: LogicExpression_Field_Code;
+    type: 'CondCode';
+    data: LogicExpression_Field_Code;
 };
 export type LogicExpression_Field_kind_CondAccountID = {
-    $: 'CondAccountID';
-    CondAccountID: LogicExpression_Field_AccountID;
+    type: 'CondAccountID';
+    data: LogicExpression_Field_AccountID;
 };
 export type LogicExpression_Field_kind_CondName = {
-    $: 'CondName';
-    CondName: LogicExpression_Field_Name;
+    type: 'CondName';
+    data: LogicExpression_Field_Name;
 };
 export type LogicExpression_Field_kind_CondApplicationID = {
-    $: 'CondApplicationID';
-    CondApplicationID: LogicExpression_Field_ApplicationID;
+    type: 'CondApplicationID';
+    data: LogicExpression_Field_ApplicationID;
 };
 export type LogicExpression_Field_kind_CondIsFiltrationInProgress = {
-    $: 'CondIsFiltrationInProgress';
-    CondIsFiltrationInProgress: LogicExpression_Field_IsFiltrationInProgress;
+    type: 'CondIsFiltrationInProgress';
+    data: LogicExpression_Field_IsFiltrationInProgress;
 };
 export type LogicExpression_Field_kind_CondFiltrationStartedAt = {
-    $: 'CondFiltrationStartedAt';
-    CondFiltrationStartedAt: LogicExpression_Field_FiltrationStartedAt;
+    type: 'CondFiltrationStartedAt';
+    data: LogicExpression_Field_FiltrationStartedAt;
 };
 export type LogicExpression_Field_kind_CondFiltrationLastFilteredAt = {
-    $: 'CondFiltrationLastFilteredAt';
-    CondFiltrationLastFilteredAt: LogicExpression_Field_FiltrationLastFilteredAt;
+    type: 'CondFiltrationLastFilteredAt';
+    data: LogicExpression_Field_FiltrationLastFilteredAt;
 };
 export type LogicExpression_Field_kind_CondFiltrationLastCheckedAt = {
-    $: 'CondFiltrationLastCheckedAt';
-    CondFiltrationLastCheckedAt: LogicExpression_Field_FiltrationLastCheckedAt;
+    type: 'CondFiltrationLastCheckedAt';
+    data: LogicExpression_Field_FiltrationLastCheckedAt;
 };
 export type LogicExpression_Field_kind_CondFiltrationScheduledAt = {
-    $: 'CondFiltrationScheduledAt';
-    CondFiltrationScheduledAt: LogicExpression_Field_FiltrationScheduledAt;
+    type: 'CondFiltrationScheduledAt';
+    data: LogicExpression_Field_FiltrationScheduledAt;
 };
 export type LogicExpression_Field_kind_CondCheckerScheduledAt = {
-    $: 'CondCheckerScheduledAt';
-    CondCheckerScheduledAt: LogicExpression_Field_CheckerScheduledAt;
+    type: 'CondCheckerScheduledAt';
+    data: LogicExpression_Field_CheckerScheduledAt;
 };
 export type LogicExpression_Field_kind_CondIsSystem = {
-    $: 'CondIsSystem';
-    CondIsSystem: LogicExpression_Field_IsSystem;
+    type: 'CondIsSystem';
+    data: LogicExpression_Field_IsSystem;
 };
 export type LogicExpression_Field_kind_CondExpirationDate = {
-    $: 'CondExpirationDate';
-    CondExpirationDate: LogicExpression_Field_ExpirationDate;
+    type: 'CondExpirationDate';
+    data: LogicExpression_Field_ExpirationDate;
 };
 export type LogicExpression_Field_kind_CondCreated = {
-    $: 'CondCreated';
-    CondCreated: LogicExpression_Field_Created;
+    type: 'CondCreated';
+    data: LogicExpression_Field_Created;
 };
 export type LogicExpression_Field_kind_CondFilterExpressionRaw = {
-    $: 'CondFilterExpressionRaw';
-    CondFilterExpressionRaw: LogicExpression_Field_FilterExpressionRaw;
+    type: 'CondFilterExpressionRaw';
+    data: LogicExpression_Field_FilterExpressionRaw;
 };
 export type LogicExpression_Field_kind_CondFiltrationID = {
-    $: 'CondFiltrationID';
-    CondFiltrationID: LogicExpression_Field_FiltrationID;
+    type: 'CondFiltrationID';
+    data: LogicExpression_Field_FiltrationID;
 };
 export type LogicExpression_Field_kind_CondUpdated = {
-    $: 'CondUpdated';
-    CondUpdated: LogicExpression_Field_Updated;
+    type: 'CondUpdated';
+    data: LogicExpression_Field_Updated;
 };
 export type LogicExpression_Field_kind = LogicExpression_Field_kind_CondID | LogicExpression_Field_kind_CondCode | LogicExpression_Field_kind_CondAccountID | LogicExpression_Field_kind_CondName | LogicExpression_Field_kind_CondApplicationID | LogicExpression_Field_kind_CondIsFiltrationInProgress | LogicExpression_Field_kind_CondFiltrationStartedAt | LogicExpression_Field_kind_CondFiltrationLastFilteredAt | LogicExpression_Field_kind_CondFiltrationLastCheckedAt | LogicExpression_Field_kind_CondFiltrationScheduledAt | LogicExpression_Field_kind_CondCheckerScheduledAt | LogicExpression_Field_kind_CondIsSystem | LogicExpression_Field_kind_CondExpirationDate | LogicExpression_Field_kind_CondCreated | LogicExpression_Field_kind_CondFilterExpressionRaw | LogicExpression_Field_kind_CondFiltrationID | LogicExpression_Field_kind_CondUpdated;
-export type LogicExpression_Field = {} & LogicExpression_Field_kind;
+export type LogicExpression_Field = {
+    kind: LogicExpression_Field_kind;
+};
 export type LogicExpression_kind_binary = {
-    $: 'binary';
-    binary: LogicExpression_Binary;
+    type: 'binary';
+    data: LogicExpression_Binary;
 };
 export type LogicExpression_kind_field = {
-    $: 'field';
-    field: LogicExpression_Field;
+    type: 'field';
+    data: LogicExpression_Field;
 };
 export type LogicExpression_kind = LogicExpression_kind_binary | LogicExpression_kind_field;
-export type LogicExpression = {} & LogicExpression_kind;
+export type LogicExpression = {
+    kind: LogicExpression_kind;
+};
 export type Sort = {
     field: string;
     order: SortOrder;
@@ -424,27 +428,29 @@ export type FilterExpression_BestTimeToSend_Value_Gte = {
 };
 export type FilterExpression_BestTimeToSend_Value_Any = {};
 export type FilterExpression_BestTimeToSend_Value_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_BestTimeToSend_Value_Eq;
+    type: 'eq';
+    data: FilterExpression_BestTimeToSend_Value_Eq;
 };
 export type FilterExpression_BestTimeToSend_Value_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_BestTimeToSend_Value_Neq;
+    type: 'neq';
+    data: FilterExpression_BestTimeToSend_Value_Neq;
 };
 export type FilterExpression_BestTimeToSend_Value_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_BestTimeToSend_Value_Lte;
+    type: 'lte';
+    data: FilterExpression_BestTimeToSend_Value_Lte;
 };
 export type FilterExpression_BestTimeToSend_Value_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_BestTimeToSend_Value_Gte;
+    type: 'gte';
+    data: FilterExpression_BestTimeToSend_Value_Gte;
 };
 export type FilterExpression_BestTimeToSend_Value_kind_any = {
-    $: 'any';
-    any: FilterExpression_BestTimeToSend_Value_Any;
+    type: 'any';
+    data: FilterExpression_BestTimeToSend_Value_Any;
 };
 export type FilterExpression_BestTimeToSend_Value_kind = FilterExpression_BestTimeToSend_Value_kind_eq | FilterExpression_BestTimeToSend_Value_kind_neq | FilterExpression_BestTimeToSend_Value_kind_lte | FilterExpression_BestTimeToSend_Value_kind_gte | FilterExpression_BestTimeToSend_Value_kind_any;
-export type FilterExpression_BestTimeToSend_Value = {} & FilterExpression_BestTimeToSend_Value_kind;
+export type FilterExpression_BestTimeToSend_Value = {
+    kind: FilterExpression_BestTimeToSend_Value_kind;
+};
 export type FilterExpression_BestTimeToSend = {
     applications: string[];
     value: FilterExpression_BestTimeToSend_Value;
@@ -490,43 +496,45 @@ export type FilterExpression_Event_Date_DaysAgo = {
     values: number[];
 };
 export type FilterExpression_Event_Date_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Event_Date_Eq;
+    type: 'eq';
+    data: FilterExpression_Event_Date_Eq;
 };
 export type FilterExpression_Event_Date_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Event_Date_Neq;
+    type: 'neq';
+    data: FilterExpression_Event_Date_Neq;
 };
 export type FilterExpression_Event_Date_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Event_Date_Lte;
+    type: 'lte';
+    data: FilterExpression_Event_Date_Lte;
 };
 export type FilterExpression_Event_Date_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Event_Date_Gte;
+    type: 'gte';
+    data: FilterExpression_Event_Date_Gte;
 };
 export type FilterExpression_Event_Date_kind_in = {
-    $: 'in';
-    in: FilterExpression_Event_Date_In;
+    type: 'in';
+    data: FilterExpression_Event_Date_In;
 };
 export type FilterExpression_Event_Date_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Event_Date_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Event_Date_NotIn;
 };
 export type FilterExpression_Event_Date_kind_between = {
-    $: 'between';
-    between: FilterExpression_Event_Date_Between;
+    type: 'between';
+    data: FilterExpression_Event_Date_Between;
 };
 export type FilterExpression_Event_Date_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Event_Date_Exists;
+    type: 'exists';
+    data: FilterExpression_Event_Date_Exists;
 };
 export type FilterExpression_Event_Date_kind_daysAgo = {
-    $: 'daysAgo';
-    daysAgo: FilterExpression_Event_Date_DaysAgo;
+    type: 'daysAgo';
+    data: FilterExpression_Event_Date_DaysAgo;
 };
 export type FilterExpression_Event_Date_kind = FilterExpression_Event_Date_kind_eq | FilterExpression_Event_Date_kind_neq | FilterExpression_Event_Date_kind_lte | FilterExpression_Event_Date_kind_gte | FilterExpression_Event_Date_kind_in | FilterExpression_Event_Date_kind_notIn | FilterExpression_Event_Date_kind_between | FilterExpression_Event_Date_kind_exists | FilterExpression_Event_Date_kind_daysAgo;
-export type FilterExpression_Event_Date = {} & FilterExpression_Event_Date_kind;
+export type FilterExpression_Event_Date = {
+    kind: FilterExpression_Event_Date_kind;
+};
 export type FilterExpression_Event_Attribute_Integer_Eq = {
     value: number;
 };
@@ -553,39 +561,41 @@ export type FilterExpression_Event_Attribute_Integer_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Event_Attribute_Integer_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Event_Attribute_Integer_Eq;
+    type: 'eq';
+    data: FilterExpression_Event_Attribute_Integer_Eq;
 };
 export type FilterExpression_Event_Attribute_Integer_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Event_Attribute_Integer_Neq;
+    type: 'neq';
+    data: FilterExpression_Event_Attribute_Integer_Neq;
 };
 export type FilterExpression_Event_Attribute_Integer_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Event_Attribute_Integer_Lte;
+    type: 'lte';
+    data: FilterExpression_Event_Attribute_Integer_Lte;
 };
 export type FilterExpression_Event_Attribute_Integer_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Event_Attribute_Integer_Gte;
+    type: 'gte';
+    data: FilterExpression_Event_Attribute_Integer_Gte;
 };
 export type FilterExpression_Event_Attribute_Integer_kind_in = {
-    $: 'in';
-    in: FilterExpression_Event_Attribute_Integer_In;
+    type: 'in';
+    data: FilterExpression_Event_Attribute_Integer_In;
 };
 export type FilterExpression_Event_Attribute_Integer_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Event_Attribute_Integer_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Event_Attribute_Integer_NotIn;
 };
 export type FilterExpression_Event_Attribute_Integer_kind_between = {
-    $: 'between';
-    between: FilterExpression_Event_Attribute_Integer_Between;
+    type: 'between';
+    data: FilterExpression_Event_Attribute_Integer_Between;
 };
 export type FilterExpression_Event_Attribute_Integer_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Event_Attribute_Integer_Exists;
+    type: 'exists';
+    data: FilterExpression_Event_Attribute_Integer_Exists;
 };
 export type FilterExpression_Event_Attribute_Integer_kind = FilterExpression_Event_Attribute_Integer_kind_eq | FilterExpression_Event_Attribute_Integer_kind_neq | FilterExpression_Event_Attribute_Integer_kind_lte | FilterExpression_Event_Attribute_Integer_kind_gte | FilterExpression_Event_Attribute_Integer_kind_in | FilterExpression_Event_Attribute_Integer_kind_notIn | FilterExpression_Event_Attribute_Integer_kind_between | FilterExpression_Event_Attribute_Integer_kind_exists;
-export type FilterExpression_Event_Attribute_Integer = {} & FilterExpression_Event_Attribute_Integer_kind;
+export type FilterExpression_Event_Attribute_Integer = {
+    kind: FilterExpression_Event_Attribute_Integer_kind;
+};
 export type FilterExpression_Event_Attribute_String_Eq = {
     value: string;
 };
@@ -611,39 +621,41 @@ export type FilterExpression_Event_Attribute_String_Contains = {
     value: string;
 };
 export type FilterExpression_Event_Attribute_String_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Event_Attribute_String_Eq;
+    type: 'eq';
+    data: FilterExpression_Event_Attribute_String_Eq;
 };
 export type FilterExpression_Event_Attribute_String_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Event_Attribute_String_Neq;
+    type: 'neq';
+    data: FilterExpression_Event_Attribute_String_Neq;
 };
 export type FilterExpression_Event_Attribute_String_kind_in = {
-    $: 'in';
-    in: FilterExpression_Event_Attribute_String_In;
+    type: 'in';
+    data: FilterExpression_Event_Attribute_String_In;
 };
 export type FilterExpression_Event_Attribute_String_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Event_Attribute_String_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Event_Attribute_String_NotIn;
 };
 export type FilterExpression_Event_Attribute_String_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Event_Attribute_String_Exists;
+    type: 'exists';
+    data: FilterExpression_Event_Attribute_String_Exists;
 };
 export type FilterExpression_Event_Attribute_String_kind_startsWith = {
-    $: 'startsWith';
-    startsWith: FilterExpression_Event_Attribute_String_StartsWith;
+    type: 'startsWith';
+    data: FilterExpression_Event_Attribute_String_StartsWith;
 };
 export type FilterExpression_Event_Attribute_String_kind_endsWith = {
-    $: 'endsWith';
-    endsWith: FilterExpression_Event_Attribute_String_EndsWith;
+    type: 'endsWith';
+    data: FilterExpression_Event_Attribute_String_EndsWith;
 };
 export type FilterExpression_Event_Attribute_String_kind_contains = {
-    $: 'contains';
-    contains: FilterExpression_Event_Attribute_String_Contains;
+    type: 'contains';
+    data: FilterExpression_Event_Attribute_String_Contains;
 };
 export type FilterExpression_Event_Attribute_String_kind = FilterExpression_Event_Attribute_String_kind_eq | FilterExpression_Event_Attribute_String_kind_neq | FilterExpression_Event_Attribute_String_kind_in | FilterExpression_Event_Attribute_String_kind_notIn | FilterExpression_Event_Attribute_String_kind_exists | FilterExpression_Event_Attribute_String_kind_startsWith | FilterExpression_Event_Attribute_String_kind_endsWith | FilterExpression_Event_Attribute_String_kind_contains;
-export type FilterExpression_Event_Attribute_String = {} & FilterExpression_Event_Attribute_String_kind;
+export type FilterExpression_Event_Attribute_String = {
+    kind: FilterExpression_Event_Attribute_String_kind;
+};
 export type FilterExpression_Event_Attribute_List_In = {
     values: string[];
 };
@@ -654,19 +666,21 @@ export type FilterExpression_Event_Attribute_List_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Event_Attribute_List_kind_in = {
-    $: 'in';
-    in: FilterExpression_Event_Attribute_List_In;
+    type: 'in';
+    data: FilterExpression_Event_Attribute_List_In;
 };
 export type FilterExpression_Event_Attribute_List_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Event_Attribute_List_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Event_Attribute_List_NotIn;
 };
 export type FilterExpression_Event_Attribute_List_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Event_Attribute_List_Exists;
+    type: 'exists';
+    data: FilterExpression_Event_Attribute_List_Exists;
 };
 export type FilterExpression_Event_Attribute_List_kind = FilterExpression_Event_Attribute_List_kind_in | FilterExpression_Event_Attribute_List_kind_notIn | FilterExpression_Event_Attribute_List_kind_exists;
-export type FilterExpression_Event_Attribute_List = {} & FilterExpression_Event_Attribute_List_kind;
+export type FilterExpression_Event_Attribute_List = {
+    kind: FilterExpression_Event_Attribute_List_kind;
+};
 export type FilterExpression_Event_Attribute_Date_Eq = {
     value: Date;
 };
@@ -699,43 +713,45 @@ export type FilterExpression_Event_Attribute_Date_DaysAgo = {
     values: number[];
 };
 export type FilterExpression_Event_Attribute_Date_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Event_Attribute_Date_Eq;
+    type: 'eq';
+    data: FilterExpression_Event_Attribute_Date_Eq;
 };
 export type FilterExpression_Event_Attribute_Date_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Event_Attribute_Date_Neq;
+    type: 'neq';
+    data: FilterExpression_Event_Attribute_Date_Neq;
 };
 export type FilterExpression_Event_Attribute_Date_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Event_Attribute_Date_Lte;
+    type: 'lte';
+    data: FilterExpression_Event_Attribute_Date_Lte;
 };
 export type FilterExpression_Event_Attribute_Date_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Event_Attribute_Date_Gte;
+    type: 'gte';
+    data: FilterExpression_Event_Attribute_Date_Gte;
 };
 export type FilterExpression_Event_Attribute_Date_kind_in = {
-    $: 'in';
-    in: FilterExpression_Event_Attribute_Date_In;
+    type: 'in';
+    data: FilterExpression_Event_Attribute_Date_In;
 };
 export type FilterExpression_Event_Attribute_Date_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Event_Attribute_Date_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Event_Attribute_Date_NotIn;
 };
 export type FilterExpression_Event_Attribute_Date_kind_between = {
-    $: 'between';
-    between: FilterExpression_Event_Attribute_Date_Between;
+    type: 'between';
+    data: FilterExpression_Event_Attribute_Date_Between;
 };
 export type FilterExpression_Event_Attribute_Date_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Event_Attribute_Date_Exists;
+    type: 'exists';
+    data: FilterExpression_Event_Attribute_Date_Exists;
 };
 export type FilterExpression_Event_Attribute_Date_kind_daysAgo = {
-    $: 'daysAgo';
-    daysAgo: FilterExpression_Event_Attribute_Date_DaysAgo;
+    type: 'daysAgo';
+    data: FilterExpression_Event_Attribute_Date_DaysAgo;
 };
 export type FilterExpression_Event_Attribute_Date_kind = FilterExpression_Event_Attribute_Date_kind_eq | FilterExpression_Event_Attribute_Date_kind_neq | FilterExpression_Event_Attribute_Date_kind_lte | FilterExpression_Event_Attribute_Date_kind_gte | FilterExpression_Event_Attribute_Date_kind_in | FilterExpression_Event_Attribute_Date_kind_notIn | FilterExpression_Event_Attribute_Date_kind_between | FilterExpression_Event_Attribute_Date_kind_exists | FilterExpression_Event_Attribute_Date_kind_daysAgo;
-export type FilterExpression_Event_Attribute_Date = {} & FilterExpression_Event_Attribute_Date_kind;
+export type FilterExpression_Event_Attribute_Date = {
+    kind: FilterExpression_Event_Attribute_Date_kind;
+};
 export type FilterExpression_Event_Attribute_Boolean_Eq = {
     value: boolean;
 };
@@ -746,19 +762,21 @@ export type FilterExpression_Event_Attribute_Boolean_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Event_Attribute_Boolean_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Event_Attribute_Boolean_Eq;
+    type: 'eq';
+    data: FilterExpression_Event_Attribute_Boolean_Eq;
 };
 export type FilterExpression_Event_Attribute_Boolean_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Event_Attribute_Boolean_Neq;
+    type: 'neq';
+    data: FilterExpression_Event_Attribute_Boolean_Neq;
 };
 export type FilterExpression_Event_Attribute_Boolean_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Event_Attribute_Boolean_Exists;
+    type: 'exists';
+    data: FilterExpression_Event_Attribute_Boolean_Exists;
 };
 export type FilterExpression_Event_Attribute_Boolean_kind = FilterExpression_Event_Attribute_Boolean_kind_eq | FilterExpression_Event_Attribute_Boolean_kind_neq | FilterExpression_Event_Attribute_Boolean_kind_exists;
-export type FilterExpression_Event_Attribute_Boolean = {} & FilterExpression_Event_Attribute_Boolean_kind;
+export type FilterExpression_Event_Attribute_Boolean = {
+    kind: FilterExpression_Event_Attribute_Boolean_kind;
+};
 export type FilterExpression_Event_Attribute_Price_Eq = {
     value: number;
 };
@@ -785,67 +803,70 @@ export type FilterExpression_Event_Attribute_Price_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Event_Attribute_Price_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Event_Attribute_Price_Eq;
+    type: 'eq';
+    data: FilterExpression_Event_Attribute_Price_Eq;
 };
 export type FilterExpression_Event_Attribute_Price_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Event_Attribute_Price_Neq;
+    type: 'neq';
+    data: FilterExpression_Event_Attribute_Price_Neq;
 };
 export type FilterExpression_Event_Attribute_Price_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Event_Attribute_Price_Lte;
+    type: 'lte';
+    data: FilterExpression_Event_Attribute_Price_Lte;
 };
 export type FilterExpression_Event_Attribute_Price_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Event_Attribute_Price_Gte;
+    type: 'gte';
+    data: FilterExpression_Event_Attribute_Price_Gte;
 };
 export type FilterExpression_Event_Attribute_Price_kind_in = {
-    $: 'in';
-    in: FilterExpression_Event_Attribute_Price_In;
+    type: 'in';
+    data: FilterExpression_Event_Attribute_Price_In;
 };
 export type FilterExpression_Event_Attribute_Price_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Event_Attribute_Price_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Event_Attribute_Price_NotIn;
 };
 export type FilterExpression_Event_Attribute_Price_kind_between = {
-    $: 'between';
-    between: FilterExpression_Event_Attribute_Price_Between;
+    type: 'between';
+    data: FilterExpression_Event_Attribute_Price_Between;
 };
 export type FilterExpression_Event_Attribute_Price_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Event_Attribute_Price_Exists;
+    type: 'exists';
+    data: FilterExpression_Event_Attribute_Price_Exists;
 };
 export type FilterExpression_Event_Attribute_Price_kind = FilterExpression_Event_Attribute_Price_kind_eq | FilterExpression_Event_Attribute_Price_kind_neq | FilterExpression_Event_Attribute_Price_kind_lte | FilterExpression_Event_Attribute_Price_kind_gte | FilterExpression_Event_Attribute_Price_kind_in | FilterExpression_Event_Attribute_Price_kind_notIn | FilterExpression_Event_Attribute_Price_kind_between | FilterExpression_Event_Attribute_Price_kind_exists;
-export type FilterExpression_Event_Attribute_Price = {} & FilterExpression_Event_Attribute_Price_kind;
+export type FilterExpression_Event_Attribute_Price = {
+    kind: FilterExpression_Event_Attribute_Price_kind;
+};
 export type FilterExpression_Event_Attribute_kind_integer = {
-    $: 'integer';
-    integer: FilterExpression_Event_Attribute_Integer;
+    type: 'integer';
+    data: FilterExpression_Event_Attribute_Integer;
 };
 export type FilterExpression_Event_Attribute_kind_string = {
-    $: 'string';
-    string: FilterExpression_Event_Attribute_String;
+    type: 'string';
+    data: FilterExpression_Event_Attribute_String;
 };
 export type FilterExpression_Event_Attribute_kind_list = {
-    $: 'list';
-    list: FilterExpression_Event_Attribute_List;
+    type: 'list';
+    data: FilterExpression_Event_Attribute_List;
 };
 export type FilterExpression_Event_Attribute_kind_date = {
-    $: 'date';
-    date: FilterExpression_Event_Attribute_Date;
+    type: 'date';
+    data: FilterExpression_Event_Attribute_Date;
 };
 export type FilterExpression_Event_Attribute_kind_boolean = {
-    $: 'boolean';
-    boolean: FilterExpression_Event_Attribute_Boolean;
+    type: 'boolean';
+    data: FilterExpression_Event_Attribute_Boolean;
 };
 export type FilterExpression_Event_Attribute_kind_price = {
-    $: 'price';
-    price: FilterExpression_Event_Attribute_Price;
+    type: 'price';
+    data: FilterExpression_Event_Attribute_Price;
 };
 export type FilterExpression_Event_Attribute_kind = FilterExpression_Event_Attribute_kind_integer | FilterExpression_Event_Attribute_kind_string | FilterExpression_Event_Attribute_kind_list | FilterExpression_Event_Attribute_kind_date | FilterExpression_Event_Attribute_kind_boolean | FilterExpression_Event_Attribute_kind_price;
 export type FilterExpression_Event_Attribute = {
     name: string;
-} & FilterExpression_Event_Attribute_kind;
+    kind: FilterExpression_Event_Attribute_kind;
+};
 export type FilterExpression_Event = {
     application: string;
     event: string;
@@ -866,19 +887,21 @@ export type FilterExpression_Updated_Condition_Between = {
 };
 export type FilterExpression_Updated_Condition_Operator = 'OPERATOR_UNSPECIFIED' | 'OPERATOR_LTE' | 'OPERATOR_GTE' | 'OPERATOR_BETWEEN';
 export type FilterExpression_Updated_Condition_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Updated_Condition_Lte;
+    type: 'lte';
+    data: FilterExpression_Updated_Condition_Lte;
 };
 export type FilterExpression_Updated_Condition_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Updated_Condition_Gte;
+    type: 'gte';
+    data: FilterExpression_Updated_Condition_Gte;
 };
 export type FilterExpression_Updated_Condition_kind_between = {
-    $: 'between';
-    between: FilterExpression_Updated_Condition_Between;
+    type: 'between';
+    data: FilterExpression_Updated_Condition_Between;
 };
 export type FilterExpression_Updated_Condition_kind = FilterExpression_Updated_Condition_kind_lte | FilterExpression_Updated_Condition_kind_gte | FilterExpression_Updated_Condition_kind_between;
-export type FilterExpression_Updated_Condition = {} & FilterExpression_Updated_Condition_kind;
+export type FilterExpression_Updated_Condition = {
+    kind: FilterExpression_Updated_Condition_kind;
+};
 export type FilterExpression_Updated = {
     application: string;
     condition: FilterExpression_Updated_Condition;
@@ -909,39 +932,41 @@ export type FilterExpression_Tag_Integer_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Tag_Integer_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Tag_Integer_Eq;
+    type: 'eq';
+    data: FilterExpression_Tag_Integer_Eq;
 };
 export type FilterExpression_Tag_Integer_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Tag_Integer_Neq;
+    type: 'neq';
+    data: FilterExpression_Tag_Integer_Neq;
 };
 export type FilterExpression_Tag_Integer_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Tag_Integer_Lte;
+    type: 'lte';
+    data: FilterExpression_Tag_Integer_Lte;
 };
 export type FilterExpression_Tag_Integer_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Tag_Integer_Gte;
+    type: 'gte';
+    data: FilterExpression_Tag_Integer_Gte;
 };
 export type FilterExpression_Tag_Integer_kind_in = {
-    $: 'in';
-    in: FilterExpression_Tag_Integer_In;
+    type: 'in';
+    data: FilterExpression_Tag_Integer_In;
 };
 export type FilterExpression_Tag_Integer_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Tag_Integer_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Tag_Integer_NotIn;
 };
 export type FilterExpression_Tag_Integer_kind_between = {
-    $: 'between';
-    between: FilterExpression_Tag_Integer_Between;
+    type: 'between';
+    data: FilterExpression_Tag_Integer_Between;
 };
 export type FilterExpression_Tag_Integer_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Tag_Integer_Exists;
+    type: 'exists';
+    data: FilterExpression_Tag_Integer_Exists;
 };
 export type FilterExpression_Tag_Integer_kind = FilterExpression_Tag_Integer_kind_eq | FilterExpression_Tag_Integer_kind_neq | FilterExpression_Tag_Integer_kind_lte | FilterExpression_Tag_Integer_kind_gte | FilterExpression_Tag_Integer_kind_in | FilterExpression_Tag_Integer_kind_notIn | FilterExpression_Tag_Integer_kind_between | FilterExpression_Tag_Integer_kind_exists;
-export type FilterExpression_Tag_Integer = {} & FilterExpression_Tag_Integer_kind;
+export type FilterExpression_Tag_Integer = {
+    kind: FilterExpression_Tag_Integer_kind;
+};
 export type FilterExpression_Tag_String_Eq = {
     value: string;
 };
@@ -967,39 +992,41 @@ export type FilterExpression_Tag_String_Contains = {
     value: string;
 };
 export type FilterExpression_Tag_String_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Tag_String_Eq;
+    type: 'eq';
+    data: FilterExpression_Tag_String_Eq;
 };
 export type FilterExpression_Tag_String_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Tag_String_Neq;
+    type: 'neq';
+    data: FilterExpression_Tag_String_Neq;
 };
 export type FilterExpression_Tag_String_kind_in = {
-    $: 'in';
-    in: FilterExpression_Tag_String_In;
+    type: 'in';
+    data: FilterExpression_Tag_String_In;
 };
 export type FilterExpression_Tag_String_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Tag_String_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Tag_String_NotIn;
 };
 export type FilterExpression_Tag_String_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Tag_String_Exists;
+    type: 'exists';
+    data: FilterExpression_Tag_String_Exists;
 };
 export type FilterExpression_Tag_String_kind_startsWith = {
-    $: 'startsWith';
-    startsWith: FilterExpression_Tag_String_StartsWith;
+    type: 'startsWith';
+    data: FilterExpression_Tag_String_StartsWith;
 };
 export type FilterExpression_Tag_String_kind_endsWith = {
-    $: 'endsWith';
-    endsWith: FilterExpression_Tag_String_EndsWith;
+    type: 'endsWith';
+    data: FilterExpression_Tag_String_EndsWith;
 };
 export type FilterExpression_Tag_String_kind_contains = {
-    $: 'contains';
-    contains: FilterExpression_Tag_String_Contains;
+    type: 'contains';
+    data: FilterExpression_Tag_String_Contains;
 };
 export type FilterExpression_Tag_String_kind = FilterExpression_Tag_String_kind_eq | FilterExpression_Tag_String_kind_neq | FilterExpression_Tag_String_kind_in | FilterExpression_Tag_String_kind_notIn | FilterExpression_Tag_String_kind_exists | FilterExpression_Tag_String_kind_startsWith | FilterExpression_Tag_String_kind_endsWith | FilterExpression_Tag_String_kind_contains;
-export type FilterExpression_Tag_String = {} & FilterExpression_Tag_String_kind;
+export type FilterExpression_Tag_String = {
+    kind: FilterExpression_Tag_String_kind;
+};
 export type FilterExpression_Tag_List_In = {
     values: string[];
 };
@@ -1010,19 +1037,21 @@ export type FilterExpression_Tag_List_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Tag_List_kind_in = {
-    $: 'in';
-    in: FilterExpression_Tag_List_In;
+    type: 'in';
+    data: FilterExpression_Tag_List_In;
 };
 export type FilterExpression_Tag_List_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Tag_List_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Tag_List_NotIn;
 };
 export type FilterExpression_Tag_List_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Tag_List_Exists;
+    type: 'exists';
+    data: FilterExpression_Tag_List_Exists;
 };
 export type FilterExpression_Tag_List_kind = FilterExpression_Tag_List_kind_in | FilterExpression_Tag_List_kind_notIn | FilterExpression_Tag_List_kind_exists;
-export type FilterExpression_Tag_List = {} & FilterExpression_Tag_List_kind;
+export type FilterExpression_Tag_List = {
+    kind: FilterExpression_Tag_List_kind;
+};
 export type FilterExpression_Tag_Date_Eq = {
     value: Date;
 };
@@ -1055,43 +1084,45 @@ export type FilterExpression_Tag_Date_DaysAgo = {
     values: number[];
 };
 export type FilterExpression_Tag_Date_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Tag_Date_Eq;
+    type: 'eq';
+    data: FilterExpression_Tag_Date_Eq;
 };
 export type FilterExpression_Tag_Date_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Tag_Date_Neq;
+    type: 'neq';
+    data: FilterExpression_Tag_Date_Neq;
 };
 export type FilterExpression_Tag_Date_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Tag_Date_Lte;
+    type: 'lte';
+    data: FilterExpression_Tag_Date_Lte;
 };
 export type FilterExpression_Tag_Date_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Tag_Date_Gte;
+    type: 'gte';
+    data: FilterExpression_Tag_Date_Gte;
 };
 export type FilterExpression_Tag_Date_kind_in = {
-    $: 'in';
-    in: FilterExpression_Tag_Date_In;
+    type: 'in';
+    data: FilterExpression_Tag_Date_In;
 };
 export type FilterExpression_Tag_Date_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Tag_Date_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Tag_Date_NotIn;
 };
 export type FilterExpression_Tag_Date_kind_between = {
-    $: 'between';
-    between: FilterExpression_Tag_Date_Between;
+    type: 'between';
+    data: FilterExpression_Tag_Date_Between;
 };
 export type FilterExpression_Tag_Date_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Tag_Date_Exists;
+    type: 'exists';
+    data: FilterExpression_Tag_Date_Exists;
 };
 export type FilterExpression_Tag_Date_kind_daysAgo = {
-    $: 'daysAgo';
-    daysAgo: FilterExpression_Tag_Date_DaysAgo;
+    type: 'daysAgo';
+    data: FilterExpression_Tag_Date_DaysAgo;
 };
 export type FilterExpression_Tag_Date_kind = FilterExpression_Tag_Date_kind_eq | FilterExpression_Tag_Date_kind_neq | FilterExpression_Tag_Date_kind_lte | FilterExpression_Tag_Date_kind_gte | FilterExpression_Tag_Date_kind_in | FilterExpression_Tag_Date_kind_notIn | FilterExpression_Tag_Date_kind_between | FilterExpression_Tag_Date_kind_exists | FilterExpression_Tag_Date_kind_daysAgo;
-export type FilterExpression_Tag_Date = {} & FilterExpression_Tag_Date_kind;
+export type FilterExpression_Tag_Date = {
+    kind: FilterExpression_Tag_Date_kind;
+};
 export type FilterExpression_Tag_Boolean_Eq = {
     value: boolean;
 };
@@ -1102,19 +1133,21 @@ export type FilterExpression_Tag_Boolean_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Tag_Boolean_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Tag_Boolean_Eq;
+    type: 'eq';
+    data: FilterExpression_Tag_Boolean_Eq;
 };
 export type FilterExpression_Tag_Boolean_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Tag_Boolean_Neq;
+    type: 'neq';
+    data: FilterExpression_Tag_Boolean_Neq;
 };
 export type FilterExpression_Tag_Boolean_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Tag_Boolean_Exists;
+    type: 'exists';
+    data: FilterExpression_Tag_Boolean_Exists;
 };
 export type FilterExpression_Tag_Boolean_kind = FilterExpression_Tag_Boolean_kind_eq | FilterExpression_Tag_Boolean_kind_neq | FilterExpression_Tag_Boolean_kind_exists;
-export type FilterExpression_Tag_Boolean = {} & FilterExpression_Tag_Boolean_kind;
+export type FilterExpression_Tag_Boolean = {
+    kind: FilterExpression_Tag_Boolean_kind;
+};
 export type FilterExpression_Tag_Price_Eq = {
     value: number;
 };
@@ -1141,39 +1174,41 @@ export type FilterExpression_Tag_Price_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Tag_Price_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Tag_Price_Eq;
+    type: 'eq';
+    data: FilterExpression_Tag_Price_Eq;
 };
 export type FilterExpression_Tag_Price_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Tag_Price_Neq;
+    type: 'neq';
+    data: FilterExpression_Tag_Price_Neq;
 };
 export type FilterExpression_Tag_Price_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Tag_Price_Lte;
+    type: 'lte';
+    data: FilterExpression_Tag_Price_Lte;
 };
 export type FilterExpression_Tag_Price_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Tag_Price_Gte;
+    type: 'gte';
+    data: FilterExpression_Tag_Price_Gte;
 };
 export type FilterExpression_Tag_Price_kind_in = {
-    $: 'in';
-    in: FilterExpression_Tag_Price_In;
+    type: 'in';
+    data: FilterExpression_Tag_Price_In;
 };
 export type FilterExpression_Tag_Price_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Tag_Price_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Tag_Price_NotIn;
 };
 export type FilterExpression_Tag_Price_kind_between = {
-    $: 'between';
-    between: FilterExpression_Tag_Price_Between;
+    type: 'between';
+    data: FilterExpression_Tag_Price_Between;
 };
 export type FilterExpression_Tag_Price_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Tag_Price_Exists;
+    type: 'exists';
+    data: FilterExpression_Tag_Price_Exists;
 };
 export type FilterExpression_Tag_Price_kind = FilterExpression_Tag_Price_kind_eq | FilterExpression_Tag_Price_kind_neq | FilterExpression_Tag_Price_kind_lte | FilterExpression_Tag_Price_kind_gte | FilterExpression_Tag_Price_kind_in | FilterExpression_Tag_Price_kind_notIn | FilterExpression_Tag_Price_kind_between | FilterExpression_Tag_Price_kind_exists;
-export type FilterExpression_Tag_Price = {} & FilterExpression_Tag_Price_kind;
+export type FilterExpression_Tag_Price = {
+    kind: FilterExpression_Tag_Price_kind;
+};
 export type FilterExpression_Tag_Version_Eq = {
     value: string;
 };
@@ -1200,39 +1235,41 @@ export type FilterExpression_Tag_Version_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Tag_Version_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Tag_Version_Eq;
+    type: 'eq';
+    data: FilterExpression_Tag_Version_Eq;
 };
 export type FilterExpression_Tag_Version_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Tag_Version_Neq;
+    type: 'neq';
+    data: FilterExpression_Tag_Version_Neq;
 };
 export type FilterExpression_Tag_Version_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Tag_Version_Lte;
+    type: 'lte';
+    data: FilterExpression_Tag_Version_Lte;
 };
 export type FilterExpression_Tag_Version_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Tag_Version_Gte;
+    type: 'gte';
+    data: FilterExpression_Tag_Version_Gte;
 };
 export type FilterExpression_Tag_Version_kind_in = {
-    $: 'in';
-    in: FilterExpression_Tag_Version_In;
+    type: 'in';
+    data: FilterExpression_Tag_Version_In;
 };
 export type FilterExpression_Tag_Version_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Tag_Version_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Tag_Version_NotIn;
 };
 export type FilterExpression_Tag_Version_kind_between = {
-    $: 'between';
-    between: FilterExpression_Tag_Version_Between;
+    type: 'between';
+    data: FilterExpression_Tag_Version_Between;
 };
 export type FilterExpression_Tag_Version_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Tag_Version_Exists;
+    type: 'exists';
+    data: FilterExpression_Tag_Version_Exists;
 };
 export type FilterExpression_Tag_Version_kind = FilterExpression_Tag_Version_kind_eq | FilterExpression_Tag_Version_kind_neq | FilterExpression_Tag_Version_kind_lte | FilterExpression_Tag_Version_kind_gte | FilterExpression_Tag_Version_kind_in | FilterExpression_Tag_Version_kind_notIn | FilterExpression_Tag_Version_kind_between | FilterExpression_Tag_Version_kind_exists;
-export type FilterExpression_Tag_Version = {} & FilterExpression_Tag_Version_kind;
+export type FilterExpression_Tag_Version = {
+    kind: FilterExpression_Tag_Version_kind;
+};
 export type FilterExpression_Tag_Timezone_Eq = {
     value: number;
 };
@@ -1259,76 +1296,79 @@ export type FilterExpression_Tag_Timezone_Exists = {
     exists: boolean;
 };
 export type FilterExpression_Tag_Timezone_kind_eq = {
-    $: 'eq';
-    eq: FilterExpression_Tag_Timezone_Eq;
+    type: 'eq';
+    data: FilterExpression_Tag_Timezone_Eq;
 };
 export type FilterExpression_Tag_Timezone_kind_neq = {
-    $: 'neq';
-    neq: FilterExpression_Tag_Timezone_Neq;
+    type: 'neq';
+    data: FilterExpression_Tag_Timezone_Neq;
 };
 export type FilterExpression_Tag_Timezone_kind_lte = {
-    $: 'lte';
-    lte: FilterExpression_Tag_Timezone_Lte;
+    type: 'lte';
+    data: FilterExpression_Tag_Timezone_Lte;
 };
 export type FilterExpression_Tag_Timezone_kind_gte = {
-    $: 'gte';
-    gte: FilterExpression_Tag_Timezone_Gte;
+    type: 'gte';
+    data: FilterExpression_Tag_Timezone_Gte;
 };
 export type FilterExpression_Tag_Timezone_kind_in = {
-    $: 'in';
-    in: FilterExpression_Tag_Timezone_In;
+    type: 'in';
+    data: FilterExpression_Tag_Timezone_In;
 };
 export type FilterExpression_Tag_Timezone_kind_notIn = {
-    $: 'notIn';
-    notIn: FilterExpression_Tag_Timezone_NotIn;
+    type: 'notIn';
+    data: FilterExpression_Tag_Timezone_NotIn;
 };
 export type FilterExpression_Tag_Timezone_kind_between = {
-    $: 'between';
-    between: FilterExpression_Tag_Timezone_Between;
+    type: 'between';
+    data: FilterExpression_Tag_Timezone_Between;
 };
 export type FilterExpression_Tag_Timezone_kind_exists = {
-    $: 'exists';
-    exists: FilterExpression_Tag_Timezone_Exists;
+    type: 'exists';
+    data: FilterExpression_Tag_Timezone_Exists;
 };
 export type FilterExpression_Tag_Timezone_kind = FilterExpression_Tag_Timezone_kind_eq | FilterExpression_Tag_Timezone_kind_neq | FilterExpression_Tag_Timezone_kind_lte | FilterExpression_Tag_Timezone_kind_gte | FilterExpression_Tag_Timezone_kind_in | FilterExpression_Tag_Timezone_kind_notIn | FilterExpression_Tag_Timezone_kind_between | FilterExpression_Tag_Timezone_kind_exists;
-export type FilterExpression_Tag_Timezone = {} & FilterExpression_Tag_Timezone_kind;
+export type FilterExpression_Tag_Timezone = {
+    kind: FilterExpression_Tag_Timezone_kind;
+};
 export type FilterExpression_Tag_kind_integer = {
-    $: 'integer';
-    integer: FilterExpression_Tag_Integer;
+    type: 'integer';
+    data: FilterExpression_Tag_Integer;
 };
 export type FilterExpression_Tag_kind_string = {
-    $: 'string';
-    string: FilterExpression_Tag_String;
+    type: 'string';
+    data: FilterExpression_Tag_String;
 };
 export type FilterExpression_Tag_kind_list = {
-    $: 'list';
-    list: FilterExpression_Tag_List;
+    type: 'list';
+    data: FilterExpression_Tag_List;
 };
 export type FilterExpression_Tag_kind_date = {
-    $: 'date';
-    date: FilterExpression_Tag_Date;
+    type: 'date';
+    data: FilterExpression_Tag_Date;
 };
 export type FilterExpression_Tag_kind_boolean = {
-    $: 'boolean';
-    boolean: FilterExpression_Tag_Boolean;
+    type: 'boolean';
+    data: FilterExpression_Tag_Boolean;
 };
 export type FilterExpression_Tag_kind_price = {
-    $: 'price';
-    price: FilterExpression_Tag_Price;
+    type: 'price';
+    data: FilterExpression_Tag_Price;
 };
 export type FilterExpression_Tag_kind_version = {
-    $: 'version';
-    version: FilterExpression_Tag_Version;
+    type: 'version';
+    data: FilterExpression_Tag_Version;
 };
 export type FilterExpression_Tag_kind_timezone = {
-    $: 'timezone';
-    timezone: FilterExpression_Tag_Timezone;
+    type: 'timezone';
+    data: FilterExpression_Tag_Timezone;
 };
 export type FilterExpression_Tag_kind = FilterExpression_Tag_kind_integer | FilterExpression_Tag_kind_string | FilterExpression_Tag_kind_list | FilterExpression_Tag_kind_date | FilterExpression_Tag_kind_boolean | FilterExpression_Tag_kind_price | FilterExpression_Tag_kind_version | FilterExpression_Tag_kind_timezone;
 export type FilterExpression_Tag = {
     name: string;
     application: string;
-} & FilterExpression_Tag_kind;
+    kind: FilterExpression_Tag_kind;
+};
 export type FilterExpression_TagDateMatch = {
     name: string;
     application: string;
@@ -1337,40 +1377,42 @@ export type FilterExpression_TagDateMatch = {
     addDays: number;
 };
 export type FilterExpression_kind_operation = {
-    $: 'operation';
-    operation: FilterExpression_Operation;
+    type: 'operation';
+    data: FilterExpression_Operation;
 };
 export type FilterExpression_kind_application = {
-    $: 'application';
-    application: FilterExpression_Application;
+    type: 'application';
+    data: FilterExpression_Application;
 };
 export type FilterExpression_kind_tag = {
-    $: 'tag';
-    tag: FilterExpression_Tag;
+    type: 'tag';
+    data: FilterExpression_Tag;
 };
 export type FilterExpression_kind_geo = {
-    $: 'geo';
-    geo: FilterExpression_Geo;
+    type: 'geo';
+    data: FilterExpression_Geo;
 };
 export type FilterExpression_kind_static = {
-    $: 'static';
-    static: FilterExpression_Static;
+    type: 'static';
+    data: FilterExpression_Static;
 };
 export type FilterExpression_kind_event = {
-    $: 'event';
-    event: FilterExpression_Event;
+    type: 'event';
+    data: FilterExpression_Event;
 };
 export type FilterExpression_kind_updated = {
-    $: 'updated';
-    updated: FilterExpression_Updated;
+    type: 'updated';
+    data: FilterExpression_Updated;
 };
 export type FilterExpression_kind_bestTimeToSend = {
-    $: 'bestTimeToSend';
-    bestTimeToSend: FilterExpression_BestTimeToSend;
+    type: 'bestTimeToSend';
+    data: FilterExpression_BestTimeToSend;
 };
 export type FilterExpression_kind_tagDateMatch = {
-    $: 'tagDateMatch';
-    tagDateMatch: FilterExpression_TagDateMatch;
+    type: 'tagDateMatch';
+    data: FilterExpression_TagDateMatch;
 };
 export type FilterExpression_kind = FilterExpression_kind_operation | FilterExpression_kind_application | FilterExpression_kind_tag | FilterExpression_kind_geo | FilterExpression_kind_static | FilterExpression_kind_event | FilterExpression_kind_updated | FilterExpression_kind_bestTimeToSend | FilterExpression_kind_tagDateMatch;
-export type FilterExpression = {} & FilterExpression_kind;
+export type FilterExpression = {
+    kind: FilterExpression_kind;
+};