@tthr/cli 0.0.2 → 0.0.4

package/dist/index.js

@@ -1356,76 +1356,339 @@ async function showStatus(migrationsDir) {
   }
 }
 
-// src/commands/login.ts
+// src/commands/deploy.ts
 import chalk6 from "chalk";
 import ora5 from "ora";
+import fs6 from "fs-extra";
+import path6 from "path";
 var isDev2 = process.env.NODE_ENV === "development" || process.env.TETHER_DEV === "true";
 var API_URL2 = isDev2 ? "http://localhost:3001/api/v1" : "https://tthr.io/api/v1";
-var AUTH_URL = isDev2 ? "http://localhost:3000/cli" : "https://tthr.io/cli";
+async function deployCommand(options) {
+  const credentials = await requireAuth();
+  const configPath = path6.resolve(process.cwd(), "tether.config.ts");
+  if (!await fs6.pathExists(configPath)) {
+    console.log(chalk6.red("\nError: Not a Tether project"));
+    console.log(chalk6.dim("Run `tthr init` to create a new project\n"));
+    process.exit(1);
+  }
+  const envPath = path6.resolve(process.cwd(), ".env");
+  let projectId;
+  if (await fs6.pathExists(envPath)) {
+    const envContent = await fs6.readFile(envPath, "utf-8");
+    const match = envContent.match(/TETHER_PROJECT_ID=(.+)/);
+    projectId = match?.[1]?.trim();
+  }
+  if (!projectId) {
+    console.log(chalk6.red("\nError: Project ID not found"));
+    console.log(chalk6.dim("Make sure TETHER_PROJECT_ID is set in your .env file\n"));
+    process.exit(1);
+  }
+  console.log(chalk6.bold("\n\u26A1 Deploying to Tether\n"));
+  console.log(chalk6.dim(`  Project: ${projectId}`));
+  console.log(chalk6.dim(`  API: ${API_URL2}
+`));
+  const deploySchema = options.schema || !options.schema && !options.functions;
+  const deployFunctions = options.functions || !options.schema && !options.functions;
+  if (deploySchema) {
+    await deploySchemaToServer(projectId, credentials.accessToken, options.dryRun);
+  }
+  if (deployFunctions) {
+    await deployFunctionsToServer(projectId, credentials.accessToken, options.dryRun);
+  }
+  console.log(chalk6.green("\n\u2713 Deployment complete\n"));
+}
+async function deploySchemaToServer(projectId, token, dryRun) {
+  const spinner = ora5("Reading schema...").start();
+  try {
+    const schemaPath = path6.resolve(process.cwd(), "tether", "schema.ts");
+    if (!await fs6.pathExists(schemaPath)) {
+      spinner.warn("No schema file found");
+      console.log(chalk6.dim("  Create tether/schema.ts to define your database schema\n"));
+      return;
+    }
+    const schemaSource = await fs6.readFile(schemaPath, "utf-8");
+    const tables = parseSchema(schemaSource);
+    spinner.text = `Found ${tables.length} table(s)`;
+    if (dryRun) {
+      spinner.info("Dry run - would deploy schema:");
+      for (const table of tables) {
+        console.log(chalk6.dim(`  - ${table.name}`));
+      }
+      return;
+    }
+    const sql = generateSchemaSQL(tables);
+    spinner.text = "Deploying schema...";
+    const response = await fetch(`${API_URL2}/${projectId}/mutation`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        function: "_migrate",
+        args: { sql }
+      })
+    });
+    if (!response.ok) {
+      const error = await response.json().catch(() => ({ error: "Unknown error" }));
+      throw new Error(error.error || `HTTP ${response.status}`);
+    }
+    spinner.succeed(`Schema deployed (${tables.length} table(s))`);
+  } catch (error) {
+    spinner.fail("Failed to deploy schema");
+    console.error(chalk6.red(error instanceof Error ? error.message : "Unknown error"));
+  }
+}
+async function deployFunctionsToServer(projectId, token, dryRun) {
+  const spinner = ora5("Reading functions...").start();
+  try {
+    const functionsDir = path6.resolve(process.cwd(), "tether", "functions");
+    if (!await fs6.pathExists(functionsDir)) {
+      spinner.warn("No functions directory found");
+      console.log(chalk6.dim("  Create tether/functions/ to define your API functions\n"));
+      return;
+    }
+    const files = await fs6.readdir(functionsDir);
+    const tsFiles = files.filter((f) => f.endsWith(".ts"));
+    if (tsFiles.length === 0) {
+      spinner.info("No function files found");
+      return;
+    }
+    const functions = [];
+    for (const file of tsFiles) {
+      const filePath = path6.join(functionsDir, file);
+      const source = await fs6.readFile(filePath, "utf-8");
+      const moduleName = file.replace(".ts", "");
+      const parsedFunctions = parseFunctions(moduleName, source);
+      functions.push(...parsedFunctions);
+    }
+    spinner.text = `Found ${functions.length} function(s)`;
+    if (dryRun) {
+      spinner.info("Dry run - would deploy functions:");
+      for (const fn of functions) {
+        const icon = fn.type === "query" ? "\u{1F50D}" : fn.type === "mutation" ? "\u270F\uFE0F" : "\u26A1";
+        console.log(chalk6.dim(`  ${icon} ${fn.name} (${fn.type})`));
+      }
+      return;
+    }
+    spinner.text = "Deploying functions...";
+    const response = await fetch(`${API_URL2}/${projectId}/deploy/functions`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        functions: functions.map((fn) => ({
+          name: fn.name,
+          type: fn.type,
+          source: fn.source
+        }))
+      })
+    });
+    if (!response.ok) {
+      const error = await response.json().catch(() => ({ error: "Unknown error" }));
+      throw new Error(error.error || `HTTP ${response.status}`);
+    }
+    spinner.succeed(`Functions deployed (${functions.length} function(s))`);
+    const queries = functions.filter((f) => f.type === "query");
+    const mutations = functions.filter((f) => f.type === "mutation");
+    const actions = functions.filter((f) => f.type === "action");
+    if (queries.length > 0) {
+      console.log(chalk6.dim(`
+  Queries:`));
+      for (const fn of queries) {
+        console.log(chalk6.dim(`    - ${fn.name}`));
+      }
+    }
+    if (mutations.length > 0) {
+      console.log(chalk6.dim(`
+  Mutations:`));
+      for (const fn of mutations) {
+        console.log(chalk6.dim(`    - ${fn.name}`));
+      }
+    }
+    if (actions.length > 0) {
+      console.log(chalk6.dim(`
+  Actions:`));
+      for (const fn of actions) {
+        console.log(chalk6.dim(`    - ${fn.name}`));
+      }
+    }
+  } catch (error) {
+    spinner.fail("Failed to deploy functions");
+    console.error(chalk6.red(error instanceof Error ? error.message : "Unknown error"));
+  }
+}
+function parseSchema(source) {
+  const tables = [];
+  const schemaMatch = source.match(/defineSchema\s*\(\s*\{([\s\S]*)\}\s*\)/);
+  if (!schemaMatch) return tables;
+  const schemaContent = schemaMatch[1];
+  const tableRegex = /(\w+)\s*:\s*\{([^}]+(?:\{[^}]*\}[^}]*)*)\}/g;
+  let match;
+  while ((match = tableRegex.exec(schemaContent)) !== null) {
+    const tableName = match[1];
+    const columnsContent = match[2];
+    const columns = {};
+    const columnRegex = /(\w+)\s*:\s*(\w+)\s*\(\s*\)([^,\n]*)/g;
+    let colMatch;
+    while ((colMatch = columnRegex.exec(columnsContent)) !== null) {
+      const colName = colMatch[1];
+      const colType = colMatch[2];
+      const modifiers = colMatch[3];
+      columns[colName] = {
+        type: colType,
+        primaryKey: modifiers.includes(".primaryKey()"),
+        notNull: modifiers.includes(".notNull()"),
+        unique: modifiers.includes(".unique()"),
+        hasDefault: modifiers.includes(".default("),
+        references: modifiers.match(/\.references\s*\(\s*['"]([^'"]+)['"]\s*\)/)?.[1]
+      };
+    }
+    tables.push({ name: tableName, columns });
+  }
+  return tables;
+}
+function generateSchemaSQL(tables) {
+  const statements = [];
+  for (const table of tables) {
+    const columnDefs = [];
+    for (const [colName, colDef] of Object.entries(table.columns)) {
+      const def = colDef;
+      let sqlType = "TEXT";
+      switch (def.type) {
+        case "text":
+          sqlType = "TEXT";
+          break;
+        case "integer":
+          sqlType = "INTEGER";
+          break;
+        case "real":
+          sqlType = "REAL";
+          break;
+        case "blob":
+          sqlType = "BLOB";
+          break;
+        case "timestamp":
+          sqlType = "TEXT";
+          break;
+        case "boolean":
+          sqlType = "INTEGER";
+          break;
+        case "json":
+          sqlType = "TEXT";
+          break;
+      }
+      let colSql = `${colName} ${sqlType}`;
+      if (def.primaryKey) colSql += " PRIMARY KEY";
+      if (def.notNull) colSql += " NOT NULL";
+      if (def.unique) colSql += " UNIQUE";
+      if (def.hasDefault && def.type === "timestamp") {
+        colSql += " DEFAULT (datetime('now'))";
+      }
+      if (def.references) {
+        const [refTable, refCol] = def.references.split(".");
+        colSql += ` REFERENCES ${refTable}(${refCol})`;
+      }
+      columnDefs.push(colSql);
+    }
+    statements.push(
+      `CREATE TABLE IF NOT EXISTS ${table.name} (
+  ${columnDefs.join(",\n  ")}
+);`
+    );
+  }
+  return statements.join("\n\n");
+}
+function parseFunctions(moduleName, source) {
+  const functions = [];
+  const fnRegex = /export\s+const\s+(\w+)\s*=\s*(query|mutation|action)\s*\(\s*\{([\s\S]*?)\}\s*\)/g;
+  let match;
+  while ((match = fnRegex.exec(source)) !== null) {
+    const fnName = match[1];
+    const fnType = match[2];
+    const fnBody = match[3];
+    functions.push({
+      name: `${moduleName}.${fnName}`,
+      type: fnType,
+      file: `${moduleName}.ts`,
+      source: `${fnType}({${fnBody}})`
+    });
+  }
+  return functions;
+}
+
+// src/commands/login.ts
+import chalk7 from "chalk";
+import ora6 from "ora";
+var isDev3 = process.env.NODE_ENV === "development" || process.env.TETHER_DEV === "true";
+var API_URL3 = isDev3 ? "http://localhost:3001/api/v1" : "https://tthr.io/api/v1";
+var AUTH_URL = isDev3 ? "http://localhost:3000/cli" : "https://tthr.io/cli";
 async function loginCommand() {
-  console.log(chalk6.bold("\u26A1 Login to Tether\n"));
+  console.log(chalk7.bold("\u26A1 Login to Tether\n"));
   const existing = await getCredentials();
   if (existing) {
-    console.log(chalk6.green("\u2713") + ` Already logged in as ${chalk6.cyan(existing.email)}`);
-    console.log(chalk6.dim("\nRun `tthr logout` to sign out\n"));
+    console.log(chalk7.green("\u2713") + ` Already logged in as ${chalk7.cyan(existing.email)}`);
+    console.log(chalk7.dim("\nRun `tthr logout` to sign out\n"));
     return;
   }
-  const spinner = ora5("Generating authentication code...").start();
+  const spinner = ora6("Generating authentication code...").start();
   try {
     const deviceCode = await requestDeviceCode();
     spinner.stop();
     const authUrl = `${AUTH_URL}/${deviceCode.userCode}`;
-    console.log(chalk6.dim("Open this URL in your browser to authenticate:\n"));
-    console.log(chalk6.cyan.bold(`  ${authUrl}
+    console.log(chalk7.dim("Open this URL in your browser to authenticate:\n"));
+    console.log(chalk7.cyan.bold(`  ${authUrl}
 `));
-    console.log(chalk6.dim(`Your code: ${chalk6.white.bold(deviceCode.userCode)}
+    console.log(chalk7.dim(`Your code: ${chalk7.white.bold(deviceCode.userCode)}
 `));
     const credentials = await pollForApproval(deviceCode.deviceCode, deviceCode.interval, deviceCode.expiresIn);
     await saveCredentials(credentials);
-    console.log(chalk6.green("\u2713") + ` Logged in as ${chalk6.cyan(credentials.email)}`);
+    console.log(chalk7.green("\u2713") + ` Logged in as ${chalk7.cyan(credentials.email)}`);
     console.log();
   } catch (error) {
     spinner.fail("Authentication failed");
-    console.error(chalk6.red(error instanceof Error ? error.message : "Unknown error"));
-    console.log(chalk6.dim("\nTry again or visit https://tthr.io/docs/cli for help\n"));
+    console.error(chalk7.red(error instanceof Error ? error.message : "Unknown error"));
+    console.log(chalk7.dim("\nTry again or visit https://tthr.io/docs/cli for help\n"));
     process.exit(1);
   }
 }
 async function logoutCommand() {
-  console.log(chalk6.bold("\n\u26A1 Logout from Tether\n"));
+  console.log(chalk7.bold("\n\u26A1 Logout from Tether\n"));
   const credentials = await getCredentials();
   if (!credentials) {
-    console.log(chalk6.dim("Not logged in\n"));
+    console.log(chalk7.dim("Not logged in\n"));
     return;
   }
-  const spinner = ora5("Logging out...").start();
+  const spinner = ora6("Logging out...").start();
   try {
     await clearCredentials();
-    spinner.succeed(`Logged out from ${chalk6.cyan(credentials.email)}`);
+    spinner.succeed(`Logged out from ${chalk7.cyan(credentials.email)}`);
     console.log();
   } catch (error) {
     spinner.fail("Logout failed");
-    console.error(chalk6.red(error instanceof Error ? error.message : "Unknown error"));
+    console.error(chalk7.red(error instanceof Error ? error.message : "Unknown error"));
     process.exit(1);
   }
 }
 async function whoamiCommand() {
   const credentials = await getCredentials();
   if (!credentials) {
-    console.log(chalk6.dim("\nNot logged in"));
-    console.log(chalk6.dim("Run `tthr login` to authenticate\n"));
+    console.log(chalk7.dim("\nNot logged in"));
+    console.log(chalk7.dim("Run `tthr login` to authenticate\n"));
     return;
   }
-  console.log(chalk6.bold("\n\u26A1 Current user\n"));
-  console.log(`  Email:   ${chalk6.cyan(credentials.email)}`);
-  console.log(`  User ID: ${chalk6.dim(credentials.userId)}`);
+  console.log(chalk7.bold("\n\u26A1 Current user\n"));
+  console.log(`  Email:   ${chalk7.cyan(credentials.email)}`);
+  console.log(`  User ID: ${chalk7.dim(credentials.userId)}`);
   if (credentials.expiresAt) {
     const expiresAt = new Date(credentials.expiresAt);
     const now = /* @__PURE__ */ new Date();
     if (expiresAt > now) {
-      console.log(`  Session: ${chalk6.green("Active")}`);
+      console.log(`  Session: ${chalk7.green("Active")}`);
     } else {
-      console.log(`  Session: ${chalk6.yellow("Expired")}`);
+      console.log(`  Session: ${chalk7.yellow("Expired")}`);
     }
   }
   console.log();
@@ -1446,7 +1709,7 @@ function generateUserCode() {
 async function requestDeviceCode() {
   const userCode = generateUserCode();
   const deviceCode = crypto.randomUUID();
-  const response = await fetch(`${API_URL2}/auth/device`, {
+  const response = await fetch(`${API_URL3}/auth/device`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ userCode, deviceCode })
@@ -1466,21 +1729,21 @@ async function requestDeviceCode() {
 async function pollForApproval(deviceCode, interval, expiresIn) {
   const startTime = Date.now();
   const expiresAt = startTime + expiresIn * 1e3;
-  const spinner = ora5("").start();
+  const spinner = ora6("").start();
   const updateCountdown = () => {
     const remaining = Math.max(0, Math.ceil((expiresAt - Date.now()) / 1e3));
     const mins = Math.floor(remaining / 60);
     const secs = remaining % 60;
     const timeStr = mins > 0 ? `${mins}:${secs.toString().padStart(2, "0")}` : `${secs}s`;
-    spinner.text = `Waiting for approval... ${chalk6.dim(`(${timeStr} remaining)`)}`;
+    spinner.text = `Waiting for approval... ${chalk7.dim(`(${timeStr} remaining)`)}`;
   };
   updateCountdown();
   const countdownInterval = setInterval(updateCountdown, 1e3);
   try {
     while (Date.now() < expiresAt) {
       await sleep(interval * 1e3);
-      spinner.text = `Checking... ${chalk6.dim(`(${Math.ceil((expiresAt - Date.now()) / 1e3)}s remaining)`)}`;
-      const response = await fetch(`${API_URL2}/auth/device/${deviceCode}`, {
+      spinner.text = `Checking... ${chalk7.dim(`(${Math.ceil((expiresAt - Date.now()) / 1e3)}s remaining)`)}`;
+      const response = await fetch(`${API_URL3}/auth/device/${deviceCode}`, {
         method: "GET"
       }).catch(() => null);
       updateCountdown();
@@ -1518,6 +1781,7 @@ program.command("init [name]").description("Create a new Tether project").option
 program.command("dev").description("Start local development server with hot reload").option("-p, --port <port>", "Port to run on", "3001").action(devCommand);
 program.command("generate").alias("gen").description("Generate types from schema").action(generateCommand);
 program.command("migrate").description("Database migrations").argument("[action]", "Migration action: create, up, down, status", "status").option("-n, --name <name>", "Migration name (for create)").action(migrateCommand);
+program.command("deploy").description("Deploy schema and functions to Tether").option("-s, --schema", "Deploy schema only").option("-f, --functions", "Deploy functions only").option("--dry-run", "Show what would be deployed without deploying").action(deployCommand);
 program.command("login").description("Authenticate with Tether").action(loginCommand);
 program.command("logout").description("Sign out of Tether").action(logoutCommand);
 program.command("whoami").description("Show current authenticated user").action(whoamiCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tthr/cli",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Tether CLI - project scaffolding, migrations, and deployment",
   "type": "module",
   "bin": {