pmcf 3.19.10 → 3.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.19.10",
+  "version": "3.20.0",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "ip-utilties": "^2.0.2",
-    "npm-pkgbuild": "^19.1.2",
+    "npm-pkgbuild": "^19.1.3",
     "pacc": "^6.8.1",
     "package-directory": "^8.1.0"
   },

package/src/base.mjs

@@ -43,6 +43,7 @@ export class Base {
   _packaging = new Set();
   _directory;
   _finalize;
+  _extends = [];
   _properties;
 
   static {
@@ -61,14 +62,10 @@ export class Base {
     return this.typeName + ".json";
   }
 
-  static get fileNameGlob() {
-    return "**/" + this.typeFileName;
-  }
-
   /**
    *
    * @param {Base} owner
-   * @param {object} data
+   * @param {object} [data]
    */
   constructor(owner, data) {
     this.owner = owner;
@@ -210,7 +207,7 @@ export class Base {
                   this.error(
                     "Not found",
                     name,
-                    attribute.type.map(t => t.name),
+                    attribute.type?.map && attribute.type.map(t => t.name),
                     value
                   );
                 });
@@ -270,6 +267,30 @@ export class Base {
         instantiateAndAssign(name, attribute, value);
       }
     }
+
+    if (data?.extends) {
+      this.finalize(() => {
+        for (const object of this.extends) {
+          object.execFinalize();
+          this._applyExtends(object);
+        }
+      });
+    }
+
+    /*if(this.type) {
+      console.log(this.toString(),this.name,this.fullName);
+    }*/
+  }
+
+  _applyExtends() {
+  }
+
+  set extends(value) {
+    this._extends.push(value);
+  }
+
+  get extends() {
+    return this._extends;
   }
 
   named(name) {}
@@ -318,13 +339,6 @@ export class Base {
     return this.constructor.typeDefinition.name;
   }
 
-  /**
-   * @return {Iterable<Base>}
-   */
-  get extends() {
-    return [];
-  }
-
   *_extendedPropertyIterator(propertyName, seen) {
     if (!seen.has(this)) {
       seen.add(this);
@@ -410,6 +424,9 @@ export class Base {
     this._priority = value;
   }
 
+  /**
+   * @return {number}
+   */
   get priority() {
     return this._priority ?? this.owner?.priority;
   }
@@ -499,7 +516,7 @@ export class Base {
   }
 
   get isTemplate() {
-    return false;
+    return  this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false;
   }
 
   get properties() {
@@ -518,7 +535,11 @@ export class Base {
   }
 
   property(name) {
-    return this._properties?.[name] ?? this.owner?.property(name) ?? this.owner?.owner?.property(name);
+    return (
+      this._properties?.[name] ??
+      this.owner?.property(name) ??
+      this.owner?.owner?.property(name)
+    );
   }
 
   /**
@@ -634,6 +655,9 @@ export function extractFrom(
 
   do {
     for (const [path, def] of attributeIterator(typeDefinition.attributes)) {
+      if (def.private) {
+        continue;
+      }
       const name = path.join(".");
       let value = object[name];
 

package/src/host.mjs

@@ -88,7 +88,6 @@ const HostTypeDefinition = {
 };
 
 export class Host extends ServiceOwner {
-  _extends = [];
   _aliases = new Set();
   _networkInterfaces = new Map();
   _provides = new Set();
@@ -114,27 +113,13 @@ export class Host extends ServiceOwner {
   read(data, type) {
     super.read(data, type);
 
-    if (data?.extends) {
-      this.finalize(() => {
-        for (const host of this.extends) {
-          host.execFinalize();
-          this._applyExtends(host);
-        }
-      });
-    }
     this.extra = data.extra;
   }
 
   _applyExtends(host) {
-    for (const service of host.services) {
-      //present.extends.push(service);
-
-      this.services = service.forOwner(this);
-    }
-
+    super._applyExtends(host);
     for (const [name, ni] of host.networkInterfaces) {
-      if (ni.isTemplate) {
-      } else {
+      if (!ni.isTemplate) {
         let present = this._networkInterfaces.get(name);
 
         if (!present) {
@@ -210,7 +195,7 @@ export class Host extends ServiceOwner {
   }
 
   get isTemplate() {
-    return this.isModel || this.name?.match(/services\//); // TODO
+    return this.isModel || super.isTemplate;
   }
 
   get isModel() {
@@ -233,14 +218,6 @@ export class Host extends ServiceOwner {
     return this.extends.reduce((a, c) => a.union(c.aliases), this._aliases);
   }
 
-  set extends(value) {
-    this._extends.push(value);
-  }
-
-  get extends() {
-    return this._extends;
-  }
-
   set provides(value) {
     if (value instanceof Set) {
       this._provides = this._provides.union(value);

package/src/location.mjs

@@ -53,7 +53,7 @@ export class Location extends Owner {
         name: `${this.typeName}-${this.name}`,
         description: `${this.typeName} definitions for ${this.fullName}`,
         access: "private",
-        dependencies: { jq: ">=1.6" },
+        dependencies: { jq: ">=1.8" },
         provides: ["location", "mf-location"],
         replaces: [`mf-location-${this.name}`],
         hooks: await loadHooks(

package/src/network-interfaces/skeleton.mjs

@@ -7,7 +7,6 @@ import { ServiceOwner } from "../service-owner.mjs";
  * 
  */
 export class SkeletonNetworkInterface extends ServiceOwner {
-  _extends = [];
   _network;
 
   static get typeName() {
@@ -18,18 +17,6 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     return "network_interface";
   }
 
-  set extends(value) {
-    this._extends.push(value);
-  }
-
-  get extends() {
-    return this._extends;
-  }
-
-  get isTemplate() {
-    return this.name?.indexOf("*") >= 0;
-  }
-
   get host() {
     if (this.owner instanceof Host) {
       return this.owner;

package/src/owner.mjs

@@ -4,7 +4,9 @@ import {
   string_collection_attribute_writable,
   string_attribute_writable,
   email_attribute,
-  addType, types
+  addType,
+  types,
+  boolean_attribute_writable_false
 } from "pacc";
 import { asIterator } from "./utils.mjs";
 import { Base } from "./base.mjs";
@@ -35,7 +37,8 @@ const OwnerTypeDefinition = {
     timezone: string_attribute_writable,
     architectures: string_collection_attribute_writable,
     locales: string_collection_attribute_writable,
-    administratorEmail: { ...email_attribute, writable: true }
+    administratorEmail: { ...email_attribute, writable: true },
+    template: { ...boolean_attribute_writable_false, private: true }
   }
 };
 
@@ -53,6 +56,13 @@ export class Owner extends Base {
     return OwnerTypeDefinition;
   }
 
+  /**
+   * @return {boolean}
+   */
+  get isTemplate() {
+    return this.template ?? super.isTemplate;
+  }
+
   _traverse(...args) {
     if (super._traverse(...args)) {
       for (const typeSlot of this._membersByType.values()) {

package/src/root.mjs

@@ -74,8 +74,8 @@ export class Root extends Location {
     for (const type of Object.values(types).sort(
       (a, b) => (b.priority || 1.0) - (a.priority || 1.0)
     )) {
-      if (type.clazz?.fileNameGlob) {
-        for await (const name of glob(type.clazz.fileNameGlob, {
+      if (type.clazz?.typeFileName) {
+        for await (const name of glob( "**/" + type.clazz.typeFileName, {
           cwd: this.directory
         })) {
           await this.load(name, { type });

package/src/service-owner.mjs

@@ -1,4 +1,4 @@
-import { Base } from "pmcf";
+import { Base, Service } from "pmcf";
 
 export class ServiceOwner extends Base {
   _services = [];
@@ -7,21 +7,26 @@ export class ServiceOwner extends Base {
     return this._services;
   }
 
+  /**
+   * @param {Service} service
+   */
   set services(service) {
-    const present = this._services.find(s => s.name === service.name);
-
-    if (!present) {
-      this._services.push(service);
-    }
+    this._services.push(service);
   }
 
-  *findServices(filter) {
-    const services = filter
-      ? this.expression(`services[${filter}]`)
-      : this.services;
+  _applyExtends(owner) {
+    super._applyExtends(owner);
 
-    for (const service of services) {
-      yield service;
+    for (const service of owner.services) {
+      const present = this._services.find(s => s.name === service.name);
+
+      if (present && service.isTemplate) {
+        if (present.extends.indexOf(service) < 0) {
+          present.extends.push(service);
+        }
+      } else {
+        this.services = service.forOwner(this);
+      }
     }
   }
 
@@ -36,6 +41,16 @@ 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);
@@ -45,16 +60,17 @@ export class ServiceOwner extends Base {
     }
 
     if (typeName === "number") {
-      throw new Error("invalidType");
+      throw new Error("invalidType", { cause: typeName });
     }
-    //console.log("TN***",typeName, name);
     return super.typeNamed(typeName, name);
   }
 
+  /**
+   *
+   * @param {string} name
+   * @returns {Service|undefined}
+   */
   named(name) {
-    const service = this.services.find(s => s.name === name);
-    if (service) {
-      return service;
-    }
+    return this._services.find(s => s.name === name);
   }
 }

package/src/service.mjs

@@ -89,16 +89,8 @@ export class Service extends Base {
     return ServiceTypeDefinition;
   }
 
-  get isTemplate() {
-    // TODO
-    if (this.fullName.startsWith("/services")) {
-      return true;
-    }
-    return super.isTemplate;
-  }
-
   toString() {
-    return `${super.toString()}[${this.type}]`;
+    return `${this.fullName}(${this.type})`;
   }
 
   get network() {

package/src/services/kea.mjs

@@ -152,8 +152,9 @@ export class KeaService extends Service {
     const network = this.network;
     const host = this.host;
     const name = host.name;
+    const pkgName = `kea-${this.location.name}-${name}`;
 
-    console.log("kea", name, network.name);
+    console.log(pkgName, this.fullName, network.name);
 
     const dnsServerEndpoints = serviceEndpoints(network, {
       services: 'in("dns",types) && priority>=300',
@@ -165,7 +166,7 @@ export class KeaService extends Service {
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
       properties: {
-        name: `kea-${this.location.name}-${name}`,
+        name: pkgName,
         description: `kea definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: [`kea>=${keaVersion}`]

package/src/services/openldap.mjs

@@ -82,28 +82,38 @@ export class OpenLDAPService extends Service {
     const network = this.network;
     const host = this.host;
     const name = host.name;
-
-    console.log("openldap", name, network.name);
-
-    const filePermissions = [
-      {
-        mode: 0o644,
-        owner: "ldap",
-        group: "ldap"
-      },
-      {
-        mode: 0o755,
-        owner: "ldap",
-        group: "ldap"
-      }
-    ];
+    const pkgName = `openldap-${this.location.name}-${name}`;
+    const owner = "ldap";
+    const group = "ldap";
+
+    console.log(
+      pkgName,
+      this.fullName,
+      this.alias,
+      network.name,
+      this.extends.map(o => o.fullName)
+    );
 
     const packageData = {
       dir,
-      sources: [new FileContentProvider(dir + "/", ...filePermissions)],
+      sources: [
+        new FileContentProvider(
+          dir + "/",
+          {
+            mode: 0o644,
+            owner,
+            group
+          },
+          {
+            mode: 0o755,
+            owner,
+            group
+          }
+        )
+      ],
       outputs: this.outputs,
       properties: {
-        name: `openldap-${this.location.name}-${name}`,
+        name: pkgName,
         description: `openldap definitions for ${this.fullName}@${name}`,
         access: "private",
         dependencies: ["openldap>=2.6.10"],
@@ -114,13 +124,13 @@ export class OpenLDAPService extends Service {
     addHook(
       packageData.properties.hooks,
       "post_upgrade",
-      "setfacl -m u:ldap:r /etc/letsencrypt/archive/*/privkey*.pem"
+      `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
     );
 
     addHook(
       packageData.properties.hooks,
       "post_install",
-      "setfacl -m u:ldap:r /etc/letsencrypt/archive/*/privkey*.pem"
+      `setfacl -m u:${owner}:r /etc/letsencrypt/archive/*/privkey*.pem`
     );
 
     await writeLines(

package/src/services/systemd-journal-remote.mjs

@@ -104,15 +104,22 @@ export class SystemdJournalRemoteService extends Service {
         configFileName: `etc/systemd/journal-remote.conf.d/${name}.conf`,
         content: [
           "Remote",
-          getAttributesJSON(
-            this,
-            SystemdJournalRemoteServiceTypeDefinition.attributes
-          )
+          {
+            ...getAttributesJSON(
+              this,
+              SystemdJournalRemoteServiceTypeDefinition.attributes
+            ),
+            // TODO extendet properties with getAttribute()
+            ...Object.fromEntries(
+              Object.entries(
+                SystemdJournalRemoteServiceTypeDefinition.attributes
+              )
+                .map(([k, v]) => [k, this.extendedProperty(k)])
+                .filter(([k, v]) => v !== undefined)
+            )
+          }
         ]
-      } /*,
-      {
-        serviceName: "systemd-journal-remote.socket"
-      }*/
+      }
     ];
   }
 }

package/types/base.d.mts

@@ -38,13 +38,12 @@ export class Base {
     static get typeName(): string;
     static get typeDefinition(): typeof Base;
     static get typeFileName(): string;
-    static get fileNameGlob(): string;
     /**
      *
      * @param {Base} owner
-     * @param {object} data
+     * @param {object} [data]
      */
-    constructor(owner: Base, data: object);
+    constructor(owner: Base, data?: object);
     owner: Base;
     description: any;
     name: string;
@@ -52,9 +51,13 @@ export class Base {
     _packaging: Set<any>;
     _directory: any;
     _finalize: any;
+    _extends: any[];
     _properties: any;
     ownerFor(attribute: any, data: any): any;
     read(data: any, type?: any): void;
+    _applyExtends(): void;
+    set extends(value: any[]);
+    get extends(): any[];
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;
@@ -62,11 +65,7 @@ export class Base {
     isNamed(name: any): boolean;
     relativeName(name: any): any;
     get typeName(): any;
-    /**
-     * @return {Iterable<Base>}
-     */
-    get extends(): Iterable<Base>;
-    _extendedPropertyIterator(propertyName: any, seen: any): any;
+    _extendedPropertyIterator(propertyName: any, seen: any): Generator<any, void, any>;
     _extendedProperty(propertyName: any, seen: any): any;
     extendedProperty(propertyName: any): any;
     get root(): any;
@@ -80,9 +79,12 @@ export class Base {
     get locales(): any;
     get country(): any;
     get timezone(): any;
-    set priority(value: any);
-    get priority(): any;
-    _priority: any;
+    set priority(value: number);
+    /**
+     * @return {number}
+     */
+    get priority(): number;
+    _priority: number;
     get smtp(): any;
     /**
      *
@@ -108,7 +110,7 @@ export class Base {
     preparePackages(stagingDir: any): AsyncGenerator<never, void, unknown>;
     set tags(value: Set<any>);
     get tags(): Set<any>;
-    get isTemplate(): boolean;
+    get isTemplate(): any;
     get properties(): any;
     get globals(): any;
     property(name: any): any;

package/types/cluster.d.mts

@@ -143,6 +143,26 @@ export class Cluster extends Host {
                     env?: string[] | string;
                     additionalValues?: object;
                 };
+                template: {
+                    private: boolean;
+                    type: object;
+                    isKey: boolean;
+                    writable: boolean;
+                    mandatory: boolean;
+                    collection: boolean;
+                    credential?: boolean;
+                    persistent?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
+                };
             };
         })[];
         extends: {

package/types/host.d.mts

@@ -183,7 +183,6 @@ export class Host extends ServiceOwner {
             address: import("pacc").AttributeDefinition;
         };
     };
-    _extends: any[];
     _aliases: Set<any>;
     _networkInterfaces: Map<any, any>;
     _provides: Set<any>;
@@ -198,7 +197,6 @@ export class Host extends ServiceOwner {
     _serial: any;
     _keymap: any;
     extra: any;
-    _applyExtends(host: any): void;
     set serial(value: any);
     get serial(): any;
     set deployment(value: any);
@@ -211,13 +209,10 @@ export class Host extends ServiceOwner {
     get keymap(): any;
     set architecture(value: any);
     get architecture(): any;
-    get isTemplate(): true | RegExpMatchArray;
     get isModel(): boolean;
     get model(): any;
     set aliases(value: any);
     get aliases(): any;
-    set extends(value: any[]);
-    get extends(): any[];
     set provides(value: any);
     get provides(): any;
     set replaces(value: any);
@@ -240,6 +235,7 @@ export class Host extends ServiceOwner {
     get clusters(): Set<any>;
     get host(): this;
     hosts(): Generator<this, void, unknown>;
+    named(name: any): any;
     get networks(): Set<any>;
     set networkInterfaces(networkInterface: Map<any, any>);
     get networkInterfaces(): Map<any, any>;

package/types/location.d.mts

@@ -143,6 +143,26 @@ export class Location extends Owner {
                     env?: string[] | string;
                     additionalValues?: object;
                 };
+                template: {
+                    private: boolean;
+                    type: object;
+                    isKey: boolean;
+                    writable: boolean;
+                    mandatory: boolean;
+                    collection: boolean;
+                    credential?: boolean;
+                    persistent?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
+                };
             };
         })[];
         extends: {
@@ -287,6 +307,26 @@ export class Location extends Owner {
                     env?: string[] | string;
                     additionalValues?: object;
                 };
+                template: {
+                    private: boolean;
+                    type: object;
+                    isKey: boolean;
+                    writable: boolean;
+                    mandatory: boolean;
+                    collection: boolean;
+                    credential?: boolean;
+                    persistent?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
+                };
             };
         };
         key: string;

package/types/network-interfaces/ethernet.d.mts

@@ -226,6 +226,26 @@ export class EthernetNetworkInterface extends NetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;
@@ -721,6 +741,26 @@ export class EthernetNetworkInterface extends NetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;

package/types/network-interfaces/loopback.d.mts

@@ -197,6 +197,26 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;
@@ -692,6 +712,26 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;

package/types/network-interfaces/network-interface.d.mts

@@ -195,6 +195,26 @@ export namespace NetworkInterfaceTypeDefinition {
                             env?: string[] | string;
                             additionalValues?: object;
                         };
+                        template: {
+                            private: boolean;
+                            type: object;
+                            isKey: boolean;
+                            writable: boolean;
+                            mandatory: boolean;
+                            collection: boolean;
+                            credential?: boolean;
+                            persistent?: boolean;
+                            depends?: string;
+                            description?: string;
+                            default?: any;
+                            set?: Function;
+                            get?: Function;
+                            prepareValue?: Function;
+                            values?: Set<any>;
+                            externalName?: string;
+                            env?: string[] | string;
+                            additionalValues?: object;
+                        };
                     };
                 };
                 key: string;
@@ -691,6 +711,26 @@ export class NetworkInterface extends SkeletonNetworkInterface {
                                 env?: string[] | string;
                                 additionalValues?: object;
                             };
+                            template: {
+                                private: boolean;
+                                type: object;
+                                isKey: boolean;
+                                writable: boolean;
+                                mandatory: boolean;
+                                collection: boolean;
+                                credential?: boolean;
+                                persistent?: boolean;
+                                depends?: string;
+                                description?: string;
+                                default?: any;
+                                set?: Function;
+                                get?: Function;
+                                prepareValue?: Function;
+                                values?: Set<any>;
+                                externalName?: string;
+                                env?: string[] | string;
+                                additionalValues?: object;
+                            };
                         };
                     };
                     key: string;

package/types/network-interfaces/skeleton.d.mts

@@ -2,11 +2,8 @@
  *
  */
 export class SkeletonNetworkInterface extends ServiceOwner {
-    _extends: any[];
     _network: any;
     get typeName(): string;
-    set extends(value: any[]);
-    get extends(): any[];
     get host(): Host;
     hosts(): Generator<Host, void, unknown>;
     get network_interface(): this;

package/types/network-interfaces/tun.d.mts

@@ -197,6 +197,26 @@ export class TUNNetworkInterface extends NetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;
@@ -692,6 +712,26 @@ export class TUNNetworkInterface extends NetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;

package/types/network-interfaces/wireguard.d.mts

@@ -197,6 +197,26 @@ export class WireguardNetworkInterface extends SkeletonNetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;
@@ -692,6 +712,26 @@ export class WireguardNetworkInterface extends SkeletonNetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;

package/types/network-interfaces/wlan.d.mts

@@ -199,6 +199,26 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
                                         env?: string[] | string;
                                         additionalValues?: object;
                                     };
+                                    template: {
+                                        private: boolean;
+                                        type: object;
+                                        isKey: boolean;
+                                        writable: boolean;
+                                        mandatory: boolean;
+                                        collection: boolean;
+                                        credential?: boolean;
+                                        persistent?: boolean;
+                                        depends?: string;
+                                        description?: string;
+                                        default?: any;
+                                        set?: Function;
+                                        get?: Function;
+                                        prepareValue?: Function;
+                                        values?: Set<any>;
+                                        externalName?: string;
+                                        env?: string[] | string;
+                                        additionalValues?: object;
+                                    };
                                 };
                             };
                             key: string;
@@ -694,6 +714,26 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
                                         env?: string[] | string;
                                         additionalValues?: object;
                                     };
+                                    template: {
+                                        private: boolean;
+                                        type: object;
+                                        isKey: boolean;
+                                        writable: boolean;
+                                        mandatory: boolean;
+                                        collection: boolean;
+                                        credential?: boolean;
+                                        persistent?: boolean;
+                                        depends?: string;
+                                        description?: string;
+                                        default?: any;
+                                        set?: Function;
+                                        get?: Function;
+                                        prepareValue?: Function;
+                                        values?: Set<any>;
+                                        externalName?: string;
+                                        env?: string[] | string;
+                                        additionalValues?: object;
+                                    };
                                 };
                             };
                             key: string;
@@ -1214,6 +1254,26 @@ export class WLANNetworkInterface extends EthernetNetworkInterface {
                                     env?: string[] | string;
                                     additionalValues?: object;
                                 };
+                                template: {
+                                    private: boolean;
+                                    type: object;
+                                    isKey: boolean;
+                                    writable: boolean;
+                                    mandatory: boolean;
+                                    collection: boolean;
+                                    credential?: boolean;
+                                    persistent?: boolean;
+                                    depends?: string;
+                                    description?: string;
+                                    default?: any;
+                                    set?: Function;
+                                    get?: Function;
+                                    prepareValue?: Function;
+                                    values?: Set<any>;
+                                    externalName?: string;
+                                    env?: string[] | string;
+                                    additionalValues?: object;
+                                };
                             };
                         };
                         key: string;

package/types/network.d.mts

@@ -143,6 +143,26 @@ export namespace NetworkTypeDefinition {
                 env?: string[] | string;
                 additionalValues?: object;
             };
+            template: {
+                private: boolean;
+                type: object;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                credential?: boolean;
+                persistent?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                prepareValue?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
+            };
         };
     };
     export { _extends as extends };
@@ -440,6 +460,26 @@ export class Network extends Owner {
                     env?: string[] | string;
                     additionalValues?: object;
                 };
+                template: {
+                    private: boolean;
+                    type: object;
+                    isKey: boolean;
+                    writable: boolean;
+                    mandatory: boolean;
+                    collection: boolean;
+                    credential?: boolean;
+                    persistent?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
+                };
             };
         };
         key: string;

package/types/owner.d.mts

@@ -141,10 +141,34 @@ export class Owner extends Base {
                 env?: string[] | string;
                 additionalValues?: object;
             };
+            template: {
+                private: boolean;
+                type: object;
+                isKey: boolean;
+                writable: boolean;
+                mandatory: boolean;
+                collection: boolean;
+                credential?: boolean;
+                persistent?: boolean;
+                depends?: string;
+                description?: string;
+                default?: any;
+                set?: Function;
+                get?: Function;
+                prepareValue?: Function;
+                values?: Set<any>;
+                externalName?: string;
+                env?: string[] | string;
+                additionalValues?: object;
+            };
         };
     };
     _membersByType: Map<any, any>;
     _bridges: Set<any>;
+    /**
+     * @return {boolean}
+     */
+    get isTemplate(): boolean;
     _traverse(...args: any[]): boolean;
     find(pattern: any): Generator<any, void, unknown>;
     named(name: any): any;

package/types/service-owner.d.mts

@@ -1,9 +1,19 @@
 export class ServiceOwner extends Base {
     _services: any[];
-    set services(service: any[]);
-    get services(): any[];
-    findServices(filter: any): Generator<any, void, unknown>;
+    /**
+     * @param {Service} service
+     */
+    set services(service: Service);
+    get services(): Service;
+    _applyExtends(owner: any): void;
     _traverse(...args: any[]): boolean;
-    named(name: any): any;
+    findServices(filter: any): Generator<any, void, unknown>;
+    /**
+     *
+     * @param {string} name
+     * @returns {Service|undefined}
+     */
+    named(name: string): Service | undefined;
 }
 import { Base } from "pmcf";
+import { Service } from "pmcf";