pmcf 1.2.2 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -23,21 +23,21 @@
   "license": "0BSD",
   "bin": {
     "pmcf-host-defs": "./bin/pmcf-host-defs",
+    "pmcf-info": "./bin/pmcf-info",
     "pmcf-location-defs": "./bin/pmcf-location-defs",
     "pmcf-named-defs": "./bin/pmcf-named-defs",
-    "pmcf-info": "./bin/pmcf-info",
     "pmcf-network": "./bin/pmcf-network"
   },
   "scripts": {
     "prepare": "node --run prepare:typescript",
-    "prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target es2024 --lib es2024 -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
+    "prepare:typescript": "tsc --allowJs --declaration --emitDeclarationOnly --declarationDir types --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext --rootDir src ./src**/*.mjs",
     "test": "node --run test:ava",
     "test:ava": "ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs",
     "cover": "c8 -x 'tests/**/*' --temp-directory build/tmp ava --timeout 4m tests/*-ava.mjs tests/*-ava-node.mjs && c8 report -r lcov -o build/coverage --temp-directory build/tmp",
     "docs": "documentation readme --section=API ./src**/*.mjs",
     "lint": "node --run lint:docs && node --run lint:typescript",
     "lint:docs": "documentation lint ./src**/*.mjs",
-    "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib es2024 -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
+    "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "devDependencies": {
     "@types/node": "^22.10.7",

package/src/model.mjs

@@ -96,13 +96,12 @@ export class Base {
     return this.typeName + ":" + this.owner.name + "/" + this.name;
   }
 
+  get propertyNames() {
+    return ["name", "description", "directory", "owner"];
+  }
+
   toJSON() {
-    return {
-      name: this.name,
-      directory: this.directory,
-      owner: this.owner.name,
-      description: this.description
-    };
+    return extractFrom(this, this.propertyNames);
   }
 }
 
@@ -388,24 +387,24 @@ export class Host extends Base {
     return readFile(join(this.directory, `ssh_host_${type}_key.pub`), "utf8");
   }
 
+  get propertyNames() {
+    return [
+      ...super.propertyNames,
+      "os",
+      "distribution",
+      "deployment",
+      "master",
+      "location",
+      "model",
+      "replaces",
+      "depends",
+      "networkInterfaces"
+    ];
+  }
+
   toJSON() {
     return {
       ...super.toJSON(),
-      ...Object.fromEntries(
-        [
-          "location",
-          "model",
-          "os",
-          "distribution",
-          "deployment",
-          "replaces",
-          "depends",
-          "master",
-          "networkInterfaces"
-        ]
-          .filter(p => this[p])
-          .map(p => [p, this[p]])
-      ),
       extends: this.extends.map(host => host.name),
       services: Object.fromEntries(
         Object.values(this.services).map(s => [s.name, s.toJSON()])
@@ -574,10 +573,13 @@ export class Location extends Base {
     return this.#administratorEmail || "admin@" + this.domain;
   }
 
+  get propertyNames() {
+    return [...super.propertyNames, "domain"];
+  }
+
   toJSON() {
     return {
       ...super.toJSON(),
-      domain: this.domain,
       hosts: [...this.#hosts.keys()].sort()
     };
   }
@@ -627,14 +629,8 @@ export class Network extends Base {
     this.#hosts.set(host.name, host);
   }
 
-  toJSON() {
-    return {
-      ...super.toJSON(),
-      kind: this.kind,
-      ipv4: this.ipv4,
-      scope: this.scope,
-      metric: this.metric
-    };
+  get propertyNames() {
+    return [...super.propertyNames, "kind", "ipv4", "scope", "metric"];
   }
 }
 
@@ -734,16 +730,16 @@ export class Service extends Base {
     return this.#type || this.name;
   }
 
-  toJSON() {
-    return {
-      ...super.toJSON(),
-      ipAddress: this.ipAddress,
-      alias: this.alias,
-      type: this.type,
-      master: this.master,
-      priority: this.priority,
-      weight: this.weight
-    };
+  get propertyNames() {
+    return [
+      ...super.propertyNames,
+      "ipAddress",
+      "alias",
+      "type",
+      "master",
+      "priority",
+      "weight"
+    ];
   }
 }
 
@@ -776,3 +772,14 @@ export function sectionLines(sectionName, values) {
 
   return lines;
 }
+
+function extractFrom(object, propertyNames) {
+  const json = {};
+  for (const p of propertyNames) {
+    const value = object[p];
+    if (value !== undefined) {
+      json[p] = value;
+    }
+  }
+  return json;
+}

package/types/model.d.mts

@@ -17,12 +17,8 @@ export class Base {
     get directory(): any;
     expand(object: any): any;
     toString(): string;
-    toJSON(): {
-        name: any;
-        directory: any;
-        owner: any;
-        description: any;
-    };
+    get propertyNames(): string[];
+    toJSON(): {};
     #private;
 }
 export class World {
@@ -75,10 +71,6 @@ export class Host extends Base {
     toJSON(): {
         extends: any[];
         services: any;
-        name: any;
-        directory: any;
-        owner: any;
-        description: any;
     };
     #private;
 }
@@ -101,12 +93,7 @@ export class Location extends Base {
     get dnsRecordTTL(): any;
     get administratorEmail(): any;
     toJSON(): {
-        domain: any;
         hosts: any[];
-        name: any;
-        directory: any;
-        owner: any;
-        description: any;
     };
     #private;
 }
@@ -120,16 +107,6 @@ export class Network extends Base {
     get subnetAddress(): any;
     hosts(): AsyncGenerator<any, void, unknown>;
     addHost(host: any): void;
-    toJSON(): {
-        kind: any;
-        ipv4: any;
-        scope: any;
-        metric: any;
-        name: any;
-        directory: any;
-        owner: any;
-        description: any;
-    };
     #private;
 }
 export class Subnet extends Base {
@@ -145,17 +122,5 @@ export class Service extends Base {
     get weight(): any;
     get master(): any;
     get type(): any;
-    toJSON(): {
-        ipAddress: any;
-        alias: any;
-        type: any;
-        master: any;
-        priority: any;
-        weight: any;
-        name: any;
-        directory: any;
-        owner: any;
-        description: any;
-    };
     #private;
 }