repository-provider 28.3.15 → 28.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repository-provider",
-  "version": "28.3.15",
+  "version": "28.4.2",
   "publishConfig": {
     "access": "public"
   },

package/src/multi-group-provider.mjs

@@ -63,9 +63,8 @@ export class MultiGroupProvider extends BaseProvider {
     const { base } = this.parseName(name);
 
     if (this.supportsBase(base)) {
-      name = stripBaseNames(name, this.provider.repositoryBases);
       await this.initializeRepositories();
-      return this.#repositoryGroups.get(this.normalizeGroupName(name, true));
+      return this.#repositoryGroups.get(this.normalizeGroupName(stripBaseNames(name, this.provider.repositoryBases), true));
     }
   }
 
@@ -105,13 +104,10 @@ export class MultiGroupProvider extends BaseProvider {
    * @return {RepositoryGroup}
    */
   addRepositoryGroup(name, options) {
-    const normalizedName = this.normalizeGroupName(name, true);
+    return this.#repositoryGroups.get(this.normalizeGroupName(name, true)) || new this.repositoryGroupClass(this, name, options);
+  }
 
-    let repositoryGroup = this.#repositoryGroups.get(normalizedName);
-    if (repositoryGroup === undefined) {
-      repositoryGroup = new this.repositoryGroupClass(this, name, options);
-      this.#repositoryGroups.set(normalizedName, repositoryGroup);
-    }
-    return repositoryGroup;
+  _addRepositoryGroup(repositoryGroup) {
+    this.#repositoryGroups.set(this.normalizeGroupName(repositoryGroup.name, true), repositoryGroup);
   }
 }

package/src/repository-group.mjs

@@ -1,5 +1,5 @@
 import { RepositoryOwner } from "./repository-owner.mjs";
-import { NamedObject } from "./named-object.mjs";
+import { OwnedObject } from "./owned-object.mjs";
 import { BaseProvider } from "./base-provider.mjs";
 
 /**
@@ -16,7 +16,12 @@ import { BaseProvider } from "./base-provider.mjs";
  * @property {string} name
  */
 
-export class RepositoryGroup extends RepositoryOwner(NamedObject) {
+export class RepositoryGroup extends RepositoryOwner(OwnedObject) {
+
+  static get registerInstanceMethodName() {
+    return "_addRepositoryGroup";
+  }
+
   static get attributes() {
     return {
       ...super.attributes,
@@ -43,15 +48,9 @@ export class RepositoryGroup extends RepositoryOwner(NamedObject) {
     return {};
   }
 
-  constructor(provider, name, options) {
-    super(name, options, {
-      provider: { value: provider }
-    });
-  }
-
-  get owner()
+  get provider()
   {
-    return this.provider;
+    return this.owner;
   }
 
   get isAdmin() {
@@ -59,10 +58,10 @@ export class RepositoryGroup extends RepositoryOwner(NamedObject) {
   }
 
   get areRepositoryNamesCaseSensitive() {
-    return this.provider.areRepositoryNamesCaseSensitive;
+    return this.owner.areRepositoryNamesCaseSensitive;
   }
 
   get areRepositoryGroupNamesCaseSensitive() {
-    return this.provider.areRepositoryGroupNamesCaseSensitive;
+    return this.owner.areRepositoryGroupNamesCaseSensitive;
   }
 }

package/src/repository-owner.mjs

@@ -146,12 +146,7 @@ export function RepositoryOwner(base) {
      * @return {Promise<Repository>} newly created repository
      */
     addRepository(name, options) {
-      const normalizedName = this.normalizeRepositoryName(name, true);
-      let repository = this.#repositories.get(normalizedName);
-      if (repository === undefined) {
-        repository = new this.repositoryClass(this, name, options);
-      }
-      return repository;
+      return this.#repositories.get(this.normalizeRepositoryName(name, true)) || new this.repositoryClass(this, name, options);
     }
 
     _addRepository(repository)

package/src/repository.mjs

@@ -66,15 +66,15 @@ export class Repository extends OwnedObject {
     };
   }
 
+  #branches = new Map();
+  #tags = new Map();
+  #projects = new Map();
+  #milestones = new Map();
+  #pullRequests = new Map();
+  #hooks = [];
+
   constructor(owner, name, options) {
-    super(owner, owner.normalizeRepositoryName(name, false), options, {
-      _branches: { value: new Map() },
-      _tags: { value: new Map() },
-      _pullRequests: { value: new Map() },
-      _milestones: { value: new Map() },
-      _projects: { value: new Map() },
-      _hooks: { value: [] }
-    });
+    super(owner, owner.normalizeRepositoryName(name, false), options);
   }
 
   /**
@@ -242,16 +242,11 @@ export class Repository extends OwnedObject {
    */
   async branch(name) {
     if(name === this.defaultBranchName) {
-      const branch = this._branches.get(name);
-      if(branch) {
-        return branch;
-      }
-      
-      return this.addBranch(name);
+      return this.#branches.get(name) || this.addBranch(name);
     }
 
     await this.initializeBranches();
-    return this._branches.get(name);
+    return this.#branches.get(name);
   }
 
   /**
@@ -259,7 +254,7 @@ export class Repository extends OwnedObject {
    */
   async *branches(patterns) {
     await this.initializeBranches();
-    yield* matcher(this._branches.values(), patterns, {
+    yield* matcher(this.#branches.values(), patterns, {
       name: "name"
     });
   }
@@ -284,16 +279,11 @@ export class Repository extends OwnedObject {
    * @return {Branch} newly created branch
    */
   addBranch(name, options) {
-    let branch = this._branches.get(name);
-    if (branch === undefined) {
-      branch = new this.branchClass(this, name, options);
-    }
-
-    return branch;
+    return this.#branches.get(name) || new this.branchClass(this, name, options);
   }
 
   _addBranch(branch) {
-    this._branches.set(branch.name, branch);
+    this.#branches.set(branch.name, branch);
   }
 
   /**
@@ -302,7 +292,7 @@ export class Repository extends OwnedObject {
    * @return {Promise<any>}
    */
   async deleteBranch(name) {
-    this._branches.delete(name);
+    this.#branches.delete(name);
   }
 
   /**
@@ -312,7 +302,7 @@ export class Repository extends OwnedObject {
    */
   async tag(name) {
     await this.initializeTags();
-    return this._tags.get(name);
+    return this.#tags.get(name);
   }
 
   /**
@@ -322,7 +312,7 @@ export class Repository extends OwnedObject {
   async *tags(patterns) {
     await this.initializeTags();
 
-    yield* matcher(this._tags.values(), patterns, {
+    yield* matcher(this.#tags.values(), patterns, {
       name: "name"
     });
   }
@@ -335,16 +325,11 @@ export class Repository extends OwnedObject {
    * @return {Tag} newly created tag
    */
   addTag(name, options) {
-    let tag = this._tags.get(name);
-    if (tag === undefined) {
-      tag = new this.tagClass(this, name, options);
-    }
-
-    return tag;
+    return this.#tags.get(name) || new this.tagClass(this, name, options);
   }
 
   _addTag(tag) {
-    this._tags.set(tag.name, tag);
+    this.#tags.set(tag.name, tag);
   }
 
   /**
@@ -370,13 +355,13 @@ export class Repository extends OwnedObject {
     let pr = this._pullRequests.get(name);
     if (pr === undefined) {
       pr = new this.pullRequestClass(name, source, this, options);
-      this._pullRequests.set(pr.name, pr);
+      this.#pullRequests.set(pr.name, pr);
     }
     return pr;
   }
 
   _addPullRequest(pr) {
-    this._pullRequests.set(pr.name, pr);
+    this.#pullRequests.set(pr.name, pr);
   }
 
   /**
@@ -386,7 +371,7 @@ export class Repository extends OwnedObject {
   async *pullRequests() {
     await this.initializePullRequests();
 
-    for (const pr of this._pullRequests.values()) {
+    for (const pr of this.#pullRequests.values()) {
       yield pr;
     }
   }
@@ -398,7 +383,7 @@ export class Repository extends OwnedObject {
    */
   async pullRequest(name) {
     await this.initializePullRequests();
-    return this._pullRequests.get(name);
+    return this.#pullRequests.get(name);
   }
 
   /**
@@ -407,7 +392,7 @@ export class Repository extends OwnedObject {
    * @return {Promise<any>}
    */
   async deletePullRequest(name) {
-    this._pullRequests.delete(name);
+    this.#pullRequests.delete(name);
   }
 
   /**
@@ -415,11 +400,11 @@ export class Repository extends OwnedObject {
    * @param {Hook} hook
    */
   addHook(hook) {
-    this._hooks.push(hook);
+    this.#hooks.push(hook);
   }
 
   _addHook(hook) {
-    this._hooks.push(hook);
+    this.#hooks.push(hook);
   }
 
   /**
@@ -436,7 +421,7 @@ export class Repository extends OwnedObject {
    */
   async *hooks() {
     await this.initializeHooks();
-    for (const hook of this._hooks) {
+    for (const hook of this.#hooks) {
       yield hook;
     }
   }
@@ -456,19 +441,19 @@ export class Repository extends OwnedObject {
   }
 
   _addMilestone(milestone) {
-    this._milestones.set(milestone.name, milestone);
+    this.#milestones.set(milestone.name, milestone);
   }
 
   async milestone(name) {
-    return this._milestones.get(name);
+    return this.#milestones.get(name);
   }
 
   _addProject(project) {
-    this._projects.set(project.name, project);
+    this.#projects.set(project.name, project);
   }
 
   async project(name) {
-    return this._projects.get(name);
+    return this.#projects.get(name);
   }
 
   /**
@@ -522,7 +507,7 @@ export class Repository extends OwnedObject {
 
   async initializePullRequests() {
     for await (const pr of this.pullRequestClass.list(this)) {
-      this._pullRequests.set(pr.name, pr);
+      this.#pullRequests.set(pr.name, pr);
     }
   }
 }