tthr 0.0.19 → 0.0.21

package/dist/index.js

@@ -1567,6 +1567,195 @@ import chalk5 from "chalk";
 import ora4 from "ora";
 import fs6 from "fs-extra";
 import path6 from "path";
+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 modifiers = match[3] || "";
+    const nullable = !modifiers.includes(".notNull()") && !modifiers.includes(".primaryKey()");
+    const primaryKey = modifiers.includes(".primaryKey()");
+    columns.push({
+      name,
+      type: schemaTypeToTS(schemaType),
+      nullable,
+      primaryKey
+    });
+  }
+  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";
+    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 lines = [
+    "// Auto-generated by Tether CLI - do not edit manually",
+    `// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}`,
+    "",
+    "import { createDatabaseProxy, type TetherDatabase } from '@tthr/client';",
+    ""
+  ];
+  for (const table of tables) {
+    const interfaceName = tableNameToInterface(table.name);
+    lines.push(`export interface ${interfaceName} {`);
+    for (const col of table.columns) {
+      const typeStr = col.nullable ? `${col.type} | null` : col.type;
+      lines.push(`  ${col.name}: ${typeStr};`);
+    }
+    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("");
+  return lines.join("\n");
+}
+async function parseFunctionsDir(functionsDir) {
+  const functions = [];
+  if (!await fs6.pathExists(functionsDir)) {
+    return functions;
+  }
+  const files = await fs6.readdir(functionsDir);
+  for (const file of files) {
+    if (!file.endsWith(".ts") && !file.endsWith(".js")) continue;
+    const filePath = path6.join(functionsDir, file);
+    const stat = await fs6.stat(filePath);
+    if (!stat.isFile()) continue;
+    const moduleName = file.replace(/\.(ts|js)$/, "");
+    const source = await fs6.readFile(filePath, "utf-8");
+    const exportRegex = /export\s+const\s+(\w+)\s*=\s*(query|mutation|action)\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 generateCommand() {
   await requireAuth();
   const configPath = path6.resolve(process.cwd(), "tether.config.ts");
@@ -1581,71 +1770,29 @@ async function generateCommand() {
     const config = await loadConfig();
     const schemaPath = resolvePath(config.schema);
     const outputDir = resolvePath(config.output);
+    const functionsDir = resolvePath(config.functions);
     if (!await fs6.pathExists(schemaPath)) {
       spinner.fail("Schema file not found");
       console.log(chalk5.dim(`Expected: ${schemaPath}
 `));
       process.exit(1);
     }
-    spinner.text = "Generating types...";
+    const schemaSource = await fs6.readFile(schemaPath, "utf-8");
+    const tables = parseSchemaFile(schemaSource);
+    if (tables.length === 0) {
+      spinner.warn("No tables found in schema");
+      console.log(chalk5.dim("  Make sure your schema uses defineSchema({ ... })\n"));
+      return;
+    }
+    spinner.text = `Generating types for ${tables.length} table(s)...`;
     await fs6.ensureDir(outputDir);
     await fs6.writeFile(
       path6.join(outputDir, "db.ts"),
-      `// Auto-generated by Tether CLI - do not edit manually
-// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}
-
-import { createDatabaseProxy, type TetherDatabase } from '@tthr/client';
-
-export interface Post {
-  id: string;
-  title: string;
-  content: string | null;
-  authorId: string;
-  createdAt: string;
-  updatedAt: string;
-}
-
-export interface Comment {
-  id: string;
-  postId: string;
-  content: string;
-  authorId: string;
-  createdAt: string;
-}
-
-export interface Schema {
-  posts: Post;
-  comments: Comment;
-}
-
-// Database client with typed tables
-// This is a proxy that will be populated by the Tether runtime
-export const db: TetherDatabase<Schema> = createDatabaseProxy<Schema>();
-`
+      generateDbFile(tables)
     );
     await fs6.writeFile(
       path6.join(outputDir, "api.ts"),
-      `// Auto-generated by Tether CLI - do not edit manually
-// Generated at: ${(/* @__PURE__ */ new Date()).toISOString()}
-
-import { createApiProxy } from '@tthr/client';
-import type { Schema } from './db';
-
-export interface PostsApi {
-  list: (args?: { limit?: number }) => Promise<Schema['posts'][]>;
-  get: (args: { id: string }) => Promise<Schema['posts'] | null>;
-  create: (args: { title: string; content?: string }) => Promise<{ id: string }>;
-  update: (args: { id: string; title?: string; content?: string }) => Promise<void>;
-  remove: (args: { id: string }) => Promise<void>;
-}
-
-export interface Api {
-  posts: PostsApi;
-}
-
-// API client proxy - will be populated by the Tether runtime
-export const api: Api = createApiProxy<Api>();
-`
+      await generateApiFile(functionsDir)
     );
     await fs6.writeFile(
       path6.join(outputDir, "index.ts"),
@@ -1654,7 +1801,11 @@ export * from './db';
 export * from './api';
 `
     );
-    spinner.succeed("Types generated");
+    spinner.succeed(`Types generated for ${tables.length} table(s)`);
+    console.log("\n" + chalk5.green("\u2713") + " Tables:");
+    for (const table of tables) {
+      console.log(chalk5.dim(`  - ${table.name} (${table.columns.length} columns)`));
+    }
     const relativeOutput = path6.relative(process.cwd(), outputDir);
     console.log("\n" + chalk5.green("\u2713") + " Generated files:");
     console.log(chalk5.dim(`  ${relativeOutput}/db.ts`));

package/package.json

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