pmcf 4.25.19 → 4.25.21

package/README.md

@@ -75,9 +75,6 @@ generates config packages for:
 *   [id](#id)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-13)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -274,18 +271,6 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## SystemdJournalRemoteService
 
 **Extends Service**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.25.19",
+  "version": "4.25.21",
   "publishConfig": {
     "access": "public"
   },
@@ -54,11 +54,11 @@
     "content-entry-transform": "^1.6.9",
     "ip-utilties": "^3.0.4",
     "npm-pkgbuild": "^20.7.2",
-    "pacc": "^9.2.13",
+    "pacc": "^9.2.14",
     "package-directory": "^8.2.0"
   },
   "devDependencies": {
-    "@types/node": "^25.9.2",
+    "@types/node": "^25.9.3",
     "ava": "^8.0.1",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -52,12 +52,8 @@ export class Base {
     addType(this);
   }
 
-  static get typeName() {
-    return this.name;
-  }
-
-  static get typeFileName() {
-    return this.typeName + ".json";
+  static get fileName() {
+    return this.name + ".json";
   }
 
   owner;
@@ -210,7 +206,6 @@ export class Base {
   }
 
   get typeName() {
-    // @ts-ignore
     return this.constructor.name;
   }
 

package/src/initialization-context.mjs

@@ -146,7 +146,7 @@ export class InitializationContext {
             this.assign(object, name, attribute, o);
           } else {
             if (attribute.type.constructWithIdentifierOnly) {
-              o = new attribute.type.clazz(
+              o = new attribute.type(
                 object.ownerFor(attribute, value),
                 value
               );
@@ -161,7 +161,7 @@ export class InitializationContext {
         break;
 
       case "object":
-        if (attribute.type.clazz && value instanceof attribute.type.clazz) {
+        if (attribute.type && value instanceof attribute.type) {
           this.assign(object, name, attribute, value);
         } else {
           this.assign(
@@ -180,7 +180,7 @@ export class InitializationContext {
   }
 
   typeFactory(type, owner, data) {
-    const factory = type.factoryFor?.(owner, data) || type.clazz;
+    const factory = type.factoryFor?.(owner, data) || type;
     const object = new factory(owner);
 
     this.read(object, data);
@@ -244,7 +244,7 @@ export class InitializationContext {
   async loadType(name, type) {
     const data = JSON.parse(
       await readFile(
-        join(this.directory, name, type.clazz.typeFileName),
+        join(this.directory, name, type.fileName),
         "utf8"
       )
     );
@@ -262,7 +262,7 @@ export class InitializationContext {
     //console.log("LOAD", [name, owner.fullName, data.name]);
 
     const object = this.typeFactory(type, owner, data);
-    this.root.addTypeObject(type.clazz.typeName, name, object);
+    this.root.addTypeObject(type.name, name, object);
 
     return object;
   }
@@ -279,7 +279,7 @@ export class InitializationContext {
       return this.loadType(name, options.type);
     } else {
       for (const type of Object.values(types).filter(
-        type => type?.clazz?.typeFileName
+        type => type?.fileName
       )) {
         try {
           return await this.loadType(name, type);
@@ -295,9 +295,8 @@ export class InitializationContext {
     for (const type of Object.values(types).sort(
       (a, b) => b.priority - a.priority
     )) {
-      //console.log("LIST","**/" + type.clazz.typeFileName);
-      if (type.clazz?.typeFileName) {
-        for await (const name of glob("**/" + type.clazz.typeFileName, {
+      if (type.fileName) {
+        for await (const name of glob("**/" + type.fileName, {
           cwd: this.directory
         })) {
           if (type === this.root.constructor) {

package/src/network-interfaces/network-interface.mjs

@@ -22,21 +22,21 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   static extends = Base;
   static specializations = {};
   static factoryFor(owner, value) {
-    let t = this.specializations[value.kind];
+    let st = this.specializations[value.kind];
 
     //console.log("factoryFor", owner, value);
-    if (!t) {
-      for (t of Object.values(this.specializations)) {
-        if (t.clazz.isCommonName && t.clazz.isCommonName(value.name)) {
+    if (!st) {
+      for (st of Object.values(this.specializations)) {
+        if (st.isCommonName && st.isCommonName(value.name)) {
           break;
         }
       }
     }
 
-    if (t) {
+    if (st) {
       delete value.type;
       delete value.kind;
-      return t.clazz;
+      return st;
     }
 
     return this;

package/src/service.mjs

@@ -56,11 +56,11 @@ export class Service extends Base {
   static specializations = {};
   static factoryFor(owner, value) {
     const type = value.type ?? value.name;
-    const t = this.specializations[type];
+    const st = this.specializations[type];
 
-    if (t) {
+    if (st) {
       delete value.type;
-      return t.clazz;
+      return st;
     }
 
     return Service;