@quillsql/react 2.16.24 → 2.16.25

package/dist/index.cjs

@@ -17028,22 +17028,6 @@ function getSelectFromAST(ast) {
     return ast;
   }
 }
-function processStarColumn(ast, columns) {
-  if (ast.columns === "*") {
-    ast.columns = columns.map((column) => {
-      return {
-        type: "expr",
-        expr: {
-          type: "column_ref",
-          table: null,
-          column: column.field
-        },
-        as: null
-      };
-    });
-  }
-  return ast;
-}
 function createTableNameToTableAliasMap(ast) {
   const tableNameToTableAliasMap = {};
   if (ast.from) {
@@ -17077,21 +17061,6 @@ function createTableNameToTableAliasMap(ast) {
   }
   return tableNameToTableAliasMap;
 }
-function processApostrophe(node, searchKeys) {
-  if (!node || typeof node !== "object") {
-    return;
-  }
-  const nodeKeys = Object.keys(node);
-  if (searchKeys.every((key) => nodeKeys.includes(key))) {
-    if (node.type === "single_quote_string") {
-      node.value = node.value.replace("''", "'").replace("\\'", "'");
-    }
-  }
-  for (const key of nodeKeys) {
-    processApostrophe(node[key], searchKeys);
-  }
-  return;
-}
 function recursiveSearchByKeysFindAllOccurances(node, searchKeys, results) {
   if (!node || typeof node !== "object") {
     return;
@@ -17304,7 +17273,7 @@ function getTablesHelper(ast, allTables, skipStar) {
   });
   return { referencedTablesAndColumns, dateFields };
 }
-var isSubquery, createSelectStarFromAst, fetchAndProcessASTFromPrompt, fetchASTFromQuillReport, POSTGRES_DATE_TYPES;
+var isSubquery, createSelectStarFromAst, fetchAndProcessASTFromPrompt, POSTGRES_DATE_TYPES;
 var init_astProcessing = __esm({
   "src/utils/astProcessing.ts"() {
     "use strict";
@@ -17492,63 +17461,6 @@ var init_astProcessing = __esm({
       }
       return { ast: newAst, pivot, whereAST };
     };
-    fetchASTFromQuillReport = async (report, client, schema, getToken, eventTracking) => {
-      let newAst;
-      let groupByPivot = null;
-      let schemaInfo = [];
-      try {
-        if (!report) {
-          throw new Error("Report not found");
-        }
-        const { data: resp } = await quillFetch({
-          client,
-          task: "astify",
-          metadata: {
-            query: report.queryString,
-            useNewNodeSql: true
-          },
-          getToken
-        });
-        if (resp.success === false) {
-          throw new Error(resp.message || "Couldn't process report query.");
-        }
-        const ast = getSelectFromAST(resp.ast);
-        let convertedAst = processStarColumn(ast, report.columns);
-        convertedAst = convertWildcardColumns(convertedAst, schema);
-        convertedAst = convertBigQuery(convertedAst);
-        schemaInfo = schema;
-        processApostrophe(convertedAst, ["type", "value"]);
-        convertedAst = convertBigQuery(convertedAst);
-        ({ ast: newAst, pivot: groupByPivot } = convertGroupBy(
-          convertedAst,
-          schemaInfo,
-          report.pivot ? report.pivot : void 0
-        ));
-        newAst = convertedAst;
-      } catch (e) {
-        console.log(e);
-        eventTracking?.logError?.({
-          type: "bug",
-          // TODO: determine type
-          severity: "high",
-          message: "Error fetching AST from report",
-          errorMessage: e.message,
-          errorStack: e.stack,
-          errorData: {
-            caller: "fetchASTFromQuillReport",
-            function: "fetchASTFromQuillReport"
-          }
-        });
-        if (e instanceof Error) {
-          return {
-            error: e.message,
-            ast: null,
-            pivot: null
-          };
-        }
-      }
-      return { ast: newAst, pivot: groupByPivot, schema: schemaInfo };
-    };
     POSTGRES_DATE_TYPES = [
       "timestamp",
       "date",
@@ -51038,7 +50950,7 @@ var useReportBuilderInternal = ({
     isLoading: dashboardIsLoading,
     reload
   } = useDashboardInternal(destinationDashboard);
-  const { getToken } = (0, import_react49.useContext)(FetchContext);
+  const { getToken, quillFetchWithToken } = (0, import_react49.useContext)(FetchContext);
   const { eventTracking } = (0, import_react49.useContext)(EventTrackingContext);
   const destinationDashboardConfig = (0, import_react49.useMemo)(() => {
     return dashboards?.find((d) => d.name === destinationDashboard);
@@ -52250,29 +52162,38 @@ var useReportBuilderInternal = ({
       clearAllState();
     }
   }, [client]);
+  const fetchReportBuilderStateByReportId = async (reportId2) => {
+    if (!client) {
+      throw new Error("Client not found");
+    }
+    const { data: resp, error } = await quillFetchWithToken({
+      client,
+      task: "report-builder-state",
+      metadata: {
+        reportId: reportId2
+      }
+    });
+    if (error) {
+      throw new Error(error);
+    }
+    const state = resp?.reportBuilderState;
+    if (!state) {
+      throw new Error("ReportBuilder state not found for report");
+    }
+    return state;
+  };
   (0, import_react49.useEffect)(() => {
     const loadChart = async () => {
       if (!client || !reportId) return;
       const report = allReportsById[reportId];
       if (!report) return;
       try {
-        const { ast: newAst, pivot: newPivot } = await fetchASTFromQuillReport(
-          report,
-          client,
-          filteredSchema,
-          getToken,
-          eventTracking
-        );
-        const initialState = astToReportBuilderState(
-          newAst,
-          client.databaseType || "postgresql",
-          filteredSchema
-        );
+        const initialState = report.reportBuilderState ?? await fetchReportBuilderStateByReportId(report.id || reportId);
         setTempReport(report);
         handleMultiStateChange({
           state: {
             ...initialState,
-            pivot: newPivot ?? null
+            pivot: initialState.pivot ?? report.pivot ?? null
           },
           fetchData: true,
           report,

package/dist/index.js

@@ -17070,22 +17070,6 @@ function getSelectFromAST(ast) {
     return ast;
   }
 }
-function processStarColumn(ast, columns) {
-  if (ast.columns === "*") {
-    ast.columns = columns.map((column) => {
-      return {
-        type: "expr",
-        expr: {
-          type: "column_ref",
-          table: null,
-          column: column.field
-        },
-        as: null
-      };
-    });
-  }
-  return ast;
-}
 function createTableNameToTableAliasMap(ast) {
   const tableNameToTableAliasMap = {};
   if (ast.from) {
@@ -17119,21 +17103,6 @@ function createTableNameToTableAliasMap(ast) {
   }
   return tableNameToTableAliasMap;
 }
-function processApostrophe(node, searchKeys) {
-  if (!node || typeof node !== "object") {
-    return;
-  }
-  const nodeKeys = Object.keys(node);
-  if (searchKeys.every((key) => nodeKeys.includes(key))) {
-    if (node.type === "single_quote_string") {
-      node.value = node.value.replace("''", "'").replace("\\'", "'");
-    }
-  }
-  for (const key of nodeKeys) {
-    processApostrophe(node[key], searchKeys);
-  }
-  return;
-}
 function recursiveSearchByKeysFindAllOccurances(node, searchKeys, results) {
   if (!node || typeof node !== "object") {
     return;
@@ -17346,7 +17315,7 @@ function getTablesHelper(ast, allTables, skipStar) {
   });
   return { referencedTablesAndColumns, dateFields };
 }
-var isSubquery, createSelectStarFromAst, fetchAndProcessASTFromPrompt, fetchASTFromQuillReport, POSTGRES_DATE_TYPES;
+var isSubquery, createSelectStarFromAst, fetchAndProcessASTFromPrompt, POSTGRES_DATE_TYPES;
 var init_astProcessing = __esm({
   "src/utils/astProcessing.ts"() {
     "use strict";
@@ -17534,63 +17503,6 @@ var init_astProcessing = __esm({
       }
       return { ast: newAst, pivot, whereAST };
     };
-    fetchASTFromQuillReport = async (report, client, schema, getToken, eventTracking) => {
-      let newAst;
-      let groupByPivot = null;
-      let schemaInfo = [];
-      try {
-        if (!report) {
-          throw new Error("Report not found");
-        }
-        const { data: resp } = await quillFetch({
-          client,
-          task: "astify",
-          metadata: {
-            query: report.queryString,
-            useNewNodeSql: true
-          },
-          getToken
-        });
-        if (resp.success === false) {
-          throw new Error(resp.message || "Couldn't process report query.");
-        }
-        const ast = getSelectFromAST(resp.ast);
-        let convertedAst = processStarColumn(ast, report.columns);
-        convertedAst = convertWildcardColumns(convertedAst, schema);
-        convertedAst = convertBigQuery(convertedAst);
-        schemaInfo = schema;
-        processApostrophe(convertedAst, ["type", "value"]);
-        convertedAst = convertBigQuery(convertedAst);
-        ({ ast: newAst, pivot: groupByPivot } = convertGroupBy(
-          convertedAst,
-          schemaInfo,
-          report.pivot ? report.pivot : void 0
-        ));
-        newAst = convertedAst;
-      } catch (e) {
-        console.log(e);
-        eventTracking?.logError?.({
-          type: "bug",
-          // TODO: determine type
-          severity: "high",
-          message: "Error fetching AST from report",
-          errorMessage: e.message,
-          errorStack: e.stack,
-          errorData: {
-            caller: "fetchASTFromQuillReport",
-            function: "fetchASTFromQuillReport"
-          }
-        });
-        if (e instanceof Error) {
-          return {
-            error: e.message,
-            ast: null,
-            pivot: null
-          };
-        }
-      }
-      return { ast: newAst, pivot: groupByPivot, schema: schemaInfo };
-    };
     POSTGRES_DATE_TYPES = [
       "timestamp",
       "date",
@@ -51214,7 +51126,7 @@ var useReportBuilderInternal = ({
     isLoading: dashboardIsLoading,
     reload
   } = useDashboardInternal(destinationDashboard);
-  const { getToken } = useContext30(FetchContext);
+  const { getToken, quillFetchWithToken } = useContext30(FetchContext);
   const { eventTracking } = useContext30(EventTrackingContext);
   const destinationDashboardConfig = useMemo24(() => {
     return dashboards?.find((d) => d.name === destinationDashboard);
@@ -52426,29 +52338,38 @@ var useReportBuilderInternal = ({
       clearAllState();
     }
   }, [client]);
+  const fetchReportBuilderStateByReportId = async (reportId2) => {
+    if (!client) {
+      throw new Error("Client not found");
+    }
+    const { data: resp, error } = await quillFetchWithToken({
+      client,
+      task: "report-builder-state",
+      metadata: {
+        reportId: reportId2
+      }
+    });
+    if (error) {
+      throw new Error(error);
+    }
+    const state = resp?.reportBuilderState;
+    if (!state) {
+      throw new Error("ReportBuilder state not found for report");
+    }
+    return state;
+  };
   useEffect26(() => {
     const loadChart = async () => {
       if (!client || !reportId) return;
       const report = allReportsById[reportId];
       if (!report) return;
       try {
-        const { ast: newAst, pivot: newPivot } = await fetchASTFromQuillReport(
-          report,
-          client,
-          filteredSchema,
-          getToken,
-          eventTracking
-        );
-        const initialState = astToReportBuilderState(
-          newAst,
-          client.databaseType || "postgresql",
-          filteredSchema
-        );
+        const initialState = report.reportBuilderState ?? await fetchReportBuilderStateByReportId(report.id || reportId);
         setTempReport(report);
         handleMultiStateChange({
           state: {
             ...initialState,
-            pivot: newPivot ?? null
+            pivot: initialState.pivot ?? report.pivot ?? null
           },
           fetchData: true,
           report,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.16.24",
+  "version": "2.16.25",
   "type": "module",
   "exports": {
     ".": {