pmcf 6.32.0 → 6.32.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.32.0",
+  "version": "6.32.2",
   "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") {
@@ -119,32 +122,41 @@ export class Base {
           attribute.name
         )) {
           const present = collection.get(extending.name);
-          //console.log("ME",this.fullName,attribute.name,extending.name);
+
           if (present) {
+            /*if (attribute.name === "services") {
+              console.log(
+                this.fullName,
+                present.fullName,
+                "<-",
+                extending.fullName
+              );
+            }*/
+
             present.extends.add(extending);
             present.materializeExtends();
           } else {
+            /*if (attribute.name === "services") {
+              console.log(this.fullName, extending.fullName);
+            }*/
             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);
         }
       }*/
     }
@@ -180,7 +192,9 @@ export class Base {
    */
   mapFromDirections(directions, property) {
     return new AggregatedMap(
-      [...this.walkDirections(directions)].map(node => node[property])
+      [...this.walkDirections(directions)]
+        .map(node => node[property])
+        .filter(node => node !== undefined)
     );
   }
 
@@ -195,6 +209,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/initialization-context.mjs

@@ -29,6 +29,12 @@ export class InitializationContext {
         const resolved = this.named(value, node);
         if (resolved) {
           assign(attribute, object, resolved);
+
+          if (attribute.name === "extends") {
+            // TODO attribute action ?
+            object.materializeExtends();
+          }
+
           continue nextOutstanding;
         }
       }
@@ -36,6 +42,12 @@ export class InitializationContext {
       const resolved = object.expression(value);
       if (resolved) {
         assign(attribute, object, resolved);
+
+        if (attribute.name === "extends") {
+          // TODO attribute action ?
+          object.materializeExtends();
+        }
+
         continue nextOutstanding;
       }
 

package/src/services/bind.mjs

@@ -783,6 +783,12 @@ export class bind extends CoreService {
 
   async writeForwarders(outputControl) {
     // TODO formulate everything as pacc expression
+
+/*
+    console.log("F",this.extends);
+    console.log("F0",this.fullName);
+    console.log("F1",this.forwarders);
+*/
     const forwarders = [...this.forwarders]
       .map(e => e.endpoints())
       .flat()