pmcf 1.44.0 → 1.44.1

package/package.json

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

package/src/base.mjs

@@ -16,9 +16,10 @@ export class Base {
     return {
       name: "base",
       properties: {
+        type: { type: "string", writeable: false },
         name: { type: "string" },
         description: { type: "string" },
-        directory: { type: "string" },
+        directory: { type: "string", writeable: false },
         owner: {}
       }
     };
@@ -109,7 +110,7 @@ export class Base {
 
   get typeName() {
     // @ts-ignore
-    return this.constructor.typeName;
+    return this.constructor.typeDefinition.name;
   }
 
   get root() {
@@ -277,7 +278,10 @@ export function extractFrom(object, typeDefinition) {
               json[name] = value;
             } else {
               json[name] = Object.fromEntries(
-                Object.entries(value).map(([k, v]) => [k, extractFrom(v)])
+                Object.entries(value).map(([k, v]) => [
+                  k,
+                  extractFrom(v, typesByName[def.type])
+                ])
               );
             }
           }

package/src/dns.mjs

@@ -8,7 +8,6 @@ export class DNSService extends Base {
   soaUpdates = [36000, 72000, 600000, 60000];
   hasSVRRecords = true;
   hasCatalog = true;
-
   forwardsTo = [];
 
   static {
@@ -21,10 +20,10 @@ export class DNSService extends Base {
       properties: {
         hasSVRRecords: { type: "boolean" },
         hasCatalog: { type: "boolean" },
-        recordTTL: { type: "string" }
-        /*soaUpdates: {},
-        forwardsTo: {},
-        allowedUpdates: {}*/
+        recordTTL: { type: "string" },
+        soaUpdates: { type: "number", collection: true },
+        forwardsTo: { type: "host", collection: true },
+        allowedUpdates: { type: "string", collection: true }
       }
     };
   }

package/src/host.mjs

@@ -303,7 +303,7 @@ export class NetworkInterface extends Base {
         ssid: { type: "string" },
         psk: { type: "string" },
         metric: { type: "number" },
-        ipAddresses: { type: "string", isCollection: true },
+        ipAddresses: { type: "string", collection: true },
         network: {},
         gateway: {},
         arpbridge: {}

package/types/base.d.mts

@@ -4,6 +4,10 @@ export class Base {
     static get typeDefinition(): {
         name: string;
         properties: {
+            type: {
+                type: string;
+                writeable: boolean;
+            };
             name: {
                 type: string;
             };
@@ -12,6 +16,7 @@ export class Base {
             };
             directory: {
                 type: string;
+                writeable: boolean;
             };
             owner: {};
         };

package/types/dns.d.mts

@@ -11,6 +11,18 @@ export class DNSService extends Base {
             recordTTL: {
                 type: string;
             };
+            soaUpdates: {
+                type: string;
+                collection: boolean;
+            };
+            forwardsTo: {
+                type: string;
+                collection: boolean;
+            };
+            allowedUpdates: {
+                type: string;
+                collection: boolean;
+            };
         };
     };
     allowedUpdates: any[];

package/types/host.d.mts

@@ -96,7 +96,7 @@ export class NetworkInterface extends Base {
             };
             ipAddresses: {
                 type: string;
-                isCollection: boolean;
+                collection: boolean;
             };
             network: {};
             gateway: {};