@quillsql/react 2.12.40 → 2.12.41

package/dist/esm/utils/astProcessing.js

@@ -1,3 +1,8 @@
+import { getTableNames } from '../components/ReportBuilder/ast';
+import { convertBigQuery, convertGroupBy, convertRemoveSimpleParentheses, convertStringComparison, convertUnaryToBinary, convertWildcardColumns, } from '../components/ReportBuilder/convert';
+import { deepCopy, removeNonSelectedTableReferences, } from '../components/ReportBuilder/util';
+import { QUILL_SERVER } from './constants';
+import { getSchemaInfoWithCustomFields } from './schema';
 export function getSelectFromAST(ast) {
     if (Array.isArray(ast)) {
         return ast[0];
@@ -252,3 +257,202 @@ export function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
     }
     return referencedColumns;
 }
+export const isSubquery = (node) => {
+    if (!node)
+        return false;
+    if (node.ast)
+        return true;
+    if (node.left && isSubquery(node.left))
+        return true;
+    if (node.right && isSubquery(node.right))
+        return true;
+    if (node.value && Array.isArray(node.value)) {
+        for (const value of node.value) {
+            if (isSubquery(value))
+                return true;
+        }
+    }
+    return false;
+};
+export const getAllPossibleColumns = (baseAst, schema) => {
+    if (!baseAst || !baseAst.from) {
+        return schema.flatMap((table) => table.columns.map((c) => ({
+            ...c,
+            table: table.displayName,
+        })));
+    }
+    // TODO: support infinitely nested FROM table lookups.
+    // This currently only supports top-level table names in the FROM section
+    // of queries (eg. FROM "table_name", not "FROM (SELECT * FROM other) AS table_name")
+    const tableNamesInQuery = baseAst.from.map((tbl) => tbl.table);
+    return schema
+        .filter((t) => tableNamesInQuery.includes(t.displayName))
+        .flatMap((table) => table.columns
+        .map((c) => ({
+        ...c,
+        table: table.displayName,
+    }))
+        .sort((a, b) => {
+        const aIsId = a.name.toLowerCase() === 'id' ||
+            a.name.toLowerCase().endsWith('_id') ||
+            a.name.endsWith('Id');
+        const bIsId = b.name.toLowerCase() === 'id' ||
+            b.name.toLowerCase().endsWith('_id') ||
+            b.name.endsWith('Id');
+        if (aIsId && !bIsId)
+            return 1;
+        if (bIsId && !aIsId)
+            return -1;
+        return 0;
+    }));
+};
+export const createBasicSelectASTFromColumns = (columns, tableName) => {
+    return {
+        type: 'select',
+        options: null,
+        distinct: null,
+        columns: columns.map((column) => ({
+            expr: {
+                type: 'column_ref',
+                table: tableName,
+                // @ts-ignore
+                column: column.field || column.name,
+            },
+            as: null,
+        })),
+        from: [{ db: null, table: tableName, as: null }],
+        where: null,
+        groupby: null,
+        having: null,
+        orderby: null,
+        limit: null,
+    };
+};
+export const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot, currentQuery) => {
+    let res, data, ast, newAst, pivot;
+    let numRetries = 0;
+    let whereAST;
+    const MAX_RETRIES = 3;
+    try {
+        console.log(`[Prompt]: ${aiPrompt}`);
+        let isTableJoin = !ast || !ast.from || ast.from.length !== 1;
+        while (isTableJoin || isSubquery(ast?.where)) {
+            if (numRetries === MAX_RETRIES)
+                break;
+            if (!currentQuery || (ast && (isTableJoin || isSubquery(ast?.where)))) {
+                res = await fetch(`${QUILL_SERVER}/magic`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({
+                        initialQuestion: aiPrompt,
+                        publicKey: client.publicKey,
+                        useNewNodeSql: true, // new flag
+                    }),
+                });
+            }
+            else {
+                res = await fetch(`${QUILL_SERVER}/magic/edit`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({
+                        sqlQuery: currentQuery,
+                        initialQuestion: aiPrompt,
+                        publicKey: client.publicKey,
+                        useNewNodeSql: true, // new flag
+                    }),
+                });
+            }
+            data = await res.json();
+            ast = data?.ast?.length ? data?.ast[0] : data?.ast;
+            // TODO: Debug invalid table joins in handleAsk
+            isTableJoin =
+                ast?.type !== 'bigquery' &&
+                    (!ast || !ast.from || ast.from.length !== 1);
+            numRetries += 1;
+        }
+        if (numRetries === MAX_RETRIES) {
+            console.error('[Error]: Max retries exceeded.');
+            console.info(`%c[Prompt]: ${aiPrompt}`, 'color: dimgray');
+            throw new Error("Error: Couldn't process your request, please re-word your prompt.");
+        }
+        ast = ast.length ? ast[0] : ast;
+        newAst = convertBigQuery(ast);
+        newAst = convertWildcardColumns(newAst, schema); // must go before groupby
+        ({ ast: newAst, pivot } = convertGroupBy(newAst, schema, prevPivot));
+        newAst = convertStringComparison(newAst, client.databaseType);
+        newAst = convertRemoveSimpleParentheses(newAst);
+        const table = getTableNames(newAst)[0];
+        if (!table) {
+            throw new Error('Table or table alias not found');
+        }
+        const processedName = table || '';
+        const tableInfo = schema.find((t) => t.name === processedName);
+        if (!tableInfo) {
+            throw new Error('Table info not found');
+        }
+        newAst = convertUnaryToBinary(newAst);
+        newAst = removeNonSelectedTableReferences(newAst, processedName, tableInfo.columns.map((col) => col.name));
+        if (pivot) {
+            newAst = deepCopy({ ...newAst, orderby: null, limit: null });
+        }
+        whereAST = deepCopy(newAst.where);
+    }
+    catch (e) {
+        console.log(e);
+        if (e instanceof Error) {
+            return {
+                ast: null,
+                pivot: null,
+                whereAST: null,
+                error: "Error: Couldn't process your request, please re-word your prompt.",
+            };
+        }
+    }
+    return { ast: newAst, pivot, whereAST };
+};
+export const fetchASTFromQuillReport = async (report, client, schema) => {
+    let newAst;
+    let groupByPivot = null;
+    let schemaInfo = [];
+    try {
+        if (!report || report.referencedTables?.length !== 1) {
+            throw new Error('Report not found');
+        }
+        const url = `${QUILL_SERVER}/astify`;
+        const result = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ query: report.queryString, useNewNodeSql: true }),
+        });
+        const resp = await result.json();
+        if (resp.success === false) {
+            throw new Error("Couldn't process report query.");
+        }
+        const ast = getSelectFromAST(resp.ast);
+        let convertedAst = processStarColumn(ast, report.columns);
+        convertedAst = convertWildcardColumns(convertedAst, schema); // must go before groupby
+        convertedAst = convertBigQuery(convertedAst);
+        schemaInfo = schema;
+        if (!schemaInfo) {
+            const { schemaData } = await getSchemaInfoWithCustomFields(client, 'rb');
+            schemaInfo = schemaData;
+        }
+        processApostrophe(convertedAst, ['type', 'value']);
+        convertedAst = convertBigQuery(convertedAst);
+        ({ ast: newAst, pivot: groupByPivot } = convertGroupBy(convertedAst, schemaInfo, report.pivot ? report.pivot : undefined));
+        newAst = groupByPivot ? newAst : convertedAst;
+    }
+    catch (e) {
+        console.log(e);
+        if (e instanceof Error) {
+            return {
+                error: e.message,
+                ast: null,
+                pivot: null,
+            };
+        }
+    }
+    return { ast: newAst, pivot: groupByPivot, schema: schemaInfo };
+};

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

@@ -1,3 +1,4 @@
 export declare const MAX_COLUMN_ROWS_LIMIT = 500;
+export declare const QUILL_SERVER = "https://quill-344421.uc.r.appspot.com";
 export declare const MAX_PIVOT_UNIQUE_VALUES = 250;
 //# sourceMappingURL=constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,uBAAuB,MAAM,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,YAAY,0CAA0C,CAAC;AACpE,eAAO,MAAM,uBAAuB,MAAM,CAAC"}

package/dist/esm/utils/constants.js

@@ -1,2 +1,3 @@
 export const MAX_COLUMN_ROWS_LIMIT = 500;
+export const QUILL_SERVER = 'https://quill-344421.uc.r.appspot.com';
 export const MAX_PIVOT_UNIQUE_VALUES = 250;

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

@@ -1,3 +1,7 @@
 export declare function getData(client: any, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string): Promise<any>;
 export declare function getDataFromCloud(client: any, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
+export declare function fetchSqlQuery(ast: any, client: any, formData?: any): Promise<{
+    query: string;
+    error?: string;
+}>;
 //# sourceMappingURL=dataFetcher.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AA2EA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,gBA6IpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AA6EA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,EACf,UAAU,CAAC,EAAE,MAAM,gBA6IpB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,GAAG,EACX,QAAQ,CAAC,EAAE,GAAG,GACb,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmB5C"}

package/dist/esm/utils/dataFetcher.js

@@ -1,3 +1,4 @@
+import { QUILL_SERVER } from './constants';
 function fetchQuillData(responseData) {
     if (!responseData) {
         return null;
@@ -203,3 +204,24 @@ export async function getDataFromCloud(client, cloudQueryEndpoint, cloudRequestB
         return null;
     }
 }
+export async function fetchSqlQuery(ast, client, formData) {
+    try {
+        const where = formData ? formData : ast?.where || null;
+        const response = await fetch(`${QUILL_SERVER}/sqlify`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                ast: { ...ast, where },
+                publicKey: client.publicKey,
+                useNewNodeSql: true, // new flag
+            }),
+        });
+        const data = await response.json();
+        return { query: data.query };
+    }
+    catch (error) {
+        return { query: '', error: 'Failed to fetch query' };
+    }
+}

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

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

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

@@ -1,8 +1,8 @@
-import { Filter } from '../models/Filter';
+import { FieldTypes, Filter } from '../models/Filter';
 export declare function findAndProcessDateFilter(filters: any[]): any;
 export declare function processFilterFromBackend(filter: any): any;
 export declare function updateFilter(filter: any, value?: any, comparison?: any): any;
-export declare const getType: (t: string) => "string" | "boolean" | "date" | "numeric";
+export declare const getType: (t: string) => FieldTypes.String | FieldTypes.Number | FieldTypes.Date | FieldTypes.Boolean;
 /**
  * Returns a sentence to describe a Filter
  */

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,EAAgB,MAAM,EAAe,MAAM,kBAAkB,CAAC;AAGrE,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,GAAE,GAAU,EACjB,UAAU,GAAE,GAAU,OAuGvB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,8CAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD"}
+{"version":3,"file":"filterProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/filterProcessing.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,UAAU,EACV,MAAM,EAEP,MAAM,kBAAkB,CAAC;AAG1B,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,GAAE,GAAU,EACjB,UAAU,GAAE,GAAU,OAuGvB;AAGD,eAAO,MAAM,OAAO,MAAO,MAAM,iFAwDhC,CAAC;AAEF;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAwBrD"}

package/dist/esm/utils/filterProcessing.js

@@ -1,5 +1,5 @@
 import { COMPARISON_RANGE, PRIMARY_RANGE, defaultOptionsV2, getRangeFromPresetOptions, } from '../DateRangePicker/dateRangePickerUtils';
-import { DateOperator, FilterNames } from '../models/Filter';
+import { DateOperator, FieldTypes, FilterNames, } from '../models/Filter';
 import { snakeAndCamelCaseToTitleCase } from './textProcessing';
 export function findAndProcessDateFilter(filters) {
     let dateFilter = filters.find((filter) => filter.filterType === 'date_range');
@@ -161,7 +161,7 @@ export const getType = (t) => {
         case 'longtext':
         case 'longblob':
         case 'text':
-            return 'string';
+            return FieldTypes.String;
         case 'numeric':
         case 'bit':
         case 'tinybit':
@@ -179,7 +179,7 @@ export const getType = (t) => {
         case 'smallmoney':
         case 'money':
         case 'real':
-            return 'numeric';
+            return FieldTypes.Number;
         case 'date':
         case 'datetime':
         case 'datetime2':
@@ -189,12 +189,12 @@ export const getType = (t) => {
         case 'timestamptz':
         case 'time':
         case 'year':
-            return 'date';
+            return FieldTypes.Date;
         case 'bool':
         case 'boolean':
-            return 'boolean';
+            return FieldTypes.Boolean;
         default:
-            return 'string';
+            return FieldTypes.String;
     }
 };
 /**
@@ -202,7 +202,7 @@ export const getType = (t) => {
  */
 export function filterSentence(filter) {
     let value = '';
-    if (filter.name == FilterNames.NullFilter) {
+    if (filter.filterType == FilterNames.NullFilter) {
         return `${snakeAndCamelCaseToTitleCase(filter.field)} ${filter.operator}`;
     }
     else if (filter.value === null || filter.value === undefined) {

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

@@ -1,4 +1,4 @@
-import { Pivot } from '../internals/ReportBuilder/PivotModal';
+import { Pivot } from '../models/Pivot';
 import { QuillReportInternal } from '../models/Report';
 export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: any, dateBucket?: string, dateFilter?: any, distinctStrings?: any): Promise<{
     rows: any;

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

@@ -1 +1 @@
-{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAOvD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAyLtB"}
+{"version":3,"file":"pivotConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotConstructor.ts"],"names":[],"mappings":"AAGA,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,GAAG,EACX,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAgMtB"}

package/dist/esm/utils/pivotConstructor.js

@@ -84,15 +84,17 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
             }
             return 0;
         });
-        if (pivot.rowField && !['string', 'varchar'].includes(pivot.rowFieldType)) {
+        if (pivot.rowField &&
+            !['string', 'varchar'].includes(pivot.rowFieldType || '')) {
             rows.forEach((row) => {
-                row[pivot.rowField] = getDateString(row[pivot.rowField], undefined, dateBucket);
+                row[pivot.rowField || ''] = getDateString(row[pivot.rowField || ''], undefined, dateBucket);
             });
             // add a row for each date in the range that doesn't have a value
             if (pivot.rowField &&
+                pivot.rowFieldType &&
                 !['string', 'varchar'].includes(pivot.rowFieldType) &&
                 dateFilter) {
-                const dateSet = new Set(rows.map((row) => row[pivot.rowField]));
+                const dateSet = new Set(rows.map((row) => row[pivot.rowField || '']));
                 // create a loop that will go through each formatted date and add a row if it doesn't exist going to the current date
                 for (let date = dateFilter.start ?? dateFilter.startDate; date <= dateFilter.end; date = new Date(date.getTime() + 24 * 60 * 60 * 1000)) {
                     const formattedDate = getDateString(date.toDateString(), undefined, dateBucket);
@@ -104,7 +106,8 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
                     }
                     // order the rows by the date field
                     rows.sort((a, b) => {
-                        return new Date(a[pivot.rowField]) < new Date(b[pivot.rowField])
+                        return new Date(a[pivot.rowField || '']) <
+                            new Date(b[pivot.rowField || ''])
                             ? -1
                             : 1;
                     });

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

@@ -1,10 +1,9 @@
-import { Pivot } from '../internals/ReportBuilder/PivotModal';
 import { ColumnInternal } from '../models/Columns';
+import { Pivot } from '../models/Pivot';
+import { UniqueValuesByColumn } from '../models/Tables';
 export declare function pivotToSql(pivot: Pivot, query: string, columns: ColumnInternal[]): string;
 export declare function isValidPivot(pivot: Pivot): boolean;
-export declare function getPossiblePivotFieldOptions(columns: ColumnInternal[], uniqueValues: {
-    [field: string]: any;
-}): {
+export declare function getPossiblePivotFieldOptions(columns: ColumnInternal[], uniqueValues: UniqueValuesByColumn): {
     rowFields: string[];
     columnFields: string[];
     valueFields: string[];
@@ -14,4 +13,5 @@ export declare function cleanPivot(pivot: Pivot, possibleColumns: {
     columnFields: any;
     valueFields: any;
 }): Pivot;
+export declare const isPivotPossible: (fields: any, pivot: Pivot) => boolean;
 //# sourceMappingURL=pivotProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAsCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;;;EA4CvC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP"}
+{"version":3,"file":"pivotProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/pivotProcessing.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EAAE,GACxB,MAAM,CAuCR;AAkBD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,WA0BxC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,EAAE,oBAAoB;;;;EA4CnC;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,KAAK,EACZ,eAAe,EAAE;IACf,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;CAClB,GACA,KAAK,CAqCP;AAED,eAAO,MAAM,eAAe,WAAY,GAAG,SAAS,KAAK,YA8BxD,CAAC"}

package/dist/esm/utils/pivotProcessing.js

@@ -26,7 +26,9 @@ export function pivotToSql(pivot, query, columns) {
         pivot.valueField &&
         processedAggType) {
         // 2-d pivot
-        const sqlQuery = generateTwoDPivotQuery({ ...pivot, aggregationType: processedAggType }, query, columns);
+        const sqlQuery = generateTwoDPivotQuery(
+        // @ts-ignore
+        { ...pivot, aggregationType: processedAggType }, query, columns);
         return sqlQuery;
     }
     return query;
@@ -133,3 +135,19 @@ export function cleanPivot(pivot, possibleColumns) {
     }
     return pivot;
 }
+export const isPivotPossible = (fields, pivot) => {
+    let validPivot = true;
+    if (pivot.rowField &&
+        !fields.find((field) => field.name === pivot.rowField || field.field === pivot.rowField)) {
+        validPivot = false;
+    }
+    if (pivot.valueField &&
+        !fields.find((field) => field.name === pivot.valueField || field.field === pivot.valueField)) {
+        validPivot = false;
+    }
+    if (pivot.columnField &&
+        !fields.find((field) => field.name === pivot.columnField || field.field === pivot.columnField)) {
+        validPivot = false;
+    }
+    return validPivot;
+};

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

@@ -1,4 +1,4 @@
-import { Pivot } from '../internals/ReportBuilder/PivotModal';
+import { Pivot } from '../models/Pivot';
 export declare function processColumnReference(column: string, databaseType: string, fallbackOnNull?: string): string;
 export declare function generateCountQuery(fields: string[], query: string, databaseType: string): string;
 export declare function generateDistinctQuery(stringFields: string[], query: string, databaseType: string): string;

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

@@ -1 +1 @@
-{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uCAAuC,CAAC;AAmB9D,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,UAiBxB;AAgDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UASrB;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAwBpB"}
+{"version":3,"file":"queryConstructor.d.ts","sourceRoot":"","sources":["../../../src/utils/queryConstructor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAmBxC,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,UAiBxB;AAgDD,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAUrB;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UASrB;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,EAAE,EACtB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,UAcrB;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAwBpB"}

package/dist/esm/utils/queryConstructor.js

@@ -102,7 +102,7 @@ function create2DPivotQuery(pivot, itemQueries, databaseType, dateBucket, compar
     if (!columnFieldValues) {
         return undefined;
     }
-    if (['string', 'varchar'].includes(pivot.rowFieldType) ||
+    if (['string', 'varchar'].includes(pivot.rowFieldType || '') ||
         !pivot.rowFieldType) {
         return create2DStringPivotQuery(pivot, itemQueries, columnFieldValues, databaseType);
     }
@@ -164,7 +164,7 @@ function create2DDatePivotQuery(pivot, itemQueries, columnFieldValues, databaseT
   ${joinQuery} ORDER BY qt.${processColumnReference(`${rowField}`, databaseType)}`;
 }
 function create1DPivotQuery(pivot, itemQueries, dateBucket = 'month', databaseType, comparisonInterval) {
-    if (['string', 'varchar'].includes(pivot.rowFieldType) ||
+    if (['string', 'varchar'].includes(pivot.rowFieldType || '') ||
         !pivot.rowFieldType) {
         return create1DStringPivotQuery(pivot, itemQueries, databaseType);
     }
@@ -189,7 +189,7 @@ function create1DStringPivotQuery(pivot, itemQueries, databaseType) {
   ${joinQuery}`;
 }
 function create1DDatePivotQuery(pivot, itemQueries, dateBucket = 'month', databaseType, comparisonInterval) {
-    const rowField = pivot.rowField;
+    const rowField = pivot.rowField || '';
     const valueField = pivot.valueField;
     const compareCTE = itemQueries[1] && comparisonInterval
         ? `, quill_ct as (${itemQueries[1]?.replaceAll(';', '')})`

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

@@ -1,5 +1,26 @@
+import { TableInfo } from '../components/ReportBuilder/schema';
+import { ColumnInternal } from '../models/Columns';
+import { Pivot } from '../models/Pivot';
 import { QuillReport, QuillReportInternal } from '../models/Report';
+import { DateRangesByColumn, UniqueValuesByTable } from '../models/Tables';
 import { AdditionalProcessing } from './tableProcessing';
+export type ReportBuilderInfo = {
+    rows: any[];
+    columns: ColumnInternal[];
+    rowCount: number;
+    pivot: Pivot | null;
+    pivotData: {
+        rows: any[];
+        columns: ColumnInternal[];
+    } | null;
+    formattedRows: any[];
+    report: QuillReportInternal;
+    table: string;
+    uniqueValues: UniqueValuesByTable;
+    dateRanges: DateRangesByColumn;
+    query: string;
+    error?: string;
+};
 export declare const EMPTY_REPORT: QuillReport;
 export declare function fetchReport(reportId: string, client: any, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any): Promise<{
     report: QuillReportInternal;
@@ -7,4 +28,8 @@ export declare function fetchReport(reportId: string, client: any, useReportTask
 }>;
 export declare const formatRowsFromReport: (report: any) => any;
 export declare function convertInternalReportToReport(report: QuillReportInternal): QuillReport;
+export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: TableInfo[], client: any, pivot?: Pivot, previousFormData?: any, currentTable?: string, previousRelevant?: {
+    uniqueStrings: UniqueValuesByTable;
+    dateRanges: DateRangesByColumn;
+}, report?: QuillReportInternal, customFields?: any) => Promise<ReportBuilderInfo>;
 //# sourceMappingURL=report.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAUpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,EACX,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,GAAG,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0G1D;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb"}
+{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/utils/report.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D,OAAO,EAAU,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAa3E,OAAO,EACL,oBAAoB,EAGrB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE;QAAE,IAAI,EAAE,GAAG,EAAE,CAAC;QAAC,OAAO,EAAE,cAAc,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7D,aAAa,EAAE,GAAG,EAAE,CAAC;IACrB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,mBAAmB,CAAC;IAClC,UAAU,EAAE,kBAAkB,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,WAkB1B,CAAC;AAEF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,EACX,aAAa,UAAO,EACpB,OAAO,GAAE,GAAG,EAAO,EACnB,oBAAoB,CAAC,EAAE,oBAAoB,EAC3C,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,GAAG,GACjB,OAAO,CAAC;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0G1D;AAED,eAAO,MAAM,oBAAoB,WAAY,GAAG,QAkB/C,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,mBAAmB,GAC1B,WAAW,CAsDb;AAED,eAAO,MAAM,6BAA6B,YAC/B,GAAG,YACF,GAAG,UACL,SAAS,EAAE,UACX,GAAG,UACH,KAAK,qBACM,GAAG,iBACP,MAAM,qBACF;IACjB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,kBAAkB,CAAC;CAChC,WACQ,mBAAmB,iBACb,GAAG,KACjB,QAAQ,iBAAiB,CAmI3B,CAAC"}