pmcf 6.31.4 → 6.32.1

package/package.json

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

package/src/base.mjs

@@ -110,7 +110,10 @@ export class Base {
 
     for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
-      attribute => attribute.collection && !attribute.type.primitive
+      attribute =>
+        attribute.collection &&
+        !attribute.type.primitive &&
+        !attribute.deferredExpression
     )) {
       const collection = this[attribute.name];
       if (typeof collection?.get === "function") {
@@ -127,24 +130,21 @@ export class Base {
             collection.set(extending.name, extending.forOwner(this));
           }
         }
-      }
-      /*
-      else {
-        if (collection instanceof Set) {
-          for (const all of this.unionFromDirections(["extends"], attribute.name)) {
-            if (all instanceof Set) {
-              const d = collection.difference(all);
-
-              // if (d.size) {
-              console.log("ME", this.fullName, attribute.name, d);
-              //    }
-            }
-            else {
-            //  console.error("NO SET",this.fullName, attribute.name, typeof all, all.constructor.name);
+      } /*else {
+        if (Array.isArray(collection)) {
+          // TODO
+        } else {
+          //console.log("EXTENDS", this.fullName, attribute.name);
+
+          for (const extending of this.unionFromDirections(
+            ["extends"],
+            attribute.name
+          )) {
+            if (!collection.has(extending)) {
+              //console.log("ADD", this.fullName, extending.fullName);
+              collection.add(extending);
             }
           }
-        } else {
-          //console.log("NO MAP OR SET", this.fullName, name);
         }
       }*/
     }
@@ -195,6 +195,9 @@ export class Base {
     for (const node of this.walkDirections(directions)) {
       const value = node[property];
       if (value !== undefined) {
+        if (!(value instanceof Set)) {
+          console.log("NO SET", value, node.fullName, property);
+        }
         collected = collected.union(value);
       }
     }

package/src/services/bind.mjs

@@ -695,6 +695,10 @@ export class bind extends CoreService {
       type: networkAddressType,
       deferredExpression: true
     },
+    serverType: {
+      ...string_attribute_writable,
+      name: "serverType"
+    },
     keys: {
       ...default_collection_attribute_writable,
       name: "keys",
@@ -762,8 +766,19 @@ export class bind extends CoreService {
   acls = new Map();
   groups = new Map();
 
+  set serverType(value) {
+    //console.log("SET SERVERTYPE", this.fullName, value);
+    this._serverType = value;
+  }
+
   get serverType() {
-    return this.primaries ? "secondary" : "primary";
+    /*console.log(
+      "GET SERVERTYPE",
+      this.fullName,
+      this._serverType ?? (this.primaries ? "secondary" : "primary")
+    );*/
+
+    return this._serverType ?? (this.primaries ? "secondary" : "primary");
   }
 
   async writeForwarders(outputControl) {