@vizzly/dashboard 0.14.4-dev-fb756b8dda6220215f533bcdd3f270f5253906a8 → 0.14.4-dev-141913bcc9dced2a3f4a2c5c2d40ac36ba1bb900

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

@@ -1,3 +1,3 @@
 import { LineChartRepresentation } from './types';
-export declare const ASSUMED_AVERAGE_CHAR_WIDTH = 8;
+export declare const ASSUMED_AVERAGE_CHAR_WIDTH = 8.8;
 export declare const adjustTicks: (lineChartRepresentation: LineChartRepresentation, width: number) => LineChartRepresentation;

package/dist/shared-logic/src/LineChartV2/buildLineChartRepresentation.d.ts

@@ -15,9 +15,7 @@ interface buildLineChartRepresentationArgs {
     defaultFormats: () => {
         [functionId: string]: string;
     };
-    dimensions: QueryAttributes.Dimension[];
     goalLineAttributes: Component.GoalLine.Rule[];
-    measures: QueryAttributes.Measure[];
     nullValue?: string;
     numberFormatOptions: {
         [id: string]: NumberFormatter;
@@ -35,5 +33,5 @@ interface buildLineChartRepresentationArgs {
     yAxisPrefix: string;
     approxYAxisLabelCount: number;
 }
-export declare const buildLineChartRepresentation: ({ axisTitles, colors, conditionalFormattingAttributes, dateTimeFormatOptions, defaultFormats, dimensions, goalLineAttributes, measures, nullValue, numberFormatOptions, order, pivotConfig, result, trendsAndForecasts, xAxisFormat, xAxisPostfix, xAxisPrefix, yAxisFormat, yAxisPostfix, yAxisPrefix, approxYAxisLabelCount, }: buildLineChartRepresentationArgs) => LineChartRepresentation;
+export declare const buildLineChartRepresentation: ({ axisTitles, colors, conditionalFormattingAttributes, dateTimeFormatOptions, defaultFormats, goalLineAttributes, nullValue, numberFormatOptions, order, pivotConfig, result, trendsAndForecasts, xAxisFormat, xAxisPostfix, xAxisPrefix, yAxisFormat, yAxisPostfix, yAxisPrefix, approxYAxisLabelCount, }: buildLineChartRepresentationArgs) => LineChartRepresentation;
 export {};

package/dist/shared-logic/src/LineChartV2/getMinAndMax.d.ts

@@ -1,8 +1,7 @@
 import { DataType } from '../Field/types';
+import { FormattedResult } from '../Result/types';
 export declare const getMinAndMax: ({ data, key, dataType, }: {
-    data: {
-        [key: string]: string | number | Date | null;
-    }[];
+    data: FormattedResult['contentMapped'];
     key: string | null;
     dataType: DataType;
 }) => {

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

@@ -1,26 +1,17 @@
-import { KeyId, Tick, Key, GoalLine } from './types';
+import { KeyId, Tick, GoalLine } from './types';
 import { QueryAttributes } from '../QueryAttributes/types';
 import { DataType } from '../Field/types';
+import { FormattedResult } from '../Result/types';
 declare type FormattingFunction = (value: any, nullValueAlias?: string) => string;
 interface getScaleAndTicksArgs {
-    data: {
-        [key: string]: Date | number | string | null;
-    }[];
+    data: FormattedResult['contentMapped'];
     xKey: string | null;
     xScaleDataType: DataType;
-    keys: {
-        [key: KeyId]: Key;
-    };
     yKeys: string[];
     nullValue: string | undefined;
     tickCountYAxis: number;
-    fillMissingXTicks: boolean;
     formattingFunctionX: FormattingFunction;
     formattingFunctionY: FormattingFunction;
-    xAxisPostfix: string;
-    xAxisPrefix: string;
-    yAxisPostfix: string;
-    yAxisPrefix: string;
     order: QueryAttributes.Order[];
     goalLines: GoalLine[];
 }
@@ -46,5 +37,5 @@ interface getScaleAndTicksReturn {
         };
     };
 }
-export declare const getScaleAndTicks: ({ data, xKey, yKeys, xScaleDataType, nullValue, tickCountYAxis, fillMissingXTicks, formattingFunctionX, formattingFunctionY, xAxisPostfix, xAxisPrefix, yAxisPostfix, yAxisPrefix, order, keys, 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/LineChartV2/types.d.ts

@@ -37,7 +37,7 @@ export declare type Key = {
 };
 export declare type Tick<DataType> = {
     value: DataType;
-    valueFormatted: string | null;
+    formattedValue: string | null;
     scaleValue: DataType | null;
 };
 export declare type LineChartRepresentation = {
@@ -59,12 +59,11 @@ export declare type LineChartRepresentation = {
 };
 export declare type DataItem = {
     value: number | string | null;
-    valueAlias: string | null;
-    valueFormatted: string | null;
+    formattedValue: string | null;
 };
 export declare type GoalLine = {
     value: number;
-    valueFormatted: string | null;
+    formattedValue: string | null;
     color: string;
     strokeStyle?: 'dashed' | 'solid';
     strokeWidth: number;

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

@@ -2,4 +2,14 @@ import { QueryAttributes } from '../QueryAttributes/types';
 export declare type PivotConfig = {
     x: QueryAttributes.Field[];
     y: (QueryAttributes.Field | 'measures')[];
+    detailed: {
+        x: Array<{
+            field: string;
+            function: string;
+        }>;
+        y: Array<{
+            field: string;
+            function: string;
+        }>;
+    };
 };

package/dist/shared-logic/src/Result/formattedResultToSeries.d.ts

@@ -0,0 +1,19 @@
+import { PivotConfig } from '../PivotConfig/types';
+import { FormattedResult } from './types';
+import { DataType } from '@vizzly/sqlbuilder-public';
+declare type Key = {
+    key: string;
+    keyFormatted: string;
+    dataType: DataType;
+    outputDataType: DataType;
+};
+declare type Returns = {
+    yKeys: string[];
+    xKeys: string[];
+    keys: {
+        [keyId: string]: Key;
+    };
+    seriesData: FormattedResult['contentMapped'];
+};
+export declare const formattedResultToSeries: (formattedResult: FormattedResult, pivotConfig: PivotConfig) => Returns;
+export {};

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

@@ -24,6 +24,20 @@ export declare type FormattedResult = {
         value: any;
         formattedValue: string;
     }[][];
+    contentMapped: Array<{
+        [key: string]: {
+            value: any;
+            formattedValue: string;
+        };
+    }>;
     fields: Result.Field[];
     hasMoreResults?: boolean | null;
+    formatterFunc: (value: any, fieldParams: {
+        fieldId: Result['fields'][number]['fieldId'];
+        function: Result['fields'][number]['function'];
+        outputDataType: Result['fields'][number]['outputDataType'];
+    }) => {
+        value: any;
+        formattedValue: string;
+    };
 };

package/dist/shared-ui/src/contexts/DashboardBehaviour/dateTimeFormatOptions.d.ts

@@ -1,5 +1,6 @@
 import { DashboardBehaviour } from './types';
 import { QueryEngineConfig } from '../../../../shared-logic/src/QueryEngineConfig/types';
+/** @deprecated - moved to number formatting option */
 export declare const FUNCTIONS_WHICH_USE_STRING_INSTEAD_OF_DATE: Array<keyof typeof defaultDateTimeFormatOptions>;
 export declare const defaultDateTimeFormatOptions: DashboardBehaviour['dateTimeFormatOptions'];
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vizzly/dashboard",
   "author": "james@vizzly.co",
-  "version": "0.14.4-dev-fb756b8dda6220215f533bcdd3f270f5253906a8",
+  "version": "0.14.4-dev-141913bcc9dced2a3f4a2c5c2d40ac36ba1bb900",
   "source": "src/index.tsx",
   "types": "./dist/dashboard/src/index.d.ts",
   "main": "dist/index.js",

package/dist/shared-logic/src/LineChartV2/getData.d.ts

@@ -1,18 +0,0 @@
-import { DataItem, KeyId } from './types';
-interface getDataArgs {
-    data: {
-        [key: string]: Date | number | string | null;
-    }[];
-    xKey: KeyId | undefined;
-    nullValue: string | undefined;
-    xAxisPostfix: string;
-    xAxisPrefix: string;
-    yAxisPostfix: string;
-    yAxisPrefix: string;
-    formattingFunctionX: (value: any, noValueReplacement?: string) => string;
-    formattingFunctionY: (value: any, noValueReplacement?: string) => string;
-}
-export declare const getData: ({ data, xKey, formattingFunctionX, formattingFunctionY, nullValue, xAxisPostfix, xAxisPrefix, yAxisPostfix, yAxisPrefix, }: getDataArgs) => {
-    [keyId: string]: DataItem;
-}[];
-export {};

package/dist/shared-logic/src/LineChartV2/getXScale.d.ts

@@ -1,18 +0,0 @@
-import { KeyId, Key } from './types';
-import { QueryAttributes } from '../QueryAttributes/types';
-import { DataType } from '../Field/types';
-interface getXScaleArgs {
-    xKey: string | null;
-    xScaleDataType: DataType;
-    order: QueryAttributes.Order[];
-    keys: {
-        [key: string]: Key;
-    };
-}
-export declare const getXScale: ({ order, xKey, xScaleDataType, keys }: getXScaleArgs) => {
-    dataType: DataType;
-    key: KeyId | null;
-    ordering: 'asc' | 'desc' | null;
-    xScaleIsDimension: boolean;
-};
-export {};

package/dist/shared-logic/src/LineChartV2/prepareData.d.ts

@@ -1,34 +0,0 @@
-import { Result } from '../Result/types';
-import { PivotConfig } from '../PivotConfig/types';
-import { QueryAttributes } from '../QueryAttributes/types';
-import { DataType } from '../Field/types';
-import { DateTimeFormatter, NumberFormatter } from './types';
-interface prepareDataArgs {
-    result: Result;
-    pivotConfig: PivotConfig;
-    measures: QueryAttributes.Measure[];
-    dimensions: QueryAttributes.Dimension[];
-    xKey: string;
-    xKeyFunction: string;
-    xKeyDataType: DataType;
-    xKeyField: Result.Field | undefined;
-    numberFormatOptions: {
-        [id: string]: NumberFormatter;
-    };
-    dateTimeFormatOptions: {
-        [id: string]: DateTimeFormatter;
-    };
-    defaultFormats: () => {
-        [functionId: string]: string;
-    };
-}
-export declare const prepareData: ({ result, pivotConfig, measures, dimensions, xKey, xKeyFunction, xKeyDataType, xKeyField, defaultFormats, numberFormatOptions, dateTimeFormatOptions, }: prepareDataArgs) => {
-    data: {
-        [x: string]: any;
-    }[];
-    xScaleDataType: "string" | "number" | "boolean" | "date_time";
-    xScaleIsDateTimeAsNumber: boolean;
-    yKeys: string[];
-    keys: {};
-};
-export {};