thinkncollab-cli 0.0.61 → 0.0.63

package/bin/index.js

@@ -20,7 +20,7 @@ import sendInvite from '../commands/sendInvite.js'
 
 const RC_FILE = path.join(os.homedir(), ".tncrc");
 const VERSION_FILE = path.join(process.cwd(), ".tncversions");
-const BASE_URL = "https://thinkncollab.in/rooms";
+const BASE_URL = "http://localhost:3001/rooms";
 const CWD = process.cwd();
 
 /** ------------------ LOGIN ------------------ **/
@@ -368,7 +368,7 @@ async function push(roomId, targetPath) {
     const uploadedTree = await uploadTree(contentWithChanges, folderHex, roomId, token, email, previousVersions);
 
     console.log("🗂️ Sending metadata...");
-    await axios.post(
+     const res = await axios.post(
       `${BASE_URL}/${roomId}/upload`,
       { folderId: folderHex, content: uploadedTree, uploadedBy: email, projectId },
       { headers: { authorization: `Bearer ${token}`, email } }
@@ -402,7 +402,8 @@ async function push(roomId, targetPath) {
         pushedAt: new Date().toISOString(),
         roomId: roomId,
         pushedBy: email,
-        projectId: projectId
+        projectId: projectId,
+        folderId: res.folderId
     };
 
 

package/commands/branch.js

@@ -4,24 +4,43 @@ import axios from "axios";
 import os from "os";
 import inquirer from "inquirer";
 
+// Updates the current branch name in .tnc/.tncmeta.json
 async function updateBranch(branchName) {
-  const currenDir = process.cwd();
-  const tncFolder = path.join(currenDir, ".tnc");
-  const tncmetaFile = path.join(tncFolder, ".tncmeta.json")
+  const currentDir = process.cwd();
+  const tncFolder = path.join(currentDir, ".tnc");
+  const tncmetaFile = path.join(tncFolder, ".tncmeta.json");
 
-  if(!fs.readFileSync(tncmetaFile)) {
+  // Ensure .tnc folder exists
+  if (!fs.existsSync(tncFolder)) {
+    fs.mkdirSync(tncFolder, { recursive: true });
+  }
+
+  let meta = {};
 
+  // Read existing meta if exists
+  if (fs.existsSync(tncmetaFile)) {
+    try {
+      const data = fs.readFileSync(tncmetaFile, "utf-8");
+      meta = JSON.parse(data);
+    } catch {
+      console.warn("⚠️ Warning: Corrupted .tncmeta.json, creating a new one.");
+      meta = {};
+    }
   }
-  const content = ` "currentBranch": "${branchName}",`;
-  
 
-  fs.writeFileSync(tncmetaFile, content, "utf-8" );
+  // Update the current branch
+  meta.currentBranch = branchName;
 
+  // Write updated data
+  fs.writeFileSync(tncmetaFile, JSON.stringify(meta, null, 2), "utf-8");
+
+  console.log(`🌿 Switched to branch '${branchName}'`);
 }
 
+// Creates a new branch for a room
 async function createBranch(roomId) {
   try {
-    const branchName = await inquirer.prompt([
+    const { branchName } = await inquirer.prompt([
       {
         type: "input",
         name: "branchName",
@@ -30,18 +49,17 @@ async function createBranch(roomId) {
           if (!input || input.trim().length === 0) {
             return "Branch name cannot be empty";
           }
-          // Basic validation - you might want to add more rules
           if (!/^[a-zA-Z0-9_-]+$/.test(input.trim())) {
             return "Branch name can only contain letters, numbers, hyphens, and underscores";
           }
           return true;
-        }
-      }
+        },
+      },
     ]);
 
     const homeDir = os.homedir();
     const tncfilepath = path.join(homeDir, ".tncrc");
-    
+
     if (!fs.existsSync(tncfilepath)) {
       throw new Error("Configuration file not found. Please login first.");
     }
@@ -55,14 +73,14 @@ async function createBranch(roomId) {
     }
 
     const res = await axios.post("https://thinkncollab.in/cli/createBranch", {
-      branchName: branchName.branchName.trim(),
-      roomId: roomId,
-      email: email
+      branchName: branchName.trim(),
+      roomId,
+      email,
     });
 
     if (res.data.success) {
-      console.log(`✅ Branch '${branchName.branchName}' created successfully!`);
-      updateBranch(branchName.branchName);
+      console.log(`✅ Branch '${branchName}' created successfully!`);
+      await updateBranch(branchName);
     } else {
       console.log(`❌ Failed to create branch: ${res.data.message}`);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thinkncollab-cli",
   "author": "Raman Singh",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "description": "CLI tool for ThinkNCollab",
   "main": "index.js",
   "bin": {