github-repository-provider 7.30.16 → 7.30.19

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)
@@ -113,14 +113,6 @@ Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/
 *   `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)** 
 
-### 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)** 
-
 ### commitForSha
 
 <https://developer.github.com/v3/git/commits/#get-a-commit>
@@ -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.16",
+  "version": "7.30.19",
   "publishConfig": {
     "access": "public"
   },

package/src/github-branch.mjs

@@ -10,9 +10,8 @@ import {
  * Branch on GitHub.
  */
 export class GithubBranch extends Branch {
-  #entries;
-  #tree;
-  #commitForSha;
+  #entries = new Map();
+  #commits = new Map();
 
   /**
    * Writes content into the branch
@@ -29,9 +28,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;
 
@@ -61,48 +58,50 @@ 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)
-          };
-        })
-      })
-    });
-
-    //console.log("TREE", json.sha, shaLatestCommit);
+    const tree = await this.owner.addTree(updates, commit.tree.sha);
 
     let r = await this.provider.fetchJSON(`${this.api}/git/commits`, {
       method: "POST",
       body: JSON.stringify({
         message,
-        tree: json.sha,
+        tree: tree.sha,
         parents: [shaLatestCommit]
       })
     });
 
+    this.#commits.set(r.json.sha, r.json);
+
     return this.owner.setRefId(this.ref, r.json.sha, options);
   }
 
+  /**
+   * {@link https://developer.github.com/v3/git/commits/#get-a-commit}
+   * @param {string} sha
+   * @return {Object} response
+   */
+  async commitForSha(sha) {
+    const commit = this.#commits.get(sha);
+    if (commit) {
+      return commit;
+    }
+
+    const { json } = await this.provider.fetchJSON(
+      `${this.api}/git/commits/${sha}`
+    );
+
+    this.#commits.set(sha, json);
+
+    return json;
+  }
+
   /**
    * {@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 entry = this.#entries.get(name);
+    if (entry) {
+      return entry;
     }
 
     const f = async () => {
@@ -126,66 +125,16 @@ export class GithubBranch extends Branch {
     return p;
   }
 
-  /**
-   * {@link https://developer.github.com/v3/git/commits/#get-a-commit}
-   * @param {string} sha
-   * @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 { json } = await this.provider.fetchJSON(
-      `${this.api}/git/commits/${sha}`
-    );
-
-    this.#commitForSha.set(sha, json);
-
-    return json;
-  }
-
-  /**
-   * @see https://developer.github.com/v3/git/trees/
-   * @param {string} sha
-   * @return {Object[]}
-   */
-  async tree(sha) {
-    if (this.#tree) {
-      const tree = this.#tree.get(sha);
-      if (tree) {
-        return tree;
-      }
-    } else {
-      this.#tree = new Map();
-    }
-
-    const { json } = await this.provider.fetchJSON(
-      `${this.api}/git/trees/${sha}?recursive=1`
-    );
-
-    const tree = json.tree;
-
-    this.#tree.set(sha, tree);
-
-    return tree;
-  }
-
   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"
-    })) {
+    for (const entry of matcher(
+      await this.owner.tree(commit.tree.sha),
+      patterns,
+      {
+        name: "path"
+      }
+    )) {
       switch (entry.type) {
         case "tree":
           yield new BaseCollectionEntry(entry.path);

package/src/github-repository.mjs

@@ -12,6 +12,9 @@ const conflictErrorActions = {
  * Repository on GitHub.
  */
 export class GithubRepository extends Repository {
+  #refs = new Map();
+  #trees = new Map();
+
   static get attributeMapping() {
     return {
       ...super.attributeMapping,
@@ -70,6 +73,55 @@ export class GithubRepository extends Repository {
     } while (next);
   }
 
+  /**
+   * @see https://developer.github.com/v3/git/trees/
+   * @param {string} sha
+   * @return {Object[]}
+   */
+  async tree(sha) {
+    let tree = this.#trees.get(sha);
+    if (tree) {
+      return tree;
+    }
+
+    const { json } = await this.provider.fetchJSON(
+      `${this.api}/git/trees/${sha}?recursive=1`
+    );
+
+    tree = json.tree;
+
+    this.#trees.set(sha, tree);
+
+    return tree;
+  }
+
+  /**
+   * @see https://developer.github.com/v3/git/trees/
+   * @param {Object[]} updates 
+   * @param {string} base base tree sha
+   * @returns {Object} newly created tree
+   */
+  async addTree(updates, base) {
+    let { json } = await this.provider.fetchJSON(`${this.api}/git/trees`, {
+      method: "POST",
+      body: JSON.stringify({
+        base_tree: base,
+        tree: updates.map(u => {
+          return {
+            path: u.name,
+            sha: u.sha,
+            type: "blob",
+            mode: "100" + u.mode.toString(8)
+          };
+        })
+      })
+    });
+
+    this.#trees.set(json.sha, json);
+
+    return json;
+  }
+
   async #initializeSlot(typeName, addMethodName) {
     let next = `${this.api}/${typeName}`;
 
@@ -140,8 +192,6 @@ export class GithubRepository extends Repository {
     });
   }
 
-  #ref;
-
   /**
    * Get sha of a ref.
    * {@link https://developer.github.com/v3/git/refs/}
@@ -151,13 +201,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.#refs.get(ref);
+    if (sha) {
+      return sha;
     }
 
     const { response, json } = await this.provider.fetchJSON(
@@ -169,9 +215,9 @@ 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);
+    this.#refs.set(ref, sha);
 
     return sha;
   }
@@ -188,13 +234,12 @@ export class GithubRepository extends Repository {
       })
     });
 
-    if (r.response.ok && this.#ref) {
-      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;
+    if (r.response.ok) {
+      this.#refs.set(ref, sha);
+      return r.json;
+    }
   }
 
   async createBranch(name, from, options) {