@quillsql/react 2.13.39 → 2.13.41

package/dist/esm/models/Schema.d.ts

@@ -2,6 +2,17 @@ import { Table } from './Tables';
 export type SchemaData = {
     schema: Table[];
     isSchemaLoading: boolean;
-    customFields: any[] | null;
+    customFields: {
+        [tableName: string]: CustomField[];
+    } | null;
+    schemaWithCustomFields: Table[];
+};
+export type CustomField = {
+    viewName: string;
+    refTable: string;
+    field: string;
+    refColumn?: string;
+    type?: string;
+    refField?: string;
 };
 //# sourceMappingURL=Schema.d.ts.map

package/dist/esm/models/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/models/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/models/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5D,sBAAsB,EAAE,KAAK,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC"}

package/dist/esm/utils/astFilterProcessing.js

@@ -1,4 +1,4 @@
-import { BoolOperator, DateOperator, FieldType, FilterType, NullOperator, NumberOperator, StringOperator, TimeUnit, } from '../models/Filter';
+import { BoolOperator, DateOperator, FieldType, InternalFilterType, NullOperator, NumberOperator, StringOperator, TimeUnit, } from '../models/Filter';
 import { format, isValid, parse, subDays, subHours, subMonths, subWeeks, subYears, } from 'date-fns';
 import { isBoolType, isDateType, isNumberType, isStringType, } from './columnProcessing';
 // Map SQL string operators to corresponding StringOperator enums
@@ -93,34 +93,34 @@ function mapOperatorToFilterName(operator, fieldType) {
         case FieldType.Date:
             switch (operator) {
                 case DateOperator.Custom:
-                    return FilterType.DateCustomFilter;
+                    return InternalFilterType.DateCustomFilter;
                 case DateOperator.EqualTo:
                 case DateOperator.GreaterThan:
                 case DateOperator.GreaterThanOrEqualTo:
                 case DateOperator.LessThan:
                 case DateOperator.LessThanOrEqualTo:
                 case DateOperator.NotEqualTo:
-                    return FilterType.DateComparisonFilter;
+                    return InternalFilterType.DateComparisonFilter;
                 case DateOperator.InTheCurrent:
                 case DateOperator.InTheLast:
                 case DateOperator.InThePrevious:
-                    return FilterType.DateFilter;
+                    return InternalFilterType.DateFilter;
             }
         // fallthrough
         case FieldType.String:
             switch (operator) {
                 case StringOperator.Is:
                 case StringOperator.IsNot:
-                    return FilterType.StringInFilter;
+                    return InternalFilterType.StringInFilter;
                 default:
-                    return FilterType.StringFilter;
+                    return InternalFilterType.StringFilter;
             }
         case FieldType.Number:
-            return FilterType.NumericFilter;
+            return InternalFilterType.NumericFilter;
         case FieldType.Null:
-            return FilterType.NullFilter;
+            return InternalFilterType.NullFilter;
         case FieldType.Boolean:
-            return FilterType.BooleanFilter;
+            return InternalFilterType.BooleanFilter;
         default:
             console.error(`Could not determine filter name: {operator: ${operator}, fieldType: ${fieldType}}`);
             return null;
@@ -8700,7 +8700,7 @@ export const astToFilter = (ast, db, columns) => {
     }
     // Finally, with the operator, field, and filter name, return the corresponding Filter object
     switch (filterName) {
-        case FilterType.StringFilter:
+        case InternalFilterType.StringFilter:
             return {
                 field: (lowerFunctionToField(field, db) ?? '').replaceAll('%', ''),
                 filterType: filterName,
@@ -8708,7 +8708,7 @@ export const astToFilter = (ast, db, columns) => {
                 operator: mappedOperator,
                 value: (lowerFunctionToField(right, db) ?? '').replaceAll('%', ''),
             };
-        case FilterType.StringInFilter:
+        case InternalFilterType.StringInFilter:
             return {
                 field: (lowerFunctionToField(field, db) ?? '').replaceAll('%', ''),
                 filterType: filterName,
@@ -8716,7 +8716,7 @@ export const astToFilter = (ast, db, columns) => {
                 operator: mappedOperator,
                 value: right.value.map((v) => (lowerFunctionToField(v, db) ?? '').replaceAll('%', '')),
             };
-        case FilterType.NumericFilter:
+        case InternalFilterType.NumericFilter:
             return {
                 field: field,
                 filterType: filterName,
@@ -8724,7 +8724,7 @@ export const astToFilter = (ast, db, columns) => {
                 operator: mappedOperator,
                 value: Number(right.value),
             };
-        case FilterType.NullFilter:
+        case InternalFilterType.NullFilter:
             return {
                 field: field,
                 filterType: filterName,
@@ -8732,7 +8732,7 @@ export const astToFilter = (ast, db, columns) => {
                 operator: mappedOperator,
                 value: null,
             };
-        case FilterType.DateCustomFilter: {
+        case InternalFilterType.DateCustomFilter: {
             const rightExprList = right;
             const values = parseBetweenDates(rightExprList.value);
             if (!values) {
@@ -8747,7 +8747,7 @@ export const astToFilter = (ast, db, columns) => {
                 value: values,
             };
         }
-        case FilterType.DateComparisonFilter: {
+        case InternalFilterType.DateComparisonFilter: {
             const numericDateComparison = reverseOperatorMap(operator, FieldType.Number);
             if (numericDateComparison) {
                 if (!right.value ||
@@ -8759,7 +8759,7 @@ export const astToFilter = (ast, db, columns) => {
                     if (numericDateComparison === NumberOperator.EqualTo) {
                         return {
                             field: field,
-                            filterType: FilterType.DateCustomFilter,
+                            filterType: InternalFilterType.DateCustomFilter,
                             fieldType: FieldType.Date,
                             operator: DateOperator.Custom,
                             value: { startDate: right.value, endDate: right.value },
@@ -8767,7 +8767,7 @@ export const astToFilter = (ast, db, columns) => {
                     }
                     return {
                         field: field,
-                        filterType: FilterType.DateComparisonFilter,
+                        filterType: InternalFilterType.DateComparisonFilter,
                         fieldType: FieldType.Date,
                         operator: numericDateComparison,
                         value: right.value,
@@ -8776,7 +8776,7 @@ export const astToFilter = (ast, db, columns) => {
             }
         }
         // fallthrough
-        case FilterType.DateFilter: {
+        case InternalFilterType.DateFilter: {
             const { operator: dateOperator, value } = parseDateOperatorAndValue(ast, db);
             if (!value) {
                 return null;
@@ -8793,14 +8793,14 @@ export const astToFilter = (ast, db, columns) => {
             else {
                 return {
                     field: field,
-                    filterType: FilterType.DateCustomFilter,
+                    filterType: InternalFilterType.DateCustomFilter,
                     fieldType: FieldType.Date,
                     operator: DateOperator.Custom,
                     value: value.value,
                 };
             }
         }
-        case FilterType.BooleanFilter: {
+        case InternalFilterType.BooleanFilter: {
             const value = right.value !== undefined &&
                 ['boolean', 'string'].includes(typeof right.value)
                 ? Boolean(right.value)
@@ -8925,7 +8925,7 @@ export const filterToAst = (filter, db) => {
             }
         case FieldType.Date:
             switch (filter.filterType) {
-                case FilterType.DateCustomFilter:
+                case InternalFilterType.DateCustomFilter:
                     return {
                         type: 'binary_expr',
                         operator: mappedOperator,
@@ -8950,7 +8950,7 @@ export const filterToAst = (filter, db) => {
                             ],
                         },
                     };
-                case FilterType.DateFilter:
+                case InternalFilterType.DateFilter:
                     switch (filter.operator) {
                         case DateOperator.InTheLast:
                             switch (db) {
@@ -10796,7 +10796,7 @@ export const filterToAst = (filter, db) => {
                         default:
                             return null;
                     }
-                case FilterType.DateComparisonFilter:
+                case InternalFilterType.DateComparisonFilter:
                     switch (filter.operator) {
                         case DateOperator.EqualTo:
                             return {

package/dist/esm/utils/astProcessing.d.ts

@@ -24,7 +24,7 @@ export declare function getColumnAndTableInfo(tableAliasMap: {
     tableName: string;
     columnName: string;
 } | undefined;
-export declare function getColumnsByTableFromASTAndSchema(ast: any, tables: Table[], tableAliasMap: any): {
+export declare function getColumnsByTableFromASTAndSchema(ast: any, tables: Table[], tableAliasMap: any, skipStar?: boolean): {
     [table: string]: string[];
 };
 export declare const isSubquery: (node: any) => boolean;
@@ -69,7 +69,7 @@ export declare const fetchASTFromQuillReport: (report: QuillReportInternal, clie
     schema?: Table[];
     error?: string;
 }>;
-export declare function getTablesHelper(ast: any, allTables: Table[]): {
+export declare function getTablesHelper(ast: any, allTables: Table[], skipStar?: boolean): {
     referencedTablesAndColumns: {
         name: string;
         columns: {

package/dist/esm/utils/astProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/astProcessing.js

@@ -1,6 +1,7 @@
 import { getTableNames } from '../components/ReportBuilder/ast';
 import { convertBigQuery, convertGroupBy, convertOrderBy, convertRemoveSimpleParentheses, convertStringComparison, convertUnaryToBinary, convertWildcardColumns, } from '../components/ReportBuilder/convert';
 import { deepCopy, removeNonSelectedTableReferences, removeTableNameAlias, } from '../components/ReportBuilder/util';
+import { getFieldFromExpression } from './astFilterProcessing';
 import { QUILL_SERVER } from './constants';
 import { getUniqueStringValues } from './tableProcessing';
 export function getSelectFromAST(ast) {
@@ -169,9 +170,10 @@ export function getColumnAndTableInfo(tableAliasMap, column, schemaInfo) {
     }
     return { tableName, columnName };
 }
-export function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
+export function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap, skipStar = false) {
     const referencedColumns = {};
-    if (ast?.columns === '*' || ast?.columns?.[0]?.expr?.column === '*') {
+    if (!skipStar &&
+        (ast?.columns === '*' || ast?.columns?.[0]?.expr?.column === '*')) {
         // Be sure to select everything from stars
         const tableList = ast.from.map((table) => recursiveSearchByKey(table, 'table'));
         tableList.forEach((table) => {
@@ -251,6 +253,23 @@ export function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
             }
         });
     }
+    // Look through the orderby's
+    if (ast.orderby) {
+        const allColumnReferencesInOrderBy = ast.orderby.map((orderby) => ({
+            field: getFieldFromExpression(orderby.expr ?? orderby),
+            table: orderby.expr?.table,
+        }));
+        allColumnReferencesInOrderBy.forEach((column) => {
+            const table = column.table || ast.from?.length === 1 ? ast.from[0].table : '';
+            if (!table) {
+                return;
+            }
+            if (!referencedColumns[table]) {
+                referencedColumns[table] = [];
+            }
+            referencedColumns[table].push(column.field);
+        });
+    }
     for (const table in referencedColumns) {
         referencedColumns[table] = Array.from(new Set(referencedColumns[table]));
     }
@@ -377,7 +396,7 @@ export const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, pre
         }
         ast = ast.length ? ast[0] : ast;
         newAst = convertBigQuery(ast);
-        newAst = removeTableNameAlias(newAst);
+        newAst = removeTableNameAlias(newAst, schema);
         newAst = convertWildcardColumns(newAst, schema); // must go before groupby
         ({ ast: newAst, pivot } = convertGroupBy(newAst, schema, prevPivot, prevTable));
         newAst = convertOrderBy(newAst, schema);
@@ -471,7 +490,7 @@ const POSTGRES_DATE_TYPES = [
     'time',
     'timetz',
 ];
-export function getTablesHelper(ast, allTables) {
+export function getTablesHelper(ast, allTables, skipStar) {
     const tableAliasMap = createTableNameToTableAliasMap(ast);
     const tablesInQuery = Object.values(tableAliasMap);
     // Remove all aliased tables (with statements and subqueries)
@@ -479,7 +498,7 @@ export function getTablesHelper(ast, allTables) {
         .filter((table) => tablesInQuery.includes(table.displayName))
         .map((table) => table.displayName);
     // Get non with statement column references
-    let referencedColumns = getColumnsByTableFromASTAndSchema(ast, allTables, tableAliasMap);
+    let referencedColumns = getColumnsByTableFromASTAndSchema(ast, allTables, tableAliasMap, skipStar);
     referencedColumns = Object.keys(referencedColumns)
         .filter((table) => onlyReferenceTables.includes(table))
         .reduce((obj, key) => {
@@ -491,7 +510,7 @@ export function getTablesHelper(ast, allTables) {
         for (const withStmt of ast.with) {
             const astFrom = withStmt.stmt.from ?? withStmt.stmt.ast.from;
             if (astFrom) {
-                const withReferencedColumns = getColumnsByTableFromASTAndSchema(withStmt.stmt.ast ?? withStmt.stmt, allTables, tableAliasMap);
+                const withReferencedColumns = getColumnsByTableFromASTAndSchema(withStmt.stmt.ast ?? withStmt.stmt, allTables, tableAliasMap, skipStar);
                 // @ts-ignore
                 Object.keys(withReferencedColumns).forEach((tableName) => {
                     if (referencedColumns[tableName]) {

package/dist/esm/utils/axisFormatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,6BAA8B,KAAK,KAAG,MAwC/D,CAAC"}
+{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,6BAA8B,KAAK,KAAG,MA4C/D,CAAC"}

package/dist/esm/utils/axisFormatter.js

@@ -23,6 +23,10 @@ export const axisFormatter = ({ value, field, fields }) => {
             return formatDollarAmount(value);
         case 'whole_number':
             return formatWholeNumber(value);
+        case 'two_decimal_places':
+            return formatDecimal2(value);
+        case 'one_decimal_place':
+            return formatDecimal1(value);
         case 'string':
             return formatString(value);
         case 'yyyy':
@@ -60,6 +64,26 @@ const formatString = (value) => {
     }
     return value.toString();
 };
+const formatterDecimal2 = new Intl.NumberFormat('en-US', {
+    style: 'decimal',
+    maximumFractionDigits: 2,
+});
+/**
+ * Formats the value as a number with two decimal places.
+ */
+const formatDecimal2 = (value) => {
+    return formatterDecimal2.format(Number(value));
+};
+const formatterDecimal1 = new Intl.NumberFormat('en-US', {
+    style: 'decimal',
+    maximumFractionDigits: 1,
+});
+/**
+ * Formats the value as a number with one decimal place.
+ */
+const formatDecimal1 = (value) => {
+    return formatterDecimal1.format(Number(value));
+};
 // Formats large numbers like 12345.67 ->  $12K
 const formatterBigDollars = new Intl.NumberFormat('en-US', {
     style: 'currency',
@@ -99,6 +123,7 @@ const formatDollarAmount = (value) => {
 const formatterBigWholeNumber = new Intl.NumberFormat('en-US', {
     minimumSignificantDigits: 1,
     maximumSignificantDigits: 2,
+    maximumFractionDigits: 0,
     notation: 'compact',
     compactDisplay: 'short',
 });

package/dist/esm/utils/color.d.ts

@@ -15,7 +15,166 @@ export type Color = (typeof colorValues)[number];
  * @param index the index of this element in colors
  */
 export declare function selectColor(element: any, colors: string[], index: number): string;
+/**
+ * Transform a hex string to an RGB array.
+ *
+ * Examples:
+ * - #8661f2   -> [134, 97, 242]
+ * - #1661ea2e -> [22, 97, 234, 46]
+ *
+ * TODO: Add support for triplet-style hex codes like this:
+ * - #123 -> #112233 -> [17, 34, 51]
+ */
+export declare function hexToRGB(hex: string): number[];
+export declare function RGBToHex(rgb: number[]): string;
 export declare function namedColorToHex(color: string): string;
+/**
+ * A comprehensive map of all the CSS named-colors that modern browsers will
+ * recognize, and converts them into their hex values.
+ */
+export declare const COLOR_TO_HEX: {
+    aliceblue: string;
+    antiquewhite: string;
+    aqua: string;
+    aquamarine: string;
+    azure: string;
+    beige: string;
+    bisque: string;
+    black: string;
+    blanchedalmond: string;
+    blue: string;
+    blueviolet: string;
+    brown: string;
+    burlywood: string;
+    cadetblue: string;
+    chartreuse: string;
+    chocolate: string;
+    coral: string;
+    cornflowerblue: string;
+    cornsilk: string;
+    crimson: string;
+    cyan: string;
+    darkblue: string;
+    darkcyan: string;
+    darkgoldenrod: string;
+    darkgray: string;
+    darkgreen: string;
+    darkkhaki: string;
+    darkmagenta: string;
+    darkolivegreen: string;
+    darkorange: string;
+    darkorchid: string;
+    darkred: string;
+    darksalmon: string;
+    darkseagreen: string;
+    darkslateblue: string;
+    darkslategray: string;
+    darkturquoise: string;
+    darkviolet: string;
+    deeppink: string;
+    deepskyblue: string;
+    dimgray: string;
+    dodgerblue: string;
+    firebrick: string;
+    floralwhite: string;
+    forestgreen: string;
+    fuchsia: string;
+    gainsboro: string;
+    ghostwhite: string;
+    gold: string;
+    goldenrod: string;
+    gray: string;
+    green: string;
+    greenyellow: string;
+    honeydew: string;
+    hotpink: string;
+    indianred: string;
+    indigo: string;
+    ivory: string;
+    khaki: string;
+    lavender: string;
+    lavenderblush: string;
+    lawngreen: string;
+    lemonchiffon: string;
+    lightblue: string;
+    lightcoral: string;
+    lightcyan: string;
+    lightgoldenrodyellow: string;
+    lightgrey: string;
+    lightgreen: string;
+    lightpink: string;
+    lightsalmon: string;
+    lightseagreen: string;
+    lightskyblue: string;
+    lightslategray: string;
+    lightsteelblue: string;
+    lightyellow: string;
+    lime: string;
+    limegreen: string;
+    linen: string;
+    magenta: string;
+    maroon: string;
+    mediumaquamarine: string;
+    mediumblue: string;
+    mediumorchid: string;
+    mediumpurple: string;
+    mediumseagreen: string;
+    mediumslateblue: string;
+    mediumspringgreen: string;
+    mediumturquoise: string;
+    mediumvioletred: string;
+    midnightblue: string;
+    mintcream: string;
+    mistyrose: string;
+    moccasin: string;
+    navajowhite: string;
+    navy: string;
+    oldlace: string;
+    olive: string;
+    olivedrab: string;
+    orange: string;
+    orangered: string;
+    orchid: string;
+    palegoldenrod: string;
+    palegreen: string;
+    paleturquoise: string;
+    palevioletred: string;
+    papayawhip: string;
+    peachpuff: string;
+    peru: string;
+    pink: string;
+    plum: string;
+    powderblue: string;
+    purple: string;
+    rebeccapurple: string;
+    red: string;
+    rosybrown: string;
+    royalblue: string;
+    saddlebrown: string;
+    salmon: string;
+    sandybrown: string;
+    seagreen: string;
+    seashell: string;
+    sienna: string;
+    silver: string;
+    skyblue: string;
+    slateblue: string;
+    slategray: string;
+    snow: string;
+    springgreen: string;
+    steelblue: string;
+    tan: string;
+    teal: string;
+    thistle: string;
+    tomato: string;
+    turquoise: string;
+    violet: string;
+    wheat: string;
+    white: string;
+    whitesmoke: string;
+    yellow: string;
+    yellowgreen: string;
+};
 /**
  * Converts an RGB color value to HSL. Conversion formula
  * adapted from http://en.wikipedia.org/wiki/HSL_color_space.

package/dist/esm/utils/color.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/utils/color.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EACzB,MAAM,EAAE,MAAM,GACb,MAAM,EAAE,CAwBV;AA6ED,QAAA,MAAM,WAAW,mKAkBP,CAAC;AAEX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,UAuBxE;AAyDD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,UAK5C;AAwJD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,YA4B9C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,YAuB9C"}
+{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/utils/color.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EACzB,MAAM,EAAE,MAAM,GACb,MAAM,EAAE,CAwBV;AA6ED,QAAA,MAAM,WAAW,mKAkBP,CAAC;AAEX,MAAM,MAAM,KAAK,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,UAuBxE;AAED;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAyB9C;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CAK9C;AAoBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,UAK5C;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8IxB,CAAC;AAIF;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,YA4B9C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,YAuB9C"}

package/dist/esm/utils/color.js

@@ -152,7 +152,7 @@ export function selectColor(element, colors, index) {
  * TODO: Add support for triplet-style hex codes like this:
  * - #123 -> #112233 -> [17, 34, 51]
  */
-function hexToRGB(hex) {
+export function hexToRGB(hex) {
     // Matches 3-4 pairs of hex digits with an optional leading `#` character
     const regex = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})?$/i;
     const result = regex.exec(hex);
@@ -176,6 +176,12 @@ function hexToRGB(hex) {
     }
     return [128, 128, 128]; // unknown color, return 'gray'
 }
+export function RGBToHex(rgb) {
+    return `#${rgb
+        .map((c) => Math.round(c).toString(16).padStart(2, '0'))
+        .join('')
+        .toUpperCase()}`;
+}
 /**
  * Converts an RGB object to grayscale.
  *
@@ -204,7 +210,7 @@ export function namedColorToHex(color) {
  * A comprehensive map of all the CSS named-colors that modern browsers will
  * recognize, and converts them into their hex values.
  */
-const COLOR_TO_HEX = {
+export const COLOR_TO_HEX = {
     aliceblue: '#f0f8ff',
     antiquewhite: '#faebd7',
     aqua: '#00ffff',

package/dist/esm/utils/columnProcessing.js

@@ -294,7 +294,7 @@ export function processColumnName(columnName) {
     return removeBigQuerySpecialChars(columnName);
 }
 export function isStringType(fieldType) {
-    return ['string', 'varchar', 'text', 'char', 'bpchar', 'citext'].includes(fieldType);
+    return ['string', 'varchar', 'text', 'char', 'bpchar', 'citext'].includes(fieldType?.toLowerCase());
 }
 export function isDateType(fieldType) {
     return [
@@ -304,7 +304,7 @@ export function isDateType(fieldType) {
         'timestamptz',
         'timestamp',
         'interval',
-    ].includes(fieldType);
+    ].includes(fieldType?.toLowerCase());
 }
 export function isNumberType(fieldType) {
     return [
@@ -318,7 +318,7 @@ export function isNumberType(fieldType) {
         'smallint',
         'float2',
         'float16',
-    ].includes(fieldType);
+    ].includes(fieldType?.toLowerCase());
 }
 export function isBoolType(fieldType) {
     return ['bool', 'boolean'].includes(fieldType);

package/dist/esm/utils/constants.d.ts

@@ -4,4 +4,5 @@ export declare const QUILL_SERVER: string;
 export declare const QUILL_QUERY_ENDPOINT: string;
 export declare const ALL_TENANTS = "QUILL_ALL_TENANTS";
 export declare const SINGLE_TENANT = "QUILL_SINGLE_TENANT";
+export declare const REFERENCE_LINE = "QUILL_REFERENCE_LINE";
 //# sourceMappingURL=constants.d.ts.map

package/dist/esm/utils/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,YAAY,QAGoB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,QAGnB,CAAC;AACf,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAC/C,eAAO,MAAM,aAAa,wBAAwB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,YAAY,QAGoB,CAAC;AAC9C,eAAO,MAAM,oBAAoB,QAGnB,CAAC;AACf,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAC/C,eAAO,MAAM,aAAa,wBAAwB,CAAC;AACnD,eAAO,MAAM,cAAc,yBAAyB,CAAC"}

package/dist/esm/utils/constants.js

@@ -8,3 +8,4 @@ export const QUILL_QUERY_ENDPOINT = typeof process !== 'undefined' && process.en
     : '/cloud';
 export const ALL_TENANTS = 'QUILL_ALL_TENANTS';
 export const SINGLE_TENANT = 'QUILL_SINGLE_TENANT';
+export const REFERENCE_LINE = 'QUILL_REFERENCE_LINE';

package/dist/esm/utils/dashboard.d.ts

@@ -1,6 +1,7 @@
 import { QuillReportInternal } from '../models/Report';
 import { QuillProviderClient } from '../models/Client';
 import { AdditionalProcessing } from './tableProcessing';
+import { CustomField } from '../models/Schema';
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
  * the dashboard item so that we aren't exposing unnecessary details to the
@@ -8,9 +9,18 @@ import { AdditionalProcessing } from './tableProcessing';
  * interface to build amazing dashboards on top of.
  * @param item
  */
-export declare function cleanDashboardItem(item: {
-    [key: string]: any;
-} | undefined, dashboardFilters: any, client: QuillProviderClient, dateBucket?: string, additionalProcessing?: AdditionalProcessing): Promise<QuillReportInternal>;
+export declare function cleanDashboardItem({ item, dashboardFilters, client, dateBucket, additionalProcessing, customFields, }: {
+    item: {
+        [key: string]: any;
+    } | undefined;
+    dashboardFilters: any;
+    client: QuillProviderClient;
+    dateBucket?: string;
+    additionalProcessing?: AdditionalProcessing;
+    customFields?: {
+        [tableName: string]: CustomField[];
+    } | null;
+}): Promise<QuillReportInternal>;
 export declare function getDashboard(dashboardName: string, client: QuillProviderClient, tenants?: {
     tenantField: string;
     tenantIds: (string | number)[];

package/dist/esm/utils/dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AA2BzD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,GAC1C,OAAO,CAAC,mBAAmB,CAAC,CA+F9B;AA0ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAMzD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAsB/C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,EACvC,IAAI,EACJ,gBAAgB,EAChB,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,YAAY,GACb,EAAE;IACD,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,GAAG,CAAC;IACtB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,YAAY,CAAC,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;CAC9D,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA6J/B;AA2ID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}