github-repository-provider 7.30.18 → 7.30.21

package/README.md

@@ -40,17 +40,15 @@ console.log(entry.name);
         *   [Parameters](#parameters-1)
     *   [commitForSha](#commitforsha)
         *   [Parameters](#parameters-2)
-    *   [tree](#tree)
-        *   [Parameters](#parameters-3)
     *   [entry](#entry)
-        *   [Parameters](#parameters-4)
+        *   [Parameters](#parameters-3)
     *   [removeEntries](#removeentries)
-        *   [Parameters](#parameters-5)
+        *   [Parameters](#parameters-4)
 *   [GithubOwner](#githubowner)
     *   [createRepository](#createrepository)
-        *   [Parameters](#parameters-6)
+        *   [Parameters](#parameters-5)
     *   [deleteRepository](#deleterepository)
-        *   [Parameters](#parameters-7)
+        *   [Parameters](#parameters-6)
     *   [attributeMapping](#attributemapping)
 *   [GithubProvider](#githubprovider)
     *   [Examples](#examples)
@@ -60,17 +58,21 @@ console.log(entry.name);
     *   [instanceIdentifier](#instanceidentifier)
 *   [GithubPullRequest](#githubpullrequest)
     *   [\_merge](#\_merge)
-        *   [Parameters](#parameters-8)
+        *   [Parameters](#parameters-7)
     *   [update](#update)
     *   [validMergeMethods](#validmergemethods)
     *   [list](#list)
-        *   [Parameters](#parameters-9)
+        *   [Parameters](#parameters-8)
     *   [open](#open)
-        *   [Parameters](#parameters-10)
+        *   [Parameters](#parameters-9)
 *   [GithubRepository](#githubrepository)
     *   [defaultBranchName](#defaultbranchname)
     *   [commits](#commits)
+        *   [Parameters](#parameters-10)
+    *   [tree](#tree)
         *   [Parameters](#parameters-11)
+    *   [addTree](#addtree)
+        *   [Parameters](#parameters-12)
     *   [initializeBranches](#initializebranches)
     *   [initializeTags](#initializetags)
     *   [url](#url)
@@ -79,9 +81,9 @@ console.log(entry.name);
     *   [api](#api)
     *   [update](#update-1)
     *   [refId](#refid)
-        *   [Parameters](#parameters-12)
-    *   [deletePullRequest](#deletepullrequest)
         *   [Parameters](#parameters-13)
+    *   [deletePullRequest](#deletepullrequest)
+        *   [Parameters](#parameters-14)
     *   [initializeHooks](#initializehooks)
 
 ## GithubBranch
@@ -123,16 +125,6 @@ Returns **[Promise](https://developer.mozilla.org/docs/Web/JavaScript/Reference/
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** response
 
-### tree
-
-*   **See**: <https://developer.github.com/v3/git/trees/>
-
-#### Parameters
-
-*   `sha` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
-
-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>
@@ -296,6 +288,27 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **AsyncIterator\<Commit>** 
 
+### tree
+
+*   **See**: <https://developer.github.com/v3/git/trees/>
+
+#### Parameters
+
+*   `sha` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+
+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)>** 
+
+### addTree
+
+*   **See**: <https://developer.github.com/v3/git/trees/>
+
+#### Parameters
+
+*   `updates` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>** 
+*   `base` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** base tree sha
+
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** newly created tree
+
 ### initializeBranches
 
 <https://developer.github.com/v3/repos/branches/#list-branches>

package/package.json

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

package/src/github-branch.mjs

@@ -11,8 +11,6 @@ import {
  */
 export class GithubBranch extends Branch {
   #entries = new Map();
-  #trees = new Map();
-  #commits = new Map();
 
   /**
    * Writes content into the branch
@@ -45,10 +43,6 @@ export class GithubBranch extends Branch {
    * @param {Object} options
    */
   async commit(message, entries, options) {
-    const updates = await Promise.all(
-      entries.map(entry => this.writeEntry(entry))
-    );
-
     /*
      * 1st. commit on empty tree
      * https://stackoverflow.com/questions/9765453/is-gits-semi-secret-empty-tree-object-reliable-and-why-is-there-not-a-symbolic/9766506#9766506
@@ -57,81 +51,20 @@ export class GithubBranch extends Branch {
      * sha256:6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321
      */
 
-    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);
-
-    let r = await this.provider.fetchJSON(`${this.api}/git/commits`, {
-      method: "POST",
-      body: JSON.stringify({
-        message,
-        tree: treeSHA,
-        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}`
+    const updates = await Promise.all(
+      entries.map(entry => this.writeEntry(entry))
     );
 
-    this.#commits.set(sha, json);
-
-    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`
+    const shaLatestCommit = await this.refId();
+    const latestCommit = await this.owner.commitForSha(shaLatestCommit);
+    const tree = await this.owner.addTree(updates, latestCommit.tree.sha);
+    const commit = await this.owner.addCommit(
+      tree.sha,
+      [shaLatestCommit],
+      message
     );
 
-    tree = json.tree;
-
-    this.#trees.set(sha, tree);
-
-    return tree;
+    return this.owner.setRefId(this.ref, commit.sha, options);
   }
 
   /**
@@ -166,11 +99,15 @@ export class GithubBranch extends Branch {
   }
 
   async *entries(patterns) {
-    const commit = await this.commitForSha(await this.refId());
+    const commit = await this.owner.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,9 @@ const conflictErrorActions = {
  * Repository on GitHub.
  */
 export class GithubRepository extends Repository {
-  #ref = new Map();
+  #refs = new Map();
+  #trees = new Map();
+  #commits = new Map();
 
   static get attributeMapping() {
     return {
@@ -61,6 +63,8 @@ export class GithubRepository extends Repository {
       const { response, json } = await this.provider.fetchJSON(next);
 
       for (const c of json) {
+        this.#commits.set(c.sha, json);
+
         yield {
           sha: c.sha,
           message: c.message,
@@ -72,6 +76,89 @@ export class GithubRepository extends Repository {
     } while (next);
   }
 
+  async addCommit(tree, parents, message) {
+    let r = await this.provider.fetchJSON(`${this.api}/git/commits`, {
+      method: "POST",
+      body: JSON.stringify({
+        tree,
+        parents,
+        message
+      })
+    });
+
+    this.#commits.set(r.json.sha, r.json);
+    return r.json;
+  }
+
+  /**
+   * {@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;
+  }
+
+  /**
+   * @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 +238,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,16 +254,24 @@ export class GithubRepository extends Repository {
 
     sha = json.object.sha;
 
-    this.#ref.set(ref, sha);
+    this.#refs.set(ref, sha);
 
     return sha;
   }
 
-  // TODO belongs into Ref ?
+  /**
+   * {@link https://docs.github.com/en/github-ae@latest/rest/git/refs#update-a-reference}
+   * @param {string} ref
+   * @param {string} sha
+   * @param {Object} options
+   * @returns
+   *
+   * @TODO: belongs into Ref ?
+   */
   async setRefId(ref, sha, options) {
-    //console.log("NEW HEAD", sha, ref);
+    ref = ref.replace(/^refs\//, "");
 
-    const r = await this.provider.fetchJSON(`${this.api}/git/${ref}`, {
+    const r = await this.provider.fetchJSON(`${this.api}/git/refs/${ref}`, {
       method: "PATCH",
       body: JSON.stringify({
         ...options,
@@ -184,13 +279,10 @@ export class GithubRepository extends Repository {
       })
     });
 
-    if (r.response.ok && this.#ref) {
-      this.#ref.set(ref, sha);
+    if (r.response.ok) {
+      this.#refs.set(ref, sha);
+      return r.json;
     }
-
-    //console.log(ref, sha, r.response.ok, r.response.status, r.json);
-
-    return r.json;
   }
 
   async createBranch(name, from, options) {
@@ -221,7 +313,6 @@ export class GithubRepository extends Repository {
           tree: sha
         })
       });
-      console.log(res);
       */
     }