pmcf 6.2.8 → 6.3.0

package/package.json

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

package/src/initialization-context.mjs

@@ -179,16 +179,22 @@ export class InitializationContext {
       owner.constructor,
       attribute => attribute.type === type && attribute.collection
     )) {
-      const object = create(type, owner, data);
+      try {
+        const object = create(type, owner, data);
 
-      // set backointer early so that parent properties can be found during load
-      if (attribute.backpointer) {
-        assign(attribute.backpointer, object, owner);
+        // set backointer early so that parent properties can be found during load
+        if (attribute.backpointer) {
+          assign(attribute.backpointer, object, owner);
+        }
+        return assign(attribute, owner, this.read(object, data));
+      } catch (e) {
+        this.error(`Unable to assign ${type.name}.${attribute.name}`, data);
       }
-      return assign(attribute, owner, this.read(object, data));
     }
 
-    this.error(`No attribute to assign ${type.name} to ${owner.fullName}(${owner.typeName})`);
+    this.error(
+      `No attribute to assign ${type.name} to ${owner.fullName}(${owner.typeName})`
+    );
   }
 
   async loadAll() {

package/src/owner.mjs

@@ -7,7 +7,7 @@ import {
   email_attribute
 } from "pacc";
 import { asArray, union } from "./utils.mjs";
-import { Base } from "./base.mjs";
+import { ServiceOwner } from "./service-owner.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import {
   networks_attribute,
@@ -20,7 +20,7 @@ import {
 import { addType, assign } from "pmcf";
 import { loadHooks } from "./hooks.mjs";
 
-export class Owner extends Base {
+export class Owner extends ServiceOwner {
   static name = "owner";
   static priority = 2;
   static owners = [Owner, "root"];
@@ -106,7 +106,7 @@ export class Owner extends Base {
 
   get services() {
     return new AggregatedMap(
-      [...this.hosts.values()].map(host => host.services)
+      [this, ...this.hosts.values()].map(host => host._services)
     );
   }
 

package/src/services/bind.mjs

@@ -481,6 +481,7 @@ export class bind extends ExtraSourceService {
   groups = new Map();
 
   materializeExtends() {
+    console.log("materializeExtends", this.fullName, this.owner, this.extends);
     super.materializeExtends();
 
     for (const service of this.walkDirections(["extends"])) {
@@ -528,7 +529,7 @@ export class bind extends ExtraSourceService {
 
     let hasContent = false;
 
-    console.log("PAKAGE", Object.keys(this.groups));
+    console.log("PACKAGE", Object.keys(this.groups));
 
     for (const group of Object.values(this.groups)) {
       hasContent ||= await group.packageContent(outputControl);