pmcf 4.25.16 → 4.25.18

package/package.json

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

package/src/base.mjs

@@ -55,7 +55,7 @@ export class Base {
   }
 
   static get typeName() {
-    return this.typeDefinition?.name || this.name;
+    return this.name;
   }
 
   static get typeFileName() {
@@ -213,7 +213,7 @@ export class Base {
 
   get typeName() {
     // @ts-ignore
-    return this.constructor.typeDefinition.name;
+    return this.constructor.name;
   }
 
   /**
@@ -236,15 +236,8 @@ export class Base {
    * @return {Iterable<[string,any]>} values
    */
   *attributeIterator(filter) {
-    for (
-      let typeDefinition = this.constructor.typeDefinition;
-      typeDefinition;
-      typeDefinition = typeDefinition.extends
-    ) {
-      for (const [path, def] of attributeIterator(
-        typeDefinition.attributes,
-        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);
 
@@ -545,14 +538,11 @@ export class Base {
   }
 
   toJSON() {
-    return extractFrom(this, this.constructor.typeDefinition);
+    return extractFrom(this, this.constructor);
   }
 }
 
-export function extractFrom(
-  object,
-  typeDefinition = object?.constructor?.typeDefinition
-) {
+export function extractFrom(object, type = object?.constructor) {
   switch (typeof object) {
     case "undefined":
     case "string":
@@ -572,12 +562,12 @@ export function extractFrom(
       return undefined;
     }
 
-    if (typeDefinition?.key) {
+    if (type?.key) {
       return Object.fromEntries(
         object.map(o => {
           o = extractFrom(o);
-          const name = o[typeDefinition.key];
-          delete o[typeDefinition.key];
+          const name = o[type.key];
+          delete o[type.key];
           return [name, o];
         })
       );
@@ -588,9 +578,9 @@ export function extractFrom(
 
   const json = {};
 
-  for (; typeDefinition; typeDefinition = typeDefinition.extends) {
+  for (; type; type = type.extends) {
     for (const [path, def] of attributeIterator(
-      typeDefinition.attributes,
+      type.attributes,
       filterPublic
     )) {
       const name = path.join(".");

package/src/initialization-context.mjs

@@ -188,7 +188,7 @@ export class InitializationContext {
     return object;
   }
 
-  read(object, data, type = object.constructor.typeDefinition) {
+  read(object, data, type = object.constructor) {
     if (data?.properties) {
       Object.assign(object.properties, data.properties);
     }
@@ -200,7 +200,7 @@ export class InitializationContext {
     }
   }
 
-  _read(object, data, type = object.constructor.typeDefinition) {
+  _read(object, data, type) {
     if (type.extends) {
       this._read(object, data, type.extends);
     }

package/src/network-interfaces/ethernet.mjs

@@ -1,16 +1,13 @@
 import { default_attribute_writable, addType } from "pacc";
-import {
-  NetworkInterface,
-  NetworkInterfaceTypeDefinition
-} from "./network-interface.mjs";
+import { NetworkInterface } from "./network-interface.mjs";
 
 export class EthernetNetworkInterface extends NetworkInterface {
-  static   name= "ethernet";
-  static extends= NetworkInterfaceTypeDefinition;
-  static specializationOf= NetworkInterfaceTypeDefinition;
-  static owners= NetworkInterfaceTypeDefinition.owners;
-  static key= "name";
-  static attributes= {
+  static name = "ethernet";
+  static extends = NetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = NetworkInterface.owners;
+  static key = "name";
+  static attributes = {
     arpbridge: {
       ...default_attribute_writable,
       type: "network_interface",

package/src/network-interfaces/loopback.mjs

@@ -1,7 +1,7 @@
 import { addType } from "pacc";
 import { SUBNET_LOCALHOST_IPV4, SUBNET_LOCALHOST_IPV6 } from "pmcf";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
+import { NetworkInterface } from "./network-interface.mjs";
 
 const _localAddresses = new Map([
   ["127.0.0.1", SUBNET_LOCALHOST_IPV4],
@@ -12,9 +12,9 @@ const _localDomains = new Set(["localhost"]);
 
 export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
   static name = "loopback";
-  static extends = NetworkInterfaceTypeDefinition;
-  static specializationOf = NetworkInterfaceTypeDefinition;
-  static owners = NetworkInterfaceTypeDefinition.owners;
+  static extends = NetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = NetworkInterface.owners;
   static key = "name";
 
   static typeDefinition = this;

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

@@ -16,17 +16,17 @@ import { SkeletonNetworkInterface } from "./skeleton.mjs";
 import { Network } from "../network.mjs";
 import { yesno } from "../utils.mjs";
 
-export const NetworkInterfaceTypeDefinition = {
-  name: "network_interface",
-  owners: ["host"],
-  extends: Base.typeDefinition,
-  specializations: {},
-  factoryFor(owner, value) {
-    let t = NetworkInterfaceTypeDefinition.specializations[value.kind];
+export class NetworkInterface extends SkeletonNetworkInterface {
+  static name = "network_interface";
+  static owners = ["host"];
+  static extends = Base;
+  static specializations = {};
+  static factoryFor(owner, value) {
+    let t = this.specializations[value.kind];
 
     //console.log("factoryFor", owner, value);
     if (!t) {
-      for (t of Object.values(NetworkInterfaceTypeDefinition.specializations)) {
+      for (t of Object.values(this.specializations)) {
         if (t.clazz.isCommonName && t.clazz.isCommonName(value.name)) {
           break;
         }
@@ -39,10 +39,10 @@ export const NetworkInterfaceTypeDefinition = {
       return t.clazz;
     }
 
-    return NetworkInterface;
-  },
-  key: "name",
-  attributes: {
+    return this;
+  }
+  static key = "name";
+  static attributes = {
     ...networkAttributes,
     ...networkAddressAttributes,
 
@@ -56,14 +56,12 @@ export const NetworkInterfaceTypeDefinition = {
     hwaddr: string_attribute_writable,
     network: {
       ...default_attribute_writable,
-      type: Network.typeDefinition
+      type: Network
     },
     destination: string_attribute_writable
-  }
-};
+  };
 
-export class NetworkInterface extends SkeletonNetworkInterface {
-  static typeDefinition = NetworkInterfaceTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);

package/src/network-interfaces/tun.mjs

@@ -1,12 +1,11 @@
 import { addType } from "pacc";
 import { NetworkInterface } from "./network-interface.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 
 export class TUNNetworkInterface extends NetworkInterface {
   static name = "tun";
-  static extends = NetworkInterfaceTypeDefinition;
-  static specializationOf = NetworkInterfaceTypeDefinition;
-  static owners = NetworkInterfaceTypeDefinition.owners;
+  static extends = NetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = NetworkInterface.owners;
   static key = "name";
 
   static typeDefinition = this;

package/src/network-interfaces/wireguard.mjs

@@ -1,12 +1,12 @@
 import { addType } from "pacc";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
+import { NetworkInterface } from "./network-interface.mjs";
 
 export class WireguardNetworkInterface extends SkeletonNetworkInterface {
   static name = "wireguard";
-  static extends = NetworkInterfaceTypeDefinition;
-  static specializationOf = NetworkInterfaceTypeDefinition;
-  static owners = NetworkInterfaceTypeDefinition.owners;
+  static extends = NetworkInterface;
+  static specializationOf = NetworkInterface;
+  static owners = NetworkInterface.owners;
   static key = "name";
 
   static typeDefinition = this;

package/src/network-interfaces/wlan.mjs

@@ -6,15 +6,13 @@ import {
   addType
 } from "pacc";
 import { writeLines, sectionLines } from "../utils.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
-import {
-  EthernetNetworkInterface
-} from "./ethernet.mjs";
+import { NetworkInterface } from "./network-interface.mjs";
+import { EthernetNetworkInterface } from "./ethernet.mjs";
 
 export class WLANNetworkInterface extends EthernetNetworkInterface {
   static name = "wlan";
   static extends = EthernetNetworkInterface;
-  static specializationOf = NetworkInterfaceTypeDefinition;
+  static specializationOf = NetworkInterface;
   static owners = EthernetNetworkInterface.owners;
   static key = "name";
   static attributes = {