isomorphic-jj 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomorphic-jj",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A pure-JavaScript library that brings Jujutsu (jj) version control semantics to Node.js and browsers",
   "type": "module",
   "bin": {

package/src/api/repository.js

@@ -5331,9 +5331,21 @@ export async function createJJ(options) {
        * @returns {Promise<Object>} Bookmark info
        */
       async set(args) {
+        // Normalize: accept common parameter aliases
+        if (args) {
+          if (args.target && !args.changeId) {
+            args = { ...args, changeId: args.target };
+          } else if (args.change && !args.changeId) {
+            args = { ...args, changeId: args.change };
+          } else if (args.revision && !args.changeId) {
+            args = { ...args, changeId: args.revision };
+          }
+        }
+
         if (!args || !args.name || !args.changeId) {
           throw new JJError('INVALID_ARGUMENT', 'Missing name or changeId', {
-            suggestion: 'Provide both: { name: "main", changeId: "abc123..." }',
+            args,
+            suggestion: 'Provide both: { name: "main", changeId: "abc123..." } (or use target/change/revision instead of changeId)',
           });
         }
 
@@ -5369,6 +5381,17 @@ export async function createJJ(options) {
        * @returns {Promise<Object>} Bookmark info
        */
       async create(args) {
+        // Normalize: accept common parameter aliases
+        if (args) {
+          if (args.target && !args.changeId) {
+            args = { ...args, changeId: args.target };
+          } else if (args.change && !args.changeId) {
+            args = { ...args, changeId: args.change };
+          } else if (args.revision && !args.changeId) {
+            args = { ...args, changeId: args.revision };
+          }
+        }
+
         if (!args || !args.name) {
           throw new JJError('INVALID_ARGUMENT', 'Missing name argument', {
             suggestion: 'Provide: { name: "main", changeId: "abc123..." } or { name: "main" } for working copy',
@@ -5421,9 +5444,23 @@ export async function createJJ(options) {
        * @returns {Promise<Object>} Move result
        */
       async move(args) {
+        // Normalize: accept common parameter aliases
+        if (args) {
+          if (args.target && !args.to) {
+            args = { ...args, to: args.target };
+          } else if (args.changeId && !args.to) {
+            args = { ...args, to: args.changeId };
+          } else if (args.change && !args.to) {
+            args = { ...args, to: args.change };
+          } else if (args.revision && !args.to) {
+            args = { ...args, to: args.revision };
+          }
+        }
+
         if (!args || !args.name || !args.to) {
           throw new JJError('INVALID_ARGUMENT', 'Missing name or to', {
-            suggestion: 'Provide both: { name: "main", to: "abc123..." }',
+            args,
+            suggestion: 'Provide both: { name: "main", to: "abc123..." } (or use target/changeId/change/revision instead of to)',
           });
         }
 

package/src/core/jj-checkout.js

@@ -12,11 +12,17 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+// Determine proto path based on whether we're running from dist or src
+const inDist = __dirname.includes('/dist') || __dirname.includes('\\dist');
+const protoDir = inDist
+  ? path.join(__dirname, '..', 'src', 'protos')
+  : path.join(__dirname, '..', 'protos');
+
 export class JJCheckout {
   constructor(fs, dir) {
     this.fs = fs;
     this.dir = dir;
-    this.protoPath = path.join(__dirname, '..', 'protos', 'local_working_copy.proto');
+    this.protoPath = path.join(protoDir, 'local_working_copy.proto');
   }
 
   /**

package/src/core/jj-operation-store.js

@@ -12,11 +12,17 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+// Determine proto path based on whether we're running from dist or src
+const inDist = __dirname.includes('/dist') || __dirname.includes('\\dist');
+const protoDir = inDist
+  ? path.join(__dirname, '..', 'src', 'protos')
+  : path.join(__dirname, '..', 'protos');
+
 export class JJOperationStore {
   constructor(fs, dir) {
     this.fs = fs;
     this.dir = dir;
-    this.protoPath = path.join(__dirname, '..', 'protos', 'simple_op_store.proto');
+    this.protoPath = path.join(protoDir, 'simple_op_store.proto');
   }
 
   /**

package/src/core/jj-tree-state.js

@@ -12,11 +12,17 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+// Determine proto path based on whether we're running from dist or src
+const inDist = __dirname.includes('/dist') || __dirname.includes('\\dist');
+const protoDir = inDist
+  ? path.join(__dirname, '..', 'src', 'protos')
+  : path.join(__dirname, '..', 'protos');
+
 export class JJTreeState {
   constructor(fs, dir) {
     this.fs = fs;
     this.dir = dir;
-    this.protoPath = path.join(__dirname, '..', 'protos', 'local_working_copy.proto');
+    this.protoPath = path.join(protoDir, 'local_working_copy.proto');
   }
 
   /**

package/src/core/jj-view-store.js

@@ -12,11 +12,17 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+// Determine proto path based on whether we're running from dist or src
+const inDist = __dirname.includes('/dist') || __dirname.includes('\\dist');
+const protoDir = inDist
+  ? path.join(__dirname, '..', 'src', 'protos')
+  : path.join(__dirname, '..', 'protos');
+
 export class JJViewStore {
   constructor(fs, dir) {
     this.fs = fs;
     this.dir = dir;
-    this.protoPath = path.join(__dirname, '..', 'protos', 'simple_op_store.proto');
+    this.protoPath = path.join(protoDir, 'simple_op_store.proto');
   }
 
   /**