github-repository-provider 7.30.13 → 7.30.16

package/README.md

@@ -111,7 +111,7 @@ Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/
 
 *   `message` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 *   `entries` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<ContentEntry>** 
-*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `{}`)
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
 ### entry
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-repository-provider",
-  "version": "7.30.13",
+  "version": "7.30.16",
   "publishConfig": {
     "access": "public"
   },
@@ -32,7 +32,7 @@
   "dependencies": {
     "content-entry": "^5.0.6",
     "fetch-link-util": "^1.0.10",
-    "fetch-rate-limit-util": "^3.0.13",
+    "fetch-rate-limit-util": "^3.0.14",
     "matching-iterator": "^2.0.6",
     "node-fetch": "^3.2.6",
     "one-time-execution-method": "^3.0.3",
@@ -42,7 +42,7 @@
     "ava": "^4.3.0",
     "c8": "^7.11.3",
     "documentation": "^13.2.5",
-    "etag-cache-leveldb": "^1.2.2",
+    "etag-cache-leveldb": "^1.2.4",
     "leveldown": "^6.1.1",
     "levelup": "^5.1.1",
     "repository-provider-test-support": "^2.2.5",

package/src/github-branch.mjs

@@ -10,7 +10,10 @@ import {
  * Branch on GitHub.
  */
 export class GithubBranch extends Branch {
-  
+  #entries;
+  #tree;
+  #commitForSha;
+
   /**
    * Writes content into the branch
    * {@link https://developer.github.com/v3/git/blobs/#get-a-blob}
@@ -18,16 +21,17 @@ export class GithubBranch extends Branch {
    * @return {Promise<ContentEntry>} written content with sha values set
    */
   async writeEntry(entry) {
-    const { json } = await this.provider.fetchJSON(
-      `${this.api}/git/blobs`,
-      {
-        method: "POST",
-        body: JSON.stringify({
-          content: await entry.string,
-          encoding: "utf8"
-        })
-      }
-    );
+    const { json } = await this.provider.fetchJSON(`${this.api}/git/blobs`, {
+      method: "POST",
+      body: JSON.stringify({
+        content: await entry.string,
+        encoding: "utf8"
+      })
+    });
+
+    if (this.#entries) {
+      this.#entries.set(entry.name, entry);
+    }
 
     entry.sha = json.sha;
 
@@ -42,7 +46,7 @@ export class GithubBranch extends Branch {
    * @param {ContentEntry[]} entries
    * @param {Object} options
    */
-  async commit(message, entries, options = {}) {
+  async commit(message, entries, options) {
     const updates = await Promise.all(
       entries.map(entry => this.writeEntry(entry))
     );
@@ -58,23 +62,22 @@ export class GithubBranch extends Branch {
     const shaLatestCommit = await this.refId();
     const commit = await this.commitForSha(shaLatestCommit);
 
-    let { json } = await this.provider.fetchJSON(
-      `${this.api}/git/trees`,
-      {
-        method: "POST",
-        body: JSON.stringify({
-          base_tree: commit.tree.sha,
-          tree: updates.map(u => {
-            return {
-              path: u.name,
-              sha: u.sha,
-              type: "blob",
-              mode: "100" + u.mode.toString(8)
-            };
-          })
+    let { json } = await this.provider.fetchJSON(`${this.api}/git/trees`, {
+      method: "POST",
+      body: JSON.stringify({
+        base_tree: commit.tree.sha,
+        tree: updates.map(u => {
+          return {
+            path: u.name,
+            sha: u.sha,
+            type: "blob",
+            mode: "100" + u.mode.toString(8)
+          };
         })
-      }
-    );
+      })
+    });
+
+    //console.log("TREE", json.sha, shaLatestCommit);
 
     let r = await this.provider.fetchJSON(`${this.api}/git/commits`, {
       method: "POST",
@@ -85,21 +88,9 @@ export class GithubBranch extends Branch {
       })
     });
 
-    r = await this.provider.fetchJSON(`${this.api}/git/${this.ref}`, {
-      method: "PATCH",
-      body: JSON.stringify({
-        ...options,
-        sha: r.json.sha
-      })
-    });
-
-    return r.json;
+    return this.owner.setRefId(this.ref, r.json.sha, options);
   }
 
-  #entries;
-  #tree;
-  #commitForSha;
-
   /**
    * {@link https://developer.github.com/v3/repos/contents/#get-repository-content}
    * @param {string} name
@@ -115,7 +106,9 @@ export class GithubBranch extends Branch {
     }
 
     const f = async () => {
-      const { json } = await this.provider.fetchJSON(`${this.api}/contents/${name}?ref=${this.ref}`);
+      const { json } = await this.provider.fetchJSON(
+        `${this.api}/contents/${name}?ref=${this.ref}`
+      );
 
       const entry = new this.entryClass(
         name,
@@ -148,7 +141,9 @@ export class GithubBranch extends Branch {
       this.#commitForSha = new Map();
     }
 
-    const { json } = await this.provider.fetchJSON(`${this.api}/git/commits/${sha}`);
+    const { json } = await this.provider.fetchJSON(
+      `${this.api}/git/commits/${sha}`
+    );
 
     this.#commitForSha.set(sha, json);
 
@@ -170,7 +165,9 @@ export class GithubBranch extends Branch {
       this.#tree = new Map();
     }
 
-    const { json } = await this.provider.fetchJSON(`${this.api}/git/trees/${sha}?recursive=1`);
+    const { json } = await this.provider.fetchJSON(
+      `${this.api}/git/trees/${sha}?recursive=1`
+    );
 
     const tree = json.tree;
 
@@ -234,7 +231,7 @@ class LazyBufferContentEntry extends BufferContentEntryMixin(ContentEntry) {
   }
 
   #buffer;
-  
+
   async getBuffer() {
     if (this.#buffer) {
       return this.#buffer;

package/src/github-pull-request.mjs

@@ -19,7 +19,7 @@ export class GithubPullRequest extends PullRequest {
       url: "api"
     };
   }
-  
+
   static get attributes() {
     return {
       ...super.attributes,
@@ -79,6 +79,7 @@ export class GithubPullRequest extends PullRequest {
       return p;
     }
 
+    
     const { response, json } = await destination.provider.fetchJSON(
       `${destination.repository.api}/pulls`,
       {
@@ -90,10 +91,11 @@ export class GithubPullRequest extends PullRequest {
         })
       }
     );
-	if(!response.ok) {
-		throw new Error(response.statusText);	
-	}
-	
+
+    if (!response.ok) {
+      throw new Error(response.statusText);
+    }
+
     return new this(source, destination, json.number, json);
   }
 

package/src/github-repository.mjs

@@ -176,6 +176,27 @@ export class GithubRepository extends Repository {
     return sha;
   }
 
+  // TODO belongs into Ref ?
+  async setRefId(ref, sha, options) {
+    //console.log("NEW HEAD", sha, ref);
+
+    const r = await this.provider.fetchJSON(`${this.api}/git/${ref}`, {
+      method: "PATCH",
+      body: JSON.stringify({
+        ...options,
+        sha
+      })
+    });
+
+    if (r.response.ok && this.#ref) {
+      this.#ref.set(ref, sha);
+    }
+
+    //console.log(r.response.ok, r.response.status, r.json);
+
+    return r.json;
+  }
+
   async createBranch(name, from, options) {
     await this.initializeBranches();