github-repository-provider 7.30.14 → 7.30.17

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.14",
+  "version": "7.30.17",
   "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.3",
+    "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,6 +10,10 @@ import {
  * Branch on GitHub.
  */
 export class GithubBranch extends Branch {
+  #entries = new Map();
+  #trees = new Map();
+  #commits = new Map();
+
   /**
    * Writes content into the branch
    * {@link https://developer.github.com/v3/git/blobs/#get-a-blob}
@@ -25,9 +29,7 @@ export class GithubBranch extends Branch {
       })
     });
 
-    if (this.#entries) {
-      this.#entries.set(entry.name, entry);
-    }
+    this.#entries.set(entry.name, entry);
 
     entry.sha = json.sha;
 
@@ -42,7 +44,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))
     );
@@ -73,63 +75,21 @@ export class GithubBranch extends Branch {
       })
     });
 
+    const treeSHA = json.sha;
+    this.#trees.set(treeSHA, json);
+
     let r = await this.provider.fetchJSON(`${this.api}/git/commits`, {
       method: "POST",
       body: JSON.stringify({
         message,
-        tree: json.sha,
+        tree: treeSHA,
         parents: [shaLatestCommit]
       })
     });
 
-    r = await this.provider.fetchJSON(`${this.api}/git/${this.ref}`, {
-      method: "PATCH",
-      body: JSON.stringify({
-        ...options,
-        sha: r.json.sha
-      })
-    });
+    this.#commits.set(r.json.sha, r.json);
 
-    return r.json;
-  }
-
-  #entries;
-  #tree;
-  #commitForSha;
-
-  /**
-   * {@link https://developer.github.com/v3/repos/contents/#get-repository-content}
-   * @param {string} name
-   */
-  async entry(name) {
-    if (this.#entries) {
-      const entry = this.#entries.get(name);
-      if (entry) {
-        return entry;
-      }
-    } else {
-      this.#entries = new Map();
-    }
-
-    const f = async () => {
-      const { json } = await this.provider.fetchJSON(
-        `${this.api}/contents/${name}?ref=${this.ref}`
-      );
-
-      const entry = new this.entryClass(
-        name,
-        Buffer.from(json.content, "base64")
-      );
-
-      this.#entries.set(name, entry);
-      return entry;
-    };
-
-    const p = f();
-
-    this.#entries.set(name, p);
-
-    return p;
+    return this.owner.setRefId(this.ref, r.json.sha, options);
   }
 
   /**
@@ -138,20 +98,16 @@ export class GithubBranch extends Branch {
    * @return {Object} response
    */
   async commitForSha(sha) {
-    if (this.#commitForSha) {
-      const json = this.#commitForSha.get(sha);
-      if (json) {
-        return json;
-      }
-    } else {
-      this.#commitForSha = new Map();
+    const commit = this.#commits.get(sha);
+    if (commit) {
+      return commit;
     }
 
     const { json } = await this.provider.fetchJSON(
       `${this.api}/git/commits/${sha}`
     );
 
-    this.#commitForSha.set(sha, json);
+    this.#commits.set(sha, json);
 
     return json;
   }
@@ -162,33 +118,56 @@ export class GithubBranch extends Branch {
    * @return {Object[]}
    */
   async tree(sha) {
-    if (this.#tree) {
-      const tree = this.#tree.get(sha);
-      if (tree) {
-        return tree;
-      }
-    } else {
-      this.#tree = new Map();
+    let tree = this.#trees.get(sha);
+    if (tree) {
+      return tree;
     }
 
     const { json } = await this.provider.fetchJSON(
       `${this.api}/git/trees/${sha}?recursive=1`
     );
 
-    const tree = json.tree;
+    tree = json.tree;
 
-    this.#tree.set(sha, tree);
+    this.#trees.set(sha, tree);
 
     return tree;
   }
 
+  /**
+   * {@link https://developer.github.com/v3/repos/contents/#get-repository-content}
+   * @param {string} name
+   */
+  async entry(name) {
+    const entry = this.#entries.get(name);
+    if (entry) {
+      return entry;
+    }
+
+    const f = async () => {
+      const { json } = await this.provider.fetchJSON(
+        `${this.api}/contents/${name}?ref=${this.ref}`
+      );
+
+      const entry = new this.entryClass(
+        name,
+        Buffer.from(json.content, "base64")
+      );
+
+      this.#entries.set(name, entry);
+      return entry;
+    };
+
+    const p = f();
+
+    this.#entries.set(name, p);
+
+    return p;
+  }
+
   async *entries(patterns) {
     const commit = await this.commitForSha(await this.refId());
 
-    if (!this.#entries) {
-      this.#entries = new Map();
-    }
-
     for (const entry of matcher(await this.tree(commit.tree.sha), patterns, {
       name: "path"
     })) {

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();