@quillsql/react 2.13.7 → 2.13.9

package/dist/esm/utils/report.js

@@ -10,10 +10,9 @@ import { getDateBucketFromRange } from './dates';
 import { DataLoadError } from './error';
 import { processFilterErrorList } from './errorProcessing';
 import { internalLog } from './logging';
-import { mergeComparisonRange } from './merge';
 import { DEFAULT_PAGINATION } from './paginationProcessing';
 import { isPivotPossible, isValidPivot } from './pivotProcessing';
-import { fetchTableByAST, getDateRangeByColumns, getRelevantInfoFromQuery, } from './tableProcessing';
+import { fetchTableByAST, getQueryDateRangeByColumns, getRelevantInfoFromQuery, } from './tableProcessing';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 import { quillFormat } from './valueFormatter';
 export const EMPTY_REPORT = {
@@ -105,7 +104,6 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
                 client.databaseType.toLowerCase() === 'bigquery') {
                 parseValueFromBigQueryDates(dashboardItem.compareRows, resp.fields);
             }
-            mergeComparisonRange(dashboardItem);
         }
         reportInfo = await cleanDashboardItem(dashboardItem, filters, client, dateBucket);
         if (additionalProcessing) {
@@ -120,6 +118,7 @@ export async function fetchReport(reportId, client, useReportTask = true, filter
             reportInfo &&
             !reportInfo.pivot &&
             !reportInfo.pivotColumns &&
+            !reportInfo.error &&
             useReportTask &&
             reportInfo.columns?.filter((col) => !observedColumns.includes(col.field))
                 ?.length > 0) {
@@ -325,11 +324,16 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
             ? report
             : createInitialFormData(tableData.columns);
         curReport = {
-            ...formData,
+            id: report?.id ?? '',
+            dashboardName: report?.dashboardName ?? '',
+            order: report?.order ?? 1,
+            compareRows: report?.compareRows ?? [],
+            queryString: report?.queryString ?? '',
+            ...report,
             ...processedFormData,
-            pivot: pivot,
+            pivot: pivot ?? null,
             itemQuery: tableData.itemQuery,
-            rowCount: tableData.rowCount,
+            rowCount: tableData.rowCount ?? 0,
             filtersApplied: [],
             rows: tableData.rows,
             columns: tableData.columns.map((col) => {
@@ -360,7 +364,7 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
                     return column.fieldType === 'date';
                 });
                 if (dateColumns.length > 0) {
-                    const dateRanges = await getDateRangeByColumns(dateColumns, queryResult.query, client, customFields ?? []);
+                    const dateRanges = await getQueryDateRangeByColumns(dateColumns, queryResult.query, client, customFields ?? []);
                     if (dateRanges === null) {
                         throw new Error("Couldn't fetch date ranges");
                     }
@@ -378,7 +382,13 @@ export const fetchReportBuilderDataFromAST = async (baseAst, formData, schema, c
                 if (rowFieldDateRange) {
                     dateBucket = getDateBucketFromRange(rowFieldDateRange.dateRange);
                 }
-                newPivotData = await generatePivotTable(pivot, tableData.rows, undefined, false, -1, undefined, dateBucket, curReport, client, relevantInfo.uniqueStrings[table]);
+                newPivotData = await generatePivotTable({
+                    pivot,
+                    dateBucket,
+                    report: curReport,
+                    client,
+                    uniqueValues: relevantInfo.uniqueStrings[table],
+                });
                 newPivot = pivot;
             }
             if (!newPivotData) {

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAyDzC,eAAO,MAAM,kBAAkB,WACrB,mBAAmB,oCAqF5B,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,mBAAmB,8BAEhB,MAAM,EAAE,KAClB,QAAQ;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAoD3D,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/utils/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAyDzC,eAAO,MAAM,kBAAkB,WACrB,mBAAmB,oCAqF5B,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,mBAAmB,8BAEhB,MAAM,EAAE,KAClB,OAAO,CAAC;IAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAA;CAAE,CAoD3D,CAAC"}

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

@@ -20,15 +20,15 @@ export declare const getUniqueValuesByColumns: (columns: Column[], query: string
 } | null>;
 export declare const getUniqueStringValues: (columns: ColumnInternal[], tableName: string, client: any, customFields?: any, previousUniqueValues?: any, withExceededColumns?: boolean, query?: string) => Promise<any>;
 export declare const getRelevantInfoFromQuery: (columns: ColumnInternal[], client: QuillProviderClient, query: string, customFields?: any) => Promise<{
-    uniqueStrings?: UniqueValuesByColumn | undefined;
-    dateRanges?: DateRangesByColumn | undefined;
-    error?: string | undefined;
+    uniqueStrings?: UniqueValuesByColumn;
+    dateRanges?: DateRangesByColumn;
+    error?: string;
 }>;
 export declare const getCountsByColumns: (columns: Column[], query: string, client: QuillProviderClient, customFields: any[]) => Promise<{
     filteredColumns: Column[];
     exceededColumns: Column[] | undefined;
 }>;
-export declare const getDateRangeByColumns: (columns: Column[], query: string, client: QuillProviderClient, customFields: any[]) => Promise<{
+export declare const getQueryDateRangeByColumns: (columns: Column[], query: string, client: QuillProviderClient, customFields: any[]) => Promise<{
     [column: string]: {
         dateRange: {
             start: Date;
@@ -48,22 +48,22 @@ export declare const fetchResultsByQuery: (query: string, client: QuillProviderC
 } | null, rowsOnly?: boolean, rowCountOnly?: boolean) => Promise<{
     columns: ColumnInternal[];
     rows: any[];
-    rowCount?: number | undefined;
-    error?: string | undefined;
-    itemQuery?: string[] | undefined;
+    rowCount?: number;
+    error?: string;
+    itemQuery?: string[];
 }>;
 export declare const fetchResultsByReport: (reportId: string, client: QuillProviderClient, processing?: AdditionalProcessing, filters?: any, customFields?: any, rowsOnly?: boolean, rowCountOnly?: boolean, abortSignal?: AbortSignal) => Promise<{
     columns: Column[];
     rows: any[];
-    rowCount?: number | undefined;
-    error?: string | undefined;
+    rowCount?: number;
+    error?: string;
 }>;
 export declare const fetchTableByAST: (ast: NodeSQLParser.Select, client: QuillProviderClient, processing?: AdditionalProcessing, customFields?: any, rowsOnly?: boolean, rowCountOnly?: boolean) => Promise<{
     columns: ColumnInternal[];
     rows: any[];
-    rowCount?: number | undefined;
-    error?: string | undefined;
-    itemQuery?: string[] | undefined;
+    rowCount?: number;
+    error?: string;
+    itemQuery?: string[];
 }>;
 export declare const convertUniqueValuesByColumnToUniqueValueStrings: (uniqueValuesByColumns: UniqueValuesByColumn) => {
     [columnName: string]: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAgB5E,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,cAAc,YAChB,MAAM,EAAE,qBACE,MAAM,EAAE,KAC1B,OAUF,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,MAAM,EAAE,SACV,MAAM,QACP,GAAG,UACD,mBAAmB,gBACb,GAAG,EAAE;;;;SAmEpB,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,cAAc,EAAE,aACd,MAAM,UACT,GAAG,iBACI,GAAG,yBACK,GAAG,wBACJ,OAAO,UACrB,MAAM,iBA2Cf,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAC1B,cAAc,EAAE,UACjB,mBAAmB,SACpB,MAAM,iBACE,GAAG;;;;EA6DnB,CAAC;AAEF,eAAO,MAAM,kBAAkB,YACpB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,gBACb,GAAG,EAAE,KAClB,QAAQ;IACT,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACvC,CAiDA,CAAC;AAkDF,eAAO,MAAM,qBAAqB,YACvB,MAAM,EAAE,SACV,MAAM,UACL,mBAAmB,gBACb,GAAG,EAAE;;mBAEY;YAAE,KAAK,EAAE,IAAI,CAAC;YAAC,GAAG,EAAE,IAAI,CAAA;SAAE;;SAiB1D,CAAC;AA2DF,eAAO,MAAM,gBAAgB,WACnB,mBAAmB,UACnB,MAAM,aACH,MAAM,eACJ,oBAAoB,YACvB,GAAG,iBACE,GAAG,KACjB,QAAQ;IACT,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAaA,CAAC;AAEF,eAAO,MAAM,mBAAmB,UACvB,MAAM,UACL,mBAAmB,eACd,oBAAoB,iBAClB,GAAG,YACR,eAAe,EAAE,cACf;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,aACxC,OAAO,iBACH,OAAO;aAEb,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EA2DZ,CAAC;AAEF,eAAO,MAAM,oBAAoB,aACrB,MAAM,UACR,mBAAmB,eACd,oBAAoB,YACvB,GAAG,iBACE,GAAG,aACP,OAAO,iBACH,OAAO,gBACR,WAAW;aAEhB,MAAM,EAAE;UACX,GAAG,EAAE;;;EAyFZ,CAAC;AAEF,eAAO,MAAM,eAAe,QACrB,cAAc,MAAM,UACjB,mBAAmB,eACd,oBAAoB,iBAClB,GAAG,aACP,OAAO,iBACH,OAAO;aAEb,cAAc,EAAE;UACnB,GAAG,EAAE;;;;EAyDZ,CAAC;AAEF,eAAO,MAAM,+CAA+C,0BACnC,oBAAoB;;CAU5C,CAAC"}
+{"version":3,"file":"tableProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/tableProcessing.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/tableProcessing.js

@@ -1,12 +1,11 @@
 import { isTextColumnType, } from '../components/ReportBuilder/ast';
 import { deepCopy } from '../components/ReportBuilder/util';
 import { convertPostgresColumn } from './columnProcessing';
-import { MAX_PIVOT_UNIQUE_VALUES } from './constants';
+import { MAX_PIVOT_UNIQUE_VALUES, QUILL_QUERY_ENDPOINT, QUILL_SERVER, } from './constants';
 import { getData } from './dataFetcher';
 import { parseValueFromBigQueryDates } from './dataProcessing';
-import { parseDateByDatabaseType } from './dates';
+import { parseQueryDateRangeByDatabaseType } from './dates';
 import { processFilterErrorList } from './errorProcessing';
-import { mergeComparisonRange } from './merge';
 import { DEFAULT_PAGINATION } from './paginationProcessing';
 import { generateCountQuery, generateDistinctQuery, generateMinMaxRangeQueries, processColumnReference, } from './queryConstructor';
 export const hasColumnAlias = (columns, referencedColumns) => {
@@ -45,9 +44,9 @@ export const getUniqueValuesByColumns = async (columns, query, rows, client, cus
             rows = data.rows;
         }
         for (const column of columns) {
-            const values = Array.from(
-            //@ts-ignore
-            new Set(rows.map((row) => row[column.name || column.field])));
+            const values = Array.from(new Set(rows
+                .map((row) => row[column.name || column.field])
+                .filter((value) => value !== null && value !== undefined)));
             // @ts-ignore
             uniqueValues[column.name || column.field] = values.reduce((result, value) => {
                 result[value] = false;
@@ -74,7 +73,12 @@ export const getUniqueStringValues = async (columns, tableName, client, customFi
     const stringNames = convertedStringColumns.map((column) => processColumnReference(column.field, client.databaseType));
     const { filteredColumns: smallStringColumns, exceededColumns } = await getCountsByColumns(convertedStringColumns, query ?? `Select ${stringNames.join(', ')} from ${tableName}`, client, customFields ?? []);
     const smallStringNames = smallStringColumns.map((column) => processColumnReference(column.field, client.databaseType));
-    const newUniqueValues = await getUniqueValuesByColumns(smallStringColumns, query ?? `Select ${smallStringNames.join(', ')} from ${tableName}`, [], client, customFields ?? []);
+    const newUniqueValues = await getUniqueValuesByColumns(
+    // returns null if data error
+    smallStringColumns, query ?? `Select ${smallStringNames.join(', ')} from ${tableName}`, [], client, customFields ?? []);
+    if (!newUniqueValues) {
+        return {};
+    }
     if (withExceededColumns) {
         exceededColumns?.forEach((column) => {
             if (newUniqueValues) {
@@ -110,7 +114,7 @@ export const getRelevantInfoFromQuery = async (columns, client, query, customFie
             return column.fieldType === 'date';
         });
         if (dateColumns.length > 0) {
-            dateRanges = await getDateRangeByColumns(dateColumns, query, client, customFields);
+            dateRanges = await getQueryDateRangeByColumns(dateColumns, query, client, customFields);
             if (dateRanges === null) {
                 throw new Error("Couldn't fetch date ranges");
             }
@@ -146,7 +150,10 @@ export const getCountsByColumns = async (columns, query, client, customFields) =
             return { filteredColumns: columns, exceededColumns: undefined };
         }
         const results = data.rows.map((columnInfo) => {
-            return { field: columnInfo.field, count: columnInfo.count };
+            return {
+                field: columnInfo.field || columnInfo.FIELD, // Snowflake
+                count: columnInfo.count || columnInfo.COUNT, // Snowflake
+            };
         });
         const filteredColumns = columns.filter((column) => {
             const columnInfo = results.find((result) => result.field === column.field);
@@ -159,6 +166,7 @@ export const getCountsByColumns = async (columns, query, client, customFields) =
         return { filteredColumns, exceededColumns };
     }
     catch (e) {
+        console.error(e);
         return { filteredColumns: columns, exceededColumns: undefined };
     }
 };
@@ -181,12 +189,18 @@ const fetchDistinctStrings = async (query, client, customFields) => {
             return null;
         }
         const results = data.rows.map((columnInfo) => {
-            const column = columnInfo.field;
+            const column = columnInfo.field || columnInfo.FIELD;
             if (!columnInfo.string_values) {
                 return { column, values: {} };
             }
+            // This function is used in ReportBuilder and PivotModal to fetch distinct values. However, neither PivotModal or FilterModal
+            // are currently built to handle null values (FilterModal uses SQL IN, which doesn't handle null values). For now, filtering
+            // out null values.
             const values = columnInfo.string_values.reduce((result, value) => {
-                result[value] = false;
+                if (value !== null && value !== undefined) {
+                    // filter out null values for now, TODO: handle
+                    result[value] = false;
+                }
                 return result;
             }, {});
             return { column, values };
@@ -197,15 +211,15 @@ const fetchDistinctStrings = async (query, client, customFields) => {
         return null;
     }
 };
-export const getDateRangeByColumns = async (columns, query, client, customFields) => {
+export const getQueryDateRangeByColumns = async (columns, query, client, customFields) => {
     const columnNames = columns.map(
     // @ts-ignore
     (column) => column.field || column.name);
     const distinctValueQuery = generateMinMaxRangeQueries(columnNames, query, client.databaseType || 'postgresql');
-    const dateRanges = await fetchDateRanges(distinctValueQuery, client, customFields);
+    const dateRanges = await fetchQueryDateRanges(distinctValueQuery, client, customFields);
     return dateRanges;
 };
-const fetchDateRanges = async (query, client, customFields) => {
+const fetchQueryDateRanges = async (query, client, customFields) => {
     try {
         const hostedBody = {
             metadata: {
@@ -225,10 +239,7 @@ const fetchDateRanges = async (query, client, customFields) => {
         }
         const results = data.rows.reduce((acc, currentValue) => {
             acc[currentValue.field] = {
-                dateRange: {
-                    start: parseDateByDatabaseType(currentValue.min_range, client.databaseType || 'postgresql'),
-                    end: parseDateByDatabaseType(currentValue.max_range, client.databaseType || 'postgresql'),
-                },
+                dateRange: parseQueryDateRangeByDatabaseType(currentValue.min_range, currentValue.max_range, client.databaseType || 'postgresql'),
             };
             return acc;
         }, {});
@@ -275,6 +286,27 @@ export const fetchResultsByQuery = async (query, client, processing, customField
             },
         };
         const cloudBody = { query };
+        let parsedSuccessfully = true;
+        let parsingError = '';
+        if (!rowCountOnly) {
+            const localURL = `${QUILL_SERVER}/astify`;
+            const response = await fetch(localURL, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    query,
+                    publicKey: client.publicKey,
+                    useNewNodeSql: true,
+                }),
+            });
+            const results = await response.json();
+            if (results.success == false) {
+                parsedSuccessfully = false;
+                parsingError = results.message;
+            }
+        }
         const resp = await getData(client, 'dashquery', 'same-origin', hostedBody, cloudBody);
         if (resp && resp.errorMessage) {
             throw new Error(resp.errorMessage);
@@ -282,6 +314,23 @@ export const fetchResultsByQuery = async (query, client, processing, customField
         if (resp.rowCount) {
             rowCount = resp.rowCount;
         }
+        if (!resp.error && !parsedSuccessfully) {
+            fetch(`${QUILL_SERVER}${QUILL_QUERY_ENDPOINT}`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    metadata: {
+                        task: 'log-broken-query',
+                        query,
+                        clientId: client.clientId,
+                        error: parsingError,
+                    },
+                }),
+            });
+            throw new Error('Quill parsing error' + parsingError.replace(`Error parsing query`, ''));
+        }
         columns = resp.fields.map((elem) => convertPostgresColumn(elem));
         rows = resp.rows;
         itemQuery = resp.itemQuery;
@@ -312,9 +361,9 @@ export const fetchResultsByReport = async (reportId, client, processing, filters
             const newFilter = { ...filter };
             if (newFilter.filterType === 'date_range') {
                 delete newFilter['field'];
-                delete newFilter['options'];
                 delete newFilter['selectedValue'];
             }
+            delete newFilter['options'];
             return newFilter;
         })
         : [];
@@ -351,18 +400,12 @@ export const fetchResultsByReport = async (reportId, client, processing, filters
         const gatheredRows = resp.rows && resp.rows.length ? resp.rows : [];
         columns = resp.fields.map((elem) => convertPostgresColumn(elem));
         rows = gatheredRows;
-        if (resp && resp.name !== 'error') {
-            if (resp.compareRows) {
-                mergeComparisonRange(resp);
-            }
-        }
-        else {
+        if (resp && resp.name === 'error') {
             throw new Error(resp.errorMessage);
         }
     }
     catch (e) {
         if (e instanceof Error && e.name === 'AbortError') {
-            console.log('Aborted fetch results by report');
             throw e;
         }
         rows = [];

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

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,eAAO,MAAM,cAAc,aACf,gBAAgB,iBACX;IAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,qBACjC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,aAC1C,GAAG,EAAE,UA+BjB,CAAC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,eAAO,MAAM,cAAc,aACf,gBAAgB,iBACX;IAAE,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,GAAG,CAAA;CAAE,qBACjC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,aAC1C,GAAG,EAAE,UAmCjB,CAAC"}

package/dist/esm/utils/validation.js

@@ -3,7 +3,9 @@ export const validateReport = (formData, dashboardData, defaultDateFilter, allTa
     const issues = [];
     const filters = dashboardData.filters || [];
     const dateFilter = dashboardData.dateFilter;
-    if (dateFilter && dateFilter.comparison && formData.chartType === 'pie') {
+    if (dateFilter &&
+        dateFilter.comparison &&
+        !['line', 'column'].includes(formData.chartType)) {
         issues.push(`"${formData.dashboardName}" is a date comparison dashboard that only supports line and column charts.`);
     }
     if (dateFilter &&

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

@@ -18,6 +18,7 @@ export declare const quillFormat: ({ value, format, }: {
     value: any;
     format: string;
 }) => string;
+export declare function getValidDate(dateString: string): Date | undefined;
 export declare const compareValues: (a: {
     [key: string]: any;
 }, b: {

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,UAM/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,6BAA8B,KAAK,KAAG,MA8ChE,CAAC;AAEF,eAAO,MAAM,WAAW;WAIf,GAAG;YACF,MAAM;MACZ,MAgDH,CAAC;AAoNF,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,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"}

package/dist/esm/utils/valueFormatter.js

@@ -13,6 +13,7 @@ export const NUMBER_FORMAT_TYPES = [
     'whole_number',
     'one_decimal_place',
     'two_decimal_places',
+    'percent',
     'dollar_amount',
     'dollar_cents',
 ];
@@ -304,7 +305,7 @@ function isValidDate(dateString) {
     return !isNaN(d.getTime());
     // return FORMATS.some((fmt) => isValid(parse(d, fmt, new Date())));
 }
-function getValidDate(dateString) {
+export function getValidDate(dateString) {
     const dates = FORMATS.map((fmt) => parse(dateString, fmt, new Date()));
     return dates.find((date) => isValid(date));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"width.d.ts","sourceRoot":"","sources":["../../../src/utils/width.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,iBAClB,MAAM,SAAS,CAAC,WAAW,CAAC,oBACxB,MAAM,cAAc,CAAC,MAAM,CAAC,KAAK,IAAI,YAC9C;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,SAazB,CAAC"}
+{"version":3,"file":"width.d.ts","sourceRoot":"","sources":["../../../src/utils/width.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,iBAClB,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,YAChC,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,IAAI,YAC9C;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,SAazB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.13.7",
+  "version": "2.13.9",
   "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: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",
+    "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",
     "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"
-}
+}