@squadbase/vite-server 0.1.17-dev.24af54e → 0.1.17-dev.3b633bb

package/dist/connectors/powerbi-oauth.js

@@ -256,19 +256,34 @@ async function runSetupFlow(flow, params, ctx, config) {
   };
   let state = flow.initialState();
   let answerIdx = 0;
+  const pendingParameterUpdates = [];
   for (const step of flow.steps) {
     const ans = ctx.answers[answerIdx];
     if (ans && ans.questionSlug === step.slug) {
       state = step.applyAnswer(state, ans.answer);
+      if (step.toParameterUpdates) {
+        pendingParameterUpdates.push(...step.toParameterUpdates(state));
+      }
       answerIdx += 1;
       continue;
     }
+    const resolvedAllowFreeText = step.allowFreeText !== void 0 ? step.allowFreeText : true;
     if (step.type === "text") {
+      if (step.fetchOptions) {
+        const options2 = await step.fetchOptions(state, runtime);
+        if (options2.length === 0) {
+          continue;
+        }
+      }
       return {
         type: "nextQuestion",
         questionSlug: step.slug,
         question: step.question[ctx.language],
-        questionType: "text"
+        questionType: "text",
+        allowFreeText: resolvedAllowFreeText,
+        ...pendingParameterUpdates.length > 0 && {
+          parameterUpdates: pendingParameterUpdates
+        }
       };
     }
     const options = step.fetchOptions ? await step.fetchOptions(state, runtime) : [];
@@ -280,11 +295,21 @@ async function runSetupFlow(flow, params, ctx, config) {
       questionSlug: step.slug,
       question: step.question[ctx.language],
       questionType: step.type,
-      options
+      options,
+      allowFreeText: resolvedAllowFreeText,
+      ...pendingParameterUpdates.length > 0 && {
+        parameterUpdates: pendingParameterUpdates
+      }
     };
   }
   const dataInvestigationResult = await flow.finalize(state, runtime);
-  return { type: "fulfilled", dataInvestigationResult };
+  return {
+    type: "fulfilled",
+    dataInvestigationResult,
+    ...pendingParameterUpdates.length > 0 && {
+      parameterUpdates: pendingParameterUpdates
+    }
+  };
 }
 async function resolveSetupSelection(params) {
   const { selected, allSentinel, fetchAll, limit } = params;
@@ -489,6 +514,10 @@ function apiFetch(proxyFetch, path2, init) {
 
 // ../connectors/src/connectors/powerbi-oauth/setup-flow.ts
 var ALL_WORKSPACES = "__ALL_WORKSPACES__";
+var MY_WORKSPACE = "__MY_WORKSPACE__";
+var ALL_DATASETS = "__ALL_DATASETS__";
+var ALL_REPORTS = "__ALL_REPORTS__";
+var ALL_DASHBOARDS = "__ALL_DASHBOARDS__";
 var POWERBI_SETUP_MAX_WORKSPACES = 10;
 var RESOURCE_DISPLAY_LIMIT = 25;
 var RESOURCE_DATASETS = "datasets";
@@ -504,14 +533,12 @@ async function listGroups(proxyFetch) {
   return data.value ?? [];
 }
 async function listResource(proxyFetch, groupId, resource) {
-  const res = await apiFetch(
-    proxyFetch,
-    `/groups/${encodeURIComponent(groupId)}/${resource}`
-  );
+  const path2 = groupId === MY_WORKSPACE ? `/${resource}` : `/groups/${encodeURIComponent(groupId)}/${resource}`;
+  const res = await apiFetch(proxyFetch, path2);
   if (!res.ok) {
     const body = await res.text().catch(() => res.statusText);
     throw new Error(
-      `powerbi: list ${resource} for group ${groupId} failed (${res.status}): ${body}`
+      `powerbi: list ${resource} for ${groupId === MY_WORKSPACE ? "My workspace" : `group ${groupId}`} failed (${res.status}): ${body}`
     );
   }
   const data = await res.json();
@@ -520,6 +547,99 @@ async function listResource(proxyFetch, groupId, resource) {
 function resourceLabel(r) {
   return r.name ?? r.displayName ?? r.id ?? "(unknown)";
 }
+var INTERNAL_TABLE_PREFIXES = [
+  "DateTableTemplate_",
+  "LocalDateTable_"
+];
+function isInternalColumn(name) {
+  return /^RowNumber-[0-9A-Fa-f-]+$/.test(name);
+}
+async function fetchDatasetSchema(proxyFetch, wsId, datasetId) {
+  const pathPrefix = wsId === MY_WORKSPACE ? "" : `/groups/${encodeURIComponent(wsId)}`;
+  const daxQuery = 'EVALUATE SELECTCOLUMNS(COLUMNSTATISTICS(), "T", [Table Name], "C", [Column Name])';
+  const res = await apiFetch(
+    proxyFetch,
+    `${pathPrefix}/datasets/${encodeURIComponent(datasetId)}/executeQueries`,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        queries: [{ query: daxQuery }],
+        serializerSettings: { includeNulls: true }
+      })
+    }
+  );
+  if (!res.ok) return /* @__PURE__ */ new Map();
+  const data = await res.json();
+  const rows = data.results?.[0]?.tables?.[0]?.rows ?? [];
+  const schema = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const table = row["[T]"] ?? "";
+    const column = row["[C]"] ?? "";
+    if (!table || !column) continue;
+    if (INTERNAL_TABLE_PREFIXES.some((p) => table.startsWith(p))) continue;
+    if (isInternalColumn(column)) continue;
+    if (!schema.has(table)) schema.set(table, []);
+    schema.get(table).push(column);
+  }
+  return schema;
+}
+function workspaceName(wsId, groupById, language) {
+  if (wsId === MY_WORKSPACE) {
+    return language === "ja" ? "\u30DE\u30A4 \u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9" : "My workspace";
+  }
+  return groupById.get(wsId)?.name ?? wsId;
+}
+async function resolveWorkspaceIds(selected, proxyFetch) {
+  return resolveSetupSelection({
+    selected,
+    allSentinel: ALL_WORKSPACES,
+    fetchAll: async () => {
+      const groups = await listGroups(proxyFetch);
+      return [MY_WORKSPACE, ...groups.map((g) => g.id).filter(Boolean)];
+    },
+    limit: POWERBI_SETUP_MAX_WORKSPACES
+  });
+}
+function compoundKey(wsId, objectId) {
+  return `${wsId}:${objectId}`;
+}
+function parseCompoundKey(key) {
+  const idx = key.indexOf(":");
+  if (idx < 0) return { wsId: "", objectId: key };
+  return { wsId: key.slice(0, idx), objectId: key.slice(idx + 1) };
+}
+async function fetchObjectOptions(state, resource, allSentinel, allLabelJa, allLabelEn, rt) {
+  if (!state.workspaces?.length || !state.resources?.includes(resource))
+    return [];
+  const wsIds = await resolveWorkspaceIds(
+    state.workspaces,
+    rt.config.proxyFetch
+  );
+  const allGroups = await listGroups(rt.config.proxyFetch);
+  const groupById = new Map(allGroups.map((g) => [g.id, g]));
+  const multiWorkspace = wsIds.length > 1;
+  const options = [];
+  for (const wsId of wsIds) {
+    const wsLabel = workspaceName(wsId, groupById, rt.language);
+    const items = await listResource(rt.config.proxyFetch, wsId, resource);
+    for (const item of items) {
+      if (!item.id) continue;
+      options.push({
+        value: compoundKey(wsId, item.id),
+        label: multiWorkspace ? `${wsLabel} / ${resourceLabel(item)}` : resourceLabel(item)
+      });
+    }
+  }
+  if (options.length === 0) return [];
+  return [
+    {
+      value: allSentinel,
+      label: rt.language === "ja" ? allLabelJa : allLabelEn
+    },
+    ...options
+  ];
+}
 var powerbiOauthSetupFlow = {
   initialState: () => ({}),
   steps: [
@@ -538,6 +658,10 @@ var powerbiOauthSetupFlow = {
             value: ALL_WORKSPACES,
             label: rt.language === "ja" ? "\u3059\u3079\u3066\u306E\u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9" : "All workspaces"
           },
+          {
+            value: MY_WORKSPACE,
+            label: rt.language === "ja" ? "\u30DE\u30A4 \u30EF\u30FC\u30AF\u30B9\u30DA\u30FC\u30B9" : "My workspace"
+          },
           ...options
         ];
       },
@@ -552,16 +676,82 @@ var powerbiOauthSetupFlow = {
       },
       async fetchOptions(state, rt) {
         if (!state.workspaces?.length) return [];
-        const datasetsLabel = rt.language === "ja" ? "\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8" : "Datasets";
-        const reportsLabel = rt.language === "ja" ? "\u30EC\u30DD\u30FC\u30C8" : "Reports";
-        const dashboardsLabel = rt.language === "ja" ? "\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9" : "Dashboards";
         return [
-          { value: RESOURCE_DATASETS, label: datasetsLabel },
-          { value: RESOURCE_REPORTS, label: reportsLabel },
-          { value: RESOURCE_DASHBOARDS, label: dashboardsLabel }
+          {
+            value: RESOURCE_DATASETS,
+            label: rt.language === "ja" ? "\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8" : "Datasets"
+          },
+          {
+            value: RESOURCE_REPORTS,
+            label: rt.language === "ja" ? "\u30EC\u30DD\u30FC\u30C8" : "Reports"
+          },
+          {
+            value: RESOURCE_DASHBOARDS,
+            label: rt.language === "ja" ? "\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9" : "Dashboards"
+          }
         ];
       },
       applyAnswer: (state, answer) => ({ ...state, resources: answer })
+    },
+    {
+      slug: "datasets",
+      type: "multiSelect",
+      question: {
+        ja: "\u4F7F\u7528\u3059\u308B\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select the datasets you want to use (multi-select allowed)"
+      },
+      async fetchOptions(state, rt) {
+        return fetchObjectOptions(
+          state,
+          RESOURCE_DATASETS,
+          ALL_DATASETS,
+          "\u3059\u3079\u3066\u306E\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8",
+          "All datasets",
+          rt
+        );
+      },
+      applyAnswer: (state, answer) => ({ ...state, selectedDatasets: answer })
+    },
+    {
+      slug: "reports",
+      type: "multiSelect",
+      question: {
+        ja: "\u4F7F\u7528\u3059\u308B\u30EC\u30DD\u30FC\u30C8\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select the reports you want to use (multi-select allowed)"
+      },
+      async fetchOptions(state, rt) {
+        return fetchObjectOptions(
+          state,
+          RESOURCE_REPORTS,
+          ALL_REPORTS,
+          "\u3059\u3079\u3066\u306E\u30EC\u30DD\u30FC\u30C8",
+          "All reports",
+          rt
+        );
+      },
+      applyAnswer: (state, answer) => ({ ...state, selectedReports: answer })
+    },
+    {
+      slug: "dashboards",
+      type: "multiSelect",
+      question: {
+        ja: "\u4F7F\u7528\u3059\u308B\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u3092\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u8907\u6570\u9078\u629E\u53EF\uFF09",
+        en: "Select the dashboards you want to use (multi-select allowed)"
+      },
+      async fetchOptions(state, rt) {
+        return fetchObjectOptions(
+          state,
+          RESOURCE_DASHBOARDS,
+          ALL_DASHBOARDS,
+          "\u3059\u3079\u3066\u306E\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9",
+          "All dashboards",
+          rt
+        );
+      },
+      applyAnswer: (state, answer) => ({
+        ...state,
+        selectedDashboards: answer
+      })
     }
   ],
   async finalize(state, rt) {
@@ -570,37 +760,119 @@ var powerbiOauthSetupFlow = {
     }
     const allGroups = await listGroups(rt.config.proxyFetch);
     const groupById = new Map(allGroups.map((g) => [g.id, g]));
-    const targetIds = await resolveSetupSelection({
-      selected: state.workspaces,
-      allSentinel: ALL_WORKSPACES,
-      fetchAll: async () => allGroups.map((g) => g.id).filter((id) => id),
-      limit: POWERBI_SETUP_MAX_WORKSPACES
-    });
+    const wsIds = await resolveWorkspaceIds(
+      state.workspaces,
+      rt.config.proxyFetch
+    );
     const selectedResources = new Set(state.resources);
+    async function resolveObjects(selected, allSentinel, resource) {
+      const byWorkspace = /* @__PURE__ */ new Map();
+      if (!selected || !selectedResources.has(resource)) return byWorkspace;
+      if (selected.includes(allSentinel)) {
+        for (const wsId of wsIds) {
+          const items = await listResource(
+            rt.config.proxyFetch,
+            wsId,
+            resource
+          );
+          const ids = items.map((i) => i.id).filter((id) => !!id);
+          if (ids.length > 0) byWorkspace.set(wsId, new Set(ids));
+        }
+      } else {
+        for (const key of selected) {
+          if (key === allSentinel) continue;
+          const { wsId, objectId } = parseCompoundKey(key);
+          if (!byWorkspace.has(wsId)) byWorkspace.set(wsId, /* @__PURE__ */ new Set());
+          byWorkspace.get(wsId).add(objectId);
+        }
+      }
+      return byWorkspace;
+    }
+    const datasetsByWs = await resolveObjects(
+      state.selectedDatasets,
+      ALL_DATASETS,
+      RESOURCE_DATASETS
+    );
+    const reportsByWs = await resolveObjects(
+      state.selectedReports,
+      ALL_REPORTS,
+      RESOURCE_REPORTS
+    );
+    const dashboardsByWs = await resolveObjects(
+      state.selectedDashboards,
+      ALL_DASHBOARDS,
+      RESOURCE_DASHBOARDS
+    );
+    const allWsIds = /* @__PURE__ */ new Set([
+      ...datasetsByWs.keys(),
+      ...reportsByWs.keys(),
+      ...dashboardsByWs.keys()
+    ]);
     const sections = ["## Power BI", ""];
-    if (!targetIds.length) {
-      sections.push("_No workspaces selected._", "");
+    if (allWsIds.size === 0) {
+      sections.push("_No resources selected._", "");
       return sections.join("\n");
     }
-    for (const id of targetIds) {
-      const group = groupById.get(id);
-      const name = group?.name ?? id;
-      sections.push(`### Workspace: ${name}`, "", `- id: \`${id}\``);
-      for (const resource of [
-        RESOURCE_DATASETS,
-        RESOURCE_REPORTS,
-        RESOURCE_DASHBOARDS
+    for (const wsId of wsIds) {
+      if (!allWsIds.has(wsId)) continue;
+      const name = workspaceName(wsId, groupById, rt.language);
+      sections.push(`### Workspace: ${name}`, "");
+      if (wsId !== MY_WORKSPACE) {
+        sections.push(`- id: \`${wsId}\``);
+      }
+      const datasetIds = datasetsByWs.get(wsId);
+      if (datasetIds?.size) {
+        const items = await listResource(
+          rt.config.proxyFetch,
+          wsId,
+          RESOURCE_DATASETS
+        );
+        const filtered = items.filter(
+          (item) => item.id && datasetIds.has(item.id)
+        );
+        for (const item of filtered.slice(0, RESOURCE_DISPLAY_LIMIT)) {
+          sections.push(`#### Dataset: ${resourceLabel(item)}`, "");
+          const schema = await fetchDatasetSchema(
+            rt.config.proxyFetch,
+            wsId,
+            item.id
+          );
+          if (schema.size > 0) {
+            for (const [table, columns] of schema) {
+              sections.push(`##### Table: ${table}`, "");
+              sections.push("| Column |");
+              sections.push("|--------|");
+              for (const col of columns) {
+                sections.push(`| ${col} |`);
+              }
+              sections.push("");
+            }
+          } else {
+            sections.push("_Schema not available._", "");
+          }
+        }
+      }
+      for (const [resource, selectedByWs, heading] of [
+        [RESOURCE_REPORTS, reportsByWs, "Reports"],
+        [RESOURCE_DASHBOARDS, dashboardsByWs, "Dashboards"]
       ]) {
-        if (!selectedResources.has(resource)) continue;
-        const items = await listResource(rt.config.proxyFetch, id, resource);
-        const heading = resource === RESOURCE_DATASETS ? "Datasets" : resource === RESOURCE_REPORTS ? "Reports" : "Dashboards";
-        sections.push(`- ${heading} (${items.length}):`);
-        for (const item of items.slice(0, RESOURCE_DISPLAY_LIMIT)) {
+        const selectedIds = selectedByWs.get(wsId);
+        if (!selectedIds?.size) continue;
+        const items = await listResource(
+          rt.config.proxyFetch,
+          wsId,
+          resource
+        );
+        const filtered = items.filter(
+          (item) => item.id && selectedIds.has(item.id)
+        );
+        sections.push(`- ${heading} (${filtered.length}):`);
+        for (const item of filtered.slice(0, RESOURCE_DISPLAY_LIMIT)) {
           sections.push(`  - ${resourceLabel(item)}`);
         }
-        if (items.length > RESOURCE_DISPLAY_LIMIT) {
+        if (filtered.length > RESOURCE_DISPLAY_LIMIT) {
           sections.push(
-            `  - \u2026and ${items.length - RESOURCE_DISPLAY_LIMIT} more`
+            `  - \u2026and ${filtered.length - RESOURCE_DISPLAY_LIMIT} more`
           );
         }
       }

package/dist/connectors/salesforce.js

@@ -397,19 +397,34 @@ async function runSetupFlow(flow, params, ctx, config) {
   };
   let state = flow.initialState();
   let answerIdx = 0;
+  const pendingParameterUpdates = [];
   for (const step of flow.steps) {
     const ans = ctx.answers[answerIdx];
     if (ans && ans.questionSlug === step.slug) {
       state = step.applyAnswer(state, ans.answer);
+      if (step.toParameterUpdates) {
+        pendingParameterUpdates.push(...step.toParameterUpdates(state));
+      }
       answerIdx += 1;
       continue;
     }
+    const resolvedAllowFreeText = step.allowFreeText !== void 0 ? step.allowFreeText : true;
     if (step.type === "text") {
+      if (step.fetchOptions) {
+        const options2 = await step.fetchOptions(state, runtime);
+        if (options2.length === 0) {
+          continue;
+        }
+      }
       return {
         type: "nextQuestion",
         questionSlug: step.slug,
         question: step.question[ctx.language],
-        questionType: "text"
+        questionType: "text",
+        allowFreeText: resolvedAllowFreeText,
+        ...pendingParameterUpdates.length > 0 && {
+          parameterUpdates: pendingParameterUpdates
+        }
       };
     }
     const options = step.fetchOptions ? await step.fetchOptions(state, runtime) : [];
@@ -421,11 +436,21 @@ async function runSetupFlow(flow, params, ctx, config) {
       questionSlug: step.slug,
       question: step.question[ctx.language],
       questionType: step.type,
-      options
+      options,
+      allowFreeText: resolvedAllowFreeText,
+      ...pendingParameterUpdates.length > 0 && {
+        parameterUpdates: pendingParameterUpdates
+      }
     };
   }
   const dataInvestigationResult = await flow.finalize(state, runtime);
-  return { type: "fulfilled", dataInvestigationResult };
+  return {
+    type: "fulfilled",
+    dataInvestigationResult,
+    ...pendingParameterUpdates.length > 0 && {
+      parameterUpdates: pendingParameterUpdates
+    }
+  };
 }
 async function resolveSetupSelection(params) {
   const { selected, allSentinel, fetchAll, limit } = params;