pmcf 4.19.1 → 4.19.2

package/bin/pmcf-diagram

@@ -46,7 +46,7 @@ for await (const network of location.networks) {
   }
 }
 
-for await (const cluster of location.clusters()) {
+for await (const cluster of location.clusters) {
   console.log(`  subgraph cluster_${cluster.name} {`);
 
   for (const ni of cluster.members) {

package/package.json

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

package/src/base.mjs

@@ -515,6 +515,11 @@ export class Base {
     });
   }
 
+  get services()
+  {
+    return this.owner?.services;
+  }
+
   /**
    *
    * @param {any} filter
@@ -630,7 +635,7 @@ export class Base {
   }
 
   get tags() {
-    return this._tags;
+    return this.extends.reduce((a, c) => a.union(c.tags), this._tags);
   }
 
   set tags(value) {

package/src/cluster.mjs

@@ -76,7 +76,7 @@ export class Cluster extends Host {
   }
 
   async *preparePackages(stagingDir) {
-    for (const ni of [...this.owner.clusters()].reduce(
+    for (const ni of [...this.owner.clusters].reduce(
       (all, cluster) => all.union(cluster.members),
       new Set()
     )) {
@@ -117,7 +117,7 @@ export class Cluster extends Host {
         ""
       ];
 
-      for (const cluster of [...this.owner.clusters()].sort((a, b) =>
+      for (const cluster of [...this.owner.clusters].sort((a, b) =>
         a.name.localeCompare(b.name)
       )) {
         cfg.push(`vrrp_instance ${cluster.name} {`);

package/src/owner.mjs

@@ -258,7 +258,7 @@ export class Owner extends Base {
     return this.typeNamed("cluster", name);
   }
 
-  clusters() {
+  get clusters() {
     return this.typeList("cluster");
   }
 

package/types/base.d.mts

@@ -117,6 +117,7 @@ export class Base {
      * @returns {any}
      */
     expression(expression: string, options: object): any;
+    get services(): any;
     /**
      *
      * @param {any} filter
@@ -150,8 +151,8 @@ export class Base {
      * @returns {AsyncIterable<ContentProvider>}
      */
     templateContent(entryProperties: any, directoryProperties: any): AsyncIterable<ContentProvider>;
-    set tags(value: Set<any>);
-    get tags(): Set<any>;
+    set tags(value: any);
+    get tags(): any;
     get isTemplate(): any;
     valueFor(name: any, at: any): any;
     get properties(): any;

package/types/owner.d.mts

@@ -204,7 +204,7 @@ export class Owner extends Base {
     addSubnet(address: any): any;
     subnetForAddress(address: any): any;
     clusterNamed(name: any): any;
-    clusters(): any;
+    get clusters(): any;
     get bridges(): Set<any>;
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;