@wavehouse/sdk 0.0.0-dev.h04a85f20bb96 → 0.0.0-dev.h70dbf5d8f5ed

package/README.md

@@ -150,7 +150,7 @@ Generate TypeScript types from your live WaveHouse schema. The package ships a `
 npx wavehouse-codegen --url http://localhost:8080 --out ./src/db.d.ts
 ```
 
-This introspects `/v1/schema`, maps ClickHouse column types to TypeScript, and outputs a `Database` interface you can pass to `createClient<Database>()`. `/v1/schema` is **admin-only** — pass an admin-role token with `--auth <jwt>` (or `-a`) against any non-dev policy.
+This introspects `/v1/ops/schema`, maps ClickHouse column types to TypeScript, and outputs a `Database` interface you can pass to `createClient<Database>()`. `/v1/ops/schema` is **admin-only** — pass an admin-role token with `--auth <jwt>` (or `-a`) against any non-dev policy.
 
 ## Development & Testing
 

package/dist/cli/codegen.js

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
+// src/cli/codegen.ts
+import { realpathSync } from "fs";
+import { pathToFileURL } from "url";
+
 // src/url.ts
 function resolveURL(base, path, params) {
   const root = new URL(base);
@@ -107,15 +111,29 @@ function findTopLevelComma(s) {
   }
   return -1;
 }
+function isColumn(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const col = value;
+  return typeof col.name === "string" && typeof col.type === "string";
+}
+function isTableSchema(value) {
+  if (typeof value !== "object" || value === null) return false;
+  const table = value;
+  return typeof table.name === "string" && Array.isArray(table.columns) && table.columns.every(isColumn);
+}
 async function fetchSchemas(url, auth) {
   const headers = {};
   if (auth) headers.Authorization = `Bearer ${auth}`;
-  const res = await fetch(resolveURL(url, "/v1/schema").toString(), { headers });
+  const res = await fetch(resolveURL(url, "/v1/ops/schema").toString(), { headers });
   if (!res.ok) {
     const text = await res.text();
     throw new Error(`Schema fetch failed (${res.status}): ${text}`);
   }
-  return await res.json();
+  const body = await res.json();
+  if (!Array.isArray(body) || !body.every(isTableSchema)) {
+    throw new Error("Unexpected /v1/ops/schema response: expected a JSON array of table schemas");
+  }
+  return body;
 }
 function generateTypes(schemas) {
   const lines = [
@@ -125,19 +143,16 @@ function generateTypes(schemas) {
     "",
     "export interface Database {"
   ];
-  const tableNames = Object.keys(schemas).sort();
-  for (const tableName of tableNames) {
-    const _schema = schemas[tableName];
-    const rowType = `${pascalCase(tableName)}Row`;
-    lines.push(`  ${tableName}: ${rowType};`);
+  const tables = [...schemas].sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
+  for (const table of tables) {
+    lines.push(`  ${table.name}: ${pascalCase(table.name)}Row;`);
   }
   lines.push("}");
   lines.push("");
-  for (const tableName of tableNames) {
-    const schema = schemas[tableName];
-    const rowType = `${pascalCase(tableName)}Row`;
+  for (const table of tables) {
+    const rowType = `${pascalCase(table.name)}Row`;
     lines.push(`export interface ${rowType} {`);
-    for (const col of schema.columns) {
+    for (const col of table.columns) {
       const tsType = chTypeToTS(col.type);
       const optional = col.has_default ? "?" : "";
       lines.push(`  ${col.name}${optional}: ${tsType};`);
@@ -154,12 +169,11 @@ async function main() {
   const args = parseArgs(process.argv);
   console.log(`Fetching schema from ${args.url}...`);
   const schemas = await fetchSchemas(args.url, args.auth);
-  const tableCount = Object.keys(schemas).length;
-  if (tableCount === 0) {
+  if (schemas.length === 0) {
     console.warn("No tables found. Is WaveHouse running with tables in ClickHouse?");
     process.exit(1);
   }
-  console.log(`Found ${tableCount} table(s): ${Object.keys(schemas).join(", ")}`);
+  console.log(`Found ${schemas.length} table(s): ${schemas.map((t) => t.name).join(", ")}`);
   const output = generateTypes(schemas);
   const { writeFile } = await import("fs/promises");
   const { resolve } = await import("path");
@@ -167,7 +181,22 @@ async function main() {
   await writeFile(outPath, output, "utf-8");
   console.log(`\u2713 Types written to ${outPath}`);
 }
-main().catch((err) => {
-  console.error("Codegen failed:", err.message);
-  process.exit(1);
-});
+function isDirectInvocation() {
+  if (!process.argv[1]) return false;
+  try {
+    return import.meta.url === pathToFileURL(realpathSync(process.argv[1])).href;
+  } catch {
+    return false;
+  }
+}
+if (isDirectInvocation()) {
+  main().catch((err) => {
+    console.error("Codegen failed:", err.message);
+    process.exit(1);
+  });
+}
+export {
+  chTypeToTS,
+  fetchSchemas,
+  generateTypes
+};

package/dist/index.cjs

@@ -200,7 +200,7 @@ var DLQNamespace = class {
   async list(opts) {
     const { data, error } = await request(this._ctx, {
       method: "GET",
-      path: "/v1/dlq/stats",
+      path: "/v1/ops/dlq/stats",
       signal: opts?.signal
     });
     if (error) return err(error);
@@ -210,7 +210,7 @@ var DLQNamespace = class {
   async table(name, opts) {
     const { data, error } = await request(this._ctx, {
       method: "GET",
-      path: "/v1/dlq/stats",
+      path: "/v1/ops/dlq/stats",
       params: { table: name },
       signal: opts?.signal
     });
@@ -270,7 +270,7 @@ var PipesNamespace = class {
   async list(opts) {
     const { data, error } = await request(this._ctx, {
       method: "GET",
-      path: "/v1/admin/pipes",
+      path: "/v1/ops/pipes",
       signal: opts?.signal
     });
     if (error) return err(error);
@@ -280,7 +280,7 @@ var PipesNamespace = class {
   async get(name, opts) {
     const { data, error } = await request(this._ctx, {
       method: "GET",
-      path: `/v1/admin/pipes/${encodeURIComponent(name)}`,
+      path: `/v1/ops/pipes/${encodeURIComponent(name)}`,
       signal: opts?.signal
     });
     if (error) return err(error);
@@ -290,7 +290,7 @@ var PipesNamespace = class {
   async set(name, def, opts) {
     const { error } = await request(this._ctx, {
       method: "PUT",
-      path: `/v1/admin/pipes/${encodeURIComponent(name)}`,
+      path: `/v1/ops/pipes/${encodeURIComponent(name)}`,
       body: def,
       signal: opts?.signal
     });
@@ -301,7 +301,7 @@ var PipesNamespace = class {
   async delete(name, opts) {
     const { error } = await request(this._ctx, {
       method: "DELETE",
-      path: `/v1/admin/pipes/${encodeURIComponent(name)}`,
+      path: `/v1/ops/pipes/${encodeURIComponent(name)}`,
       signal: opts?.signal
     });
     if (error) return err(error);
@@ -319,7 +319,7 @@ var PolicyNamespace = class {
   async get(opts) {
     const { data, error } = await request(this._ctx, {
       method: "GET",
-      path: "/v1/admin/policy",
+      path: "/v1/ops/policy",
       signal: opts?.signal
     });
     if (error) return err(error);
@@ -329,7 +329,7 @@ var PolicyNamespace = class {
   async set(policy, opts) {
     const { error } = await request(this._ctx, {
       method: "PUT",
-      path: "/v1/admin/policy",
+      path: "/v1/ops/policy",
       body: policy,
       signal: opts?.signal
     });
@@ -340,7 +340,7 @@ var PolicyNamespace = class {
   async validate(policy, opts) {
     const { data, error } = await request(this._ctx, {
       method: "POST",
-      path: "/v1/admin/policy/validate",
+      path: "/v1/ops/policy/validate",
       body: policy,
       signal: opts?.signal
     });
@@ -359,7 +359,7 @@ var SchemaNamespace = class {
   async list(opts) {
     const { data, error } = await request(this._ctx, {
       method: "GET",
-      path: "/v1/schema",
+      path: "/v1/ops/schema",
       signal: opts?.signal
     });
     if (error) return err(error);
@@ -380,7 +380,7 @@ var SchemaNamespace = class {
   async refresh(opts) {
     const { error } = await request(this._ctx, {
       method: "POST",
-      path: "/v1/schema/refresh",
+      path: "/v1/ops/schema/refresh",
       signal: opts?.signal
     });
     if (error) return err(error);
@@ -392,7 +392,7 @@ var SchemaNamespace = class {
 async function sql(ctx, query, opts) {
   const { data, error } = await request(ctx, {
     method: "POST",
-    path: "/v1/admin/query",
+    path: "/v1/ops/query",
     body: { sql: query },
     signal: opts?.signal
   });
@@ -1104,7 +1104,7 @@ var TableRef = class {
   async schema(opts) {
     const { data, error } = await request(this._ctx, {
       method: "GET",
-      path: `/v1/schema?table=${encodeURIComponent(this._table)}`,
+      path: `/v1/ops/schema?table=${encodeURIComponent(this._table)}`,
       signal: opts?.signal
     });
     if (error) return err(error);
@@ -1170,7 +1170,7 @@ var WaveHouseClient = class {
   sql(query, opts) {
     if (Array.isArray(opts)) {
       throw new Error(
-        "[WaveHouse SDK] client.sql(sql, params) was removed. The /v1/admin/query endpoint does not accept positional `?` params. Inline literals into the SQL, or use the structured query builder (wh.from(table)\u2026) for safe binding from user input."
+        "[WaveHouse SDK] client.sql(sql, params) was removed. The /v1/ops/query endpoint does not accept positional `?` params. Inline literals into the SQL, or use the structured query builder (wh.from(table)\u2026) for safe binding from user input."
       );
     }
     return sql(this._ctx, query, opts);