pmcf 1.30.6 → 1.31.0

package/package.json

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

package/src/base.mjs

@@ -112,7 +112,7 @@ export class Base {
           return new Set([...object].map(e => this.expand(e)));
         }
 
-        /*return Object.fromEntries(
+      /*return Object.fromEntries(
           Object.entries(object).map(([k, v]) => [k, this.expand(v)])
         );*/
     }
@@ -180,21 +180,33 @@ 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];
 
-    if (value !== undefined) {
-      if (value instanceof Base && value.name !== undefined) {
-        json[p] = { name: value.name, type: value.typeName };
-      } else {
+    switch (typeof value) {
+      case "undefined":
+        break;
+      case "object":
+        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;
-      }
     }
   }
   return json;

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);
 
@@ -84,8 +88,6 @@ export class Owner extends Base {
       this.#membersByType.set(typeName, typeSlot);
     }
     typeSlot.set(fullName, object);
-
-    //console.log(this.toString(),"ADD", typeName, fullName, object.name, this.named(fullName)?.toString());
   }
 
   addObject(object) {
@@ -190,7 +192,7 @@ export class Owner extends Base {
 
   _resolveBridges() {
     for (const bridge of this.#bridges) {
-      this.info(bridgeToJSON(bridge));
+      //this.info(bridgeToJSON(bridge));
       for (const network of bridge) {
         if (typeof network === "string") {
           const other = this.networkNamed(network);

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";