pmcf 1.5.1 → 1.5.2

package/bin/pmcf-host-defs

@@ -5,18 +5,16 @@ import { join } from "node:path";
 import { writeLines, sectionLines } from "../src/model.mjs";
 import { prepare } from "../src/cmd.mjs";
 
-const { world, args } = prepare();
+const { world, args, options } = prepare();
 
 const hostName = args[0];
 
 const host = await world.host(hostName);
 
-const targetDir = args[1] || `pkg/host-${host.hostName}`;
-
-await generateNetworkDefs(host, targetDir);
-await generateMachineInfo(host, targetDir);
-await copySshKeys(host, targetDir);
-await generateKnownHosts(world.hosts(), join(targetDir, "root", ".ssh"));
+await generateNetworkDefs(host, options.output);
+await generateMachineInfo(host, options.output);
+await copySshKeys(host, options.output);
+await generateKnownHosts(world.hosts(), join(options.output, "root", ".ssh"));
 
 console.log("provides", "host", ...host.provides);
 console.log("depends", `location-${host.location.name}`, ...host.depends);

package/bin/pmcf-location-defs

@@ -5,12 +5,11 @@ import { join } from "node:path";
 import { writeLines, sectionLines } from "../src/model.mjs";
 import { prepare } from "../src/cmd.mjs";
 
-const { world, args } = prepare();
+const { world, args, options } = prepare();
 
 const location = await world.location(args[0] || "SW");
-const targetDir = args[1];
 
-await generateLocationDefs(location, targetDir);
+await generateLocationDefs(location, options.output);
 
 console.log(
   "provides",

package/bin/pmcf-named-defs

@@ -5,10 +5,9 @@ import { createHmac } from "node:crypto";
 import { writeLines } from "../src/model.mjs";
 import { prepare } from "../src/cmd.mjs";
 
-const { world, args } = prepare();
+const { world, args, options } = prepare();
 
 const location = await world.location(args[0] || "SW");
-const targetDir = args[1] || `pkg/mf-named-${location.name}`;
 const ttl = location.dnsRecordTTL;
 const updates = [
   Math.ceil(Date.now() / 1000),
@@ -20,7 +19,7 @@ const updates = [
 
 const NAME_LEN = 35;
 
-await generateNamedDefs(location, targetDir);
+await generateNamedDefs(location, options.output);
 
 console.log("depends", "mf-named");
 console.log("replaces", "mf-named-zones");

package/package.json

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

package/src/model.mjs

@@ -69,7 +69,7 @@ export class Base {
     return this.owner.host;
   }
 
-  network(name) {
+  async network(name) {
     return this.owner.network(name);
   }
 
@@ -161,7 +161,7 @@ export class World {
 
       type = await type.prepareData(this, data);
       object = new type(owner, data);
-      this.#byName.set(data.name, object);
+      this.#byName.set(object.name, object);
     }
 
     return object;
@@ -217,6 +217,7 @@ export class World {
   }
 
   addHost(host) {}
+  addNetwork(network) {}
   network(name) {}
 
   async *subnets() {
@@ -487,10 +488,6 @@ export class Location extends Base {
     }
   }
 
-  async load() {
-    for await (const host of this.owner.hosts());
-  }
-
   async *hosts() {
     for await (const host of this.owner.hosts()) {
       if (host.location === this) {
@@ -525,12 +522,7 @@ export class Location extends Base {
     }
   }
 
-  network(name) {
-    return this.#networks.get(name);
-  }
-
   async *networkAddresses() {
-    await this.load();
     for await (const host of this.hosts()) {
       for (const networkAddresses of host.networkAddresses()) {
         yield networkAddresses;
@@ -538,15 +530,17 @@ export class Location extends Base {
     }
   }
 
+  async network(name) {
+    return this.#networks.get(name);
+  }
+
   async *networks() {
-    await this.load();
     for (const network of this.#networks.values()) {
       yield network;
     }
   }
 
   async *subnets() {
-    await this.load();
     for (const subnet of this.#subnets.values()) {
       yield subnet;
     }
@@ -562,6 +556,11 @@ export class Location extends Base {
       return network;
     }
 
+    if(data instanceof Network) {
+      this.#networks.set(data.name, data);
+      return data;
+    }
+
     network = new Network(this, data);
     this.#networks.set(data.name, network);
 
@@ -605,7 +604,7 @@ export class Location extends Base {
   }
 
   get propertyNames() {
-    return [...super.propertyNames, "domain"];
+    return [...super.propertyNames, "domain" /*, "hosts"*/];
   }
 
   toJSON() {
@@ -640,6 +639,8 @@ export class Network extends Base {
         this.ipv4_netmask = m[1];
       }
     }
+
+    owner.addNetwork(this);
   }
 
   get subnetAddress() {
@@ -808,8 +809,13 @@ function extractFrom(object, propertyNames) {
   const json = {};
   for (const p of propertyNames) {
     const value = object[p];
+
     if (value !== undefined) {
-      json[p] = value;
+      if (value instanceof Base) {
+        json[p] = { name: object.name };
+      } else {
+        json[p] = value;
+      }
     }
   }
   return json;

package/types/model.d.mts

@@ -14,7 +14,7 @@ export class Base {
     get world(): any;
     get location(): any;
     get host(): any;
-    network(name: any): any;
+    network(name: any): Promise<any>;
     set directory(directory: any);
     get directory(): any;
     expand(object: any): any;
@@ -40,6 +40,7 @@ export class World {
     location(name: any): Promise<any>;
     host(name: any): Promise<any>;
     addHost(host: any): void;
+    addNetwork(network: any): void;
     network(name: any): void;
     subnets(): AsyncGenerator<any, void, unknown>;
     networkAddresses(): AsyncGenerator<{
@@ -84,7 +85,6 @@ export class Model extends Host {
 export class Location extends Base {
     domain: any;
     dns: any;
-    load(): Promise<void>;
     hosts(): AsyncGenerator<any, void, unknown>;
     service(filter: any): Promise<any>;
     services(filter: any): AsyncGenerator<any, void, unknown>;