@quillsql/react 2.13.7 → 2.13.9

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

@@ -58,12 +58,21 @@ export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: Ta
     ast: any;
     pivot: Pivot | null | undefined;
     whereAST: any;
-    error?: string | undefined;
+    error?: string;
 }>;
 export declare const fetchASTFromQuillReport: (report: QuillReportInternal, client: QuillProviderClient, schema: Table[]) => Promise<{
     ast: any;
     pivot: Pivot | undefined | null;
-    schema?: Table[] | undefined;
-    error?: string | undefined;
+    schema?: Table[];
+    error?: string;
 }>;
+export declare function getTablesHelper(ast: any, allTables: Table[]): {
+    referencedTablesAndColumns: {
+        name: string;
+        columns: {
+            field: string;
+        }[];
+    }[];
+    dateFields: any;
+};
 //# sourceMappingURL=astProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIzC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAgBtE;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAgB1E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG;;EA4BtD;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAahD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CActE;AAED,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,GAAG,EAAE,GACb,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC1C,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,KAAK,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAmCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,KAAK,EAAE,EACf,aAAa,EAAE,GAAG,GACjB;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAyG/B;AAED,eAAO,MAAM,UAAU,SAAU,GAAG,YAWnC,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,GAAG,UACJ,KAAK,EAAE,KACd,CAAC,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,EAmCtC,CAAC;AAEF,eAAO,MAAM,+BAA+B,YACjC,cAAc,EAAE,aACd,MAAM;;;;;;;;;;;;;;;;;;;;;;CAqBlB,CAAC;AAEF,eAAO,MAAM,4BAA4B,aAC7B,MAAM,UACR,KAAK,EAAE,UACP,mBAAmB,cACf,KAAK,iBACF,MAAM;SAEhB,GAAG;WACD,KAAK,GAAG,IAAI,GAAG,SAAS;cACrB,GAAG;;EAsGd,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,UACnB,mBAAmB,UACnB,KAAK,EAAE;SAEV,GAAG;WACD,KAAK,GAAG,SAAS,GAAG,IAAI;;;EAwDhC,CAAC"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"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"}

package/dist/esm/utils/astProcessing.js

@@ -459,3 +459,67 @@ export const fetchASTFromQuillReport = async (report, client, schema) => {
     }
     return { ast: newAst, pivot: groupByPivot, schema: schemaInfo };
 };
+const POSTGRES_DATE_TYPES = [
+    'timestamp',
+    'date',
+    'timestamptz',
+    'time',
+    'timetz',
+];
+export function getTablesHelper(ast, allTables) {
+    const tableAliasMap = createTableNameToTableAliasMap(ast);
+    const tablesInQuery = Object.values(tableAliasMap);
+    // Remove all aliased tables (with statements and subqueries)
+    const onlyReferenceTables = allTables
+        .filter((table) => tablesInQuery.includes(table.displayName))
+        .map((table) => table.displayName);
+    // Get non with statement column references
+    let referencedColumns = getColumnsByTableFromASTAndSchema(ast, allTables, tableAliasMap);
+    referencedColumns = Object.keys(referencedColumns)
+        .filter((table) => onlyReferenceTables.includes(table))
+        .reduce((obj, key) => {
+        obj[key] = referencedColumns[key];
+        return obj;
+    }, {});
+    // With statement column references
+    if (ast.with) {
+        for (const withStmt of ast.with) {
+            const astFrom = withStmt.stmt.from ?? withStmt.stmt.ast.from;
+            if (astFrom) {
+                const withReferencedColumns = getColumnsByTableFromASTAndSchema(withStmt.stmt.ast ?? withStmt.stmt, allTables, tableAliasMap);
+                // @ts-ignore
+                Object.keys(withReferencedColumns).forEach((tableName) => {
+                    if (referencedColumns[tableName]) {
+                        // @ts-ignore
+                        referencedColumns[tableName].push(...(withReferencedColumns[tableName] || []));
+                    }
+                    else {
+                        // @ts-ignore
+                        referencedColumns[tableName] = withReferencedColumns[tableName];
+                    }
+                });
+            }
+        }
+    }
+    // Make all the column strings unique
+    for (const table in referencedColumns) {
+        referencedColumns[table] = Array.from(new Set(referencedColumns[table]));
+    }
+    const referencedTablesAndColumns = Object.keys(referencedColumns).map((tableName) => {
+        return {
+            name: tableName,
+            columns: referencedColumns[tableName]?.map((column) => {
+                return { field: column };
+            }) || [],
+        };
+    });
+    const dateFields = allTables
+        .filter((table) => onlyReferenceTables.includes(table.displayName))
+        .map((table) => {
+        return {
+            name: table.displayName,
+            columns: table.columns.filter((column) => POSTGRES_DATE_TYPES.includes(column.fieldType)),
+        };
+    });
+    return { referencedTablesAndColumns, dateFields };
+}

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;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAgJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AAsED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,eAAO,MAAM,cAAc,WAAY,mBAAmB,UAsDzD,CAAC"}
+{"version":3,"file":"columnProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/columnProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,UAAU,6CAA6C;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,oCAAoC;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,2BAA2B,GAC5B,6CAA6C,GAC7C,oCAAoC,CAAC;AAEzC,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,2BAA2B,GACjC,cAAc,CAgJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AAsED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAwDlE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAY5D;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,eAAO,MAAM,cAAc,WAAY,mBAAmB,UAoDzD,CAAC"}

package/dist/esm/utils/columnProcessing.js

@@ -292,7 +292,7 @@ export function processColumnName(columnName) {
 }
 export const getYAxisFields = (report) => {
     try {
-        const curDateFilter = findAndProcessDateFilter(Object.values(report.filtersApplied));
+        const curDateFilter = findAndProcessDateFilter(report.filtersApplied);
         if (report.pivot && report.pivotColumns && report.pivot.columnField) {
             return (report.pivotColumns
                 .slice(1)

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AA6BnD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,mBAAmB,EAC5B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAoD9B;AAsID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,GAAG,CAAC,CA2Bd;AAED,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,eAAe,EAAE,CAAC,CA8F5B"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAWvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AA6BnD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,mBAAmB,EAC5B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CA8D9B;AAwHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,GAAG,CAAC,CA2Bd;AAED,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,eAAe,EAAE,CAAC,CAiG5B"}

package/dist/esm/utils/dashboard.js

@@ -19,7 +19,7 @@ const defaultDashboardItem = {
     xAxisField: '',
     xAxisFormat: 'string',
     order: -1,
-    filtersApplied: {},
+    filtersApplied: [],
     queryString: '',
     rowCount: 0,
     columnInternal: [],
@@ -34,16 +34,26 @@ const defaultDashboardItem = {
 export async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
     if (!item)
         return defaultDashboardItem;
-    if (!item.rows)
+    if (!item.rows) {
         return {
             ...defaultDashboardItem,
             id: item._id,
             name: item.name,
         };
-    const pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket);
+    }
     const processedColumns = item.columns.map((col) => {
         return { ...col, label: snakeAndCamelCaseToTitleCase(col.label) };
     });
+    let pivotTable;
+    let pivotError;
+    try {
+        pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket);
+    }
+    catch (e) {
+        pivotTable = undefined;
+        console.error('Error fetching pivot table', e);
+        pivotError = 'Error fetching pivot table';
+    }
     return {
         id: item._id ?? item.id,
         name: item.name,
@@ -62,7 +72,7 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         columnInternal: processedColumns,
         chartType: item.chartType,
         dateField: item.dateField,
-        pivot: item.pivot,
+        pivot: pivotError ? undefined : item.pivot,
         yAxisFields: pivotTable
             ? extractPivotedYAxis(pivotTable, item)
             : item.yAxisFields,
@@ -78,6 +88,7 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         queryString: item.queryString,
         referencedTables: item?.referencedTables || [],
         referencedColumns: item?.referencedColumns || {},
+        error: pivotError,
     };
 }
 /**
@@ -119,7 +130,7 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
         try {
             let dateBucket = dateBucketInitial;
             let filterDateRange = undefined;
-            if (dateFilter) {
+            if (dateFilter && dateFilter.startDate && dateFilter.endDate) {
                 filterDateRange = {
                     start: dateFilter.startDate,
                     end: dateFilter.endDate,
@@ -132,27 +143,19 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
                 dateBucket = getDateBucketFromRange(filterDateRange);
             }
             const pivotTable = await generatePivotWithSQL(pivot, report, client, dateBucket, dateFilter, report.distinctStrings);
-            if (pivotTable) {
-                return pivotTable;
-            }
-            throw new Error('Error generating pivot table');
+            return pivotTable;
         }
         catch (e) {
-            console.log('Error fetching pivot table', e);
-            throw new Error('Failed to fetch chart');
+            console.error('Error fetching pivot table', e);
+            throw e;
         }
     }
     return pivot && data.rows
-        ? generatePivotTable(pivot, JSON.parse(JSON.stringify(data.rows)), // deep copy
-        dateFilter?.startDate && dateFilter?.endDate
-            ? { start: dateFilter.startDate, end: dateFilter.endDate }
-            : undefined, Boolean(dateFilter?.comparisonRange?.startDate), -1, dateFilter?.comparisonRange?.startDate &&
-            dateFilter?.comparisonRange?.endDate
-            ? {
-                start: dateFilter.comparisonRange.startDate,
-                end: dateFilter.comparisonRange.endDate,
-            }
-            : undefined)
+        ? generatePivotTable({
+            pivot,
+            report,
+            client,
+        })
         : undefined;
 }
 /**
@@ -228,8 +231,10 @@ export async function getDashboardFilters(dashboardName, client) {
                     return {
                         label: elem.label,
                         value: elem.value,
-                        startDate: PRIMARY_RANGE[elem.value].start,
-                        endDate: PRIMARY_RANGE[elem.value].end,
+                        startDate: (PRIMARY_RANGE[elem.value] ??
+                            PRIMARY_RANGE['LAST_30_DAYS']).startDate,
+                        endDate: (PRIMARY_RANGE[elem.value] ??
+                            PRIMARY_RANGE['LAST_30_DAYS']).endDate,
                     };
                 }
                 return {
@@ -265,10 +270,10 @@ export async function getDashboardFilters(dashboardName, client) {
         if (resp.dateFilter.comparison) {
             filter.comparison = true;
             const compKey = resp.dateFilter.defaultComparisonRange ?? 'PREV_PERIOD';
-            const range = { start: filter.startDate, end: filter.endDate };
+            const range = { startDate: filter.startDate, endDate: filter.endDate };
             filter.comparisonRange = {
-                startDate: COMPARISON_RANGE[compKey](range)?.start,
-                endDate: COMPARISON_RANGE[compKey](range)?.end,
+                startDate: COMPARISON_RANGE[compKey](range)?.startDate,
+                endDate: COMPARISON_RANGE[compKey](range)?.endDate,
                 value: compKey,
             };
         }

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

@@ -15,6 +15,9 @@ export declare function getDateBucketFromRange(dateRange: {
     start: Date;
     end: Date;
 }): "year" | "month" | "week" | "day";
-export declare function parseDateByDatabaseType(date: any, databaseType: string): Date;
+export declare function parseQueryDateRangeByDatabaseType(minRange: any, maxRange: any, databaseType: string): {
+    start: Date;
+    end: Date;
+};
 export declare function getDateFormatFromBucket(dateBucket: string): string;
 //# sourceMappingURL=dates.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,QAMtE;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,UAoBzD"}
+{"version":3,"file":"dates.d.ts","sourceRoot":"","sources":["../../../src/utils/dates.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,UAYxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,WAa/C;AAED,wBAAgB,qBAAqB,CACnC,eAAe,EAAE;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,IAAI,CAAC;CACf,EACD,UAAU,CAAC,EAAE,MAAM,sBAepB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE;IAAE,KAAK,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,qCAW3E;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,GAAG,EACb,QAAQ,EAAE,GAAG,EACb,YAAY,EAAE,MAAM;;;EAUrB;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,UAoBzD"}

package/dist/esm/utils/dates.js

@@ -64,12 +64,15 @@ export function getDateBucketFromRange(dateRange) {
         return 'year';
     }
 }
-export function parseDateByDatabaseType(date, databaseType) {
+export function parseQueryDateRangeByDatabaseType(minRange, maxRange, databaseType) {
     if (databaseType.toLowerCase() === 'bigquery') {
-        return new Date(date.value);
+        return {
+            start: new Date(minRange?.value ?? null),
+            end: new Date(maxRange?.value ?? null),
+        };
     }
     else {
-        return new Date(date);
+        return { start: new Date(minRange), end: new Date(maxRange) };
     }
 }
 export function getDateFormatFromBucket(dateBucket) {

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

@@ -1,14 +1,14 @@
-import { FieldTypes, Filter } from '../models/Filter';
+import { FieldType, InternalFilter } from '../models/Filter';
 import { UniqueValuesByColumn } from '../models/Tables';
 import { FilterTreeNode } from './astFilterProcessing';
 export declare function findAndProcessDateFilter(filters: any[]): any;
 export declare function processFilterFromBackend(filter: any): any;
 export declare function updateFilter(filter: any, value: any, comparison: any, dashboardName: string): any;
-export declare const getType: (t: string) => FieldTypes.String | FieldTypes.Number | FieldTypes.Date | FieldTypes.Boolean;
+export declare const getType: (t: string) => FieldType.String | FieldType.Number | FieldType.Date | FieldType.Boolean;
 /**
  * Returns a sentence to describe a Filter
  */
-export declare function filterSentence(filter: Filter): string;
+export declare function filterSentence(filter: InternalFilter): string;
 /**
  * Function that flattens a tree of filters into an array
  */

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

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,UAAU,EACV,MAAM,EAEP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,KAAY,EACjB,UAAU,KAAY,EACtB,aAAa,EAAE,MAAM,OAgGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,iFAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,SAAS,EACT,cAAc,EAEf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAoB5D;AAMD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,OAkBnD;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,GAAG,EACX,KAAK,EAAE,GAAU,EACjB,UAAU,EAAE,GAAU,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,6EAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAwB7D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,EAAE,CAoCrE;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,GAAG,EAAE,yBAgCnD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B/D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,GAAG;IAC3E,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA"}

package/dist/esm/utils/filterProcessing.js

@@ -1,5 +1,5 @@
 import { COMPARISON_RANGE, PRIMARY_RANGE, defaultOptionsV2, getRangeFromPresetOptions, } from '../DateRangePicker/dateRangePickerUtils';
-import { DateOperator, FieldTypes, FilterNames, } from '../models/Filter';
+import { DateOperator, FieldType, FilterType, } from '../models/Filter';
 import { filterTreeToAst } from './astFilterProcessing';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 export function findAndProcessDateFilter(filters) {
@@ -74,8 +74,10 @@ export function updateFilter(filter, value = null, comparison = null, dashboardN
                     return {
                         label: elem.label,
                         value: elem.value,
-                        startDate: PRIMARY_RANGE[elem.value].start,
-                        endDate: PRIMARY_RANGE[elem.value].end,
+                        startDate: (PRIMARY_RANGE[elem.value] ??
+                            PRIMARY_RANGE['LAST_30_DAYS']).startDate,
+                        endDate: (PRIMARY_RANGE[elem.value] ??
+                            PRIMARY_RANGE['LAST_30_DAYS']).endDate,
                     };
                 }
                 return {
@@ -90,15 +92,15 @@ export function updateFilter(filter, value = null, comparison = null, dashboardN
             (filter.comparison && filter.comparisonRange.value !== 'NO_COMPARISON')) {
             const key = comparison?.value || filter.comparisonRange.value;
             let primaryRange = {
-                start: value ? value.startDate : filter.startDate,
-                end: value ? value.endDate : filter.endDate,
+                startDate: value ? value.startDate : filter.startDate,
+                endDate: value ? value.endDate : filter.endDate,
             };
             if (value && value.preset) {
                 primaryRange = getRangeFromPresetOptions(value.preset, presetsOptions);
             }
             return {
-                startDate: primaryRange.start,
-                endDate: primaryRange.end,
+                startDate: primaryRange.startDate,
+                endDate: primaryRange.endDate,
                 filterType: 'date_range',
                 label: 'Date',
                 field: 'date_range',
@@ -106,8 +108,9 @@ export function updateFilter(filter, value = null, comparison = null, dashboardN
                 options: filter.options,
                 comparison: true,
                 comparisonRange: {
-                    startDate: COMPARISON_RANGE[key](primaryRange)?.start,
-                    endDate: COMPARISON_RANGE[key](primaryRange)?.end,
+                    startDate: COMPARISON_RANGE[key](primaryRange)
+                        ?.startDate,
+                    endDate: COMPARISON_RANGE[key](primaryRange)?.endDate,
                     value: key,
                 },
                 dashboardName: name,
@@ -117,14 +120,14 @@ export function updateFilter(filter, value = null, comparison = null, dashboardN
             const primaryRange = value && value.preset
                 ? getRangeFromPresetOptions(value.preset, presetsOptions)
                 : {
-                    start: value?.startDate || filter.startDate,
-                    end: value?.endDate || filter.endDate,
+                    startDate: value?.startDate || filter.startDate,
+                    endDate: value?.endDate || filter.endDate,
                 };
             return {
                 ...filter,
                 preset: filter.preset,
-                startDate: primaryRange.start,
-                endDate: primaryRange.end,
+                startDate: primaryRange.startDate,
+                endDate: primaryRange.endDate,
                 filterType: 'date_range',
                 field: 'date_range',
                 options: filter.options,
@@ -156,7 +159,7 @@ export const getType = (t) => {
         case 'longtext':
         case 'longblob':
         case 'text':
-            return FieldTypes.String;
+            return FieldType.String;
         case 'numeric':
         case 'bit':
         case 'tinybit':
@@ -174,7 +177,7 @@ export const getType = (t) => {
         case 'smallmoney':
         case 'money':
         case 'real':
-            return FieldTypes.Number;
+            return FieldType.Number;
         case 'date':
         case 'datetime':
         case 'datetime2':
@@ -184,12 +187,12 @@ export const getType = (t) => {
         case 'timestamptz':
         case 'time':
         case 'year':
-            return FieldTypes.Date;
+            return FieldType.Date;
         case 'bool':
         case 'boolean':
-            return FieldTypes.Boolean;
+            return FieldType.Boolean;
         default:
-            return FieldTypes.String;
+            return FieldType.String;
     }
 };
 /**
@@ -197,7 +200,7 @@ export const getType = (t) => {
  */
 export function filterSentence(filter) {
     let value = '';
-    if (filter.filterType == FilterNames.NullFilter) {
+    if (filter.filterType == FilterType.NullFilter) {
         return `${snakeAndCamelCaseToTitleCase(filter.field)} ${filter.operator}`;
     }
     else if (filter.value === null || filter.value === undefined) {

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

@@ -1,2 +1,2 @@
-export declare function mergeComparisonRange(resp: any): void;
+export declare function mergeComparisonRange(resp: any): any;
 //# sourceMappingURL=merge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/utils/merge.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,QAI7C"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/utils/merge.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAInD"}

package/dist/esm/utils/merge.js

@@ -1,18 +1,23 @@
 export function mergeComparisonRange(resp) {
     if (resp.chartType === 'table')
-        return;
-    mergeForwards(resp);
+        return resp;
+    return mergeForwards(resp);
     // mergeBackwards(resp); // uncomment to switch back and forth
 }
 function mergeForwards(resp) {
     const compRows = resp.compareRows;
-    let j = 0;
-    for (let i = 0; i < resp.rows.length; i++) {
-        if (j < compRows.length) {
-            for (const [key, value] of Object.entries(compRows[j])) {
-                resp.rows[i][`comparison_${key}`] = value;
+    if (!compRows)
+        return resp;
+    const newRows = resp.rows.map((row, i) => {
+        if (i < compRows.length) {
+            const compRow = compRows[i];
+            const newRow = { ...row };
+            for (const [key, value] of Object.entries(compRow)) {
+                newRow[`comparison_${key}`] = value;
             }
+            return newRow;
         }
-        j++;
-    }
+        return row;
+    });
+    return { ...resp, rows: newRows };
 }

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

@@ -1,8 +1,8 @@
 import { QuillProviderClient } from '../models/Client';
 import { Pivot } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
-export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: QuillProviderClient, dateBucket?: string, dateFilter?: any, distinctStrings?: any): Promise<{
-    rows: any;
-    columns: any;
-} | undefined>;
+export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: QuillProviderClient, dateBucket?: string, dateFilter?: any, distinctStrings?: any, rowLimit?: number): Promise<{
+    rows: any[];
+    columns: any[];
+}>;
 //# sourceMappingURL=pivotConstructor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,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;;;eAuMtB"}
+{"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"}