pmcf 1.13.0 → 1.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.13.0",
+  "version": "1.15.0",
   "publishConfig": {
     "access": "public"
   },
@@ -64,5 +64,8 @@
       "arlac77/template-node-app",
       "arlac77/template-typescript"
     ]
+  },
+  "dependencies": {
+    "pacc": "^3.1.9"
   }
 }

package/src/model.mjs

@@ -1,5 +1,6 @@
 import { readFile, writeFile, mkdir, glob } from "node:fs/promises";
 import { join } from "node:path";
+import { getAttribute } from "pacc";
 
 export class Base {
   owner;
@@ -89,18 +90,24 @@ export class Base {
   }
 
   expand(object) {
-    if (typeof object === "string") {
-      return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
-        return this[m1] || "${" + m1 + "}";
-      });
-    }
+    switch (typeof object) {
+      case "string":
+        return object.replaceAll(/\$\{([^\}]*)\}/g, (match, m1) => {
+          return getAttribute(this, m1) || "${" + m1 + "}";
+        });
+
+      case "object":
+        if (Array.isArray(object)) {
+          return object.map(e => this.expand(e));
+        }
 
-    if (Array.isArray(object)) {
-      return object.map(e => this.expand(e));
-    }
+        if (object instanceof Set) {
+          return new Set([...object].map(e => this.expand(e)));
+        }
 
-    if (object instanceof Set) {
-      return new Set([...object].map(e => this.expand(e)));
+        /*return Object.fromEntries(
+          Object.entries(object).map(([k, v]) => [k, this.expand(v)])
+        );*/
     }
 
     return object;
@@ -413,15 +420,13 @@ export class World extends Owner {
   }
 }
 
-class DNSService {
-  owner;
-
+class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
   forwardsTo = [];
 
   constructor(owner, data) {
-    this.owner = owner;
+    super(owner, data);
     Object.assign(this, data);
   }
 
@@ -435,6 +440,10 @@ class DNSService {
       yield* owner.services(filter);
     }
   }
+
+  get propertyNames() {
+    return ["recordTTL", "forwardsTo", "allowedUpdates"];
+  }
 }
 
 export class Location extends Owner {
@@ -494,7 +503,7 @@ export class Location extends Owner {
   }
 
   get propertyNames() {
-    return [...super.propertyNames, "domain" /*, "hosts"*/];
+    return [...super.propertyNames, "domain", "administratorEmail", "dns"];
   }
 }
 
@@ -780,6 +789,10 @@ export class Host extends Base {
     }
   }
 
+  get ipAddresses() {
+    return [...this.networkAddresses()].map(na => na.address);
+  }
+
   get ipAddress() {
     for (const a of this.networkAddresses()) {
       return a.address;
@@ -882,7 +895,7 @@ export class Service extends Base {
   #priority;
   #type;
   #port;
-  #ipAddress;
+  #ipAddresses;
 
   static get typeName() {
     return "service";
@@ -906,9 +919,9 @@ export class Service extends Base {
       this.#port = data.port;
       delete data.port;
     }
-    if (data.ipAddress) {
-      this.#ipAddress = data.ipAddress;
-      delete data.ipAddress;
+    if (data.ipAddresses) {
+      this.#ipAddresses = data.ipAddresses;
+      delete data.ipAddresses;
     }
 
     Object.assign(this, data);
@@ -933,8 +946,8 @@ export class Service extends Base {
       if (this.#port) {
         data.port = this.#port;
       }
-      if (this.#ipAddress) {
-        data.ipAddress = this.#ipAddress;
+      if (this.#ipAddresses) {
+        data.ipAddresses = this.#ipAddresses;
       }
       return new this.constructor(owner, data);
     }
@@ -953,8 +966,8 @@ export class Service extends Base {
     }
   }
 
-  get ipAddress() {
-    return this.#ipAddress || this.owner.ipAddress;
+  get ipAddresses() {
+    return this.#ipAddresses || this.owner.ipAddresses;
   }
 
   get port() {
@@ -980,7 +993,7 @@ export class Service extends Base {
   get propertyNames() {
     return [
       ...super.propertyNames,
-      "ipAddress",
+      "ipAddresses",
       "port",
       "protocol",
       "alias",

package/types/model.d.mts

@@ -119,6 +119,7 @@ export class Host extends Base {
         address: any;
         networkInterface: any;
     }, void, unknown>;
+    get ipAddresses(): any[];
     get ipAddress(): any;
     publicKey(type?: string): Promise<string>;
     toJSON(): {
@@ -137,7 +138,7 @@ export class Service extends Base {
     alias: any;
     get protocol(): any;
     get srvPrefix(): string;
-    get ipAddress(): any;
+    get ipAddresses(): any;
     get port(): any;
     get priority(): any;
     get weight(): any;
@@ -145,9 +146,7 @@ export class Service extends Base {
     get type(): any;
     #private;
 }
-declare class DNSService {
-    constructor(owner: any, data: any);
-    owner: any;
+declare class DNSService extends Base {
     allowedUpdates: any[];
     recordTTL: string;
     forwardsTo: any[];