@tinybirdco/sdk 0.0.78 → 0.0.79

package/src/cli/config.ts

@@ -7,9 +7,17 @@ import * as path from "path";
 import { config as loadDotenv } from "dotenv";
 import { getCurrentGitBranch, isMainBranch, getTinybirdBranchName } from "./git.js";
 
-// Re-export types from config-types.ts (separate file to avoid bundling esbuild)
-export type { DevMode, TinybirdConfig } from "./config-types.js";
-import type { DevMode, TinybirdConfig } from "./config-types.js";
+// Re-export config types/constants from config-types.ts (separate file to avoid bundling esbuild)
+export {
+  BRANCH_DATA_MODE_VALUES,
+  type BranchDataMode,
+  type DevMode,
+  type TinybirdConfig,
+} from "./config-types.js";
+import { BRANCH_DATA_MODE_VALUES } from "./config-types.js";
+import type { BranchDataMode, DevMode, TinybirdConfig } from "./config-types.js";
+
+const DEFAULT_BRANCH_DATA_MODE: BranchDataMode = "last_partition";
 
 /**
  * Resolved configuration with all values expanded
@@ -33,6 +41,8 @@ export interface ResolvedConfig {
   isMainBranch: boolean;
   /** Development mode: "branch" or "local" */
   devMode: DevMode;
+  /** Branch data mode configured in tinybird.config.json */
+  branchDataMode?: BranchDataMode | null;
 }
 
 /**
@@ -196,6 +206,24 @@ export function findConfigFile(startDir: string): ConfigFileResult | null {
 // Import the universal config loader
 import { loadConfigFile } from "./config-loader.js";
 
+function resolveBranchDataMode(raw: Record<string, unknown>): { mode: BranchDataMode | null; explicit: boolean } {
+  if (raw["branch_data_on_create"] !== undefined) {
+    throw new Error("`branch_data_on_create` has been renamed to `branch_data_mode`.");
+  }
+
+  const value = raw["branch_data_mode"];
+  if (value === undefined || value === null) return { mode: DEFAULT_BRANCH_DATA_MODE, explicit: false };
+  if (typeof value !== "string") throw new Error("branch_data_mode must be a string.");
+  const mode = value.trim().toLowerCase();
+  if (!mode) return { mode: DEFAULT_BRANCH_DATA_MODE, explicit: false };
+  if (!BRANCH_DATA_MODE_VALUES.includes(mode as BranchDataMode)) {
+    throw new Error(
+      `Invalid branch_data_mode '${value}'. Allowed values are: ${BRANCH_DATA_MODE_VALUES.join(", ")}.`
+    );
+  }
+  return { mode: mode as BranchDataMode, explicit: true };
+}
+
 /**
  * Resolve a TinybirdConfig to a ResolvedConfig
  */
@@ -255,6 +283,15 @@ function resolveConfig(config: TinybirdConfig, configPath: string): ResolvedConf
 
   // Resolve devMode (default to "branch")
   const devMode: DevMode = config.devMode ?? "branch";
+  const { mode: branchDataMode, explicit: branchDataModeExplicit } = resolveBranchDataMode(
+    config as unknown as Record<string, unknown>
+  );
+  if (branchDataModeExplicit && branchDataMode && devMode === "local") {
+    console.warn(
+      "branch_data_mode is set in tinybird.config.json but dev_mode='local'. " +
+      "Branch data settings only apply to cloud branches."
+    );
+  }
 
   return {
     include,
@@ -266,6 +303,7 @@ function resolveConfig(config: TinybirdConfig, configPath: string): ResolvedConf
     tinybirdBranch,
     isMainBranch: isMainBranch(),
     devMode,
+    branchDataMode,
   };
 }
 

package/src/cli/index.ts

@@ -270,7 +270,10 @@ function createCli(): Command {
     .option("--debug", "Show debug output including API requests/responses")
     .option("--local", "Use local Tinybird container")
     .option("--branch", "Use Tinybird cloud with branches")
-    .option("--last-partition", "Copy the last partition of production data when creating a branch")
+    .option(
+      "--last-partition",
+      '[DEPRECATED] Use `branch_data_mode: "last_partition"` in tinybird.config.json. Copy the last partition of production data when creating a cloud branch.'
+    )
     .action(async (options) => {
       if (options.debug) {
         process.env.TINYBIRD_DEBUG = "1";
@@ -679,7 +682,10 @@ function createCli(): Command {
     .description("Watch for changes and sync with Tinybird")
     .option("--local", "Use local Tinybird container")
     .option("--branch", "Use Tinybird cloud with branches")
-    .option("--last-partition", "Copy the last partition of production data when creating a branch")
+    .option(
+      "--last-partition",
+      '[DEPRECATED] Use `branch_data_mode: "last_partition"` in tinybird.config.json. Copy the last partition of production data when creating a cloud branch.'
+    )
     .action(async (options) => {
       // Determine devMode override
       let devModeOverride: DevMode | undefined;

package/src/client/base.test.ts

@@ -167,6 +167,7 @@ describe("TinybirdClient", () => {
         tinybirdBranch: "feature_add_fetch",
         isMainBranch: false,
         devMode: "branch",
+        branchDataMode: null,
       });
       mockedGetOrCreateBranch.mockResolvedValue({
         id: "branch-123",
@@ -192,7 +193,8 @@ describe("TinybirdClient", () => {
           token: "workspace-token",
           fetch: customFetch,
         },
-        "feature_add_fetch"
+        "feature_add_fetch",
+        undefined
       );
       expect(context.token).toBe("branch-token");
       expect(context.isBranchToken).toBe(true);

package/src/client/base.ts

@@ -19,6 +19,7 @@ import type {
 } from "./types.js";
 import { TinybirdError } from "./types.js";
 import { TinybirdApi, TinybirdApiError } from "../api/api.js";
+import type { CreateBranchOptions } from "../api/branches.js";
 import { TokensNamespace } from "./tokens.js";
 
 /**
@@ -340,6 +341,10 @@ export class TinybirdClient {
       }
 
       const branchName = config.tinybirdBranch;
+      const branchOptions: CreateBranchOptions | undefined =
+        config.devMode !== "local" && config.branchDataMode === "last_partition"
+          ? { branch_data_mode: "last_partition" }
+          : undefined;
 
       // Get or create branch (always fetch fresh to avoid stale cache issues)
       const branch = await getOrCreateBranch(
@@ -348,7 +353,8 @@ export class TinybirdClient {
           token: this.config.token,
           fetch: this.config.fetch,
         },
-        branchName
+        branchName,
+        branchOptions
       );
 
       if (!branch.token) {

package/src/index.ts

@@ -317,4 +317,4 @@ export type {
 
 // ============ Config Types ============
 // Import from config-types.ts to avoid bundling esbuild in client code
-export type { TinybirdConfig, DevMode } from "./cli/config-types.js";
+export type { TinybirdConfig, DevMode, BranchDataMode } from "./cli/config-types.js";