pmcf 4.16.13 → 4.17.0

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/bin/pmcf-package

@@ -67,7 +67,7 @@ for (const object of root.find(args)) {
       const output = new outputFactory(properties);
 
       const artifact = await output.create(
-        sources.map(source => source[Symbol.asyncIterator]()),
+        sources.flat().map(source => source[Symbol.asyncIterator]()),
         [],
         publishingDetails,
         options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.16.13",
+  "version": "4.17.0",
   "publishConfig": {
     "access": "public"
   },
@@ -55,7 +55,7 @@
   "dependencies": {
     "content-entry-transform": "^1.6.4",
     "ip-utilties": "^3.0.0",
-    "npm-pkgbuild": "^20.5.1",
+    "npm-pkgbuild": "^20.6.1",
     "pacc": "^8.8.0",
     "package-directory": "^8.2.0"
   },

package/src/base.mjs

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { stat } from "node:fs/promises";
 import { allOutputs } from "npm-pkgbuild";
 import {
   createExpressionTransformer,
@@ -318,6 +319,11 @@ export class Base {
     return this.owner.addObject(object);
   }
 
+  /**
+   * Walk the object graph in some directions and deliver seen nodes.
+   * @param {string[]} directions
+   * @return {Iterable<Base>}
+   */
   *walkDirections(directions = ["this", "extends", "owner"]) {
     yield* this._walkDirections(
       directions,
@@ -567,17 +573,33 @@ export class Base {
     ];
   }
 
-  templateContent(entryProperties, directoryProperties) {
-    return [...this.walkDirections(["this", "extends"])].map(e =>
-      transform(
-        new FileContentProvider(
-          { dir: join(e.directory, "content"), pattern: "**/*" },
-          entryProperties,
-          directoryProperties
-        ),
-        this.templateTransformers
-      )
-    );
+  /**
+   *
+   * @param {*} entryProperties
+   * @param {*} directoryProperties
+   * @returns {AsyncIterable<ContentProvider>}
+   */
+  async *templateContent(entryProperties, directoryProperties) {
+    for (const node of this.walkDirections(["this", "extends"])) {
+      const dir = join(node.directory, "content");
+
+      try {
+        if ((await stat(dir)).isDirectory) {
+          yield transform(
+            new FileContentProvider(
+              { dir, pattern: "**/*" },
+              entryProperties,
+              directoryProperties
+            ),
+            this.templateTransformers
+          );
+        }
+      } catch (e) {
+        if (e.code !== "ENOENT") {
+          throw e;
+        }
+      }
+    }
   }
 
   get tags() {

package/src/host.mjs

@@ -412,7 +412,7 @@ export class Host extends ServiceOwner {
     const pkgName = `${this.typeName}-${this.owner.name}-${this.name}`;
     let packageData = {
       sources: [
-        ...this.templateContent(),
+        await Array.fromAsync(this.templateContent()),
         new FileContentProvider(
           { dir: this.directory, pattern: "*.pub" },
           { destination: "/etc/ssh/", mode: 0o644 }
@@ -491,4 +491,3 @@ export class Host extends ServiceOwner {
     }
   }
 }
-

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/service.mjs

@@ -272,7 +272,7 @@ export class Service extends Base {
 
   async *preparePackages(dir) {
     const pd = this.packageData;
-    pd.sources = this.templateContent();
+    pd.sources = await Array.fromAsync(this.templateContent());
     if (pd.sources.length) {
       yield pd;
     }

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/src/services/mosquitto.mjs

@@ -55,17 +55,19 @@ export class MosquittoService extends Service {
     const group = "mosquitto";
 
     const packageData = this.packageData;
-    packageData.sources = this.templateContent(
-      {
-        mode: 0o644,
-        owner,
-        group
-      },
-      {
-        mode: 0o755,
-        owner,
-        group
-      }
+    packageData.sources = await Array.fromAsync(
+      this.templateContent(
+        {
+          mode: 0o644,
+          owner,
+          group
+        },
+        {
+          mode: 0o755,
+          owner,
+          group
+        }
+      )
     );
 
     yield packageData;

package/src/services/openldap.mjs

@@ -63,17 +63,19 @@ export class OpenLDAPService extends Service {
 
     const packageData = this.packageData;
 
-    packageData.sources = this.templateContent(
-      {
-        mode: 0o644,
-        owner,
-        group
-      },
-      {
-        mode: 0o755,
-        owner,
-        group
-      }
+    packageData.sources = await Array.fromAsync(
+      this.templateContent(
+        {
+          mode: 0o644,
+          owner,
+          group
+        },
+        {
+          mode: 0o755,
+          owner,
+          group
+        }
+      )
     );
 
     yield packageData;

package/types/base.d.mts

@@ -63,7 +63,12 @@ export class Base {
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;
     addObject(object: any): any;
-    walkDirections(directions?: string[]): Generator<any, void, any>;
+    /**
+     * Walk the object graph in some directions and deliver seen nodes.
+     * @param {string[]} directions
+     * @return {Iterable<Base>}
+     */
+    walkDirections(directions?: string[]): Iterable<Base>;
     _walkDirections(directions: any, withThis: any, seen: any): Generator<any, void, any>;
     forOwner(owner: any): any;
     isNamed(name: any): boolean;
@@ -128,7 +133,13 @@ export class Base {
     get outputs(): Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
     preparePackages(stagingDir: any): AsyncGenerator<never, void, unknown>;
     get templateTransformers(): any[];
-    templateContent(entryProperties: any, directoryProperties: any): any[];
+    /**
+     *
+     * @param {*} entryProperties
+     * @param {*} directoryProperties
+     * @returns {AsyncIterable<ContentProvider>}
+     */
+    templateContent(entryProperties: any, directoryProperties: any): AsyncIterable<ContentProvider>;
     set tags(value: Set<any>);
     get tags(): Set<any>;
     get isTemplate(): any;

package/types/host.d.mts

@@ -261,7 +261,7 @@ export class Host extends ServiceOwner {
     get subnets(): Set<any>;
     publicKey(type?: string): Promise<string>;
     preparePackages(dir: any): AsyncGenerator<{
-        sources: any[];
+        sources: (FileContentProvider | ContentProvider[])[];
         outputs: Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;

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 = {};
-}