@quillsql/react 2.12.14 → 2.12.16

package/dist/esm/components/ReportBuilder/AddColumnModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AddColumnModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddColumnModal.tsx"],"names":[],"mappings":";AAoBA,OAAO,EAEL,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,MAAM,EACN,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,eAAe,EACf,MAAM,EACN,sBAAoD,GACrD,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,GAAG,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC;IAC3B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,gBAAgB,EAAE,GAAG,CAAC;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3D,YAAY,EAAE,CAAC,KAAK,EAAE;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,MAAM,IAAI,CAAC;QACxB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;YAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;SAAE,KAAK,GAAG,CAAC,OAAO,CAAC;KAC5E,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC;IACZ,sBAAsB,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;CAC3C,2CA+MA"}
+{"version":3,"file":"AddColumnModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/AddColumnModal.tsx"],"names":[],"mappings":";AAoBA,OAAO,EAEL,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAMzB,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,MAAM,EACN,kBAAkB,EAClB,qBAAqB,EACrB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,OAAO,EACP,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,eAAe,EACf,MAAM,EACN,sBAAoD,GACrD,EAAE;IACD,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,GAAG,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC;IAC3B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,aAAa,EAAE,GAAG,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,gBAAgB,EAAE,GAAG,CAAC;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3D,YAAY,EAAE,CAAC,KAAK,EAAE;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,OAAO,CAAC;QACpB,WAAW,EAAE,MAAM,IAAI,CAAC;QACxB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;YAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;SAAE,KAAK,GAAG,CAAC,OAAO,CAAC;KAC5E,KAAK,GAAG,CAAC,OAAO,CAAC;IAClB,eAAe,EAAE,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,CAAC;IACZ,sBAAsB,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;CAC3C,2CAkNA"}

package/dist/esm/components/ReportBuilder/AddColumnModal.js

@@ -6,7 +6,7 @@ import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSo
 import { CSS as DND_CSS } from '@dnd-kit/utilities';
 import { ThemeContext } from '../../Context';
 import { QuillColumnSearchEmptyState, } from '../UiComponents';
-import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { snakeAndCamelCaseToTitleCase, } from '../../utils/textProcessing';
 export default function AddColumnModal({ onSave, orderedColumnNames, setOrderedColumnNames, selectedColumns, setSelectedColumns, isSelectedAllColumns, clearAllState, nameToColumn, baseAst, setBaseAst, pivot, initialTableName, defaultAST, defaultTable, setPivot, TextInput, SelectColumn, SecondaryButton, Button, ColumnSearchEmptyState = QuillColumnSearchEmptyState, }) {
     const [theme] = useContext(ThemeContext);
     const [search, setSearch] = useState('');
@@ -43,7 +43,7 @@ export default function AddColumnModal({ onSave, orderedColumnNames, setOrderedC
         })
             .filter((row) => search.length === 0 ||
             row.includes(search) ||
-            snakeCaseToTitleCase(row)
+            snakeAndCamelCaseToTitleCase(row)
                 .toLowerCase()
                 .includes(search.toLowerCase())));
     }, [search, orderedColumnNames, selectedColumns]);
@@ -70,7 +70,10 @@ export default function AddColumnModal({ onSave, orderedColumnNames, setOrderedC
                             overflowY: 'auto',
                             maxWidth: '400px',
                         }, children: [searchResults.map((value) => {
-                                return (_jsx(SortableItem, { selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, id: value, label: value.replace('.', ' | '), SelectColumn: SelectColumn }, value));
+                                return (_jsx(SortableItem, { selectedColumns: selectedColumns, setSelectedColumns: setSelectedColumns, id: value, label: value
+                                        .split('.')
+                                        .map((v) => snakeAndCamelCaseToTitleCase(v))
+                                        .join(' | '), SelectColumn: SelectColumn }, value));
                             }), search.length > 0 && searchResults.length === 0 && (_jsx(ColumnSearchEmptyState, {}))] }) }) }), _jsxs("div", { style: {
                     display: 'flex',
                     width: '100%',
@@ -139,7 +142,7 @@ const SortableItem = ({ id, label, setSelectedColumns, selectedColumns, SelectCo
             }
         });
     };
-    return (_jsx("div", { style: { userSelect: 'none', ...style }, ref: setNodeRef, children: _jsx(SelectColumn, { isSelected: selectedColumns?.includes(id), setSelected: handleSelect, label: snakeCaseToTitleCase(label), DragHandle: (props) => (_jsx("div", { style: {
+    return (_jsx("div", { style: { userSelect: 'none', ...style }, ref: setNodeRef, children: _jsx(SelectColumn, { isSelected: selectedColumns?.includes(id), setSelected: handleSelect, label: snakeAndCamelCaseToTitleCase(label), DragHandle: (props) => (_jsx("div", { style: {
                     cursor: 'grab',
                 }, ...attributes, ...listeners, children: _jsx(props.dragIcon, {}) })) }) }));
 };

package/dist/esm/components/ReportBuilder/AddSortPopover.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useState } from 'react';
 import { QuillSelectComponent } from '../QuillSelect';
 import { MemoizedButton, MemoizedSecondaryButton, } from '../UiComponents';
-import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
 const SORT_VALUE_TO_LABEL = {
     ASC: 'ascending',
     DESC: 'descending',
@@ -28,7 +28,7 @@ export const SortSentence = ({ sortData, keyPrefix, columns, handleDelete, setEd
     if (!sortData && (!sortData.expr.column || !sortData.expr.value)) {
         return null;
     }
-    return (_jsx("div", { children: _jsx(SortPopover, { isOpen: isOpen, setIsOpen: handleSetIsOpen, sortLabel: `${snakeCaseToTitleCase(sortData.expr.column) || snakeCaseToTitleCase(sortData.expr.value)} ${SORT_VALUE_TO_LABEL[sortData.type]}`, onClickDelete: handleClickDelete, popoverTitle: popoverTitle, popoverChildren: _jsx(EditPopover, { onSave: (column, direction) => {
+    return (_jsx("div", { children: _jsx(SortPopover, { isOpen: isOpen, setIsOpen: handleSetIsOpen, sortLabel: `${snakeAndCamelCaseToTitleCase(sortData.expr.column) || snakeAndCamelCaseToTitleCase(sortData.expr.value)} ${SORT_VALUE_TO_LABEL[sortData.type]}`, onClickDelete: handleClickDelete, popoverTitle: popoverTitle, popoverChildren: _jsx(EditPopover, { onSave: (column, direction) => {
                     setIsOpen(false);
                     onSave(column, direction);
                 }, columns: columns, isEdit: true, onDelete: handleClickDelete, column: sortData.expr.column || sortData.expr.value, direction: sortData.type, Select: Select, Button: Button, SecondaryButton: SecondaryButton }) }) }));
@@ -45,7 +45,7 @@ export const AddSortPopover = ({ onSave, columns, isEdit, onDelete, column, dire
                             setSortColumn(e.target.value);
                         }, options: [
                             ...columns.map((column) => ({
-                                label: snakeCaseToTitleCase(column.split('.')[1] || ''),
+                                label: snakeAndCamelCaseToTitleCase(column.split('.')[1] || ''),
                                 value: column.split('.')[1],
                             })),
                         ], width: 200 }), _jsx(Select, { label: "Sort Direction", value: sortDirection, onChange: (e) => {

package/dist/esm/components/ReportBuilder/bigDateMap.js

@@ -1,13 +1,13 @@
 // A giant map of partial objects keys to functions that take the root node
 // and return a strinified version of the node. Used to populate the filters.
-import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
 /**
  * Trims off the _at suffix of columnNames so "created_at" becomes "created"
  */
 function cleanDateFieldName(fieldName) {
     if (!fieldName)
         return undefined;
-    return snakeCaseToTitleCase(fieldName.replace('_at', ''));
+    return snakeAndCamelCaseToTitleCase(fieldName.replace('_at', ''));
 }
 /**
  * A big map of partial objects and a callback to convert each to a string.

package/dist/esm/components/ReportBuilder/util.js

@@ -1,7 +1,7 @@
 // A collection of reusable, pure, utility functions for the Report Builder.
 import { getQuarter, format, addMinutes, } from 'date-fns';
 import { DATE_DESCRIPTION_MAP } from './bigDateMap';
-import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
 import { isAfterBigQuery, isBeforeBigQuery, isEqualsBigQuery, isInTheLastIntervalBigQuery, isTheCurrentIntervalBigQuery, } from '../../utils/parserBigQuery';
 import { isInTheLastIntervalPostgres, isTheCurrentIntervalPostgres, } from '../../utils/parserPostgres';
 /**
@@ -123,7 +123,7 @@ export function formatDateComparisonNode(node) {
 }
 export function getInTheCurrentIntervalSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = snakeCaseToTitleCase(node.left.args.value[0].column);
+        const dateColumn = snakeAndCamelCaseToTitleCase(node.left.args.value[0].column);
         const periodValue = node.left.args.value[1].column.toLowerCase();
         return `${dateColumn} in the current ${periodValue}`;
     }
@@ -136,7 +136,7 @@ const BIG_QUERY_DAY_TO_INTERVAL_MAP = {
 };
 export function getInTheLastIntervalSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = snakeCaseToTitleCase(node.left.column || node.left.args.value[0].columns || '');
+        const dateColumn = snakeAndCamelCaseToTitleCase(node.left.column || node.left.args.value[0].columns || '');
         const amount = node.right.args.value[1].expr.value;
         let unit = node.right.args.value[1].unit.toLowerCase();
         if (unit.includes('*')) {
@@ -148,7 +148,7 @@ export function getInTheLastIntervalSentence(node, databaseType) {
 }
 export function getInThePreviousIntervalSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = snakeCaseToTitleCase(node.left.args.value[0].column);
+        const dateColumn = snakeAndCamelCaseToTitleCase(node.left.args.value[0].column);
         const periodValue = node.left.args.value[1].column.toLowerCase();
         return `${dateColumn} in the previous ${periodValue}`;
     }
@@ -156,7 +156,7 @@ export function getInThePreviousIntervalSentence(node, databaseType) {
 }
 export function getIsEqualsSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = snakeCaseToTitleCase(node.left.args.value[1].column);
+        const dateColumn = snakeAndCamelCaseToTitleCase(node.left.args.value[1].column);
         const type = node.right.args.value[1].column.toLowerCase();
         const value = node.right.args.value[0].value;
         // using date-fns can I parse the date to short month year
@@ -176,7 +176,7 @@ export function getIsEqualsSentence(node, databaseType) {
 }
 export function getIsAfterSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = snakeCaseToTitleCase(node.left?.column || node.left?.args?.value[0]?.columns || '');
+        const dateColumn = snakeAndCamelCaseToTitleCase(node.left?.column || node.left?.args?.value[0]?.columns || '');
         const value = node.right?.value || node.right?.args?.value[0]?.value || '';
         if (!dateColumn || !value) {
             return null;
@@ -187,7 +187,7 @@ export function getIsAfterSentence(node, databaseType) {
 }
 export function getIsBeforeSentence(node, databaseType) {
     if (databaseType === 'BigQuery') {
-        const dateColumn = snakeCaseToTitleCase(node.left?.column || node.left?.args?.value[0]?.columns || '');
+        const dateColumn = snakeAndCamelCaseToTitleCase(node.left?.column || node.left?.args?.value[0]?.columns || '');
         const value = node.right?.value || node.right?.args?.value[0]?.value || '';
         if (!dateColumn || !value) {
             return null;
@@ -367,14 +367,14 @@ export function tryConvertDateEquality(node, databaseType) {
     if (isDateTruncEquals(node, databaseType)) {
         const columnNode = node.left.args.value[1];
         const columnName = columnNode.column ?? columnNode.value;
-        const cleanColumnName = snakeCaseToTitleCase(columnName.replaceAll('_at', ''));
+        const cleanColumnName = snakeAndCamelCaseToTitleCase(columnName.replaceAll('_at', ''));
         const prettyDateSuffix = dateTruncSuffixToString(node, databaseType);
         return `${cleanColumnName} ${prettyDateSuffix}`;
     }
     else if (isExtractEquals(node)) {
         const columnNode = node.left.args.source;
         const columnName = columnNode.column ?? columnNode.value;
-        const cleanColumnName = snakeCaseToTitleCase(columnName.replaceAll('_at', ''));
+        const cleanColumnName = snakeAndCamelCaseToTitleCase(columnName.replaceAll('_at', ''));
         const prettyDateSuffix = extractSuffixToString(node);
         return `${cleanColumnName} ${prettyDateSuffix}`;
     }

package/dist/esm/internals/ReportBuilder/PivotForm.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { QuillPivotColumnContainer, } from '../../components/UiComponents';
-import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
 import { numberFormatOptions } from '../../ChartBuilder';
 import { getPossiblePivotFieldOptions } from '../../utils/pivotProcessing';
 export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, columns, uniqueValues, onDelete, SecondaryButtonComponent, SelectComponent, PivotColumnContainer = QuillPivotColumnContainer, }) {
@@ -18,21 +18,21 @@ export default function PivotForm({ pivotRowField, setPivotRowField, pivotColumn
                     setPivotRowField(e.target.value === '' ? undefined : e.target.value);
                 }, options: allowedRowFields.map((field) => {
                     return {
-                        label: snakeCaseToTitleCase(field),
+                        label: snakeAndCamelCaseToTitleCase(field),
                         value: field,
                     };
                 }), width: 200 }), _jsx(SelectComponent, { id: "pivot-row-field", label: "Column field", value: pivotColumnField, onChange: (e) => {
                     setPivotColumnField(e.target.value === '' ? undefined : e.target.value);
                 }, options: allowedColumnFields.map((field) => {
                     return {
-                        label: snakeCaseToTitleCase(field),
+                        label: snakeAndCamelCaseToTitleCase(field),
                         value: field,
                     };
                 }), width: 200 }), _jsx(SelectComponent, { id: "pivot-row-field", label: "Value field", value: pivotValueField, onChange: (e) => {
                     setPivotValueField(e.target.value === '' ? undefined : e.target.value);
                 }, options: allowedValueFields.map((field) => {
                     return {
-                        label: snakeCaseToTitleCase(field),
+                        label: snakeAndCamelCaseToTitleCase(field),
                         value: field,
                     };
                 }), width: 200 }), _jsx(SelectComponent, { id: "pivot-row-field", label: "Aggregation type", value: pivotAggregation, onChange: (e) => {

package/dist/esm/internals/ReportBuilder/PivotList.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { quillFormat } from '../../utils/valueFormatter';
-import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { snakeAndCamelCaseToTitleCase } from '../../utils/textProcessing';
 import { QuillCard } from '../../components/QuillCard';
 export const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPivotIndex, onEditPivot, ButtonComponent, showEdit = false, clickable = true, onClose, minHeight = 0, CardComponent = QuillCard, LabelComponent, TextComponent, HeaderComponent, }) => {
     const maxRowsInPivotPeak = 5;
@@ -27,14 +27,14 @@ export const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPiv
                                                     textAlign: 'left',
                                                     whiteSpace: 'nowrap',
                                                     textOverflow: 'ellipsis',
-                                                }, children: _jsx(LabelComponent, { label: snakeCaseToTitleCase(pivotTable.pivot.rowField) }) }, pivotTable.pivot.rowField)), pivotTable.pivot.columnField && (_jsx("th", { style: {
+                                                }, children: _jsx(LabelComponent, { label: snakeAndCamelCaseToTitleCase(pivotTable.pivot.rowField) }) }, pivotTable.pivot.rowField)), pivotTable.pivot.columnField && (_jsx("th", { style: {
                                                     fontWeight: 600,
                                                     paddingRight: 5,
                                                     flex: 1,
                                                     textAlign: 'left',
                                                     whiteSpace: 'nowrap',
                                                     textOverflow: 'ellipsis',
-                                                }, children: _jsx(LabelComponent, { label: snakeCaseToTitleCase(pivotTable.pivot.columnField) }) }, pivotTable.pivot.columnField)), !pivotTable.pivot.columnField &&
+                                                }, children: _jsx(LabelComponent, { label: snakeAndCamelCaseToTitleCase(pivotTable.pivot.columnField) }) }, pivotTable.pivot.columnField)), !pivotTable.pivot.columnField &&
                                                 pivotTable.pivot.valueField && (_jsx("th", { style: {
                                                     fontWeight: 600,
                                                     paddingRight: 5,
@@ -42,7 +42,7 @@ export const PivotCard = ({ pivotTable, theme, index, onSelectPivot, selectedPiv
                                                     textAlign: 'left',
                                                     whiteSpace: 'nowrap',
                                                     textOverflow: 'ellipsis',
-                                                }, children: _jsx(LabelComponent, { label: snakeCaseToTitleCase(pivotTable.pivot.valueField) }) }, pivotTable.pivot.valueField))] }) }), _jsx("div", { style: {
+                                                }, children: _jsx(LabelComponent, { label: snakeAndCamelCaseToTitleCase(pivotTable.pivot.valueField) }) }, pivotTable.pivot.valueField))] }) }), _jsx("div", { style: {
                                         paddingLeft: '2px',
                                         width: '100%',
                                     }, children: _jsx(TextComponent, { label: 'No results' }) })] })) : (_jsxs("table", { children: [_jsx("thead", { children: _jsx("tr", { children: pivotTable.columns.map((column) => (_jsx("th", { style: {

package/dist/esm/internals/ReportBuilder/PivotModal.d.ts

@@ -104,7 +104,7 @@ export declare function generatePivotTable(pivot: Pivot, data: any, dateRange: {
 } | undefined, isComparison: boolean, rowLimit?: number, compRange?: {
     start: Date;
     end: Date;
-} | undefined): {
+} | undefined, dateBucket?: string): {
     rows: any[];
     columns: {
         label: string;

package/dist/esm/internals/ReportBuilder/PivotModal.d.ts.map

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

package/dist/esm/internals/ReportBuilder/PivotModal.js

@@ -6,7 +6,7 @@ import { PivotList, PivotCard } from './PivotList';
 import { differenceInDays, eachDayOfInterval, eachMonthOfInterval, eachWeekOfInterval, eachYearOfInterval, endOfDay, isWithinInterval, subMilliseconds, } from 'date-fns';
 import { valueFormatter } from '../../utils/valueFormatter';
 import { numberFormatOptions, dateFormatOptions } from '../../ChartBuilder';
-import { snakeCaseToTitleCase } from '../../utils/textProcessing';
+import { snakeAndCamelCaseToTitleCase, } from '../../utils/textProcessing';
 import { QuillErrorMessageComponent, QuillLoadingComponent, QuillPivotColumnContainer, QuillPivotRowContainer, } from '../../components/UiComponents';
 import { isNumericColumnType, } from '../../components/ReportBuilder/ast';
 import { QuillCard } from '../../components/QuillCard';
@@ -292,7 +292,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
         allowedColumnFields,
         allowedRowFields,
         allowedValueFields,
-        columns
+        columns,
     ]);
     const pivotFieldChange = async (field, value) => {
         setErrors([]);
@@ -402,7 +402,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                                     : e.target.value);
                                                             }, options: allowedRowFields.map((field) => {
                                                                 return {
-                                                                    label: snakeCaseToTitleCase(field),
+                                                                    label: snakeAndCamelCaseToTitleCase(field),
                                                                     value: field,
                                                                 };
                                                             }), width: 200 }) }), _jsx("div", { ref: colFieldRef, children: _jsx(SelectComponent, { id: "pivot-row-field", label: "Column field", value: pivotColumnField, onChange: (e) => {
@@ -412,7 +412,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                                     : e.target.value);
                                                             }, options: allowedColumnFields.map((field) => {
                                                                 return {
-                                                                    label: snakeCaseToTitleCase(field),
+                                                                    label: snakeAndCamelCaseToTitleCase(field),
                                                                     value: field,
                                                                 };
                                                             }), width: 200 }) })] }), _jsxs(PivotRowContainer, { children: [_jsx(SelectComponent, { id: "pivot-row-field", label: "Value field", value: pivotValueField, onChange: (e) => {
@@ -422,7 +422,7 @@ export const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField,
                                                                 : e.target.value);
                                                         }, options: allowedValueFields.map((field) => {
                                                             return {
-                                                                label: snakeCaseToTitleCase(field),
+                                                                label: snakeAndCamelCaseToTitleCase(field),
                                                                 value: field,
                                                             };
                                                         }), width: 200 }), _jsx(SelectComponent, { id: "pivot-row-field", label: "Aggregation type", value: pivotAggregation, onChange: (e) => {
@@ -520,14 +520,14 @@ export function generatePivotTableYAxis(pivot, cols, format) {
 }
 export function generatePivotTitle(pivot) {
     if (pivot.rowField && !pivot.valueField) {
-        return snakeCaseToTitleCase(`${pivot.aggregationType} of ${pivot.rowField}
+        return snakeAndCamelCaseToTitleCase(`${pivot.aggregationType} of ${pivot.rowField}
       `);
     }
     else if (pivot.valueField && !pivot.rowField) {
-        return snakeCaseToTitleCase(`${pivot.aggregationType} of ${pivot.valueField}
+        return snakeAndCamelCaseToTitleCase(`${pivot.aggregationType} of ${pivot.valueField}
       `);
     }
-    return snakeCaseToTitleCase(`${pivot.aggregationType} of ${pivot.valueField} by ${pivot.rowField}${pivot.columnField ? ` and ${pivot.columnField}` : ''}`);
+    return snakeAndCamelCaseToTitleCase(`${pivot.aggregationType} of ${pivot.valueField} by ${pivot.rowField}${pivot.columnField ? ` and ${pivot.columnField}` : ''}`);
 }
 function castValueToDate(value) {
     if (!value) {
@@ -600,10 +600,30 @@ function getDateRange(dateRange, column, data) {
         return dateRange;
     }
 }
-function getDateBuckets(dateRange, column, data) {
+function determineIntervalThroughOverride(dateBucket, dateRange) {
+    switch (dateBucket) {
+        case 'day':
+            return eachDayOfInterval(dateRange);
+        case 'week':
+            return eachWeekOfInterval(dateRange, { weekStartsOn: 1 });
+        case 'month':
+            return eachMonthOfInterval(dateRange);
+        case 'year':
+            return eachYearOfInterval(dateRange);
+        default:
+            return eachMonthOfInterval(dateRange);
+    }
+}
+function getDateBuckets(dateRange, column, data, dateBucket) {
     if (!dateRange) {
+        if (dateBucket) {
+            return determineIntervalThroughOverride(dateBucket, getDateRange(undefined, column, data));
+        }
         return eachMonthOfInterval(getDateRange(dateRange, column, data));
     }
+    if (dateBucket) {
+        return determineIntervalThroughOverride(dateBucket, dateRange);
+    }
     const dayDifference = differenceInDays(dateRange.end, dateRange.start);
     return dayDifferenceToInterval(dayDifference, dateRange);
 }
@@ -690,7 +710,7 @@ const fixBigQueryData = (data = []) => {
     }
     return newData;
 };
-export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined) {
+export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = undefined, dateBucket) {
     // If there is no rowField, aggregate on the valueField
     if (!pivot.rowField) {
         return valueFieldAggregation(data, pivot.valueField, pivot.aggregationType, isComparison);
@@ -709,7 +729,7 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
     }
     const pivotRows = [];
     const uniqueRows = (isDateField(pivot.rowFieldType)
-        ? getDateBuckets(dateRange, pivot.rowField, data)
+        ? getDateBuckets(dateRange, pivot.rowField, data, dateBucket)
         : [...new Set(data.map((item) => item[pivot.rowField]))]).filter((row) => Boolean(row));
     const rowDateRange = getDateRange(dateRange, pivot.rowField, data);
     const compRowDateRange = getDateRange(compRange ?? dateRange, pivot.rowField, data);
@@ -717,7 +737,7 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
     // @ts-ignore
     const uniqueColumns = (pivot.columnField
         ? isDateField(pivot.columnFieldType || '')
-            ? getDateBuckets(dateRange, pivot.columnField, data)
+            ? getDateBuckets(dateRange, pivot.columnField, data, dateBucket)
             : [...new Set(data.map((item) => item[pivot.columnField || '']))]
         : [pivot.valueField]).filter((col) => Boolean(col));
     // Map from new dates to their corresponding prior dates
@@ -974,7 +994,7 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
     });
     const columns = [
         {
-            label: pivot.rowField === null ? 'Null' : snakeCaseToTitleCase(pivot.rowField),
+            label: pivot.rowField === null ? 'Null' : snakeAndCamelCaseToTitleCase(pivot.rowField),
             field: pivot.rowField,
         },
         ...uniqueColumns.map((column, index) => {
@@ -990,7 +1010,7 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
                             !pivot.columnField &&
                             index === 1
                             ? 'Count'
-                            : snakeCaseToTitleCase(columnName),
+                            : snakeAndCamelCaseToTitleCase(columnName),
                 field: columnName,
             };
         }),
@@ -1011,7 +1031,7 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
                                 : isDateField(pivot.columnFieldType || '')
                                     ? COL_DATE_MAP[getDateString(column, dateRange)] ??
                                         'Comparison'
-                                    : `comparison ${snakeCaseToTitleCase(columnName)}`,
+                                    : `comparison ${snakeAndCamelCaseToTitleCase(columnName)}`,
                     field: `comparison_${columnName}`,
                 };
             })
@@ -1093,6 +1113,6 @@ function valueFieldAggregation(data, valueField, aggregationType, isComparison)
     }
     return {
         rows: [row],
-        columns: [{ label: snakeCaseToTitleCase(valueField), field: valueField }],
+        columns: [{ label: snakeAndCamelCaseToTitleCase(valueField), field: valueField }],
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAGA,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB,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,8BAIvB,KAAK,KAAG,MAAM,GAAG,MAAM,GAAG,OA8B5B,CAAC"}
+{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAGA,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB,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,8BAIvB,KAAK,KAAG,MAAM,GAAG,MAAM,GAAG,OA+B5B,CAAC"}

package/dist/esm/utils/axisFormatter.js

@@ -24,6 +24,7 @@ export const axisFormatter = ({ value, field, fields, }) => {
         string: formatString,
         yyyy: format_YYYY,
         MMM_yyyy: format_MMM_yyyy,
+        MMM_dd: format_MMM_dd,
         MMM_dd_yyyy: format_MMM_dd_yyyy,
         hh_ap_pm: format_hh_ap_pm,
         'MMM_dd-MMM_dd': format_MMM_dd_MMM_dd,
@@ -201,6 +202,7 @@ const _getUTCDateHelper = (value, fmt) => {
     return format(utcDate, fmt);
 };
 const format_YYYY = (value) => _getUTCDateHelper(value, 'yyyy');
+const format_MMM_dd = (value) => _getUTCDateHelper(value, 'dd MMM');
 const format_MMM_yyyy = (value) => _getUTCDateHelper(value, 'MMM yyyy');
 const format_hh_ap_pm = (value) => _getUTCDateHelper(value, 'hh:mm aa');
 const format_MMM_dd_yyyy = (value) => _getUTCDateHelper(value, 'dd MMM yyyy');

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

@@ -1 +1 @@
-{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE3D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAqBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D"}
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE3D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,cAAc,CAyGjB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0DD,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAsBlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D"}

package/dist/esm/utils/columnProcessing.js

@@ -182,6 +182,7 @@ export function convertFieldTypeToJSType(fieldType) {
             return 'date';
         case 'interval':
         case 'varchar':
+        case 'text':
         default:
             return 'string';
     }

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

@@ -1,5 +1,6 @@
 export declare function capitalize(text: string): string;
 export declare function depluralize(text: string): string;
 export declare function snakeCaseToTitleCase(str: string): string;
+export declare function snakeAndCamelCaseToTitleCase(str: string): string;
 export declare function removeDoubleQuotes(str: string): string;
 //# sourceMappingURL=textProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"textProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/textProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhD;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,UAa/C;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,UAK7C"}
+{"version":3,"file":"textProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/textProcessing.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhD;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,UAa/C;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,UAiBvD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,UAK7C"}

package/dist/esm/utils/textProcessing.js

@@ -22,6 +22,25 @@ export function snakeCaseToTitleCase(str) {
         : word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
         .join(' ');
 }
+export function snakeAndCamelCaseToTitleCase(str) {
+    if (!str) {
+        return str;
+    }
+    if (str.includes('_')) {
+        return str
+            .split(/_| /)
+            .map((word) => (word === 'id' ? 'ID' : capitalize(word)))
+            .join(' ');
+    }
+    else {
+        const text = str.replace(/([a-z])([A-Z])/g, '$1 $2');
+        const newText = text
+            .split(' ')
+            .map((word) => (word === 'Id' || word === 'id' ? 'ID' : capitalize(word)))
+            .join(' ');
+        return newText;
+    }
+}
 export function removeDoubleQuotes(str) {
     if (!str) {
         return str;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.12.14",
+  "version": "2.12.16",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",