pmcf 4.18.13 → 4.18.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.18.13",
+  "version": "4.18.14",
   "publishConfig": {
     "access": "public"
   },

package/src/owner.mjs

@@ -159,6 +159,11 @@ export class Owner extends Base {
     this.addTypeObject(object.typeName, object.name, object);
   }
 
+  get services()
+  {
+    return [...this.hosts].map(host=>host.services).flat();
+  }
+
   *findServices(filter) {
     for (const host of this.hosts) {
       yield* host.findServices(filter);

package/src/service-owner.mjs

@@ -1,38 +1,27 @@
 import { Base, Service } from "pmcf";
 
 export class ServiceOwner extends Base {
-  _services = [];
-
-  get services() {
-    return this._services;
-  }
-
-  /**
-   * @param {Service} service
-   */
-  set services(service) {
-    this._services.push(service);
-  }
+  services = [];
 
   _applyExtends(owner) {
     super._applyExtends(owner);
 
     for (const service of owner.services) {
-      const present = this._services.find(s => s.name === service.name);
+      const present = this.services.find(s => s.name === service.name);
 
       if (present && service.isTemplate) {
         if (present.extends.indexOf(service) < 0) {
           present.extends.push(service);
         }
       } else {
-        this.services = service.forOwner(this);
+        this.services.push(service.forOwner(this));
       }
     }
   }
 
   _traverse(...args) {
     if (super._traverse(...args)) {
-      for (const service of this._services) {
+      for (const service of this.services) {
         service._traverse(...args);
       }
 
@@ -71,6 +60,6 @@ export class ServiceOwner extends Base {
    * @returns {Service|undefined}
    */
   named(name) {
-    return this._services.find(s => s.name === name);
+    return this.services.find(s => s.name === name);
   }
 }

package/types/owner.d.mts

@@ -190,6 +190,7 @@ export class Owner extends Base {
     typeList(typeName: any): any;
     addTypeObject(typeName: any, name: any, object: any): void;
     addObject(object: any): void;
+    get services(): any[];
     findServices(filter: any): Generator<any, void, any>;
     locationNamed(name: any): any;
     get locations(): any;

package/types/service-owner.d.mts

@@ -1,10 +1,5 @@
 export class ServiceOwner extends Base {
-    _services: any[];
-    /**
-     * @param {Service} service
-     */
-    set services(service: Service);
-    get services(): Service;
+    services: any[];
     _applyExtends(owner: any): void;
     _traverse(...args: any[]): boolean;
     findServices(filter: any): Generator<any, void, unknown>;