pmcf 4.15.12 → 4.15.14

package/package.json

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

package/src/base.mjs

@@ -7,6 +7,7 @@ import {
 import { FileContentProvider } from "npm-pkgbuild";
 import {
   getAttribute,
+  toInternal,
   typeFactory,
   addType,
   parse,
@@ -114,6 +115,7 @@ export class Base {
     }
 
     const assign = (name, attribute, value) => {
+      value = toInternal(value, attribute);
       value ??= attribute.default;
 
       if (value !== undefined) {
@@ -132,7 +134,11 @@ export class Base {
               break;
             case "object":
               if (Array.isArray(current)) {
-                current.push(value);
+                if (Array.isArray(value)) {
+                  current.push(...value);
+                } else {
+                  current.push(value);
+                }
               } else {
                 if (current instanceof Set) {
                   // TODO
@@ -370,8 +376,8 @@ export class Base {
   }
 
   /**
-   * 
-   * @param {string} name 
+   *
+   * @param {string} name
    * @returns {any}
    */
   extendedAttribute(name) {
@@ -548,8 +554,7 @@ export class Base {
 
   async *preparePackages(stagingDir) {}
 
-  get templateTransformers()
-  {
+  get templateTransformers() {
     return [
       createExpressionTransformer(
         e => e.isBlob,

package/src/host.mjs

@@ -17,7 +17,8 @@ import {
   domainFromDominName,
   domainName,
   writeLines,
-  asArray
+  asArray,
+  union
 } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";
 import { generateKnownHosts } from "./host-utils.mjs";
@@ -203,11 +204,7 @@ export class Host extends ServiceOwner {
   }
 
   set aliases(value) {
-    if (value instanceof Set) {
-      this._aliases = this._aliases.union(value);
-    } else {
-      this._aliases.add(value);
-    }
+    this._aliases = union(value, this._aliases);
   }
 
   get aliases() {
@@ -215,11 +212,7 @@ export class Host extends ServiceOwner {
   }
 
   set provides(value) {
-    if (value instanceof Set) {
-      this._provides = this._provides.union(value);
-    } else {
-      this._provides.add(value);
-    }
+    this._provides = union(value, this._provides);
   }
 
   get provides() {
@@ -229,11 +222,7 @@ export class Host extends ServiceOwner {
   }
 
   set replaces(value) {
-    if (value instanceof Set) {
-      this._replaces = this._replaces.union(value);
-    } else {
-      this._replaces.add(value);
-    }
+    this._replaces = union(value, this._replaces);
   }
 
   get replaces() {
@@ -243,11 +232,7 @@ export class Host extends ServiceOwner {
   }
 
   set depends(value) {
-    if (value instanceof Set) {
-      this._depends = this._depends.union(value);
-    } else {
-      this._depends.add(value);
-    }
+    this._depends = union(value, this._depends);
   }
 
   get depends() {
@@ -460,7 +445,7 @@ export class Host extends ServiceOwner {
     );
 
     for (const ni of this.networkInterfaces.values()) {
-      await ni.systemdDefinitions(packageData);
+      await ni.systemdDefinitions(dir, packageData);
     }
 
     if (this.keymap) {
@@ -506,3 +491,4 @@ export class Host extends ServiceOwner {
     }
   }
 }
+

package/src/location.mjs

@@ -1,5 +1,5 @@
 import { FileContentProvider } from "npm-pkgbuild";
-import { string_collection_attribute_writable, addType } from "pacc";
+import { addType } from "pacc";
 import { Owner } from "pmcf";
 import { loadHooks } from "./hooks.mjs";
 
@@ -9,7 +9,6 @@ const LocationTypeDefinition = {
   extends: Owner.typeDefinition,
   key: "name",
   attributes: {
-    locales: string_collection_attribute_writable
   }
 };
 

package/src/network-interfaces/network-interface.mjs

@@ -197,10 +197,10 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     return this.extendedAttribute("_kind") ?? this.network?.kind;
   }
 
-  async systemdDefinitions(packageData) {
-    await super.systemdDefinitions(packageData);
+  async systemdDefinitions(dir, packageData) {
+    await super.systemdDefinitions(dir, packageData);
 
-    const networkDir = join(packageData.dir, "etc/systemd/network");
+    const networkDir = join(dir, "etc/systemd/network");
 
     if (this.name !== "eth0" && this.hwaddr) {
       const disabled = {};

package/src/network-interfaces/skeleton.mjs

@@ -96,8 +96,8 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     return [...this.ipAddresses].map(([address]) => address);
   }
 
-  async systemdDefinitions(packageData) {
-    const networkDir = join(packageData.dir, "etc/systemd/network");
+  async systemdDefinitions(dir) {
+    const networkDir = join(dir, "etc/systemd/network");
 
     if (this.name !== "eth0" && this.hwaddr) {
       await writeLines(networkDir, `${this.name}.link`, [

package/src/network-interfaces/tun.mjs

@@ -23,5 +23,5 @@ export class TUNNetworkInterface extends NetworkInterface {
     return TUNdNetworkInterfaceTypeDefinition.name;
   }
 
-  async systemdDefinitions(packageData) {}
+  async systemdDefinitions(dir, packageData) {}
 }

package/src/network-interfaces/wlan.mjs

@@ -74,20 +74,20 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
     return this.extendedAttribute("_psk") ?? this.network?.psk;
   }
 
-  async systemdDefinitions(packageData) {
-    await super.systemdDefinitions(packageData);
-    await mkdir(join(packageData.dir, "var/lib/iwd/"), { recursive: true });
+  async systemdDefinitions(dir, packageData) {
+    await super.systemdDefinitions(dir, packageData);
+    await mkdir(join(dir, "var/lib/iwd/"), { recursive: true });
 
     const secretName = this.secretName;
 
-    await writeLines(join(packageData.dir, "/etc/iwd"), "main.conf", [
+    await writeLines(join(dir, "/etc/iwd"), "main.conf", [
       sectionLines("General", {
         SystemdEncrypt: secretName
       })
     ]);
 
     await writeLines(
-      join(packageData.dir, "usr/lib/systemd/system/iwd.service.d/"),
+      join(dir, "usr/lib/systemd/system/iwd.service.d/"),
       "pmcf.conf",
       [
         sectionLines("Service", {

package/src/owner.mjs

@@ -8,7 +8,7 @@ import {
   addType,
   types
 } from "pacc";
-import { asIterator } from "./utils.mjs";
+import { asIterator, union } from "./utils.mjs";
 import { Base } from "./base.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import { networks_attribute } from "./network-support.mjs";
@@ -364,11 +364,7 @@ export class Owner extends Base {
   _locales = new Set();
 
   set locales(value) {
-    if (value instanceof Set) {
-      this._locales = this._locales.union(value);
-    } else {
-      this._locales.add(value);
-    }
+    this._locales = union(value, this._locales);
   }
 
   get locales() {
@@ -443,13 +439,7 @@ export class Owner extends Base {
   _architectures;
 
   set architectures(value) {
-    if (value instanceof Set) {
-      this._architectures = this._architectures
-        ? this._architectures.union(value)
-        : value;
-    } else {
-      this._architectures = new Set(value);
-    }
+    this._architectures = union(value, this._architectures);
   }
 
   get architectures() {

package/src/services/bind.mjs

@@ -328,12 +328,14 @@ export class BindService extends ExtraSourceService {
       access: "private"
     };
 
-    yield this.generateZoneDefs(newOutputControl(packageData), sources);
+    yield this.generateZoneDefs(newOutputControl(packageData, zonesPackageDir), sources);
 
     const location = "outfacing";
 
+    const outfacingZonesPackageDir = join(dir, location) + "/";
+
     packageData.sources = [
-      new FileContentProvider(join(dir, location) + "/", ...filePermissions)
+      new FileContentProvider(outfacingZonesPackageDir, ...filePermissions)
     ];
     packageData.properties = {
       name: `named-zones-${name}-${location}`,
@@ -341,7 +343,7 @@ export class BindService extends ExtraSourceService {
       access: "private"
     };
 
-    yield* this.generateOutfacingDefs(newOutputControl(packageData), sources);
+    yield* this.generateOutfacingDefs(newOutputControl(packageData, outfacingZonesPackageDir), sources);
   }
 
   async *generateOutfacingDefs(outputControl, sources) {
@@ -366,7 +368,7 @@ export class BindService extends ExtraSourceService {
           .join(" ")}`
       );
 
-      await this.writeZones(outputControl.packageData, outputControl.configs);
+      await this.writeZones(outputControl);
 
       yield outputControl.packageData;
     }
@@ -511,7 +513,7 @@ export class BindService extends ExtraSourceService {
       }
     }
 
-    await this.writeZones(outputControl.packageData, outputControl.configs);
+    await this.writeZones(outputControl);
 
     return outputControl.packageData;
   }
@@ -617,8 +619,8 @@ export class BindService extends ExtraSourceService {
     return [SOARecord, NSRecord];
   }
 
-  async writeZones(packageData, configs) {
-    for (const config of configs) {
+  async writeZones(outputControl) {
+    for (const config of outputControl.configs) {
       console.log(`config: ${config.view.name}/${config.name}`);
 
       const content = [];
@@ -652,7 +654,7 @@ export class BindService extends ExtraSourceService {
         }
 
         await writeLines(
-          join(packageData.dir, "var/lib/named"),
+          join(outputControl.dir, "var/lib/named"),
           zone.file,
           [...zone.records]
             .sort(sortZoneRecords)
@@ -661,7 +663,7 @@ export class BindService extends ExtraSourceService {
       }
 
       await writeLines(
-        join(packageData.dir, `etc/named/${config.view.name}`),
+        join(outputControl.dir, `etc/named/${config.view.name}`),
         config.name,
         content
       );
@@ -669,6 +671,6 @@ export class BindService extends ExtraSourceService {
   }
 }
 
-function newOutputControl(packageData) {
-  return { configs: [], catalogs: new Map(), packageData };
+function newOutputControl(packageData, dir) {
+  return { configs: [], catalogs: new Map(), packageData, dir };
 }

package/src/services/systemd-resolved.mjs

@@ -93,7 +93,7 @@ export class SystemdResolvedService extends ExtraSourceService {
         services: `in("dns",types) && priority>=${lower} && priority<=${upper}`,
         endpoints: e =>
           e.family == "IPv4" &&
-         // e.networkInterface &&
+          e.networkInterface &&
           e.networkInterface.kind !== "loopback",
           //e.family !== "dns",
         select: endpoint => endpoint.address,

package/src/utils.mjs

@@ -120,3 +120,14 @@ export function asIterator(value) {
 
 export const filterConfigurable = (name, attribute) =>
   !attribute.private & attribute.configurable;
+
+
+export function union(value, present= new Set()) {
+  if (value instanceof Set) {
+    return present.union(value);
+  } else if (value instanceof Array) {
+    return present.union(new Set(value));
+  }
+  present.add(value);
+  return present;
+}

package/types/location.d.mts

@@ -344,9 +344,7 @@ export class Location extends Owner {
             };
         };
         key: string;
-        attributes: {
-            locales: import("pacc").AttributeDefinition;
-        };
+        attributes: {};
     };
     get location(): this;
     preparePackages(dir: any): AsyncGenerator<{

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

@@ -1106,6 +1106,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     get class(): any;
     set kind(value: any);
     get kind(): any;
+    systemdDefinitions(dir: any, packageData: any): Promise<void>;
 }
 import { Base } from "pmcf";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";

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

@@ -23,7 +23,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     networkAddress(filter: any): NetworkAddress;
     get address(): any;
     get addresses(): any[];
-    systemdDefinitions(packageData: any): Promise<void>;
+    systemdDefinitions(dir: any): Promise<void>;
 }
 import { ServiceOwner } from "../service-owner.mjs";
 import { Host } from "pmcf";

package/types/services/bind.d.mts

@@ -1512,6 +1512,6 @@ export class BindService extends ExtraSourceService {
         values: any[];
         toString: (maxKeyLength?: number, ttl?: string) => string;
     }[];
-    writeZones(packageData: any, configs: any): Promise<void>;
+    writeZones(outputControl: any): Promise<void>;
 }
 import { ExtraSourceService } from "pmcf";

package/types/utils.d.mts

@@ -33,4 +33,5 @@ export function asArray(value: any): Array<any>;
  * @returns {Iterable<any>}
  */
 export function asIterator(value: any): Iterable<any>;
+export function union(value: any, present?: Set<any>): Set<any>;
 export function filterConfigurable(name: any, attribute: any): number;