@quillsql/react 2.12.40 → 2.12.42

package/dist/cjs/utils/astFilterProcessing.js

@@ -63,7 +63,7 @@ const reverseOperatorMap = (operator, fieldType) => {
             return (Object.keys(stringOperatorMap).find((key) => stringOperatorMap[key].includes(operator)) ?? null);
         case Filter_1.FieldTypes.Date:
             return (Object.keys(dateOperatorMap).find((key) => dateOperatorMap[key].includes(operator)) ?? null);
-        case Filter_1.FieldTypes.Numeric:
+        case Filter_1.FieldTypes.Number:
             return (Object.keys(numberOperatorMap).find((key) => numberOperatorMap[key].includes(operator)) ?? null);
         case Filter_1.FieldTypes.Null:
             return (Object.keys(nullOperatorMap).find((key) => nullOperatorMap[key].includes(operator)) ?? null);
@@ -119,7 +119,7 @@ function mapOperatorToFilterName(operator, fieldType) {
                 default:
                     return Filter_1.FilterNames.StringFilter;
             }
-        case Filter_1.FieldTypes.Numeric:
+        case Filter_1.FieldTypes.Number:
             return Filter_1.FilterNames.NumericFilter;
         case Filter_1.FieldTypes.Null:
             return Filter_1.FilterNames.NullFilter;
@@ -4296,7 +4296,7 @@ const astToFilter = (ast, db) => {
             fieldType = Filter_1.FieldTypes.Null;
             break;
         case 'number':
-            fieldType = Filter_1.FieldTypes.Numeric;
+            fieldType = Filter_1.FieldTypes.Number;
             break;
         case 'single_quote_string':
         case 'double_quote_string':
@@ -4414,32 +4414,32 @@ const astToFilter = (ast, db) => {
         case Filter_1.FilterNames.StringFilter:
             return {
                 field: lowerFunctionToField(field, db).replaceAll('%', ''),
-                name: filterName,
-                type: Filter_1.FieldTypes.String,
+                filterType: filterName,
+                fieldType: Filter_1.FieldTypes.String,
                 operator: mappedOperator,
                 value: lowerFunctionToField(right, db).replaceAll('%', ''),
             };
         case Filter_1.FilterNames.StringInFilter:
             return {
                 field: lowerFunctionToField(field, db).replaceAll('%', ''),
-                name: filterName,
-                type: Filter_1.FieldTypes.String,
+                filterType: filterName,
+                fieldType: Filter_1.FieldTypes.String,
                 operator: mappedOperator,
                 value: right.value.map((v) => lowerFunctionToField(v, db).replaceAll('%', '')),
             };
         case Filter_1.FilterNames.NumericFilter:
             return {
                 field: field,
-                name: filterName,
-                type: Filter_1.FieldTypes.Numeric,
+                filterType: filterName,
+                fieldType: Filter_1.FieldTypes.Number,
                 operator: mappedOperator,
                 value: Number(right.value),
             };
         case Filter_1.FilterNames.NullFilter:
             return {
                 field: field,
-                name: filterName,
-                type: Filter_1.FieldTypes.Null,
+                filterType: filterName,
+                fieldType: Filter_1.FieldTypes.Null,
                 operator: mappedOperator,
                 value: null,
             };
@@ -4452,13 +4452,13 @@ const astToFilter = (ast, db) => {
             }
             return {
                 field: field,
-                name: filterName,
-                type: Filter_1.FieldTypes.Date,
+                filterType: filterName,
+                fieldType: Filter_1.FieldTypes.Date,
                 operator: Filter_1.DateOperator.Custom,
                 value: values,
             };
         case Filter_1.FilterNames.DateComparisonFilter:
-            const numericDateComparison = reverseOperatorMap(operator, Filter_1.FieldTypes.Numeric);
+            const numericDateComparison = reverseOperatorMap(operator, Filter_1.FieldTypes.Number);
             if (numericDateComparison) {
                 if (!right.value ||
                     (typeof right.value !== 'number' && typeof right.value !== 'string')) {
@@ -4469,16 +4469,16 @@ const astToFilter = (ast, db) => {
                     if (numericDateComparison === Filter_1.NumberOperator.EqualTo) {
                         return {
                             field: field,
-                            name: Filter_1.FilterNames.DateCustomFilter,
-                            type: Filter_1.FieldTypes.Date,
+                            filterType: Filter_1.FilterNames.DateCustomFilter,
+                            fieldType: Filter_1.FieldTypes.Date,
                             operator: Filter_1.DateOperator.Custom,
                             value: { startDate: right.value, endDate: right.value },
                         };
                     }
                     return {
                         field: field,
-                        name: Filter_1.FilterNames.DateComparisonFilter,
-                        type: Filter_1.FieldTypes.Date,
+                        filterType: Filter_1.FilterNames.DateComparisonFilter,
+                        fieldType: Filter_1.FieldTypes.Date,
                         operator: numericDateComparison,
                         value: right.value,
                     };
@@ -4492,8 +4492,8 @@ const astToFilter = (ast, db) => {
             if (!isNaN(value.value)) {
                 return {
                     field: field,
-                    name: filterName,
-                    type: Filter_1.FieldTypes.Date,
+                    filterType: filterName,
+                    fieldType: Filter_1.FieldTypes.Date,
                     operator: dateOperator,
                     value,
                 };
@@ -4501,8 +4501,8 @@ const astToFilter = (ast, db) => {
             else {
                 return {
                     field: field,
-                    name: Filter_1.FilterNames.DateCustomFilter,
-                    type: Filter_1.FieldTypes.Date,
+                    filterType: Filter_1.FilterNames.DateCustomFilter,
+                    fieldType: Filter_1.FieldTypes.Date,
                     operator: Filter_1.DateOperator.Custom,
                     value: value.value,
                 };
@@ -4510,8 +4510,8 @@ const astToFilter = (ast, db) => {
         case Filter_1.FilterNames.BooleanFilter:
             return {
                 field: field,
-                name: filterName,
-                type: Filter_1.FieldTypes.Boolean,
+                filterType: filterName,
+                fieldType: Filter_1.FieldTypes.Boolean,
                 operator: mappedOperator,
                 value: Boolean(right.value),
             };
@@ -4559,7 +4559,7 @@ const filterToAst = (filter, db) => {
     const { field, operator, value } = filter;
     const mappedOperator = operatorMap[operator][0];
     // Generate SQL AST based on the filter type
-    switch (filter.type) {
+    switch (filter.fieldType) {
         case Filter_1.FieldTypes.String:
             if (!value) {
                 return null;
@@ -4610,7 +4610,7 @@ const filterToAst = (filter, db) => {
                         right: fieldColumnToLowerCaseAst(value, db, false),
                     };
             }
-        case Filter_1.FieldTypes.Numeric:
+        case Filter_1.FieldTypes.Number:
             switch (mappedOperator) {
                 default:
                     return {
@@ -4621,7 +4621,7 @@ const filterToAst = (filter, db) => {
                     };
             }
         case Filter_1.FieldTypes.Date:
-            switch (filter.name) {
+            switch (filter.filterType) {
                 case Filter_1.FilterNames.DateCustomFilter:
                     return {
                         type: 'binary_expr',

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

@@ -1,4 +1,8 @@
-import { Column } from '../models/Columns';
+import { Client } from '../models/Client';
+import { Column, ColumnInternal } from '../models/Columns';
+import { Pivot } from '../models/Pivot';
+import { QuillReportInternal } from '../models/Report';
+import { Table } from '../models/Tables';
 export declare function getSelectFromAST(ast: any): any;
 export declare function processStarColumn(ast: any, columns: Column[]): any;
 export declare function recursiveSearchByKey(node: any, searchKey: string): any;
@@ -16,11 +20,50 @@ export declare function processApostrophe(node: any, searchKeys: string[]): any;
 export declare function recursiveSearchByKeysFindAllOccurances(node: any, searchKeys: string[], results: any[]): any;
 export declare function getColumnAndTableInfo(tableAliasMap: {
     [alias: string]: string;
-}, column: any, schemaInfo: any): {
+}, column: any, schemaInfo: Table[]): {
     tableName: string;
     columnName: string;
 } | undefined;
-export declare function getColumnsByTableFromASTAndSchema(ast: any, tables: any, tableAliasMap: any): {
+export declare function getColumnsByTableFromASTAndSchema(ast: any, tables: Table[], tableAliasMap: any): {
     [table: string]: string[];
 };
+export declare const isSubquery: (node: any) => boolean;
+export declare const getAllPossibleColumns: (baseAst: any, schema: Table[]) => (ColumnInternal & {
+    table: string;
+})[];
+export declare const createBasicSelectASTFromColumns: (columns: ColumnInternal[], tableName: string) => {
+    type: string;
+    options: null;
+    distinct: null;
+    columns: {
+        expr: {
+            type: string;
+            table: string;
+            column: string;
+        };
+        as: null;
+    }[];
+    from: {
+        db: null;
+        table: string;
+        as: null;
+    }[];
+    where: null;
+    groupby: null;
+    having: null;
+    orderby: null;
+    limit: null;
+};
+export declare const fetchAndProcessASTFromPrompt: (aiPrompt: string, schema: Table[], client: Client, prevPivot?: Pivot, currentQuery?: string) => Promise<{
+    ast: any;
+    pivot: Pivot | null | undefined;
+    whereAST: any;
+    error?: string | undefined;
+}>;
+export declare const fetchASTFromQuillReport: (report: QuillReportInternal, client: Client, schema: Table[]) => Promise<{
+    ast: any;
+    pivot: Pivot | undefined | null;
+    schema?: Table[] | undefined;
+    error?: string | undefined;
+}>;
 //# sourceMappingURL=astProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,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,GAAG,GACd;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAqCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,GAAG,EACX,aAAa,EAAE,GAAG,GACjB;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAqG/B"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,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,CAqG/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,MAAM,cACF,KAAK,iBACF,MAAM;SAEhB,GAAG;WACD,KAAK,GAAG,IAAI,GAAG,SAAS;cACrB,GAAG;;EA+Fd,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,UACnB,MAAM,UACN,KAAK,EAAE;SAEV,GAAG;WACD,KAAK,GAAG,SAAS,GAAG,IAAI;;;EAmDhC,CAAC"}

package/dist/cjs/utils/astProcessing.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getColumnsByTableFromASTAndSchema = exports.getColumnAndTableInfo = exports.recursiveSearchByKeysFindAllOccurances = exports.processApostrophe = exports.getColumnsByTableName = exports.createTableNameToTableAliasMap = exports.recursiveSearchByKeys = exports.recursiveSearchByKey = exports.processStarColumn = exports.getSelectFromAST = void 0;
+exports.fetchASTFromQuillReport = exports.fetchAndProcessASTFromPrompt = exports.createBasicSelectASTFromColumns = exports.getAllPossibleColumns = exports.isSubquery = exports.getColumnsByTableFromASTAndSchema = exports.getColumnAndTableInfo = exports.recursiveSearchByKeysFindAllOccurances = exports.processApostrophe = exports.getColumnsByTableName = exports.createTableNameToTableAliasMap = exports.recursiveSearchByKeys = exports.recursiveSearchByKey = exports.processStarColumn = exports.getSelectFromAST = void 0;
+const ast_1 = require("../components/ReportBuilder/ast");
+const convert_1 = require("../components/ReportBuilder/convert");
+const util_1 = require("../components/ReportBuilder/util");
+const constants_1 = require("./constants");
+const schema_1 = require("./schema");
 function getSelectFromAST(ast) {
     if (Array.isArray(ast)) {
         return ast[0];
@@ -166,17 +171,13 @@ function getColumnAndTableInfo(tableAliasMap, column, schemaInfo) {
             const tableInfo = schemaInfo.find((tableInfo) => tableInfo.name === table);
             if (!tableInfo)
                 continue;
-            const columnNames = tableInfo.columns.map((column) => column.name);
+            const columnNames = tableInfo.columns.map((column) => column.field);
             if (columnNames.includes(columnName)) {
                 tableName = table;
                 break;
             }
         }
     }
-    // const tableName = columnsInfo.table
-    //   ? tableAliasMap[columnsInfo.table]
-    //   : //@ts-ignore
-    //     tableAliasMap[Object.keys(tableAliasMap)[0]];
     return { tableName, columnName };
 }
 exports.getColumnAndTableInfo = getColumnAndTableInfo;
@@ -191,7 +192,7 @@ function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
                 if (!referencedColumns[table]) {
                     referencedColumns[table] = [];
                 }
-                referencedColumns[table] = tableInfo.columns.map((column) => column.name || '');
+                referencedColumns[table] = tableInfo.columns.map((column) => column.field);
             }
         });
     }
@@ -265,3 +266,205 @@ function getColumnsByTableFromASTAndSchema(ast, tables, tableAliasMap) {
     return referencedColumns;
 }
 exports.getColumnsByTableFromASTAndSchema = getColumnsByTableFromASTAndSchema;
+const isSubquery = (node) => {
+    if (!node)
+        return false;
+    if (node.ast)
+        return true;
+    if (node.left && (0, exports.isSubquery)(node.left))
+        return true;
+    if (node.right && (0, exports.isSubquery)(node.right))
+        return true;
+    if (node.value && Array.isArray(node.value)) {
+        for (const value of node.value) {
+            if ((0, exports.isSubquery)(value))
+                return true;
+        }
+    }
+    return false;
+};
+exports.isSubquery = isSubquery;
+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.field.toLowerCase() === 'id' ||
+            a.field.toLowerCase().endsWith('_id') ||
+            a.field.endsWith('Id');
+        const bIsId = b.field.toLowerCase() === 'id' ||
+            b.field.toLowerCase().endsWith('_id') ||
+            b.field.endsWith('Id');
+        if (aIsId && !bIsId)
+            return 1;
+        if (bIsId && !aIsId)
+            return -1;
+        return 0;
+    }));
+};
+exports.getAllPossibleColumns = getAllPossibleColumns;
+const createBasicSelectASTFromColumns = (columns, tableName) => {
+    return {
+        type: 'select',
+        options: null,
+        distinct: null,
+        columns: columns.map((column) => ({
+            expr: {
+                type: 'column_ref',
+                table: tableName,
+                column: column.field,
+            },
+            as: null,
+        })),
+        from: [{ db: null, table: tableName, as: null }],
+        where: null,
+        groupby: null,
+        having: null,
+        orderby: null,
+        limit: null,
+    };
+};
+exports.createBasicSelectASTFromColumns = createBasicSelectASTFromColumns;
+const fetchAndProcessASTFromPrompt = async (aiPrompt, schema, client, prevPivot, currentQuery) => {
+    let res, data, ast, newAst, pivot;
+    let numRetries = 0;
+    let whereAST;
+    const MAX_RETRIES = 3;
+    try {
+        let isTableJoin = !ast || !ast.from || ast.from.length !== 1;
+        while (isTableJoin || (0, exports.isSubquery)(ast?.where)) {
+            if (numRetries === MAX_RETRIES)
+                break;
+            if (!currentQuery || (ast && (isTableJoin || (0, exports.isSubquery)(ast?.where)))) {
+                res = await fetch(`${constants_1.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(`${constants_1.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 = (0, convert_1.convertBigQuery)(ast);
+        newAst = (0, convert_1.convertWildcardColumns)(newAst, schema); // must go before groupby
+        ({ ast: newAst, pivot } = (0, convert_1.convertGroupBy)(newAst, schema, prevPivot));
+        newAst = (0, convert_1.convertStringComparison)(newAst, client.databaseType || 'postgresql');
+        newAst = (0, convert_1.convertRemoveSimpleParentheses)(newAst);
+        const table = (0, ast_1.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 = (0, convert_1.convertUnaryToBinary)(newAst);
+        newAst = (0, util_1.removeNonSelectedTableReferences)(newAst, processedName, tableInfo.columns.map((col) => col.field));
+        if (pivot) {
+            newAst = (0, util_1.deepCopy)({ ...newAst, orderby: null, limit: null });
+        }
+        whereAST = (0, util_1.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 };
+};
+exports.fetchAndProcessASTFromPrompt = fetchAndProcessASTFromPrompt;
+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 = `${constants_1.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 = (0, convert_1.convertWildcardColumns)(convertedAst, schema); // must go before groupby
+        convertedAst = (0, convert_1.convertBigQuery)(convertedAst);
+        schemaInfo = schema;
+        if (!schemaInfo) {
+            const { schemaData } = await (0, schema_1.getSchemaInfoWithCustomFields)(client, 'rb');
+            schemaInfo = schemaData;
+        }
+        processApostrophe(convertedAst, ['type', 'value']);
+        convertedAst = (0, convert_1.convertBigQuery)(convertedAst);
+        ({ ast: newAst, pivot: groupByPivot } = (0, convert_1.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 };
+};
+exports.fetchASTFromQuillReport = fetchASTFromQuillReport;

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

@@ -1,8 +1,7 @@
+import { AxisFormat } from '../Dashboard';
 type Field = {
-    _id: string;
-    label: string;
     field: string;
-    format: 'percent';
+    format: AxisFormat;
 };
 type Props = {
     value: string | number | boolean | undefined | null;
@@ -15,6 +14,6 @@ type Props = {
  * The axis formatter will print a shorter version of the valueFormatter, which
  * fits nicely along the X or Y axes.
  */
-export declare const axisFormatter: ({ value, field, fields, }: Props) => string | number | boolean;
+export declare const axisFormatter: ({ value, field, fields }: Props) => string;
 export {};
 //# sourceMappingURL=axisFormatter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAGA,KAAK,KAAK,GAAG;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,8BAIvB,KAAK,KAAG,MAAM,GAAG,MAAM,GAAG,OAgC5B,CAAC"}
+{"version":3,"file":"axisFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/axisFormatter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IACpD,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,6BAA8B,KAAK,KAAG,MAwC/D,CAAC"}

package/dist/cjs/utils/axisFormatter.js

@@ -9,7 +9,7 @@ const date_fns_tz_1 = require("date-fns-tz");
  * The axis formatter will print a shorter version of the valueFormatter, which
  * fits nicely along the X or Y axes.
  */
-const axisFormatter = ({ value, field, fields, }) => {
+const axisFormatter = ({ value, field, fields }) => {
     if (field === undefined || field === null)
         return '';
     if (value === undefined || value === null)
@@ -17,30 +17,39 @@ const axisFormatter = ({ value, field, fields, }) => {
     const fieldInfo = fields.find((f) => f.field === field);
     if (!fieldInfo)
         return '';
-    const HANDLERS = {
-        percent: formatPercent,
-        dollar_amount: formatDollarAmount,
-        dollar_cents: formatDollarAmount, // no cents for axis format
-        whole_number: formatWholeNumber,
-        one_decimal_place: formatWholeNumber, // no decimals for axis format
-        two_decimal_places: formatWholeNumber, // no decimals for axis format
-        string: formatString,
-        yyyy: format_YYYY,
-        MMM_yyyy: format_MMM_yyyy,
-        MMM_dd: format_MMM_dd,
-        MMM_dd_yyyy: format_MMM_dd_yyyy,
-        MMM_ww_yyyy: format_MMM_ww_yyyy,
-        hh_ap_pm: format_hh_ap_pm,
-        'MMM_dd-MMM_dd': format_MMM_dd_MMM_dd,
-        'MMM_dd_hh:mm_ap_pm': format_MMM_dd_hh_mm_ap_pm,
-        'wo, yyyy': format_wo_yyyy,
-    };
     // try to handle this value using the associated formatType handler
     const formatType = fieldInfo.format;
-    if (Object.keys(HANDLERS).includes(formatType)) {
-        return HANDLERS[formatType](value);
+    switch (formatType) {
+        case 'percent':
+            return formatPercent(value);
+        case 'dollar_amount':
+            return formatDollarAmount(value);
+        case 'whole_number':
+            return formatWholeNumber(value);
+        case 'string':
+            return formatString(value);
+        case 'yyyy':
+            return format_YYYY(value);
+        case 'MMM_dd':
+            return format_MMM_dd(value);
+        case 'MMM_yyyy':
+            return format_MMM_yyyy(value);
+        case 'MMM_dd_yyyy':
+            return format_MMM_dd_yyyy(value);
+        // not sure what this is
+        // case 'MMM_ww_yyyy':
+        //   return format_MMM_ww_yyyy(value);
+        case 'hh_ap_pm':
+            return format_hh_ap_pm(value);
+        case 'MMM_dd-MMM_dd':
+            return format_MMM_dd_MMM_dd(value);
+        case 'MMM_dd_hh:mm_ap_pm':
+            return format_MMM_dd_hh_mm_ap_pm(value);
+        case 'wo, yyyy':
+            return format_wo_yyyy(value);
+        default:
+            return formatString(value);
     }
-    return formatString(value); // by default make this value a string
 };
 exports.axisFormatter = axisFormatter;
 /**
@@ -155,18 +164,17 @@ const format_MMM_dd_MMM_dd = (value) => {
         return `${(0, date_fns_1.format)(monday, 'MMM dd')} - ${(0, date_fns_1.format)(sunday, 'MMM dd')}`;
     }
 };
-const format_MMM_ww_yyyy = (value) => {
-    const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(value), 'UTC');
-    if (!(0, date_fns_1.isValid)(utcDate))
-        return 'Invalid date';
-    const startOfWeekDate = (0, date_fns_1.startOfWeek)(utcDate, { weekStartsOn: 1 });
-    const endOfWeekDate = (0, date_fns_1.endOfWeek)(utcDate, { weekStartsOn: 1 });
-    const month = (0, date_fns_1.format)(utcDate, 'MMM');
-    const startDay = (0, date_fns_1.format)(startOfWeekDate, 'd');
-    const endDay = (0, date_fns_1.format)(endOfWeekDate, 'd');
-    const year = (0, date_fns_1.format)(utcDate, 'yyyy');
-    return `${month}, ${startDay}-${endDay}, ${year}`;
-};
+// const format_MMM_ww_yyyy = (value: any) => {
+//   const utcDate: Date = utcToZonedTime(new Date(value), 'UTC');
+//   if (!isValid(utcDate)) return 'Invalid date';
+//   const startOfWeekDate = startOfWeek(utcDate, { weekStartsOn: 1 });
+//   const endOfWeekDate = endOfWeek(utcDate, { weekStartsOn: 1 });
+//   const month = format(utcDate, 'MMM');
+//   const startDay = format(startOfWeekDate, 'd');
+//   const endDay = format(endOfWeekDate, 'd');
+//   const year = format(utcDate, 'yyyy');
+//   return `${month}, ${startDay}-${endDay}, ${year}`;
+// };
 const format_MMM_dd_hh_mm_ap_pm = (value) => {
     const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(value), 'UTC');
     if (!(0, date_fns_1.isValid)(utcDate))

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

@@ -0,0 +1,4 @@
+import { Client } from '../models/Client';
+export declare const EMPTY_CLIENT: Client;
+export declare function fetchClient(publicKey: string, queryEndpoint: string, withCredentials?: boolean, queryHeaders?: HeadersInit): Promise<Client>;
+//# sourceMappingURL=client.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/utils/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,eAAO,MAAM,YAAY,EAAE,MAS1B,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,CAAC,CAwBjB"}

package/dist/cjs/utils/client.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchClient = exports.EMPTY_CLIENT = void 0;
+exports.EMPTY_CLIENT = {
+    customerId: '',
+    clientId: '',
+    userId: '',
+    publicKey: '',
+    queryEndpoint: '',
+    queryHeaders: {},
+    withCredentials: false,
+    databaseType: '',
+};
+async function fetchClient(publicKey, queryEndpoint, withCredentials = false, queryHeaders) {
+    let result = exports.EMPTY_CLIENT;
+    try {
+        const response = await fetch(`${queryEndpoint}`, {
+            method: 'POST',
+            headers: {
+                ...queryHeaders,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                metadata: {
+                    clientId: publicKey,
+                    publicKey,
+                    task: 'client',
+                },
+            }),
+            credentials: withCredentials ? 'include' : 'omit',
+        });
+        const json = await response.json();
+        result = json.data?.data?.client || json.data?.client;
+    }
+    catch (error) {
+        console.error('ERROR:', error);
+    }
+    return result;
+}
+exports.fetchClient = fetchClient;

package/dist/cjs/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