bitbucket-repository-provider 4.1.0 → 4.1.3

package/README.md

@@ -121,9 +121,9 @@ Supported name schemes are
 Known environment variables
 
 *   BITBUCKET_API api
-*   BB_TOKEN api token
 *   BITBUCKET_TOKEN api token
 *   BITBUCKET_USERNAME username
+*   BITBUCKET_APP_PASSWORD password
 *   BITBUCKET_PASSWORD password
 
 ### Parameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitbucket-repository-provider",
-  "version": "4.1.0",
+  "version": "4.1.3",
   "publishConfig": {
     "access": "public"
   },
@@ -31,17 +31,17 @@
   },
   "dependencies": {
     "content-entry": "^5.0.0",
-    "fetch-rate-limit-util": "^2.8.0",
+    "fetch-rate-limit-util": "^2.9.3",
     "matching-iterator": "^2.0.4",
     "node-fetch": "^3.2.3",
     "one-time-execution-method": "^2.0.13",
-    "repository-provider": "^28.1.1"
+    "repository-provider": "^28.3.0"
   },
   "devDependencies": {
     "ava": "^4.2.0",
     "c8": "^7.11.2",
     "documentation": "^13.2.5",
-    "repository-provider-test-support": "^2.1.2",
+    "repository-provider-test-support": "^2.1.4",
     "semantic-release": "^19.0.2"
   },
   "engines": {

package/src/bitbucket-branch.mjs

@@ -25,12 +25,30 @@ export class BitbucketBranch extends Branch {
     };
   }
 
+  // TODO isInitialized ?
+  
+  async initialize()
+  {
+      if(this.hash === undefined) { 
+        const url = `repositories/${this.slug}/refs/branches?q=name="${this.name}"`;
+        const { json } = await this.provider.fetchJSON(url);
+//        console.log(json.values[0].target);
+
+        this.hash = json.values[0].target.hash;
+
+        //delete json.values[0].target.repository;
+        //Object.assign(this,json.values[0].target);
+      }
+  }
+
   /**
    * {@link https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Busername%7D/%7Brepo_slug%7D/src/%7Bnode%7D/%7Bpath%7D}
    * @param {string} name
    * @return {Promise<ContentEntry>}
    */
   async entry(name) {
+    await this.initialize();
+
     const res = await this.provider.fetch(
       `repositories/${this.slug}/src/${this.hash}/${name}`
     );
@@ -44,6 +62,8 @@ export class BitbucketBranch extends Branch {
    * @param patterns
    */
   async *entries(patterns) {
+    await this.initialize();
+
     const { json } = await this.provider.fetchJSON(
       `repositories/${this.slug}/src/${this.hash}/?max_depth=99`
     );

package/src/bitbucket-provider.mjs

@@ -153,17 +153,19 @@ export class BitbucketProvider extends MultiGroupProvider {
    * {@link https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories}
    */
   async initializeRepositories() {
-    let next = "repositories/?role=contributor";
-
-    do {
-      const { json } = await this.fetchJSON(next);
-
-      next = json.next;
-      json.values.map(b => {
-        const groupName = b.owner.nickname || b.owner.username;
-        this.addRepositoryGroup(groupName, b.owner).addRepository(b.name, b);
-      });
-    } while (next);
+    try {
+      let next = "repositories/?role=contributor";
+
+      do {
+        const { json } = await this.fetchJSON(next);
+
+        next = json.next;
+        json.values.map(b => {
+          const groupName = b.owner.nickname || b.owner.username;
+          this.addRepositoryGroup(groupName, b.owner).addRepository(b.name, b);
+        });
+      } while (next);
+    } catch {}
   }
 
   fetch(url, options = {}, responseHandler) {

package/src/bitbucket-pull-request.mjs

@@ -70,9 +70,7 @@ export class BitbucketPullRequest extends PullRequest {
       return p;
     }
 
-    const url = `repositories/${destination.slug}/pullrequests`;
-
-    const { json } = await destination.provider.fetchJSON(url, {
+    const { json } = await destination.provider.fetchJSON(`repositories/${destination.slug}/pullrequests`, {
       method: "POST",
       data: {
         source: {

package/src/bitbucket-repository.mjs

@@ -22,12 +22,8 @@ export class BitbucketRepository extends Repository {
     };
   }
 
-  constructor(owner, name, options) {
-    super(owner, name, options);
-
-    Object.defineProperties(this, {
-      user: { value: name.split(/\//)[0] }
-    });
+  get user() {
+    return this.name.split(/\//)[0];
   }
 
   /**
@@ -80,6 +76,9 @@ export class BitbucketRepository extends Repository {
     } while (url);
   }
 
+  /**
+   * {@link https://developer.atlassian.com/cloud/bitbucket/rest/api-group-refs/#api-group-refs}
+   */
   async initializeBranches() {
     let url = `repositories/${this.slug}/refs/branches`;
 
@@ -111,7 +110,9 @@ export class BitbucketRepository extends Repository {
     }
 
     from = await from;
-    
+
+    await from.initialize();
+
     const { json } = await this.provider.fetchJSON(
       `repositories/${this.slug}/refs/branches`,
       {
@@ -133,10 +134,12 @@ export class BitbucketRepository extends Repository {
    * {@link https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Busername%7D/%7Brepo_slug%7D/refs/branches/%7Bname%7D#delete}
    */
   async deleteBranch(name) {
-    const url = `repositories/${this.slug}/refs/branches/${name}`;
-    const response = await this.provider.fetch(url, { method: "DELETE" });
+    const response = await this.provider.fetch(
+      `repositories/${this.slug}/refs/branches/${name}`,
+      { method: "DELETE" }
+    );
 
-    if(!response.ok) {
+    if (!response.ok) {
       throw new Error(response.statusText);
     }