pmcf 1.0.2 → 1.2.0

package/package.json

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

package/src/model.mjs

@@ -4,6 +4,7 @@ import { join } from "node:path";
 export class Base {
   owner;
   name;
+  description;
 
   static get typeName() {
     return "base";
@@ -17,6 +18,10 @@ export class Base {
     return "**/" + this.typeFileName;
   }
 
+  static refinedType(data) {
+    return this;
+  }
+
   static baseName(name) {
     if (!name) {
       return undefined;
@@ -31,8 +36,14 @@ export 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;
+      }
     }
   }
 
@@ -54,6 +65,15 @@ export class Base {
     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) => {
@@ -79,7 +99,9 @@ export class Base {
   toJSON() {
     return {
       name: this.name,
-      owner: this.owner.name
+      directory: this.directory,
+      owner: this.owner.name,
+      description: this.description
     };
   }
 }
@@ -92,7 +114,6 @@ export class World {
   directory;
   #byName = new Map();
 
-  /** @typedef {Map<string,Location>} */ #locations = new Map();
   /** @typedef {Map<string,Host>} */ #hosts = new Map();
 
   constructor(directory) {
@@ -104,7 +125,7 @@ export class World {
   }
 
   async load() {
-    for (const type of Object.values(World.types)) {
+    for (let type of Object.values(World.types)) {
       for await (const name of glob(type.fileNameGlob, {
         cwd: this.directory
       })) {
@@ -114,8 +135,12 @@ export class World {
             await readFile(join(this.directory, name), "utf8")
           );
 
-          data.directory = baseName;
           data.name = baseName;
+
+          const t2 = type.refinedType(data);
+          if (t2) {
+            type = t2;
+          }
           const object = new type(this, data);
           this.#byName.set(data.name, object);
         }
@@ -124,34 +149,27 @@ export class World {
   }
 
   async named(name) {
+    await this.load();
     return this.#byName.get(name);
   }
 
   async *locations() {
-    if (this.#locations.size > 0) {
-      for (const location of this.#locations.values()) {
-        yield location;
-      }
-    }
+    await this.load();
 
-    for await (const name of glob(Location.fileNameGlob, {
-      cwd: this.directory
-    })) {
-      yield this.location(name);
+    for (const object of this.#byName.values()) {
+      if (object instanceof Location) {
+        yield object;
+      }
     }
   }
 
   async *hosts() {
-    if (this.#hosts.size > 0) {
-      for (const host of this.#hosts.values()) {
-        yield host;
-      }
-    }
+    await this.load();
 
-    for await (const name of glob(Host.fileNameGlob, {
-      cwd: this.directory
-    })) {
-      yield this.host(name);
+    for (const object of this.#byName.values()) {
+      if (object instanceof Host) {
+        yield object;
+      }
     }
   }
 
@@ -162,49 +180,14 @@ 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.directory, 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;
+    await this.load();
+    return this.#byName.get(Location.baseName(name));
   }
 
   async host(name) {
-    name = Host.baseName(name);
-
-    if (name === undefined) {
-      return undefined;
-    }
-
-    let host = this.#hosts.get(name);
-    if (host) {
-      return host;
-    }
-
-    const directory = join(this.directory, name);
-    const data = JSON.parse(
-      await readFile(join(directory, Host.typeFileName), "utf8")
-    );
-
-    data.directory = directory;
+    await this.load();
+    return this.#byName.get(Host.baseName(name));
+    /*
 
     if (!data.name) {
       data.name = name;
@@ -225,11 +208,7 @@ export class World {
     if (data.extends) {
       data.extends = await Promise.all(data.extends.map(e => this.host(e)));
     }
-
-    host = new (data.name.indexOf("model/") >= 0 ? Model : Host)(this, data);
-
-    this.#hosts.set(name, host);
-    return host;
+    */
   }
 
   async *subnets() {
@@ -248,7 +227,6 @@ export class World {
 }
 
 export class Host extends Base {
-  directory;
   networkInterfaces = {};
   services = {};
   postinstall = [];
@@ -266,6 +244,14 @@ export class Host extends Base {
     return "host";
   }
 
+  static refinedType(data) {
+    if (data.name?.indexOf("model/") >= 0) {
+      return Model;
+    }
+
+    return this;
+  }
+
   constructor(owner, data) {
     super(owner, data);
 
@@ -413,7 +399,6 @@ export class Host extends Base {
       ...super.toJSON(),
       ...Object.fromEntries(
         [
-          "directory",
           "location",
           "model",
           "os",
@@ -438,7 +423,6 @@ export class Host extends Base {
 export class Model extends Host {}
 
 export class Location extends Base {
-  directory;
   domain;
   dns;
   #administratorEmail;
@@ -608,6 +592,8 @@ export class Location extends Base {
 export class Network extends Base {
   #hosts = new Map();
   kind;
+  scope;
+  metric;
   ipv4;
   ipv4_netmask;
   subnet;
@@ -650,7 +636,10 @@ export class Network extends Base {
   toJSON() {
     return {
       ...super.toJSON(),
-      kind: this.kind
+      kind: this.kind,
+      ipv4: this.ipv4,
+      scope: this.scope,
+      metric: this.metric
     };
   }
 }