@squadbase/vite-server 0.0.1-build-3 → 0.0.1-build-5

package/dist/vite-plugin.js

@@ -2,8 +2,6 @@
 import buildPlugin from "@hono/vite-build/node";
 import devServer from "@hono/vite-dev-server";
 import nodeAdapter from "@hono/vite-dev-server/node";
-import { fileURLToPath } from "url";
-import path3 from "path";
 
 // src/registry.ts
 import { readdir, readFile, mkdir } from "fs/promises";
@@ -28,34 +26,29 @@ function createPostgreSQLClient(connectionString) {
 }
 
 // src/connector-client/env.ts
-function resolveEnvVar(entry, key, slug) {
+function resolveEnvVar(entry, key, connectionId) {
   const envVarName = entry.envVars[key];
   if (!envVarName) {
-    throw new Error(`Connector "${slug}" is missing envVars mapping for key "${key}"`);
+    throw new Error(`Connection "${connectionId}" is missing envVars mapping for key "${key}"`);
   }
   const value = process.env[envVarName];
   if (!value) {
-    throw new Error(`Environment variable "${envVarName}" (for "${slug}.${key}") is not set`);
+    throw new Error(`Environment variable "${envVarName}" (for connection "${connectionId}", key "${key}") is not set`);
   }
   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) {
-  const projectId = resolveEnvVar(entry, "project-id", slug);
-  const serviceAccountJsonBase64 = resolveEnvVar(entry, "service-account-json-base64", slug);
+function createBigQueryClient(entry, connectionId) {
+  const projectId = resolveEnvVar(entry, "project-id", connectionId);
+  const serviceAccountJsonBase64 = resolveEnvVar(entry, "service-account-json-base64", connectionId);
   const serviceAccountJson = Buffer.from(serviceAccountJsonBase64, "base64").toString("utf-8");
   let gcpCredentials;
   try {
     gcpCredentials = JSON.parse(serviceAccountJson);
   } catch {
     throw new Error(
-      `BigQuery service account JSON (decoded from base64) is not valid JSON for slug "${slug}"`
+      `BigQuery service account JSON (decoded from base64) is not valid JSON for connection "${connectionId}"`
     );
   }
   return {
@@ -70,12 +63,12 @@ function createBigQueryClient(entry, slug) {
 }
 
 // src/connector-client/snowflake.ts
-function createSnowflakeClient(entry, slug) {
-  const accountIdentifier = resolveEnvVar(entry, "account", slug);
-  const user = resolveEnvVar(entry, "user", slug);
-  const role = resolveEnvVar(entry, "role", slug);
-  const warehouse = resolveEnvVar(entry, "warehouse", slug);
-  const privateKeyBase64 = resolveEnvVar(entry, "private-key-base64", slug);
+function createSnowflakeClient(entry, connectionId) {
+  const accountIdentifier = resolveEnvVar(entry, "account", connectionId);
+  const user = resolveEnvVar(entry, "user", connectionId);
+  const role = resolveEnvVar(entry, "role", connectionId);
+  const warehouse = resolveEnvVar(entry, "warehouse", connectionId);
+  const privateKeyBase64 = resolveEnvVar(entry, "private-key-base64", connectionId);
   const privateKey = Buffer.from(privateKeyBase64, "base64").toString("utf-8");
   return {
     async query(sql) {
@@ -112,176 +105,6 @@ 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;
@@ -289,7 +112,7 @@ function createConnectorRegistry() {
   function getConnectionsFilePath() {
     return process.env.CONNECTIONS_PATH ?? path.join(process.cwd(), "../../.squadbase/connections.json");
   }
-  function loadConnections2() {
+  function loadConnections() {
     if (connectionsCache !== null) return connectionsCache;
     const filePath = getConnectionsFilePath();
     try {
@@ -300,67 +123,38 @@ function createConnectorRegistry() {
     }
     return connectionsCache;
   }
-  async function getClient2(connectorSlug, connectorType) {
-    if (!connectorSlug) {
-      const cacheKey = "__squadbase-db__";
-      const cached2 = clientCache.get(cacheKey);
-      if (cached2) return cached2;
-      const url = process.env.SQUADBASE_POSTGRESQL_URL;
-      if (!url) throw new Error("SQUADBASE_POSTGRESQL_URL environment variable is not set");
-      const client = createPostgreSQLClient(url);
-      clientCache.set(cacheKey, client);
-      return client;
-    }
-    const cached = clientCache.get(connectorSlug);
-    if (cached) return cached;
-    const connections = loadConnections2();
-    const entry = connections[connectorSlug];
+  async function getClient2(connectionId) {
+    const connections = loadConnections();
+    const entry = connections[connectionId];
     if (!entry) {
-      throw new Error(`connector slug '${connectorSlug}' not found in .squadbase/connections.json`);
-    }
-    const resolvedType = connectorType ?? entry.connectorType;
-    if (!resolvedType) {
-      throw new Error(
-        `connector type could not be determined for slug '${connectorSlug}'. Specify connectorType in the data-source JSON or in .squadbase/connections.json.`
-      );
-    }
-    if (resolvedType === "snowflake") {
-      return createSnowflakeClient(entry, connectorSlug);
-    }
-    if (resolvedType === "bigquery") {
-      return createBigQueryClient(entry, connectorSlug);
+      throw new Error(`connection '${connectionId}' not found in .squadbase/connections.json`);
     }
-    if (resolvedType === "athena") {
-      return createAthenaClient(entry, connectorSlug);
+    const connectorSlug = entry.connector.slug;
+    const cached = clientCache.get(connectionId);
+    if (cached) return { client: cached, connectorSlug };
+    if (connectorSlug === "snowflake") {
+      return { client: createSnowflakeClient(entry, connectionId), connectorSlug };
     }
-    if (resolvedType === "redshift") {
-      return createRedshiftClient(entry, connectorSlug);
+    if (connectorSlug === "bigquery") {
+      return { client: createBigQueryClient(entry, connectionId), 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") {
+    if (connectorSlug === "postgresql" || connectorSlug === "squadbase-db") {
       const urlEnvName = entry.envVars["connection-url"];
       if (!urlEnvName) {
-        throw new Error(`'connection-url' is not defined in envVars for connector '${connectorSlug}'`);
+        throw new Error(`'connection-url' is not defined in envVars for connection '${connectionId}'`);
       }
       const connectionUrl = process.env[urlEnvName];
       if (!connectionUrl) {
         throw new Error(
-          `environment variable '${urlEnvName}' (mapped from connector '${connectorSlug}') is not set`
+          `environment variable '${urlEnvName}' (mapped from connection '${connectionId}') is not set`
         );
       }
       const client = createPostgreSQLClient(connectionUrl);
-      clientCache.set(connectorSlug, client);
-      return client;
+      clientCache.set(connectionId, client);
+      return { client, connectorSlug };
     }
     throw new Error(
-      `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.`
+      `connector type '${connectorSlug}' is not supported. Supported: "snowflake", "bigquery", "postgresql", "squadbase-db"`
     );
   }
   function reloadEnvFile2(envPath) {
@@ -392,11 +186,11 @@ function createConnectorRegistry() {
     } catch {
     }
   }
-  return { getClient: getClient2, loadConnections: loadConnections2, reloadEnvFile: reloadEnvFile2, watchConnectionsFile: watchConnectionsFile2 };
+  return { getClient: getClient2, reloadEnvFile: reloadEnvFile2, watchConnectionsFile: watchConnectionsFile2 };
 }
 
 // src/connector-client/index.ts
-var { getClient, loadConnections, reloadEnvFile, watchConnectionsFile } = createConnectorRegistry();
+var { getClient, reloadEnvFile, watchConnectionsFile } = createConnectorRegistry();
 
 // src/registry.ts
 var viteServer = null;
@@ -417,17 +211,6 @@ var DEFAULT_EXCLUDE = [
   /^\/node_modules\/.*/,
   /^(?!\/api)/
 ];
-function resolveEntry(entry) {
-  if (entry.startsWith(".") || entry.startsWith("/")) return entry;
-  try {
-    const resolvedUrl = import.meta.resolve(entry);
-    const absolutePath = fileURLToPath(resolvedUrl);
-    const relativePath = path3.relative(process.cwd(), absolutePath).replace(/\\/g, "/");
-    return "./" + relativePath;
-  } catch {
-    return entry;
-  }
-}
 function squadbasePlugin(options = {}) {
   const {
     buildEntry = "@squadbase/vite-server/main",
@@ -438,7 +221,7 @@ function squadbasePlugin(options = {}) {
   } = options;
   const isServerBuild = (_, { command, mode }) => command === "build" && mode !== "client";
   const rawBuildPlugin = buildPlugin({
-    entry: resolveEntry(buildEntry),
+    entry: buildEntry,
     outputDir: "./dist/server",
     output: "index.js",
     port,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squadbase/vite-server",
-  "version": "0.0.1-build-3",
+  "version": "0.0.1-build-5",
   "type": "module",
   "exports": {
     ".": {
@@ -30,21 +30,14 @@
   "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 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"
+    "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"
   },
   "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"
   },

package/dist/cli/index.d.ts

@@ -1 +0,0 @@
-#!/usr/bin/env node