isomorphic-jj 1.0.0 → 1.1.0

package/bin/isojj.js

@@ -0,0 +1,262 @@
+#!/usr/bin/env node
+
+/**
+ * isojj - CLI wrapper for isomorphic-jj
+ *
+ * Thin shell that translates CLI arguments to isomorphic-jj API calls.
+ * Similar to isogit for isomorphic-git.
+ */
+
+import { createJJ } from '../src/api/repository.js';
+import fs from 'fs';
+
+// Parse command line arguments
+function parseArgs(argv) {
+  const args = argv.slice(2);
+  const command = args[0];
+  const opts = {};
+
+  for (let i = 1; i < args.length; i++) {
+    const arg = args[i];
+
+    if (arg.startsWith('--')) {
+      const key = arg.slice(2);
+      const nextArg = args[i + 1];
+
+      // Handle --flag and --key=value
+      if (arg.includes('=')) {
+        const [k, v] = arg.slice(2).split('=');
+        opts[k] = v;
+      } else if (nextArg && !nextArg.startsWith('-')) {
+        opts[key] = nextArg;
+        i++;
+      } else {
+        opts[key] = true;
+      }
+    } else if (arg.startsWith('-')) {
+      // Handle short flags like -m "message"
+      const key = arg.slice(1);
+      const nextArg = args[i + 1];
+
+      if (nextArg && !nextArg.startsWith('-')) {
+        opts[key] = nextArg;
+        i++;
+      } else {
+        opts[key] = true;
+      }
+    } else {
+      // Positional argument
+      if (!opts._positional) opts._positional = [];
+      opts._positional.push(arg);
+    }
+  }
+
+  return { command, opts };
+}
+
+// Format output for different commands
+function formatOutput(command, result) {
+  if (result === undefined || result === null) {
+    return;
+  }
+
+  // Handle special output formatting for common commands
+  if (command === 'log') {
+    if (Array.isArray(result)) {
+      console.log('\nChange History:\n');
+      result.forEach((change, idx) => {
+        const shortId = change.changeId.slice(0, 12);
+        const desc = change.description || '(no description)';
+        const author = change.author?.name || 'unknown';
+        const timestamp = change.timestamp ? new Date(change.timestamp).toLocaleString() : '';
+
+        console.log(`  ${shortId}  ${desc}`);
+        console.log(`             ${author}  ${timestamp}`);
+        if (idx < result.length - 1) console.log();
+      });
+      return;
+    }
+  }
+
+  if (command === 'status') {
+    if (result.workingCopy) {
+      console.log(`Working copy change: ${result.workingCopy.changeId.slice(0, 12)}`);
+      console.log(`Parent change(s): ${result.workingCopy.parents.map(p => p.slice(0, 12)).join(', ')}`);
+      console.log();
+    }
+
+    if (result.modified?.length > 0) {
+      console.log('Modified files:');
+      result.modified.forEach(file => console.log(`  M ${file}`));
+    }
+
+    if (result.added?.length > 0) {
+      console.log('Added files:');
+      result.added.forEach(file => console.log(`  A ${file}`));
+    }
+
+    if (result.removed?.length > 0) {
+      console.log('Removed files:');
+      result.removed.forEach(file => console.log(`  D ${file}`));
+    }
+
+    if (result.conflicts?.length > 0) {
+      console.log('Conflicted files:');
+      result.conflicts.forEach(file => console.log(`  C ${file}`));
+    }
+
+    return;
+  }
+
+  if (command === 'diff') {
+    if (typeof result === 'string') {
+      console.log(result);
+      return;
+    }
+  }
+
+  // Default: pretty-print JSON
+  console.log(JSON.stringify(result, null, 2));
+}
+
+// Main CLI handler
+async function main() {
+  try {
+    const { command, opts } = parseArgs(process.argv);
+
+    if (!command || command === 'help' || command === '--help' || command === '-h') {
+      console.log(`
+isojj - CLI for isomorphic-jj
+
+Usage: isojj <command> [options]
+
+Common commands:
+  init                    Initialize a new repository
+  log [--revset <expr>]   Show change history
+  status                  Show working copy status
+  describe -m <message>   Set change description
+  new -m <message>        Create new change
+  diff [--changeId <id>]  Show changes
+
+  bookmark.set --name <name> --changeId <id>
+  bookmark.list
+
+  absorb [--dryRun]       Absorb working copy changes
+
+  bisect.start --good <id> --bad <id>
+  bisect.good
+  bisect.bad
+  bisect.status
+  bisect.reset
+
+Options:
+  --dir <path>            Repository directory (default: current directory)
+  --json                  Output raw JSON (skip formatting)
+
+Examples:
+  isojj init
+  isojj log
+  isojj describe -m "Fix bug"
+  isojj new -m "Start new feature"
+  isojj bookmark.set --name main --changeId abc123
+  isojj bisect.start --good abc123 --bad def456
+`);
+      process.exit(0);
+    }
+
+    // Get repository directory
+    const dir = opts.dir || process.cwd();
+
+    // Initialize repository instance
+    const jj = await createJJ({ fs, dir });
+
+    // If not initializing, load existing repository state
+    if (command !== 'init') {
+      try {
+        // Check if repository exists by checking for .jj directory
+        await fs.promises.stat(`${dir}/.jj`);
+
+        // Load repository state
+        await jj.graph.load();
+        await jj.workingCopy.load();
+        await jj.bookmarks.load();
+      } catch (error) {
+        if (error.code === 'ENOENT') {
+          throw new Error(`Not a jj repository (or any parent up to mount point /)\nStopped at: ${dir}\nRun 'isojj init' to initialize a repository`);
+        }
+        throw error;
+      }
+    }
+
+    // Handle nested commands (e.g., bisect.start, bookmark.set)
+    const parts = command.split('.');
+    let method = jj;
+
+    for (const part of parts) {
+      method = method[part];
+      if (!method) {
+        throw new Error(`Unknown command: ${command}`);
+      }
+    }
+
+    if (typeof method !== 'function') {
+      throw new Error(`${command} is not a valid command`);
+    }
+
+    // Map common CLI flags to API options
+    const apiOpts = {};
+
+    // Common mappings
+    if (opts.m || opts.message) apiOpts.message = opts.m || opts.message;
+    if (opts.changeId) apiOpts.changeId = opts.changeId;
+    if (opts.revset) apiOpts.revset = opts.revset;
+    if (opts.name) apiOpts.name = opts.name;
+    if (opts.path) apiOpts.path = opts.path;
+    if (opts.good) apiOpts.good = opts.good;
+    if (opts.bad) apiOpts.bad = opts.bad;
+    if (opts.dryRun) apiOpts.dryRun = true;
+    if (opts.parents) {
+      apiOpts.parents = opts.parents.includes(',')
+        ? opts.parents.split(',')
+        : [opts.parents];
+    }
+
+    // Add positional arguments if any
+    if (opts._positional?.length > 0) {
+      // For commands like 'read <path>', use first positional as path
+      if (command === 'read' || command === 'remove') {
+        apiOpts.path = opts._positional[0];
+      }
+    }
+
+    // Execute the command
+    const result = await method.call(jj, apiOpts);
+
+    // Format and output result
+    if (opts.json) {
+      console.log(JSON.stringify(result, null, 2));
+    } else {
+      formatOutput(command, result);
+    }
+
+    process.exit(0);
+  } catch (error) {
+    console.error(`Error: ${error.message}`);
+
+    if (error.code) {
+      console.error(`Code: ${error.code}`);
+    }
+
+    if (error.context?.suggestion) {
+      console.error(`Suggestion: ${error.context.suggestion}`);
+    }
+
+    if (process.env.DEBUG) {
+      console.error(error.stack);
+    }
+
+    process.exit(1);
+  }
+}
+
+main();

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "isomorphic-jj",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A pure-JavaScript library that brings Jujutsu (jj) version control semantics to Node.js and browsers",
   "type": "module",
+  "bin": {
+    "isojj": "./bin/isojj.js"
+  },
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./src/types.d.ts",
@@ -18,6 +21,7 @@
     }
   },
   "files": [
+    "bin",
     "dist",
     "src",
     "README.md",