@squadbase/vite-server 0.0.1-build-1 → 0.0.1-build-2

package/dist/main.js

@@ -37,6 +37,11 @@ function resolveEnvVar(entry, key, slug) {
   }
   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, slug) {
@@ -105,6 +110,176 @@ function createSnowflakeClient(entry, slug) {
   };
 }
 
+// src/connector-client/mysql.ts
+function createMySQLClient(entry, slug) {
+  const connectionUrl = resolveEnvVar(entry, "connection-url", slug);
+  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, slug) {
+  const region = resolveEnvVar(entry, "aws-region", slug);
+  const accessKeyId = resolveEnvVar(entry, "aws-access-key-id", slug);
+  const secretAccessKey = resolveEnvVar(entry, "aws-secret-access-key", slug);
+  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, slug) {
+  const region = resolveEnvVar(entry, "aws-region", slug);
+  const accessKeyId = resolveEnvVar(entry, "aws-access-key-id", slug);
+  const secretAccessKey = resolveEnvVar(entry, "aws-secret-access-key", slug);
+  const database = resolveEnvVar(entry, "database", slug);
+  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, slug) {
+  const host = resolveEnvVar(entry, "host", slug);
+  const httpPath = resolveEnvVar(entry, "http-path", slug);
+  const token = resolveEnvVar(entry, "token", slug);
+  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;
@@ -112,7 +287,7 @@ function createConnectorRegistry() {
   function getConnectionsFilePath() {
     return process.env.CONNECTIONS_PATH ?? path.join(process.cwd(), "../../.squadbase/connections.json");
   }
-  function loadConnections() {
+  function loadConnections2() {
     if (connectionsCache !== null) return connectionsCache;
     const filePath = getConnectionsFilePath();
     try {
@@ -136,7 +311,7 @@ function createConnectorRegistry() {
     }
     const cached = clientCache.get(connectorSlug);
     if (cached) return cached;
-    const connections = loadConnections();
+    const connections = loadConnections2();
     const entry = connections[connectorSlug];
     if (!entry) {
       throw new Error(`connector slug '${connectorSlug}' not found in .squadbase/connections.json`);
@@ -153,6 +328,20 @@ function createConnectorRegistry() {
     if (resolvedType === "bigquery") {
       return createBigQueryClient(entry, connectorSlug);
     }
+    if (resolvedType === "athena") {
+      return createAthenaClient(entry, connectorSlug);
+    }
+    if (resolvedType === "redshift") {
+      return createRedshiftClient(entry, connectorSlug);
+    }
+    if (resolvedType === "databricks") {
+      return createDatabricksClient(entry, connectorSlug);
+    }
+    if (resolvedType === "mysql") {
+      const client = createMySQLClient(entry, connectorSlug);
+      clientCache.set(connectorSlug, client);
+      return client;
+    }
     if (resolvedType === "postgresql" || resolvedType === "squadbase-db") {
       const urlEnvName = entry.envVars["connection-url"];
       if (!urlEnvName) {
@@ -169,7 +358,7 @@ function createConnectorRegistry() {
       return client;
     }
     throw new Error(
-      `connector type '${resolvedType}' is not supported. Supported: "snowflake", "bigquery", "postgresql", "squadbase-db"`
+      `connector type '${resolvedType}' 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) {
@@ -201,11 +390,11 @@ function createConnectorRegistry() {
     } 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/registry.ts
 var dataSources = /* @__PURE__ */ new Map();
@@ -308,10 +497,10 @@ async function initialize() {
           cacheConfig: sqlDef.cache,
           handler: async (runtimeParams) => {
             const client = await getClient(sqlDef.connectorSlug, sqlDef.connectorType);
-            const isExternalConnector = sqlDef.connectorType === "snowflake" || sqlDef.connectorType === "bigquery";
+            const isLiteralConnector = sqlDef.connectorType === "snowflake" || sqlDef.connectorType === "bigquery" || sqlDef.connectorType === "athena" || sqlDef.connectorType === "redshift" || sqlDef.connectorType === "databricks";
             let queryText;
             let queryValues;
-            if (isExternalConnector) {
+            if (isLiteralConnector) {
               const defaults = new Map(
                 (sqlDef.parameters ?? []).map((p) => [p.name, p.default ?? null])
               );
@@ -329,6 +518,14 @@ async function initialize() {
                 }
               );
               queryValues = [];
+            } else if (sqlDef.connectorType === "mysql") {
+              const built = buildQuery(
+                sqlDef.query,
+                sqlDef.parameters ?? [],
+                runtimeParams
+              );
+              queryText = built.text.replace(/\$(\d+)/g, "?");
+              queryValues = built.values;
             } else {
               const built = buildQuery(
                 sqlDef.query,

package/dist/types/data-source.d.ts

@@ -7,14 +7,14 @@ interface ParameterMeta {
 }
 interface DataSourceCacheConfig {
     /**
-     * キャッシュの有効期間（秒）。
-     * 0 または未指定の場合はキャッシュしない（後方互換性を保つデフォルト動作）。
+     * Cache TTL in seconds.
+     * 0 or unset means no caching (default behavior for backward compatibility).
      */
     ttl: number;
     /**
-     * true の場合、TTL 期限切れ後も古いデータを即座に返しつつ、
-     * バックグラウンドで新しいデータを非同期取得してキャッシュを更新する。
-     * デフォルト: false
+     * When true, stale data is returned immediately after TTL expiry
+     * while fresh data is fetched asynchronously in the background to update the cache.
+     * Default: false
      */
     staleWhileRevalidate?: boolean;
 }

package/dist/vite-plugin.js

@@ -37,6 +37,11 @@ function resolveEnvVar(entry, key, slug) {
   }
   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, slug) {
@@ -105,6 +110,176 @@ function createSnowflakeClient(entry, slug) {
   };
 }
 
+// src/connector-client/mysql.ts
+function createMySQLClient(entry, slug) {
+  const connectionUrl = resolveEnvVar(entry, "connection-url", slug);
+  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, slug) {
+  const region = resolveEnvVar(entry, "aws-region", slug);
+  const accessKeyId = resolveEnvVar(entry, "aws-access-key-id", slug);
+  const secretAccessKey = resolveEnvVar(entry, "aws-secret-access-key", slug);
+  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, slug) {
+  const region = resolveEnvVar(entry, "aws-region", slug);
+  const accessKeyId = resolveEnvVar(entry, "aws-access-key-id", slug);
+  const secretAccessKey = resolveEnvVar(entry, "aws-secret-access-key", slug);
+  const database = resolveEnvVar(entry, "database", slug);
+  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, slug) {
+  const host = resolveEnvVar(entry, "host", slug);
+  const httpPath = resolveEnvVar(entry, "http-path", slug);
+  const token = resolveEnvVar(entry, "token", slug);
+  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;
@@ -112,7 +287,7 @@ function createConnectorRegistry() {
   function getConnectionsFilePath() {
     return process.env.CONNECTIONS_PATH ?? path.join(process.cwd(), "../../.squadbase/connections.json");
   }
-  function loadConnections() {
+  function loadConnections2() {
     if (connectionsCache !== null) return connectionsCache;
     const filePath = getConnectionsFilePath();
     try {
@@ -136,7 +311,7 @@ function createConnectorRegistry() {
     }
     const cached = clientCache.get(connectorSlug);
     if (cached) return cached;
-    const connections = loadConnections();
+    const connections = loadConnections2();
     const entry = connections[connectorSlug];
     if (!entry) {
       throw new Error(`connector slug '${connectorSlug}' not found in .squadbase/connections.json`);
@@ -153,6 +328,20 @@ function createConnectorRegistry() {
     if (resolvedType === "bigquery") {
       return createBigQueryClient(entry, connectorSlug);
     }
+    if (resolvedType === "athena") {
+      return createAthenaClient(entry, connectorSlug);
+    }
+    if (resolvedType === "redshift") {
+      return createRedshiftClient(entry, connectorSlug);
+    }
+    if (resolvedType === "databricks") {
+      return createDatabricksClient(entry, connectorSlug);
+    }
+    if (resolvedType === "mysql") {
+      const client = createMySQLClient(entry, connectorSlug);
+      clientCache.set(connectorSlug, client);
+      return client;
+    }
     if (resolvedType === "postgresql" || resolvedType === "squadbase-db") {
       const urlEnvName = entry.envVars["connection-url"];
       if (!urlEnvName) {
@@ -169,7 +358,7 @@ function createConnectorRegistry() {
       return client;
     }
     throw new Error(
-      `connector type '${resolvedType}' is not supported. Supported: "snowflake", "bigquery", "postgresql", "squadbase-db"`
+      `connector type '${resolvedType}' 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) {
@@ -201,11 +390,11 @@ function createConnectorRegistry() {
     } 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/registry.ts
 var viteServer = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squadbase/vite-server",
-  "version": "0.0.1-build-1",
+  "version": "0.0.1-build-2",
   "type": "module",
   "exports": {
     ".": {
@@ -30,14 +30,21 @@
   "scripts": {
     "cli": "tsx src/cli/index.ts",
     "build": "tsup && pnpm run build:cli",
-    "build:cli": "tsup src/cli/index.ts --out-dir dist/cli --format esm --platform node --no-splitting --external pg --external snowflake-sdk --external @google-cloud/bigquery --external hono --external @clack/prompts"
+    "build:cli": "tsup src/cli/index.ts --out-dir dist/cli --format esm --platform node --no-splitting --external pg --external snowflake-sdk --external @google-cloud/bigquery --external mysql2 --external @aws-sdk/client-athena --external @aws-sdk/client-redshift-data --external @databricks/sql --external @google-analytics/data --external @kintone/rest-api-client --external hono --external @clack/prompts"
   },
   "dependencies": {
+    "@aws-sdk/client-athena": "^3.750.0",
+    "@aws-sdk/client-redshift-data": "^3.750.0",
+    "@databricks/sql": "^1.8.0",
+
+    "@google-analytics/data": "^4.8.0",
     "@google-cloud/bigquery": "^7.9.4",
     "@hono/node-server": "^1.19.9",
     "@hono/vite-build": "^1.10.0",
     "@hono/vite-dev-server": "^0.18.0",
+    "@kintone/rest-api-client": "^5.5.0",
     "hono": "^4.11.9",
+    "mysql2": "^3.11.0",
     "pg": "^8.18.0",
     "snowflake-sdk": "^1.15.0"
   },