thinkncollab-cli 0.0.30 → 0.0.32

package/bin/index.js

@@ -122,7 +122,7 @@ function scanFolder(folderPath, ignoreList, rootPath = folderPath) {
 function loadVersions() {
   if (!fs.existsSync(VERSION_FILE)) return {};
   const data = JSON.parse(fs.readFileSync(VERSION_FILE, "utf-8"));
-  
+
   // Backward compatibility: if old format (just strings), convert to new format
   const converted = {};
   for (const [path, value] of Object.entries(data)) {
@@ -142,15 +142,15 @@ function saveVersions(versionMap) {
 function computeFileHash(filePath) {
   try {
     if (!fs.existsSync(filePath)) return null;
-    
+
     const stats = fs.statSync(filePath);
     if (stats.isDirectory()) {
       // For folders: hash of sorted file names + their hashes
       const items = fs.readdirSync(filePath).sort();
-      const childrenHashes = items.map(name => 
+      const childrenHashes = items.map(name =>
         computeFileHash(path.join(filePath, name))
       ).filter(Boolean).join('|');
-      
+
       return crypto.createHash("sha256")
         .update(`folder:${filePath}|${childrenHashes}`)
         .digest("hex");
@@ -158,7 +158,7 @@ function computeFileHash(filePath) {
       // For files: hash of content + file metadata
       const content = fs.readFileSync(filePath);
       const stats = fs.statSync(filePath);
-      
+
       return crypto.createHash("sha256")
         .update(content)
         .update(`size:${stats.size}|mtime:${stats.mtimeMs}`)
@@ -174,14 +174,14 @@ function checkChanges(fileTree, versionMap, rootPath = CWD) {
   return fileTree.map(item => {
     const fullPath = path.join(rootPath, item.path || item.name);
     const relativePath = item.path || item.name;
-    
+
     let hash = null;
     let changed = true;
 
     try {
       if (fs.existsSync(fullPath)) {
         hash = computeFileHash(fullPath);
-        
+
         // Check against previous version
         const prevVersion = versionMap[relativePath];
         if (prevVersion && prevVersion.hash === hash) {
@@ -192,9 +192,9 @@ function checkChanges(fileTree, versionMap, rootPath = CWD) {
       console.error(`❌ Error checking changes for ${relativePath}:`, err.message);
     }
 
-    const newItem = { 
-      ...item, 
-      changed, 
+    const newItem = {
+      ...item,
+      changed,
       hash,
       path: relativePath // Ensure consistent path
     };
@@ -246,24 +246,24 @@ async function uploadTree(fileTree, folderHex, roomId, token, email, previousVer
 
     if (node.type === "folder") {
       const children = await uploadTree(node.children, folderHex, roomId, token, email, previousVersions, relativePath);
-      
-      uploaded.push({ 
-        ...node, 
-        children, 
+
+      uploaded.push({
+        ...node,
+        children,
         hash: node.hash,
-        path: relativePath 
+        path: relativePath
       });
     } else {
       const prevFile = previousVersions[relativePath];
-      
+
       if (node.changed) {
         try {
           console.log(`📤 Uploading changed file: ${relativePath}`);
           const url = await uploadFileSigned(node.path, `tnc_uploads/${folderHex}`, roomId, token, email);
           console.log(`✅ Uploaded: ${relativePath}`);
-          
-          uploaded.push({ 
-            ...node, 
+
+          uploaded.push({
+            ...node,
             url,
             hash: node.hash,
             path: relativePath,
@@ -272,8 +272,8 @@ async function uploadTree(fileTree, folderHex, roomId, token, email, previousVer
         } catch (err) {
           console.error(`❌ Failed to upload ${relativePath}:`, err.message);
           // Fallback to previous version if upload fails
-          uploaded.push({ 
-            ...node, 
+          uploaded.push({
+            ...node,
             url: prevFile?.url,
             hash: node.hash,
             path: relativePath,
@@ -283,8 +283,8 @@ async function uploadTree(fileTree, folderHex, roomId, token, email, previousVer
       } else {
         // Unchanged file - use previous URL and version
         console.log(`📋 Using previous version for: ${relativePath}`);
-        uploaded.push({ 
-          ...node, 
+        uploaded.push({
+          ...node,
           url: prevFile?.url,
           hash: node.hash,
           path: relativePath,
@@ -329,11 +329,11 @@ async function push(roomId, targetPath) {
 
   const previousVersions = loadVersions();
   console.log('📁 Previous versions:', Object.keys(previousVersions).length);
-  
+
   const contentWithChanges = checkChanges(content, previousVersions);
-  
+
   // Debug: Show what changed
-  const changedFiles = contentWithChanges.flatMap(item => 
+  const changedFiles = contentWithChanges.flatMap(item =>
     item.changed ? [item.path] : []
   );
   console.log('🔄 Changed files:', changedFiles.length, changedFiles);
@@ -417,29 +417,26 @@ async function main() {
       break;
 
     case "pull": {
-  const roomIndex = args.indexOf("--room");
-  const versionIndex = args.indexOf("--version");
-  
-  if (roomIndex === -1 || !args[roomIndex + 1]) {
-    console.error("Usage: tnc pull --room <roomId> [--version <version>]");
-    process.exit(1);
-  }
-  
-  const roomId = args[roomIndex + 1];
-  let version = "latest";
-  if (versionIndex !== -1 && args[versionIndex + 1]) {
-    version = args[versionIndex + 1];
-  } else {
-    const possibleVersionIndex = roomIndex + 2;
-    if (args[possibleVersionIndex] && !args[possibleVersionIndex].startsWith("--")) {
-      version = args[possibleVersionIndex];
-    }
-  }
-  
-  await pull(roomId, version);
-  break;
-}
+      const roomIndex = args.indexOf("--room");
+
+      if (roomIndex === -1 || !args[roomIndex + 1]) {
+        console.error("Usage: tnc pull --room <roomId> [--version <version>]");
+        process.exit(1);
+      }
 
+      const roomId = args[roomIndex + 1];
+      let version = "latest";
+
+      // Check for --version flag
+      const versionIndex = args.indexOf("--version");
+      if (versionIndex !== -1 && args[versionIndex + 1]) {
+        version = args[versionIndex + 1];
+      }
+
+      await pull(roomId, version);
+      break;
+    }
+    
     default:
       console.log("✅ TNC CLI ready!");
       console.log("Commands:");

package/commands/pull.js

@@ -57,22 +57,30 @@ async function processFolderContent(content, basePath = "") {
     const relPath = item.path ? item.path.replace(/^[\\/]+/, "") : item.name;
     const itemPath = path.join(basePath, relPath);
 
-    if (item.type === "folder") {
-      if (!fs.existsSync(itemPath)) {
-        fs.mkdirSync(itemPath, { recursive: true });
-        console.log(chalk.cyan(`📁 Created directory: ${itemPath}`));
-      }
+    // ✅ Skip .tnc folder and its contents
+    if (relPath.includes('.tnc') || itemPath.includes('.tnc')) {
+      console.log(chalk.gray(`⏭️  Skipping .tnc folder: ${itemPath}`));
+      skippedCount++;
+      continue;
+    }
 
+    // ✅ ONLY PROCESS FILES - Skip folders entirely
+    if (item.type === "folder") {
+      // Skip folder processing - we only care about files
       if (item.children && item.children.length > 0) {
+        // Recursively process children files, but don't create folders
         const result = await processFolderContent(item.children, itemPath);
         downloadedCount += result.downloadedCount;
         skippedCount += result.skippedCount;
         errorCount += result.errorCount;
       }
-    } else if (item.type === "file" && item.url) {
-      try {
-        fs.mkdirSync(path.dirname(itemPath), { recursive: true });
+      continue; // Skip the folder itself
+    }
 
+    // ✅ ONLY FILE PROCESSING LOGIC
+    if (item.type === "file" && item.url) {
+      try {
+        // downloadFile will create necessary directories automatically
         if (fs.existsSync(itemPath)) {
           const existingStats = fs.statSync(itemPath);
           if (existingStats.size === item.size) {

package/package.json

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