jvcs 1.7.4 → 1.7.5

package/controllers/add.js

@@ -1,4 +1,4 @@
-const { getGlobalConfig, checkforjvcs } = require("./utility")
+const { checkGlobalConfig, getGlobalConfig, checkforjvcs } = require("./utility")
 const path = require("path")
 const fssync = require("fs")
 const chalk = require("chalk")
@@ -15,7 +15,7 @@ async function getFileHash(filepath) {
 // load .jvcsignore file
 async function loadIgnorePatterns() {
     const ignorePath = path.join(process.cwd(), ".jvcsignore")
-    if (!fssync.existsSync(ignorePath)) return []
+    if(!fssync.existsSync(ignorePath)) return []
 
     const content = await fs.readFile(ignorePath, "utf-8")
     return content
@@ -61,20 +61,26 @@ async function addCmd(paths) {
 
     if (!paths || paths.length === 0) {
         console.log(chalk.yellow("Please specify files or folders to add."));
-        process.exit(1);
+        return
     }
 
-    const configData = getGlobalConfig()
+    if (!checkGlobalConfig()) {
+        console.log(chalk.red("No existing session found. Please login or signup."))
+        console.log(chalk.green("jvcs --help for help"))
+        return
+    }
+
+    let configData = getGlobalConfig()
 
     if (!configData) {
         console.log(chalk.red("No existing session found. Please login or signup."))
         console.log(chalk.green("jvcs --help for help"))
-        process.exit(1);
+        return
     }
 
     if (!checkforjvcs()) {
         console.log(chalk.red("Repository is not initialized or is deleted. Please create it."))
-        process.exit(1);
+        return
     }
 
     const repoPath = path.join(process.cwd(), ".jvcs")
@@ -93,43 +99,6 @@ async function addCmd(paths) {
     // load ignore patterns
     const ignorePatterns = await loadIgnorePatterns()
 
-    // -------------------------------------------------------------
-    // NEW: Handle Deletions sync before adding new files
-    // -------------------------------------------------------------
-    let deletionHandledFor = new Set();
-
-    for (const key of Object.keys(hashData)) {
-        const cwdPath = path.join(process.cwd(), key);
-
-        // Check if the staged file falls under any of the target paths
-        let isUnderTarget = false;
-        if (paths.length === 1 && paths[0] === ".") {
-            isUnderTarget = true;
-        } else {
-            for (const p of paths) {
-                const targetPath = path.resolve(process.cwd(), p);
-                const relToTarget = path.relative(targetPath, cwdPath);
-                // If it's the exact file or inside the target directory
-                if (relToTarget === "" || (!relToTarget.startsWith("..") && !path.isAbsolute(relToTarget))) {
-                    isUnderTarget = true;
-                    break;
-                }
-            }
-        }
-
-        if (isUnderTarget && !fssync.existsSync(cwdPath)) {
-            // File was deleted from working directory, remove it from staging
-            delete hashData[key];
-            const stagedTarget = path.join(staging, key);
-            if (fssync.existsSync(stagedTarget)) {
-                await fs.rm(stagedTarget);
-            }
-            console.log(chalk.red(`Removed deleted file: ${key}`));
-            deletionHandledFor.add(cwdPath);
-        }
-    }
-
-
     let targets = []
     if (paths.length === 1 && paths[0] === ".") {
         let rootEntries = await fs.readdir(process.cwd(), { withFileTypes: true })
@@ -145,10 +114,7 @@ async function addCmd(paths) {
         try {
 
             if (!fssync.existsSync(target)) {
-                // Only warn if we didn't just handle its deletion
-                if (!deletionHandledFor.has(target)) {
-                    console.log(chalk.yellow(`Path not found: ${path.relative(process.cwd(), target)}`));
-                }
+                console.log(chalk.red(`Path not found: ${target}`))
                 continue
             }
 
@@ -189,7 +155,7 @@ async function addCmd(paths) {
             }
         }
         catch (error) {
-            console.log(chalk.red(`Unexpected error processing ${target}: ${error.message}`));
+            console.log(chalk.red(`Unexpected error: ${error.message}`));
         }
     }
 

package/controllers/begin.js

@@ -10,24 +10,14 @@ const fs = require("fs")
 
 async function beginCmd() {
 
-    const config = path.join(require("os").homedir(), ".jvcs", "config.json")
+    const config = path.join(require("os").homedir(),".jvcs","config.json")
     let isInitialized = false
     let configData = null
-    if (fs.existsSync(config)) {
-        try {
-            configData = JSON.parse(fs.readFileSync(config, "utf-8"))
-            isInitialized = true
-        }
-        catch (error) {
-            // corrupted file, delete it and force re-login
-            try {
-                fs.unlinkSync(config)
-            }
-            catch (e) { }
-            isInitialized = false
-        }
+    if(fs.existsSync(config)) {
+        isInitialized = true
+        configData = JSON.parse(fs.readFileSync(config,"utf-8"))
     }
-
+    
     if (isInitialized) {
         console.log(chalk.green(`You are already logged in as ${configData.username} (${configData.email})`))
         console.log(chalk.yellow(`[1] Continue \n[2] Logout \nChoose an option (1/2) : `))
@@ -48,20 +38,14 @@ async function beginCmd() {
             }
         ])
 
+        console.log(`Your choice was ${answer.choice}`)
         if (answer.choice === "1") {
             console.log(chalk.green("Continuing as current user..."))
             console.log(chalk.green("jvcs --help for help"))
         }
         else {
             console.log(chalk.green("logging out..."))
-            try {
-                if (fs.existsSync(config)) {
-                    fs.unlinkSync(config)
-                }
-            }
-            catch (error) {
-                console.log(chalk.yellow("Warning: Could not remove config file properly."));
-            }
+            fs.unlinkSync(config)
             console.log(chalk.green("Logged out Successfully"))
             console.log(chalk.green("Please login or signup again (jvcs begin) to use version control system"))
             console.log(chalk.green("jvcs --help for help"))
@@ -96,14 +80,6 @@ async function beginCmd() {
             {
                 type: 'input',
                 name: 'username',
-                validate: function (input) {
-                    // Ensure no spaces or weird special characters in username
-                    if (!/^[a-zA-Z0-9_]+$/.test(input)) {
-                        return "Username can only contain alphanumeric characters and underscores";
-                    }
-                    if (input.length < 3) return "Username must be at least 3 characters long";
-                    return true;
-                },
                 filter: function (input) {
                     return input.trim()
                 }
@@ -163,7 +139,6 @@ async function beginCmd() {
         }
         catch (error) {
             console.log(chalk.red(error))
-            process.exit(1);
         }
     }
     else {
@@ -219,7 +194,6 @@ async function beginCmd() {
         }
         catch (error) {
             console.log(chalk.red(error))
-            process.exit(1);
         }
     }
 }

package/controllers/init.js

@@ -6,16 +6,16 @@ const { getGlobalConfig, checkGlobalConfig } = require("./utility")
 
 async function initCmd() {
 
-    if (!checkGlobalConfig()) {
+    if(!checkGlobalConfig()) {
         console.log(chalk.red("No existing session found. Please login or signup."))
         console.log(chalk.green("jvcs --help for help"))
         return
     }
-
+    
     let configData = null
     configData = getGlobalConfig()
-
-    if (!configData) {
+    
+    if(!configData) {
         console.log(chalk.red("No existing session found. Please login or signup."))
         console.log(chalk.green("jvcs --help for help"))
         return
@@ -25,45 +25,36 @@ async function initCmd() {
     const cwd = process.cwd()
     const home = require("os").homedir()
 
-    if (cwd === home) {
+    if(cwd ===  home) {
         console.log(chalk.red("Cannot initialize a repository in your home directory."));
         console.log(chalk.yellow("Hint: navigate to a project folder and run 'jvcs init' there."));
         process.exit(1);
     }
 
-    const repoPath = path.join(cwd, ".jvcs")
-    if (fssync.existsSync(repoPath)) {
+    const repoPath = path.join(cwd,".jvcs")
+    if(fssync.existsSync(repoPath)) {
         console.log(chalk.yellow("Repository already is initialized."));
-        process.exit(0);
+        process.exit(1);    
     }
 
-    try {
-        fssync.mkdirSync(repoPath)
-        fssync.mkdirSync(path.join(repoPath, "commits"))
-        fssync.mkdirSync(path.join(repoPath, "staging"))
-
-        const config = {
-            repoName: path.basename(cwd),
-            createdAt: new Date().toISOString(),
-            remote: null,
-            owner: {
-                username: configData.username,
-                email: configData.email
-            }
+    fssync.mkdirSync(repoPath)
+    fssync.mkdirSync(path.join(repoPath,"commits"))
+    fssync.mkdirSync(path.join(repoPath,"staging"))
+    
+    const config = {
+        repoName: path.basename(cwd),
+        createdAt: new Date().toISOString(),
+        remote: null,
+        owner : {
+            username: configData.username,
+            email: configData.email
         }
+    }
 
-        fssync.writeFileSync(path.join(repoPath, "config.json"), JSON.stringify(config, null, 2))
-        fssync.writeFileSync(path.join(repoPath, "HEAD"), "");
+    fssync.writeFileSync(path.join(repoPath, "config.json"), JSON.stringify(config, null, 2))
+    fssync.writeFileSync(path.join(repoPath, "HEAD"), "");
 
-        console.log(chalk.green(`Initialized empty JVCS repository in ${repoPath}`));
-    }
-    catch (error) {
-        if (fssync.existsSync(repoPath)) {
-            fssync.rmSync(repoPath, { recursive: true, force: true });
-        }
-        console.log(chalk.red(`Failed to initialize repository: ${error.message}`));
-        process.exit(1);
-    }
+    console.log(chalk.green(`Initialized empty JVCS repository`));
 }
 
 module.exports = initCmd

package/controllers/status.js

@@ -23,32 +23,32 @@ function hashfile(filepath) {
         const data = fs.readFileSync(filepath)
         return crypto.createHash("sha256").update(data).digest("hex")
     }
-    catch (error) {
+    catch(error) {
         // return null
     }
 }
 
 
-function getAllFiles(dir, rootDir = dir, collected = []) {
+function getAllFiles(dir, rootDir=dir, collected=[]) {
 
     if (!fs.existsSync(dir)) return collected;
 
-    const entries = fs.readdirSync(dir, { withFileTypes: true })
+    const entries = fs.readdirSync(dir,{withFileTypes:true})
 
-    for (const entry of entries) {
-        const fullPath = path.join(dir, entry.name)
-        const rel = normalizeRel(path.relative(rootDir, fullPath))
+    for(const entry of entries) {
+        const fullPath = path.join(dir,entry.name)
+        const rel = normalizeRel(path.relative(rootDir,fullPath))
 
-        if (entry.isDirectory() && (entry.name === ".jvcs" || entry.name === "node_modules"))
-            continue;
-
-        if (entry.isFile() && (entry.name === "meta.json" || entry.name === "jvcs_hashcode.json"))
-            continue;
-
-        if (entry.isFile()) {
+        if(entry.isDirectory() && (entry.name === ".jvcs" || entry.name === "node_modules")) 
+        continue;
+        
+        if(entry.isFile() && (entry.name === "meta.json" || entry.name === "jvcs_hashcode.json")) 
+        continue;
+        
+        if(entry.isFile()) {
             collected.push(rel);
         }
-        else if (entry.isDirectory()) {
+        else if(entry.isDirectory()) {
             getAllFiles(fullPath, rootDir, collected);
         }
 
@@ -59,30 +59,30 @@ function getAllFiles(dir, rootDir = dir, collected = []) {
 
 async function statusCmd() {
 
-    if (!checkGlobalConfig()) {
+    if(!checkGlobalConfig()) {
         console.log(chalk.red("No existing session found. Please login or signup."));
         console.log(chalk.green("jvcs --help for help"));
         return;
     }
 
     const configData = getGlobalConfig();
-    if (!configData) {
+    if(!configData) {
         console.log(chalk.red("No existing session found. Please login or signup."));
         return;
     }
 
-    if (!checkforjvcs()) {
+    if(!checkforjvcs()) {
         console.log(chalk.red("Repository is not initialized or is deleted."));
         return;
     }
 
     const cwd = process.cwd()
-    const jvcsDir = path.join(cwd, ".jvcs")
-    const commitDir = path.join(jvcsDir, "commits")
-    const stagingDir = path.join(jvcsDir, "staging")
+    const jvcsDir = path.join(cwd,".jvcs")
+    const commitDir = path.join(jvcsDir,"commits")
+    const stagingDir = path.join(jvcsDir,"staging")
     const headFile = path.join(jvcsDir, "HEAD");
 
-    if (!fs.existsSync(jvcsDir)) {
+    if(!fs.existsSync(jvcsDir)) {
         console.log(chalk.red("No repository exists. Please create one using 'jvcs init'"))
         return
     }
@@ -91,9 +91,9 @@ async function statusCmd() {
     const cwdFiles = getAllFiles(cwd, cwd, []);
     const stagedFiles = fs.existsSync(stagingDir) ? getAllFiles(stagingDir, stagingDir, []).map(f => normalizeRel(f)) : [];
     let commitedFiles = []
-    if (fs.existsSync(commitDir)) {
+    if(fs.existsSync(commitDir)) {
         const commits = fs.readdirSync(commitDir)
-        if (commits.length > 0) {
+        if(commits.length > 0) {
             const lastCommit = `${fs.readFileSync(headFile, "utf-8").trim()}`;
             const commitPath = path.join(commitDir, lastCommit);
             commitedFiles = getAllFiles(commitPath, commitPath, []).map(f => normalizeRel(f))
@@ -111,12 +111,12 @@ async function statusCmd() {
     const toBeCommitted = stagedFiles.filter(f => !committedSet.has(f));
 
     // Changes not staged for commit: present in staging and in cwd, but changed in cwd compared to staged copy
-    const modified = stagedFiles.filter((file) => {
-        const cwdFilePath = path.join(process.cwd(), file)
-        const stagedFilePath = path.join(stagingDir, file)
-
-        if (!fs.existsSync(cwdFilePath) || !fs.existsSync(stagedFilePath))
-            return false
+    const modified = stagedFiles.filter((file)=> {
+        const cwdFilePath = path.join(process.cwd(),file)
+        const stagedFilePath = path.join(stagingDir,file)
+        
+        if(!fs.existsSync(cwdFilePath) || !fs.existsSync(stagedFilePath))
+        return false
 
         const cwdHash = hashfile(cwdFilePath)
         const stagingHash = hashfile(stagedFilePath)
@@ -129,7 +129,7 @@ async function statusCmd() {
     console.log(chalk.bold.blue(`\nOn branch: main (default)`));
 
     console.log(chalk.bold.green("\nChanges to be committed (files that are staged but not commited):"));
-    if (toBeCommitted.length > 0) {
+    if(toBeCommitted.length > 0) {
         toBeCommitted.forEach(f => console.log(chalk.green(`\t${f}`)));
     }
     else {
@@ -137,15 +137,15 @@ async function statusCmd() {
     }
 
     console.log(chalk.bold.yellow("\nChanges not staged for commit (files that are modified after adding to staging area):"));
-    if (modified.length > 0) {
+    if(modified.length > 0) {
         modified.forEach(f => console.log(chalk.yellow(`\t${f}`)));
-    }
+    } 
     else {
         console.log(chalk.gray("\tNo modified files detected"));
     }
 
     console.log(chalk.bold.red("\nUntracked files (files that are not staged or commited):"));
-    if (untracked.length > 0) {
+    if(untracked.length > 0) {
         untracked.forEach(f => console.log(chalk.red(`\t${f}`)));
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jvcs",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "bin": {
     "jvcs": "index.js"
   },