pmcf 4.25.7 → 4.25.9

package/package.json

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

package/src/owner.mjs

@@ -37,7 +37,7 @@ const OwnerTypeDefinition = {
     domains: string_set_attribute_writable,
     timezone: string_attribute_writable,
     architectures: string_set_attribute_writable,
-    locales: string_set_attribute_writable,
+    locales: { ...string_set_attribute_writable, description: "unix locale" },
     administratorEmail: { ...email_attribute, writable: true },
     template: { ...boolean_attribute_writable, private: true }
   }
@@ -201,7 +201,7 @@ export class Owner extends Base {
   }
 
   subnetNamed(name) {
-    return [...this.subnets].find(s => s.name == name);
+    return this.subnets.values().find(s => s.name == name);
   }
 
   get subnets() {
@@ -232,11 +232,7 @@ export class Owner extends Base {
   }
 
   subnetForAddress(address) {
-    for (const subnet of this.subnets) {
-      if (subnet.matchesAddress(address)) {
-        return subnet;
-      }
-    }
+    return this.subnets.values().find(subnet => subnet.matchesAddress(address));
   }
 
   get clusters() {
@@ -354,10 +350,7 @@ export class Owner extends Base {
   }
 
   get locales() {
-    if (this.owner) {
-      return this.owner.locales.union(this._locales);
-    }
-    return this._locales;
+    return this.unionFromDirections(["this", "owner"], "_locales");
   }
 
   _timezone;

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);