github-repository-provider 7.30.15 → 7.30.18

package/README.md

@@ -38,11 +38,11 @@ console.log(entry.name);
         *   [Parameters](#parameters)
     *   [commit](#commit)
         *   [Parameters](#parameters-1)
-    *   [entry](#entry)
-        *   [Parameters](#parameters-2)
     *   [commitForSha](#commitforsha)
-        *   [Parameters](#parameters-3)
+        *   [Parameters](#parameters-2)
     *   [tree](#tree)
+        *   [Parameters](#parameters-3)
+    *   [entry](#entry)
         *   [Parameters](#parameters-4)
     *   [removeEntries](#removeentries)
         *   [Parameters](#parameters-5)
@@ -111,15 +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 `{}`)
-
-### entry
-
-<https://developer.github.com/v3/repos/contents/#get-repository-content>
-
-#### Parameters
-
-*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
 ### commitForSha
 
@@ -141,6 +133,14 @@ Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>** 
 
+### entry
+
+<https://developer.github.com/v3/repos/contents/#get-repository-content>
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
 ### removeEntries
 
 <https://developer.github.com/v3/repos/contents/>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-repository-provider",
-  "version": "7.30.15",
+  "version": "7.30.18",
   "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,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"
     })) {

package/src/github-repository.mjs

@@ -12,6 +12,8 @@ const conflictErrorActions = {
  * Repository on GitHub.
  */
 export class GithubRepository extends Repository {
+  #ref = new Map();
+
   static get attributeMapping() {
     return {
       ...super.attributeMapping,
@@ -140,8 +142,6 @@ export class GithubRepository extends Repository {
     });
   }
 
-  #ref;
-
   /**
    * Get sha of a ref.
    * {@link https://developer.github.com/v3/git/refs/}
@@ -151,13 +151,9 @@ export class GithubRepository extends Repository {
   async refId(ref) {
     ref = ref.replace(/^refs\//, "");
 
-    if (this.#ref) {
-      const sha = this.#ref.get(ref);
-      if (sha) {
-        return sha;
-      }
-    } else {
-      this.#ref = new Map();
+    let sha = this.#ref.get(ref);
+    if (sha) {
+      return sha;
     }
 
     const { response, json } = await this.provider.fetchJSON(
@@ -169,7 +165,7 @@ export class GithubRepository extends Repository {
       throw new Error(`No refId for '${this.fullName}' '${ref}'`);
     }
 
-    const sha = json.object.sha;
+    sha = json.object.sha;
 
     this.#ref.set(ref, sha);
 
@@ -192,7 +188,7 @@ export class GithubRepository extends Repository {
       this.#ref.set(ref, sha);
     }
 
-    //console.log(r.response.ok, r.response.status, r.json);
+    //console.log(ref, sha, r.response.ok, r.response.status, r.json);
 
     return r.json;
   }