pmcf 4.19.1 → 4.20.0

package/src/network-interfaces/tun.mjs

@@ -11,14 +11,12 @@ const TUNdNetworkInterfaceTypeDefinition = {
 };
 
 export class TUNNetworkInterface extends NetworkInterface {
+  static typeDefinition = TUNdNetworkInterfaceTypeDefinition;
+
   static {
     addType(this);
   }
 
-  static get typeDefinition() {
-    return TUNdNetworkInterfaceTypeDefinition;
-  }
-
   get kind() {
     return TUNdNetworkInterfaceTypeDefinition.name;
   }

package/src/network-interfaces/wireguard.mjs

@@ -11,14 +11,12 @@ const WireguardNetworkInterfaceTypeDefinition = {
 };
 
 export class WireguardNetworkInterface extends SkeletonNetworkInterface {
+  static typeDefinition = WireguardNetworkInterfaceTypeDefinition;
+
   static {
     addType(this);
   }
-
-  static get typeDefinition() {
-    return WireguardNetworkInterfaceTypeDefinition;
-  }
-
+  
   get kind() {
     return WireguardNetworkInterfaceTypeDefinition.name;
   }

package/src/network-interfaces/wlan.mjs

@@ -26,9 +26,7 @@ const WLANNetworkInterfaceTypeDefinition = {
 };
 
 export class WLANNetworkInterface extends EthernetNetworkInterface {
-  _ssid;
-  _psk;
-  _secretName;
+  static typeDefinition = WLANNetworkInterfaceTypeDefinition;
 
   static {
     addType(this);
@@ -38,10 +36,9 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
     return name.match(/^wlan\d+$/);
   }
 
-  static get typeDefinition() {
-    return WLANNetworkInterfaceTypeDefinition;
-  }
-
+  _ssid;
+  _psk;
+  _secretName;
   get kind() {
     return WLANNetworkInterfaceTypeDefinition.name;
   }

package/src/network.mjs

@@ -5,6 +5,7 @@ import { networkAttributes } from "./network-support.mjs";
 
 export const NetworkTypeDefinition = {
   name: "network",
+  priority: 2,
   owners: ["location", "owner", "root"],
   extends: Owner.typeDefinition,
   key: "name",
@@ -20,19 +21,17 @@ export const NetworkTypeDefinition = {
 };
 
 export class Network extends Owner {
-  kind;
-  scope;
-  metric;
-  gateway;
-  _bridge;
+  static typeDefinition = NetworkTypeDefinition;
 
   static {
     addType(this);
   }
 
-  static get typeDefinition() {
-    return NetworkTypeDefinition;
-  }
+  kind;
+  scope;
+  metric;
+  gateway;
+  _bridge;
 
   get network() {
     return this;
@@ -83,6 +82,9 @@ export class Network extends Owner {
     this._secretName = value;
   }
 
+  /**
+   * @return {string}
+   */
   get secretName() {
     return this._secretName ?? `${this.name}.password`;
   }

package/src/owner.mjs

@@ -3,7 +3,7 @@ import {
   default_attribute_writable,
   string_set_attribute_writable,
   string_attribute_writable,
-  boolean_attribute_writable_false,
+  boolean_attribute_writable,
   email_attribute,
   addType,
   types
@@ -15,6 +15,7 @@ import { networks_attribute } from "./network-support.mjs";
 
 const OwnerTypeDefinition = {
   name: "owner",
+  priority: 2,
   owners: ["location", "owner", "root"],
   extends: Base.typeDefinition,
   key: "name",
@@ -38,23 +39,21 @@ const OwnerTypeDefinition = {
     architectures: string_set_attribute_writable,
     locales: string_set_attribute_writable,
     administratorEmail: { ...email_attribute, writable: true },
-    template: { ...boolean_attribute_writable_false, private: true }
+    template: { ...boolean_attribute_writable, private: true }
   }
 };
 
 const EMPTY = new Map();
 
 export class Owner extends Base {
-  _membersByType = new Map();
-  _bridges = new Set();
+  static typeDefinition = OwnerTypeDefinition;
 
   static {
     addType(this);
   }
 
-  static get typeDefinition() {
-    return OwnerTypeDefinition;
-  }
+  _membersByType = new Map();
+  _bridges = new Set();
 
   /**
    * @return {boolean}
@@ -127,22 +126,13 @@ export class Owner extends Base {
     return super.typeNamed(typeName, name);
   }
 
-  typeObject(typeName) {
-    return this._membersByType.get(typeName);
-  }
-
   typeList(typeName) {
     const typeSlot = this._membersByType.get(typeName);
     return (typeSlot || EMPTY).values();
   }
 
   addTypeObject(typeName, name, object) {
-    let typeSlot = this._membersByType.get(typeName);
-    if (!typeSlot) {
-      typeSlot = new Map();
-      this._membersByType.set(typeName, typeSlot);
-    }
-
+    const typeSlot = this._membersByType.getOrInsertComputed(typeName, () => new Map());
     typeSlot.set(name, object);
   }
 
@@ -164,16 +154,6 @@ export class Owner extends Base {
     return [...this.hosts].map(host=>host.services).flat();
   }
 
-  *findServices(filter) {
-    for (const host of this.hosts) {
-      yield* host.findServices(filter);
-    }
-  }
-
-  locationNamed(name) {
-    return this.typeNamed("location", name);
-  }
-
   get locations() {
     return this.typeList("location");
   }
@@ -254,11 +234,7 @@ export class Owner extends Base {
     }
   }
 
-  clusterNamed(name) {
-    return this.typeNamed("cluster", name);
-  }
-
-  clusters() {
+  get clusters() {
     return this.typeList("cluster");
   }
 

package/src/root.mjs

@@ -1,21 +1,16 @@
-import { readFile, glob } from "node:fs/promises";
-import { join } from "node:path";
-import { typeFactory, addType, types, resolveTypeLinks } from "pacc";
+import { addType } from "pacc";
 import { Location } from "./location.mjs";
 
 export class Root extends Location {
   static name = "root";
-
-  static get typeDefinition() {
-    return this;
-  }
-
+  static priority = 3;
+  static typeDefinition = this;
+  
   static {
     addType(this);
   }
 
   constructor(directory) {
-    resolveTypeLinks();
     super(undefined, "");
     this.directory = directory;
     this.addObject(this);
@@ -28,68 +23,4 @@ export class Root extends Location {
   get root() {
     return this;
   }
-
-  async _load(name, type) {
-    const data = JSON.parse(
-      await readFile(
-        join(this.directory, name, type.clazz.typeFileName),
-        "utf8"
-      )
-    );
-
-    const parentName = name.replace(/\/[^\/]+$/, "");
-    const owner = name === parentName ? this.root : await this.load(parentName);
-
-    const fullName = this.fullName + "/" + name;
-    data.name = fullName.substring(owner.fullName.length + 1);
-
-    const object = typeFactory(type, owner, data);
-    this.addTypeObject(type.clazz.typeName, name, object);
-    return object;
-  }
-
-  async load(name, options) {
-    name = name.replace(/\/?([^\/]+\.json)?$/, "");
-
-    const object = this.named(name);
-    if (object) {
-      return object;
-    }
-
-    if (options?.type) {
-      return this._load(name, options.type);
-    } else {
-      for (const type of Object.values(types)) {
-        try {
-          return await this._load(name, type);
-        } catch {}
-      }
-    }
-
-    const parentName = name.replace(/\/[^\/]$/, "");
-    return name === parentName ? this.root : this.load(parentName, options);
-  }
-
-  async loadAll() {
-    for (const type of Object.values(types).sort(
-      (a, b) => (b.priority || 1.0) - (a.priority || 1.0)
-    )) {
-      if (type.clazz?.typeFileName) {
-        for await (const name of glob("**/" + type.clazz.typeFileName, {
-          cwd: this.directory
-        })) {
-          if (type === this.constructor) {
-            const data = JSON.parse(
-              await readFile(join(this.directory, name), "utf8")
-            );
-            this._properties = data.properties;
-          } else {
-            await this.load(name, { type });
-          }
-        }
-      }
-    }
-
-    this.execFinalize();
-  }
 }

package/src/service-owner.mjs

@@ -3,19 +3,30 @@ import { Base, Service } from "pmcf";
 export class ServiceOwner extends Base {
   services = [];
 
-  _applyExtends(owner) {
-    super._applyExtends(owner);
+  materializeExtends() {
+    super.materializeExtends();
 
-    for (const service of owner.services) {
-      const present = this.services.find(s => s.name === service.name);
+    for (const serviceOwner of this.walkDirections(["extends"])) {
+      /*console.log(
+        "ServiceOwner materializeExtends",
+        this.fullName,
+        serviceOwner.fullName
+      );*/
 
-      if (present && service.isTemplate) {
-        if (present.extends.indexOf(service) < 0) {
+      for (const service of serviceOwner.services) {
+        const present = this.services.find(s => s.name === service.name);
+
+        if (present) {
+          //console.log("LINK", present.fullName, service.fullName);
           present.extends.push(service);
+        } else {
+          this.services.push(service.forOwner(this));
         }
-      } else {
-        this.services.push(service.forOwner(this));
       }
+
+      /*for (const service of this.services) {
+        service.materializeExtends();
+      }*/
     }
   }
 
@@ -30,16 +41,6 @@ export class ServiceOwner extends Base {
     return false;
   }
 
-  *findServices(filter) {
-    const services = filter
-      ? this.expression(`services[${filter}]`)
-      : this.services;
-
-    for (const service of services) {
-      yield service;
-    }
-  }
-
   typeNamed(typeName, name) {
     if (typeName === "service") {
       const service = this.services.find(s => s.name === name);

package/src/service.mjs

@@ -41,6 +41,7 @@ export const endpointAttributes = {
 
 export const EndpointTypeDefinition = {
   name: "endpoint",
+  priority: 1.1,
   owners: ["service", "network_interface"],
   specializations: {},
   key: "type",
@@ -49,6 +50,7 @@ export const EndpointTypeDefinition = {
 
 export const ServiceTypeDefinition = {
   name: "service",
+  priority: 1.1,
   owners: [Host.typeDefinition, "cluster", "network_interface"],
   extends: Base.typeDefinition,
   specializations: {},
@@ -74,19 +76,17 @@ export const ServiceTypeDefinition = {
 };
 
 export class Service extends Base {
-  _alias;
-  _weight;
-  _type;
-  _port;
-  _systemdService;
+  static typeDefinition = ServiceTypeDefinition;
 
   static {
     addType(this);
   }
 
-  static get typeDefinition() {
-    return ServiceTypeDefinition;
-  }
+  _alias;
+  _weight;
+  _type;
+  _port;
+  _systemdService;
 
   toString() {
     return `${this.fullName}(${this.type})`;
@@ -102,8 +102,7 @@ export class Service extends Base {
     }
   }
 
-  get hosts()
-  {
+  get hosts() {
     return this.owner.hosts;
   }
 
@@ -123,10 +122,6 @@ export class Service extends Base {
     return this.endpoint()?.url;
   }
 
-  get services() {
-    return [this];
-  }
-
   get serviceTypeEndpoints() {
     return serviceTypeEndpoints(ServiceTypes[this.type]);
   }
@@ -242,7 +237,7 @@ export class Service extends Base {
   }
 
   get type() {
-    return this._type ?? this.name;
+    return this.extendedAttribute("_type") ?? this.name;
   }
 
   get types() {
@@ -260,7 +255,7 @@ export class Service extends Base {
     const packageData = super.packageData;
     const location = `${this.location.name}-${this.host.name}`;
     packageData.properties.name = `${this.type}-${location}`;
-    packageData.properties.description =`${this.type} service definitions for ${this.fullName}`;
+    packageData.properties.description = `${this.type} service definitions for ${this.fullName}`;
     packageData.properties.groups.push("service-config", location);
     return packageData;
   }
@@ -305,7 +300,7 @@ export class Service extends Base {
       let parameters = dnsRecord.parameters;
 
       if (parameters) {
-        for (const service of this.findServices()) {
+        for (const service of this.services) {
           if (service !== this) {
             const serviceType = ServiceTypes[service.type];
             /*if(!serviceType) {
@@ -360,7 +355,7 @@ export const sortDescendingByPriority = (a, b) => b.priority - a.priority;
  */
 export function serviceEndpoints(sources, options = {}) {
   const all = asArray(sources)
-    .map(ft => Array.from(ft.findServices(options.services)))
+    .map(source => Array.from(source.expression(options.services)))
     .flat()
     .sort(sortDescendingByPriority)
     .map(service => service.endpoints(options.endpoints))

package/src/services/alpm.mjs

@@ -20,17 +20,15 @@ const ALPMRepositoryTypeDefinition = {
 };
 
 class ALPMRepository extends Base {
+  static typeDefinition = ALPMRepositoryTypeDefinition;
   static {
     addType(this);
   }
-
-  static get typeDefinition() {
-    return ALPMRepositoryTypeDefinition;
-  }
 }
 
 const ALPMServiceTypeDefinition = {
   name: "alpm",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -43,20 +41,17 @@ const ALPMServiceTypeDefinition = {
   },
 
   service: {
-    extends: ["https"]
+    extends: ["https", "http"]
   }
 };
 
 export class ALPMService extends Service {
+  static typeDefinition = ALPMServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return ALPMServiceTypeDefinition;
-  }
-
   repositories = new Map();
 
   typeNamed(type, name) {