tthr 0.0.58 → 0.0.59

package/dist/chunk-GKELUQ44.js

@@ -0,0 +1,502 @@
+// src/commands/generate.ts
+import chalk2 from "chalk";
+import ora from "ora";
+import fs3 from "fs-extra";
+import path3 from "path";
+
+// src/utils/auth.ts
+import chalk from "chalk";
+import fs from "fs-extra";
+import path from "path";
+var CONFIG_DIR = path.join(process.env.HOME || process.env.USERPROFILE || "", ".tether");
+var CREDENTIALS_FILE = path.join(CONFIG_DIR, "credentials.json");
+async function getCredentials() {
+  try {
+    if (await fs.pathExists(CREDENTIALS_FILE)) {
+      return await fs.readJSON(CREDENTIALS_FILE);
+    }
+  } catch {
+  }
+  return null;
+}
+async function requireAuth() {
+  const credentials = await getCredentials();
+  if (!credentials) {
+    console.error(chalk.red("\n\u2717 Not logged in\n"));
+    console.log(chalk.dim("Run `tthr login` to authenticate\n"));
+    process.exit(1);
+  }
+  if (credentials.expiresAt) {
+    const expiresAt = new Date(credentials.expiresAt);
+    if (/* @__PURE__ */ new Date() > expiresAt) {
+      console.error(chalk.red("\n\u2717 Session expired\n"));
+      console.log(chalk.dim("Run `tthr login` to authenticate\n"));
+      process.exit(1);
+    }
+  }
+  return credentials;
+}
+async function saveCredentials(credentials) {
+  await fs.ensureDir(CONFIG_DIR);
+  await fs.writeJSON(CREDENTIALS_FILE, credentials, { spaces: 2, mode: 384 });
+}
+async function clearCredentials() {
+  try {
+    await fs.remove(CREDENTIALS_FILE);
+  } catch {
+  }
+}
+
+// src/utils/config.ts
+import fs2 from "fs-extra";
+import path2 from "path";
+var DEFAULT_CONFIG = {
+  schema: "./tether/schema.ts",
+  functions: "./tether/functions",
+  output: "./tether/_generated",
+  dev: {
+    port: 3001,
+    host: "localhost"
+  },
+  database: {
+    walMode: true
+  }
+};
+async function loadConfig(cwd = process.cwd()) {
+  const configPath = path2.resolve(cwd, "tether.config.ts");
+  if (!await fs2.pathExists(configPath)) {
+    return DEFAULT_CONFIG;
+  }
+  const configSource = await fs2.readFile(configPath, "utf-8");
+  const config = {};
+  const schemaMatch = configSource.match(/schema\s*:\s*['"]([^'"]+)['"]/);
+  if (schemaMatch) {
+    config.schema = schemaMatch[1];
+  }
+  const functionsMatch = configSource.match(/functions\s*:\s*['"]([^'"]+)['"]/);
+  if (functionsMatch) {
+    config.functions = functionsMatch[1];
+  }
+  const outputMatch = configSource.match(/output\s*:\s*['"]([^'"]+)['"]/);
+  if (outputMatch) {
+    config.output = outputMatch[1];
+  }
+  const envMatch = configSource.match(/environment\s*:\s*['"]([^'"]+)['"]/);
+  if (envMatch) {
+    config.environment = envMatch[1];
+  }
+  const portMatch = configSource.match(/port\s*:\s*(\d+)/);
+  if (portMatch) {
+    config.dev = { ...config.dev, port: parseInt(portMatch[1], 10) };
+  }
+  const hostMatch = configSource.match(/host\s*:\s*['"]([^'"]+)['"]/);
+  if (hostMatch) {
+    config.dev = { ...config.dev, host: hostMatch[1] };
+  }
+  return {
+    ...DEFAULT_CONFIG,
+    ...config,
+    dev: { ...DEFAULT_CONFIG.dev, ...config.dev },
+    database: { ...DEFAULT_CONFIG.database, ...config.database }
+  };
+}
+function resolvePath(configPath, cwd = process.cwd()) {
+  const normalised = configPath.replace(/^\.\//, "");
+  return path2.resolve(cwd, normalised);
+}
+async function detectFramework(cwd = process.cwd()) {
+  const packageJsonPath = path2.resolve(cwd, "package.json");
+  if (!await fs2.pathExists(packageJsonPath)) {
+    return "unknown";
+  }
+  try {
+    const packageJson = await fs2.readJson(packageJsonPath);
+    const deps = {
+      ...packageJson.dependencies,
+      ...packageJson.devDependencies
+    };
+    if (deps.nuxt || deps["@nuxt/kit"]) {
+      return "nuxt";
+    }
+    if (deps.next) {
+      return "next";
+    }
+    if (deps["@sveltejs/kit"]) {
+      return "sveltekit";
+    }
+    if (deps.vite && !deps.nuxt && !deps.next && !deps["@sveltejs/kit"]) {
+      return "vite";
+    }
+    return "vanilla";
+  } catch {
+    return "unknown";
+  }
+}
+function getFrameworkDevCommand(framework) {
+  switch (framework) {
+    case "nuxt":
+      return "nuxt dev";
+    case "next":
+      return "next dev";
+    case "sveltekit":
+      return "vite dev";
+    case "vite":
+      return "vite dev";
+    case "vanilla":
+      return null;
+    // No default dev server for vanilla
+    default:
+      return null;
+  }
+}
+
+// src/commands/generate.ts
+function parseSchemaFile(source) {
+  const tables = [];
+  const schemaMatch = source.match(/defineSchema\s*\(\s*\{([\s\S]*)\}\s*\)/);
+  if (!schemaMatch) return tables;
+  const schemaContent = schemaMatch[1];
+  const tableStartRegex = /(\w+)\s*:\s*\{/g;
+  let match;
+  while ((match = tableStartRegex.exec(schemaContent)) !== null) {
+    const tableName = match[1];
+    const startOffset = match.index + match[0].length;
+    let braceCount = 1;
+    let endOffset = startOffset;
+    for (let i = startOffset; i < schemaContent.length && braceCount > 0; i++) {
+      const char = schemaContent[i];
+      if (char === "{") braceCount++;
+      else if (char === "}") braceCount--;
+      endOffset = i;
+    }
+    const columnsContent = schemaContent.slice(startOffset, endOffset);
+    const columns = parseColumns(columnsContent);
+    tables.push({ name: tableName, columns });
+  }
+  return tables;
+}
+function parseColumns(content) {
+  const columns = [];
+  const columnRegex = /(\w+)\s*:\s*(\w+)(?:<([^>]+)>)?\s*\(\s*\)((?:\[.*?\]|[^,\n}])*)/g;
+  let match;
+  while ((match = columnRegex.exec(content)) !== null) {
+    const name = match[1];
+    const schemaType = match[2];
+    const genericType = match[3];
+    const modifiers = match[4] || "";
+    const nullable = !modifiers.includes(".notNull()");
+    const oneOfMatch = modifiers.match(/\.oneOf\s*\(\s*\[(.*?)\]\s*\)/);
+    let oneOf;
+    if (oneOfMatch) {
+      oneOf = [...oneOfMatch[1].matchAll(/['"]([^'"]+)['"]/g)].map((m) => m[1]);
+    }
+    columns.push({
+      name,
+      type: schemaTypeToTS(schemaType),
+      nullable,
+      jsonType: genericType,
+      // Store the generic type for json columns
+      oneOf
+    });
+  }
+  return columns;
+}
+function schemaTypeToTS(schemaType) {
+  switch (schemaType) {
+    case "text":
+      return "string";
+    case "integer":
+      return "number";
+    case "real":
+      return "number";
+    case "boolean":
+      return "boolean";
+    case "timestamp":
+      return "string";
+    case "json":
+      return "unknown";
+    case "blob":
+      return "Uint8Array";
+    case "asset":
+      return "TetherAsset";
+    // Asset object returned by API
+    default:
+      return "unknown";
+  }
+}
+function tableNameToInterface(tableName) {
+  let name = tableName;
+  if (name.endsWith("ies")) {
+    name = name.slice(0, -3) + "y";
+  } else if (name.endsWith("s") && !name.endsWith("ss")) {
+    name = name.slice(0, -1);
+  }
+  return name.charAt(0).toUpperCase() + name.slice(1);
+}
+function generateDbFile(tables) {
+  const jsonTypes = /* @__PURE__ */ new Set();
+  for (const table of tables) {
+    for (const col of table.columns) {
+      if (col.jsonType) {
+        jsonTypes.add(col.jsonType.replace(/\[\]$/, ""));
+      }
+    }
+  }
+  const lines = [
+    "// Auto-generated by Tether CLI - do not edit manually",
+    `// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}`,
+    "",
+    "import { createDatabaseProxy, type TetherDatabase } from '@tthr/client';",
+    "import {",
+    "  query as baseQuery,",
+    "  mutation as baseMutation,",
+    "  type QueryDefinition,",
+    "  type MutationDefinition,",
+    "  z,",
+    "} from '@tthr/server';"
+  ];
+  if (jsonTypes.size > 0) {
+    const typeImports = Array.from(jsonTypes).sort().join(", ");
+    lines.push(`import type { ${typeImports} } from '../schema';`);
+  }
+  lines.push("");
+  lines.push("// Asset type returned by the API for asset columns");
+  lines.push("export interface TetherAsset {");
+  lines.push("  id: string;");
+  lines.push("  filename: string;");
+  lines.push("  contentType: string;");
+  lines.push("  size: number;");
+  lines.push("  url: string;");
+  lines.push("  createdAt: string;");
+  lines.push("}");
+  lines.push("");
+  for (const table of tables) {
+    const interfaceName = tableNameToInterface(table.name);
+    lines.push(`export interface ${interfaceName} {`);
+    lines.push("  _id: string;");
+    for (const col of table.columns) {
+      let colType;
+      if (col.oneOf && col.oneOf.length > 0) {
+        colType = col.oneOf.map((v) => `'${v}'`).join(" | ");
+      } else {
+        colType = col.jsonType || col.type;
+      }
+      const typeStr = col.nullable ? `${colType} | null` : colType;
+      const optional = col.nullable ? "?" : "";
+      lines.push(`  ${col.name}${optional}: ${typeStr};`);
+    }
+    lines.push("  _createdAt: string;");
+    lines.push("  _updatedAt?: string | null;");
+    lines.push("  _deletedAt?: string | null;");
+    lines.push("}");
+    lines.push("");
+  }
+  lines.push("export interface Schema {");
+  for (const table of tables) {
+    const interfaceName = tableNameToInterface(table.name);
+    lines.push(`  ${table.name}: ${interfaceName};`);
+  }
+  lines.push("}");
+  lines.push("");
+  lines.push("// Database client with typed tables");
+  lines.push("// This is a proxy that will be populated by the Tether runtime");
+  lines.push("export const db: TetherDatabase<Schema> = createDatabaseProxy<Schema>();");
+  lines.push("");
+  lines.push("// ============================================================================");
+  lines.push("// Typed function wrappers - use these instead of importing from @tthr/server");
+  lines.push("// This ensures the `db` parameter in handlers is properly typed with Schema");
+  lines.push("// ============================================================================");
+  lines.push("");
+  lines.push("/**");
+  lines.push(" * Define a query function with typed database access.");
+  lines.push(" * The `db` parameter in the handler will have full type safety for your schema.");
+  lines.push(" */");
+  lines.push("export function query<TArgs = void, TResult = unknown>(");
+  lines.push("  definition: QueryDefinition<TArgs, TResult, Schema>");
+  lines.push("): QueryDefinition<TArgs, TResult, Schema> {");
+  lines.push("  return baseQuery(definition);");
+  lines.push("}");
+  lines.push("");
+  lines.push("/**");
+  lines.push(" * Define a mutation function with typed database access.");
+  lines.push(" * The `db` parameter in the handler will have full type safety for your schema.");
+  lines.push(" */");
+  lines.push("export function mutation<TArgs = void, TResult = unknown>(");
+  lines.push("  definition: MutationDefinition<TArgs, TResult, Schema>");
+  lines.push("): MutationDefinition<TArgs, TResult, Schema> {");
+  lines.push("  return baseMutation(definition);");
+  lines.push("}");
+  lines.push("");
+  lines.push("// Re-export z for convenience");
+  lines.push("export { z };");
+  if (jsonTypes.size > 0) {
+    lines.push("");
+    lines.push("// Re-export JSON schema types");
+    const typeExports = Array.from(jsonTypes).sort().join(", ");
+    lines.push(`export type { ${typeExports} } from '../schema';`);
+  }
+  lines.push("");
+  return lines.join("\n");
+}
+async function parseFunctionsDir(functionsDir) {
+  const functions = [];
+  if (!await fs3.pathExists(functionsDir)) {
+    return functions;
+  }
+  const files = await fs3.readdir(functionsDir);
+  for (const file of files) {
+    if (!file.endsWith(".ts") && !file.endsWith(".js")) continue;
+    const filePath = path3.join(functionsDir, file);
+    const stat = await fs3.stat(filePath);
+    if (!stat.isFile()) continue;
+    const moduleName = file.replace(/\.(ts|js)$/, "");
+    const source = await fs3.readFile(filePath, "utf-8");
+    const exportRegex = /export\s+const\s+(\w+)\s*=\s*(query|mutation)\s*\(/g;
+    let match;
+    while ((match = exportRegex.exec(source)) !== null) {
+      functions.push({
+        name: match[1],
+        moduleName
+      });
+    }
+  }
+  return functions;
+}
+async function generateApiFile(functionsDir) {
+  const functions = await parseFunctionsDir(functionsDir);
+  const moduleMap = /* @__PURE__ */ new Map();
+  for (const fn of functions) {
+    if (!moduleMap.has(fn.moduleName)) {
+      moduleMap.set(fn.moduleName, []);
+    }
+    moduleMap.get(fn.moduleName).push(fn.name);
+  }
+  const lines = [
+    "// Auto-generated by Tether CLI - do not edit manually",
+    `// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}`,
+    "",
+    "import { createApiProxy } from '@tthr/client';",
+    "",
+    "/**",
+    " * API function reference type for useQuery/useMutation.",
+    ' * The _name property contains the function path (e.g., "users.list").',
+    " */",
+    "export interface ApiFunction<TArgs = unknown, TResult = unknown> {",
+    "  _name: string;",
+    "  _args?: TArgs;",
+    "  _result?: TResult;",
+    "}",
+    ""
+  ];
+  if (moduleMap.size > 0) {
+    for (const [moduleName, fnNames] of moduleMap) {
+      const interfaceName = moduleName.charAt(0).toUpperCase() + moduleName.slice(1) + "Api";
+      lines.push(`export interface ${interfaceName} {`);
+      for (const fnName of fnNames) {
+        lines.push(`  ${fnName}: ApiFunction;`);
+      }
+      lines.push("}");
+      lines.push("");
+    }
+    lines.push("export interface Api {");
+    for (const moduleName of moduleMap.keys()) {
+      const interfaceName = moduleName.charAt(0).toUpperCase() + moduleName.slice(1) + "Api";
+      lines.push(`  ${moduleName}: ${interfaceName};`);
+    }
+    lines.push("}");
+  } else {
+    lines.push("/**");
+    lines.push(" * Flexible API type that allows access to any function path.");
+    lines.push(" * Functions are accessed as api.moduleName.functionName");
+    lines.push(" * The actual types depend on your function definitions.");
+    lines.push(" */");
+    lines.push("export type Api = {");
+    lines.push("  [module: string]: {");
+    lines.push("    [fn: string]: ApiFunction;");
+    lines.push("  };");
+    lines.push("};");
+  }
+  lines.push("");
+  lines.push("// API client proxy - provides typed access to your functions");
+  lines.push("// On the client: returns { _name } references for useQuery/useMutation");
+  lines.push("// In Tether functions: calls the actual function implementation");
+  lines.push("export const api = createApiProxy<Api>();");
+  lines.push("");
+  return lines.join("\n");
+}
+async function generateTypes(options = {}) {
+  const config = await loadConfig();
+  const schemaPath = resolvePath(config.schema);
+  const outputDir = resolvePath(config.output);
+  const functionsDir = resolvePath(config.functions);
+  if (!await fs3.pathExists(schemaPath)) {
+    throw new Error(`Schema file not found: ${schemaPath}`);
+  }
+  const schemaSource = await fs3.readFile(schemaPath, "utf-8");
+  const tables = parseSchemaFile(schemaSource);
+  await fs3.ensureDir(outputDir);
+  await fs3.writeFile(
+    path3.join(outputDir, "db.ts"),
+    generateDbFile(tables)
+  );
+  await fs3.writeFile(
+    path3.join(outputDir, "api.ts"),
+    await generateApiFile(functionsDir)
+  );
+  await fs3.writeFile(
+    path3.join(outputDir, "index.ts"),
+    `// Auto-generated by Tether CLI - do not edit manually
+export * from './db';
+export * from './api';
+`
+  );
+  return { tables, outputDir };
+}
+async function generateCommand() {
+  await requireAuth();
+  const configPath = path3.resolve(process.cwd(), "tether.config.ts");
+  if (!await fs3.pathExists(configPath)) {
+    console.log(chalk2.red("\nError: Not a Tether project"));
+    console.log(chalk2.dim("Run `tthr init` to create a new project\n"));
+    process.exit(1);
+  }
+  console.log(chalk2.bold("\n\u26A1 Generating types from schema\n"));
+  const spinner = ora("Reading schema...").start();
+  try {
+    spinner.text = "Generating types...";
+    const { tables, outputDir } = await generateTypes();
+    if (tables.length === 0) {
+      spinner.warn("No tables found in schema");
+      console.log(chalk2.dim("  Make sure your schema uses defineSchema({ ... })\n"));
+      return;
+    }
+    spinner.succeed(`Types generated for ${tables.length} table(s)`);
+    console.log("\n" + chalk2.green("\u2713") + " Tables:");
+    for (const table of tables) {
+      console.log(chalk2.dim(`  - ${table.name} (${table.columns.length} columns)`));
+    }
+    const relativeOutput = path3.relative(process.cwd(), outputDir);
+    console.log("\n" + chalk2.green("\u2713") + " Generated files:");
+    console.log(chalk2.dim(`  ${relativeOutput}/db.ts`));
+    console.log(chalk2.dim(`  ${relativeOutput}/api.ts`));
+    console.log(chalk2.dim(`  ${relativeOutput}/index.ts
+`));
+  } catch (error) {
+    spinner.fail("Failed to generate types");
+    console.error(chalk2.red(error instanceof Error ? error.message : "Unknown error"));
+    process.exit(1);
+  }
+}
+
+export {
+  getCredentials,
+  requireAuth,
+  saveCredentials,
+  clearCredentials,
+  loadConfig,
+  resolvePath,
+  detectFramework,
+  getFrameworkDevCommand,
+  generateTypes,
+  generateCommand
+};

package/dist/chunk-JPZQRYD3.js

@@ -0,0 +1,502 @@
+// src/commands/generate.ts
+import chalk2 from "chalk";
+import ora from "ora";
+import fs3 from "fs-extra";
+import path3 from "path";
+
+// src/utils/auth.ts
+import chalk from "chalk";
+import fs from "fs-extra";
+import path from "path";
+var CONFIG_DIR = path.join(process.env.HOME || process.env.USERPROFILE || "", ".tether");
+var CREDENTIALS_FILE = path.join(CONFIG_DIR, "credentials.json");
+async function getCredentials() {
+  try {
+    if (await fs.pathExists(CREDENTIALS_FILE)) {
+      return await fs.readJSON(CREDENTIALS_FILE);
+    }
+  } catch {
+  }
+  return null;
+}
+async function requireAuth() {
+  const credentials = await getCredentials();
+  if (!credentials) {
+    console.error(chalk.red("\n\u2717 Not logged in\n"));
+    console.log(chalk.dim("Run `tthr login` to authenticate\n"));
+    process.exit(1);
+  }
+  if (credentials.expiresAt) {
+    const expiresAt = new Date(credentials.expiresAt);
+    if (/* @__PURE__ */ new Date() > expiresAt) {
+      console.error(chalk.red("\n\u2717 Session expired\n"));
+      console.log(chalk.dim("Run `tthr login` to authenticate\n"));
+      process.exit(1);
+    }
+  }
+  return credentials;
+}
+async function saveCredentials(credentials) {
+  await fs.ensureDir(CONFIG_DIR);
+  await fs.writeJSON(CREDENTIALS_FILE, credentials, { spaces: 2, mode: 384 });
+}
+async function clearCredentials() {
+  try {
+    await fs.remove(CREDENTIALS_FILE);
+  } catch {
+  }
+}
+
+// src/utils/config.ts
+import fs2 from "fs-extra";
+import path2 from "path";
+var DEFAULT_CONFIG = {
+  schema: "./tether/schema.ts",
+  functions: "./tether/functions",
+  output: "./tether/_generated",
+  dev: {
+    port: 3001,
+    host: "localhost"
+  },
+  database: {
+    walMode: true
+  }
+};
+async function loadConfig(cwd = process.cwd()) {
+  const configPath = path2.resolve(cwd, "tether.config.ts");
+  if (!await fs2.pathExists(configPath)) {
+    return DEFAULT_CONFIG;
+  }
+  const configSource = await fs2.readFile(configPath, "utf-8");
+  const config = {};
+  const schemaMatch = configSource.match(/schema\s*:\s*['"]([^'"]+)['"]/);
+  if (schemaMatch) {
+    config.schema = schemaMatch[1];
+  }
+  const functionsMatch = configSource.match(/functions\s*:\s*['"]([^'"]+)['"]/);
+  if (functionsMatch) {
+    config.functions = functionsMatch[1];
+  }
+  const outputMatch = configSource.match(/output\s*:\s*['"]([^'"]+)['"]/);
+  if (outputMatch) {
+    config.output = outputMatch[1];
+  }
+  const envMatch = configSource.match(/environment\s*:\s*['"]([^'"]+)['"]/);
+  if (envMatch) {
+    config.environment = envMatch[1];
+  }
+  const portMatch = configSource.match(/port\s*:\s*(\d+)/);
+  if (portMatch) {
+    config.dev = { ...config.dev, port: parseInt(portMatch[1], 10) };
+  }
+  const hostMatch = configSource.match(/host\s*:\s*['"]([^'"]+)['"]/);
+  if (hostMatch) {
+    config.dev = { ...config.dev, host: hostMatch[1] };
+  }
+  return {
+    ...DEFAULT_CONFIG,
+    ...config,
+    dev: { ...DEFAULT_CONFIG.dev, ...config.dev },
+    database: { ...DEFAULT_CONFIG.database, ...config.database }
+  };
+}
+function resolvePath(configPath, cwd = process.cwd()) {
+  const normalised = configPath.replace(/^\.\//, "");
+  return path2.resolve(cwd, normalised);
+}
+async function detectFramework(cwd = process.cwd()) {
+  const packageJsonPath = path2.resolve(cwd, "package.json");
+  if (!await fs2.pathExists(packageJsonPath)) {
+    return "unknown";
+  }
+  try {
+    const packageJson = await fs2.readJson(packageJsonPath);
+    const deps = {
+      ...packageJson.dependencies,
+      ...packageJson.devDependencies
+    };
+    if (deps.nuxt || deps["@nuxt/kit"]) {
+      return "nuxt";
+    }
+    if (deps.next) {
+      return "next";
+    }
+    if (deps["@sveltejs/kit"]) {
+      return "sveltekit";
+    }
+    if (deps.vite && !deps.nuxt && !deps.next && !deps["@sveltejs/kit"]) {
+      return "vite";
+    }
+    return "vanilla";
+  } catch {
+    return "unknown";
+  }
+}
+function getFrameworkDevCommand(framework) {
+  switch (framework) {
+    case "nuxt":
+      return "nuxt dev";
+    case "next":
+      return "next dev";
+    case "sveltekit":
+      return "vite dev";
+    case "vite":
+      return "vite dev";
+    case "vanilla":
+      return null;
+    // No default dev server for vanilla
+    default:
+      return null;
+  }
+}
+
+// src/commands/generate.ts
+function parseSchemaFile(source) {
+  const tables = [];
+  const schemaMatch = source.match(/defineSchema\s*\(\s*\{([\s\S]*)\}\s*\)/);
+  if (!schemaMatch) return tables;
+  const schemaContent = schemaMatch[1];
+  const tableStartRegex = /(\w+)\s*:\s*\{/g;
+  let match;
+  while ((match = tableStartRegex.exec(schemaContent)) !== null) {
+    const tableName = match[1];
+    const startOffset = match.index + match[0].length;
+    let braceCount = 1;
+    let endOffset = startOffset;
+    for (let i = startOffset; i < schemaContent.length && braceCount > 0; i++) {
+      const char = schemaContent[i];
+      if (char === "{") braceCount++;
+      else if (char === "}") braceCount--;
+      endOffset = i;
+    }
+    const columnsContent = schemaContent.slice(startOffset, endOffset);
+    const columns = parseColumns(columnsContent);
+    tables.push({ name: tableName, columns });
+  }
+  return tables;
+}
+function parseColumns(content) {
+  const columns = [];
+  const columnRegex = /(\w+)\s*:\s*(\w+)(?:<([^>]+)>)?\s*\(\s*\)((?:[^,\n}]|\[.*?\])*)/g;
+  let match;
+  while ((match = columnRegex.exec(content)) !== null) {
+    const name = match[1];
+    const schemaType = match[2];
+    const genericType = match[3];
+    const modifiers = match[4] || "";
+    const nullable = !modifiers.includes(".notNull()");
+    const oneOfMatch = modifiers.match(/\.oneOf\s*\(\s*\[(.*?)\]\s*\)/);
+    let oneOf;
+    if (oneOfMatch) {
+      oneOf = [...oneOfMatch[1].matchAll(/['"]([^'"]+)['"]/g)].map((m) => m[1]);
+    }
+    columns.push({
+      name,
+      type: schemaTypeToTS(schemaType),
+      nullable,
+      jsonType: genericType,
+      // Store the generic type for json columns
+      oneOf
+    });
+  }
+  return columns;
+}
+function schemaTypeToTS(schemaType) {
+  switch (schemaType) {
+    case "text":
+      return "string";
+    case "integer":
+      return "number";
+    case "real":
+      return "number";
+    case "boolean":
+      return "boolean";
+    case "timestamp":
+      return "string";
+    case "json":
+      return "unknown";
+    case "blob":
+      return "Uint8Array";
+    case "asset":
+      return "TetherAsset";
+    // Asset object returned by API
+    default:
+      return "unknown";
+  }
+}
+function tableNameToInterface(tableName) {
+  let name = tableName;
+  if (name.endsWith("ies")) {
+    name = name.slice(0, -3) + "y";
+  } else if (name.endsWith("s") && !name.endsWith("ss")) {
+    name = name.slice(0, -1);
+  }
+  return name.charAt(0).toUpperCase() + name.slice(1);
+}
+function generateDbFile(tables) {
+  const jsonTypes = /* @__PURE__ */ new Set();
+  for (const table of tables) {
+    for (const col of table.columns) {
+      if (col.jsonType) {
+        jsonTypes.add(col.jsonType.replace(/\[\]$/, ""));
+      }
+    }
+  }
+  const lines = [
+    "// Auto-generated by Tether CLI - do not edit manually",
+    `// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}`,
+    "",
+    "import { createDatabaseProxy, type TetherDatabase } from '@tthr/client';",
+    "import {",
+    "  query as baseQuery,",
+    "  mutation as baseMutation,",
+    "  type QueryDefinition,",
+    "  type MutationDefinition,",
+    "  z,",
+    "} from '@tthr/server';"
+  ];
+  if (jsonTypes.size > 0) {
+    const typeImports = Array.from(jsonTypes).sort().join(", ");
+    lines.push(`import type { ${typeImports} } from '../schema';`);
+  }
+  lines.push("");
+  lines.push("// Asset type returned by the API for asset columns");
+  lines.push("export interface TetherAsset {");
+  lines.push("  id: string;");
+  lines.push("  filename: string;");
+  lines.push("  contentType: string;");
+  lines.push("  size: number;");
+  lines.push("  url: string;");
+  lines.push("  createdAt: string;");
+  lines.push("}");
+  lines.push("");
+  for (const table of tables) {
+    const interfaceName = tableNameToInterface(table.name);
+    lines.push(`export interface ${interfaceName} {`);
+    lines.push("  _id: string;");
+    for (const col of table.columns) {
+      let colType;
+      if (col.oneOf && col.oneOf.length > 0) {
+        colType = col.oneOf.map((v) => `'${v}'`).join(" | ");
+      } else {
+        colType = col.jsonType || col.type;
+      }
+      const typeStr = col.nullable ? `${colType} | null` : colType;
+      const optional = col.nullable ? "?" : "";
+      lines.push(`  ${col.name}${optional}: ${typeStr};`);
+    }
+    lines.push("  _createdAt: string;");
+    lines.push("  _updatedAt?: string | null;");
+    lines.push("  _deletedAt?: string | null;");
+    lines.push("}");
+    lines.push("");
+  }
+  lines.push("export interface Schema {");
+  for (const table of tables) {
+    const interfaceName = tableNameToInterface(table.name);
+    lines.push(`  ${table.name}: ${interfaceName};`);
+  }
+  lines.push("}");
+  lines.push("");
+  lines.push("// Database client with typed tables");
+  lines.push("// This is a proxy that will be populated by the Tether runtime");
+  lines.push("export const db: TetherDatabase<Schema> = createDatabaseProxy<Schema>();");
+  lines.push("");
+  lines.push("// ============================================================================");
+  lines.push("// Typed function wrappers - use these instead of importing from @tthr/server");
+  lines.push("// This ensures the `db` parameter in handlers is properly typed with Schema");
+  lines.push("// ============================================================================");
+  lines.push("");
+  lines.push("/**");
+  lines.push(" * Define a query function with typed database access.");
+  lines.push(" * The `db` parameter in the handler will have full type safety for your schema.");
+  lines.push(" */");
+  lines.push("export function query<TArgs = void, TResult = unknown>(");
+  lines.push("  definition: QueryDefinition<TArgs, TResult, Schema>");
+  lines.push("): QueryDefinition<TArgs, TResult, Schema> {");
+  lines.push("  return baseQuery(definition);");
+  lines.push("}");
+  lines.push("");
+  lines.push("/**");
+  lines.push(" * Define a mutation function with typed database access.");
+  lines.push(" * The `db` parameter in the handler will have full type safety for your schema.");
+  lines.push(" */");
+  lines.push("export function mutation<TArgs = void, TResult = unknown>(");
+  lines.push("  definition: MutationDefinition<TArgs, TResult, Schema>");
+  lines.push("): MutationDefinition<TArgs, TResult, Schema> {");
+  lines.push("  return baseMutation(definition);");
+  lines.push("}");
+  lines.push("");
+  lines.push("// Re-export z for convenience");
+  lines.push("export { z };");
+  if (jsonTypes.size > 0) {
+    lines.push("");
+    lines.push("// Re-export JSON schema types");
+    const typeExports = Array.from(jsonTypes).sort().join(", ");
+    lines.push(`export type { ${typeExports} } from '../schema';`);
+  }
+  lines.push("");
+  return lines.join("\n");
+}
+async function parseFunctionsDir(functionsDir) {
+  const functions = [];
+  if (!await fs3.pathExists(functionsDir)) {
+    return functions;
+  }
+  const files = await fs3.readdir(functionsDir);
+  for (const file of files) {
+    if (!file.endsWith(".ts") && !file.endsWith(".js")) continue;
+    const filePath = path3.join(functionsDir, file);
+    const stat = await fs3.stat(filePath);
+    if (!stat.isFile()) continue;
+    const moduleName = file.replace(/\.(ts|js)$/, "");
+    const source = await fs3.readFile(filePath, "utf-8");
+    const exportRegex = /export\s+const\s+(\w+)\s*=\s*(query|mutation)\s*\(/g;
+    let match;
+    while ((match = exportRegex.exec(source)) !== null) {
+      functions.push({
+        name: match[1],
+        moduleName
+      });
+    }
+  }
+  return functions;
+}
+async function generateApiFile(functionsDir) {
+  const functions = await parseFunctionsDir(functionsDir);
+  const moduleMap = /* @__PURE__ */ new Map();
+  for (const fn of functions) {
+    if (!moduleMap.has(fn.moduleName)) {
+      moduleMap.set(fn.moduleName, []);
+    }
+    moduleMap.get(fn.moduleName).push(fn.name);
+  }
+  const lines = [
+    "// Auto-generated by Tether CLI - do not edit manually",
+    `// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}`,
+    "",
+    "import { createApiProxy } from '@tthr/client';",
+    "",
+    "/**",
+    " * API function reference type for useQuery/useMutation.",
+    ' * The _name property contains the function path (e.g., "users.list").',
+    " */",
+    "export interface ApiFunction<TArgs = unknown, TResult = unknown> {",
+    "  _name: string;",
+    "  _args?: TArgs;",
+    "  _result?: TResult;",
+    "}",
+    ""
+  ];
+  if (moduleMap.size > 0) {
+    for (const [moduleName, fnNames] of moduleMap) {
+      const interfaceName = moduleName.charAt(0).toUpperCase() + moduleName.slice(1) + "Api";
+      lines.push(`export interface ${interfaceName} {`);
+      for (const fnName of fnNames) {
+        lines.push(`  ${fnName}: ApiFunction;`);
+      }
+      lines.push("}");
+      lines.push("");
+    }
+    lines.push("export interface Api {");
+    for (const moduleName of moduleMap.keys()) {
+      const interfaceName = moduleName.charAt(0).toUpperCase() + moduleName.slice(1) + "Api";
+      lines.push(`  ${moduleName}: ${interfaceName};`);
+    }
+    lines.push("}");
+  } else {
+    lines.push("/**");
+    lines.push(" * Flexible API type that allows access to any function path.");
+    lines.push(" * Functions are accessed as api.moduleName.functionName");
+    lines.push(" * The actual types depend on your function definitions.");
+    lines.push(" */");
+    lines.push("export type Api = {");
+    lines.push("  [module: string]: {");
+    lines.push("    [fn: string]: ApiFunction;");
+    lines.push("  };");
+    lines.push("};");
+  }
+  lines.push("");
+  lines.push("// API client proxy - provides typed access to your functions");
+  lines.push("// On the client: returns { _name } references for useQuery/useMutation");
+  lines.push("// In Tether functions: calls the actual function implementation");
+  lines.push("export const api = createApiProxy<Api>();");
+  lines.push("");
+  return lines.join("\n");
+}
+async function generateTypes(options = {}) {
+  const config = await loadConfig();
+  const schemaPath = resolvePath(config.schema);
+  const outputDir = resolvePath(config.output);
+  const functionsDir = resolvePath(config.functions);
+  if (!await fs3.pathExists(schemaPath)) {
+    throw new Error(`Schema file not found: ${schemaPath}`);
+  }
+  const schemaSource = await fs3.readFile(schemaPath, "utf-8");
+  const tables = parseSchemaFile(schemaSource);
+  await fs3.ensureDir(outputDir);
+  await fs3.writeFile(
+    path3.join(outputDir, "db.ts"),
+    generateDbFile(tables)
+  );
+  await fs3.writeFile(
+    path3.join(outputDir, "api.ts"),
+    await generateApiFile(functionsDir)
+  );
+  await fs3.writeFile(
+    path3.join(outputDir, "index.ts"),
+    `// Auto-generated by Tether CLI - do not edit manually
+export * from './db';
+export * from './api';
+`
+  );
+  return { tables, outputDir };
+}
+async function generateCommand() {
+  await requireAuth();
+  const configPath = path3.resolve(process.cwd(), "tether.config.ts");
+  if (!await fs3.pathExists(configPath)) {
+    console.log(chalk2.red("\nError: Not a Tether project"));
+    console.log(chalk2.dim("Run `tthr init` to create a new project\n"));
+    process.exit(1);
+  }
+  console.log(chalk2.bold("\n\u26A1 Generating types from schema\n"));
+  const spinner = ora("Reading schema...").start();
+  try {
+    spinner.text = "Generating types...";
+    const { tables, outputDir } = await generateTypes();
+    if (tables.length === 0) {
+      spinner.warn("No tables found in schema");
+      console.log(chalk2.dim("  Make sure your schema uses defineSchema({ ... })\n"));
+      return;
+    }
+    spinner.succeed(`Types generated for ${tables.length} table(s)`);
+    console.log("\n" + chalk2.green("\u2713") + " Tables:");
+    for (const table of tables) {
+      console.log(chalk2.dim(`  - ${table.name} (${table.columns.length} columns)`));
+    }
+    const relativeOutput = path3.relative(process.cwd(), outputDir);
+    console.log("\n" + chalk2.green("\u2713") + " Generated files:");
+    console.log(chalk2.dim(`  ${relativeOutput}/db.ts`));
+    console.log(chalk2.dim(`  ${relativeOutput}/api.ts`));
+    console.log(chalk2.dim(`  ${relativeOutput}/index.ts
+`));
+  } catch (error) {
+    spinner.fail("Failed to generate types");
+    console.error(chalk2.red(error instanceof Error ? error.message : "Unknown error"));
+    process.exit(1);
+  }
+}
+
+export {
+  getCredentials,
+  requireAuth,
+  saveCredentials,
+  clearCredentials,
+  loadConfig,
+  resolvePath,
+  detectFramework,
+  getFrameworkDevCommand,
+  generateTypes,
+  generateCommand
+};

package/dist/generate-5AY6JNCG.js

@@ -0,0 +1,8 @@
+import {
+  generateCommand,
+  generateTypes
+} from "./chunk-GKELUQ44.js";
+export {
+  generateCommand,
+  generateTypes
+};

package/dist/generate-KZ2UQ2E6.js

@@ -0,0 +1,8 @@
+import {
+  generateCommand,
+  generateTypes
+} from "./chunk-JPZQRYD3.js";
+export {
+  generateCommand,
+  generateTypes
+};

package/dist/index.js

@@ -10,7 +10,7 @@ import {
   requireAuth,
   resolvePath,
   saveCredentials
-} from "./chunk-QAZWXLPE.js";
+} from "./chunk-GKELUQ44.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -274,7 +274,7 @@ function parseSchema(source) {
   ${normalisedContent.split("\n").join("\n  ")}
 }`;
     const columns = {};
-    const columnRegex = /(\w+)\s*:\s*(\w+)(?:<[^>]*>)?\s*\(\s*\)([^,\n]*)/g;
+    const columnRegex = /(\w+)\s*:\s*(\w+)(?:<[^>]*>)?\s*\(\s*\)((?:\[.*?\]|[^,\n}])*)/g;
     let colMatch;
     while ((colMatch = columnRegex.exec(columnsContent)) !== null) {
       const colName = colMatch[1];
@@ -290,12 +290,18 @@ function parseSchema(source) {
           `Cannot use column name "id" in table "${tableName}". Tether automatically adds a "_id" primary key column. Use a different column name or rely on the system-provided "_id".`
         );
       }
+      const oneOfMatch = modifiers.match(/\.oneOf\s*\(\s*\[(.*?)\]\s*\)/);
+      let oneOf;
+      if (oneOfMatch) {
+        oneOf = [...oneOfMatch[1].matchAll(/['"]([^'"]+)['"]/g)].map((m) => m[1]);
+      }
       columns[colName] = {
         type: colType,
         notNull: modifiers.includes(".notNull()"),
         unique: modifiers.includes(".unique()"),
         hasDefault: modifiers.includes(".default("),
-        references: modifiers.match(/\.references\s*\(\s*['"]([^'"]+)['"]\s*\)/)?.[1]
+        references: modifiers.match(/\.references\s*\(\s*['"]([^'"]+)['"]\s*\)/)?.[1],
+        oneOf
       };
     }
     tables.push({ name: tableName, columns, source: tableSource });
@@ -337,6 +343,10 @@ function buildColumnSql(colName, def, forAlterTable = false) {
     const [refTable, refCol] = def.references.split(".");
     colSql += ` REFERENCES "${refTable}"("${refCol || "_id"}")`;
   }
+  if (def.oneOf && def.oneOf.length > 0) {
+    const values = def.oneOf.map((v) => `'${v}'`).join(", ");
+    colSql += ` CHECK ("${colName}" IN (${values}))`;
+  }
   return colSql;
 }
 function generateSchemaSQL(tables) {
@@ -755,7 +765,7 @@ export default defineSchema({
 
   // Example: comments table
   comments: {
-    postId: text().notNull().references('posts._id'),
+    postId: text().notNull().references('posts'),
     content: text().notNull(),
     authorId: text().notNull(),
   },
@@ -1534,7 +1544,7 @@ async function runGenerate(spinner) {
   }
   isGenerating = true;
   try {
-    const { generateTypes: generateTypes2 } = await import("./generate-BBHML7RQ.js");
+    const { generateTypes: generateTypes2 } = await import("./generate-5AY6JNCG.js");
     spinner.text = "Regenerating types...";
     await generateTypes2({ silent: true });
     spinner.succeed("Types regenerated");
@@ -1719,7 +1729,7 @@ async function devCommand(options) {
       }
     }
     spinner.text = "Generating types...";
-    const { generateTypes: generateTypes2 } = await import("./generate-BBHML7RQ.js");
+    const { generateTypes: generateTypes2 } = await import("./generate-5AY6JNCG.js");
     await generateTypes2({ silent: true });
     spinner.succeed("Types generated");
     spinner.start("Setting up file watchers...");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tthr",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "description": "Tether CLI - project scaffolding and deployment",
   "type": "module",
   "bin": {