pmcf 4.0.3 → 4.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -59,7 +59,7 @@
     "package-directory": "^8.1.0"
   },
   "devDependencies": {
-    "@types/node": "^25.0.3",
+    "@types/node": "^25.0.5",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -42,11 +42,11 @@ export class Base {
   owner;
   description;
   name;
+  extends = [];
   _tags = new Set();
   _packaging = new Set();
   _directory;
   _finalize;
-  _extends = [];
   _properties;
 
   static {
@@ -285,14 +285,6 @@ export class Base {
 
   _applyExtends() {}
 
-  set extends(value) {
-    this._extends.push(value);
-  }
-
-  get extends() {
-    return this._extends;
-  }
-
   named(name) {}
 
   typeNamed(typeName, name) {
@@ -327,7 +319,7 @@ export class Base {
   forOwner(owner) {
     if (this.owner !== owner) {
       const newObject = Object.create(this);
-
+      newObject.extends = [...this.extends];
       newObject.owner = owner;
       return newObject;
     }

package/src/services/bind.mjs

@@ -12,13 +12,6 @@ import {
   string_collection_attribute_writable,
   name_attribute_writable
 } from "pacc";
-import { yesno, writeLines, asArray } from "../utils.mjs";
-import {
-  DNSRecord,
-  dnsFullName,
-  dnsRecordTypeForAddressFamily,
-  sortZoneRecords
-} from "../dns-utils.mjs";
 import {
   ExtraSourceService,
   serviceEndpoints,
@@ -26,6 +19,13 @@ import {
   networkAddressType,
   addServiceType
 } from "pmcf";
+import { yesno, writeLines, asArray } from "../utils.mjs";
+import {
+  DNSRecord,
+  dnsFullName,
+  dnsRecordTypeForAddressFamily,
+  sortZoneRecords
+} from "../dns-utils.mjs";
 import { ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
 import { addHook } from "../hooks.mjs";
@@ -86,7 +86,7 @@ const BindServiceTypeDefinition = {
       collection: true
     },
     notify: boolean_attribute_writable_false,
-    recordTTL: string_attribute_writable,
+    recordTTL: { ...string_attribute_writable, default: "1W" },
     serial: number_attribute_writable,
     refresh: { ...string_attribute_writable, default: 36000 },
     retry: { ...string_attribute_writable, default: 72000 },
@@ -236,8 +236,8 @@ export class BindService extends ExtraSourceService {
   }
 
   async *preparePackages(dir) {
-    const zoneSources = this.zones.length ? this.zones : [this.owner];
-    const names = zoneSources.map(a => a.fullName).join(" ");
+    const sources = this.zones.length ? this.zones : [this.owner];
+    const names = sources.map(a => a.fullName).join(" ");
     const name = this.owner.owner.name || this.owner.name;
 
     const configPackageDir = join(dir, "config") + "/";
@@ -293,6 +293,12 @@ export class BindService extends ExtraSourceService {
       yield packageData;
     }
 
+    const ownerAndGroup = { owner: "named", group: "named" };
+    const filePermissions = [
+      { ...ownerAndGroup, mode: 0o644 },
+      { ...ownerAndGroup, mode: 0o755 }
+    ];
+
     const zonesPackageDir = join(dir, "zones") + "/";
 
     packageData.dir = zonesPackageDir;
@@ -301,27 +307,11 @@ export class BindService extends ExtraSourceService {
       description: `zone definitions for ${names}`,
       dependencies: ["mf-named"],
       access: "private",
-      hooks: {}
+      hooks: {},
+      sources: [new FileContentProvider(zonesPackageDir, ...filePermissions)]
     };
 
-    const filePermissions = [
-      {
-        mode: 0o644,
-        owner: "named",
-        group: "named"
-      },
-      {
-        mode: 0o755,
-        owner: "named",
-        group: "named"
-      }
-    ];
-
-    packageData.sources = [
-      new FileContentProvider(zonesPackageDir, ...filePermissions)
-    ];
-
-    yield this.generateZoneDefs(zoneSources, packageData);
+    yield this.generateZoneDefs(sources, packageData);
 
     const outfacingZonesPackageDir = join(dir, "outfacingZones") + "/";
 
@@ -330,14 +320,13 @@ export class BindService extends ExtraSourceService {
       name: `named-zones-${name}-outfacing`,
       description: `outfacing zone definitions for ${names}`,
       access: "private",
-      hooks: {}
+      hooks: {},
+      sources: [
+        new FileContentProvider(outfacingZonesPackageDir, ...filePermissions)
+      ]
     };
 
-    packageData.sources = [
-      new FileContentProvider(outfacingZonesPackageDir, ...filePermissions)
-    ];
-
-    yield* this.generateOutfacingDefs(zoneSources, packageData);
+    yield* this.generateOutfacingDefs(sources, packageData);
   }
 
   async *generateOutfacingDefs(sources, packageData) {
@@ -368,18 +357,18 @@ export class BindService extends ExtraSourceService {
     }
   }
 
-  async generateZoneDefs(zoneSources, packageData) {
+  async generateZoneDefs(sources, packageData) {
     const configs = [];
 
-    for (const zoneSource of zoneSources) {
+    for (const source of sources) {
       console.log(
-        "SOURCE",
-        zoneSource.toString(),
-        [...zoneSource.localDomains].join(" ")
+        "ZONE",
+        source.toString(),
+        [...source.localDomains].join(" ")
       );
 
-      for (const domain of zoneSource.localDomains) {
-        const locationName = zoneSource.location.name;
+      for (const domain of source.localDomains) {
+        const locationName = source.location.name;
         const reverseZones = new Map();
 
         const config = {
@@ -432,7 +421,7 @@ export class BindService extends ExtraSourceService {
           networkInterface,
           domainNames,
           family
-        } of zoneSource.networkAddresses()) {
+        } of source.networkAddresses()) {
           if (
             !this.exclude.has(networkInterface.network) &&
             !this.excludeInterfaceKinds.has(networkInterface.kind)

package/types/base.d.mts

@@ -48,17 +48,15 @@ export class Base {
     owner: Base;
     description: any;
     name: string;
+    extends: any[];
     _tags: Set<any>;
     _packaging: Set<any>;
     _directory: any;
     _finalize: any;
-    _extends: any[];
     _properties: any;
     ownerFor(attribute: any, data: any): any;
     read(data: any, type?: any): void;
     _applyExtends(): void;
-    set extends(value: any[]);
-    get extends(): any[];
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;

package/types/services/bind.d.mts

@@ -1314,7 +1314,27 @@ export class BindService extends ExtraSourceService {
                 additionalValues?: object;
             };
             notify: import("pacc").AttributeDefinition;
-            recordTTL: import("pacc").AttributeDefinition;
+            recordTTL: {
+                default: string;
+                type: object;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                private?: boolean;
+                credential?: boolean;
+                persistent?: boolean;
+                depends?: string;
+                description?: string;
+                set?: Function;
+                get?: Function;
+                toInternal?: Function;
+                toExternal?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
+            };
             serial: import("pacc").AttributeDefinition;
             refresh: {
                 default: number;
@@ -1460,7 +1480,7 @@ export class BindService extends ExtraSourceService {
     get excludeInterfaceKinds(): Set<any>;
     preparePackages(dir: any): AsyncGenerator<any, void, unknown>;
     generateOutfacingDefs(sources: any, packageData: any): AsyncGenerator<any, void, unknown>;
-    generateZoneDefs(zoneSources: any, packageData: any): Promise<any>;
+    generateZoneDefs(sources: any, packageData: any): Promise<any>;
     outfacingZones(host: any, view: any, records: any): any;
     get defaultRecords(): {
         type: any;