pmcf 1.0.1 → 1.1.0

package/package.json

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

package/src/model.mjs

@@ -1,9 +1,10 @@
 import { readFile, writeFile, mkdir, glob } from "node:fs/promises";
 import { join } from "node:path";
 
-class Base {
+export class Base {
   owner;
   name;
+  description;
 
   static get typeName() {
     return "base";
@@ -31,28 +32,44 @@ class Base {
 
   constructor(owner, data) {
     this.owner = owner;
-    if (data?.name) {
-      this.name = data.name;
+
+    if (data) {
+      if (data.name) {
+        this.name = data.name;
+      }
+      if (data.description) {
+        this.description = data.description;
+      }
     }
   }
 
-  get typeName()
-  {
+  get typeName() {
     return this.constructor.typeName;
   }
 
-  get host()
-  {
-    if(this instanceof Host) { return this; }
+  get host() {
+    if (this instanceof Host) {
+      return this;
+    }
     return this.owner.host;
   }
 
-  get network()
-  {
-    if(this instanceof Network) { return this; }
+  get network() {
+    if (this instanceof Network) {
+      return this;
+    }
     return this.owner.network;
   }
 
+  #directory;
+  set directory(directory) {
+    this.#directory = directory;
+  }
+
+  get directory() {
+    return this.#directory || this.name;
+  }
+
   expand(object) {
     if (typeof object === "string") {
       return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
@@ -78,35 +95,62 @@ class Base {
   toJSON() {
     return {
       name: this.name,
-      owner: this.owner.name
+      directory: this.directory,
+      owner: this.owner.name,
+      description: this.description
     };
   }
 }
 
 export class World {
-  baseDir;
-  /** @typedef {Map<string,Location>} */ #locations = new Map();
+  static get types() {
+    return _types;
+  }
+
+  directory;
+  #byName = new Map();
+
   /** @typedef {Map<string,Host>} */ #hosts = new Map();
 
-  constructor(baseDir) {
-    this.baseDir = baseDir;
+  constructor(directory) {
+    this.directory = directory;
   }
 
   get name() {
     return "";
   }
 
-  async *locations() {
-    if (this.#locations.size > 0) {
-      for (const location of this.#locations.values()) {
-        yield location;
+  async load() {
+    for (const type of Object.values(World.types)) {
+      for await (const name of glob(type.fileNameGlob, {
+        cwd: this.directory
+      })) {
+        const baseName = type.baseName(name);
+        if (!this.#byName.get(baseName)) {
+          const data = JSON.parse(
+            await readFile(join(this.directory, name), "utf8")
+          );
+
+          data.name = baseName;
+          const object = new type(this, data);
+          this.#byName.set(data.name, object);
+        }
       }
     }
+  }
 
-    for await (const name of glob(Location.fileNameGlob, {
-      cwd: this.baseDir
-    })) {
-      yield this.location(name);
+  async named(name) {
+    await this.load();
+    return this.#byName.get(name);
+  }
+
+  async *locations() {
+    await this.load();
+
+    for (const object of this.#byName.values()) {
+      if (object instanceof Location) {
+        yield object;
+      }
     }
   }
 
@@ -118,7 +162,7 @@ export class World {
     }
 
     for await (const name of glob(Host.fileNameGlob, {
-      cwd: this.baseDir
+      cwd: this.directory
     })) {
       yield this.host(name);
     }
@@ -131,29 +175,7 @@ export class World {
   }
 
   async location(name) {
-    name = Location.baseName(name);
-    if (name === undefined) {
-      return undefined;
-    }
-
-    let location = this.#locations.get(name);
-    if (location) {
-      return location;
-    }
-
-    const directory = join(this.baseDir, name);
-    try {
-      const data = JSON.parse(
-        await readFile(join(directory, Location.typeFileName), "utf8")
-      );
-
-      data.directory = directory;
-      data.name = name;
-
-      location = new Location(this, data);
-    } catch {} // TODO
-    this.#locations.set(name, location);
-    return location;
+    return this.#byName.get(Location.baseName(name));
   }
 
   async host(name) {
@@ -168,7 +190,7 @@ export class World {
       return host;
     }
 
-    const directory = join(this.baseDir, name);
+    const directory = join(this.directory, name);
     const data = JSON.parse(
       await readFile(join(directory, Host.typeFileName), "utf8")
     );
@@ -216,8 +238,7 @@ export class World {
   }
 }
 
-class Host extends Base {
-  directory;
+export class Host extends Base {
   networkInterfaces = {};
   services = {};
   postinstall = [];
@@ -382,7 +403,6 @@ class Host extends Base {
       ...super.toJSON(),
       ...Object.fromEntries(
         [
-          "directory",
           "location",
           "model",
           "os",
@@ -404,10 +424,9 @@ class Host extends Base {
   }
 }
 
-class Model extends Host {}
+export class Model extends Host {}
 
-class Location extends Base {
-  directory;
+export class Location extends Base {
   domain;
   dns;
   #administratorEmail;
@@ -574,9 +593,11 @@ class Location extends Base {
   }
 }
 
-class Network extends Base {
+export class Network extends Base {
   #hosts = new Map();
   kind;
+  scope;
+  metric;
   ipv4;
   ipv4_netmask;
   subnet;
@@ -619,12 +640,15 @@ class Network extends Base {
   toJSON() {
     return {
       ...super.toJSON(),
-      kind: this.kind
+      kind: this.kind,
+      ipv4: this.ipv4,
+      scope: this.scope,
+      metric: this.metric
     };
   }
 }
 
-class Subnet extends Base {
+export class Subnet extends Base {
   networks = new Set();
 
   static get typeName() {
@@ -653,7 +677,7 @@ const ServiceTypes = {
   dhcp: {}
 };
 
-class Service extends Base {
+export class Service extends Base {
   alias;
   #weight;
   #priority;
@@ -733,6 +757,13 @@ class Service extends Base {
   }
 }
 
+const _types = Object.fromEntries(
+  [Location, Network, Subnet, Host, /*Model,*/ Service].map(t => [
+    t.typeName,
+    t
+  ])
+);
+
 export async function writeLines(dir, name, lines) {
   await mkdir(dir, { recursive: true });
   return writeFile(