github-repository-provider 7.24.2 → 7.24.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-repository-provider",
-  "version": "7.24.2",
+  "version": "7.24.6",
   "publishConfig": {
     "access": "public"
   },
@@ -36,13 +36,13 @@
     "matching-iterator": "^2.0.0",
     "node-fetch": "3.1.0",
     "one-time-execution-method": "^2.0.9",
-    "repository-provider": "^26.0.2"
+    "repository-provider": "^26.0.3"
   },
   "devDependencies": {
     "ava": "^3.15.0",
     "c8": "^7.10.0",
     "documentation": "^13.2.5",
-    "repository-provider-test-support": "^1.8.13",
+    "repository-provider-test-support": "^1.8.15",
     "semantic-release": "^18.0.1"
   },
   "engines": {

package/src/github-branch.mjs

@@ -15,17 +15,16 @@ export class GithubBranch extends Branch {
    * Writes content into the branch
    * {@link https://developer.github.com/v3/git/blobs/#get-a-blob}
    * @param {ConentEntry} entry
-   * @return {Promise<Entry>} written content with sha values set
+   * @return {Promise<ConentEntry>} written content with sha values set
    */
   async writeEntry(entry) {
-    const res = await this.provider.fetch(`repos/${this.slug}/git/blobs`, {
+    const json = await this.provider.fetchJSON(`repos/${this.slug}/git/blobs`, {
       method: "POST",
       body: JSON.stringify({
         content: await entry.string,
         encoding: "utf8"
       })
     });
-    const json = await res.json();
 
     entry.sha = json.sha;
 
@@ -37,15 +36,10 @@ export class GithubBranch extends Branch {
    * @param {string} sha
    */
   async baseTreeSha(sha) {
-    const res = await this.provider.fetch(
+    const json = await this.provider.fetchJSON(
       `repos/${this.slug}/git/commits/${sha}`
     );
-    if (res.ok) {
-      const json = await res.json();
-      return json.tree.sha;
-    }
-
-    throw new Error(`Unable to decode ${res.url}`);
+    return json.tree.sha;
   }
 
   /**
@@ -72,7 +66,7 @@ export class GithubBranch extends Branch {
     const shaLatestCommit = await this.refId();
     const shaBaseTree = await this.baseTreeSha(shaLatestCommit);
 
-    let result = await this.provider.fetch(`repos/${this.slug}/git/trees`, {
+    let json = await this.provider.fetchJSON(`repos/${this.slug}/git/trees`, {
       method: "POST",
       body: JSON.stringify({
         base_tree: shaBaseTree,
@@ -87,11 +81,9 @@ export class GithubBranch extends Branch {
       })
     });
 
-    let json = await result.json();
-
     const shaNewTree = json.sha;
 
-    result = await this.provider.fetch(`repos/${this.slug}/git/commits`, {
+    json = await this.provider.fetchJSON(`repos/${this.slug}/git/commits`, {
       method: "POST",
       body: JSON.stringify({
         message,
@@ -99,11 +91,10 @@ export class GithubBranch extends Branch {
         parents: [shaLatestCommit]
       })
     });
-    json = await result.json();
 
     const sha = json.sha;
 
-    result = await this.provider.fetch(
+    return await this.provider.fetchJSON(
       `repos/${this.slug}/git/refs/heads/${this.name}`,
       {
         method: "PATCH",
@@ -113,8 +104,6 @@ export class GithubBranch extends Branch {
         })
       }
     );
-
-    return result.json();
   }
 
   /**
@@ -122,16 +111,11 @@ export class GithubBranch extends Branch {
    * @param {string} name
    */
   async entry(name) {
-    const res = await this.provider.fetch(
+    const json = await this.provider.fetchJSON(
       `repos/${this.slug}/contents/${name}?ref=${this.ref}`
     );
 
-    if (res.ok) {
-      const json = await res.json();
-      return new this.entryClass(name, Buffer.from(json.content, "base64"));
-    }
-
-    throw new Error(res.status);
+    return new this.entryClass(name, Buffer.from(json.content, "base64"));
   }
 
   /** @inheritdoc */
@@ -164,7 +148,7 @@ export class GithubBranch extends Branch {
       } catch (e) {
         // errno: 'ERR_STREAM_PREMATURE_CLOSE',
         // code: 'ERR_STREAM_PREMATURE_CLOSE',
-        
+
         this.error(e);
       }
     }
@@ -220,11 +204,10 @@ class LazyBufferContentEntry extends BufferContentEntryMixin(ContentEntry) {
     }
 
     const branch = this.branch;
-    const res = await branch.provider.fetch(
+    const json = await branch.provider.fetchJSON(
       `repos/${branch.slug}/contents/${this.name}?ref=${branch.ref}`
     );
 
-    const json = await res.json();
     this._buffer = Buffer.from(json.content, "base64");
     return this._buffer;
   }

package/src/github-provider.mjs

@@ -121,8 +121,7 @@ export class GithubProvider extends MultiGroupProvider {
       try {
         const response = await this.fetch(url, options);
         if (!response.ok) {
-          this.error(`Unable to fetch ${response.status} ${response.url}`);
-          throw new Error(`Unable to fetch ${response.status} ${response.url}`);
+          throw new Error(`Unable to fetch ${response.url} (${response.status})`);
         }
         return await response.json();
       } catch (e) {

package/src/github-pull-request.mjs

@@ -72,7 +72,7 @@ export class GithubPullRequest extends PullRequest {
       return p;
     }
 
-    const res = await destination.provider.fetch(
+    const json = await destination.provider.fetchJSON(
       `repos/${destination.repository.slug}/pulls`,
       {
         method: "POST",
@@ -84,13 +84,7 @@ export class GithubPullRequest extends PullRequest {
       }
     );
 
-    const json = await res.json();
-
-    if (res.ok) {
-      return new this(source, destination, json.number, json);
-    }
-
-    throw new Error(json.errors.map(e => e.message).join(";"));
+    return new this(source, destination, json.number, json);
   }
 
   /**

package/src/github-repository.mjs

@@ -112,13 +112,7 @@ export class GithubRepository extends Repository {
   async refId(ref) {
     ref = ref.replace(/^refs\//, "");
 
-    const res = await this.provider.fetch(`repos/${this.slug}/git/ref/${ref}`);
-
-    if (!res.ok) {
-      throw new Error(`Unable to fetch ${res.url}: ${res.code}`);
-    }
-
-    const json = await res.json();
+    const json = await this.provider.fetchJSON(`repos/${this.slug}/git/ref/${ref}`);
 
     // TODO why does this happen ?
     if (!json.object.sha) {
@@ -153,12 +147,11 @@ export class GithubRepository extends Repository {
       console.log(res);
       */
     } else {
-      const res = await this.provider.fetch(
+      const json = await this.provider.fetchJSON(
         `repos/${this.slug}/git/ref/heads/${
           from === undefined ? this.defaultBranchName : from.name
         }`
       );
-      let json = await res.json();
       sha = json.object.sha;
     }