pmcf 1.30.7 → 1.31.1

package/bin/pmcf-named-defs

@@ -12,13 +12,6 @@ import { prepare } from "../src/cmd.mjs";
 const { root, args, options } = await prepare();
 
 const owner = await root.load(args[0]);
-const updates = [
-  Math.ceil(Date.now() / 1000),
-  36000,
-  72000,
-  600000,
-  60000
-].join(" ");
 
 await generateNamedDefs(owner, options.output);
 
@@ -29,6 +22,7 @@ console.log("description", `named defintions for ${owner.name}`);
 async function generateNamedDefs(owner, targetDir) {
   const dns = owner.dns;
   const ttl = dns.recordTTL;
+  const updates = [Math.ceil(Date.now() / 1000), ...dns.soaUpdates].join(" ");
 
   for (const domain of dns.domains) {
     const zones = [];
@@ -42,8 +36,6 @@ async function generateNamedDefs(owner, targetDir) {
     const createRecord = (key, type, value) => {
       return {
         key,
-        /*type,
-        value,*/
         toString: () =>
           `${key.padEnd(maxKeyLength, " ")} ${ttl} IN ${type.padEnd(
             5,

package/package.json

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

package/src/base.mjs

@@ -180,23 +180,30 @@ export class Base {
   }
 
   toJSON() {
-    return extractFrom(this, this.propertyNames);
+    return extractFrom(this);
   }
 }
 
-export function extractFrom(object, propertyNames) {
+export function extractFrom(object) {
   const json = {};
-  for (const p of propertyNames) {
+
+  for (const p of object?.propertyNames || Object.keys(object)) {
     const value = object[p];
 
     switch (typeof value) {
       case "undefined":
         break;
       case "object":
-        if (value instanceof Base && value.name !== undefined) {
-          json[p] = { name: value.name, type: value.typeName };
+        if (value instanceof Base) {
+          json[p] = { type: value.typeName };
+          if (value.name) {
+            json[p].name = value.name;
+          }
+        } else {
+          json[p] = Object.fromEntries(
+            Object.entries(value).map(([k, v]) => [k, extractFrom(v)])
+          );
         }
-
         break;
       default:
         json[p] = value;

package/src/dns.mjs

@@ -4,6 +4,8 @@ import { asArray } from "./utils.mjs";
 export class DNSService extends Base {
   allowedUpdates = [];
   recordTTL = "1W";
+  soaUpdates = [36000, 72000, 600000, 60000];
+
   forwardsTo = [];
 
   static get typeName() {
@@ -32,7 +34,7 @@ export class DNSService extends Base {
   }
 
   get propertyNames() {
-    return ["recordTTL", "forwardsTo", "allowedUpdates"];
+    return ["recordTTL", "soaUpdates", "forwardsTo", "allowedUpdates"];
   }
 
   async resolvedConfig() {

package/src/model.mjs

@@ -305,7 +305,9 @@ export class Host extends Base {
   }
 
   get domainName() {
-    return this.hostName + "." + this.domain;
+    const domain = this.domain;
+    const hostName = this.hostName;
+    return domain ? hostName + "." + domain : hostName;
   }
 
   get host() {
@@ -538,6 +540,7 @@ export class NetworkInterface extends Base {
 }
 
 const _types = [
+  Owner,
   Location,
   Network,
   Subnet,

package/src/owner.mjs

@@ -10,6 +10,10 @@ export class Owner extends Base {
   domain;
   ntp = { servers: [] };
 
+  static get typeName() {
+    return "owner";
+  }
+
   constructor(owner, data) {
     super(owner, data);
 

package/types/base.d.mts

@@ -1,4 +1,4 @@
-export function extractFrom(object: any, propertyNames: any): {};
+export function extractFrom(object: any): {};
 export class Base {
     static get typeName(): string;
     static get pluralTypeName(): string;

package/types/dns.d.mts

@@ -1,6 +1,7 @@
 export class DNSService extends Base {
     allowedUpdates: any[];
     recordTTL: string;
+    soaUpdates: number[];
     forwardsTo: any[];
     services(): AsyncGenerator<any, void, any>;
     get domains(): any[];

package/types/model.d.mts

@@ -1,6 +1,6 @@
 export class Root extends Owner {
     static get types(): {
-        [k: string]: typeof DNSService | typeof Subnet | typeof Cluster | typeof Service | typeof Host | typeof NetworkInterface;
+        [k: string]: typeof DNSService | typeof Owner | typeof Subnet | typeof Service | typeof Host | typeof NetworkInterface;
     };
     constructor(directory: any);
     get fullName(): string;
@@ -32,7 +32,7 @@ export class Host extends Base {
     get domain(): any;
     get modelName(): any;
     get hostName(): any;
-    get domainName(): string;
+    get domainName(): any;
     get host(): this;
     addService(service: any): void;
     services(filter: any): Generator<any, void, unknown>;
@@ -69,6 +69,5 @@ export class NetworkInterface extends Base {
 import { Owner } from "./owner.mjs";
 import { DNSService } from "./dns.mjs";
 import { Subnet } from "./owner.mjs";
-import { Cluster } from "./cluster.mjs";
 import { Service } from "./service.mjs";
 import { Base } from "./base.mjs";