repository-provider 28.3.13 → 28.4.0

package/README.md

@@ -940,9 +940,10 @@ Abstract branch.
 
 ### Parameters
 
-*   `repository` **[Repository](#repository)** 
-*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**  (optional, default `repository.defaultBranchName`)
+*   `owner`  
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**  (optional, default `owner.defaultBranchName`)
 *   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+*   `repository` **[Repository](#repository)** 
 
 ### Properties
 
@@ -1182,7 +1183,7 @@ Check for equality.
 
 *   `other` **[NamedObject](#namedobject)** 
 
-Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** true if names are equal and have the same owner
+Returns **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** true if names are equal and have the same provider
 
 ### fullName
 
@@ -1190,7 +1191,7 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 ### toJSON
 
-Provide name and all defined attributes.
+Provided name and all defined attributes.
 
 ## OwnedObject
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repository-provider",
-  "version": "28.3.13",
+  "version": "28.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -36,7 +36,7 @@
     "ava": "^4.2.0",
     "c8": "^7.11.2",
     "documentation": "^13.2.5",
-    "repository-provider-test-support": "^2.1.9",
+    "repository-provider-test-support": "^2.1.10",
     "semantic-release": "^19.0.2",
     "typescript": "^4.6.3"
   },

package/src/multi-group-provider.mjs

@@ -10,11 +10,8 @@ import { RepositoryGroup } from "./repository-group.mjs";
  *
  */
 export class MultiGroupProvider extends BaseProvider {
-  constructor(options) {
-    super(options, {
-      _repositoryGroups: { value: new Map() }
-    });
-  }
+
+  #repositoryGroups = new Map();
 
   /**
    * Lookup a repository in the provider and all of its repository groups.
@@ -68,7 +65,7 @@ export class MultiGroupProvider extends BaseProvider {
     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(name, true));
     }
   }
 
@@ -81,7 +78,7 @@ export class MultiGroupProvider extends BaseProvider {
     await this.initializeRepositories();
 
     yield* matcher(
-      this._repositoryGroups.values(),
+      this.#repositoryGroups.values(),
       stripBaseNames(patterns, this.provider.repositoryBases),
       {
         caseSensitive: this.areGroupNamesCaseSensitive,
@@ -108,13 +105,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

@@ -9,11 +9,8 @@ import { asArray, stripBaseName, stripBaseNames } from "./util.mjs";
  */
 export function RepositoryOwner(base) {
   return class RepositoryOwner extends base {
-    constructor(...args) {
-      super(...args);
 
-      Object.defineProperties(this, { _repositories: { value: new Map() } });
-    }
+    #repositories = new Map();
 
     /**
      * Normalizes a repository name.
@@ -51,7 +48,7 @@ export function RepositoryOwner(base) {
 
       await this.initializeRepositories();
 
-      return this._repositories.get(this.normalizeRepositoryName(name, true));
+      return this.#repositories.get(this.normalizeRepositoryName(name, true));
     }
 
     /**
@@ -75,7 +72,7 @@ export function RepositoryOwner(base) {
 
       await this.initializeRepositories();
       yield* matcher(
-        this._repositories.values(),
+        this.#repositories.values(),
         stripBaseNames(patterns, this.provider.repositoryBases),
         {
           caseSensitive: this.areRepositoryNamesCaseSensitive,
@@ -91,7 +88,7 @@ export function RepositoryOwner(base) {
         name = stripBaseName(name, this.provider.repositoryBases);
 
         const [repoName, typeName] = split ? split(name) : name.split("/");
-        const repository = this._repositories.get(repoName);
+        const repository = this.#repositories.get(repoName);
 
         if (repository) {
           if (typeName === undefined && defaultItem) {
@@ -113,10 +110,10 @@ export function RepositoryOwner(base) {
           ? split(pattern)
           : pattern.split("/");
 
-        for (const name of matcher(this._repositories.keys(), repoPattern, {
+        for (const name of matcher(this.#repositories.keys(), repoPattern, {
           caseSensitive: this.areRepositoriesCaseSensitive
         })) {
-          const repository = this._repositories.get(name);
+          const repository = this.#repositories.get(name);
 
           if (typePattern === undefined && defaultItem) {
             const item = await defaultItem(repository);
@@ -149,18 +146,13 @@ 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)
     {
       const normalizedName = this.normalizeRepositoryName(repository.name, true);
-      this._repositories.set(normalizedName, repository);
+      this.#repositories.set(normalizedName, repository);
     }
 
     /**
@@ -169,7 +161,7 @@ export function RepositoryOwner(base) {
      * @return {Promise<any>}
      */
     async deleteRepository(name) {
-      this._repositories.delete(this.normalizeRepositoryName(name, true));
+      this.#repositories.delete(this.normalizeRepositoryName(name, true));
     }
 
     initializeRepositories() {}

package/src/repository.mjs

@@ -242,12 +242,7 @@ 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();
@@ -284,12 +279,7 @@ 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) {
@@ -335,12 +325,7 @@ 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) {