pmcf 1.9.0 → 1.9.2

package/bin/pmcf-location-defs

@@ -62,7 +62,7 @@ async function generateLocationDefs(location, dir) {
   await mkdir(locationDir, { recursive: true });
 
   copyFile(
-    join(world.directory, location.directory, "location.json"),
+    join(location.directory, "location.json"),
     join(locationDir, "location.json")
   );
 }

package/package.json

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

package/src/model.mjs

@@ -572,11 +572,6 @@ export class Host extends Base {
   constructor(owner, data) {
     super(owner, data);
 
-    if (data.model) {
-      this.#isModel = true;
-      delete data.model;
-    }
-
     if (data.location !== undefined) {
       this.#location = data.location;
       delete data.location;
@@ -652,6 +647,14 @@ export class Host extends Base {
     return this.#vendor || this.extends.find(e => e.vendor)?.vendor;
   }
 
+  get isModel() {
+    return (this.#vendor || this.#chassis) ? true : false;
+  }
+
+  get model() {
+    return this.extends.find(h => h.isModel);
+  }
+
   get extends() {
     return this.#extends.map(e => this.expand(e));
   }
@@ -694,14 +697,6 @@ export class Host extends Base {
     return this.#distribution || this.extends.find(e => e.distribution);
   }
 
-  get isModel() {
-    return this.#isModel;
-  }
-
-  get model() {
-    return this.extends.find(h => h.isModel);
-  }
-
   get domain() {
     return this.location?.domain;
   }

package/types/model.d.mts

@@ -97,6 +97,8 @@ export class Host extends Base {
     get deployment(): any;
     get chassis(): any;
     get vendor(): any;
+    get isModel(): boolean;
+    get model(): any;
     get extends(): any[];
     get provides(): Set<any>;
     get replaces(): Set<any>;
@@ -105,8 +107,6 @@ export class Host extends Base {
     get master(): boolean;
     get os(): any;
     get distribution(): any;
-    get isModel(): boolean;
-    get model(): any;
     get domain(): any;
     get modelName(): any;
     get hostName(): any;