@vizzly/dashboard 0.15.0-dev-3d599f1049eba812c1f45d1985540f920617733b → 0.15.0

package/dist/results-driver/src/driver/VizzlyQuery/AreaChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/AreaChartV2/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/BarChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/BarChartV2/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/BasicTable/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/FunnelChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/HorizontalBarChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/LineChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/LineChartV2/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/PieChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/PivotTable/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/RadarChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/RichText/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/SunburstChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/results-driver/src/driver/VizzlyQuery/WaterfallChart/toQueries.d.ts

@@ -1,4 +1,4 @@
 export declare const toQueries: (attributes: import("../../../../../shared-logic/src/Component/types").Component.AreaChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.BasicTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.BubbleChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.DataTableAttributes | import("../../../../../shared-logic/src/Component/types").Component.FunnelChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.HorizontalBarChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.LineChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.BarChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.AreaChartV2Attributes | import("../../../../../shared-logic/src/Component/types").Component.PieChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.SunburstChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RichTextAttributes | import("../../../../../shared-logic/src/Component/types").Component.WaterfallChartAttributes | import("../../../../../shared-logic/src/Component/types").Component.RadarChartAttributes, dataSet: import("../../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../../shared-logic/src/DataSet/types").DataSet.Field>, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../types").Params) => {
-    queries: import("../../../../../shared-logic/src/Query/types").Query[];
+    queries: import("../../../../../shared-logic/src/Query/types").Query<string, string, string>[];
     resultFields: import("../../../../../shared-logic/src/Result/types").Result.Field[][];
 };

package/dist/shared-logic/src/AdditionalFilter/types.d.ts

@@ -1,12 +1,9 @@
 import { QueryAttributes } from '../QueryAttributes/types';
 import * as FilterType from './constants';
 export declare type FilterConfig = {
-    /** Quick-access filters added to each view */
     localFilters?: Array<AdditionalFilter>;
-    /** Filters existing on the dashboard level */
     globalFilters?: Array<AdditionalFilter>;
-    /** Filters existing in the "advanced" section of the data panel */
-    viewFilters?: QueryAttributes['filter'];
+    advancedFilter?: Array<QueryAttributes.Filter[]>;
 };
 export declare type AdditionalFilter = NumericFilter | SingleSelectFilter | DateFilter | DateAndTimeFilter | DateTimeFilter | MultiSelectFilter | AdvancedFilter;
 export declare type Field = {

package/dist/shared-logic/src/BubbleChart/types.d.ts

@@ -53,13 +53,6 @@ export declare type BubbleChartRepresentation = {
         [keyId: string]: DataItem;
     }[];
     lines: LegendItem[];
-    groupByKey: string;
-    legend: {
-        keys: {
-            [keyId: string]: Key;
-        };
-        items: LegendItem[];
-    };
 };
 export declare type DataItem = {
     value: number | string | null;

package/dist/shared-logic/src/BubbleChartV2/buildBubbleChartRepresentation.d.ts

@@ -4,10 +4,11 @@ import { ValueAlias } from '../ValueAlias/types';
 import { Result } from '../Result/types';
 import { PivotConfig } from '../PivotConfig/types';
 import { QueryAttributes } from '../QueryAttributes/types';
-import { ApproxAxisLabelCount, Component, FormatType } from '../Component/types';
+import { Component, FormatType } from '../Component/types';
+import { seriesLabelFormatter } from '../Result/formattedResultToSeries';
 interface buildBubbleChartRepresentationArgs {
     axisTitles?: Component.AxisTitles;
-    colors: CSSProperties['color'][];
+    colors?: CSSProperties['color'][];
     conditionalFormattingAttributes: Component.ConditionalFormatting.Rule[];
     dateTimeFormatOptions: {
         [id: string]: DateTimeFormatter;
@@ -23,6 +24,7 @@ interface buildBubbleChartRepresentationArgs {
     order: QueryAttributes.Order[];
     pivotConfig: PivotConfig;
     result: Result;
+    trendsAndForecasts?: Component.Trends[];
     valueAlias?: ValueAlias;
     xAxisFormat: FormatType;
     xAxisPostfix: string;
@@ -30,8 +32,9 @@ interface buildBubbleChartRepresentationArgs {
     yAxisFormat: FormatType;
     yAxisPostfix: string;
     yAxisPrefix: string;
-    approxYAxisLabelCount: ApproxAxisLabelCount;
+    approxYAxisLabelCount: number;
+    seriesLabelFormatter: seriesLabelFormatter;
     zFieldId: string;
 }
-export declare const buildBubbleChartRepresentation: ({ axisTitles, colors, conditionalFormattingAttributes, dateTimeFormatOptions, defaultFormats, goalLineAttributes, nullValue, numberFormatOptions, order, pivotConfig, result, xAxisFormat, xAxisPostfix, xAxisPrefix, yAxisFormat, yAxisPostfix, yAxisPrefix, approxYAxisLabelCount, valueAlias, zFieldId, }: buildBubbleChartRepresentationArgs) => BubbleChartRepresentation;
+export declare const buildBubbleChartRepresentation: ({ axisTitles, colors, conditionalFormattingAttributes, dateTimeFormatOptions, defaultFormats, goalLineAttributes, nullValue, numberFormatOptions, order, pivotConfig, result, trendsAndForecasts, xAxisFormat, xAxisPostfix, xAxisPrefix, yAxisFormat, yAxisPostfix, yAxisPrefix, approxYAxisLabelCount, seriesLabelFormatter, valueAlias, zFieldId, }: buildBubbleChartRepresentationArgs) => BubbleChartRepresentation;
 export {};

package/dist/shared-logic/src/BubbleChartV2/getScaleAndTicks.d.ts

@@ -3,7 +3,6 @@ import { QueryAttributes } from '../QueryAttributes/types';
 import { DataType } from '../Field/types';
 import { FormattedResult } from '../Result/types';
 import { Tick } from '../ChartsV2/types';
-import { ApproxAxisLabelCount } from '../../../shared-logic/src/Component/types';
 declare type FormattingFunction = (value: any, nullValueAlias?: string) => string;
 interface getScaleAndTicksArgs {
     data: FormattedResult['contentMapped'];
@@ -11,7 +10,7 @@ interface getScaleAndTicksArgs {
     xScaleDataType: DataType;
     yKeys: string[];
     nullValue: string | undefined;
-    approxYAxisLabelCount: ApproxAxisLabelCount;
+    tickCountYAxis: number;
     formattingFunctionX: FormattingFunction;
     formattingFunctionY: FormattingFunction;
     order: QueryAttributes.Order[];
@@ -33,11 +32,11 @@ interface getScaleAndTicksReturn {
         scale: {
             max: number;
             min: number;
-            key: string | null;
+            key: null;
             ordering: 'asc' | 'desc';
             dataType: 'number';
         };
     };
 }
-export declare const getScaleAndTicks: ({ data, xKey, yKeys, xScaleDataType, nullValue, approxYAxisLabelCount, formattingFunctionX, formattingFunctionY, order, goalLines, }: getScaleAndTicksArgs) => getScaleAndTicksReturn;
+export declare const getScaleAndTicks: ({ data, xKey, yKeys, xScaleDataType, nullValue, tickCountYAxis, formattingFunctionX, formattingFunctionY, order, goalLines, }: getScaleAndTicksArgs) => getScaleAndTicksReturn;
 export {};

package/dist/shared-logic/src/BubbleChartV2/types.d.ts

@@ -36,12 +36,6 @@ export declare type Key = {
     keyFormatted: string;
     dataType: DataType;
 };
-export declare type Legend = {
-    keys: {
-        [key: KeyId]: Key;
-    };
-    items: LegendItem[];
-};
 export declare type BubbleChartRepresentation = {
     keys: {
         [key: KeyId]: Key;
@@ -59,8 +53,6 @@ export declare type BubbleChartRepresentation = {
         [keyId: string]: DataItem;
     }[];
     lines: LegendItem[];
-    groupByKey: string;
-    legend: Legend;
 };
 export declare type DataItem = {
     value: number | string | null;

package/dist/shared-logic/src/ChartsV2/adjustTicks.d.ts

@@ -1,9 +1,9 @@
 import { Result } from '../Result/types';
 import { BaseChartRepresentation, Tick } from './types';
-export declare const ASSUMED_AVERAGE_CHAR_WIDTH = 7.1;
-export declare function howManyTicksFitInWidth(ticks: Tick<string | number | Date>[], maxWidth: number, avgCharWidth?: number): number;
+export declare const ASSUMED_AVERAGE_CHAR_WIDTH = 4;
+export declare function howManyTicksFitInWidth(ticks: Tick<string | Number | Date>[], maxWidth: number, avgCharWidth?: number): number;
 export declare function howManyTicksFitInHeight(ticks: Tick<string | number | Date>[], height: number): number | undefined;
 export declare function determineYTicks(ticks: Tick<number>[], height: number): Tick<number>[];
 export declare function pickEquallySpaced<T>(arr: Tick<T>[], numPicks: number): Tick<T>[];
 export declare function adjustTicks<T extends BaseChartRepresentation>(representation: T, width: number, height: number, xKeyField?: Result.Field): T;
-export declare function getEvenlySpacedTicks<DataType extends string | number | Date>(ticks: Tick<DataType>[], count: number, xKeyField: Result.Field | undefined): Tick<DataType>[];
+export declare function getEvenlySpacedTicks<DataType extends string | number | Date>(ticks: Tick<DataType>[], count: number | undefined, xKeyField: Result.Field | undefined): Tick<DataType>[];

package/dist/shared-logic/src/Component/types.d.ts

@@ -586,6 +586,7 @@ export declare type MaybeOldComponent<Attrs = Component.Attributes> = Omit<Compo
 export declare type Component<Attrs = Component.Attributes> = {
     attributes: Attrs;
     localFilters: Array<AdditionalFilter>;
+    results: (Result | null)[];
     colSpan: number;
     /** @deprecated Moved to dashboard level. */
     reports: Array<Report>;

package/dist/shared-logic/src/CustomField/SimpleMath/index.d.ts

@@ -8,4 +8,4 @@ import { Params } from '../../../../results-driver/src/types';
 import { VariableList } from '../../Variables/types';
 export declare const init: (publicName: string, leftFieldId: string, operator: MathOperator, rightFieldId: string, queryEngineConfig: QueryEngineConfig) => SimpleMathField;
 export declare const build: (measureAttribute: QueryAttributes.Measure, customField: SimpleMathField, dataSet: DataSet, params: Params) => Query['measure'][number];
-export declare const buildSide: (value: string, dataSet: DataSet, variables: VariableList) => QueryNameSpace.FieldDefinition;
+export declare const buildSide: (value: string, dataSet: DataSet, variables: VariableList) => QueryNameSpace.FieldDefinition<string, string, string>;

package/dist/shared-logic/src/Filter/Filter.d.ts

@@ -4,7 +4,7 @@ import { QueryEngineConfig } from '../QueryEngineConfig/types';
 import { DataSet } from '../DataSet/types';
 import { Params } from '../../../results-driver/src/types';
 export declare const addAndFilters: (filter: QueryAttributes['filter'], filterToAddToAll: QueryAttributes.Filter[]) => QueryAttributes['filter'];
-export declare const filterAttributeToQueryFilter: (filterAttrs: QueryAttributes.Filter[][], queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['filter'];
+export declare const filterAttributeToQueryFilter: (filters: QueryAttributes.Filter[][], queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['filter'];
 export declare const takeUsedFields: (filter: QueryAttributes['filter']) => string[];
 export declare const isAvailable: (filter?: QueryAttributes.Filter[][] | undefined) => boolean | undefined;
 export declare const isAdditionalFilter: (value: any) => boolean;

package/dist/shared-logic/src/Filter/Where.d.ts

@@ -0,0 +1,6 @@
+import { DataSet } from '../DataSet/types';
+import { WhereClause } from './types';
+import { QueryEngineConfig } from '../QueryEngineConfig/types';
+import { Params } from '../../../results-driver/src/types';
+export declare const filterConfigToWhere: (dataSet: DataSet, queryEngineConfig: QueryEngineConfig, params: Params) => WhereClause | undefined;
+export declare const isWhereClause: (thing: any) => thing is WhereClause;

package/dist/shared-logic/src/Filter/types.d.ts

@@ -1,7 +1,9 @@
-import type { Query } from '@vizzly/sqlbuilder-public';
 export declare enum Clause {
     AND_WHERE = "andWhere",
     OR_WHERE = "orWhere",
     WHERE = "where"
 }
-export declare type WhereClause = Query['filter'];
+export declare type WhereClause = {
+    type: Clause;
+    value: any;
+};

package/dist/shared-logic/src/JSQueryEngine/types.d.ts

@@ -2,5 +2,11 @@ import { Query, SubQuery } from '../Query/types';
 export declare type DataMap = {
     [key: string]: string | boolean | number | Date | null | string[];
 };
-export declare type JSQueryEngineSubQuery = SubQuery;
-export declare type JSQueryEngineQuery = Query;
+declare type JSQueryEngineOperator = '>' | '<' | '=' | '!=' | '>=' | '<=' | 'is_one_of' | 'is_not_one_of' | 'starts_with' | 'ends_with' | 'contains_substring' | 'does_not_contain_substring';
+export declare type JSQueryEngineTimeFunction = 'month' | 'year' | 'quarter' | 'week' | 'day' | 'hour' | 'minute' | 'second';
+export declare type JSQueryEngineAggregateFunction = 'countDistinct' | 'count' | 'mean' | 'sum' | 'min' | 'max' | 'none';
+export declare type JSQueryEngineFunction = JSQueryEngineTimeFunction | JSQueryEngineAggregateFunction;
+export declare type JSQueryEngineMathsOp = '*' | '-' | '/' | '+';
+export declare type JSQueryEngineSubQuery = SubQuery<JSQueryEngineFunction, JSQueryEngineOperator, JSQueryEngineMathsOp>;
+export declare type JSQueryEngineQuery = Query<JSQueryEngineFunction, JSQueryEngineOperator, JSQueryEngineMathsOp>;
+export {};

package/dist/shared-logic/src/Query/Query.d.ts

@@ -3,8 +3,8 @@ import { QueryAttributes } from '../QueryAttributes/types';
 import { QueryEngineConfig, SupportedFeature as SupportedFeatureType } from '../QueryEngineConfig/types';
 import { DataSet } from '../DataSet/types';
 import { Result } from '../Result/types';
-export declare const build: (dataSet: DataSet<DataSet.Field>, measureAttr: QueryAttributes.Measure[], filterAttr: QueryAttributes.Filter[][], orderAttr: QueryAttributes.Order[], dimensionAttr: QueryAttributes.Dimension[], timeDimensionAttr: QueryAttributes.TimeDimension | null, limitAttr: number | undefined, offsetAttr: number | undefined, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../results-driver/src/types").Params) => {
-    query: Query;
+export declare const build: (dataSet: DataSet<DataSet.Field>, measureAttr: QueryAttributes.Measure[], orderAttr: QueryAttributes.Order[], dimensionAttr: QueryAttributes.Dimension[], timeDimensionAttr: QueryAttributes.TimeDimension | null, limitAttr: number | undefined, offsetAttr: number | undefined, queryEngineConfig: import("@vizzly/semantic-layer-public/dist/types").QueryEngineConfig, params: import("../../../results-driver/src/types").Params, prebuiltFilters?: QueryAttributes.Filter[][] | undefined) => {
+    query: Query<string, string, string>;
     measureDescription: import("./types").MeasureDescription[];
 };
 export declare const hasDimensions: (query: {
@@ -14,13 +14,7 @@ export declare const buildPreAggregatedPreparedQuery: (query: PreAggregatedQuery
     query: PreAggregatedQuery;
     resultFields: Result.Field[];
 };
-export declare const buildUniqueArrayValuesPreparedQuery: (dataSetId: string, dataSetField: DataSet['fields'][number], optionsFilters?: {
-    type: "andWhere" | "orWhere";
-    value: import("@vizzly/sqlbuilder-public").RecursiveFilter[];
-} | {
-    type: "where";
-    value: import("@vizzly/sqlbuilder-public/dist/Query/types").QueryNameSpace.Filter<import("@vizzly/sqlbuilder-public/dist/Query/types").QueryNameSpace.FieldDefinition<string, string, import("../CustomField/types").MathOperator, import("@vizzly/sqlbuilder-public").RecursiveFilter>, string>;
-} | undefined) => {
+export declare const buildUniqueArrayValuesPreparedQuery: (dataSetId: string, dataSetField: DataSet['fields'][number], optionsFilters?: import("./types").QueryNameSpace.Filter<import("./types").QueryNameSpace.FieldDefinition<string, string, string>, string>[][] | undefined) => {
     query: PreparedQuery;
     resultFields: Result.Field[];
 };

package/dist/shared-logic/src/Query/buildFromQueryAttributes.d.ts

@@ -3,7 +3,7 @@ import { QueryEngineConfig } from '../QueryEngineConfig/types';
 import { MeasureDescription, Query } from './types';
 import { DataSet } from '../DataSet/types';
 import { Params } from '../../../results-driver/src/types';
-export declare const buildFromQueryAttributes: (dataSet: DataSet, measureAttr: QueryAttributes.Measure[], filterAttr: QueryAttributes.Filter[][], orderAttr: QueryAttributes.Order[], dimensionAttr: QueryAttributes.Dimension[], timeDimensionAttr: QueryAttributes.TimeDimension | null, limitAttr: QueryAttributes.Limit | undefined, offsetAttr: QueryAttributes.Offset | undefined, queryEngineConfig: QueryEngineConfig, params: Params) => {
+export declare const buildFromQueryAttributes: (dataSet: DataSet, measureAttr: QueryAttributes.Measure[], orderAttr: QueryAttributes.Order[], dimensionAttr: QueryAttributes.Dimension[], timeDimensionAttr: QueryAttributes.TimeDimension | null, limitAttr: QueryAttributes.Limit | undefined, offsetAttr: QueryAttributes.Offset | undefined, queryEngineConfig: QueryEngineConfig, params: Params, prebuiltFilters?: QueryAttributes.Filter[][] | undefined) => {
     query: Query;
     measureDescription: Array<MeasureDescription>;
 };

package/dist/shared-logic/src/Query/types.d.ts

@@ -1,15 +1,108 @@
 import { DataSet } from '../DataSet/types';
-import { QueryNameSpace, SQLQuery } from '@vizzly/sqlbuilder-public';
-export type { QueryNameSpace } from '@vizzly/sqlbuilder-public';
+export declare namespace QueryNameSpace {
+    /**
+     * Which direction should the values be sorted in?
+     */
+    type SortDirection = 'asc' | 'desc';
+    /**
+     * ID of the field. This is the same ID that is used in
+     * the data sets.
+     */
+    type Field = string;
+    /**
+     * Index of the measure to group the aggregates on.
+     * Index starts from 0.
+     */
+    type Group = {
+        index: number;
+    };
+    /**
+     * Index of the measure to sort the results by.
+     * Index starts from 0.
+     */
+    type Order = {
+        index: number;
+        direction: SortDirection;
+    };
+    /**
+     * Defines filters to apply on the query. This can be thought of
+     * as the WHERE clause in a SQL statement.
+     */
+    type Filter<Field, ComparisonOperator> = {
+        field: Field | BasicType;
+        op: ComparisonOperator;
+        value: any;
+    };
+    type SecureFilterGuard<ComparisonOperator> = {
+        fieldId: string;
+        op: ComparisonOperator;
+    };
+    /**
+     * Limit the number of results returned from the query.
+     */
+    type Limit = number;
+    /**
+     * Sets the offset of results to return.
+     */
+    type Offset = number;
+    type Cases<SupportedFunction = string, ComparisonOperator = string, MathsOp = string> = {
+        returns: BasicType | {
+            type: 'field';
+            value: string;
+            function: SupportedFunction;
+        };
+        filter: QueryNameSpace.Filter<QueryNameSpace.FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>, ComparisonOperator>[][];
+    };
+    type BasicType = {
+        type: 'number';
+        value: number;
+    } | {
+        type: 'string';
+        value: string;
+    } | {
+        type: 'null';
+    } | {
+        type: 'boolean';
+        value: boolean | null;
+    };
+    type ComplexType<SupportedFunction = string, ComparisonOperator = string, MathsOp = string> = {
+        type: 'field';
+        value: string;
+        function: SupportedFunction;
+    } | {
+        type: 'switchField';
+        value: {
+            cases: Cases<SupportedFunction, ComparisonOperator, MathsOp>[];
+        };
+    } | {
+        type: 'subquery';
+        value: SubQuery<SupportedFunction, ComparisonOperator, MathsOp>;
+    } | {
+        type: 'maths';
+        left: FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>;
+        op: MathsOp;
+        right: FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>;
+    } | {
+        type: 'date_maths';
+        left: FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>;
+        op: MathsOp;
+        right: FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>;
+    } | {
+        type: 'function';
+        function: SupportedFunction;
+        value: FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>;
+    };
+    type FieldDefinition<SupportedFunction = string, ComparisonOperator = string, MathsOp = string> = BasicType | ComplexType<SupportedFunction, ComparisonOperator, MathsOp>;
+}
 export declare type MeasureDescription = {
     /** What is the underlying field of the data set? */
     field: DataSet.Field;
     /** What function was applied? */
     functionId: string;
 };
-export declare type SubQuery = {
-    measure: [QueryNameSpace.FieldDefinition];
-    filter: Query['filter'];
+export declare type SubQuery<SupportedFunction = string, ComparisonOperator = string, MathsOp = string> = {
+    measure: [QueryNameSpace.FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>];
+    filter: QueryNameSpace.Filter<QueryNameSpace.FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>, ComparisonOperator>[][];
 };
 /** For when a query cannot be generalised into the TraditionalQuery format. We can provide a very specific query for a specific purpose. */
 declare type BasePreparedQuery<PreparedQueryType> = {
@@ -30,6 +123,16 @@ export declare type PreAggregatedQuery = BasePreparedQuery<'preAggregated'> & {
     };
 };
 export declare type PreparedQuery = UniqueArrayValuesQuery | PreAggregatedQuery;
-export declare type Query = Omit<SQLQuery, 'timeZone'> & {
+/** Most commonly used query format. */
+export declare type Query<SupportedFunction = string, ComparisonOperator = string, MathsOp = string> = {
+    type: 'query';
     timeZone?: string;
+    dataSetId: string;
+    measure: Array<QueryNameSpace.FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>>;
+    filter: QueryNameSpace.Filter<QueryNameSpace.FieldDefinition<SupportedFunction, ComparisonOperator, MathsOp>, ComparisonOperator>[][];
+    order: Array<QueryNameSpace.Order>;
+    group: Array<QueryNameSpace.Group>;
+    limit?: QueryNameSpace.Limit;
+    offset?: QueryNameSpace.Offset;
 };
+export {};

package/dist/shared-logic/src/TimeDimension/TimeDimension.d.ts

@@ -3,8 +3,6 @@ import { QueryAttributes } from '../QueryAttributes/types';
 export declare const id: (metric: QueryAttributes.TimeDimension) => string;
 export declare const decodeId: (metric: string, supportedTimeTruncFunctions: SupportedTimeTruncFunctions) => QueryAttributes.TimeDimension | null;
 export declare const vizzlyManagedTimeDimensions: SupportedTimeTruncFunctions;
-declare type SupportedTimeFunctions = 'minute' | 'hour' | 'second' | 'week' | 'quarter' | 'year' | 'month' | 'day';
-export declare const supportedTimeTruncFunctions: (keys?: SupportedTimeFunctions[] | undefined) => SupportedTimeTruncFunctions;
+export declare const supportedTimeTruncFunctions: (keys?: import("../JSQueryEngine/types").JSQueryEngineTimeFunction[] | undefined) => SupportedTimeTruncFunctions;
 export declare const isSupportedTimeTruncFunction: (supportedTimeFunctions: SupportedTimeTruncFunctions, proposedFunction: string) => boolean;
 export declare const getPublicName: (id: keyof typeof vizzlyManagedTimeDimensions) => string;
-export {};

package/dist/shared-logic/src/api/queryEngine/getRunQueriesCallback.d.ts

@@ -15,7 +15,7 @@ export declare type runQueriesCallback = (queries: Component.Attributes | Additi
     dataAccessToken?: string;
     filterConfig?: FilterConfig;
 }) => Promise<(Result | null)[] | Array<Result['content'] | null> | CallbackError>;
-declare const getRunQueriesCallback: (identityConfig: IdentityConfigType, queryEngineConfig: QueryEngineConfigType, timeRangeOptions: TimeRangeOptions, variables: VariableList, runQueries?: ((queries: import("../../../../shared-logic/src/Query/types").Query[], params: {
+declare const getRunQueriesCallback: (identityConfig: IdentityConfigType, queryEngineConfig: QueryEngineConfigType, timeRangeOptions: TimeRangeOptions, variables: VariableList, runQueries?: ((queries: import("../../../../shared-logic/src/Query/types").Query<string, string, string>[], params: {
     dataSets: import("../../../../shared-logic/src/DataSet/types").DataSet<import("../../../../shared-logic/src/DataSet/types").DataSet.Field>[];
     abortSignal?: AbortSignal | undefined;
     dataAccessToken?: string | undefined;

package/dist/shared-ui/src/api/useQueryEffect.d.ts

@@ -4,7 +4,6 @@ import { FilterConfig } from '../../../shared-logic/src/AdditionalFilter/types';
 import { DataSet } from '../../../shared-logic/src/DataSet/types';
 import { QueryableEntity } from './useQueryEffect/types';
 import { UseVariableState } from '../contexts/Variables/types';
-export declare const useQueryEffect: (queries: QueryableEntity, runQueriesCallback: VizzlyComponents.runQueriesCallbackInternal, filterConfig: FilterConfig, dataSet: DataSet, componentType?: "progress" | "areaChart" | "areaChartV2" | "barChart" | "barChartV2" | "basicTable" | "bubbleChart" | "bubbleChartV2" | "comboChart" | "comboChartV2" | "custom" | "dataTable" | "funnelChart" | "horizontalBarChart" | "lineChart" | "lineChartV2" | "mercatorMap" | "pieChart" | "radarChart" | "richText" | "scatterChart" | "singleStat" | "sunburstChart" | "waterfallChart" | undefined, variables?: UseVariableState | undefined) => {
-    results: Array<Result | null>;
+export declare const useQueryEffect: (queries: QueryableEntity, runQueriesCallback: VizzlyComponents.runQueriesCallbackInternal, onResultsCallback: (results: Array<Result | null>) => void, filterConfig: FilterConfig, dataSet: DataSet, componentType?: "progress" | "areaChart" | "areaChartV2" | "barChart" | "barChartV2" | "basicTable" | "bubbleChart" | "bubbleChartV2" | "comboChart" | "comboChartV2" | "custom" | "dataTable" | "funnelChart" | "horizontalBarChart" | "lineChart" | "lineChartV2" | "mercatorMap" | "pieChart" | "radarChart" | "richText" | "scatterChart" | "singleStat" | "sunburstChart" | "waterfallChart" | undefined, variables?: UseVariableState | undefined) => {
     queriesAreChanging: boolean;
 };