@quillsql/react 2.12.40 → 2.12.42

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

@@ -1,6 +1,7 @@
+import { Column } from '../models/Columns';
 export declare const downloadCSV: (data: {
     rows: any[];
-    fields?: any[];
+    fields?: Column[];
     name?: string;
 }) => void;
 //# sourceMappingURL=csv.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../../src/utils/csv.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,WAAW,SAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,SA2FA,CAAC"}
+{"version":3,"file":"csv.d.ts","sourceRoot":"","sources":["../../../src/utils/csv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,eAAO,MAAM,WAAW,SAAU;IAChC,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,SA2FA,CAAC"}

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

@@ -1,4 +1,5 @@
 import { QuillReportInternal } from '../models/Report';
+import { Client } from '../models/Client';
 /**
  * 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
@@ -8,6 +9,6 @@ import { QuillReportInternal } from '../models/Report';
  */
 export declare function cleanDashboardItem(item: {
     [key: string]: any;
-} | undefined, dashboardFilters: any, client?: any, dateBucket?: string): Promise<QuillReportInternal>;
-export declare function getDashboard(dashboardName: string, client: any): Promise<any>;
+} | undefined, dashboardFilters: any, client?: Client, dateBucket?: string): Promise<QuillReportInternal>;
+export declare function getDashboard(dashboardName: string, client: Client): Promise<any>;
 //# sourceMappingURL=dashboard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../../src/utils/dashboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AA+BpE;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CA2C9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,CAAC,CA2Bd"}
+{"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,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAuB1C;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,EACxC,gBAAgB,EAAE,GAAG,EACrB,MAAM,CAAC,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,mBAAmB,CAAC,CAmD9B;AAgHD,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,CAAC,CA2Bd"}

package/dist/esm/utils/dashboard.js

@@ -21,6 +21,7 @@ const defaultDashboardItem = {
     filtersApplied: {},
     queryString: '',
     rowCount: 0,
+    columnInternal: [],
 };
 /**
  * Returns a cleaned version of the dashboard item we store in state. We clean
@@ -39,6 +40,9 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
             name: item.name,
         };
     const pivotTable = await getPivotTable(item, dashboardFilters, client, dateBucket);
+    const processedColumns = item.columns.map((col) => {
+        return { ...col, label: snakeAndCamelCaseToTitleCase(col.label) };
+    });
     return {
         id: item._id,
         name: item.name,
@@ -47,9 +51,14 @@ export async function cleanDashboardItem(item, dashboardFilters, client, dateBuc
         pivotRows: pivotTable ? pivotTable.rows : undefined,
         pivotColumns: pivotTable ? pivotTable.columns : undefined,
         compareRows: item.compareRows,
-        columns: item.columns.map((col) => {
-            return { ...col, label: snakeAndCamelCaseToTitleCase(col.label) };
+        columns: processedColumns.map((column) => {
+            return {
+                field: column.field,
+                format: column.format,
+                label: column.label,
+            };
         }),
+        columnInternal: processedColumns,
         chartType: item.chartType,
         dateField: item.dateField,
         pivot: item.pivot,

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

@@ -1,3 +1,8 @@
-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>;
+import { Client } from '../models/Client';
+export declare function getData(client: Client, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string, queryParam?: string): Promise<any>;
+export declare function getDataFromCloud(client: Client, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
+export declare function fetchSqlQuery(ast: any, client: Client, 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":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AA8E1C,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,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,MAAM,EACd,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA6BhB;AAED,wBAAsB,aAAa,CACjC,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,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;
@@ -173,7 +174,6 @@ export async function getData(client, cloudQueryEndpoint, noCred, hostedRequestB
     }
 }
 export async function getDataFromCloud(client, cloudQueryEndpoint, cloudRequestBody, method = 'POST') {
-    const environment = client?.environment;
     const host = (typeof process !== 'undefined' && process?.env?.QUILL_SERVER_HOST) ||
         'https://quill-344421.uc.r.appspot.com';
     const url = `${host}/${cloudQueryEndpoint}`;
@@ -181,9 +181,7 @@ export async function getDataFromCloud(client, cloudQueryEndpoint, cloudRequestB
         method,
         headers: {
             Authorization: 'Bearer ',
-            ...(environment ? { environment } : {}), // Remember to provide the actual token
             'Content-Type': 'application/json',
-            environment: environment || undefined,
         },
         body: method === 'POST'
             ? JSON.stringify({
@@ -203,3 +201,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/dataProcessing.d.ts

@@ -1,11 +1,12 @@
-import { QuillReportInternal } from '../models/Report';
+import { QuillReport } from '../models/Report';
+import { ColumnInternal } from '../models/Columns';
 export declare enum Calculation {
     PointToPointPercentageChange = "POINT_TO_POINT_PERCENTAGE_CHANGE",
     SimplePercentageChange = "SIMPLE_PERCENTAGE_CHANGE",
     Sum = "SUM"
 }
-export declare const getSimplePercentageChange: (data: QuillReportInternal) => number | undefined;
-export declare const getPointToPointPercentageChange: (data: QuillReportInternal) => number | undefined;
-export declare const getSumOfFields: (data: QuillReportInternal, comparison: boolean) => number;
-export declare function parseValueFromBigQueryDates(rows: any[], columns: any[]): void;
+export declare const getSimplePercentageChange: (data: QuillReport) => number | undefined;
+export declare const getPointToPointPercentageChange: (data: QuillReport) => number | undefined;
+export declare const getSumOfFields: (data: QuillReport, comparison: boolean) => number;
+export declare function parseValueFromBigQueryDates(rows: any[], columns: ColumnInternal[]): void;
 //# sourceMappingURL=dataProcessing.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQvD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,SAAU,mBAAmB,uBAsClE,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,mBAAmB,uBAkFxE,CAAC;AAEF,eAAO,MAAM,cAAc,SACnB,mBAAmB,cACb,OAAO,WAoBpB,CAAC;AAGF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,QAkBtE"}
+{"version":3,"file":"dataProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/dataProcessing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,oBAAY,WAAW;IACrB,4BAA4B,qCAAqC;IACjE,sBAAsB,6BAA6B;IACnD,GAAG,QAAQ;CACZ;AAyBD,eAAO,MAAM,yBAAyB,SAAU,WAAW,uBAsC1D,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAAU,WAAW,uBA4EhE,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,WAAW,cAAc,OAAO,WAmBpE,CAAC;AAGF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,cAAc,EAAE,QAY1B"}

package/dist/esm/utils/dataProcessing.js

@@ -1,6 +1,5 @@
 import { getDateString, isDateField, } from '../internals/ReportBuilder/PivotModal';
 import { getDateBucketFromRange } from './dates';
-import { getPostgresBasicType } from '../components/ReportBuilder/util';
 export var Calculation;
 (function (Calculation) {
     Calculation["PointToPointPercentageChange"] = "POINT_TO_POINT_PERCENTAGE_CHANGE";
@@ -27,16 +26,16 @@ const getSumOfFieldsAndRows = (rows, fields) => {
 };
 export const getSimplePercentageChange = (data) => {
     if (data.compareRows && data.compareRows.length > 0) {
-        if (data.pivot && data.pivotRows && data.pivotColumns) {
-            const pivotRows = data.pivotRows;
-            const comparisonFields = data.pivotColumns
+        if (data.pivot) {
+            const pivotRows = data.rows;
+            const comparisonFields = data.columns
                 .filter((field) => {
                 return field.field.includes(`comparison_`);
             })
                 .map((field) => {
                 return field.field;
             });
-            const nonComparisonFields = data.pivotColumns
+            const nonComparisonFields = data.columns
                 .filter((field) => {
                 return !field.field.includes(`comparison_`);
             })
@@ -61,19 +60,15 @@ export const getSimplePercentageChange = (data) => {
     }
 };
 export const getPointToPointPercentageChange = (data) => {
-    if (data.pivot &&
-        data.pivotRows &&
-        data.pivotRows.length > 0 &&
-        data.pivotColumns &&
-        data.pivot.rowFieldType === 'date') {
-        const lastRow = data.pivotRows[data.pivotRows.length - 1];
+    if (data.pivot && data.pivot.rowFieldType === 'date') {
+        const lastRow = data.rows[data.rows.length - 1];
         const sumLastRow = getSumOfFieldsAndRows(
         // @ts-ignore
-        [lastRow], data.pivotColumns.map((field) => field.field));
-        const firstRow = data.pivotRows[0];
+        [lastRow], data.columns.map((field) => field.field));
+        const firstRow = data.rows[0];
         const sumFirstRow = getSumOfFieldsAndRows(
         // @ts-ignore
-        [firstRow], data.pivotColumns.map((field) => field.field));
+        [firstRow], data.columns.map((field) => field.field));
         return (sumLastRow - sumFirstRow) / sumFirstRow;
     }
     else {
@@ -129,9 +124,9 @@ export const getSumOfFields = (data, comparison) => {
         });
         return getSumOfFieldsAndRows(data.compareRows, yAxisFields);
     }
-    if (data.pivot && data.pivotRows && data.pivotColumns) {
-        const pivotRows = data.pivotRows;
-        const fields = data.pivotColumns.map((field) => {
+    if (data.pivot) {
+        const pivotRows = data.rows;
+        const fields = data.columns.map((field) => {
             return field.field;
         });
         return getSumOfFieldsAndRows(pivotRows, fields);
@@ -148,13 +143,10 @@ export function parseValueFromBigQueryDates(rows, columns) {
     if (!rows || !columns)
         return;
     columns.forEach((column) => {
-        if (isDateField(column.fieldType) ||
-            getPostgresBasicType(column) === 'date') {
+        if (isDateField(column.fieldType)) {
             rows.forEach((row) => {
-                if (row[column.field ?? column.name] &&
-                    typeof row[column.field ?? column.name] === 'object') {
-                    row[column.field ?? column.name] =
-                        row[column.field ?? column.name].value;
+                if (row[column.field] && typeof row[column.field] === 'object') {
+                    row[column.field] = row[column.field].value;
                 }
             });
         }

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";
+}): "year" | "month" | "week" | "day";
 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/monacoConfig.d.ts

@@ -1,5 +1,6 @@
 import { Monaco } from '@monaco-editor/react';
 import { Range } from 'monaco-editor';
+import { Table } from '../models/Tables';
 interface CompletionItem {
     label: string;
     kind: number;
@@ -9,7 +10,7 @@ interface CompletionItem {
     detail?: string;
 }
 export declare const QUILL_LANGUAGE: any;
-export declare function generateSuggestionsBySchema(schema: any[], monaco: Monaco, range: Range, databaseType: string): CompletionItem[];
+export declare function generateSuggestionsBySchema(schema: Table[], monaco: Monaco, range: Range, databaseType: string): CompletionItem[];
 export declare function generateSuggestionsByDatasource(monaco: Monaco, range: Range, databaseType: string): {
     label: string;
     kind: import("monaco-editor").languages.CompletionItemKind;

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

@@ -1 +1 @@
-{"version":3,"file":"monacoConfig.d.ts","sourceRoot":"","sources":["../../../src/utils/monacoConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAGtC,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,cAAc,EAAE,GAmJ5B,CAAC;AAyJF,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,GAAG,EAAE,EACb,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,GACnB,cAAc,EAAE,CA2BlB;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM;;;;;;IAoBrB"}
+{"version":3,"file":"monacoConfig.d.ts","sourceRoot":"","sources":["../../../src/utils/monacoConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,UAAU,cAAc;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,cAAc,EAAE,GAmJ5B,CAAC;AAyJF,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,KAAK,EAAE,EACf,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,GACnB,cAAc,EAAE,CA2BlB;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM;;;;;;IAoBrB"}

package/dist/esm/utils/monacoConfig.js

@@ -283,9 +283,9 @@ export function generateSuggestionsBySchema(schema, monaco, range, databaseType)
         };
         suggestions.push(curSuggestion);
         table.columns.forEach((column) => {
-            const insertText = `${processColumnReference(column.name, databaseType).replaceAll('`', '')}`;
+            const insertText = `${processColumnReference(column.field, databaseType).replaceAll('`', '')}`;
             const curSuggestion = {
-                label: column.name,
+                label: column.field,
                 kind: monaco.languages.CompletionItemKind.Field,
                 insertText,
                 detail: table.name,

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

@@ -1,6 +1,7 @@
-import { Pivot } from '../internals/ReportBuilder/PivotModal';
+import { Client } from '../models/Client';
+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<{
+export declare function generatePivotWithSQL(pivot: Pivot, report: QuillReportInternal, client: Client, dateBucket?: string, dateFilter?: any, distinctStrings?: any): Promise<{
     rows: any;
     columns: any;
 } | undefined>;

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,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,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,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,GAAG,EAChB,eAAe,CAAC,EAAE,GAAG;;;eAmMtB"}

package/dist/esm/utils/pivotConstructor.js

@@ -34,7 +34,7 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
     if (!report.itemQuery) {
         return undefined;
     }
-    const sqlQuery = generatePivotQuery(pivot, report.itemQuery, client.databaseType, comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket);
+    const sqlQuery = generatePivotQuery(pivot, report.itemQuery, client.databaseType || 'postgresql', comparisonInterval, distinctStrings ? distinctStrings : distinctStringValues, dateBucket);
     if (sqlQuery && report.rows.length > 0) {
         const hostedBody = {
             metadata: {
@@ -55,7 +55,8 @@ export async function generatePivotWithSQL(pivot, report, client, dateBucket, da
         const resp = await getData(client, 'query', 'same-origin', hostedBody, cloudBody, 'POST', 'fetch-pivot');
         // With our current design we have to remove the second row field but leave the first for comparison purposes.
         const rows = resp.queryResults[0].rows;
-        if (pivot.columnField && client.databaseType.toLowerCase() === 'bigquery') {
+        if (pivot.columnField &&
+            client.databaseType?.toLowerCase() === 'bigquery') {
             rows.forEach((row) => {
                 Object.keys(row).forEach((key) => {
                     const processedKey = processColumnName(key);
@@ -84,15 +85,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 +107,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,10 +1,36 @@
+import { Client } from '../models/Client';
+import { ColumnInternal } from '../models/Columns';
+import { Pivot } from '../models/Pivot';
 import { QuillReport, QuillReportInternal } from '../models/Report';
+import { DateRangesByColumn, Table, 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<{
+export declare const EMPTY_INTERNAL_REPORT: QuillReportInternal;
+export declare function fetchReport(reportId: string, client: Client, useReportTask?: boolean, filters?: any[], additionalProcessing?: AdditionalProcessing, dateBucket?: string, customFields?: any): Promise<{
     report: QuillReportInternal;
     error?: string;
 }>;
 export declare const formatRowsFromReport: (report: any) => any;
 export declare function convertInternalReportToReport(report: QuillReportInternal): QuillReport;
+export declare const fetchReportBuilderDataFromAST: (baseAst: any, formData: any, schema: Table[], client: Client, 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":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,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,EACL,kBAAkB,EAClB,KAAK,EACL,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAa1B,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,eAAO,MAAM,qBAAqB,EAAE,mBAGnC,CAAC;AA0BF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,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,KAAK,EAAE,UACP,MAAM,UACN,KAAK,qBACM,GAAG,iBACP,MAAM,qBACF;IACjB,aAAa,EAAE,mBAAmB,CAAC;IACnC,UAAU,EAAE,kBAAkB,CAAC;CAChC,WACQ,mBAAmB,iBACb,GAAG,KACjB,QAAQ,iBAAiB,CAqI3B,CAAC"}