@tinybirdco/sdk 0.0.8 → 0.0.9

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

@@ -25,41 +25,29 @@ describe("Init Command", () => {
   });
 
   describe("folder structure creation", () => {
-    it("creates tinybird folder with datasources.ts, endpoints.ts, client.ts when project has no src folder", async () => {
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+    it("creates lib/tinybird.ts when project has no src folder", 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/datasources.ts");
-      expect(result.created).toContain("tinybird/endpoints.ts");
-      expect(result.created).toContain("tinybird/client.ts");
-      expect(fs.existsSync(path.join(tempDir, "tinybird", "datasources.ts"))).toBe(true);
-      expect(fs.existsSync(path.join(tempDir, "tinybird", "endpoints.ts"))).toBe(true);
-      expect(fs.existsSync(path.join(tempDir, "tinybird", "client.ts"))).toBe(true);
+      expect(result.created).toContain("lib/tinybird.ts");
+      expect(fs.existsSync(path.join(tempDir, "lib", "tinybird.ts"))).toBe(true);
     });
 
-    it("creates src/tinybird folder with files when project has src folder", async () => {
+    it("creates src/lib/tinybird.ts when project has src folder", async () => {
       // Create src folder to simulate existing project
       fs.mkdirSync(path.join(tempDir, "src"));
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "src/tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "src/lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
-      expect(result.created).toContain("src/tinybird/datasources.ts");
-      expect(result.created).toContain("src/tinybird/endpoints.ts");
-      expect(result.created).toContain("src/tinybird/client.ts");
+      expect(result.created).toContain("src/lib/tinybird.ts");
       expect(
-        fs.existsSync(path.join(tempDir, "src", "tinybird", "datasources.ts"))
-      ).toBe(true);
-      expect(
-        fs.existsSync(path.join(tempDir, "src", "tinybird", "endpoints.ts"))
-      ).toBe(true);
-      expect(
-        fs.existsSync(path.join(tempDir, "src", "tinybird", "client.ts"))
+        fs.existsSync(path.join(tempDir, "src", "lib", "tinybird.ts"))
       ).toBe(true);
     });
 
-    it("creates tinybird.json with correct include paths for tinybird folder", async () => {
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+    it("creates tinybird.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");
@@ -67,32 +55,26 @@ describe("Init Command", () => {
       const config = JSON.parse(
         fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
       );
-      expect(config.include).toEqual([
-        "tinybird/datasources.ts",
-        "tinybird/endpoints.ts",
-      ]);
+      expect(config.include).toEqual(["lib/tinybird.ts"]);
     });
 
-    it("creates tinybird.json with correct include paths for src/tinybird", async () => {
+    it("creates tinybird.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/tinybird" });
+      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/tinybird/datasources.ts",
-        "src/tinybird/endpoints.ts",
-      ]);
+      expect(config.include).toEqual(["src/lib/tinybird.ts"]);
     });
   });
 
   describe("config file creation", () => {
     it("creates tinybird.json with default values", async () => {
-      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+      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")
@@ -102,23 +84,29 @@ describe("Init Command", () => {
       expect(config.baseUrl).toBe("https://api.tinybird.co");
     });
 
-    it("skips tinybird.json if it already exists", async () => {
-      const existingConfig = { schema: "custom.ts", token: "existing" };
+    it("updates tinybird.json if it already exists", async () => {
+      const existingConfig = {
+        include: ["custom.ts"],
+        token: "existing",
+        devMode: "local",
+      };
       fs.writeFileSync(
         path.join(tempDir, "tinybird.json"),
         JSON.stringify(existingConfig)
       );
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
-      expect(result.skipped).toContain("tinybird.json");
+      expect(result.created).toContain("tinybird.json (updated)");
 
-      // Verify it wasn't overwritten
+      // Verify include/devMode updated but token preserved
       const config = JSON.parse(
         fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
       );
-      expect(config.schema).toBe("custom.ts");
+      expect(config.include).toEqual(["lib/tinybird.ts"]);
+      expect(config.devMode).toBe("branch");
+      expect(config.token).toBe("existing");
     });
 
     it("overwrites tinybird.json with force option", async () => {
@@ -128,7 +116,7 @@ describe("Init Command", () => {
         JSON.stringify(existingConfig)
       );
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, force: true, devMode: "branch", clientPath: "tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, force: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
       expect(result.created).toContain("tinybird.json");
@@ -136,92 +124,71 @@ describe("Init Command", () => {
       const config = JSON.parse(
         fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
       );
-      expect(config.include).toEqual([
-        "tinybird/datasources.ts",
-        "tinybird/endpoints.ts",
-      ]);
+      expect(config.include).toEqual(["lib/tinybird.ts"]);
     });
   });
 
   describe("file content creation", () => {
-    it("creates datasources.ts with example datasource and InferRow type", async () => {
-      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+    it("creates tinybird.ts with example datasource, endpoint, and client", async () => {
+      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       const content = fs.readFileSync(
-        path.join(tempDir, "tinybird", "datasources.ts"),
+        path.join(tempDir, "lib", "tinybird.ts"),
         "utf-8"
       );
 
+      // Check datasource content
       expect(content).toContain("defineDatasource");
       expect(content).toContain("export const pageViews");
       expect(content).toContain("InferRow");
       expect(content).toContain("PageViewsRow");
-    });
-
-    it("creates endpoints.ts with example endpoint and types", async () => {
-      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
-
-      const content = fs.readFileSync(
-        path.join(tempDir, "tinybird", "endpoints.ts"),
-        "utf-8"
-      );
 
+      // Check endpoint content
       expect(content).toContain("defineEndpoint");
       expect(content).toContain("export const topPages");
       expect(content).toContain("InferParams");
       expect(content).toContain("InferOutputRow");
       expect(content).toContain("TopPagesParams");
       expect(content).toContain("TopPagesOutput");
-    });
-
-    it("creates client.ts with createTinybirdClient", async () => {
-      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
-
-      const content = fs.readFileSync(
-        path.join(tempDir, "tinybird", "client.ts"),
-        "utf-8"
-      );
 
+      // Check client content
       expect(content).toContain("createTinybirdClient");
-      expect(content).toContain("export const tinybird");
-      expect(content).toContain("pageViews");
-      expect(content).toContain("topPages");
     });
 
-    it("skips files that already exist", async () => {
-      fs.mkdirSync(path.join(tempDir, "tinybird"), { recursive: true });
+    it("skips tinybird.ts if it already exists", async () => {
+      fs.mkdirSync(path.join(tempDir, "lib"), { recursive: true });
       fs.writeFileSync(
-        path.join(tempDir, "tinybird", "datasources.ts"),
+        path.join(tempDir, "lib", "tinybird.ts"),
         "// existing content"
       );
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
-      expect(result.skipped).toContain("tinybird/datasources.ts");
+      expect(result.skipped).toContain("lib/tinybird.ts");
 
       // Verify it wasn't overwritten
       const content = fs.readFileSync(
-        path.join(tempDir, "tinybird", "datasources.ts"),
+        path.join(tempDir, "lib", "tinybird.ts"),
         "utf-8"
       );
       expect(content).toBe("// existing content");
     });
 
-    it("overwrites files with force option", async () => {
-      fs.mkdirSync(path.join(tempDir, "tinybird"), { recursive: true });
+    it("overwrites tinybird.ts with force option", async () => {
+      fs.mkdirSync(path.join(tempDir, "lib"), { recursive: true });
       fs.writeFileSync(
-        path.join(tempDir, "tinybird", "datasources.ts"),
+        path.join(tempDir, "lib", "tinybird.ts"),
         "// existing content"
       );
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, force: true, devMode: "branch", clientPath: "tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, force: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
-      expect(result.created).toContain("tinybird/datasources.ts");
+      expect(result.created).toContain("lib/tinybird.ts");
 
       const content = fs.readFileSync(
-        path.join(tempDir, "tinybird", "datasources.ts"),
+        path.join(tempDir, "lib", "tinybird.ts"),
         "utf-8"
       );
       expect(content).toContain("defineDatasource");
@@ -236,7 +203,7 @@ describe("Init Command", () => {
         JSON.stringify(packageJson, null, 2)
       );
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
       expect(result.created).toContain("package.json (added tinybird scripts)");
@@ -264,7 +231,7 @@ describe("Init Command", () => {
         JSON.stringify(packageJson, null, 2)
       );
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
       expect(result.created).not.toContain("package.json (added tinybird scripts)");
@@ -284,7 +251,7 @@ describe("Init Command", () => {
         JSON.stringify(packageJson, null, 2)
       );
 
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
 
@@ -296,7 +263,7 @@ describe("Init Command", () => {
     });
 
     it("does not fail if no package.json exists", async () => {
-      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+      const result = await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
       expect(result.success).toBe(true);
       expect(result.created).not.toContain("package.json (added tinybird scripts)");
@@ -304,21 +271,21 @@ describe("Init Command", () => {
   });
 
   describe("directory creation", () => {
-    it("creates tinybird directory if it does not exist", async () => {
-      expect(fs.existsSync(path.join(tempDir, "tinybird"))).toBe(false);
+    it("creates lib directory if it does not exist", async () => {
+      expect(fs.existsSync(path.join(tempDir, "lib"))).toBe(false);
 
-      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "tinybird" });
+      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "lib/tinybird.ts" });
 
-      expect(fs.existsSync(path.join(tempDir, "tinybird"))).toBe(true);
+      expect(fs.existsSync(path.join(tempDir, "lib"))).toBe(true);
     });
 
-    it("creates src/tinybird directory if project has src folder", async () => {
+    it("creates src/lib directory if project has src folder", async () => {
       fs.mkdirSync(path.join(tempDir, "src"));
-      expect(fs.existsSync(path.join(tempDir, "src", "tinybird"))).toBe(false);
+      expect(fs.existsSync(path.join(tempDir, "src", "lib"))).toBe(false);
 
-      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "src/tinybird" });
+      await runInit({ cwd: tempDir, skipLogin: true, devMode: "branch", clientPath: "src/lib/tinybird.ts" });
 
-      expect(fs.existsSync(path.join(tempDir, "src", "tinybird"))).toBe(true);
+      expect(fs.existsSync(path.join(tempDir, "src", "lib"))).toBe(true);
     });
   });
 
@@ -437,7 +404,7 @@ describe("Init Command", () => {
         cwd: tempDir,
         skipLogin: true,
         devMode: "branch",
-        clientPath: "tinybird",
+        clientPath: "lib/tinybird.ts",
         skipDatafilePrompt: true,
         includeExistingDatafiles: true,
       });
@@ -462,7 +429,7 @@ describe("Init Command", () => {
         cwd: tempDir,
         skipLogin: true,
         devMode: "branch",
-        clientPath: "tinybird",
+        clientPath: "lib/tinybird.ts",
         skipDatafilePrompt: true,
         includeExistingDatafiles: false,
       });
@@ -474,10 +441,7 @@ describe("Init Command", () => {
         fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
       );
       expect(config.include).not.toContain("datasources/events.datasource");
-      expect(config.include).toEqual([
-        "tinybird/datasources.ts",
-        "tinybird/endpoints.ts",
-      ]);
+      expect(config.include).toEqual(["lib/tinybird.ts"]);
     });
 
     it("preserves TypeScript include paths alongside datafiles", async () => {
@@ -489,7 +453,7 @@ describe("Init Command", () => {
         cwd: tempDir,
         skipLogin: true,
         devMode: "branch",
-        clientPath: "tinybird",
+        clientPath: "lib/tinybird.ts",
         skipDatafilePrompt: true,
         includeExistingDatafiles: true,
       });
@@ -499,9 +463,8 @@ describe("Init Command", () => {
       const config = JSON.parse(
         fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
       );
-      // Should have both TypeScript files AND datafiles
-      expect(config.include).toContain("tinybird/datasources.ts");
-      expect(config.include).toContain("tinybird/endpoints.ts");
+      // Should have both TypeScript file AND datafiles
+      expect(config.include).toContain("lib/tinybird.ts");
       expect(config.include).toContain("datasources/events.datasource");
     });
 
@@ -510,7 +473,7 @@ describe("Init Command", () => {
         cwd: tempDir,
         skipLogin: true,
         devMode: "branch",
-        clientPath: "tinybird",
+        clientPath: "lib/tinybird.ts",
         skipDatafilePrompt: true,
         includeExistingDatafiles: true,
       });
@@ -521,10 +484,7 @@ describe("Init Command", () => {
       const config = JSON.parse(
         fs.readFileSync(path.join(tempDir, "tinybird.json"), "utf-8")
       );
-      expect(config.include).toEqual([
-        "tinybird/datasources.ts",
-        "tinybird/endpoints.ts",
-      ]);
+      expect(config.include).toEqual(["lib/tinybird.ts"]);
     });
   });
 });