@tinybirdco/sdk 0.0.29 → 0.0.31

package/src/cli/commands/init.test.ts

@@ -46,45 +46,45 @@ describe("Init Command", () => {
       ).toBe(true);
     });
 
-    it("creates tinybird.json with correct include path for lib/tinybird.ts", async () => {
+    it("creates tinybird.config.json with correct include path for lib/tinybird.ts", async () => {
       const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
-      expect(result.created).toContain("tinybird.json");
+      expect(result.created).toContain("tinybird.config.json");
 
       const config = JSON.parse(
-        fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
+        fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8")
       );
-      expect(config.include).toEqual(["lib/tinybird.ts"]);
+      expect(config.include).toContain("lib/tinybird.ts");
+      expect(config.token).toBe("${TINYBIRD_TOKEN}");
     });
 
-    it("creates tinybird.json with correct include path for src/lib/tinybird.ts", async () => {
+    it("creates tinybird.config.json with correct include path for src/lib/tinybird.ts", async () => {
       fs.mkdirSync(path.join(tempDir, "src"));
 
       const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "src/lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
 
-      const config = JSON.parse(
-        fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
-      );
-      expect(config.include).toEqual(["src/lib/tinybird.ts"]);
+      const content = fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8");
+      expect(content).toContain('"src/lib/tinybird.ts"');
     });
   });
 
   describe("config file creation", () => {
-    it("creates tinybird.json with default values", async () => {
+    it("creates tinybird.config.json with default values", async () => {
       await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       const config = JSON.parse(
-        fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
+        fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8")
       );
 
       expect(config.token).toBe("${TINYBIRD_TOKEN}");
       expect(config.baseUrl).toBe("https://api.tinybird.co");
+      expect(config.devMode).toBe("branch");
     });
 
-    it("updates tinybird.json if it already exists", async () => {
+    it("updates legacy tinybird.json if it already exists", async () => {
       const existingConfig = {
         include: ["custom.ts"],
         token: "existing",
@@ -109,22 +109,46 @@ describe("Init Command", () => {
       expect(config.token).toBe("existing");
     });
 
-    it("overwrites tinybird.json with force option", async () => {
-      const existingConfig = { include: ["custom.ts"], token: "existing" };
+    it("updates tinybird.config.json if it already exists", async () => {
+      const existingConfig = {
+        include: ["custom.ts"],
+        token: "existing",
+        devMode: "local",
+      };
       fs.writeFileSync(
-        path.join(tempDir, "tinybird.json"),
+        path.join(tempDir, "tinybird.config.json"),
         JSON.stringify(existingConfig)
       );
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, force: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
-      expect(result.created).toContain("tinybird.json");
+      expect(result.created).toContain("tinybird.config.json (updated)");
 
+      // Verify include/devMode updated but token preserved
       const config = JSON.parse(
-        fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
+        fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8")
       );
       expect(config.include).toEqual(["lib/tinybird.ts"]);
+      expect(config.devMode).toBe("branch");
+      expect(config.token).toBe("existing");
+    });
+
+    it("overwrites existing config with force option", async () => {
+      const existingConfig = { include: ["custom.ts"], token: "existing" };
+      fs.writeFileSync(
+        path.join(tempDir, "tinybird.json"),
+        JSON.stringify(existingConfig)
+      );
+
+      const result = await runInit({ cwd: tempDir, skipLogin: true, force: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
+
+      expect(result.success).toBe(true);
+      // With force, it creates a new tinybird.config.json
+      expect(result.created).toContain("tinybird.config.json");
+
+      const content = fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8");
+      expect(content).toContain('"lib/tinybird.ts"');
     });
   });
 
@@ -417,11 +441,9 @@ describe("Init Command", () => {
       expect(result.existingDatafiles).toContain("datasources/events.datasource");
       expect(result.existingDatafiles).toContain("pipes/top_events.pipe");
 
-      const config = JSON.parse(
-        fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
-      );
-      expect(config.include).toContain("datasources/events.datasource");
-      expect(config.include).toContain("pipes/top_events.pipe");
+      const content = fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8");
+      expect(content).toContain('"datasources/events.datasource"');
+      expect(content).toContain('"pipes/top_events.pipe"');
     });
 
     it("does not include existing datafiles when user opts out", async () => {
@@ -441,11 +463,9 @@ describe("Init Command", () => {
       expect(result.success).toBe(true);
       expect(result.existingDatafiles).toBeUndefined();
 
-      const config = JSON.parse(
-        fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
-      );
-      expect(config.include).not.toContain("datasources/events.datasource");
-      expect(config.include).toEqual(["lib/tinybird.ts"]);
+      const content = fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8");
+      expect(content).not.toContain("datasources/events.datasource");
+      expect(content).toContain('"lib/tinybird.ts"');
     });
 
     it("preserves TypeScript include paths alongside datafiles", async () => {
@@ -464,12 +484,10 @@ describe("Init Command", () => {
 
       expect(result.success).toBe(true);
 
-      const config = JSON.parse(
-        fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
-      );
+      const content = fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8");
       // Should have both TypeScript file AND datafiles
-      expect(config.include).toContain("lib/tinybird.ts");
-      expect(config.include).toContain("datasources/events.datasource");
+      expect(content).toContain('"lib/tinybird.ts"');
+      expect(content).toContain('"datasources/events.datasource"');
     });
 
     it("handles projects with no existing datafiles", async () => {
@@ -485,10 +503,8 @@ describe("Init Command", () => {
       expect(result.success).toBe(true);
       expect(result.existingDatafiles).toBeUndefined();
 
-      const config = JSON.parse(
-        fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
-      );
-      expect(config.include).toEqual(["lib/tinybird.ts"]);
+      const content = fs.readFileSync(path.join(tempDir, "tinybird.config.json"), "utf-8");
+      expect(content).toContain('"lib/tinybird.ts"');
     });
   });
 });

package/src/cli/commands/init.ts

@@ -10,8 +10,9 @@ import {
   hasValidToken,
   getRelativeTinybirdDir,
   getConfigPath,
+  findExistingConfigPath,
   updateConfig,
-  loadConfig,
+  loadConfigAsync,
   type DevMode,
 } from "../config.js";
 import { browserLogin } from "../auth.js";
@@ -130,6 +131,7 @@ function generateGithubCiWorkflow(workingDirectory?: string): string {
 on:
   pull_request:
     paths:
+      - "${pathPrefix}tinybird.config.*"
       - "${pathPrefix}tinybird.json"
       - "${pathPrefix}**/*.ts"
 
@@ -176,6 +178,7 @@ on:
     branches:
       - main
     paths:
+      - "${pathPrefix}tinybird.config.*"
       - "${pathPrefix}tinybird.json"
       - "${pathPrefix}**/*.ts"
 
@@ -218,6 +221,7 @@ tinybird_ci:
   image: node:22
   rules:
     - changes:
+        - ${pathPrefix}tinybird.config.*
         - ${pathPrefix}tinybird.json
         - ${pathPrefix}**/*.ts
   script:
@@ -246,6 +250,7 @@ tinybird_cd:
   rules:
     - if: '$CI_COMMIT_BRANCH == "main"'
       changes:
+        - ${pathPrefix}tinybird.config.*
         - ${pathPrefix}tinybird.json
         - ${pathPrefix}**/*.ts
   script:
@@ -258,7 +263,7 @@ tinybird_cd:
 }
 
 /**
- * Default config content generator
+ * Default config content generator (for JSON files)
  */
 function createDefaultConfig(
   tinybirdFilePath: string,
@@ -419,7 +424,7 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
 
   if (!options.devMode) {
     // Show interactive prompt for workflow selection
-    p.intro(pc.cyan("tinybird.json"));
+    p.intro(pc.cyan("tinybird.config.json"));
 
     const workflowChoice = await p.select({
       message: "How do you want to develop with Tinybird?",
@@ -589,43 +594,54 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
   const tinybirdFilePath = path.join(cwd, relativeTinybirdDir);
   const tinybirdDir = path.dirname(tinybirdFilePath);
 
-  // Create config file (tinybird.json)
-  const configPath = getConfigPath(cwd);
-  if (fs.existsSync(configPath) && !force) {
-    try {
-      const config = createDefaultConfig(
-        relativeTinybirdDir,
-        devMode,
-        existingDatafiles
-      );
-      updateConfig(configPath, {
-        include: config.include,
-        devMode: config.devMode,
-      });
-      created.push("tinybird.json (updated)");
-    } catch (error) {
-      return {
-        success: false,
-        created,
-        skipped,
-        error: `Failed to update tinybird.json: ${(error as Error).message}`,
-      };
+  // Create or update config file
+  // Check for any existing config file first
+  const existingConfigPath = findExistingConfigPath(cwd);
+  const newConfigPath = getConfigPath(cwd);
+
+  if (existingConfigPath && !force) {
+    // Update existing config file (only if it's JSON)
+    const configFileName = path.basename(existingConfigPath);
+    if (existingConfigPath.endsWith(".json")) {
+      try {
+        const config = createDefaultConfig(
+          relativeTinybirdDir,
+          devMode,
+          existingDatafiles
+        );
+        updateConfig(existingConfigPath, {
+          include: config.include,
+          devMode: config.devMode,
+        });
+        created.push(`${configFileName} (updated)`);
+      } catch (error) {
+        return {
+          success: false,
+          created,
+          skipped,
+          error: `Failed to update ${configFileName}: ${(error as Error).message}`,
+        };
+      }
+    } else {
+      // JS config file exists - skip and let user update manually
+      skipped.push(`${configFileName} (JS config files must be updated manually)`);
     }
   } else {
+    // Create new config file with JSON format
     try {
       const config = createDefaultConfig(
         relativeTinybirdDir,
         devMode,
         existingDatafiles
       );
-      fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n");
-      created.push("tinybird.json");
+      fs.writeFileSync(newConfigPath, JSON.stringify(config, null, 2) + "\n");
+      created.push("tinybird.config.json");
     } catch (error) {
       return {
         success: false,
         created,
         skipped,
-        error: `Failed to create tinybird.json: ${(error as Error).message}`,
+        error: `Failed to create tinybird.config.json: ${(error as Error).message}`,
       };
     }
   }
@@ -841,10 +857,13 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
           created.push(".env.local");
         }
 
-        // If custom base URL, update tinybird.json
+        // If custom base URL, update config file
         const baseUrl = authResult.baseUrl ?? "https://api.tinybird.co";
         if (baseUrl !== "https://api.tinybird.co") {
-          updateConfig(configPath, { baseUrl });
+          const currentConfigPath = findExistingConfigPath(cwd);
+          if (currentConfigPath && currentConfigPath.endsWith(".json")) {
+            updateConfig(currentConfigPath, { baseUrl });
+          }
         }
 
         // Generate TypeScript from existing Tinybird resources if requested
@@ -916,7 +935,7 @@ export async function runInit(options: InitOptions = {}): Promise<InitResult> {
   // (when user is already logged in)
   if (datafileAction === "codegen" && hasValidToken(cwd)) {
     try {
-      const config = loadConfig(cwd);
+      const config = await loadConfigAsync(cwd);
       const tinybirdDir = path.join(cwd, relativeTinybirdDir);
       await runCodegen(
         config.baseUrl,

package/src/cli/commands/login.test.ts

@@ -35,7 +35,7 @@ describe("Login Command", () => {
       const result = await runLogin({ cwd: tempDir });
 
       expect(result.success).toBe(false);
-      expect(result.error).toContain("No tinybird.json found");
+      expect(result.error).toContain("No tinybird config found");
       expect(result.error).toContain("npx tinybird init");
     });
 

package/src/cli/commands/login.ts

@@ -45,14 +45,15 @@ export async function runLogin(options: RunLoginOptions = {}): Promise<LoginResu
   const cwd = options.cwd ?? process.cwd();
 
   // Find the actual config file (may be in parent directory)
-  const configPath = findConfigFile(cwd);
-  if (!configPath) {
+  const configResult = findConfigFile(cwd);
+  if (!configResult) {
     return {
       success: false,
-      error: "No tinybird.json found. Run 'npx tinybird init' first.",
+      error: "No tinybird config found. Run 'npx tinybird init' first.",
     };
   }
 
+  const configPath = configResult.path;
   // Get the directory containing the config file for .env.local
   const configDir = path.dirname(configPath);
 
@@ -72,12 +73,12 @@ export async function runLogin(options: RunLoginOptions = {}): Promise<LoginResu
     };
   }
 
-  // Save token to .env.local (in same directory as tinybird.json)
+  // Save token to .env.local (in same directory as config file)
   try {
     saveTinybirdToken(configDir, authResult.token);
 
-    // Update baseUrl in tinybird.json if it changed
-    if (authResult.baseUrl) {
+    // Update baseUrl in config file if it changed (only for JSON configs)
+    if (authResult.baseUrl && configPath.endsWith(".json")) {
       updateConfig(configPath, {
         baseUrl: authResult.baseUrl,
       });