jvcs 1.4.4 → 1.4.6

package/controllers/diff-engine/diff.js

@@ -0,0 +1,44 @@
+const AppState  = require("./state")
+const getDiff = require("./diffEngine")
+const chalk = require("chalk")
+const { checkGlobalConfig, getGlobalConfig, checkforjvcs } = require("./utility")
+
+async function diff(mode, options = {}) {
+
+    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
+    }
+
+    try {
+
+        const files = getDiff(mode, options)
+        if(!files || files.length === 0) {
+            console.log(chalk.yellow("No differences found."))
+            return
+        }
+
+        const appState = new AppState (mode, files)
+        startUI(appState)
+    }
+    catch(error) {
+        console.log(chalk.red("Diff Error: " + (error.message || error)))
+    }
+
+}
+
+module.exports = diff

package/controllers/diff-engine/diffEngine.js

@@ -0,0 +1,173 @@
+import fs from "fs"
+import path from "path"
+
+const JVCS_ROOT = path.join(process.cwd(), ".jvcs")
+
+const IGNORE_FOLDERS = [
+  ".jvcs",
+  "node_modules",
+  ".git"
+]
+
+const IGNORE_FILES = [
+  ".DS_Store",
+  "jvcs_hashcode.json",
+  "meta.json",
+  "HEAD",
+  "config.json"
+]
+
+function fileExists(filepath) {
+    return fs.existsSync(filepath)
+}
+
+function readFileSafe(filepath) {
+
+    if(!fileExists(filepath)) return ""
+    return fs.readFileSync(filepath, "utf-8")
+}
+
+function shouldIgnoreFile(fileName) {
+    return IGNORE_FILES.includes(fileName)
+}
+
+function shouldIgnoreFolder(folderName) {
+    return IGNORE_FOLDERS.includes(folderName)
+}
+
+function loadStageSnapshot() {
+    const stagePath = path.join(JVCS_ROOT, "staging")
+    return loadDirectoryRecursive(stagePath)
+}
+
+function loadDirectoryRecursive(dirPath, baseDir = dirPath, snapshot = {}) {
+
+    if(!fileExists(dirPath)) return snapshot
+
+    const entries = fs.readdirSync(dirPath)
+
+    for(const entry of entries) {
+        if(shouldIgnoreFile(entry)) continue
+        if(shouldIgnoreFolder(entry)) continue
+
+        const fullPath = path.join(dirPath, entry)
+        const stat = fs.statSync(fullPath)
+    
+        if(stat.isDirectory()) {
+            loadDirectoryRecursive(fullPath, baseDir, snapshot)
+        } 
+        else if (stat.isFile()) {
+            const relativePath = path.relative(baseDir, fullPath)
+            snapshot[relativePath] = readFileSafe(fullPath)
+        }
+    }
+
+    return snapshot
+}
+
+function loadWorkingDirectorySnapshot() {
+    return loadDirectoryRecursive(process.cwd(), process.cwd())
+}
+
+function calculateLineDiff(leftContent, rightContent) {
+    
+    const leftLines = leftContent.split("\n")
+    const rightLines = rightContent.split("\n")
+
+    let added = 0
+    let removed = 0
+
+    const max = Math.max(leftLines.length, rightLines.length)
+
+    for (let i = 0; i < max; i++) {
+        if (leftLines[i] !== rightLines[i]) {
+            if(leftLines[i] === undefined) {
+                added++
+            } 
+            else if(rightLines[i] === undefined) {
+                removed++
+            }
+            else {
+                added++
+                removed++
+            }
+        }
+    }
+
+    return { added, removed }
+}
+
+function buildDiffObject(filePath, leftContent, rightContent) {
+    let status = "modified"
+
+    if(!leftContent && rightContent) {
+        status = "added"
+    } 
+    else if(leftContent && !rightContent) {
+        status = "deleted"
+    }
+
+    return {
+        path: filePath,
+        status,
+        leftContent,
+        rightContent,
+        stats: calculateLineDiff(leftContent, rightContent)
+    }
+}
+
+function getDiff(mode, options = {}) {
+
+    let leftSnapshot = {}
+    let rightSnapshot = {}
+
+    if(mode === "commit-vs-commit") {
+        const { commitA, commitB } = options
+        
+        if(!commitA || !commitB) {
+            throw new Error("commit-vs-commit requires commitA and commitB")
+        }
+
+        leftSnapshot = loadCommitSnapshot(commitA)
+        rightSnapshot = loadCommitSnapshot(commitB)
+    }
+    else if(mode === "commit-vs-stage") {
+        const { commitId } = options
+
+        if(!commitId) {
+            throw new Error("commit-vs-stage requires commitId")
+        }
+
+        leftSnapshot = loadCommitSnapshot(commitId)
+        rightSnapshot = loadStageSnapshot()
+    }
+    else if(mode === "stage-vs-cwd") {
+        leftSnapshot = loadStageSnapshot()
+        rightSnapshot = loadWorkingDirectorySnapshot()
+    }
+    else {
+        throw new Error("Invalid diff mode")
+    }
+
+    const allFiles = new Set([
+        ...Object.keys(leftSnapshot),
+        ...Object.keys(rightSnapshot)
+    ])
+
+    const diffResults = []
+
+    for (const filePath of allFiles) {
+        const leftContent = leftSnapshot[filePath] || ""
+        const rightContent = rightSnapshot[filePath] || ""
+
+        if(leftContent !== rightContent) {
+            diffResults.push(
+                buildDiffObject(filePath, leftContent, rightContent)
+            )
+        }
+    }
+
+    return diffResults
+}
+
+module.exports = getDiff

package/controllers/diff-engine/state.js

@@ -0,0 +1,32 @@
+class AppState {
+
+    constructor(mode, files) {
+        this.mode = mode
+        this.files = files || []
+        this.screen = "FILE_LIST"
+        this.selectedIndex = 0
+        this.activeTab = 0 
+    }
+
+    selectFile(index) {
+        this.selectedIndex = index
+    }
+
+    switchTab(tabIndex) {
+        this.activeTab = tabIndex
+    }
+
+    goToFileView() {
+        this.screen = "FILE_VIEW"
+    }
+
+    goToListView() {
+        this.screen = "FILE_LIST"
+    }
+
+    getCurrentFile() {
+        return this.files[this.selectedIndex]
+    }
+}
+
+module.exports = AppState

package/controllers/diff-engine/ui.js

@@ -0,0 +1,216 @@
+const blessed = require("blessed")
+
+function startUI(state) {
+
+    const screen = blessed.screen({
+        smartCSR: true,
+        title: "JVCS Diff Viewer"
+    })
+
+    // ---------------------------------------
+    // HEADER
+    // ---------------------------------------
+
+    const header = blessed.box({
+        top: 0,
+        height: 1,
+        width: "100%",
+        content: ` JVCS DIFF VIEW (${state.mode}) | ↑↓ Navigate | Enter Open | Esc Back | Tab Switch | Q Quit `,
+        style: {
+            fg: "black",
+            bg: "cyan"
+        }
+    })
+
+    screen.append(header)
+
+    // ---------------------------------------
+    // FILE LIST VIEW
+    // ---------------------------------------
+
+    const fileList = blessed.list({
+        top: 1,
+        left: 0,
+        width: "100%",
+        height: "100%-1",
+        keys: true,
+        vi: true,
+        border: "line",
+        label: " Changed Files ",
+        style: {
+            selected: {
+                bg: "blue"
+            }
+        }
+    })
+
+    screen.append(fileList)
+
+    function renderFileList() {
+        const items = state.files.map((file, index) => {
+            return `${file.status.toUpperCase()}  ${file.path}`
+        })
+
+        fileList.setItems(items)
+        fileList.select(state.selectedIndex)
+        fileList.focus()
+        screen.render()
+    }
+
+    // ---------------------------------------
+    // FILE VIEW (3 PANELS)
+    // ---------------------------------------
+
+    const leftBox = blessed.box({
+        top: 1,
+        left: 0,
+        width: "33%",
+        height: "100%-1",
+        border: "line",
+        label: " LEFT ",
+        scrollable: true,
+        alwaysScroll: true,
+        keys: true,
+        vi: true
+    })
+
+    const rightBox = blessed.box({
+        top: 1,
+        left: "33%",
+        width: "34%",
+        height: "100%-1",
+        border: "line",
+        label: " RIGHT ",
+        scrollable: true,
+        alwaysScroll: true,
+        keys: true,
+        vi: true
+    })
+
+    const aiBox = blessed.box({
+        top: 1,
+        left: "67%",
+        width: "33%",
+        height: "100%-1",
+        border: "line",
+        label: " AI ANALYSIS ",
+        scrollable: true,
+        alwaysScroll: true,
+        keys: true,
+        vi: true
+    })
+
+    function renderFileView() {
+
+        const file = state.getCurrentFile()
+        if (!file) return
+
+        leftBox.setContent(file.leftContent || "")
+        rightBox.setContent(file.rightContent || "")
+
+        aiBox.setContent(`
+Summary:
+Changes detected in file.
+
+Status: ${file.status}
+
+Lines Added: ${file.stats.added}
+Lines Removed: ${file.stats.removed}
+
+(Real AI analysis will appear here later)
+        `)
+
+        screen.append(leftBox)
+        screen.append(rightBox)
+        screen.append(aiBox)
+
+        updateActiveTabHighlight()
+
+        screen.render()
+    }
+
+    function destroyFileView() {
+        leftBox.detach()
+        rightBox.detach()
+        aiBox.detach()
+        screen.render()
+    }
+
+    function updateActiveTabHighlight() {
+
+        leftBox.style.border.fg = "white"
+        rightBox.style.border.fg = "white"
+        aiBox.style.border.fg = "white"
+
+        if (state.activeTab === 0) {
+            leftBox.style.border.fg = "yellow"
+            leftBox.focus()
+        }
+        else if (state.activeTab === 1) {
+            rightBox.style.border.fg = "yellow"
+            rightBox.focus()
+        }
+        else {
+            aiBox.style.border.fg = "yellow"
+            aiBox.focus()
+        }
+
+        screen.render()
+    }
+
+    // ---------------------------------------
+    // KEYBOARD CONTROLS
+    // ---------------------------------------
+
+    screen.key(["q", "C-c"], () => {
+        return process.exit(0)
+    })
+
+    // Navigate list
+    fileList.key(["up"], () => {
+        if (state.selectedIndex > 0) {
+            state.selectFile(state.selectedIndex - 1)
+            renderFileList()
+        }
+    })
+
+    fileList.key(["down"], () => {
+        if (state.selectedIndex < state.files.length - 1) {
+            state.selectFile(state.selectedIndex + 1)
+            renderFileList()
+        }
+    })
+
+    // Enter → Open file view
+    fileList.key(["enter"], () => {
+        state.goToFileView()
+        fileList.detach()
+        renderFileView()
+    })
+
+    // ESC → Back to list
+    screen.key(["escape"], () => {
+        if (state.screen === "FILE_VIEW") {
+            state.goToListView()
+            destroyFileView()
+            screen.append(fileList)
+            renderFileList()
+        }
+    })
+
+    // TAB → switch active panel
+    screen.key(["tab"], () => {
+        if (state.screen === "FILE_VIEW") {
+            state.switchTab((state.activeTab + 1) % 3)
+            updateActiveTabHighlight()
+        }
+    })
+
+    // ---------------------------------------
+    // INITIAL RENDER
+    // ---------------------------------------
+
+    renderFileList()
+}
+
+module.exports = startUI

package/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const yargs = require("yargs");
 const { hideBin } = require("yargs/helpers");
@@ -16,6 +16,7 @@ const pushCmd = require("./controllers/push");
 const statusCmd = require("./controllers/status")
 const revertCmd = require("./controllers/revert")
 const cloneCmd = require("./controllers/clone")
+const diff = require("./controllers/diff-engine/diff")
 // file changed
  
 yargs(hideBin(process.argv))
@@ -157,6 +158,65 @@ yargs(hideBin(process.argv))
         }
     }
 )
+.command(
+    "diff",
+    chalk.blue(`
+    Compare different states of your repository.
+    
+    Modes:
+        stage-vs-cwd
+        commit-vs-stage
+        commit-vs-commit
+
+    Example:
+        jvcs diff --mode stage-vs-cwd
+        jvcs diff --mode commit-vs-stage --commitId <id>
+        jvcs diff --mode commit-vs-commit --commitA <id> --commitB <id>
+    `),
+    (yargs) => {
+        return yargs
+        .option("mode", {
+            type: "string",
+            describe: "Diff mode",
+            choices: ["stage-vs-cwd", "commit-vs-stage", "commit-vs-commit"],
+            demandOption: true
+        })
+        .option("commitId", {
+            type: "string",
+            describe: "Commit ID (for commit-vs-stage)"
+        })
+        .option("commitA", {
+            type: "string",
+            describe: "First commit ID (for commit-vs-commit)"
+        })
+        .option("commitB", {
+            type: "string",
+            describe: "Second commit ID (for commit-vs-commit)"
+        })
+    },
+     async (argv) => {
+        try {
+            const { mode, commitId, commitA, commitB } = argv
+
+            if(mode === "commit-vs-stage" && !commitId) {
+                throw new Error("commit-vs-stage requires --commitId")
+            }
+
+            if(mode === "commit-vs-commit" && (!commitA || !commitB)) {
+                throw new Error("commit-vs-commit requires --commitA and --commitB")
+            }
+
+            await diff(mode, {
+                commitId,
+                commitA,
+                commitB
+            })
+        } 
+        catch (error) {
+            console.log(chalk.red(error.message || error))
+        }
+    }
+)
 .command(
     "revert <commitId>",
     chalk.blue("Replace your working directory with specific commit you made previously"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jvcs",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "bin": {
     "jvcs": "index.js"
   },
@@ -8,6 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "blessed": "^0.1.81",
     "chalk": "^4.1.2",
     "dotenv": "^17.2.3",
     "googleapis": "^164.1.0",