@zerct/zerct 0.1.3 → 0.1.5

package/README.md

@@ -1,6 +1,6 @@
 # zerct
 
-Deploy Rust backends to Zerct.
+Deploy Rust backends and static frontends to Zerct.
 
 ```sh
 npx @zerct/zerct deploy
@@ -17,6 +17,9 @@ npx zerct deploy
 Zerct expects `Cargo.toml`, `Cargo.lock`, and `zerct.toml`. The app must listen
 on `0.0.0.0:$PORT` and expose the configured health endpoint.
 
+From a full-stack repo root, the same deploy command discovers nested
+`zerct.toml` files and deploys the whole workspace in one command.
+
 On first deploy, the CLI opens browser login, waits for GitHub or Google, stores
 the Zerct session in the OS credential store when available, and continues the
 deploy. Later commands reuse that session.

package/bin/zerct.js

@@ -4,7 +4,7 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSy
 import { homedir } from 'node:os'
 import path from 'node:path'
 
-const VERSION = '0.1.3'
+const VERSION = '0.1.5'
 const DEFAULT_API_URL = 'https://api.zerct.com'
 const ARCHIVE_LIMIT_BYTES = 48 * 1024 * 1024
 const SESSION_DIR = '.zerct'
@@ -46,6 +46,16 @@ const ARCHIVE_EXCLUDES = [
   '.DS_Store'
 ]
 const WALK_EXCLUDED_DIRS = new Set(['.git', 'target', 'node_modules', '.zerct'])
+const WORKSPACE_EXCLUDED_DIRS = new Set([
+  ...WALK_EXCLUDED_DIRS,
+  '.cache',
+  '.next',
+  '.turbo',
+  'build',
+  'coverage',
+  'dist',
+  'vendor'
+])
 
 const HELP = `Zerct ${VERSION}
 
@@ -65,6 +75,7 @@ Usage:
 Agent contract:
   - Rust backends keep Cargo.lock committed, listen on 0.0.0.0:$PORT, and return HTTP 200 from health.
   - Static frontends set kind = "static_frontend", keep TypeScript source, a package lockfile, and typecheck + lint scripts.
+  - Run deploy from a repo root with nested zerct.toml files to deploy the whole workspace in one command.
   - Keep direct unsafe out of Rust source.
 `
 
@@ -369,26 +380,64 @@ async function login(cli) {
 }
 
 async function deploy(projectDir, cli) {
+  const projects = discoverDeployProjects(projectDir)
+  if (projects.length === 0) {
+    throw agentError('missing_project_contract', 'No zerct.toml was found.', 'Run `npx @zerct/zerct init` in each app directory, or pass a project path.', cli.json)
+  }
+
+  if (projects.length === 1) {
+    const project = projects[0]
+    if (project.kind === 'static_frontend' && cli.database) {
+      throw agentError('invalid_database_target', 'Static frontends cannot attach managed Postgres directly.', 'Deploy a Rust backend with managed Postgres and call it from the frontend.', cli.json)
+    }
+    const token = await readOrLoginToken(project.dir, cli)
+    const result = await deployProject(project.dir, cli, token, cli.database)
+    printDeployResult(result, cli)
+    return
+  }
+
+  const token = await readOrLoginToken(projectDir, cli)
+  const results = []
+  if (!cli.json) {
+    console.log(`deploying ${projects.length} projects`)
+  }
+
+  for (const project of projects) {
+    const wantsDatabase = cli.database && project.kind === 'rust_backend'
+    if (!cli.json) {
+      console.log(`checking ${project.relative}`)
+    }
+    const response = await deployProject(project.dir, cli, token, wantsDatabase)
+    results.push({ project, wantsDatabase, response })
+    if (!cli.json) {
+      console.log(`${project.relative} queued ${response.build_job.id}`)
+      console.log(`${project.relative} url ${response.app.url}`)
+    }
+  }
+
+  printWorkspaceDeployResults(projectDir, results, cli)
+}
+
+async function deployProject(projectDir, cli, token, wantsDatabase) {
   const report = runDoctor(projectDir)
   if (!report.ok) {
     const firstFailure = report.checks.find((check) => !check.ok)
     throw agentError('doctor_failed', 'Zerct doctor failed.', firstFailure?.agent_instruction || 'Fix the failed checks and retry.', cli.json)
   }
-  if (report.config?.kind === 'static_frontend' && cli.database) {
-    throw agentError('invalid_database_target', 'Static frontends cannot attach managed Postgres directly.', 'Deploy a Rust backend with managed Postgres and call it from the frontend.', cli.json)
-  }
 
-  const token = await readOrLoginToken(projectDir, cli)
   const archive = createArchiveBase64(projectDir)
   const commitSha = gitCommitSha(projectDir)
   const body = {
     config: report.config,
     commit_sha: commitSha,
-    wants_database: cli.database,
+    wants_database: wantsDatabase,
     source_archive_base64: archive
   }
 
-  const response = await apiRequest(cli, 'POST', '/v1/deployments', token, body)
+  return apiRequest(cli, 'POST', '/v1/deploy', token, body)
+}
+
+function printDeployResult(response, cli) {
   if (cli.json) {
     console.log(JSON.stringify(response, null, 2))
     return
@@ -400,6 +449,27 @@ async function deploy(projectDir, cli) {
   console.log(`next npx @zerct/zerct logs --app ${response.app.id}`)
 }
 
+function printWorkspaceDeployResults(projectDir, results, cli) {
+  if (cli.json) {
+    console.log(JSON.stringify({
+      workspace: projectDir,
+      deploys: results.map((result) => ({
+        path: result.project.relative,
+        kind: result.project.kind,
+        wants_database: result.wantsDatabase,
+        app: result.response.app,
+        build_job: result.response.build_job
+      }))
+    }, null, 2))
+    return
+  }
+
+  const firstApp = results[0]?.response?.app?.id
+  if (firstApp) {
+    console.log(`next npx @zerct/zerct logs --app ${firstApp}`)
+  }
+}
+
 async function logs(cli) {
   const response = await appGet(cli, 'logs')
   if (cli.json) {
@@ -983,6 +1053,59 @@ function packageScriptCheck(projectDir, script) {
   }
 }
 
+function discoverDeployProjects(rootDir) {
+  ensureDirectory(rootDir)
+  if (existsSync(path.join(rootDir, 'zerct.toml'))) {
+    return [deployProjectInfo(rootDir, rootDir)]
+  }
+
+  const projectDirs = []
+  discoverProjectDirs(rootDir, projectDirs)
+  return projectDirs
+    .map((dir) => deployProjectInfo(dir, rootDir))
+    .sort(compareDeployProjects)
+}
+
+function discoverProjectDirs(dir, projectDirs) {
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    if (!entry.isDirectory() || WORKSPACE_EXCLUDED_DIRS.has(entry.name)) {
+      continue
+    }
+
+    const child = path.join(dir, entry.name)
+    if (existsSync(path.join(child, 'zerct.toml'))) {
+      projectDirs.push(child)
+      continue
+    }
+    discoverProjectDirs(child, projectDirs)
+  }
+}
+
+function deployProjectInfo(dir, rootDir) {
+  const relative = path.relative(rootDir, dir).replace(/\\/gu, '/') || '.'
+  try {
+    const config = parseZerctToml(readFileSync(path.join(dir, 'zerct.toml'), 'utf8'), dir)
+    return { dir, relative, kind: config.kind }
+  } catch (_error) {
+    return { dir, relative, kind: 'unknown' }
+  }
+}
+
+function compareDeployProjects(left, right) {
+  return kindOrder(left.kind) - kindOrder(right.kind)
+    || left.relative.localeCompare(right.relative)
+}
+
+function kindOrder(kind) {
+  if (kind === 'rust_backend') {
+    return 0
+  }
+  if (kind === 'static_frontend') {
+    return 1
+  }
+  return 2
+}
+
 function isSafeRelativePath(value) {
   return value
     && !path.isAbsolute(value)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zerct/zerct",
-  "version": "0.1.3",
-  "description": "Deploy Rust backends to Zerct.",
+  "version": "0.1.5",
+  "description": "Deploy Rust backends and static frontends to Zerct.",
   "type": "module",
   "bin": {
     "zerct": "bin/zerct.js"