pmcf 1.30.7 → 1.31.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.30.7",
+  "version": "1.31.0",
   "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/model.mjs

@@ -538,6 +538,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/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;
@@ -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";