@squadbase/vite-server 0.0.1-build-7 → 0.0.1-build-9

package/dist/cli/index.js

@@ -82,10 +82,11 @@ var init_interactive = __esm({
 // src/cli/index.ts
 import { parseArgs } from "util";
 import path4 from "path";
-import { readFile as readFile3 } from "fs/promises";
+import { readFile as readFile4 } from "fs/promises";
 
 // src/connector-client/registry.ts
 import { readFileSync, watch as fsWatch } from "fs";
+import { readFile } from "fs/promises";
 import path from "path";
 
 // src/connector-client/postgresql.ts
@@ -113,6 +114,11 @@ function resolveEnvVar(entry, key, connectionId) {
   }
   return value;
 }
+function resolveEnvVarOptional(entry, key) {
+  const envVarName = entry.envVars[key];
+  if (!envVarName) return void 0;
+  return process.env[envVarName] || void 0;
+}
 
 // src/connector-client/bigquery.ts
 function createBigQueryClient(entry, connectionId) {
@@ -124,7 +130,7 @@ function createBigQueryClient(entry, connectionId) {
     gcpCredentials = JSON.parse(serviceAccountJson);
   } catch {
     throw new Error(
-      `BigQuery service account JSON (decoded from base64) is not valid JSON for connection "${connectionId}"`
+      `BigQuery service account JSON (decoded from base64) is not valid JSON for connectionId "${connectionId}"`
     );
   }
   return {
@@ -181,26 +187,193 @@ function createSnowflakeClient(entry, connectionId) {
   };
 }
 
+// src/connector-client/mysql.ts
+function createMySQLClient(entry, connectionId) {
+  const connectionUrl = resolveEnvVar(entry, "connection-url", connectionId);
+  let poolPromise = null;
+  function getPool() {
+    if (!poolPromise) {
+      poolPromise = import("mysql2/promise").then(
+        (mysql) => mysql.default.createPool(connectionUrl)
+      );
+    }
+    return poolPromise;
+  }
+  return {
+    async query(sql, params) {
+      const pool = await getPool();
+      const [rows] = await pool.execute(sql, params);
+      return { rows };
+    }
+  };
+}
+
+// src/connector-client/aws-athena.ts
+function createAthenaClient(entry, connectionId) {
+  const region = resolveEnvVar(entry, "aws-region", connectionId);
+  const accessKeyId = resolveEnvVar(entry, "aws-access-key-id", connectionId);
+  const secretAccessKey = resolveEnvVar(entry, "aws-secret-access-key", connectionId);
+  const workgroup = resolveEnvVarOptional(entry, "workgroup") ?? "primary";
+  const outputLocation = resolveEnvVarOptional(entry, "output-location");
+  return {
+    async query(sql) {
+      const {
+        AthenaClient,
+        StartQueryExecutionCommand,
+        GetQueryExecutionCommand,
+        GetQueryResultsCommand
+      } = await import("@aws-sdk/client-athena");
+      const client = new AthenaClient({
+        region,
+        credentials: { accessKeyId, secretAccessKey }
+      });
+      const startParams = {
+        QueryString: sql,
+        WorkGroup: workgroup
+      };
+      if (outputLocation) {
+        startParams.ResultConfiguration = { OutputLocation: outputLocation };
+      }
+      const { QueryExecutionId } = await client.send(
+        new StartQueryExecutionCommand(startParams)
+      );
+      if (!QueryExecutionId) throw new Error("Athena: failed to start query execution");
+      while (true) {
+        const { QueryExecution } = await client.send(
+          new GetQueryExecutionCommand({ QueryExecutionId })
+        );
+        const state = QueryExecution?.Status?.State;
+        if (state === "SUCCEEDED") break;
+        if (state === "FAILED") {
+          throw new Error(
+            `Athena query failed: ${QueryExecution?.Status?.StateChangeReason ?? "unknown"}`
+          );
+        }
+        if (state === "CANCELLED") throw new Error("Athena query was cancelled");
+        await new Promise((r) => setTimeout(r, 500));
+      }
+      const { ResultSet } = await client.send(
+        new GetQueryResultsCommand({ QueryExecutionId })
+      );
+      const resultRows = ResultSet?.Rows ?? [];
+      if (resultRows.length === 0) return { rows: [] };
+      const headers = resultRows[0].Data?.map((d) => d.VarCharValue ?? "") ?? [];
+      const rows = resultRows.slice(1).map((row) => {
+        const obj = {};
+        row.Data?.forEach((d, i) => {
+          obj[headers[i]] = d.VarCharValue ?? null;
+        });
+        return obj;
+      });
+      return { rows };
+    }
+  };
+}
+
+// src/connector-client/redshift.ts
+function createRedshiftClient(entry, connectionId) {
+  const region = resolveEnvVar(entry, "aws-region", connectionId);
+  const accessKeyId = resolveEnvVar(entry, "aws-access-key-id", connectionId);
+  const secretAccessKey = resolveEnvVar(entry, "aws-secret-access-key", connectionId);
+  const database = resolveEnvVar(entry, "database", connectionId);
+  const clusterIdentifier = resolveEnvVarOptional(entry, "cluster-identifier");
+  const workgroupName = resolveEnvVarOptional(entry, "workgroup-name");
+  const secretArn = resolveEnvVarOptional(entry, "secret-arn");
+  const dbUser = resolveEnvVarOptional(entry, "db-user");
+  return {
+    async query(sql) {
+      const {
+        RedshiftDataClient,
+        ExecuteStatementCommand,
+        DescribeStatementCommand,
+        GetStatementResultCommand
+      } = await import("@aws-sdk/client-redshift-data");
+      const client = new RedshiftDataClient({
+        region,
+        credentials: { accessKeyId, secretAccessKey }
+      });
+      const executeParams = {
+        Sql: sql,
+        Database: database
+      };
+      if (clusterIdentifier) executeParams.ClusterIdentifier = clusterIdentifier;
+      if (workgroupName) executeParams.WorkgroupName = workgroupName;
+      if (secretArn) executeParams.SecretArn = secretArn;
+      if (dbUser) executeParams.DbUser = dbUser;
+      const { Id } = await client.send(
+        new ExecuteStatementCommand(executeParams)
+      );
+      if (!Id) throw new Error("Redshift: failed to start statement execution");
+      while (true) {
+        const desc = await client.send(new DescribeStatementCommand({ Id }));
+        const status = desc.Status;
+        if (status === "FINISHED") break;
+        if (status === "FAILED") {
+          throw new Error(`Redshift query failed: ${desc.Error ?? "unknown"}`);
+        }
+        if (status === "ABORTED") throw new Error("Redshift query was aborted");
+        await new Promise((r) => setTimeout(r, 500));
+      }
+      const result = await client.send(new GetStatementResultCommand({ Id }));
+      const columns = result.ColumnMetadata?.map((c) => c.name ?? "") ?? [];
+      const rows = (result.Records ?? []).map((record) => {
+        const obj = {};
+        record.forEach((field, i) => {
+          const col = columns[i];
+          const value = field.stringValue ?? field.longValue ?? field.doubleValue ?? field.booleanValue ?? (field.isNull ? null : field.blobValue ?? null);
+          obj[col] = value;
+        });
+        return obj;
+      });
+      return { rows };
+    }
+  };
+}
+
+// src/connector-client/databricks.ts
+function createDatabricksClient(entry, connectionId) {
+  const host = resolveEnvVar(entry, "host", connectionId);
+  const httpPath = resolveEnvVar(entry, "http-path", connectionId);
+  const token = resolveEnvVar(entry, "token", connectionId);
+  return {
+    async query(sql) {
+      const { DBSQLClient } = await import("@databricks/sql");
+      const client = new DBSQLClient();
+      await client.connect({ host, path: httpPath, token });
+      try {
+        const session = await client.openSession();
+        try {
+          const operation = await session.executeStatement(sql);
+          const result = await operation.fetchAll();
+          await operation.close();
+          return { rows: result };
+        } finally {
+          await session.close();
+        }
+      } finally {
+        await client.close();
+      }
+    }
+  };
+}
+
 // src/connector-client/registry.ts
 function createConnectorRegistry() {
-  let connectionsCache = null;
   const clientCache = /* @__PURE__ */ new Map();
   function getConnectionsFilePath() {
     return process.env.CONNECTIONS_PATH ?? path.join(process.cwd(), ".squadbase/connections.json");
   }
-  function loadConnections() {
-    if (connectionsCache !== null) return connectionsCache;
+  async function loadConnections2() {
     const filePath = getConnectionsFilePath();
     try {
-      const raw = readFileSync(filePath, "utf-8");
-      connectionsCache = JSON.parse(raw);
+      const raw = await readFile(filePath, "utf-8");
+      return JSON.parse(raw);
     } catch {
-      connectionsCache = {};
+      return {};
     }
-    return connectionsCache;
   }
   async function getClient2(connectionId) {
-    const connections = loadConnections();
+    const connections = await loadConnections2();
     const entry = connections[connectionId];
     if (!entry) {
       throw new Error(`connection '${connectionId}' not found in .squadbase/connections.json`);
@@ -214,6 +387,20 @@ function createConnectorRegistry() {
     if (connectorSlug === "bigquery") {
       return { client: createBigQueryClient(entry, connectionId), connectorSlug };
     }
+    if (connectorSlug === "athena") {
+      return { client: createAthenaClient(entry, connectionId), connectorSlug };
+    }
+    if (connectorSlug === "redshift") {
+      return { client: createRedshiftClient(entry, connectionId), connectorSlug };
+    }
+    if (connectorSlug === "databricks") {
+      return { client: createDatabricksClient(entry, connectionId), connectorSlug };
+    }
+    if (connectorSlug === "mysql") {
+      const client = createMySQLClient(entry, connectionId);
+      clientCache.set(connectionId, client);
+      return { client, connectorSlug };
+    }
     if (connectorSlug === "postgresql" || connectorSlug === "squadbase-db") {
       const urlEnvName = entry.envVars["connection-url"];
       if (!urlEnvName) {
@@ -230,7 +417,7 @@ function createConnectorRegistry() {
       return { client, connectorSlug };
     }
     throw new Error(
-      `connector type '${connectorSlug}' is not supported. Supported: "snowflake", "bigquery", "postgresql", "squadbase-db"`
+      `connector type '${connectorSlug}' is not supported as a SQL connector. Supported SQL types: "postgresql", "squadbase-db", "mysql", "snowflake", "bigquery", "athena", "redshift", "databricks". Non-SQL types (airtable, google-analytics, kintone, wix-store, dbt) should be used via TypeScript handlers.`
     );
   }
   function reloadEnvFile2(envPath) {
@@ -254,19 +441,18 @@ function createConnectorRegistry() {
     const envPath = path.join(process.cwd(), ".env");
     try {
       fsWatch(filePath, { persistent: false }, () => {
-        console.log("[connector-client] connections.json changed, clearing cache");
-        connectionsCache = null;
+        console.log("[connector-client] connections.json changed, clearing client cache");
         clientCache.clear();
         setImmediate(() => reloadEnvFile2(envPath));
       });
     } catch {
     }
   }
-  return { getClient: getClient2, reloadEnvFile: reloadEnvFile2, watchConnectionsFile: watchConnectionsFile2 };
+  return { getClient: getClient2, loadConnections: loadConnections2, reloadEnvFile: reloadEnvFile2, watchConnectionsFile: watchConnectionsFile2 };
 }
 
 // src/connector-client/index.ts
-var { getClient, reloadEnvFile, watchConnectionsFile } = createConnectorRegistry();
+var { getClient, loadConnections, reloadEnvFile, watchConnectionsFile } = createConnectorRegistry();
 
 // src/cli/env-loader.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -276,11 +462,11 @@ function loadEnvFile(envPath) {
 
 // src/cli/runner.ts
 import { pathToFileURL } from "url";
-import { readFile as readFile2, readdir as readdir2 } from "fs/promises";
+import { readFile as readFile3, readdir as readdir2 } from "fs/promises";
 import path3 from "path";
 
 // src/registry.ts
-import { readdir, readFile, mkdir } from "fs/promises";
+import { readdir, readFile as readFile2, mkdir } from "fs/promises";
 import { watch as fsWatch2 } from "fs";
 import path2 from "path";
 function buildQuery(queryTemplate, parameterMeta, runtimeParams) {
@@ -337,10 +523,10 @@ async function runSqlDataSource(slug, def, params, limit) {
   const start = Date.now();
   try {
     const { client, connectorSlug } = await getClient(def.connectionId);
-    const isExternal = connectorSlug === "snowflake" || connectorSlug === "bigquery";
+    const isLiteralConnector = connectorSlug === "snowflake" || connectorSlug === "bigquery" || connectorSlug === "athena" || connectorSlug === "redshift" || connectorSlug === "databricks";
     let queryText;
     let queryValues;
-    if (isExternal) {
+    if (isLiteralConnector) {
       const defaults = new Map(
         (def.parameters ?? []).map((p) => [p.name, p.default ?? null])
       );
@@ -351,6 +537,10 @@ async function runSqlDataSource(slug, def, params, limit) {
         return String(value);
       });
       queryValues = [];
+    } else if (connectorSlug === "mysql") {
+      const built = buildQuery(def.query, def.parameters ?? [], params);
+      queryText = built.text.replace(/\$(\d+)/g, "?");
+      queryValues = built.values;
     } else {
       const built = buildQuery(def.query, def.parameters ?? [], params);
       queryText = built.text;
@@ -414,7 +604,7 @@ async function runDataSource(slug, dirPath, params, limit) {
   const jsonPath = path3.join(dirPath, `${slug}.json`);
   let def;
   try {
-    const raw = await readFile2(jsonPath, "utf-8");
+    const raw = await readFile3(jsonPath, "utf-8");
     def = JSON.parse(raw);
   } catch {
     return {
@@ -620,7 +810,7 @@ Total: ${results.length}, Failed: ${failed}`);
       const jsonPath = path4.join(dirPath, `${slug}.json`);
       let paramMeta = [];
       try {
-        const raw = await readFile3(jsonPath, "utf-8");
+        const raw = await readFile4(jsonPath, "utf-8");
         const def = JSON.parse(raw);
         paramMeta = def.parameters ?? [];
       } catch {

package/dist/index.d.ts

@@ -1,6 +1,131 @@
 import * as hono_types from 'hono/types';
 import { Hono } from 'hono';
 
+interface DatabaseClient {
+    query(sql: string, params?: unknown[]): Promise<{
+        rows: Record<string, unknown>[];
+    }>;
+}
+interface ConnectionEntry {
+    connector: {
+        slug: string;
+        authType?: string | null;
+    };
+    envVars: Record<string, string>;
+}
+type ConnectionsMap = Record<string, ConnectionEntry>;
+
+interface AirtableClient {
+    listRecords(tableIdOrName: string, options?: {
+        fields?: string[];
+        filterByFormula?: string;
+        maxRecords?: number;
+        sort?: {
+            field: string;
+            direction?: "asc" | "desc";
+        }[];
+        pageSize?: number;
+        offset?: string;
+    }): Promise<{
+        records: AirtableRecord[];
+        offset?: string;
+    }>;
+    getRecord(tableIdOrName: string, recordId: string): Promise<AirtableRecord>;
+}
+interface AirtableRecord {
+    id: string;
+    fields: Record<string, unknown>;
+    createdTime: string;
+}
+declare function createAirtableClient(entry: ConnectionEntry, slug: string): AirtableClient;
+
+interface GoogleAnalyticsClient {
+    runReport(request: {
+        dateRanges: {
+            startDate: string;
+            endDate: string;
+        }[];
+        dimensions?: {
+            name: string;
+        }[];
+        metrics: {
+            name: string;
+        }[];
+        limit?: number;
+        offset?: number;
+        orderBys?: unknown[];
+    }): Promise<{
+        rows: {
+            dimensionValues: {
+                value: string;
+            }[];
+            metricValues: {
+                value: string;
+            }[];
+        }[];
+        rowCount: number;
+    }>;
+}
+declare function createGoogleAnalyticsClient(entry: ConnectionEntry, slug: string): GoogleAnalyticsClient;
+
+interface KintoneClient {
+    getRecords(appId: string | number, options?: {
+        query?: string;
+        fields?: string[];
+        totalCount?: boolean;
+    }): Promise<{
+        records: Record<string, unknown>[];
+        totalCount: string | null;
+    }>;
+    getRecord(appId: string | number, recordId: string | number): Promise<{
+        record: Record<string, unknown>;
+    }>;
+    listApps(options?: {
+        ids?: (string | number)[];
+        name?: string;
+        limit?: number;
+        offset?: number;
+    }): Promise<{
+        apps: Record<string, unknown>[];
+    }>;
+}
+declare function createKintoneClient(entry: ConnectionEntry, slug: string): KintoneClient;
+
+interface WixStoreClient {
+    queryProducts(options?: {
+        query?: Record<string, unknown>;
+        limit?: number;
+        offset?: number;
+    }): Promise<{
+        products: Record<string, unknown>[];
+        totalResults: number;
+    }>;
+    queryOrders(options?: {
+        query?: Record<string, unknown>;
+        limit?: number;
+        offset?: number;
+    }): Promise<{
+        orders: Record<string, unknown>[];
+        totalResults: number;
+    }>;
+}
+declare function createWixStoreClient(entry: ConnectionEntry, slug: string): WixStoreClient;
+
+interface DbtClient {
+    query(graphqlQuery: string, variables?: Record<string, unknown>): Promise<Record<string, unknown>>;
+    getModels(options?: {
+        limit?: number;
+    }): Promise<Record<string, unknown>[]>;
+    getModelByName(uniqueId: string): Promise<Record<string, unknown> | null>;
+}
+declare function createDbtClient(entry: ConnectionEntry, slug: string): DbtClient;
+
+declare const getClient: (connectionId: string) => Promise<{
+    client: DatabaseClient;
+    connectorSlug: string;
+}>;
+declare const loadConnections: () => Promise<ConnectionsMap>;
+
 declare const app: Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">;
 
-export { app as default };
+export { type AirtableClient, type AirtableRecord, type ConnectionEntry, type ConnectionsMap, type DatabaseClient, type DbtClient, type GoogleAnalyticsClient, type KintoneClient, type WixStoreClient, createAirtableClient, createDbtClient, createGoogleAnalyticsClient, createKintoneClient, createWixStoreClient, app as default, getClient, loadConnections };