pmcf 4.16.14 → 4.17.1

package/README.md

@@ -42,65 +42,69 @@ generates config packages for:
 
 *   [Base](#base)
     *   [Parameters](#parameters)
-    *   [extendedAttribute](#extendedattribute)
+    *   [walkDirections](#walkdirections)
         *   [Parameters](#parameters-1)
-    *   [propertyIterator](#propertyiterator)
+    *   [extendedAttribute](#extendedattribute)
         *   [Parameters](#parameters-2)
-    *   [getProperties](#getproperties)
+    *   [propertyIterator](#propertyiterator)
         *   [Parameters](#parameters-3)
+    *   [getProperties](#getproperties)
+        *   [Parameters](#parameters-4)
     *   [priority](#priority)
     *   [expression](#expression)
-        *   [Parameters](#parameters-4)
-    *   [findService](#findservice)
         *   [Parameters](#parameters-5)
-    *   [property](#property)
+    *   [findService](#findservice)
         *   [Parameters](#parameters-6)
-    *   [expand](#expand)
+    *   [templateContent](#templatecontent)
         *   [Parameters](#parameters-7)
+    *   [property](#property)
+        *   [Parameters](#parameters-8)
+    *   [expand](#expand)
+        *   [Parameters](#parameters-9)
 *   [PortEndpoint](#portendpoint)
-    *   [Parameters](#parameters-8)
+    *   [Parameters](#parameters-10)
     *   [port](#port)
     *   [socketAddress](#socketaddress)
 *   [HTTPEndpoint](#httpendpoint)
-    *   [Parameters](#parameters-9)
+    *   [Parameters](#parameters-11)
     *   [port](#port-1)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-10)
+        *   [Parameters](#parameters-12)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-11)
+        *   [Parameters](#parameters-13)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-12)
+        *   [Parameters](#parameters-14)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-13)
+    *   [Parameters](#parameters-15)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-14)
+    *   [Parameters](#parameters-16)
 *   [cidrAddresses](#cidraddresses)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-17)
 *   [isTemplate](#istemplate)
 *   [services](#services)
-    *   [Parameters](#parameters-16)
+    *   [Parameters](#parameters-18)
 *   [named](#named)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-19)
 *   [serviceEndpoints](#serviceendpoints)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-20)
 *   [domainName](#domainname)
-    *   [Parameters](#parameters-19)
+    *   [Parameters](#parameters-21)
 *   [domainFromDominName](#domainfromdominname)
-    *   [Parameters](#parameters-20)
+    *   [Parameters](#parameters-22)
 *   [sectionLines](#sectionlines)
-    *   [Parameters](#parameters-21)
+    *   [Parameters](#parameters-23)
 *   [asArray](#asarray)
-    *   [Parameters](#parameters-22)
+    *   [Parameters](#parameters-24)
 *   [asIterator](#asiterator)
-    *   [Parameters](#parameters-23)
+    *   [Parameters](#parameters-25)
 
 ## Base
 
@@ -112,6 +116,16 @@ properties: use defined values to support attribute value definitions
 *   `owner` **[Base](#base)** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
 
+### walkDirections
+
+Walk the object graph in some directions and deliver seen nodes.
+
+#### Parameters
+
+*   `directions` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**  (optional, default `["this","extends","owner"]`)
+
+Returns **Iterable<[Base](#base)>**&#x20;
+
 ### extendedAttribute
 
 #### Parameters
@@ -161,6 +175,15 @@ Returns **any**&#x20;
 
 Returns **any** service with the highest priority
 
+### templateContent
+
+#### Parameters
+
+*   `entryProperties` **any**&#x20;
+*   `directoryProperties` **any**&#x20;
+
+Returns **AsyncIterable\<ContentProvider>**&#x20;
+
 ### property
 
 #### Parameters

package/package.json

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

package/src/cluster.mjs

@@ -85,11 +85,7 @@ export class Cluster extends Host {
       const location = `${this.location.name}-${host.name}`;
 
       const result = {
-        sources: [
-          new FileContentProvider(packageStagingDir + "/")[
-            Symbol.asyncIterator
-          ]()
-        ],
+        sources: [new FileContentProvider(packageStagingDir + "/")],
         outputs: host.outputs,
         properties: {
           name: `keepalived-${location}`,
@@ -100,12 +96,19 @@ export class Cluster extends Host {
         }
       };
 
+      const extra = [];
+
+      const smtp = this.smtp;
+      if (smtp) {
+        extra.push(`  smtp_server ${smtp.address()}`);
+      }
+
       const cfg = [
         "global_defs {",
         "   notification_email {",
         "    " + this.administratorEmail,
         "  }",
-        `  smtp_server ${this.smtp.address()}`,
+        ...extra,
         `  notification_email_from keepalived@${host.domainName}`,
         "  enable_script_security",
         "  script_user root",

package/src/module.mjs

@@ -28,7 +28,7 @@ export * from "./services/influxdb.mjs";
 export * from "./services/mosquitto.mjs";
 export * from "./services/headscale.mjs";
 export * from "./services/tailscale.mjs";
-export * from "./services/alpm-repo.mjs";
+export * from "./services/alpm.mjs";
 export * from "./services/systemd-journald.mjs";
 export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";

package/src/services/alpm.mjs

@@ -0,0 +1,64 @@
+import {
+  addType,
+  default_attribute_writable,
+  name_attribute_writable,
+  string_attribute_writable,
+  string_set_attribute_writable
+} from "pacc";
+import { addServiceType, Base } from "pmcf";
+import { ServiceTypeDefinition, Service } from "../service.mjs";
+
+const ALPMRepositoryTypeDefinition = {
+  name: "alpm_repository",
+  extends: Base.typeDefinition,
+  attributes: {
+    name: name_attribute_writable,
+    base: string_attribute_writable,
+    architectures: string_set_attribute_writable
+  }
+};
+
+class ALPMRepository extends Base {
+  static {
+    addType(this);
+  }
+
+  static get typeDefinition() {
+    return ALPMRepositoryTypeDefinition;
+  }
+}
+
+const ALPMServiceTypeDefinition = {
+  name: "alpm",
+  extends: ServiceTypeDefinition,
+  specializationOf: ServiceTypeDefinition,
+  owners: ServiceTypeDefinition.owners,
+  attributes: {
+    repositories: {
+      ...default_attribute_writable,
+      type: "alpm_repository",
+      collection: true
+    }
+  },
+
+  service: {
+    extends: ["https"]
+  }
+};
+
+export class ALPMService extends Service {
+  static {
+    addType(this);
+    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
+  }
+
+  static get typeDefinition() {
+    return ALPMServiceTypeDefinition;
+  }
+
+  _repositories = new Map();
+
+  set repositories(repository) {
+    this._repositories.set(repository.name, repository);
+  }
+}

package/types/cluster.d.mts

@@ -503,7 +503,7 @@ export class Cluster extends Host {
     get backups(): any[];
     get members(): Set<any>;
     preparePackages(stagingDir: any): AsyncGenerator<{
-        sources: AsyncIterable<import("content-entry").ContentEntry | import("content-entry").CollectionEntry>[];
+        sources: FileContentProvider[];
         outputs: any;
         properties: {
             name: string;
@@ -515,3 +515,4 @@ export class Cluster extends Host {
     }, void, unknown>;
 }
 import { Host } from "./host.mjs";
+import { FileContentProvider } from "npm-pkgbuild";

package/types/module.d.mts

@@ -28,7 +28,7 @@ export * from "./services/influxdb.mjs";
 export * from "./services/mosquitto.mjs";
 export * from "./services/headscale.mjs";
 export * from "./services/tailscale.mjs";
-export * from "./services/alpm-repo.mjs";
+export * from "./services/alpm.mjs";
 export * from "./services/systemd-journald.mjs";
 export * from "./services/systemd-journal-remote.mjs";
 export * from "./services/systemd-journal-upload.mjs";

package/types/services/{alpm-repo.d.mts → alpm.d.mts}

@@ -1,4 +1,4 @@
-export class ALPMRepositoryService extends Service {
+export class ALPMService extends Service {
     static get typeDefinition(): {
         name: string;
         extends: {
@@ -6,7 +6,7 @@ export class ALPMRepositoryService extends Service {
             owners: (string | {
                 name: string;
                 owners: string[];
-                extends: typeof import("pmcf").Base;
+                extends: typeof Base;
                 key: string;
                 attributes: {
                     networkInterfaces: {
@@ -203,7 +203,7 @@ export class ALPMRepositoryService extends Service {
                     address: import("pacc").AttributeDefinition;
                 };
             })[];
-            extends: typeof import("pmcf").Base;
+            extends: typeof Base;
             specializations: {};
             factoryFor(owner: any, value: any): any;
             key: string;
@@ -291,7 +291,7 @@ export class ALPMRepositoryService extends Service {
             owners: (string | {
                 name: string;
                 owners: string[];
-                extends: typeof import("pmcf").Base;
+                extends: typeof Base;
                 key: string;
                 attributes: {
                     networkInterfaces: {
@@ -488,7 +488,7 @@ export class ALPMRepositoryService extends Service {
                     address: import("pacc").AttributeDefinition;
                 };
             })[];
-            extends: typeof import("pmcf").Base;
+            extends: typeof Base;
             specializations: {};
             factoryFor(owner: any, value: any): any;
             key: string;
@@ -574,7 +574,7 @@ export class ALPMRepositoryService extends Service {
         owners: (string | {
             name: string;
             owners: string[];
-            extends: typeof import("pmcf").Base;
+            extends: typeof Base;
             key: string;
             attributes: {
                 networkInterfaces: {
@@ -773,12 +773,8 @@ export class ALPMRepositoryService extends Service {
         })[];
         attributes: {
             repositories: {
+                type: string;
                 collection: boolean;
-                configurable: boolean;
-                attributes: {
-                    name: import("pacc").AttributeDefinition;
-                };
-                type: object;
                 isKey: boolean;
                 writable: boolean;
                 mandatory: boolean;
@@ -803,6 +799,8 @@ export class ALPMRepositoryService extends Service {
             extends: string[];
         };
     };
-    repositories: {};
+    _repositories: Map<any, any>;
+    set repositories(repository: any);
 }
 import { Service } from "../service.mjs";
+import { Base } from "pmcf";

package/src/services/alpm-repo.mjs

@@ -1,38 +0,0 @@
-import { addType, object_attribute, string_attribute_writable } from "pacc";
-import { addServiceType } from "pmcf";
-import { ServiceTypeDefinition, Service } from "../service.mjs";
-
-const ALPMRepositoryServiceTypeDefinition = {
-  name: "alpm-repo",
-  extends: ServiceTypeDefinition,
-  specializationOf: ServiceTypeDefinition,
-  owners: ServiceTypeDefinition.owners,
-  attributes: {
-    repositories: {
-      ...object_attribute,
-      collection: true,
-      configurable: true,
-
-      attributes: {
-        name: string_attribute_writable
-      }
-    }
-  },
-
-  service: {
-    extends: ["https"]
-  }
-};
-
-export class ALPMRepositoryService extends Service {
-  static {
-    addType(this);
-    addServiceType(this.typeDefinition.service, this.typeDefinition.name);
-  }
-
-  static get typeDefinition() {
-    return ALPMRepositoryServiceTypeDefinition;
-  }
-
-  repositories = {};
-}