@quillsql/react 2.12.15 → 2.12.17

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);
 }
@@ -628,24 +648,45 @@ function dayDifferenceToInterval(dayDifference, dateRange) {
         return eachYearOfInterval(dateRange);
     }
 }
-function getDateString(value, dateRange) {
+function getDateString(value, dateRange, dateBucket) {
     let format;
-    if (!dateRange || !dateRange[0]) {
-        format = 'MMM_yyyy';
+    if (dateBucket) {
+        switch (dateBucket) {
+            case 'day':
+                format = 'MMM_dd';
+                break;
+            case 'week':
+                format = 'MMM_dd-MMM_dd';
+                break;
+            case 'month':
+                format = 'MMM_yyyy';
+                break;
+            case 'year':
+                format = 'yyyy';
+                break;
+            default:
+                format = 'MMM_yyyy';
+                break;
+        }
     }
     else {
-        const dayDifference = differenceInDays(new Date(dateRange[1]), new Date(dateRange[0]));
-        if (dayDifference < 14) {
-            format = 'MMM_dd_yyyy';
-        }
-        else if (dayDifference < 60) {
-            format = 'MMM_dd-MMM_dd';
-        }
-        else if (dayDifference < 365 * 3) {
+        if (!dateRange) {
             format = 'MMM_yyyy';
         }
         else {
-            format = 'yyyy';
+            const dayDifference = differenceInDays(new Date(dateRange.end), new Date(dateRange.start));
+            if (dayDifference < 14) {
+                format = 'MMM_dd_yyyy';
+            }
+            else if (dayDifference < 60) {
+                format = 'MMM_dd-MMM_dd';
+            }
+            else if (dayDifference < 365 * 3) {
+                format = 'MMM_yyyy';
+            }
+            else {
+                format = 'yyyy';
+            }
         }
     }
     return valueFormatter({
@@ -690,7 +731,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 +750,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 +758,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
@@ -734,12 +775,12 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
             data.forEach((item) => {
                 if (isDateCol) {
                     const key = getDateString(item[col], dateRange);
-                    const value = getDateString(item[`comparison_${col}`], dateRange);
+                    const value = getDateString(item[`comparison_${col}`], dateRange, dateBucket);
                     COL_DATE_MAP[key] = value;
                 }
                 if (isDateRow) {
                     const key = getDateString(item[row], dateRange);
-                    const value = getDateString(item[`comparison_${row}`], dateRange);
+                    const value = getDateString(item[`comparison_${row}`], dateRange, dateBucket);
                     ROW_DATE_MAP[key] = value;
                 }
             });
@@ -769,7 +810,7 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
     rowsToGenerate.forEach((rowValue, rowIndex) => {
         const row = {
             [pivot.rowField]: isDateField(pivot.rowFieldType)
-                ? getDateString(rowValue, dateRange)
+                ? getDateString(rowValue, dateRange, dateBucket)
                 : rowValue === null
                     ? 'Null'
                     : rowValue === false
@@ -974,12 +1015,14 @@ 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) => {
             const columnName = isDateField(pivot.columnFieldType || '')
-                ? getDateString(column, dateRange)
+                ? getDateString(column, dateRange, dateBucket)
                 : column;
             return {
                 label: column === null
@@ -990,14 +1033,14 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
                             !pivot.columnField &&
                             index === 1
                             ? 'Count'
-                            : snakeCaseToTitleCase(columnName),
+                            : snakeAndCamelCaseToTitleCase(columnName),
                 field: columnName,
             };
         }),
         ...(isComparison && pivot.columnField
             ? uniqueColumns.map((column, index) => {
                 const columnName = isDateField(pivot.columnFieldType || '')
-                    ? getDateString(column, dateRange)
+                    ? getDateString(column, dateRange, dateBucket)
                     : column;
                 return {
                     label: column === null
@@ -1009,9 +1052,8 @@ export function generatePivotTable(pivot, data, dateRange, isComparison, rowLimi
                                 index === 1
                                 ? 'Comparison Count'
                                 : isDateField(pivot.columnFieldType || '')
-                                    ? COL_DATE_MAP[getDateString(column, dateRange)] ??
-                                        'Comparison'
-                                    : `comparison ${snakeCaseToTitleCase(columnName)}`,
+                                    ? COL_DATE_MAP[getDateString(column, dateRange, dateBucket)] ?? 'Comparison'
+                                    : `comparison ${snakeAndCamelCaseToTitleCase(columnName)}`,
                     field: `comparison_${columnName}`,
                 };
             })
@@ -1093,6 +1135,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,OAgC5B,CAAC"}

package/dist/esm/utils/axisFormatter.js

@@ -24,7 +24,9 @@ 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,
+        MMM_ww_yyyy: format_MMM_ww_yyyy,
         hh_ap_pm: format_hh_ap_pm,
         'MMM_dd-MMM_dd': format_MMM_dd_MMM_dd,
         'MMM_dd_hh:mm_ap_pm': format_MMM_dd_hh_mm_ap_pm,
@@ -201,6 +203,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');
@@ -218,6 +221,19 @@ const format_MMM_dd_MMM_dd = (value) => {
         return `${format(monday, 'MMM dd')} - ${format(sunday, 'MMM dd')}`;
     }
 };
+const format_MMM_ww_yyyy = (value) => {
+    const utcDate = utcToZonedTime(new Date(value), 'UTC');
+    if (!isValid(utcDate))
+        return 'Invalid date';
+    const currentDate = new Date();
+    const startOfWeekDate = startOfWeek(utcDate, { weekStartsOn: 1 });
+    const endOfWeekDate = endOfWeek(utcDate, { weekStartsOn: 1 });
+    const month = format(utcDate, 'MMM');
+    const startDay = format(startOfWeekDate, 'd');
+    const endDay = format(endOfWeekDate, 'd');
+    const year = format(utcDate, 'yyyy');
+    return `${month}, ${startDay}-${endDay}, ${year}`;
+};
 const format_MMM_dd_hh_mm_ap_pm = (value) => {
     const utcDate = utcToZonedTime(new Date(value), 'UTC');
     if (!isValid(utcDate))

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/dist/esm/utils/valueFormatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAM/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MAwChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAwCH,CAAC;AAoMF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MAkDF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAM/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MA0ChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAwCH,CAAC;AAiNF,eAAO,MAAM,aAAa;;;;WAGhB,MAAM,KACb,MAkDF,CAAC"}

package/dist/esm/utils/valueFormatter.js

@@ -36,8 +36,10 @@ export const valueFormatter = ({ value, field, fields }) => {
         two_decimal_places: formatTwoDecimalPlaces,
         string: formatString,
         yyyy: format_YYYY,
+        MMM_dd: format_MMM_dd,
         MMM_yyyy: format_MMM_yyyy,
         MMM_dd_yyyy: format_MMM_dd_yyyy,
+        MMM_ww_yyyy: format_MMM_ww_yyyy,
         hh_ap_pm: format_hh_ap_pm,
         'MMM_dd-MMM_dd': format_MMM_dd_MMM_dd,
         'MMM_dd_hh:mm_ap_pm': format_MMM_dd_hh_mm_ap_pm,
@@ -233,6 +235,19 @@ const format_wo_yyyy = (value) => {
         return 'Invalid date';
     return `${getWeek(utcDate)},${utcDate.getFullYear()}`;
 };
+const format_MMM_ww_yyyy = (value) => {
+    const utcDate = utcToZonedTime(new Date(value), 'UTC');
+    if (!isValid(utcDate))
+        return 'Invalid date';
+    const currentDate = new Date();
+    const startOfWeekDate = startOfWeek(utcDate, { weekStartsOn: 1 });
+    const endOfWeekDate = endOfWeek(utcDate, { weekStartsOn: 1 });
+    const month = format(utcDate, 'MMM');
+    const startDay = format(startOfWeekDate, 'd');
+    const endDay = format(endOfWeekDate, 'd');
+    const year = format(utcDate, 'yyyy');
+    return `${month}, ${startDay}-${endDay}, ${year}`;
+};
 /**
  * Parses a numeric string back into a number, taking into account that
  * users in different locales will format numbers differently (eg. 1,234 means

package/package.json

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