@quillsql/react 2.13.34 → 2.13.36

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

@@ -54,7 +54,10 @@ export declare const createBasicSelectASTFromColumns: (columns: ColumnInternal[]
     orderby: null;
     limit: null;
 };
-export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: Table[], client: QuillProviderClient, prevPivot?: Pivot, currentQuery?: string, prevTable?: string, dashboardName?: string) => Promise<{
+export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: Table[], client: QuillProviderClient, prevPivot?: Pivot, currentQuery?: string, prevTable?: string, dashboardName?: string, tenants?: {
+    tenantField: string;
+    tenantIds: (string | number)[];
+}[] | (string | number)[]) => Promise<{
     ast: any;
     pivot: Pivot | null | undefined;
     whereAST: any;

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

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

package/dist/cjs/utils/astProcessing.js

@@ -344,7 +344,7 @@ const createBasicSelectASTFromColumns = (columns, tableName) => {
 };
 exports.createBasicSelectASTFromColumns = createBasicSelectASTFromColumns;
 //TODO: Move all fetches to a /sdk route
-const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot, currentQuery, prevTable, dashboardName) => {
+const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot, currentQuery, prevTable, dashboardName, tenants) => {
     let res, data, ast, newAst, pivot;
     let numRetries = 0;
     let whereAST;
@@ -409,7 +409,7 @@ const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot,
         if (!tableInfo) {
             throw new Error('Table info not found');
         }
-        const uniqueValues = await (0, tableProcessing_1.getUniqueStringValues)(tableInfo.columns, processedName, client, undefined, undefined, undefined, undefined, dashboardName);
+        const uniqueValues = await (0, tableProcessing_1.getUniqueStringValues)(tableInfo.columns, processedName, client, tenants, undefined, undefined, undefined, undefined, dashboardName);
         newAst = (0, convert_1.convertUnaryToBinary)(newAst);
         newAst = (0, util_1.removeNonSelectedTableReferences)(newAst, processedName, tableInfo.columns.map((col) => col.field), uniqueValues);
         if (pivot) {

package/dist/cjs/utils/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,YAAY,EAAE,MAM1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,GAAG;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAgDtD;AAED,wBAAsB,kBAAkB,CAAC,EACvC,aAAa,EACb,YAAY,EACZ,eAAe,EACf,MAAM,EACN,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;CAClB;;;GAyCA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEvD,eAAO,MAAM,YAAY,EAAE,MAK1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,eAAe,UAAQ,EACvB,YAAY,CAAC,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,GAAG;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;CAAE,CAAC,CAoDtD;AAED,wBAAsB,kBAAkB,CAAC,EACvC,aAAa,EACb,YAAY,EACZ,eAAe,EACf,MAAM,EACN,QAAQ,GACT,EAAE;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;CAClB;;;GAyCA"}

package/dist/cjs/utils/client.js

@@ -7,7 +7,6 @@ exports.EMPTY_CLIENT = {
     name: '',
     _id: '',
     databaseType: '',
-    adminCustomerId: '',
     domainName: '',
 };
 async function fetchClient(publicKey, queryEndpoint, withCredentials = false, queryHeaders) {
@@ -31,7 +30,10 @@ async function fetchClient(publicKey, queryEndpoint, withCredentials = false, qu
         });
         const json = await response.json();
         result = json.data?.data?.client || json.data?.client;
-        clientTenantIds = await Promise.all(result.allTenantTypes?.map(async (tenant) => {
+        if (!result) {
+            throw new Error('No client found');
+        }
+        clientTenantIds = await Promise.all(result?.allTenantTypes?.map(async (tenant) => {
             return await getClientTenantIds({
                 queryEndpoint,
                 queryHeaders,
@@ -43,10 +45,11 @@ async function fetchClient(publicKey, queryEndpoint, withCredentials = false, qu
     }
     catch (error) {
         console.error('ERROR:', error);
+        throw error;
     }
     return {
         ...result,
-        allTenantTypes: result.allTenantTypes?.map((tenant) => ({
+        allTenantTypes: result?.allTenantTypes?.map((tenant) => ({
             ...tenant,
             tenantIds: clientTenantIds?.find((clientTenant) => clientTenant.id === tenant.id)
                 ?.tenantIds || [],

package/dist/cjs/utils/columnProcessing.d.ts

@@ -13,6 +13,7 @@ interface ConvertPostgresColumnParamsWithField {
 type ConvertPostgresColumnParams = ConvertPostgresColumnParamsWithColumnInternal | ConvertPostgresColumnParamsWithField;
 export declare function convertPostgresColumn(field: ConvertPostgresColumnParams): ColumnInternal;
 export declare function convertColumnInfoToColumnInternal(columnInfo: ColumnInfo): ColumnInternal;
+export declare function fieldTypeToDataTypeID(fieldType: string): number;
 export declare function convertFieldTypeToJSType(fieldType: string): string;
 export declare function convertFormatToJsType(column: Column): string;
 export declare function processColumnName(columnName: string): string;

package/dist/cjs/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,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,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,CAmJhB;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,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CASrD;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAavD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,eAAO,MAAM,cAAc,WACjB,mBAAmB,oBACT,eAAe,EAAE,UAqDpC,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,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,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,CAmJhB;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,UAAU,GACrB,cAAc,CAShB;AA0BD,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CA0C/D;AAED,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,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CASrD;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAavD;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,eAAO,MAAM,cAAc,WACjB,mBAAmB,oBACT,eAAe,EAAE,UAqDpC,CAAC"}

package/dist/cjs/utils/columnProcessing.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getYAxisFields = void 0;
 exports.convertPostgresColumn = convertPostgresColumn;
 exports.convertColumnInfoToColumnInternal = convertColumnInfoToColumnInternal;
+exports.fieldTypeToDataTypeID = fieldTypeToDataTypeID;
 exports.convertFieldTypeToJSType = convertFieldTypeToJSType;
 exports.convertFormatToJsType = convertFormatToJsType;
 exports.processColumnName = processColumnName;

package/dist/cjs/utils/dashboard.d.ts

@@ -1,5 +1,6 @@
 import { QuillReportInternal } from '../models/Report';
 import { QuillProviderClient } from '../models/Client';
+import { AdditionalProcessing } from './tableProcessing';
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
  * the dashboard item so that we aren't exposing unnecessary details to the
@@ -9,7 +10,7 @@ import { QuillProviderClient } from '../models/Client';
  */
 export declare function cleanDashboardItem(item: {
     [key: string]: any;
-} | undefined, dashboardFilters: any, client: QuillProviderClient, dateBucket?: string): Promise<QuillReportInternal>;
+} | undefined, dashboardFilters: any, client: QuillProviderClient, dateBucket?: string, additionalProcessing?: AdditionalProcessing): Promise<QuillReportInternal>;
 export declare function getDashboard(dashboardName: string, client: QuillProviderClient, tenants?: {
     tenantField: string;
     tenantIds: (string | number)[];

package/dist/cjs/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;AAuBvD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAiE9B;AA4HD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AA2BzD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,GAC1C,OAAO,CAAC,mBAAmB,CAAC,CAyE9B;AAuID,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,CA6Bd"}

package/dist/cjs/utils/dashboard.js

@@ -7,6 +7,7 @@ const textProcessing_1 = require("./textProcessing");
 const dataFetcher_1 = require("./dataFetcher");
 const dates_1 = require("./dates");
 const pivotConstructor_1 = require("./pivotConstructor");
+const columnProcessing_1 = require("./columnProcessing");
 const defaultDashboardItem = {
     id: '',
     name: '',
@@ -33,7 +34,7 @@ const defaultDashboardItem = {
  * interface to build amazing dashboards on top of.
  * @param item
  */
-async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
+async function cleanDashboardItem(item, dashboardFilters, client, dateBucket, additionalProcessing) {
     if (!item)
         return defaultDashboardItem;
     if (!item.rows) {
@@ -49,7 +50,7 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
     let pivotTable;
     let pivotError;
     try {
-        pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket, item.dashboardName);
+        pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket, additionalProcessing, item.dashboardName);
     }
     catch (e) {
         pivotTable = undefined;
@@ -74,7 +75,11 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
         columnInternal: processedColumns,
         chartType: item.chartType,
         dateField: item.dateField,
-        pivot: pivotError ? undefined : item.pivot,
+        pivot: pivotError
+            ? undefined
+            : item.pivot
+                ? { ...item.pivot, columnValues: item.distinctStrings }
+                : undefined,
         yAxisFields: pivotTable
             ? extractPivotedYAxis(pivotTable, item)
             : item.yAxisFields,
@@ -86,10 +91,13 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
         filterMap: item.filterMap,
         flags: item.flags,
         rowCount: item.rowCount ? parseInt(item.rowCount) : item.rows.length,
+        pivotRowCount: pivotTable ? pivotTable.rowCount : undefined,
         template: item.template,
         sort: item.sort,
         itemQuery: item.itemQuery,
         queryString: item.queryString,
+        pivotQuery: pivotTable?.pivotQuery,
+        comparisonPivotQuery: pivotTable?.comparisonPivotQuery,
         referencedTables: item?.referencedTables || [],
         referencedColumns: item?.referencedColumns || {},
         error: item.error ?? pivotError,
@@ -98,7 +106,7 @@ async function cleanDashboardItem(item, dashboardFilters, client, dateBucket) {
 /**
  * Extract and transform the data from itemInfo.
  */
-async function getPivotTable(report, dashboardFilters, client, dateBucketInitial, dashboardName, tenants) {
+async function getPivotTable(report, dashboardFilters, client, dateBucketInitial, additionalProcessing, dashboardName, tenants) {
     if (!report)
         return undefined;
     const dateFilter = Object.values(dashboardFilters ?? {}).find((filter) => filter.filterType === 'date_range' || filter.operator === 'BETWEEN');
@@ -114,20 +122,27 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
             if (pivot.rowField) {
                 columns.push({
                     field: pivot.rowField,
-                    label: pivot.rowField.charAt(0).toUpperCase() + pivot.rowField.slice(1),
-                    format: pivot.rowFieldType,
+                    label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(pivot.rowField)),
+                    format: pivot.rowFieldType || 'string',
+                    jsType: (0, columnProcessing_1.convertFieldTypeToJSType)(pivot.rowFieldType || 'string'),
+                    fieldType: pivot.rowFieldType || 'string',
+                    dataTypeID: (0, columnProcessing_1.fieldTypeToDataTypeID)(pivot.rowFieldType || 'string'),
                 });
             }
             if (pivot.valueField) {
                 columns.push({
                     field: pivot.valueField,
-                    label: pivot.valueField.charAt(0).toUpperCase() +
-                        pivot.valueField.slice(1),
-                    format: pivot.valueFieldType,
+                    label: (0, textProcessing_1.snakeCaseToTitleCase)((0, columnProcessing_1.processColumnName)(pivot.valueField)),
+                    format: pivot.valueFieldType || 'string',
+                    jsType: (0, columnProcessing_1.convertFieldTypeToJSType)(pivot.valueFieldType || 'string'),
+                    fieldType: pivot.valueFieldType || 'string',
+                    dataTypeID: (0, columnProcessing_1.fieldTypeToDataTypeID)(pivot.valueFieldType || 'string'),
                 });
             }
             return {
                 rows: [],
+                rowCount: 0,
+                pivotQuery: '',
                 columns: columns,
             };
         }
@@ -146,7 +161,17 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
             if (!dateBucket && filterDateRange) {
                 dateBucket = (0, dates_1.getDateBucketFromRange)(filterDateRange);
             }
-            const pivotTable = await (0, pivotConstructor_1.generatePivotWithSQL)(pivot, report, client, dateBucket, dateFilter, report.distinctStrings, undefined, dashboardName, tenants);
+            const pivotTable = await (0, pivotConstructor_1.generatePivotWithSQL)({
+                pivot,
+                report,
+                client,
+                dateBucket,
+                dateFilter,
+                distinctStrings: report.distinctStrings,
+                dashboardName,
+                tenants,
+                additionalProcessing,
+            });
             return pivotTable;
         }
         catch (e) {
@@ -159,8 +184,11 @@ async function getPivotTable(report, dashboardFilters, client, dateBucketInitial
             pivot,
             report,
             client,
+            uniqueValues: report.distinctStrings,
             dashboardName,
             tenants,
+            dateFilter,
+            additionalProcessing,
         })
         : undefined;
 }

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

@@ -3,7 +3,7 @@ import { QuillReport } from '../models/Report';
 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 function updateFilter(filter: any, value: any | undefined, comparison: any | undefined, dashboardName: string): any;
 export declare const getType: (t: string) => FieldType;
 /**
  * Returns a sentence to describe a Filter

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

@@ -1 +1 @@
-{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,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,cA0DhC,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,CA4B/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CA+CP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE;IACpD,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAChD,GAAG;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,SAAS,EACT,cAAc,EAGd,mBAAmB,EACnB,MAAM,EAEN,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,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,GAAG,YAAO,EACjB,UAAU,EAAE,GAAG,YAAO,EACtB,aAAa,EAAE,MAAM,OAmGtB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,cA0DhC,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,CA4B/D;AAED,wBAAgB,iCAAiC,CAC/C,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,mBAAmB,GACvC,mBAAmB,CAkKrB;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,eAAe,EAAE,EAC1B,aAAa,EAAE,cAAc,EAAE,GAC9B,GAAG,EAAE,CA+CP;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,CAAC,EAAE,cAAc,EAAE,EAC3B,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CA+BT;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE;IACpD,CAAC,MAAM,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAChD,GAAG;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CASA;AAED,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,WAClB,WAAW,EAAE,iBACP,MAAM,KACpB,CAAC,mBAAmB,GAAG;IAAE,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAqDpD,CAAC"}

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

@@ -1,2 +1,18 @@
+import { Pivot } from '../models/Pivot';
 export declare function mergeComparisonRange(resp: any): any;
+export declare function dateAdder(date: Date | string, interval: string): Date;
+export declare function mergeComparisonPivotColumns({ pivot, rows, compRows, }: {
+    pivot: Pivot;
+    rows: any[];
+    compRows: any[];
+}): any[];
+export declare function mergeComparisonPivotRows({ pivot, rows, compRows, databaseType, dateBucket, comparisonInterval, columnFieldValues, }: {
+    pivot: Pivot;
+    rows: any[];
+    compRows: any[];
+    databaseType: string;
+    dateBucket?: string;
+    comparisonInterval?: string;
+    columnFieldValues?: string[];
+}): any[];
 //# sourceMappingURL=merge.d.ts.map

package/dist/cjs/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,GAAG,GAAG,CAgBnD"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/utils/merge.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAIxC,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAgBnD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAsBrE;AAyBD,wBAAgB,2BAA2B,CAAC,EAC1C,KAAK,EACL,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,EAAE,GAAG,EAAE,CAAC;CACjB,GAAG,GAAG,EAAE,CAMR;AAED,wBAAgB,wBAAwB,CAAC,EACvC,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,iBAAiB,GAClB,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,QAAQ,EAAE,GAAG,EAAE,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B,GAAG,GAAG,EAAE,CAyBR"}

package/dist/cjs/utils/merge.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeComparisonRange = mergeComparisonRange;
+exports.dateAdder = dateAdder;
+exports.mergeComparisonPivotColumns = mergeComparisonPivotColumns;
+exports.mergeComparisonPivotRows = mergeComparisonPivotRows;
+const date_fns_1 = require("date-fns");
+const columnProcessing_1 = require("./columnProcessing");
+const date_fns_tz_1 = require("date-fns-tz");
 function mergeComparisonRange(resp) {
     if (resp.chartType === 'table')
         return resp;
@@ -20,3 +26,207 @@ function mergeComparisonRange(resp) {
     });
     return { ...resp, rows: newRows };
 }
+function dateAdder(date, interval) {
+    const match = interval.match(/^(\d+)\s+(day|month|year)$/);
+    if (!match) {
+        throw new Error(`Invalid interval format: ${interval}`);
+    }
+    const [, valueStr, unit] = match;
+    if (!valueStr || !unit) {
+        throw new Error('Could not parse interval');
+    }
+    const value = parseInt(valueStr, 10);
+    const parsedDate = typeof date === 'string' ? new Date(date) : date;
+    switch (unit) {
+        case 'day':
+            return (0, date_fns_1.add)(parsedDate, { days: value });
+        case 'month':
+            return (0, date_fns_1.add)(parsedDate, { months: value });
+        case 'year':
+            return (0, date_fns_1.add)(parsedDate, { years: value });
+        default:
+            throw new Error(`Unsupported interval unit: ${unit}`);
+    }
+}
+function dateTrunc(date, granularity = 'day', databaseType) {
+    const weekStartsOn = databaseType === 'mssql' ? 0 : 1;
+    const timeZone = 'UTC'; // standardize
+    const zonedDate = (0, date_fns_tz_1.utcToZonedTime)(date, timeZone);
+    switch (granularity.toLowerCase()) {
+        case 'week':
+            return (0, date_fns_1.startOfWeek)(zonedDate, { weekStartsOn });
+        case 'month':
+            return (0, date_fns_1.startOfMonth)(zonedDate);
+        case 'day':
+            return (0, date_fns_1.startOfDay)(zonedDate);
+        case 'year':
+            return (0, date_fns_1.startOfYear)(zonedDate);
+        default:
+            throw new Error(`Unsupported granularity: ${granularity}`);
+    }
+}
+function mergeComparisonPivotColumns({ pivot, rows, compRows, }) {
+    if (!compRows || !compRows.length)
+        return rows;
+    const mappedCompRows = compRows
+        .filter((compRow) => compRow.name !== pivot.rowField)
+        .map((compRow) => ({ ...compRow, name: `comparison_${compRow.name}` }));
+    return rows.concat(mappedCompRows);
+}
+function mergeComparisonPivotRows({ pivot, rows, compRows, databaseType, dateBucket, comparisonInterval, columnFieldValues, }) {
+    if (!compRows || !compRows.length)
+        return rows;
+    if (pivot.columnField && columnFieldValues && columnFieldValues.length > 0) {
+        return merge2DPivotRows(pivot, rows, compRows, columnFieldValues, databaseType, dateBucket, comparisonInterval);
+    }
+    if (pivot.rowField) {
+        return merge1DPivotRows(pivot, rows, compRows, databaseType, dateBucket, comparisonInterval);
+    }
+    return mergeAggregatedRows(pivot, rows, compRows);
+}
+function merge2DPivotRows(pivot, rows, compRows, columnFieldValues, databaseType, dateBucket, comparisonInterval) {
+    if (!pivot || !pivot.columnField) {
+        return [];
+    }
+    if ((0, columnProcessing_1.isStringType)(pivot.rowFieldType || '') || !pivot.rowFieldType) {
+        return merge2DStringPivotRows(pivot, rows, compRows, columnFieldValues);
+    }
+    return merge2DDatePivotRows(pivot, rows, compRows, columnFieldValues, databaseType, dateBucket, comparisonInterval);
+}
+function merge2DStringPivotRows(pivot, rows, compRows, columnFieldValues) {
+    if (!pivot.rowField || !pivot.valueField) {
+        return rows;
+    }
+    return rows.map((row) => {
+        const matchingCompRow = compRows.find((compRow) => compRow[pivot.rowField] === row[pivot.rowField]);
+        const comparisonFields = columnFieldValues.reduce((acc, fieldValue) => {
+            acc[`comparison_${fieldValue}`] = matchingCompRow
+                ? matchingCompRow[fieldValue] || null
+                : null;
+            return acc;
+        }, {});
+        return {
+            ...row,
+            ...comparisonFields,
+        };
+    });
+}
+function merge2DDatePivotRows(pivot, rows, compRows, columnFieldValues, databaseType, dateBucket, comparisonInterval) {
+    if (!comparisonInterval || !pivot.rowField) {
+        return rows;
+    }
+    return rows.map((row) => {
+        // Truncate the row date to match the SQL behavior
+        const rowDate = typeof row[pivot.rowField] === 'string'
+            ? new Date(row[pivot.rowField])
+            : row[pivot.rowField];
+        const truncatedRowDate = dateTrunc(rowDate, dateBucket, databaseType);
+        // Find a matching compRow where adding the interval matches the truncatedRowDate
+        const matchingCompRow = compRows.find((compRow) => {
+            const comparisonDateWithInterval = dateAdder(compRow[pivot.rowField], comparisonInterval);
+            const truncatedCompRowDate = dateTrunc(comparisonDateWithInterval, dateBucket, databaseType);
+            return (truncatedRowDate.toISOString() === truncatedCompRowDate.toISOString());
+        });
+        // Create comparison fields for each column value
+        const comparisonFields = columnFieldValues.reduce((acc, fieldValue) => {
+            acc[`comparison_${fieldValue}`] = matchingCompRow
+                ? matchingCompRow[fieldValue] || null
+                : null;
+            return acc;
+        }, {});
+        return {
+            ...row,
+            ...comparisonFields,
+        };
+    });
+}
+function merge1DPivotRows(pivot, rows, compRows, databaseType, dateBucket, comparisonInterval) {
+    if ((0, columnProcessing_1.isStringType)(pivot.rowFieldType || '') || !pivot.rowFieldType) {
+        return merge1DStringPivotRows(pivot, rows, compRows);
+    }
+    return merge1DDatePivotRows(pivot, rows, compRows, databaseType, dateBucket, comparisonInterval);
+}
+function merge1DStringPivotRows(pivot, rows, compRows) {
+    if (!pivot.rowField || !pivot.valueField) {
+        return rows;
+    }
+    return rows.map((row) => {
+        const matchingCompRow = compRows.find((compRow) => compRow[pivot.rowField] === row[pivot.rowField]);
+        let aggregationSuffix = '';
+        // match 'percentage' casing
+        if (matchingCompRow && pivot.aggregationType === 'percentage') {
+            if (matchingCompRow[`${pivot.valueField}_Percentage`]) {
+                aggregationSuffix = '_Percentage';
+            }
+            else if (matchingCompRow[`${pivot.valueField}_PERCENTAGE`]) {
+                aggregationSuffix = '_PERCENTAGE';
+            }
+            else {
+                aggregationSuffix = '_percentage';
+            }
+        }
+        // Return the merged row with the value from compRows, or null if no match is found
+        return {
+            ...row,
+            [`comparison_${pivot.valueField}${aggregationSuffix}`]: matchingCompRow
+                ? matchingCompRow[`${pivot.valueField}${aggregationSuffix}`]
+                : null,
+        };
+    });
+}
+function merge1DDatePivotRows(pivot, rows, compRows, databaseType, dateBucket, comparisonInterval) {
+    if (!comparisonInterval || !pivot.rowField) {
+        return rows;
+    }
+    return rows.map((row) => {
+        // Truncate the row date to match the SQL behavior
+        const rowDate = typeof row[pivot.rowField] === 'string'
+            ? new Date(row[pivot.rowField])
+            : row[pivot.rowField];
+        const truncatedRowDate = dateTrunc(rowDate, dateBucket, databaseType);
+        // Find a matching compRow where adding the interval matches the truncatedRowDate
+        const matchingCompRow = compRows.find((compRow) => {
+            const comparisonDateWithInterval = dateAdder(compRow[`${pivot.rowField}`], comparisonInterval);
+            const truncatedCompRowDate = dateTrunc(comparisonDateWithInterval, dateBucket, databaseType);
+            return (truncatedRowDate.toISOString() === truncatedCompRowDate.toISOString());
+        });
+        let aggregationSuffix = '';
+        // match 'percentage' casing
+        if (matchingCompRow && pivot.aggregationType === 'percentage') {
+            if (matchingCompRow[`${pivot.valueField}_Percentage`]) {
+                aggregationSuffix = '_Percentage';
+            }
+            else if (matchingCompRow[`${pivot.valueField}_PERCENTAGE`]) {
+                aggregationSuffix = '_PERCENTAGE';
+            }
+            else {
+                aggregationSuffix = '_percentage';
+            }
+        }
+        return {
+            ...row,
+            [`comparison_${pivot.valueField}${aggregationSuffix}`]: matchingCompRow?.[`${pivot.valueField}${aggregationSuffix}`] || null,
+        };
+    });
+}
+function mergeAggregatedRows(pivot, rows, compRows) {
+    return rows.map((row, i) => {
+        let aggregationSuffix = '';
+        // match 'percentage' casing
+        if (compRows[i] && pivot.aggregationType === 'percentage') {
+            if (compRows[i][`${pivot.valueField}_Percentage`]) {
+                aggregationSuffix = '_Percentage';
+            }
+            else if (compRows[i][`${pivot.valueField}_PERCENTAGE`]) {
+                aggregationSuffix = '_PERCENTAGE';
+            }
+            else {
+                aggregationSuffix = '_percentage';
+            }
+        }
+        const compRow = {
+            [`comparison_${pivot.valueField}${aggregationSuffix}`]: compRows[i]?.[`${pivot.valueField}${aggregationSuffix}`],
+        };
+        return { ...row, ...compRow };
+    });
+}

package/dist/cjs/utils/paginationProcessing.d.ts

@@ -1,5 +1,5 @@
 import { Pagination } from '../models/Pagination';
 export declare const DEFAULT_PAGINATION: Pagination;
-export declare function shouldFetchMore(pagination: Pagination, page: number, maxPage: number): boolean;
+export declare function shouldFetchMore(pagination: Pagination, page: number, maxPage: number, currentRowCount?: number): boolean;
 export declare function shouldSortInMemory(pagination: Pagination, rowCount?: number): boolean;
 //# sourceMappingURL=paginationProcessing.d.ts.map

package/dist/cjs/utils/paginationProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paginationProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/paginationProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,WAehB;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,WAK3E"}
+{"version":3,"file":"paginationProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/paginationProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,MAAM,WAkBzB;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,WAK3E"}

package/dist/cjs/utils/paginationProcessing.js

@@ -8,8 +8,9 @@ exports.DEFAULT_PAGINATION = {
     rowsPerPage: 10,
     rowsPerRequest: 600,
 };
-function shouldFetchMore(pagination, page, maxPage) {
-    if (!pagination) {
+function shouldFetchMore(pagination, page, maxPage, currentRowCount) {
+    if (!pagination ||
+        (currentRowCount && currentRowCount >= pagination.rowsPerPage * (page + 1))) {
         return false;
     }
     const indexAdjustedPage = page;

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

@@ -1,12 +1,22 @@
 import { QuillProviderClient } from '../models/Client';
-import { ColumnInternal } from '../models/Columns';
-import { Pivot } from '../models/Pivot';
+import { Pivot, PivotData } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
-export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: QuillProviderClient, dateBucket?: string, dateFilter?: any, distinctStrings?: string[], rowLimit?: number, dashboardName?: string, tenants?: {
-    tenantField: string;
-    tenantIds: (string | number)[];
-}[] | (string | number)[]): Promise<{
-    rows: any[];
-    columns: ColumnInternal[];
-}>;
+import { AdditionalProcessing } from './tableProcessing';
+export declare function generatePivotWithSQL({ pivot, report, client, dateBucket, dateFilter, distinctStrings, dashboardName, tenants, additionalProcessing, pivotQuery, comparisonPivotQuery, getPivotRowCount, }: {
+    pivot: Pivot;
+    report?: QuillReportInternal;
+    client: QuillProviderClient;
+    dateBucket?: string;
+    dateFilter?: any;
+    distinctStrings?: string[];
+    dashboardName?: string;
+    tenants?: {
+        tenantField: string;
+        tenantIds: (string | number)[];
+    }[] | (string | number)[];
+    additionalProcessing?: AdditionalProcessing;
+    pivotQuery?: string;
+    comparisonPivotQuery?: string;
+    getPivotRowCount?: boolean;
+}): Promise<PivotData>;
 //# sourceMappingURL=pivotConstructor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AASvD,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,MAAM,EAAE,EAC1B,QAAQ,CAAC,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,EACtB,OAAO,CAAC,EACJ;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACtB,OAAO,CAAC;IAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAAC,OAAO,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC,CA8OrD"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAYvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,wBAAsB,oBAAoB,CAAC,EACzC,KAAK,EACL,MAAM,EACN,MAAM,EACN,UAAU,EACV,UAAU,EACV,eAAe,EACf,aAAa,EACb,OAAO,EACP,oBAAoB,EACpB,UAAU,EACV,oBAAoB,EACpB,gBAAuB,GACxB,EAAE;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EACJ;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;KAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACxB,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GAAG,OAAO,CAAC,SAAS,CAAC,CAiVrB"}