github-repository-provider 7.30.16 → 7.30.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-repository-provider",
-  "version": "7.30.16",
+  "version": "7.30.17",
   "publishConfig": {
     "access": "public"
   },

package/src/github-branch.mjs

@@ -10,9 +10,9 @@ import {
  * Branch on GitHub.
  */
 export class GithubBranch extends Branch {
-  #entries;
-  #tree;
-  #commitForSha;
+  #entries = new Map();
+  #trees = new Map();
+  #commits = new Map();
 
   /**
    * Writes content into the branch
@@ -29,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;
 
@@ -77,53 +75,21 @@ export class GithubBranch extends Branch {
       })
     });
 
-    //console.log("TREE", json.sha, shaLatestCommit);
+    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]
       })
     });
 
-    return this.owner.setRefId(this.ref, r.json.sha, options);
-  }
-
-  /**
-   * {@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);
+    this.#commits.set(r.json.sha, r.json);
 
-    return p;
+    return this.owner.setRefId(this.ref, r.json.sha, options);
   }
 
   /**
@@ -132,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;
   }
@@ -156,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"
     })) {