pmcf 4.18.12 → 4.18.14

package/package.json

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

package/src/base.mjs

@@ -572,11 +572,12 @@ export class Base {
   }
 
   get packageData() {
+    const nameParts = [this.typeName, this.owner?.name, this.name];
     return {
       sources: [],
       outputs: this.outputs,
       properties: {
-        name: `${this.typeName}-${this.owner.name}-${this.name}`,
+        name: nameParts.filter(n => n !== undefined && n.length > 0).join("-"),
         access: "private",
         dependencies: this.depends,
         groups: [this.typeName]
@@ -751,7 +752,7 @@ export function extractFrom(
   }
 
   if (typeof object[Symbol.iterator] === "function") {
-    object = [...object].map(o => o instanceof Base ? extractFrom(o) : o);
+    object = [...object].map(o => (o instanceof Base ? extractFrom(o) : o));
 
     if (object.length === 0) {
       return undefined;

package/src/host.mjs

@@ -327,8 +327,8 @@ export class Host extends ServiceOwner {
     return this;
   }
 
-  *hosts() {
-    yield this;
+  get hosts() {
+    return [this];
   }
 
   typeNamed(typeName, name) {
@@ -449,7 +449,7 @@ export class Host extends ServiceOwner {
       await writeLines(dir, "etc/vconsole.conf", `KEYMAP=${this.keymap}`);
     }
 
-    await generateKnownHosts(this.owner.hosts(), join(dir, "root", ".ssh"));
+    await generateKnownHosts(this.owner.hosts, join(dir, "root", ".ssh"));
 
     for (const service of this.services) {
       if (service.systemdConfigs) {

package/src/network-interfaces/skeleton.mjs

@@ -23,11 +23,12 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     }
   }
 
-  *hosts() {
+  get hosts() {
     const host = this.host;
     if (host) {
-      yield host;
+      return [host];
     }
+    return [];
   }
 
   get network_interface() {

package/src/network.mjs

@@ -58,7 +58,7 @@ export class Network extends Owner {
     }
   }
 
-  hosts() {
+  get hosts() {
     if (this.bridge) {
       let hosts = new Set();
       for (const network of this.bridge) {
@@ -67,7 +67,7 @@ export class Network extends Owner {
       return hosts;
     }
 
-    return super.hosts();
+    return super.hosts;
   }
 
   get bridge() {

package/src/owner.mjs

@@ -159,8 +159,13 @@ 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()) {
+    for (const host of this.hosts) {
       yield* host.findServices(filter);
     }
   }
@@ -186,12 +191,12 @@ export class Owner extends Base {
     return hosts;
   }
 
-  hosts() {
+  get hosts() {
     let hosts = this.directHosts();
 
     for (const type of types.host.owners) {
       for (const object of this.typeList(type)) {
-        hosts = hosts.union(object.hosts());
+        hosts = hosts.union(object.hosts);
       }
     }
 
@@ -338,7 +343,7 @@ export class Owner extends Base {
 
   get derivedPackaging() {
     let all = new Set();
-    for (const host of this.hosts()) {
+    for (const host of this.hosts) {
       all = all.union(host.packaging);
     }
 
@@ -346,7 +351,7 @@ export class Owner extends Base {
   }
 
   *networkAddresses(filter) {
-    for (const host of this.hosts()) {
+    for (const host of this.hosts) {
       yield* host.networkAddresses(filter);
     }
   }
@@ -415,7 +420,7 @@ export class Owner extends Base {
   get domains() {
     let domains = new Set();
 
-    for (const object of this.hosts()) {
+    for (const object of this.hosts) {
       domains = domains.union(object.domains);
     }
 
@@ -429,7 +434,7 @@ export class Owner extends Base {
   get domainNames() {
     let names = new Set();
 
-    for (const host of this.hosts()) {
+    for (const host of this.hosts) {
       names = names.union(new Set(host.domainNames));
     }
 
@@ -449,7 +454,7 @@ export class Owner extends Base {
 
     const architectures = new Set();
 
-    for (const host of this.hosts()) {
+    for (const host of this.hosts) {
       architectures.add(host.architecture);
     }
 

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/src/service.mjs

@@ -102,8 +102,9 @@ export class Service extends Base {
     }
   }
 
-  *hosts() {
-    yield* this.owner.hosts();
+  get hosts()
+  {
+    return this.owner.hosts;
   }
 
   get domainName() {

package/types/host.d.mts

@@ -250,7 +250,7 @@ export class Host extends ServiceOwner {
     domainNamesIn(domain: any): Generator<string, void, unknown>;
     get clusters(): Set<any>;
     get host(): this;
-    hosts(): Generator<this, void, unknown>;
+    get hosts(): this[];
     named(name: any): any;
     get networks(): Set<any>;
     set networkInterfaces(networkInterface: Map<any, any>);

package/types/network-interfaces/skeleton.d.mts

@@ -5,7 +5,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     _network: any;
     get typeName(): string;
     get host(): Host;
-    hosts(): Generator<Host, void, unknown>;
+    get hosts(): Host[];
     get network_interface(): this;
     get domainName(): string;
     get domainNames(): Set<any>;

package/types/owner.d.mts

@@ -190,12 +190,13 @@ 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;
     hostNamed(name: any): any;
     directHosts(): Set<any>;
-    hosts(): Set<any>;
+    get hosts(): Set<any>;
     networkNamed(name: any): any;
     get networks(): any;
     subnetNamed(name: any): 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>;

package/types/service.d.mts

@@ -633,7 +633,7 @@ export class Service extends Base {
     _port: any;
     _systemdService: any;
     get host(): Host;
-    hosts(): Generator<any, void, any>;
+    get hosts(): any;
     get domainName(): string;
     get networks(): Set<any>;
     get subnets(): Set<any>;