@phpsandbox/sdk 0.0.47 → 0.0.48

package/README.md

@@ -85,14 +85,19 @@ const persistent = await client.notebook.create('laravel', {
   persistent: true,
 });
 
+const persistentFork = await created.fork({
+  persistent: true,
+});
+
 console.log(persistent.data.policy);
+console.log(persistentFork.data.policy);
 ```
 
 Notes:
 
 - `create()` and `fork()` initialize automatically.
 - `open()` and `get()` return a notebook instance; call `await notebook.ready()` before using tools.
-- API notebook creates are ephemeral by default. `persistent: true` requires an entitled account.
+- API notebook creates and forks are ephemeral by default. `persistent: true` requires an entitled account.
 
 ## Services At A Glance
 
@@ -207,8 +212,36 @@ await notebook.git.sync(
 
 const history = await notebook.git.log('main');
 console.log(history[0]);
+
+const review = await notebook.git.review();
+await notebook.git.stage({ paths: review.files.filter((file) => file.unstaged).map((file) => file.path) });
+await notebook.git.unstage({ path: 'README.md' });
+await notebook.git.revert({ path: 'README.md' });
+await notebook.git.revert({ path: 'staged-file.php', staged: true });
+
+const forkUrl = 'https://git.phpsandbox.io/fork-id.git';
+const preview = await notebook.git.diff({
+  url: forkUrl,
+  token: process.env.PHPSANDBOX_TOKEN,
+});
+
+if (preview.status === 'ready') {
+  const result = await notebook.git.merge({
+    url: forkUrl,
+    token: process.env.PHPSANDBOX_TOKEN,
+    expectedBaseRef: preview.baseRef,
+    author: 'PHPSandbox <hi@phpsandbox.io>',
+    message: 'Merge fork into base',
+  });
+
+  if (result.status === 'conflict') {
+    console.log(result.conflicts);
+  }
+}
 ```
 
+Fork diff requires the base and fork to share Git history. If they do not, `diff()` returns `status: 'unrelated'`.
+
 ### Mail
 
 ```ts

package/dist/browser/phpsandbox-sdk.esm.js

@@ -4036,6 +4036,33 @@ var Git = class {
   log(ref = "main") {
     return this.okra.invoke("git.log", { ref });
   }
+  diff(input) {
+    return this.okra.invoke("git.diff", input);
+  }
+  merge(input) {
+    return this.okra.invoke("git.merge", input);
+  }
+  conflicts() {
+    return this.okra.invoke("git.conflicts", {});
+  }
+  abortMerge() {
+    return this.okra.invoke("git.resolve", { action: "abort" });
+  }
+  continueMerge(author, message) {
+    return this.okra.invoke("git.resolve", { action: "continue", author, message });
+  }
+  review() {
+    return this.okra.invoke("git.review", {});
+  }
+  stage(input = { all: true }) {
+    return this.okra.invoke("git.stage", input);
+  }
+  unstage(input = { all: true }) {
+    return this.okra.invoke("git.unstage", input);
+  }
+  revert(input) {
+    return this.okra.invoke("git.revert", input);
+  }
   restore(ref) {
     return this.okra.invoke("git.restore", { ref });
   }
@@ -4822,8 +4849,8 @@ var NotebookApi = class {
   async delete(id) {
     await this.client.delete(`/notebook/${id}`);
   }
-  async fork(id) {
-    const response = await this.client.post(`/notebook/${id}/fork`);
+  async fork(id, input = {}) {
+    const response = await this.client.post(`/notebook/${id}/fork`, input);
     return this.init(new NotebookInstance(response.data, this.client));
   }
   async open(id) {
@@ -5008,8 +5035,8 @@ var NotebookInstance = class {
     };
     return ready();
   }
-  fork() {
-    return this.client.notebook.fork(this.data.id);
+  fork(input = {}) {
+    return this.client.notebook.fork(this.data.id, input);
   }
   delete() {
     return this.client.notebook.delete(this.data.id).then(() => {