pmcf 4.25.25 → 4.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.25.25",
+  "version": "4.27.0",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.6.9",
     "ip-utilties": "^3.0.4",
     "npm-pkgbuild": "^20.7.3",
-    "pacc": "^9.2.14",
+    "pacc": "^9.3.1",
     "package-directory": "^8.2.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -1,5 +1,6 @@
 import { join } from "node:path";
 import { stat } from "node:fs/promises";
+import { AggregatedMap } from "aggregated-map";
 import { allOutputs } from "npm-pkgbuild";
 import {
   createExpressionTransformer,
@@ -14,7 +15,7 @@ import {
   expand,
   toExternal,
   filterPublic,
-  attributeIterator,
+  extendingAttributeIterator,
   default_attribute,
   name_attribute_writable,
   string_attribute,
@@ -24,7 +25,6 @@ import {
   description_attribute_writable,
   boolean_attribute_writable
 } from "pacc";
-import { AggregatedMap } from "aggregated-map";
 import { union } from "./utils.mjs";
 
 /**
@@ -44,7 +44,7 @@ export class Base {
     packaging: string_attribute_writable,
     disabled: boolean_attribute_writable,
     tags: string_set_attribute_writable,
-    owner: { ...default_attribute, type: "base" },
+    owner: { ...default_attribute, type: "base", owner: false },
     type: string_attribute
   };
 
@@ -149,6 +149,23 @@ export class Base {
     return collected;
   }
 
+  get children() {
+    const all = [];
+
+    for (const [path, attribute] of extendingAttributeIterator(
+      this.constructor,
+      (name, attribute) => attribute.owner && !attribute.type.primitive
+    )) {
+      if (attribute.collection) {
+        all.push(...this[path].values());
+      } else {
+        all.push(this[path]);
+      }
+    }
+
+    return all;
+  }
+
   /**
    * Walk the object graph in some directions and deliver seen nodes.
    * @param {string[]} directions
@@ -229,14 +246,15 @@ export class Base {
    * @return {Iterable<[string,any]>} values
    */
   *attributeIterator(filter) {
-    for (let type = this.constructor; type; type = type.extends) {
-      for (const [path, def] of attributeIterator(type.attributes, filter)) {
-        const name = path.join(".");
-        const value = this.attribute(name);
+    for (const [path, def] of extendingAttributeIterator(
+      this.constructor,
+      filter
+    )) {
+      const name = path.join(".");
+      const value = this.attribute(name);
 
-        if (value !== undefined) {
-          yield [def.externalName ?? name, toExternal(value, def), path, def];
-        }
+      if (value !== undefined) {
+        yield [def.externalName ?? name, toExternal(value, def), path, def];
       }
     }
   }
@@ -571,61 +589,56 @@ export function extractFrom(object, type = object?.constructor) {
 
   const json = {};
 
-  for (; type; type = type.extends) {
-    for (const [path, def] of attributeIterator(
-      type.attributes,
-      filterPublic
-    )) {
-      const name = path.join(".");
-      let value = object[name];
+  for (const [path, def] of extendingAttributeIterator(type, filterPublic)) {
+    const name = path.join(".");
+    let value = object[name];
 
-      switch (typeof value) {
-        case "function":
-          {
-            value = object[name]();
+    switch (typeof value) {
+      case "function":
+        {
+          value = object[name]();
 
-            if (typeof value?.next === "function") {
-              value = [...value];
-            }
+          if (typeof value?.next === "function") {
+            value = [...value];
+          }
+
+          value = extractFrom(value, def.type);
+          if (value !== undefined) {
+            json[name] = value;
+          }
+        }
+        break;
+      case "object":
+        if (value instanceof Base) {
+          json[name] = { type: value.typeName };
+          if (value.name) {
+            json[name].name = value.name;
+          }
+        } else {
+          if (typeof value[Symbol.iterator] === "function") {
+            value = extractFrom(value);
 
-            value = extractFrom(value, def.type);
             if (value !== undefined) {
               json[name] = value;
             }
-          }
-          break;
-        case "object":
-          if (value instanceof Base) {
-            json[name] = { type: value.typeName };
-            if (value.name) {
-              json[name].name = value.name;
-            }
           } else {
-            if (typeof value[Symbol.iterator] === "function") {
-              value = extractFrom(value);
-
-              if (value !== undefined) {
-                json[name] = value;
-              }
-            } else {
-              const resultObject = Object.fromEntries(
-                Object.entries(value).map(([k, v]) => [
-                  k,
-                  v // extractFrom(v, def.type)
-                ])
-              );
-              if (Object.keys(resultObject).length > 0) {
-                json[name] = resultObject;
-              }
+            const resultObject = Object.fromEntries(
+              Object.entries(value).map(([k, v]) => [
+                k,
+                v // extractFrom(v, def.type)
+              ])
+            );
+            if (Object.keys(resultObject).length > 0) {
+              json[name] = resultObject;
             }
           }
-          break;
-        case "undefined":
-          break;
+        }
+        break;
+      case "undefined":
+        break;
 
-        default:
-          json[name] = value;
-      }
+      default:
+        json[name] = value;
     }
   }
 

package/src/endpoint.mjs

@@ -1,4 +1,18 @@
+import { addType } from "pacc";
+import { endpointAttributes, Service } from "./service.mjs";
+
 class BaseEndpoint {
+  static name = "endpoint";
+  static priority = 1.1;
+  static owners = [Service, "network_interface"];
+  static specializations = {};
+  static key = "type";
+  attributes = endpointAttributes;
+
+  static {
+    addType(this);
+  }
+
   _type;
 
   constructor(service, data) {
@@ -13,8 +27,7 @@ class BaseEndpoint {
     return this._type?.name ?? this.service.type;
   }
 
-  get priority()
-  {
+  get priority() {
     return this.service.priority;
   }
 
@@ -115,12 +128,11 @@ export class DomainNameEndpoint extends PortEndpoint {
  * Endpoint based on http
  */
 export class HTTPEndpoint extends BaseEndpoint {
-
   /**
-   * 
-   * @param {Service} service 
-   * @param {*} address 
-   * @param {object} data 
+   *
+   * @param {Service} service
+   * @param {*} address
+   * @param {object} data
    * @param {number} data.port
    * @param {string} data.pathname
    */
@@ -197,9 +209,8 @@ export class UnixEndpoint extends BaseEndpoint {
     return this.path;
   }
 
-  get url()
-  {
-    if(this.scheme) {
+  get url() {
+    if (this.scheme) {
       return `${this.scheme}://${this.path}`;
     }
   }

package/src/host.mjs

@@ -82,7 +82,7 @@ export class Host extends ServiceOwner {
     replaces: string_set_attribute_writable,
     depends: string_set_attribute_writable,
     provides: string_set_attribute_writable,
-    extends: { ...default_attribute_writable, type: "host", collection: true },
+    extends: { ...default_attribute_writable, type: "host", collection: true, owner: false },
     model: string_attribute,
     isModel: boolean_attribute_false
   };

package/src/initialization-context.mjs

@@ -259,9 +259,10 @@ export class InitializationContext {
       data.name = name;
     }
 
-    //console.log("LOAD", [name, owner.fullName, data.name]);
-
     const object = this.typeFactory(type, owner, data);
+
+    //console.log("LOAD", [name, type.name, owner.fullName, data.name, object.fullName]);
+
     this.root.addTypeObject(type.name, name, object);
 
     return object;

package/src/location.mjs

@@ -6,12 +6,11 @@ import { loadHooks } from "./hooks.mjs";
 export class Location extends Owner {
   static name = "location";
   static priority = 2;
-  static owners = [Owner, "location", "root"];
+  static owners = [Owner, Location, "root"];
   static extends = Owner;
   static key = "name";
   static attributes = {};
 
-
   static {
     addType(this);
   }

package/src/network.mjs

@@ -14,9 +14,10 @@ export class Network extends Owner {
     bridge: {
       ...default_attribute_writable,
       type: "network",
-      collection: true
+      collection: true,
+      owner: false
     },
-    gateway: { ...default_attribute_writable, type: "host" }
+    gateway: { ...default_attribute_writable, type: "host", owner: false }
   };
 
 

package/src/service.mjs

@@ -1,9 +1,9 @@
 import {
   string_attribute_writable,
-  string_set_attribute,
   number_attribute_writable,
-  boolean_attribute_false,
+  string_set_attribute,
   default_attribute_writable,
+  boolean_attribute_false,
   addType
 } from "pacc";
 import {
@@ -40,15 +40,6 @@ export const endpointAttributes = {
   tls: boolean_attribute_false
 };
 
-export const EndpointTypeDefinition = {
-  name: "endpoint",
-  priority: 1.1,
-  owners: ["service", "network_interface"],
-  specializations: {},
-  key: "type",
-  attributes: endpointAttributes
-};
-
 export class Service extends Base {
   static name = "service";
   static priority = 1.1;
@@ -70,7 +61,7 @@ export class Service extends Base {
   static attributes = {
     ...networkAddressAttributes,
     ...endpointAttributes,
-    extends: { ...default_attribute_writable, type: Service, collection: true },
+    extends: { ...default_attribute_writable, type: Service, collection: true, owner: false },
     alias: string_attribute_writable,
     weight: { ...number_attribute_writable /*default: 1*/ },
     systemdService: string_attribute_writable