pmcf 1.4.1 → 1.5.1

package/bin/pmcf-host-defs

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 
 import { writeFile, mkdir, copyFile, glob } from "node:fs/promises";
-import { cwd, argv } from "node:process";
 import { join } from "node:path";
-import { World, writeLines, sectionLines } from "../src/model.mjs";
+import { writeLines, sectionLines } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
 
-const world = new World(argv[2] || cwd());
+const { world, args } = prepare();
 
-const hostName = argv[3];
+const hostName = args[0];
 
 const host = await world.host(hostName);
 
-const targetDir = argv[4] || `pkg/host-${host.hostName}`;
+const targetDir = args[1] || `pkg/host-${host.hostName}`;
 
 await generateNetworkDefs(host, targetDir);
 await generateMachineInfo(host, targetDir);

package/bin/pmcf-info

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
-import { cwd, argv } from "node:process";
-import { World } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
+const { world, args } = prepare();
 
-const world = new World(argv[2] || cwd());
-
-const objectName = argv[3];
+const objectName = args[0];
 
 if (objectName) {
   const object = await world.named(objectName);

package/bin/pmcf-location-defs

@@ -1,17 +1,23 @@
 #!/usr/bin/env node
 
-import { cwd, argv } from "node:process";
 import { mkdir, copyFile } from "node:fs/promises";
 import { join } from "node:path";
-import { World, writeLines, sectionLines } from "../src/model.mjs";
+import { writeLines, sectionLines } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
 
-const world = new World(argv[2] || cwd());
-const location = await world.location(argv[3] || "SW");
-const targetDir = argv[4];
+const { world, args } = prepare();
+
+const location = await world.location(args[0] || "SW");
+const targetDir = args[1];
 
 await generateLocationDefs(location, targetDir);
 
-console.log("provides", "location", "mf-location", `mf-location-${location.name}`);
+console.log(
+  "provides",
+  "location",
+  "mf-location",
+  `mf-location-${location.name}`
+);
 console.log("replaces", `mf-location-${location.name}`);
 console.log("description", `location definitions for ${location.name}`);
 

package/bin/pmcf-named-defs

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
-import { cwd, argv } from "node:process";
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
+import { writeLines } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
 
-import { World, writeLines } from "../src/model.mjs";
+const { world, args } = prepare();
 
-const world = new World(argv[2] || cwd());
-const location = await world.location(argv[3] || "SW");
-const targetDir = argv[4] || `pkg/mf-named-${location.name}`;
+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),
@@ -38,7 +38,7 @@ async function generateNamedDefs(location, targetDir) {
     const records = new Set();
 
     const nameserver = (await location.service({ type: "dns" }))?.owner;
-    const rname = location.administratorEmail.replace(/@/,'.');
+    const rname = location.administratorEmail.replace(/@/, ".");
 
     for await (const mail of location.services({ type: "smtp" })) {
       records.add(
@@ -48,12 +48,7 @@ async function generateNamedDefs(location, targetDir) {
       );
     }
 
-    console.log(
-      location.name,
-      location.domain,
-      nameserver?.hostName,
-      rname
-    );
+    console.log(location.name, location.domain, nameserver?.hostName, rname);
 
     const catalogZone = {
       id: `catalog.${domain}`,
@@ -63,7 +58,7 @@ async function generateNamedDefs(location, targetDir) {
           nameserver.domainName
         }. ${rname}. (${updates})`,
         `${"@".padEnd(NAME_LEN, " ")} ${ttl} IN NS    ${nameserver.ipAddress}.`,
-        `${("version."+domain+'.').padEnd(NAME_LEN, " ")}    IN TXT   "2"`
+        `${("version." + domain + ".").padEnd(NAME_LEN, " ")}    IN TXT   "2"`
       ])
     };
 
@@ -152,9 +147,11 @@ async function generateNamedDefs(location, targetDir) {
     zones.push(catalogZone);
 
     for (const zone of zones) {
-      if(zone !== catalogZone) {
+      if (zone !== catalogZone) {
         const hash = createHmac("md5", zone.id).digest("hex");
-        catalogZone.records.add(`${hash}.zones.${domain}. IN PTR   ${zone.id}.`);
+        catalogZone.records.add(
+          `${hash}.zones.${domain}. IN PTR   ${zone.id}.`
+        );
       }
 
       zoneConfig.push(`zone \"${zone.id}\" {`);
@@ -162,7 +159,9 @@ async function generateNamedDefs(location, targetDir) {
       zoneConfig.push(`  file \"${zone.file}\";`);
 
       const u = location.dnsAllowedUpdates;
-      zoneConfig.push(`  allow-update { ${u.length ? u.join(';') : "none" }; };`);
+      zoneConfig.push(
+        `  allow-update { ${u.length ? u.join(";") : "none"}; };`
+      );
       zoneConfig.push(`  notify yes;`);
       zoneConfig.push(`};`);
       zoneConfig.push("");

package/bin/pmcf-network

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 
-import { cwd, argv } from "node:process";
-import { World } from "../src/model.mjs";
+import { prepare } from "../src/cmd.mjs";
 
-const world = new World(argv[2] || cwd());
-const location = await world.location(argv[3] || "SW");
+const { world, args } = prepare();
+
+const location = await world.location(args[0] || "SW");
 
 function q(str) {
   return str.match(/^\w+$/) ? str : `"${str}"`;
 }
 function id(str) {
-  return str.replaceAll(/-/g,'');
+  return str.replaceAll(/-/g, "");
 }
 
 console.log("graph G {");
@@ -26,7 +26,11 @@ for await (const host of location.hosts()) {
 }
 
 for await (const network of location.networks()) {
-  console.log(`  ${id(network.name)} [label="${network.name}\\n${network.ipv4}" shape=circle];`);
+  console.log(
+    `  ${id(network.name)} [label="${network.name}\\n${
+      network.ipv4
+    }" shape=circle];`
+  );
 
   for await (const host of network.hosts()) {
     for (const [n, i] of Object.entries(host.networkInterfaces)) {

package/package.json

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

package/src/cmd.mjs

@@ -0,0 +1,26 @@
+import { parseArgs } from "node:util";
+import { argv, cwd, env } from "node:process";
+import { World } from "./model.mjs";
+
+export function prepare() {
+  const { values, positionals } = parseArgs({
+    args: argv.slice(2),
+    options: {
+      world: {
+        type: "string",
+        short: "w",
+        default: env.PMCF_WORLD || cwd()
+      },
+      output: {
+        type: "string",
+        short: "o",
+        default: cwd()
+      }
+    },
+    allowPositionals: true
+  });
+
+  const world = new World(values.world);
+
+  return { world, options: values, args: positionals };
+}

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;
+  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,10 +146,21 @@ 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);
+      object = new type(owner, data);
       this.#byName.set(data.name, object);
     }
 
@@ -193,6 +216,9 @@ export class World {
     return this._loadType(name, Host);
   }
 
+  addHost(host) {}
+  network(name) {}
+
   async *subnets() {
     for await (const location of this.locations()) {
       yield* location.subnets();
@@ -212,7 +238,6 @@ export class Host extends Base {
   networkInterfaces = {};
   services = {};
   postinstall = [];
-  location;
   #extends = [];
   #provides = new Set();
   #replaces = new Set();
@@ -221,6 +246,7 @@ export class Host extends Base {
   #os;
   #distribution;
   #deployment;
+  #location;
 
   static get typeName() {
     return "host";
@@ -245,11 +271,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 +311,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 +337,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)));

package/types/cmd.d.mts

@@ -0,0 +1,9 @@
+export function prepare(): {
+    world: World;
+    options: {
+        world: string;
+        output: string;
+    };
+    args: string[];
+};
+import { World } from "./model.mjs";

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): 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,8 @@ export class World {
     domains(): AsyncGenerator<any, void, unknown>;
     location(name: any): Promise<any>;
     host(name: any): Promise<any>;
+    addHost(host: any): void;
+    network(name: any): void;
     subnets(): AsyncGenerator<any, void, unknown>;
     networkAddresses(): AsyncGenerator<{
         address: any;
@@ -48,7 +53,6 @@ export class Host extends Base {
     networkInterfaces: {};
     services: {};
     postinstall: any[];
-    location: any;
     get deployment(): any;
     get extends(): any[];
     get provides(): Set<any>;
@@ -84,7 +88,6 @@ export class Location extends Base {
     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>;