pmcf 4.25.8 → 4.25.10

package/package.json

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

package/src/location.mjs

@@ -3,17 +3,15 @@ import { addType } from "pacc";
 import { Owner } from "pmcf";
 import { loadHooks } from "./hooks.mjs";
 
-const LocationTypeDefinition = {
-  name: "location",
-  priority: 2,
-  owners: [Owner.typeDefinition, "location", "root"],
-  extends: Owner.typeDefinition,
-  key: "name",
-  attributes: {}
-};
-
 export class Location extends Owner {
-  static typeDefinition = LocationTypeDefinition;
+  static name = "location";
+  static priority = 2;
+  static owners = [Owner.typeDefinition, "location", "root"];
+  static extends = Owner.typeDefinition;
+  static key = "name";
+  static attributes = {};
+
+  static typeDefinition = this;
 
   static {
     addType(this);

package/src/subnet.mjs

@@ -15,22 +15,20 @@ import {
 import { networks_attribute } from "./network-support.mjs";
 import { Base } from "./base.mjs";
 
-const SubnetTypeDefinition = {
-  name: "subnet",
-  priority: 1,
-  owners: ["location", "owner", "network", "root"],
-  constructWithIdentifierOnly: true,
-  key: "address",
-  attributes: {
+export class Subnet extends Base {
+  static name = "subnet";
+  static priority = 1;
+  static owners = ["location", "owner", "network", "root"];
+  static constructWithIdentifierOnly = true;
+  static key = "address";
+  static attributes = {
     address: name_attribute,
     networks: networks_attribute,
     prefixLength: number_attribute,
     family: string_attribute
-  }
-};
+  };
 
-export class Subnet extends Base {
-  static typeDefinition = SubnetTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);