@tinybirdco/sdk 0.0.4 → 0.0.7

package/src/cli/commands/build.ts

@@ -1,11 +1,10 @@
 /**
- * Build command - generates and pushes resources to Tinybird
+ * Build command - generates and pushes resources to Tinybird branches
  */
 
 import { loadConfig, LOCAL_BASE_URL, type ResolvedConfig, type DevMode } from "../config.js";
 import { buildFromInclude, type BuildFromIncludeResult } from "../../generator/index.js";
 import { buildToTinybird, type BuildApiResult } from "../../api/build.js";
-import { deployToMain } from "../../api/deploy.js";
 import { getOrCreateBranch } from "../../api/branches.js";
 import {
   getLocalTokens,
@@ -24,8 +23,6 @@ export interface BuildCommandOptions {
   dryRun?: boolean;
   /** Override the token from config (used for branch tokens) */
   tokenOverride?: string;
-  /** Use /v1/deploy instead of /v1/build (for main branch) */
-  useDeployEndpoint?: boolean;
   /** Override the devMode from config */
   devModeOverride?: DevMode;
 }
@@ -49,7 +46,8 @@ export interface BuildCommandResult {
 /**
  * Run the build command
  *
- * Loads the schema, generates resources, and pushes to Tinybird API.
+ * Builds resources and pushes to Tinybird branches (not main).
+ * Use runDeploy for deploying to production.
  *
  * @param options - Build options
  * @returns Build command result
@@ -150,12 +148,19 @@ export async function runBuild(options: BuildCommandOptions = {}): Promise<Build
       };
     }
   } else {
-    // Branch mode (default) - existing logic
-    // Deploy to Tinybird
-    // Determine token and endpoint based on git branch
-    let effectiveToken = options.tokenOverride ?? config.token;
-    // Use deploy endpoint if on main branch OR if no branch can be detected
-    let useDeployEndpoint = options.useDeployEndpoint ?? (config.isMainBranch || !config.tinybirdBranch);
+    // Branch mode (default)
+    // Prevent building to main - must use deploy command
+    // Skip this check if tokenOverride is provided (dev command passes branch token)
+    const isMainBranch = config.isMainBranch || !config.tinybirdBranch;
+
+    if (isMainBranch && !options.tokenOverride) {
+      return {
+        success: false,
+        build: buildResult,
+        error: `Cannot deploy to main workspace with 'build' command. Use 'tinybird deploy' to deploy to production, or switch to a feature branch.`,
+        durationMs: Date.now() - startTime,
+      };
+    }
 
     if (debug) {
       console.log(`[debug] isMainBranch: ${config.isMainBranch}`);
@@ -163,8 +168,10 @@ export async function runBuild(options: BuildCommandOptions = {}): Promise<Build
       console.log(`[debug] tokenOverride: ${!!options.tokenOverride}`);
     }
 
-    // For feature branches, get or create the Tinybird branch and use its token
-    if (!config.isMainBranch && config.tinybirdBranch && !options.tokenOverride) {
+    let effectiveToken = options.tokenOverride ?? config.token;
+
+    // Get or create the Tinybird branch and use its token
+    if (!options.tokenOverride) {
       if (debug) {
         console.log(`[debug] Getting/creating Tinybird branch: ${config.tinybirdBranch}`);
       }
@@ -174,7 +181,7 @@ export async function runBuild(options: BuildCommandOptions = {}): Promise<Build
             baseUrl: config.baseUrl,
             token: config.token,
           },
-          config.tinybirdBranch
+          config.tinybirdBranch!
         );
 
         if (!tinybirdBranch.token) {
@@ -187,7 +194,6 @@ export async function runBuild(options: BuildCommandOptions = {}): Promise<Build
         }
 
         effectiveToken = tinybirdBranch.token;
-        useDeployEndpoint = false; // Always use /v1/build for branches
         if (debug) {
           console.log(`[debug] Using branch token for branch: ${config.tinybirdBranch}`);
         }
@@ -202,24 +208,14 @@ export async function runBuild(options: BuildCommandOptions = {}): Promise<Build
     }
 
     try {
-      // Use /v1/deploy for main branch, /v1/build for feature branches
-      if (useDeployEndpoint) {
-        deployResult = await deployToMain(
-          {
-            baseUrl: config.baseUrl,
-            token: effectiveToken,
-          },
-          buildResult.resources
-        );
-      } else {
-        deployResult = await buildToTinybird(
-          {
-            baseUrl: config.baseUrl,
-            token: effectiveToken,
-          },
-          buildResult.resources
-        );
-      }
+      // Always use /v1/build for branches
+      deployResult = await buildToTinybird(
+        {
+          baseUrl: config.baseUrl,
+          token: effectiveToken,
+        },
+        buildResult.resources
+      );
     } catch (error) {
       return {
         success: false,

package/src/cli/commands/deploy.ts

@@ -0,0 +1,131 @@
+/**
+ * Deploy command - deploys resources to main Tinybird workspace
+ */
+
+import { loadConfig, type ResolvedConfig } from "../config.js";
+import { buildFromInclude, type BuildFromIncludeResult } from "../../generator/index.js";
+import { deployToMain } from "../../api/deploy.js";
+import type { BuildApiResult } from "../../api/build.js";
+
+/**
+ * Deploy command options
+ */
+export interface DeployCommandOptions {
+  /** Working directory (defaults to cwd) */
+  cwd?: string;
+  /** Skip pushing to API (just generate) */
+  dryRun?: boolean;
+  /** Validate deploy with Tinybird API without applying */
+  check?: boolean;
+}
+
+/**
+ * Deploy command result
+ */
+export interface DeployCommandResult {
+  /** Whether the deploy was successful */
+  success: boolean;
+  /** Build result with generated resources */
+  build?: BuildFromIncludeResult;
+  /** Deploy API result (if not dry run) */
+  deploy?: BuildApiResult;
+  /** Error message if failed */
+  error?: string;
+  /** Duration in milliseconds */
+  durationMs: number;
+}
+
+/**
+ * Run the deploy command
+ *
+ * Builds resources and deploys to main Tinybird workspace (production).
+ *
+ * @param options - Deploy options
+ * @returns Deploy command result
+ */
+export async function runDeploy(options: DeployCommandOptions = {}): Promise<DeployCommandResult> {
+  const startTime = Date.now();
+  const cwd = options.cwd ?? process.cwd();
+
+  // Load config
+  let config: ResolvedConfig;
+  try {
+    config = loadConfig(cwd);
+  } catch (error) {
+    return {
+      success: false,
+      error: (error as Error).message,
+      durationMs: Date.now() - startTime,
+    };
+  }
+
+  // Build resources from include paths
+  let buildResult: BuildFromIncludeResult;
+  try {
+    buildResult = await buildFromInclude({
+      includePaths: config.include,
+      cwd: config.cwd,
+    });
+  } catch (error) {
+    return {
+      success: false,
+      error: `Build failed: ${(error as Error).message}`,
+      durationMs: Date.now() - startTime,
+    };
+  }
+
+  // If dry run, return without pushing
+  if (options.dryRun) {
+    return {
+      success: true,
+      build: buildResult,
+      durationMs: Date.now() - startTime,
+    };
+  }
+
+  const debug = !!process.env.TINYBIRD_DEBUG;
+
+  if (debug) {
+    console.log(`[debug] Deploying to main workspace`);
+    console.log(`[debug] baseUrl: ${config.baseUrl}`);
+  }
+
+  // Deploy to main workspace using /v1/deploy endpoint
+  let deployResult: BuildApiResult;
+  try {
+    deployResult = await deployToMain(
+      {
+        baseUrl: config.baseUrl,
+        token: config.token,
+      },
+      buildResult.resources,
+      {
+        check: options.check,
+      }
+    );
+  } catch (error) {
+    return {
+      success: false,
+      build: buildResult,
+      error: `Deploy failed: ${(error as Error).message}`,
+      durationMs: Date.now() - startTime,
+    };
+  }
+
+  if (!deployResult.success) {
+    return {
+      success: false,
+      build: buildResult,
+      deploy: deployResult,
+      error: deployResult.error,
+      durationMs: Date.now() - startTime,
+    };
+  }
+
+  return {
+    success: true,
+    build: buildResult,
+    deploy: deployResult,
+    durationMs: Date.now() - startTime,
+  };
+}

package/src/cli/commands/dev.ts

@@ -187,9 +187,16 @@ export async function runDev(options: DevCommandOptions = {}): Promise<DevContro
     };
   } else {
     // Branch mode: use Tinybird cloud with branches
-    // If we're on a feature branch, get or create the Tinybird branch
+    // Prevent dev mode on main branch - must use deploy command
+    if (config.isMainBranch || !config.tinybirdBranch) {
+      throw new Error(
+        `Cannot use 'dev' command on main branch. Use 'tinybird deploy' to deploy to production, or switch to a feature branch.`
+      );
+    }
+
+    // Get or create the Tinybird branch
     // Use tinybirdBranch (sanitized name) for Tinybird API, gitBranch for display
-    if (!config.isMainBranch && config.tinybirdBranch) {
+    if (config.tinybirdBranch) {
       const branchName = config.tinybirdBranch; // Sanitized name for Tinybird
 
       // Always fetch fresh from API to avoid stale cache issues
@@ -246,10 +253,10 @@ export async function runDev(options: DevCommandOptions = {}): Promise<DevContro
     options.onBuildStart?.();
 
     try {
+      // Always use runBuild - main branch is blocked at startup
       const result = await runBuild({
         cwd: config.cwd,
         tokenOverride: effectiveToken,
-        useDeployEndpoint: devMode !== "local" && config.isMainBranch,
         devModeOverride: devMode,
       });
       options.onBuildComplete?.(result);