pmcf 1.80.1 → 1.81.0

package/package.json

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

package/src/host.mjs

@@ -13,7 +13,8 @@ import {
   normalizeIPAddress,
   formatCIDR,
   hasWellKnownSubnet,
-  domainFromDominName
+  domainFromDominName,
+  domainName
 } from "./utils.mjs";
 import { objectFilter } from "./filter.mjs";
 import { addType, types } from "./types.mjs";
@@ -260,13 +261,13 @@ export class Host extends Base {
   }
 
   get domainNames() {
-    return [this.domainName, ...this.aliases];
+    return [this.hostName, ...this.aliases].map(n =>
+      domainName(n, this.domain)
+    );
   }
 
   get domainName() {
-    const domain = this.domain;
-    const hostName = this.hostName;
-    return domain ? hostName + "." + domain : hostName;
+    return domainName(this.hostName, this.domain);
   }
 
   domainNameIn(domain) {

package/src/owner.mjs

@@ -382,7 +382,6 @@ export class Owner extends Base {
     return this.#domain || this.owner?.domain;
   }
 
-
   get domains() {
     let domains = new Set();
 
@@ -408,4 +407,14 @@ export class Owner extends Base {
     return domains;
   }
 */
+
+  get domainNames() {
+    let names = new Set();
+
+    for (const host of this.hosts()) {
+      names = names.union(new Set(host.domainNames));
+    }
+
+    return names;
+  }
 }

package/src/utils.mjs

@@ -1,6 +1,13 @@
 import { writeFile, mkdir } from "node:fs/promises";
 import { join, dirname, basename } from "node:path";
 
+export function domainName(name, defaultDomain) {
+  const dcs = name.split(".");
+  return defaultDomain === undefined || dcs.length > 1
+    ? name
+    : [name, defaultDomain].join(".");
+}
+
 export function domainFromDominName(domainName, defaultDomain) {
   const dcs = domainName.split(".");
 

package/types/host.d.mts

@@ -187,7 +187,7 @@ export class Host extends Base {
     get hostName(): string;
     get domains(): Set<any>;
     get domainNames(): any[];
-    get domainName(): string;
+    get domainName(): any;
     domainNameIn(domain: any): any;
     get host(): this;
     named(name: any): any;

package/types/owner.d.mts

@@ -237,6 +237,7 @@ export class Owner extends Base {
     get domain(): any;
     get domains(): Set<any>;
     get localDomains(): Set<any>;
+    get domainNames(): Set<any>;
     #private;
 }
 import { Base } from "./base.mjs";

package/types/utils.d.mts

@@ -1,3 +1,4 @@
+export function domainName(name: any, defaultDomain: any): any;
 export function domainFromDominName(domainName: any, defaultDomain: any): any;
 export function writeLines(dir: any, name: any, lines: any): Promise<void>;
 export function sectionLines(sectionName: any, values: any): string[];