isomorphic-jj 1.1.2 → 1.1.3

package/dist/index.mjs

@@ -4391,11 +4391,17 @@ class UserConfig {
 const __filename$3 = fileURLToPath(import.meta.url);
 const __dirname$3 = path.dirname(__filename$3);
 
+// Determine proto path based on whether we're running from dist or src
+const inDist$3 = __dirname$3.includes('/dist') || __dirname$3.includes('\\dist');
+const protoDir$3 = inDist$3
+  ? path.join(__dirname$3, '..', 'src', 'protos')
+  : path.join(__dirname$3, '..', 'protos');
+
 class JJCheckout {
   constructor(fs, dir) {
     this.fs = fs;
     this.dir = dir;
-    this.protoPath = path.join(__dirname$3, '..', 'protos', 'local_working_copy.proto');
+    this.protoPath = path.join(protoDir$3, 'local_working_copy.proto');
   }
 
   /**
@@ -4467,11 +4473,17 @@ class JJCheckout {
 const __filename$2 = fileURLToPath(import.meta.url);
 const __dirname$2 = path.dirname(__filename$2);
 
+// Determine proto path based on whether we're running from dist or src
+const inDist$2 = __dirname$2.includes('/dist') || __dirname$2.includes('\\dist');
+const protoDir$2 = inDist$2
+  ? path.join(__dirname$2, '..', 'src', 'protos')
+  : path.join(__dirname$2, '..', 'protos');
+
 class JJTreeState {
   constructor(fs, dir) {
     this.fs = fs;
     this.dir = dir;
-    this.protoPath = path.join(__dirname$2, '..', 'protos', 'local_working_copy.proto');
+    this.protoPath = path.join(protoDir$2, 'local_working_copy.proto');
   }
 
   /**
@@ -4559,11 +4571,17 @@ class JJTreeState {
 const __filename$1 = fileURLToPath(import.meta.url);
 const __dirname$1 = path.dirname(__filename$1);
 
+// Determine proto path based on whether we're running from dist or src
+const inDist$1 = __dirname$1.includes('/dist') || __dirname$1.includes('\\dist');
+const protoDir$1 = inDist$1
+  ? path.join(__dirname$1, '..', 'src', 'protos')
+  : path.join(__dirname$1, '..', 'protos');
+
 class JJOperationStore {
   constructor(fs, dir) {
     this.fs = fs;
     this.dir = dir;
-    this.protoPath = path.join(__dirname$1, '..', 'protos', 'simple_op_store.proto');
+    this.protoPath = path.join(protoDir$1, 'simple_op_store.proto');
   }
 
   /**
@@ -4677,11 +4695,17 @@ class JJOperationStore {
 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');
+
 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');
   }
 
   /**
@@ -10767,9 +10791,21 @@ 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)',
           });
         }
 
@@ -10805,6 +10841,17 @@ 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',
@@ -10857,9 +10904,23 @@ 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)',
           });
         }