pmcf 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "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;
+  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/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>;