pmcf 3.19.4 → 3.19.6

package/package.json

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

package/src/host.mjs

@@ -305,7 +305,7 @@ export class Host extends ServiceOwner {
 
   get hostName() {
     const parts = this.name.split(/\//);
-    return parts[parts.length - 1];
+    return parts[parts.length - 1].toLowerCase();
   }
 
   get foreignDomainNames() {
@@ -498,7 +498,7 @@ export class Host extends ServiceOwner {
     for (const service of this.services) {
       if (service.systemdConfigs) {
         for (const { serviceName, configFileName, content } of asArray(
-          service.systemdConfigs(this.name)
+          service.expand(service.systemdConfigs(this.name))
         )) {
           await writeLines(dir, configFileName, sectionLines(...content));
 

package/src/service.mjs

@@ -89,6 +89,14 @@ export class Service extends Base {
     return ServiceTypeDefinition;
   }
 
+  get isTemplate() {
+    // TODO
+    if (this.fullName.startsWith("/services")) {
+      return true;
+    }
+    return super.isTemplate;
+  }
+
   toString() {
     return `${super.toString()}[${this.type}]`;
   }

package/src/utils.mjs

@@ -5,6 +5,12 @@ export function yesno(flag) {
   return flag ? "yes" : "no";
 }
 
+/**
+ * Appends default domain if name does not already have a domain.
+ * @param {string} name 
+ * @param {string} [defaultDomain] 
+ * @returns {string|undefined}
+ */
 export function domainName(name, defaultDomain) {
   const dcs = name.split(".");
   return defaultDomain === undefined || dcs.length > 1
@@ -12,6 +18,12 @@ export function domainName(name, defaultDomain) {
     : [name, defaultDomain].join(".");
 }
 
+/**
+ * Extracts domain name from a name.
+ * @param {string} domainName 
+ * @param {string} [defaultDomain]
+ * @returns {string|undefined}
+ */
 export function domainFromDominName(domainName, defaultDomain) {
   const dcs = domainName.split(".");
 

package/types/host.d.mts

@@ -231,12 +231,12 @@ export class Host extends ServiceOwner {
     get modelName(): any;
     get hostName(): string;
     get foreignDomainNames(): any[];
-    get foreignDomains(): Set<any>;
+    get foreignDomains(): Set<string>;
     get domains(): Set<any>;
-    get directDomainNames(): Set<any>;
-    get domainNames(): Set<any>;
-    get domainName(): any;
-    domainNamesIn(domain: any): Generator<any, void, unknown>;
+    get directDomainNames(): Set<string>;
+    get domainNames(): Set<string>;
+    get domainName(): string;
+    domainNamesIn(domain: any): Generator<string, void, unknown>;
     get clusters(): Set<any>;
     get host(): this;
     hosts(): Generator<this, void, unknown>;

package/types/network-address.d.mts

@@ -31,7 +31,7 @@ export class NetworkAddress {
     /** @type {Subnet} */ subnet: Subnet;
     /** @type {NetworkInterface} */ networkInterface: NetworkInterface;
     /** @type {string|Uint8Array|Uint16Array} */ address: string | Uint8Array | Uint16Array;
-    get domainNames(): Set<any>;
+    get domainNames(): Set<string>;
     get family(): any;
     get cidrAddress(): any;
     toString(): string;

package/types/network-interfaces/network-interface.d.mts

@@ -1006,6 +1006,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     get gatewayAddress(): any;
     set hostName(value: any);
     get hostName(): any;
+    get domainNames(): Set<string>;
     set scope(value: any);
     get scope(): any;
     set hwaddr(value: any);

package/types/network-interfaces/skeleton.d.mts

@@ -10,7 +10,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     get host(): Host;
     hosts(): Generator<Host, void, unknown>;
     get network_interface(): this;
-    get domainName(): any;
+    get domainName(): string;
     get domainNames(): Set<any>;
     matches(other: any): boolean;
     set network(network: any);

package/types/service.d.mts

@@ -588,7 +588,7 @@ export class Service extends Base {
     _systemd: any;
     get host(): Host;
     hosts(): Generator<any, void, any>;
-    get domainName(): any;
+    get domainName(): string;
     get networks(): Set<any>;
     get subnets(): Set<any>;
     get serviceTypeEndpoints(): any;

package/types/utils.d.mts

@@ -1,6 +1,18 @@
 export function yesno(flag: any): "yes" | "no";
-export function domainName(name: any, defaultDomain: any): any;
-export function domainFromDominName(domainName: any, defaultDomain: any): any;
+/**
+ * Appends default domain if name does not already have a domain.
+ * @param {string} name
+ * @param {string} [defaultDomain]
+ * @returns {string|undefined}
+ */
+export function domainName(name: string, defaultDomain?: string): string | undefined;
+/**
+ * Extracts domain name from a name.
+ * @param {string} domainName
+ * @param {string} [defaultDomain]
+ * @returns {string|undefined}
+ */
+export function domainFromDominName(domainName: string, defaultDomain?: string): string | undefined;
 export function writeLines(dir: any, name: any, lines: any): Promise<void>;
 /**
  *