@quillsql/react 2.13.20 → 2.13.22

package/dist/esm/utils/filterProcessing.js

@@ -1,6 +1,6 @@
+import { endOfDay, parse, startOfDay, sub } from 'date-fns';
 import { COMPARISON_RANGE, PRIMARY_RANGE, defaultOptionsV2, getRangeFromPresetOptions, } from '../DateRangePicker/dateRangePickerUtils';
-// import { Client, QuillProviderClient } from '../models/Client';
-import { DateOperator, FieldType, FilterType, DashboardFilterType, } from '../models/Filter';
+import { DateOperator, FieldType, FilterType, DashboardFilterType, TimeUnit, } from '../models/Filter';
 import { filterTreeToAst } from './astFilterProcessing';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 export function findAndProcessDateFilter(filters) {
@@ -331,36 +331,181 @@ export async function buildQueryFromFilters(baseAst, filters, endpoint, client)
         return { success: false, error: `error: ${error.message}` };
     }
 }
+export function applyCustomFilterToDashDateFilter(customDateFilter, dashboardDateFilter) {
+    if (customDateFilter.filterType === FilterType.DateCustomFilter &&
+        customDateFilter.value &&
+        typeof customDateFilter.value === 'object' &&
+        'startDate' in customDateFilter.value &&
+        'endDate' in customDateFilter.value) {
+        const startDate = customDateFilter.value.startDate;
+        const endDate = customDateFilter.value.endDate;
+        return {
+            ...dashboardDateFilter,
+            startDate: new Date(startDate),
+            endDate: new Date(endDate),
+        };
+    }
+    else if (customDateFilter.filterType === FilterType.DateFilter &&
+        customDateFilter.value &&
+        typeof customDateFilter.value === 'object' &&
+        'value' in customDateFilter.value &&
+        'unit' in customDateFilter.value) {
+        const { value, unit } = customDateFilter.value;
+        let processedUnit;
+        let processedValue = value;
+        switch (unit) {
+            case TimeUnit.Day:
+                processedUnit = 'days';
+                break;
+            case TimeUnit.Week:
+                processedUnit = 'weeks';
+                break;
+            case TimeUnit.Month:
+                processedUnit = 'months';
+                break;
+            case TimeUnit.Year:
+                processedUnit = 'years';
+                break;
+            case TimeUnit.Hour:
+                processedUnit = 'hours';
+                break;
+            case TimeUnit.Quarter:
+                processedUnit = 'months';
+                processedValue *= 3;
+                break;
+        }
+        switch (customDateFilter.operator) {
+            case DateOperator.InTheLast:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: sub(new Date(), { [processedUnit]: processedValue }),
+                    endDate: new Date(),
+                };
+            // This represents the previous period compared to the current period.
+            // For instance, if the current period is the last 30 days, the previous period would be the 30 days before that.
+            case DateOperator.InThePrevious:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: sub(new Date(), { [processedUnit]: processedValue * 2 }),
+                    endDate: sub(new Date(), { [processedUnit]: processedValue }),
+                };
+            // This represents the current period, and value is always 0.
+            // For instance if today was the 5th of August, the current month would be from the 1st to the 5th of August.
+            case DateOperator.InTheCurrent:
+                switch (unit) {
+                    case TimeUnit.Day:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: startOfDay(new Date()),
+                            endDate: endOfDay(new Date()),
+                        };
+                    case TimeUnit.Week:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: sub(new Date(), { days: new Date().getDay() }),
+                            endDate: new Date(),
+                        };
+                    case TimeUnit.Month:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: new Date(new Date().getFullYear(), new Date().getMonth(), 1),
+                            endDate: new Date(),
+                        };
+                    case TimeUnit.Year:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: new Date(new Date().getFullYear(), 0, 1),
+                            endDate: new Date(),
+                        };
+                    case TimeUnit.Quarter:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: new Date(new Date().getFullYear(), Math.floor(new Date().getMonth() / 3) * 3, 1),
+                            endDate: new Date(),
+                        };
+                    case TimeUnit.Hour:
+                        return {
+                            ...dashboardDateFilter,
+                            startDate: new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate(), new Date().getHours()),
+                            endDate: new Date(),
+                        };
+                }
+                break;
+            default:
+                return dashboardDateFilter;
+        }
+    }
+    else if (customDateFilter.filterType === FilterType.DateComparisonFilter &&
+        customDateFilter.value &&
+        typeof customDateFilter.value === 'string') {
+        const parsedDate = parse(customDateFilter.value, 'yyyy-mm-dd', new Date());
+        switch (customDateFilter.operator) {
+            case DateOperator.GreaterThanOrEqualTo:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: parsedDate,
+                    endDate: undefined,
+                };
+            case DateOperator.LessThanOrEqualTo:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: undefined,
+                    endDate: parsedDate,
+                };
+            case DateOperator.LessThan:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: undefined,
+                    endDate: sub(parsedDate, { days: 1 }),
+                };
+            case DateOperator.GreaterThan:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: sub(parsedDate, { days: 1 }),
+                    endDate: undefined,
+                };
+            case DateOperator.EqualTo:
+                return {
+                    ...dashboardDateFilter,
+                    startDate: parsedDate,
+                    endDate: parsedDate,
+                };
+            default: return dashboardDateFilter;
+        }
+    }
+    return dashboardDateFilter;
+}
 export function mergeCustomFilters(filters, customFilters) {
-    const customDateFilters = customFilters.filter((filter) => filter.filterType === FilterType.DateCustomFilter);
+    const customDateFilters = customFilters.filter((filter) => filter.filterType === FilterType.DateCustomFilter || filter.filterType === FilterType.DateFilter || filter.filterType === FilterType.DateComparisonFilter);
     if (customDateFilters.length === 0) {
         return filters.concat(customFilters);
     }
     const withoutDate = filters.filter((filter) => filter.filterType !== DashboardFilterType.Date);
     const customWithoutDate = customFilters.filter((filter) => filter.filterType !== FilterType.DateCustomFilter);
-    const startDate = customDateFilters[0]?.value.startDate;
-    const endDate = customDateFilters[0]?.value.endDate;
+    const withDate = filters.find((filter) => filter.filterType === DashboardFilterType.Date);
     return withoutDate
         .concat([
-        {
-            filterType: DashboardFilterType.Date,
-            label: 'Date',
-            field: customDateFilters[0].field,
-            table: customDateFilters[0].table,
-            options: undefined,
-            primaryRange: {
-                label: 'Custom',
-                value: 'custom',
-            },
-            dashboardName: 'none',
-            presetRanges: [],
-            preset: {
-                label: 'Custom',
-                value: 'custom',
+        withDate
+            ? applyCustomFilterToDashDateFilter(customDateFilters[0], withDate)
+            : {
+                filterType: DashboardFilterType.Date,
+                label: 'Date',
+                field: customDateFilters[0].field,
+                table: customDateFilters[0].table,
+                options: defaultOptionsV2,
+                primaryRange: {
+                    label: 'Last 30 Days',
+                    value: 'LAST_30_DAYS',
+                },
+                dashboardName: 'none',
+                presetRanges: defaultOptionsV2,
+                preset: {
+                    label: 'Last 30 Days',
+                    value: 'LAST_30_DAYS',
+                },
+                startDate: new Date(customDateFilters[0].value.startDate),
+                endDate: new Date(customDateFilters[0].value.endDate),
             },
-            startDate: new Date(startDate),
-            endDate: new Date(endDate),
-        },
     ])
         .concat(customWithoutDate);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG,EACrB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,CAoL1C"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG,EACrB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,GAAG,EAAE,CAAA;CAAE,CAAC,CAgO1C"}

package/dist/esm/utils/pivotConstructor.js

@@ -70,7 +70,9 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
         label: snakeCaseToTitleCase(processColumnName(field.name.replace('comparison_', 'comparison '))),
         format: field.name === pivot.rowField
             ? 'string'
-            : (pivot.valueFieldType ?? 'whole_number'),
+            : (pivot.valueFieldType ?? pivot.aggregationType === 'percentage')
+                ? 'percentage'
+                : 'whole_number',
     }))
         .filter((field, index) => field.field !== 'comparison_' + pivot.rowField || index === 0)
         .sort((a, b) => {
@@ -85,9 +87,26 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
     if (pivot.rowField &&
         !['string', 'varchar'].includes(pivot.rowFieldType || '')) {
         rows.forEach((row) => {
-            row[pivot.rowField || ''] = getDateString(typeof row[pivot.rowField || ''] === 'object' // BigQuery
+            row.__quillRawDate = typeof row[pivot.rowField || ''] === 'object' // BigQuery
                 ? row[pivot.rowField || ''].value
-                : row[pivot.rowField || ''], undefined, dateBucket);
+                : row[pivot.rowField || ''];
+            let value = typeof row[pivot.rowField || ''] === 'object' // BigQuery
+                ? row[pivot.rowField || ''].value
+                : row[pivot.rowField || ''];
+            if (dateBucket === 'week' && dateFilter) {
+                const rowDate = new Date(value);
+                // check if row value is within dateFilter, else push it to within the date filter
+                if (rowDate < dateFilter.startDate) {
+                    value = dateFilter.startDate.toISOString();
+                }
+                else if (rowDate > dateFilter.endDate) {
+                    value = dateFilter.endDate.toISOString();
+                }
+            }
+            const dateString = getDateString(value, dateFilter
+                ? { start: dateFilter.startDate, end: dateFilter.endDate }
+                : undefined, dateBucket);
+            row[pivot.rowField || ''] = dateString;
         });
         // add a row for each date in the range that doesn't have a value
         if (pivot.rowField &&
@@ -97,27 +116,38 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             const dateSet = new Set(rows.map((row) => row[pivot.rowField || '']));
             // create a loop that will go through each formatted date and add a row if it doesn't exist going to the current date
             for (let date = dateFilter.startDate; date <= dateFilter.endDate; date = new Date(date.getTime() + 24 * 60 * 60 * 1000)) {
-                const formattedDate = getDateString(date.toISOString().split('T')[0], undefined, dateBucket);
+                const formattedDate = getDateString(date.toISOString(), { start: dateFilter.startDate, end: dateFilter.endDate }, dateBucket);
                 if (!dateSet.has(formattedDate)) {
                     const newRow = {};
                     newRow[pivot.rowField] = formattedDate;
+                    newRow.__quillRawDate = date.toISOString();
                     rows.push(newRow);
                     dateSet.add(formattedDate);
                 }
-                // order the rows by the date field
-                // rows.sort((a: any, b: any) => {
-                //   return compareValues(a, b, pivot.rowField ?? '');
-                // });
             }
         }
+        // sort the rows by date
+        rows.sort((a, b) => {
+            if (a.__quillRawDate < b.__quillRawDate) {
+                return -1;
+            }
+            if (a.__quillRawDate > b.__quillRawDate) {
+                return 1;
+            }
+            return 0;
+        });
+        // remove the raw date field
+        // rows.forEach((row: any) => {
+        //   delete row.__quillRawDate;
+        // });
     }
     if (pivot.sort) {
         rows.sort((a, b) => {
             if (pivot.sortDirection === 'ASC') {
-                return compareValues(a, b, pivot.sortField ?? '');
+                return compareValues(a, b, pivot.sortField || '');
             }
             else {
-                return compareValues(b, a, pivot.sortField ?? '');
+                return compareValues(b, a, pivot.sortField || '');
             }
         });
     }
@@ -130,6 +160,13 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             column.label = 'Count';
         }
     });
+    // If a numeric column field is not present add it with a value of 0
+    const numericColumns = columns?.filter((column) => column.format === 'whole_number' || column.format === 'percentage');
+    rows.forEach((row) => {
+        numericColumns?.forEach((column) => {
+            row[column.field] = row[column.field] ?? 0;
+        });
+    });
     return {
         rows: rows,
         columns: columns ?? [],

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

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAarB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAgCpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAoBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,EAEvB,uBAAuB,CAAC,EAAE,OAAO,EACjC,sBAAsB,CAAC,EAAE,OAAO,UAqEjC;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,UAE1D;AAwDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAsBrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAYrB;AAiDD,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAgCpB"}

package/dist/esm/utils/queryConstructor.js

@@ -183,11 +183,12 @@ function generateDistinctQuerySnowflake(stringFields, query) {
 }
 export function generateMinMaxRangeQueries(columnFields, query, databaseType) {
     const max = databaseType.toLowerCase() === 'snowflake' ? 'GREATEST' : 'MAX';
+    const min = databaseType.toLowerCase() === 'snowflake' ? 'LEAST' : 'MIN';
     const distinctQueries = columnFields.map((field) => {
         const wrappedField = ['postgresql'].includes(databaseType.toLowerCase())
             ? `"${field}"`
             : field;
-        return `SELECT '${field}' AS field, MIN(${wrappedField}) AS min_range, ${max}(${wrappedField}) AS max_range FROM querytable`;
+        return `SELECT '${field}' AS field, ${min}(${wrappedField}) AS min_range, ${max}(${wrappedField}) AS max_range FROM querytable`;
     });
     const distinctQuery = distinctQueries.join(' UNION ALL ');
     return `WITH querytable AS (${query.replace(';', '')}) ` + distinctQuery;
@@ -570,5 +571,5 @@ function createAggregationValuePivot(pivot, itemQueries, databaseType, rowLimit)
       quill_qt_agg AS (SELECT ${aggregationType}(${valueAlias}) as ${processColumnReference(`${valueField}`, databaseType)} FROM quill_alias)
       ${compareCTE} ${aliasCTE} ${compareAggregation}
       SELECT * FROM quill_qt_agg qt
-      ${joinQuery}${rowLimit ? ` LIMIT ${rowLimit}` : ''}`;
+      ${joinQuery} ${rowLimit ? ` LIMIT ${rowLimit}` : ''}`;
 }

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

@@ -46,7 +46,7 @@ export declare function saveReport({ report, dashboardItemId, client, }: {
     client: QuillProviderClient;
 }): Promise<any>;
 export declare const formatRowsFromReport: (report: any) => any;
-export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[]): QuillReport;
+export declare function convertInternalReportToReport(report: QuillReportInternal, dashboardFilters: DashboardFilter[], initiator?: string): QuillReport;
 export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: QuillProviderClient, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
     uniqueStrings: UniqueValuesByTable;
     dateRanges: DateRangesByColumn;

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

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

package/dist/esm/utils/report.js

@@ -272,7 +272,7 @@ export const formatRowsFromReport = (report) => {
         }, {});
     });
 };
-export function convertInternalReportToReport(report, dashboardFilters) {
+export function convertInternalReportToReport(report, dashboardFilters, initiator) {
     try {
         if (!report) {
             return EMPTY_REPORT;
@@ -280,7 +280,9 @@ export function convertInternalReportToReport(report, dashboardFilters) {
         const formattedReport = {
             ...report,
         };
-        if (formattedReport.pivot && isValidPivot(formattedReport.pivot)) {
+        if (formattedReport.pivot &&
+            isValidPivot(formattedReport.pivot) &&
+            initiator !== 'useQuill') {
             let columns = report.pivotColumns ?? report.columns;
             let rows = report.pivotRows ?? report.rows;
             if (report.chartType === 'table') {

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

@@ -7,13 +7,17 @@ type Props = {
     value: any;
     field: string | undefined | null;
     fields: Field[];
+    dateRange?: {
+        start: Date;
+        end: Date;
+    };
 };
 export declare const DATE_FORMAT_TYPES: string[];
 export declare const NUMBER_FORMAT_TYPES: string[];
 /**
  * Pretty-prints the given values to their nice-looking string form.
  */
-export declare const valueFormatter: ({ value, field, fields }: Props) => string;
+export declare const valueFormatter: ({ value, field, fields, dateRange, }: Props) => string;
 export declare const quillFormat: ({ value, format, }: {
     value: any;
     format: string;

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,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,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,UAO/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MA8ChE,CAAC;AAEF,eAAO,MAAM,WAAW,uBAGrB;IACD,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,KAAG,MAgDH,CAAC;AA+MF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,oBAG9C;AAED,eAAO,MAAM,aAAa,MACrB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,KACtB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,UACjB,MAAM,KACb,MAkDF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,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;IAChB,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,CAAC;QAAC,GAAG,EAAE,IAAI,CAAA;KAAE,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAO/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,yCAKxB,KAAK,KAAG,MA8CV,CAAC;AAEF,eAAO,MAAM,WAAW,uBAGrB;IACD,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,KAAG,MAkDH,CAAC;AA0OF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,oBAG9C;AAED,eAAO,MAAM,aAAa,MACrB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,KACtB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,UACjB,MAAM,KACb,MAkDF,CAAC"}

package/dist/esm/utils/valueFormatter.js

@@ -1,4 +1,4 @@
-import { endOfWeek, format, getWeek, isValid, parse, startOfWeek, } from 'date-fns';
+import { endOfWeek, format, getWeek, isAfter, isBefore, isValid, parse, parseISO, startOfWeek, } from 'date-fns';
 import { utcToZonedTime } from 'date-fns-tz';
 export const DATE_FORMAT_TYPES = [
     'yyyy',
@@ -20,7 +20,7 @@ export const NUMBER_FORMAT_TYPES = [
 /**
  * Pretty-prints the given values to their nice-looking string form.
  */
-export const valueFormatter = ({ value, field, fields }) => {
+export const valueFormatter = ({ value, field, fields, dateRange, }) => {
     if (field === undefined || field === null)
         return '';
     if (value === undefined || value === null)
@@ -47,7 +47,7 @@ export const valueFormatter = ({ value, field, fields }) => {
         case 'yyyy':
             return format_YYYY(value);
         case 'MMM_dd':
-            return format_MMM_dd(value);
+            return format_MMM_d(value);
         case 'MMM_yyyy':
             return format_MMM_yyyy(value);
         case 'MMM_dd_yyyy':
@@ -58,7 +58,7 @@ export const valueFormatter = ({ value, field, fields }) => {
         case 'hh_ap_pm':
             return format_hh_ap_pm(value);
         case 'MMM_dd-MMM_dd':
-            return format_MMM_dd_MMM_dd(value);
+            return format_MMM_d_MMM_d(value, dateRange);
         case 'MMM_dd_hh:mm_ap_pm':
             return format_MMM_dd_hh_mm_ap_pm(value);
         case 'wo, yyyy':
@@ -92,8 +92,9 @@ export const quillFormat = ({ value, format, }) => {
             return formatString(value);
         case 'yyyy':
             return format_YYYY(value);
+        case 'MMM_d':
         case 'MMM_dd':
-            return format_MMM_dd(value);
+            return format_MMM_d(value);
         case 'MMM_yyyy':
             return format_MMM_yyyy(value);
         case 'MMM_dd_yyyy':
@@ -103,8 +104,9 @@ export const quillFormat = ({ value, format, }) => {
         //   return format_MMM_ww_yyyy(value);
         case 'hh_ap_pm':
             return format_hh_ap_pm(value);
+        case 'MMM_d-MMM_d':
         case 'MMM_dd-MMM_dd':
-            return format_MMM_dd_MMM_dd(value);
+            return format_MMM_d_MMM_d(value);
         case 'MMM_dd_hh:mm_ap_pm':
             return format_MMM_dd_hh_mm_ap_pm(value);
         case 'wo, yyyy':
@@ -226,22 +228,40 @@ const _getUTCDateHelper = (value, fmt) => {
 const format_YYYY = (value) => _getUTCDateHelper(value, 'yyyy');
 const format_MMM_yyyy = (value) => _getUTCDateHelper(value, 'MMM yyyy');
 const format_hh_ap_pm = (value) => _getUTCDateHelper(value, 'hh:mm aa');
-const format_MMM_dd = (value) => _getUTCDateHelper(value, 'MMM dd');
+const format_MMM_d = (value) => _getUTCDateHelper(value, 'MMM d');
 const format_MMM_dd_yyyy = (value) => {
     return _getUTCDateHelper(value, 'dd MMM yyyy');
 };
-const format_MMM_dd_MMM_dd = (value) => {
-    const utcDate = utcToZonedTime(new Date(value), 'UTC');
+const format_MMM_d_MMM_d = (value, dateRange) => {
+    const utcDate = parseISO(value.split('T')[0]);
     if (!isValid(utcDate))
         return 'Invalid date';
-    const monday = startOfWeek(utcDate, { weekStartsOn: 1 });
-    const sunday = endOfWeek(utcDate, { weekStartsOn: 1 });
+    let monday = startOfWeek(utcDate, { weekStartsOn: 1 });
+    let sunday = endOfWeek(utcDate, { weekStartsOn: 1 });
+    // If date range is provided, adjust the start and end dates
+    if (dateRange && dateRange.start && dateRange.end) {
+        const utcStartString = dateRange.start.toISOString().split('T')[0];
+        const utcEndString = dateRange.end.toISOString().split('T')[0];
+        if (utcStartString && utcEndString) {
+            const utcStart = parseISO(utcStartString);
+            const utcEnd = parseISO(utcEndString);
+            if (isBefore(monday, utcStart)) {
+                monday = utcStart;
+            }
+            if (isAfter(sunday, utcEnd)) {
+                sunday = utcEnd;
+            }
+            if (isAfter(monday, utcEnd) || isBefore(sunday, utcStart)) {
+                return 'Date outside range';
+            }
+        }
+    }
     // Check if start and end are in the same month
     if (format(monday, 'MMM') === format(sunday, 'MMM')) {
-        return `${format(monday, 'MMM dd')} - ${format(sunday, 'dd')}`;
+        return `${format(monday, 'MMM d')} - ${format(sunday, 'd')}`;
     }
     else {
-        return `${format(monday, 'MMM dd')} - ${format(sunday, 'MMM dd')}`;
+        return `${format(monday, 'MMM d')} - ${format(sunday, 'MMM d')}`;
     }
 };
 const format_MMM_dd_hh_mm_ap_pm = (value) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.13.20",
+  "version": "2.13.22",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
@@ -15,9 +15,9 @@
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.json && tsc -p tsconfig.esm.json",
     "dev": "concurrently \"npm run dev:types\" \"npm run dev:esm\" \"npm run dev:cjs\"",
-    "dev:types": "tsc --emitDeclarationOnly -w",
-    "dev:esm": "babel src --out-dir dist/esm --extensions \".ts,.tsx\" --copy-files --watch --env-name esm",
     "dev:cjs": "babel src --out-dir dist/cjs --extensions \".ts,.tsx\" --copy-files --watch --env-name cjs",
+    "dev:esm": "babel src --out-dir dist/esm --extensions \".ts,.tsx\" --copy-files --watch --env-name esm",
+    "dev:types": "tsc --emitDeclarationOnly -w",
     "lint": "eslint . --max-warnings 0",
     "pub": "rm -rf dist && tsc -p tsconfig.json && tsc -p tsconfig.esm.json && npm publish --access public"
   },
@@ -56,4 +56,4 @@
     "react-dom": "^18"
   },
   "access": "public"
-}
+}