github-repository-provider 7.30.18 → 7.30.19

package/package.json

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

package/src/github-branch.mjs

@@ -11,7 +11,6 @@ import {
  */
 export class GithubBranch extends Branch {
   #entries = new Map();
-  #trees = new Map();
   #commits = new Map();
 
   /**
@@ -59,30 +58,13 @@ 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)
-          };
-        })
-      })
-    });
-
-    const treeSHA = json.sha;
-    this.#trees.set(treeSHA, json);
+    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: treeSHA,
+        tree: tree.sha,
         parents: [shaLatestCommit]
       })
     });
@@ -112,28 +94,6 @@ export class GithubBranch extends Branch {
     return json;
   }
 
-  /**
-   * @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;
-  }
-
   /**
    * {@link https://developer.github.com/v3/repos/contents/#get-repository-content}
    * @param {string} name
@@ -168,9 +128,13 @@ export class GithubBranch extends Branch {
   async *entries(patterns) {
     const commit = await this.commitForSha(await this.refId());
 
-    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,7 +12,8 @@ const conflictErrorActions = {
  * Repository on GitHub.
  */
 export class GithubRepository extends Repository {
-  #ref = new Map();
+  #refs = new Map();
+  #trees = new Map();
 
   static get attributeMapping() {
     return {
@@ -72,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}`;
 
@@ -151,7 +201,7 @@ export class GithubRepository extends Repository {
   async refId(ref) {
     ref = ref.replace(/^refs\//, "");
 
-    let sha = this.#ref.get(ref);
+    let sha = this.#refs.get(ref);
     if (sha) {
       return sha;
     }
@@ -167,7 +217,7 @@ export class GithubRepository extends Repository {
 
     sha = json.object.sha;
 
-    this.#ref.set(ref, sha);
+    this.#refs.set(ref, sha);
 
     return sha;
   }
@@ -184,13 +234,12 @@ export class GithubRepository extends Repository {
       })
     });
 
-    if (r.response.ok && this.#ref) {
-      this.#ref.set(ref, sha);
-    }
-
-    //console.log(ref, sha, 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) {