pmcf 6.32.1 → 6.32.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmcf",
3
- "version": "6.32.1",
3
+ "version": "6.32.2",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
package/src/base.mjs CHANGED
@@ -122,11 +122,23 @@ export class Base {
122
122
  attribute.name
123
123
  )) {
124
124
  const present = collection.get(extending.name);
125
- //console.log("ME",this.fullName,attribute.name,extending.name);
125
+
126
126
  if (present) {
127
+ /*if (attribute.name === "services") {
128
+ console.log(
129
+ this.fullName,
130
+ present.fullName,
131
+ "<-",
132
+ extending.fullName
133
+ );
134
+ }*/
135
+
127
136
  present.extends.add(extending);
128
137
  present.materializeExtends();
129
138
  } else {
139
+ /*if (attribute.name === "services") {
140
+ console.log(this.fullName, extending.fullName);
141
+ }*/
130
142
  collection.set(extending.name, extending.forOwner(this));
131
143
  }
132
144
  }
@@ -180,7 +192,9 @@ export class Base {
180
192
  */
181
193
  mapFromDirections(directions, property) {
182
194
  return new AggregatedMap(
183
- [...this.walkDirections(directions)].map(node => node[property])
195
+ [...this.walkDirections(directions)]
196
+ .map(node => node[property])
197
+ .filter(node => node !== undefined)
184
198
  );
185
199
  }
186
200
 
@@ -29,6 +29,12 @@ export class InitializationContext {
29
29
  const resolved = this.named(value, node);
30
30
  if (resolved) {
31
31
  assign(attribute, object, resolved);
32
+
33
+ if (attribute.name === "extends") {
34
+ // TODO attribute action ?
35
+ object.materializeExtends();
36
+ }
37
+
32
38
  continue nextOutstanding;
33
39
  }
34
40
  }
@@ -36,6 +42,12 @@ export class InitializationContext {
36
42
  const resolved = object.expression(value);
37
43
  if (resolved) {
38
44
  assign(attribute, object, resolved);
45
+
46
+ if (attribute.name === "extends") {
47
+ // TODO attribute action ?
48
+ object.materializeExtends();
49
+ }
50
+
39
51
  continue nextOutstanding;
40
52
  }
41
53
 
@@ -783,6 +783,12 @@ export class bind extends CoreService {
783
783
 
784
784
  async writeForwarders(outputControl) {
785
785
  // TODO formulate everything as pacc expression
786
+
787
+ /*
788
+ console.log("F",this.extends);
789
+ console.log("F0",this.fullName);
790
+ console.log("F1",this.forwarders);
791
+ */
786
792
  const forwarders = [...this.forwarders]
787
793
  .map(e => e.endpoints())
788
794
  .flat()