pmcf 2.56.0 → 2.57.0

package/bin/pmcf-package

@@ -30,8 +30,7 @@ const publishingDetails = createPublishingDetails(
   env
 );
 
-for (const name of args) {
-  const object = await root.load(name);
+for (const object of root.find(args)) {
   const stagingDir = join(options.output, object.fullName);
 
   for await (const { sources, outputs, properties } of object.preparePackages(

package/package.json

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

package/src/base.mjs

@@ -509,6 +509,7 @@ export class Base {
   traverse(visitor, ...args) {
     const visited = new Set();
     this._traverse(visited, visitor, ...args);
+    return visited;
   }
 
   _traverse(visited, visitor, ...args) {

package/src/owner.mjs

@@ -3,6 +3,7 @@ import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { addType, types } from "./types.mjs";
+
 const OwnerTypeDefinition = {
   name: "owner",
   owners: ["location", "owner", "root"],
@@ -57,6 +58,17 @@ export class Owner extends Base {
     return false;
   }
 
+  *find(pattern) {
+    for (const node of this.traverse(() => {})) {
+      for (const p of pattern) {
+        if (node.fullName.match(p)) {
+          yield node;
+          break;
+        }
+      }
+    }
+  }
+
   named(name) {
     if (name[0] === "/") {
       name = name.substring(this.fullName.length + 1);
@@ -185,9 +197,10 @@ export class Owner extends Base {
     }
 
     let subnet = this.subnetForAddress(address);
-  
+
     if (!subnet) {
-      subnet =  familyIP(address) === 'IPv4' ?  SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
+      subnet =
+        familyIP(address) === "IPv4" ? SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
 
       /*
       this.error(
@@ -196,7 +209,7 @@ export class Owner extends Base {
       );
       */
     }
-  
+
     return subnet;
   }
 
@@ -216,8 +229,7 @@ export class Owner extends Base {
     return this.typeList("cluster");
   }
 
-  get bridges()
-  {
+  get bridges() {
     return this._bridges;
   }
 

package/src/services/kea.mjs

@@ -125,6 +125,14 @@ export class KeaService extends Service {
   }
 
   async *preparePackages(dir) {
+    const ctrlAgentEndpoint = this.endpoint(
+      e => e.type === "kea-control-agent"
+    );
+
+    if (!ctrlAgentEndpoint) {
+      return;
+    }
+
     const network = this.network;
     const host = this.host;
     const name = host.name;
@@ -151,10 +159,6 @@ export class KeaService extends Service {
       }
     };
 
-    const ctrlAgentEndpoint = this.endpoint(
-      e => e.type === "kea-control-agent"
-    );
-
     const peers = async family =>
       (
         await Array.fromAsync(
@@ -171,13 +175,16 @@ export class KeaService extends Service {
                 : "kea-control-agent")
           );
 
-          return {
-            name: dhcp.host.name,
-            role: i === 0 ? "primary" : i > 1 ? "backup" : "standby",
-            url: ctrlAgentEndpoint.url,
-            "auto-failover": i <= 1
-          };
-        });
+          if (ctrlAgentEndpoint) {
+            return {
+              name: dhcp.host.name,
+              role: i === 0 ? "primary" : i > 1 ? "backup" : "standby",
+              url: ctrlAgentEndpoint.url,
+              "auto-failover": i <= 1
+            };
+          }
+        })
+        .filter(p => p != null);
 
     const loggers = [
       {

package/types/base.d.mts

@@ -109,7 +109,7 @@ export class Base {
     finalize(action: any): void;
     execFinalize(): void;
     _execFinalize(): void;
-    traverse(visitor: any, ...args: any[]): void;
+    traverse(visitor: any, ...args: any[]): Set<any>;
     _traverse(visited: any, visitor: any, ...args: any[]): boolean;
     error(...args: any[]): void;
     info(...args: any[]): void;

package/types/owner.d.mts

@@ -134,6 +134,7 @@ export class Owner extends Base {
     _membersByType: Map<any, any>;
     _bridges: Set<any>;
     _traverse(...args: any[]): boolean;
+    find(pattern: any): Generator<any, void, unknown>;
     named(name: any): any;
     typeObject(typeName: any): any;
     typeList(typeName: any): any;