pmcf 6.58.3 → 6.59.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.58.3",
+  "version": "6.59.1",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.8",
     "ip-utilties": "^3.13.1",
     "npm-pkgbuild": "^22.2.6",
-    "pacc": "^11.15.0",
+    "pacc": "^11.16.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.1"
   },

package/src/common-attributes.mjs

@@ -160,7 +160,7 @@ export const networkAttributes = {
   ssid: ssid_attribute,
   psk: psk_attribute,
   secretName: { ...string_attribute_writable, name: "secretName" },
-  metric: { ...integer_attribute_writable, name: "metric" /*default: 1004*/ },
+  metric: { ...integer_attribute_writable, name: "metric" },
   mtu: { ...integer_attribute_writable, name: "mtu", default: 1500 },
   gateway: { ...default_attribute_writable, name: "gateway", type: "host" },
   multicastDNS: {

package/src/core-service.mjs

@@ -74,7 +74,7 @@ export class CoreService extends base {
       type: CoreService
     },
     priority: priority_attribute,
-    weight: { ...number_attribute_writable, name: "weight" /*default: 1*/ },
+    weight: { ...number_attribute_writable, name: "weight" },
     types: { ...string_set_attribute_writable, name: "types" },
     systemdService: { ...string_attribute_writable, name: "systemdService" },
     systemUserName: { ...string_attribute_writable, name: "systemUserName" },

package/src/core.mjs

@@ -322,4 +322,8 @@ export class core {
   get root() {
     return this.owner?.root;
   }
+
+  get site() {
+    return this.owner?.site;
+  }
 }

package/src/initialization-context.mjs

@@ -4,7 +4,8 @@ import {
   extendingAttributeIterator,
   types,
   resolveTypeLinks,
-  create
+  create,
+  isExtendingType
 } from "pacc";
 import { core } from "./core.mjs";
 import { root } from "./root.mjs";
@@ -200,7 +201,7 @@ export class InitializationContext {
 
     for (const [path, attribute] of extendingAttributeIterator(
       owner.constructor,
-      attribute => attribute.type === type && attribute.collection
+      attribute => isExtendingType(type, attribute.type) && attribute.collection
     )) {
       try {
         return assign(

package/src/module.mjs

@@ -8,6 +8,7 @@ export * from "./cluster.mjs";
 export * from "./keepalived.mjs";
 
 export * from "./owner.mjs";
+export * from "./site.mjs";
 export * from "./root.mjs";
 export * from "./subnet.mjs";
 export * from "./service-owner.mjs";

package/src/network.mjs

@@ -5,7 +5,7 @@ import { networkAttributes, bridges_attribute } from "./common-attributes.mjs";
 import { Subnet } from "./subnet.mjs";
 
 export class network extends owner {
-  static owners = [owner, "root"];
+  static owners = [owner, "site", "root"];
   static attributes = {
     ...networkAttributes,
     bridges: bridges_attribute

package/src/owner.mjs

@@ -23,14 +23,14 @@ import { loadHooks } from "./hooks.mjs";
 
 export class owner extends ServiceOwner {
   static priority = 2;
-  static owners = [owner, "root"];
+  static owners = [owner, "site", "root"];
   static attributes = {
     networks: networks_attribute,
-    hosts: hosts_attribute,
     clusters: clusters_attribute,
-    owners: owners_attribute,
+    hosts: hosts_attribute,
     subnets: subnets_attribute,
     networkInterfaces: networkInterfaces_attribute,
+    owners: owners_attribute,
     country: { ...string_attribute_writable, name: "country" },
     domain: { ...string_attribute_writable, name: "domain" },
     domains: { ...string_set_attribute_writable, name: "domains" },

package/src/root.mjs

@@ -1,7 +1,7 @@
 import { owner, addType } from "pmcf";
 
 export class root extends owner {
-  static priority = 3;
+  static priority = 100;
   static {
     addType(this);
   }

package/src/service-owner.mjs

@@ -5,7 +5,7 @@ import { owner_attribute } from "./common-attributes.mjs";
 export class ServiceOwner extends base {
   static name = "service-owner";
   static priority = 1.9;
-  static owners = ["owner", "network", "root"];
+  static owners = ["owner", "site", "network", "root"];
   static attributes = {
     services: {
       ...default_collection_attribute_writable,

package/src/site.mjs

@@ -0,0 +1,16 @@
+import { addType } from "pmcf";
+import { owner } from "./owner.mjs";
+
+export class site extends owner {
+  static priority = 10;
+  static owners = [owner, "root"];
+
+  static {
+    addType(this);
+  }
+
+  get site()
+  {
+    return this;
+  }
+}

package/src/subnet.mjs

@@ -12,7 +12,7 @@ import { addType, network, core } from "pmcf";
 export class Subnet extends core {
   static name = "subnet";
   static priority = 1;
-  static owners = ["owner", "network", "network_interface", "root"];
+  static owners = ["owner", "site", "network", "network_interface", "root"];
   static constructWithIdentifierOnly = true;
   static key = "address";
   static attributes = {