jvcs 1.2.0 → 1.2.2

package/.jvcs/staging/controllers/push.js

@@ -1,165 +0,0 @@
-const fs = require("fs")
-const path = require("path")
-const chalk = require("chalk")
-const { getDriveClient } = require("../config/drive-config")
-const drive = getDriveClient()
-const { getGlobalConfig, checkGlobalConfig, checkforjvcs } = require("./utility")
-const getDirectoryStructure = require("./driveUtility")
-const handleDbForRepo = require("../apicall/handleDbForRepo")
-
-
-
-
-async function uploadFile(localFile, parentId,data) {
-
-    try {
-
-        const fileName = path.basename(localFile)
-        const fileMetaData = {
-            name: fileName,
-            parents: [parentId]
-        }
-
-        const media = {
-            mimeType: "application/octet-stream",
-            body: fs.createReadStream(localFile),
-        }
-
-        const res = await drive.files.create({
-            resource: fileMetaData,
-            media,
-            fields: "id"
-        })
-
-        console.log(chalk.gray(`   ↳ Uploaded: ${fileName}`));
-        data.files.push({name:fileName,driveId:res.data.id,parentId:parentId,type:"file"})
-        return res.data.id;
-    }
-    catch(error) {
-        console.log(chalk.red(`Failed to upload ${filePath}: ${err.message}`));
-    }
-}
-
-async function uploadDirectory(localDir, parentId,data) {
-
-    const entries = fs.readdirSync(localDir, {withFileTypes: true})
-
-    for(const entry of entries) {
-
-        const entryPath = path.join(localDir,entry.name)
-
-        if(entry.isDirectory()) {
-            const folderMeta = {
-                name: entry.name,
-                mimeType: "application/vnd.google-apps.folder",
-                parents: [parentId],
-            }
-
-            const folder = await drive.files.create({
-                resource: folderMeta,
-                fields: "id"
-            })
-
-            data.files.push({name:entry.name,driveId:folder.data.id,parentId:parentId,type:"folder"})
-            await uploadDirectory(entryPath,folder.data.id,data)
-        }
-        else {
-            await uploadFile(entryPath,parentId,data)
-        }
-    }
-}
-
-async function pushCmd() {
-
-    try {
-
-        let userFolderId,repoFolderId
-
-        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"))
-            return
-        }
-        
-        if(!checkforjvcs()) {
-            console.log(chalk.red("Repository is not initialized or is deleted. Please create it."))
-            return
-        }
-        
-        const cwd = process.cwd()
-        const jvcsDir = path.join(cwd,".jvcs")
-        const commitDir = path.join(jvcsDir,"commits")
-        const reponame = path.basename(process.cwd())
-
-        if(!fs.existsSync(commitDir)) {
-            console.log(chalk.yellow("No commits to push"))
-            return
-        }
-
-        // storing the name of commit folders
-        const commitFolders = fs.readdirSync(commitDir, {withFileTypes: true}).filter((e)=> e.isDirectory()).map((e)=> e.name)
-        if(commitFolders.length === 0) {
-            console.log(chalk.yellow('No commits to push'))
-            return
-        }
-
-        console.log(chalk.blue("Pushing commits of ",reponame," to cloud storage..."))
-        
-        const Content = []
-        for(const commitId of commitFolders) {
-            let data = {}
-            data.files = []
-            data.uuid = commitId
-            const commitFolder = path.join(commitDir,commitId)
-            const metaPath = path.join(commitFolder,"meta.json")
-
-            if(!fs.existsSync(metaPath)) {
-                console.log(chalk.yellow(`Skipping ${commitId} (no meta.json found)`));
-                continue;
-            }
-
-            const metaData = JSON.parse(fs.readFileSync(metaPath,"utf-8"))
-            const { author, message, timeStamp } = metaData;
-
-            console.log(chalk.green(`\n Uploading commit:`));
-            console.log(chalk.gray(`   id: ${commitId}`));
-            console.log(chalk.gray(`   message: ${message}`));
-            console.log(chalk.gray(`   author: ${author}`));
-            console.log(chalk.gray(`   time: ${timeStamp}`));
-
-            const folderStructure = await getDirectoryStructure(configData.username,reponame,commitId)
-            const driveCommitId = folderStructure.commitFolderId;
-            repoFolderId = folderStructure.repoFolderId;
-            userFolderId = folderStructure.userFolderId;
-            const commitAlreadyExists = folderStructure.commitAlreadyExists;
-
-            if (commitAlreadyExists) {
-                console.log(chalk.yellow(`Skipping ${commitId} (already uploaded)`));
-                continue;
-            }
-
-            await uploadDirectory(commitFolder,driveCommitId,data)
-            console.log(chalk.green(`Commit ${commitId} uploaded successfully!`));
-            Content.push(data)
-        }
-        
-        console.log(chalk.bold.green("\nAll commits pushed successfully!"));
-
-        // database call for creating/updating an repository
-        await handleDbForRepo(reponame,repoFolderId,userFolderId,Content,configData.token)
-    }
-    catch(error) {
-        console.log(chalk.red.bold("\nPush Failed"));
-        console.error(chalk.red(error.stack || error.message || error));
-    }
-}
-
-module.exports = pushCmd

package/.jvcs/staging/controllers/revert.js

@@ -1,208 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const chalk = require("chalk");
-const { checkGlobalConfig, getGlobalConfig, checkforjvcs } = require("./utility");
-const { getDriveClient } = require("../config/drive-config");
-
-
-function copyDir(targetCommitFolder, destDir=process.cwd()) {
-
-    const entries = fs.readdirSync(targetCommitFolder, {withFileTypes: true})
-    
-    for(const entry of entries) {
-        
-        if (entry.name === ".jvcs") continue;
-        
-        const srcpath = path.join(targetCommitFolder,entry.name)
-        const destpath = path.join(destDir,entry.name)
-
-        if(entry.isDirectory()) {
-            fs.mkdirSync(destpath, { recursive: true });
-            copyDir(srcpath, destpath);
-        }
-        else {
-            if(entry.name !== "meta.json" && entry.name !== "jvcs_hashcode.json")
-            fs.copyFileSync(srcpath, destpath);
-        }
-    }
-}
-
-function cleanCWD() {
-
-    const cwd = process.cwd()
-    const entries = fs.readdirSync(cwd, {withFileTypes: true})
-
-    for(const entry of entries) {
-        if(entry.name === ".jvcs") continue
-        const deleteEntry = path.join(cwd,entry.name)
-        fs.rmSync(deleteEntry, {recursive: true, force: true})
-    }
-}
-
-function buildCommitMap(commitFolder) {
-
-    const map = {}
-    const dirs = fs.readdirSync(commitFolder)
-    for(const dir of dirs) {
-        const metaPath = path.join(commitFolder,dir,"meta.json")
-        if(fs.existsSync(metaPath)) {
-            const data = JSON.parse(fs.readFileSync(metaPath,"utf-8"))
-            map[dir] = data.parentId
-        }
-    }
-
-    return map
-}
-
-function getCommitsToDelete(commitFolder,currentCommit,targetCommit) {
-
-    const commitMap = buildCommitMap(commitFolder)
-    console.log("Commit Map:", commitMap); // 👈 debug log
-    const toDelete = []
-
-    while(currentCommit && currentCommit !== targetCommit) {
-        toDelete.push(currentCommit)
-        currentCommit = commitMap[currentCommit] || null
-    }
-
-    return toDelete
-}
-
-function deleteLocalCommits(commitDir,Ids) {
-
-    for(const id of Ids) {
-        const p = path.join(commitDir,id)
-        fs.rmSync(p, {recursive: true, force: true})
-        console.log(chalk.red(`Deleted local commit ${id}`))
-    }
-}
-
-async function deleteCommitsFromDrive(ids) {
-
-    const drive = getDriveClient();
-
-    if (!drive) {
-        console.log(chalk.red("Drive client not initialized. Please re-authenticate."));
-        return;
-    }
-
-    let folderName = null
-    try {
-        for(const id of ids) {
-            folderName = `commit_${id}`
-            
-            const res = await drive.files.list({
-                q: `name='${folderName}' and trashed=false`,
-                fields: "files(id,name)"
-            })
-            
-            if(res.data.files.length > 0) {
-                const fileId = res.data.files[0].id;
-                await drive.files.delete({fileId})
-                console.log(chalk.red(`Deleted folder ${folderName} from remote`));
-            }
-            else {
-                console.log(chalk.gray(`Drive folder ${folderName} not found.`));
-            }
-        }
-    }
-    catch(error) {
-        console.log(chalk.red(`Failed to delete ${folderName} from remote: ${error.message}`));
-    }
-}
-
-async function deleteCommitsFromDatabase(configData,toDelete,reponame) {
-
-    try {
-
-        const response = await fetch("http://localhost:3000/deleteCommit", {
-            method: "POST",
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({token:configData.token,email:configData.email,username:configData.username,toDelete,reponame})
-        })
-
-        const data = await response.json()
-
-        if(data.status === true) {
-            console.log(chalk.green("Removed previous commits from DB"))
-        }
-        else {
-            console.log(chalk.red(data.message))
-        }
-    }
-    catch(error) {
-        console.log(chalk.red(error || error.message))
-    }
-}
-
-async function revertCmd(commitId) {
-
-    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) {
-        console.log(chalk.red("No existing session found. Please login or signup."));
-        return;
-    }
-    
-    if(!checkforjvcs()) {
-        console.log(chalk.red("Repository is not initialized or is deleted."));
-        return;
-    }
-    
-    // actual implementation
-    const cwd = process.cwd()
-    const jvcsDir = path.join(cwd,".jvcs")
-    const commitFolder = path.join(jvcsDir,"commits")
-    const targetCommitFolder = path.join(commitFolder,commitId)
-    const headFile = path.join(jvcsDir,"HEAD")
-
-    if(!fs.existsSync(jvcsDir)) {
-        console.log(chalk.red("Repository is not initialized or is deleted."));
-        return;
-    }
-
-    if(!fs.existsSync(commitFolder)) {
-        console.log(chalk.red("You have made no commits yet. Revert not possible"))
-        return
-    }
-
-    if(!fs.existsSync(targetCommitFolder)) {
-        console.log(chalk.red("No commit exists with commit Id : ",commitId))
-        return
-    }   
-
-    
-    const currentHead = fs.readFileSync(headFile,"utf-8").trim()
-
-    if(currentHead === commitId) {
-        console.log(chalk.green("HEAD is already at the given commit"))
-        return
-    }
-
-    // get commits to delete
-    const toDelete = getCommitsToDelete(commitFolder,currentHead,commitId)
-
-    // clear the current working directory except .jvcs
-    cleanCWD()
-
-    // copy the content of commit to cwd
-    copyDir(targetCommitFolder)
-
-    fs.writeFileSync(headFile,commitId,"utf-8")
-    console.log(chalk.green(`HEAD moved to ${commitId}`));
-
-    deleteLocalCommits(commitFolder,toDelete)
-    await deleteCommitsFromDrive(toDelete)
-    await deleteCommitsFromDatabase(configData,toDelete,path.basename(process.cwd()))
-
-    console.log(chalk.green(`Successfully reverted to commit ${commitId}`));
-}
-
-module.exports = revertCmd

package/.jvcs/staging/controllers/signup.js

@@ -1,28 +0,0 @@
-const chalk = require("chalk")
-const verifyOtp = require("./verifyOtp")
-async function signup(signupData) {
-
-    const response = await fetch("http://localhost:3000/signup", {
-        method: "POST",
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        credentials: "include",
-        body: JSON.stringify(signupData)
-    })
-
-    const data = await response.json()
-
-    if(data.status === true) {
-        console.log(chalk.green(data.message))
-        await verifyOtp(signupData)
-    }
-    else if(data.status == "user") {
-        console.log(chalk.yellow(data.message))
-    }
-    else {
-        throw new Error(data.message)
-    }
-}
-
-module.exports = signup

package/.jvcs/staging/controllers/status.js

@@ -1,160 +0,0 @@
-// Untracked files
-// Files that exist in your working directory (project folder) but have never been added to staging or committed.
-
-// Changes to be committed
-// Files that are in the staging area (.jvcs/staging) — meaning, you’ve already added them using jvcs add, but haven’t committed yet.
-
-// Changes not staged for commit
-// Files that were already added to staging earlier, but you modified them again in your working directory after staging — i.e., the staged copy and working copy are different.
-
-const fs = require("fs");
-const path = require("path");
-const crypto = require("crypto");
-const chalk = require("chalk");
-const { checkGlobalConfig, getGlobalConfig, checkforjvcs } = require("./utility");
-
-// normalize relative path to use forward slashes for consistent comparisons
-function normalizeRel(p) {
-    return p.split(path.sep).join("/")
-}
-
-function hashfile(filepath) {
-    try {
-        const data = fs.readFileSync(filepath)
-        return crypto.createHash("sha256").update(data).digest("hex")
-    }
-    catch(error) {
-        // return null
-    }
-}
-
-
-function getAllFiles(dir, rootDir=dir, collected=[]) {
-
-    if (!fs.existsSync(dir)) return collected;
-
-    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))
-
-        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()) {
-            getAllFiles(fullPath, rootDir, collected);
-        }
-
-    }
-
-    return collected
-}
-
-async function statusCmd() {
-
-    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) {
-        console.log(chalk.red("No existing session found. Please login or signup."));
-        return;
-    }
-
-    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 headFile = path.join(jvcsDir, "HEAD");
-
-    if(!fs.existsSync(jvcsDir)) {
-        console.log(chalk.red("No repository exists. Please create one using 'jvcs init'"))
-        return
-    }
-
-    // collect files (all relative to cwd, normalized)
-    const cwdFiles = getAllFiles(cwd, cwd, []);
-    const stagedFiles = fs.existsSync(stagingDir) ? getAllFiles(stagingDir, stagingDir, []).map(f => normalizeRel(f)) : [];
-    let commitedFiles = []
-    if(fs.existsSync(commitDir)) {
-        const commits = fs.readdirSync(commitDir)
-        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))
-        }
-    }
-
-    // use Sets for fast looku
-    const committedSet = new Set(commitedFiles);
-    const stagedSet = new Set(stagedFiles);
-
-    // Untracked: present in cwd but not in staging or commits
-    const untracked = cwdFiles.filter(f => !stagedSet.has(f) && !committedSet.has(f));
-
-    // Changes to be committed: present in staging but not in (any) commits
-    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 cwdHash = hashfile(cwdFilePath)
-        const stagingHash = hashfile(stagedFilePath)
-
-        return cwdHash !== stagingHash
-    })
-
-
-    // output
-    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) {
-        toBeCommitted.forEach(f => console.log(chalk.green(`\t${f}`)));
-    }
-    else {
-        console.log(chalk.gray("\tNo changes added to commit"));
-    }
-
-    console.log(chalk.bold.yellow("\nChanges not staged for commit (files that are modified after adding to staging area):"));
-    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) {
-        untracked.forEach(f => console.log(chalk.red(`\t${f}`)));
-    }
-    else {
-        console.log(chalk.gray("\tNo untracked files"));
-    }
-
-    console.log(chalk.gray("\n(use 'jvcs add <file>' to stage changes)"));
-    console.log(chalk.gray("(use 'jvcs commit -m \"message\"' to commit changes)"));
-    console.log(chalk.gray("(use 'jvcs unstage <file>/<folder> to unstage a file/folder')"))
-}
-
-module.exports = statusCmd

package/.jvcs/staging/controllers/unstage.js

@@ -1,104 +0,0 @@
-const fs = require("fs").promises;
-const fssync = require("fs");
-const path = require("path");
-const chalk = require("chalk");
-const { checkGlobalConfig, getGlobalConfig, checkforjvcs } = require("./utility");
-
-function removeHashesForFolder(hashData,folderPath) {
-
-    for(const key of Object.keys(hashData)) {
-        if(key.startsWith(folderPath+path.sep)) {
-            delete hashData[key]
-        }
-    }
-}
-
-async function unstageCmd(paths) {
-
-    if(!paths || paths.length === 0) {
-        console.log(chalk.yellow("Please specify files or folders to unstage."));
-        return;
-    }
-
-    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) {
-        console.log(chalk.red("No existing session found. Please login or signup."));
-        return;
-    }
-
-    if(!checkforjvcs()) {
-        console.log(chalk.red("Repository is not initialized or is deleted."));
-        return;
-    }
-
-    const repoPath = path.join(process.cwd(), ".jvcs");
-    const stagingPath = path.join(repoPath, "staging");
-    const hashPath = path.join(stagingPath, "jvcs_hashcode.json");
-
-    if(!fssync.existsSync(stagingPath)) {
-        console.log(chalk.yellow("Nothing is staged yet."));
-        return;
-    }
-
-    const stagedItems = fssync.readdirSync(stagingPath).filter((item)=> item !== "jvcs_hashcode.json")
-    if(stagedItems.length === 0) {
-        console.log(chalk.yellow("Staging area is empty. Nothing to unstage."));
-        return;
-    }
-
-    let hashData = {};
-    if(fssync.existsSync(hashPath)) {
-        hashData = JSON.parse(await fs.readFile(hashPath, "utf-8"));
-    }
-
-    if(paths.length === 1 && paths[0] === ".") {
-        await fs.rm(stagingPath, {recursive: true, force: true})
-        await fs.mkdir(stagingPath, {recursive: true})
-        console.log(chalk.cyan("Unstaged all files and folders."));
-        return
-    }
-
-    const targets = paths.map((p) => path.resolve(process.cwd(), p));
-
-    for(const target of targets) {
-
-        const stagedTarget = path.join(stagingPath, path.relative(process.cwd(),target))
-
-        if(!fssync.existsSync(stagedTarget)) {
-            console.log(chalk.yellow(`Not found in staging: ${path.relative(process.cwd(), target)}`));
-            continue;
-        }
-
-        const stats = await fs.stat(stagedTarget);
-
-        if(stats.isDirectory()) {
-            await fs.rm(stagedTarget, {recursive: true, force: true})
-            removeHashesForFolder(hashData,path.relative(process.cwd(),target))
-            console.log(chalk.cyan(`Unstaged folder: ${path.relative(process.cwd(), target)}`));
-        }
-        else if(stats.isFile()) {
-            await fs.rm(stagedTarget)
-            delete hashData[path.relative(process.cwd(),target)]
-            console.log(chalk.green(`Unstaged file: ${path.relative(process.cwd(), target)}`));
-        }
-
-    }
-
-    if(Object.keys(hashData).length === 0) {
-        if(fssync.existsSync(hashPath)) {
-            await fs.rm(hashPath)
-        }
-    }
-    else {
-        await fs.writeFile(hashPath,JSON.stringify(hashData,null,2))
-    }
-
-}
-
-module.exports = unstageCmd

package/.jvcs/staging/controllers/utility.js

@@ -1,29 +0,0 @@
-const fs = require("fs")
-const path = require("path")
-
-const config = path.join(require("os").homedir(),".jvcs","config.json")
-
-function checkGlobalConfig() {
-    return fs.existsSync(config)
-}
-
-function getGlobalConfig() {
-    if(checkGlobalConfig()) {
-        const configData = JSON.parse(fs.readFileSync(config,"utf-8"))
-        if(configData.username && configData.email && configData.token)
-        return configData
-    }
-
-    return null
-}
-
-function checkforjvcs() {
-    const jvcsPath = path.join(process.cwd(),".jvcs")
-    return fs.existsSync(jvcsPath)
-}
-
-module.exports = {
-    checkGlobalConfig,
-    getGlobalConfig,
-    checkforjvcs
-}