pmcf 1.65.1 → 1.65.3

package/package.json

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

package/src/dns.mjs

@@ -175,7 +175,7 @@ async function generateNamedDefs(dns, targetDir) {
     const zone = {
       id: domain,
       type: "plain",
-      file: `${domain}.zone`,
+      file: `${dns.owner.name}/${domain}.zone`,
       records: new Set([SOARecord, NSRecord, ...records])
     };
     zones.push(zone);
@@ -183,7 +183,7 @@ async function generateNamedDefs(dns, targetDir) {
     const catalogZone = {
       id: `catalog.${domain}`,
       type: "catalog",
-      file: `catalog.${domain}.zone`,
+      file: `${dns.owner.name}/catalog.${domain}.zone`,
       records: new Set([
         SOARecord,
         NSRecord,
@@ -229,7 +229,7 @@ async function generateNamedDefs(dns, targetDir) {
             reverseZone = {
               id: reverseArpa,
               type: "plain",
-              file: `${reverseArpa}.zone`,
+              file: `${dns.owner.name}/${reverseArpa}.zone`,
               records: new Set([SOARecord, NSRecord])
             };
             zones.push(reverseZone);

package/src/utils.mjs

@@ -1,7 +1,11 @@
 import { writeFile, mkdir } from "node:fs/promises";
-import { join } from "node:path";
+import { join, dirname, basename } from "node:path";
 
 export async function writeLines(dir, name, lines) {
+  const full = join(dir, name);
+  dir = dirname(full);
+  name = basename(full);
+
   await mkdir(dir, { recursive: true });
   if (typeof lines === "string") lines = [lines];
   return writeFile(
@@ -33,11 +37,12 @@ export function asArray(value) {
   return Array.isArray(value) ? value : value === undefined ? [] : [value];
 }
 
-export function asIterator(value)
-{
-  if(value === undefined) { return []; }
+export function asIterator(value) {
+  if (value === undefined) {
+    return [];
+  }
 
-  if(typeof value[Symbol.iterator] === 'function') {
+  if (typeof value[Symbol.iterator] === "function") {
     return value;
   }
 
@@ -180,7 +185,7 @@ export function hasWellKnownSubnet(address) {
   return n === IPV4_LOCALHOST || n === IPV6_LOCALHOST || isLinkLocal(address);
 }
 
-const IPV4_LOCALHOST = _encode(ipv4, "127.0.0.1");
-const IPV6_LOCALHOST = _encode(ipv6, "::1");
-const IPV6_LINK_LOCAL_BROADCAST = _encode(ipv6,"ff02::1");
-const IPV6_ROUTER_BROADCAST = _encode(ipv6,"ff02::2");
+export const IPV4_LOCALHOST = _encode(ipv4, "127.0.0.1");
+export const IPV6_LOCALHOST = _encode(ipv6, "::1");
+export const IPV6_LINK_LOCAL_BROADCAST = _encode(ipv6, "ff02::1");
+export const IPV6_ROUTER_BROADCAST = _encode(ipv6, "ff02::2");

package/types/utils.d.mts

@@ -25,3 +25,7 @@ export function normalizeCIDR(address: any): {
     cidr: string;
 };
 export function hasWellKnownSubnet(address: any): any;
+export const IPV4_LOCALHOST: bigint;
+export const IPV6_LOCALHOST: bigint;
+export const IPV6_LINK_LOCAL_BROADCAST: bigint;
+export const IPV6_ROUTER_BROADCAST: bigint;