@quillsql/react 2.16.73 → 2.16.75

package/dist/index.cjs

@@ -63671,6 +63671,31 @@ function useReport(reportIdArg, options = {}) {
     () => getSchemaForeignKeyMapping(schemaForReportBuilderState),
     [schemaForReportBuilderState]
   );
+  const datasourceJoinOptionsByTable = (0, import_react61.useMemo)(() => {
+    const tableNames = new Set(
+      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
+    );
+    const compatibleByTable = new Map(
+      Array.from(tableNames, (tableName) => [tableName, /* @__PURE__ */ new Set()])
+    );
+    for (const [tableName, mappings] of Object.entries(schemaForeignKeyMap)) {
+      if (!tableNames.has(tableName)) continue;
+      for (const mapping of mappings) {
+        const foreignTableName = String(mapping.foreignTable ?? "").trim();
+        if (!foreignTableName || foreignTableName === tableName || !tableNames.has(foreignTableName)) {
+          continue;
+        }
+        compatibleByTable.get(tableName)?.add(foreignTableName);
+        compatibleByTable.get(foreignTableName)?.add(tableName);
+      }
+    }
+    return new Map(
+      Array.from(compatibleByTable, ([tableName, compatibleTables]) => [
+        tableName,
+        Array.from(compatibleTables)
+      ])
+    );
+  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
   const selectedBaseTableNamesForFieldOptions = (0, import_react61.useMemo)(() => {
     const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
@@ -63757,9 +63782,6 @@ function useReport(reportIdArg, options = {}) {
     queryColumnsBootstrapKey
   ]);
   const datasourceOptions = (0, import_react61.useMemo)(() => {
-    const tableNames = new Set(
-      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
-    );
     const seen = /* @__PURE__ */ new Set();
     const result = [];
     for (const table2 of schemaForReportBuilderState) {
@@ -63769,16 +63791,11 @@ function useReport(reportIdArg, options = {}) {
       result.push({
         value: name2,
         label: toTitleCaseLabel(name2),
-        joinOptions: getJoinCompatibleTableNames(
-          [name2],
-          schemaForeignKeyMap
-        ).filter(
-          (candidate) => candidate !== name2 && tableNames.has(candidate)
-        )
+        joinOptions: datasourceJoinOptionsByTable.get(name2) ?? []
       });
     }
     return result;
-  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
+  }, [schemaForReportBuilderState, datasourceJoinOptionsByTable]);
   const queryBuilderFieldConfigByName = (0, import_react61.useMemo)(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState
@@ -66276,14 +66293,16 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshQueryEnabled,
     effectiveReportId
   ]);
+  const settledPivotForChart = sourceReport?.pivot ?? null;
+  const settledSourceRowFieldForChart = String(
+    sourceReport?.pivotResultSourceRowField ?? settledPivotForChart?.rowField ?? ""
+  ).trim();
+  const pendingPivotChangesDimensions = Boolean(
+    sourceReport && pendingPivotRefresh && nextPivot && (settledSourceRowFieldForChart !== String(nextPivot.rowField ?? "").trim() || String(settledPivotForChart?.rowFieldTable ?? "").trim() !== String(nextPivot.rowFieldTable ?? "").trim() || String(settledPivotForChart?.columnField ?? "").trim() !== String(nextPivot.columnField ?? "").trim() || String(settledPivotForChart?.columnFieldTable ?? "").trim() !== String(nextPivot.columnFieldTable ?? "").trim())
+  );
   const chartData = (0, import_react61.useMemo)(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const settledPivot = sourceReport.pivot ?? null;
-    const settledSourceRowField = String(
-      sourceReport.pivotResultSourceRowField ?? settledPivot?.rowField ?? ""
-    ).trim();
-    const pendingPivotChangesDimensions = pendingPivotRefresh && Boolean(nextPivot) && (settledSourceRowField !== String(nextPivot?.rowField ?? "").trim() || String(settledPivot?.rowFieldTable ?? "").trim() !== String(nextPivot?.rowFieldTable ?? "").trim() || String(settledPivot?.columnField ?? "").trim() !== String(nextPivot?.columnField ?? "").trim() || String(settledPivot?.columnFieldTable ?? "").trim() !== String(nextPivot?.columnFieldTable ?? "").trim());
     const chartPivot = pendingPivotChangesDimensions ? sourceReport.pivot ?? null : nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
     const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
       ...chartPivot,
@@ -66310,7 +66329,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport,
     chartType,
     nextPivot,
-    pendingPivotRefresh,
+    pendingPivotChangesDimensions,
     effectiveReportBuilderState,
     useInMemoryEngines,
     chartPivotHydrationEpoch
@@ -67209,6 +67228,12 @@ function useReport(reportIdArg, options = {}) {
   const tableColumnSettingsById = (0, import_react61.useMemo)(() => {
     const map = /* @__PURE__ */ new Map();
     const effectiveById = tableFormatMerge.formatByColumnOptionId;
+    const mergedColumnByField = /* @__PURE__ */ new Map();
+    for (const column of tableFormatMerge.columns) {
+      if (!mergedColumnByField.has(column.field)) {
+        mergedColumnByField.set(column.field, column);
+      }
+    }
     const chartColById = /* @__PURE__ */ new Map();
     if (isPivotTableChart && chart?.columns?.length) {
       for (const c of chart.columns) {
@@ -67289,9 +67314,8 @@ function useReport(reportIdArg, options = {}) {
         optionField
       );
       const effectiveFromId = effectiveById.get(columnId) ?? (encodedForMerge !== columnId ? effectiveById.get(encodedForMerge) : void 0) ?? "";
-      const mergeByFieldFormat = String(
-        tableFormatMerge.columns.find((c) => c.field === optionField)?.format ?? ""
-      ).trim();
+      const mergedByField = mergedColumnByField.get(optionField);
+      const mergeByFieldFormat = String(mergedByField?.format ?? "").trim();
       const columnPivotMeasureFormat = columnPivotMeasureFormatByAggregationField.get(optionField) ?? columnPivotMeasureFormatByAggregationField.get(columnId);
       const chartFallback = isPivotTableChart ? chartColById.get(columnId) ?? chartColById.get(encodedForMerge) ?? yAxisByField.get(optionField) ?? (columnPivotMeasureFormat ? {
         label: "",
@@ -67306,9 +67330,7 @@ function useReport(reportIdArg, options = {}) {
         isRowPivotCol ? rowAxisLabel : chartFallback?.label ?? ""
       ).trim();
       const persistedTableLabel = String(
-        tableFormatMerge.labelByColumnOptionId.get(columnId) ?? tableFormatMerge.columns.find(
-          (column) => column.field === optionField
-        )?.label ?? ""
+        tableFormatMerge.labelByColumnOptionId.get(columnId) ?? mergedByField?.label ?? ""
       ).trim();
       const resolvedColFormat = isRowPivotCol ? String(resolvedXAxisFormat ?? "").trim() || effectiveFromId || mergeByFieldFormat || fromDisplay || String(chartFallback?.format ?? "").trim() || "string" : fromDisplay || effectiveFromId || mergeByFieldFormat;
       map.set(columnId, {

package/dist/index.js

@@ -63883,6 +63883,31 @@ function useReport(reportIdArg, options = {}) {
     () => getSchemaForeignKeyMapping(schemaForReportBuilderState),
     [schemaForReportBuilderState]
   );
+  const datasourceJoinOptionsByTable = useMemo33(() => {
+    const tableNames = new Set(
+      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
+    );
+    const compatibleByTable = new Map(
+      Array.from(tableNames, (tableName) => [tableName, /* @__PURE__ */ new Set()])
+    );
+    for (const [tableName, mappings] of Object.entries(schemaForeignKeyMap)) {
+      if (!tableNames.has(tableName)) continue;
+      for (const mapping of mappings) {
+        const foreignTableName = String(mapping.foreignTable ?? "").trim();
+        if (!foreignTableName || foreignTableName === tableName || !tableNames.has(foreignTableName)) {
+          continue;
+        }
+        compatibleByTable.get(tableName)?.add(foreignTableName);
+        compatibleByTable.get(foreignTableName)?.add(tableName);
+      }
+    }
+    return new Map(
+      Array.from(compatibleByTable, ([tableName, compatibleTables]) => [
+        tableName,
+        Array.from(compatibleTables)
+      ])
+    );
+  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
   const reportBuilderBaseTableNamesKey = (sourceReport?.reportBuilderState?.tables ?? []).map((t) => String(t?.name ?? "").trim()).filter(Boolean).join("\0") ?? "";
   const selectedBaseTableNamesForFieldOptions = useMemo33(() => {
     const fromPicker = schemaDatasourceIds?.map((id) => String(id ?? "").trim()).filter(Boolean) ?? [];
@@ -63969,9 +63994,6 @@ function useReport(reportIdArg, options = {}) {
     queryColumnsBootstrapKey
   ]);
   const datasourceOptions = useMemo33(() => {
-    const tableNames = new Set(
-      schemaForReportBuilderState.map((table2) => String(table2.name ?? "").trim()).filter(Boolean)
-    );
     const seen = /* @__PURE__ */ new Set();
     const result = [];
     for (const table2 of schemaForReportBuilderState) {
@@ -63981,16 +64003,11 @@ function useReport(reportIdArg, options = {}) {
       result.push({
         value: name2,
         label: toTitleCaseLabel(name2),
-        joinOptions: getJoinCompatibleTableNames(
-          [name2],
-          schemaForeignKeyMap
-        ).filter(
-          (candidate) => candidate !== name2 && tableNames.has(candidate)
-        )
+        joinOptions: datasourceJoinOptionsByTable.get(name2) ?? []
       });
     }
     return result;
-  }, [schemaForReportBuilderState, schemaForeignKeyMap]);
+  }, [schemaForReportBuilderState, datasourceJoinOptionsByTable]);
   const queryBuilderFieldConfigByName = useMemo33(() => {
     const configByName = buildQueryBuilderFieldConfigByName(
       schemaForReportBuilderState
@@ -66488,14 +66505,16 @@ function useReport(reportIdArg, options = {}) {
     pivotRefreshQueryEnabled,
     effectiveReportId
   ]);
+  const settledPivotForChart = sourceReport?.pivot ?? null;
+  const settledSourceRowFieldForChart = String(
+    sourceReport?.pivotResultSourceRowField ?? settledPivotForChart?.rowField ?? ""
+  ).trim();
+  const pendingPivotChangesDimensions = Boolean(
+    sourceReport && pendingPivotRefresh && nextPivot && (settledSourceRowFieldForChart !== String(nextPivot.rowField ?? "").trim() || String(settledPivotForChart?.rowFieldTable ?? "").trim() !== String(nextPivot.rowFieldTable ?? "").trim() || String(settledPivotForChart?.columnField ?? "").trim() !== String(nextPivot.columnField ?? "").trim() || String(settledPivotForChart?.columnFieldTable ?? "").trim() !== String(nextPivot.columnFieldTable ?? "").trim())
+  );
   const chartData = useMemo33(() => {
     if (!sourceReport) return void 0;
     const rowsForChart = Array.isArray(sourceReport.rows) ? sourceReport.rows : [];
-    const settledPivot = sourceReport.pivot ?? null;
-    const settledSourceRowField = String(
-      sourceReport.pivotResultSourceRowField ?? settledPivot?.rowField ?? ""
-    ).trim();
-    const pendingPivotChangesDimensions = pendingPivotRefresh && Boolean(nextPivot) && (settledSourceRowField !== String(nextPivot?.rowField ?? "").trim() || String(settledPivot?.rowFieldTable ?? "").trim() !== String(nextPivot?.rowFieldTable ?? "").trim() || String(settledPivot?.columnField ?? "").trim() !== String(nextPivot?.columnField ?? "").trim() || String(settledPivot?.columnFieldTable ?? "").trim() !== String(nextPivot?.columnFieldTable ?? "").trim());
     const chartPivot = pendingPivotChangesDimensions ? sourceReport.pivot ?? null : nextPivot ?? (!chartPivotHydratedFromSourceRef.current ? sourceReport.pivot ?? null : null);
     const chartPivotForDisplay = chartPivot && sourceReport.pivotResultRowField && sourceReport.pivotResultSourceRowField === chartPivot.rowField ? {
       ...chartPivot,
@@ -66522,7 +66541,7 @@ function useReport(reportIdArg, options = {}) {
     sourceReport,
     chartType,
     nextPivot,
-    pendingPivotRefresh,
+    pendingPivotChangesDimensions,
     effectiveReportBuilderState,
     useInMemoryEngines,
     chartPivotHydrationEpoch
@@ -67421,6 +67440,12 @@ function useReport(reportIdArg, options = {}) {
   const tableColumnSettingsById = useMemo33(() => {
     const map = /* @__PURE__ */ new Map();
     const effectiveById = tableFormatMerge.formatByColumnOptionId;
+    const mergedColumnByField = /* @__PURE__ */ new Map();
+    for (const column of tableFormatMerge.columns) {
+      if (!mergedColumnByField.has(column.field)) {
+        mergedColumnByField.set(column.field, column);
+      }
+    }
     const chartColById = /* @__PURE__ */ new Map();
     if (isPivotTableChart && chart?.columns?.length) {
       for (const c of chart.columns) {
@@ -67501,9 +67526,8 @@ function useReport(reportIdArg, options = {}) {
         optionField
       );
       const effectiveFromId = effectiveById.get(columnId) ?? (encodedForMerge !== columnId ? effectiveById.get(encodedForMerge) : void 0) ?? "";
-      const mergeByFieldFormat = String(
-        tableFormatMerge.columns.find((c) => c.field === optionField)?.format ?? ""
-      ).trim();
+      const mergedByField = mergedColumnByField.get(optionField);
+      const mergeByFieldFormat = String(mergedByField?.format ?? "").trim();
       const columnPivotMeasureFormat = columnPivotMeasureFormatByAggregationField.get(optionField) ?? columnPivotMeasureFormatByAggregationField.get(columnId);
       const chartFallback = isPivotTableChart ? chartColById.get(columnId) ?? chartColById.get(encodedForMerge) ?? yAxisByField.get(optionField) ?? (columnPivotMeasureFormat ? {
         label: "",
@@ -67518,9 +67542,7 @@ function useReport(reportIdArg, options = {}) {
         isRowPivotCol ? rowAxisLabel : chartFallback?.label ?? ""
       ).trim();
       const persistedTableLabel = String(
-        tableFormatMerge.labelByColumnOptionId.get(columnId) ?? tableFormatMerge.columns.find(
-          (column) => column.field === optionField
-        )?.label ?? ""
+        tableFormatMerge.labelByColumnOptionId.get(columnId) ?? mergedByField?.label ?? ""
       ).trim();
       const resolvedColFormat = isRowPivotCol ? String(resolvedXAxisFormat ?? "").trim() || effectiveFromId || mergeByFieldFormat || fromDisplay || String(chartFallback?.format ?? "").trim() || "string" : fromDisplay || effectiveFromId || mergeByFieldFormat;
       map.set(columnId, {

package/package.json

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