pmcf 1.30.3 → 1.30.5

package/package.json

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

package/src/base.mjs

@@ -191,7 +191,7 @@ export function extractFrom(object, propertyNames) {
 
     if (value !== undefined) {
       if (value instanceof Base && value.name !== undefined) {
-        json[p] = { name: value.name };
+        json[p] = { name: value.name, type: value.typeName };
       } else {
         json[p] = value;
       }

package/src/model.mjs

@@ -112,6 +112,14 @@ export class Location extends Owner {
   get location() {
     return this;
   }
+
+  locationNamed(name) {
+    if (this.fullName === name) {
+      return this;
+    }
+
+    return super.locationNamed(name);
+  }
 }
 
 export class Host extends Base {
@@ -134,10 +142,6 @@ export class Host extends Base {
   }
 
   static async prepareData(root, data) {
-    if (data.location) {
-      data.location = await root.load(data.location, { type: Location });
-    }
-
     if (data.extends) {
       data.extends = await Promise.all(
         asArray(data.extends).map(e => root.load(e, { type: Host }))
@@ -362,7 +366,6 @@ export class Host extends Base {
       "distribution",
       "deployment",
       "master",
-      "location",
       "model",
       "replaces",
       "depends",
@@ -534,5 +537,14 @@ export class NetworkInterface extends Base {
   }
 }
 
-const _types = [Location, Network, Subnet, Host, Cluster, Service, DNSService, NetworkInterface];
+const _types = [
+  Location,
+  Network,
+  Subnet,
+  Host,
+  Cluster,
+  Service,
+  DNSService,
+  NetworkInterface
+];
 const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));

package/src/owner.mjs

@@ -280,6 +280,13 @@ export class Network extends Owner {
     this.bridge = owner.addBridge(this, bridge);
   }
 
+  networkNamed(name) {
+    if (this.fullName === name) {
+      return this;
+    }
+    return super.networkNamed(name);
+  }
+
   get netmask() {
     const m = this.ipv4?.match(/\/(\d+)$/);
     if (m) {