pmcf 1.5.0 → 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.0",
+  "version": "1.5.2",
   "publishConfig": {
     "access": "public"
   },

package/src/model.mjs

@@ -51,6 +51,17 @@ export class Base {
     return this.constructor.typeName;
   }
 
+  get world() {
+    return this.owner.world;
+  }
+
+  get location() {
+    if (this instanceof Location) {
+      return this;
+    }
+    return this.owner.location;
+  }
+
   get host() {
     if (this instanceof Host) {
       return this;
@@ -58,11 +69,8 @@ export class Base {
     return this.owner.host;
   }
 
-  get network() {
-    if (this instanceof Network) {
-      return this;
-    }
-    return this.owner.network;
+  async network(name) {
+    return this.owner.network(name);
   }
 
   #directory;
@@ -121,6 +129,10 @@ export class World {
     return "";
   }
 
+  get world() {
+    return this;
+  }
+
   async _loadType(name, type) {
     const baseName = type.baseName(name);
 
@@ -134,11 +146,22 @@ export class World {
         )
       );
 
+      let owner;
+      let path = baseName.split("/");
+
+      if (path.length > 1 && path[0] !== "model" && path[0] != "services") {
+        // TODO
+        path.length -= 1;
+        owner = await this._loadType(path.join("/"), Location);
+      } else {
+        owner = this;
+      }
+
       data.name = baseName;
 
       type = await type.prepareData(this, data);
-      object = new type(this, data);
-      this.#byName.set(data.name, object);
+      object = new type(owner, data);
+      this.#byName.set(object.name, object);
     }
 
     return object;
@@ -193,6 +216,10 @@ export class World {
     return this._loadType(name, Host);
   }
 
+  addHost(host) {}
+  addNetwork(network) {}
+  network(name) {}
+
   async *subnets() {
     for await (const location of this.locations()) {
       yield* location.subnets();
@@ -212,7 +239,6 @@ export class Host extends Base {
   networkInterfaces = {};
   services = {};
   postinstall = [];
-  location;
   #extends = [];
   #provides = new Set();
   #replaces = new Set();
@@ -221,6 +247,7 @@ export class Host extends Base {
   #os;
   #distribution;
   #deployment;
+  #location;
 
   static get typeName() {
     return "host";
@@ -245,11 +272,15 @@ export class Host extends Base {
   constructor(owner, data) {
     super(owner, data);
 
+    if (data.location !== undefined) {
+      this.#location = data.location;
+      delete data.location;
+    }
+
     if (data.deployment !== undefined) {
       this.#deployment = data.deployment;
       delete data.deployment;
     }
-
     if (data.extends !== undefined) {
       this.#extends = data.extends;
       delete data.extends;
@@ -281,13 +312,13 @@ export class Host extends Base {
 
     Object.assign(this, { services: {}, networkInterfaces: {} }, data);
 
-    this.location?.addHost(this);
+    owner.addHost(this);
 
     for (const [name, iface] of Object.entries(this.networkInterfaces)) {
       iface.host = this;
       iface.name = name;
       if (iface.network) {
-        iface.network = this.location?.network(iface.network);
+        iface.network = this.network(iface.network);
       }
     }
 
@@ -307,6 +338,10 @@ export class Host extends Base {
     return this.#extends.map(e => this.expand(e));
   }
 
+  get location() {
+    return this.#location || super.location;
+  }
+
   get provides() {
     let provides = new Set(this.#provides);
     this.extends.forEach(h => (provides = provides.union(h.provides)));
@@ -453,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) {
@@ -491,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;
@@ -504,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;
     }
@@ -528,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);
 
@@ -571,7 +604,7 @@ export class Location extends Base {
   }
 
   get propertyNames() {
-    return [...super.propertyNames, "domain"];
+    return [...super.propertyNames, "domain" /*, "hosts"*/];
   }
 
   toJSON() {
@@ -606,6 +639,8 @@ export class Network extends Base {
         this.ipv4_netmask = m[1];
       }
     }
+
+    owner.addNetwork(this);
   }
 
   get subnetAddress() {
@@ -774,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

@@ -11,8 +11,10 @@ export class Base {
     name: any;
     description: any;
     get typeName(): any;
+    get world(): any;
+    get location(): any;
     get host(): any;
-    get network(): any;
+    network(name: any): Promise<any>;
     set directory(directory: any);
     get directory(): any;
     expand(object: any): any;
@@ -23,11 +25,12 @@ export class Base {
 }
 export class World {
     static get types(): {
-        [k: string]: typeof Host | typeof Network | typeof Location | typeof Subnet | typeof Service;
+        [k: string]: typeof Location | typeof Host | typeof Network | typeof Subnet | typeof Service;
     };
     constructor(directory: any);
     directory: any;
     get name(): string;
+    get world(): this;
     _loadType(name: any, type: any): Promise<any>;
     load(): Promise<void>;
     named(name: any): Promise<any>;
@@ -36,6 +39,9 @@ export class World {
     domains(): AsyncGenerator<any, void, unknown>;
     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<{
         address: any;
@@ -48,7 +54,6 @@ export class Host extends Base {
     networkInterfaces: {};
     services: {};
     postinstall: any[];
-    location: any;
     get deployment(): any;
     get extends(): any[];
     get provides(): Set<any>;
@@ -80,11 +85,9 @@ 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>;
-    network(name: any): any;
     networkAddresses(): AsyncGenerator<any, void, unknown>;
     networks(): AsyncGenerator<any, void, unknown>;
     subnets(): AsyncGenerator<any, void, unknown>;