pmcf 1.82.0 → 1.83.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.82.0",
+  "version": "1.83.0",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "dependencies": {
-    "npm-pkgbuild": "^17.4.0",
+    "npm-pkgbuild": "^17.5.1",
     "pacc": "^3.3.0",
     "pkg-dir": "^8.0.0"
   },

package/src/dns.mjs

@@ -168,11 +168,19 @@ export class DNSService extends Base {
     };
 
     result.sources = [
-      new FileContentProvider(p2 + "/", {
-        mode: 0o644,
-        owner: "named",
-        group: "named"
-      })[Symbol.asyncIterator]()
+      new FileContentProvider(
+        p2 + "/",
+        {
+          mode: 0o644,
+          owner: "named",
+          group: "named"
+        },
+        {
+          mode: 0o755,
+          owner: "named",
+          group: "named"
+        }
+      )[Symbol.asyncIterator]()
     ];
 
     await generateZoneDefs(this, p2);

package/src/host.mjs

@@ -47,6 +47,7 @@ const HostTypeDefinition = {
     serial: { type: "string", collection: false, writeable: true },
     vendor: { type: "string", collection: false, writeable: true },
     chassis: { type: "string", collection: false, writeable: true },
+    architecture: { type: "string", collection: false, writeable: true },
     priority: { type: "number", collection: false, writeable: true },
     replaces: { type: "string", collection: true, writeable: true },
     depends: { type: "string", collection: true, writeable: true },
@@ -73,6 +74,7 @@ export class Host extends Base {
   #deployment;
   #chassis;
   #vendor;
+  #architecture;
 
   static {
     addType(this);
@@ -149,6 +151,14 @@ export class Host extends Base {
     return this.#vendor || this.extends.find(e => e.vendor)?.vendor;
   }
 
+  set architecture(value) {
+    this.#architecture = value;
+  }
+
+  get architecture() {
+    return this.#architecture || this.extends.find(e => e.architecture)?.architecture;
+  }
+
   get derivedPackaging() {
     return this.extends.reduce((a, c) => a.union(c.packaging), new Set());
   }

package/src/owner.mjs

@@ -30,6 +30,7 @@ const OwnerTypeDefinition = {
     domain: { type: "string", collection: false, writeable: true },
     domains: { type: "string", collection: true, writeable: true },
     timezone: { type: "string", collection: false, writeable: true },
+    architectures: { type: "string", collection: true, writeable: true },
     locales: { type: "string", collection: true, writeable: true },
     administratorEmail: { type: "string", collection: false, writeable: true }
   }
@@ -396,25 +397,38 @@ export class Owner extends Base {
     return this.domain ? new Set([this.domain]) : new Set();
   }
 
-  /*
-  get localDomains() {
-    let domains = new Set();
+  get domainNames() {
+    let names = new Set();
 
-    for (const object of this.hosts()) {
-      domains = domains.union(object.localDomains);
+    for (const host of this.hosts()) {
+      names = names.union(new Set(host.domainNames));
     }
 
-    return domains;
+    return names;
   }
-*/
 
-  get domainNames() {
-    let names = new Set();
+  #architectures;
+
+  set architectures(value)
+  {
+    if (value instanceof Set) {
+      this.#architectures = this.#architectures ? this.#architectures.union(value) : value;
+    } else {
+      this.#architectures = new Set(value);
+    }
+  }
+
+  get architectures() {
+    if(this.#architectures) {
+      return this.#architectures;
+    }
+
+    const architectures = new Set();
 
     for (const host of this.hosts()) {
-      names = names.union(new Set(host.domainNames));
+      architectures.add(host.architecture);
     }
 
-    return names;
+    return architectures;
   }
 }

package/types/cluster.d.mts

@@ -193,6 +193,11 @@ export class Cluster extends Host {
                     collection: boolean;
                     writeable: boolean;
                 };
+                architectures: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 locales: {
                     type: string;
                     collection: boolean;
@@ -303,6 +308,11 @@ export class Cluster extends Host {
                     collection: boolean;
                     writeable: boolean;
                 };
+                architecture: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 priority: {
                     type: string;
                     collection: boolean;
@@ -390,7 +400,7 @@ export class Cluster extends Host {
     get backups(): Set<any>;
     get members(): Set<any>;
     preparePackages(stagingDir: any): AsyncGenerator<{
-        sources: AsyncGenerator<any, void, unknown>[];
+        sources: AsyncIterable<import("content-entry").ContentEntry>[];
         outputs: any;
         properties: {
             name: string;

package/types/dns.d.mts

@@ -92,7 +92,7 @@ export class DNSService extends Base {
         LLMNR: string;
     })[];
     preparePackages(stagingDir: any): AsyncGenerator<{
-        sources: AsyncGenerator<any, void, unknown>[];
+        sources: AsyncIterable<import("content-entry").ContentEntry>[];
         outputs: Set<typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;

package/types/host.d.mts

@@ -96,6 +96,11 @@ export class Host extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            architecture: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             priority: {
                 type: string;
                 collection: boolean;
@@ -170,6 +175,8 @@ export class Host extends Base {
     get chassis(): any;
     set vendor(value: any);
     get vendor(): any;
+    set architecture(value: any);
+    get architecture(): any;
     get isTemplate(): true | RegExpMatchArray;
     get isModel(): boolean;
     get model(): any;

package/types/location.d.mts

@@ -193,6 +193,11 @@ export class Location extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                architectures: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 locales: {
                     type: string;
                     collection: boolean;
@@ -398,6 +403,11 @@ export class Location extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                architectures: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 locales: {
                     type: string;
                     collection: boolean;

package/types/network.d.mts

@@ -195,6 +195,11 @@ export class Network extends Owner {
                     collection: boolean;
                     writeable: boolean;
                 };
+                architectures: {
+                    type: string;
+                    collection: boolean;
+                    writeable: boolean;
+                };
                 locales: {
                     type: string;
                     collection: boolean;

package/types/owner.d.mts

@@ -191,6 +191,11 @@ export class Owner extends Base {
                 collection: boolean;
                 writeable: boolean;
             };
+            architectures: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             locales: {
                 type: string;
                 collection: boolean;
@@ -238,6 +243,8 @@ export class Owner extends Base {
     get domains(): Set<any>;
     get localDomains(): Set<any>;
     get domainNames(): Set<any>;
+    set architectures(value: any);
+    get architectures(): any;
     #private;
 }
 import { Base } from "./base.mjs";

package/types/root.d.mts

@@ -197,6 +197,11 @@ export class Root extends Location {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    architectures: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     locales: {
                         type: string;
                         collection: boolean;
@@ -402,6 +407,11 @@ export class Root extends Location {
                         collection: boolean;
                         writeable: boolean;
                     };
+                    architectures: {
+                        type: string;
+                        collection: boolean;
+                        writeable: boolean;
+                    };
                     locales: {
                         type: string;
                         collection: boolean;