pmcf 3.10.11 → 3.10.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.10.11",
+  "version": "3.10.13",
   "publishConfig": {
     "access": "public"
   },
@@ -53,11 +53,11 @@
   "dependencies": {
     "ip-utilties": "^1.4.9",
     "npm-pkgbuild": "^18.2.31",
-    "pacc": "^4.22.0",
+    "pacc": "^4.23.0",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {
-    "@types/node": "^24.5.0",
+    "@types/node": "^24.5.1",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/services/mosquitto.mjs

@@ -48,7 +48,7 @@ export class MosquittoService extends Service {
       dir,
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
-      attributes: {
+      properties: {
         name: `mosquitto-${this.location.name}-${host.name}`,
         description: `mosquitto definitions for ${this.fullName}@${name}`,
         access: "private",

package/src/services/openldap.mjs

@@ -110,7 +110,7 @@ export class OpenLDAPService extends Service {
       dir,
       sources: [new FileContentProvider(dir + "/", ...filePermissions)],
       outputs: this.outputs,
-      attributes: {
+      properties: {
         name: `openldap-${this.location.name}-${name}`,
         description: `openldap definitions for ${this.fullName}@${name}`,
         access: "private",
@@ -120,13 +120,13 @@ export class OpenLDAPService extends Service {
     };
 
     addHook(
-      packageData.attributes.hooks,
+      packageData.properties.hooks,
       "post_upgrade",
       "setfacl -m u:ldap:r /etc/letsencrypt/archive/*/privkey*.pem"
     );
 
     addHook(
-      packageData.attributes.hooks,
+      packageData.properties.hooks,
       "post_install",
       "setfacl -m u:ldap:r /etc/letsencrypt/archive/*/privkey*.pem"
     );

package/src/types.mjs

@@ -29,11 +29,8 @@ export function resolveTypeLinks() {
       type.owners = [];
     }
     for (const [path, attribute] of attributeIterator(type.attributes)) {
-      attribute.name = path.join(".");
-      if (attribute.isKey) {
-        type.identifier = attribute;
-      }
-
+      const name = path.join(".");
+      attribute.name = name;
       const ts = [];
 
       for (const type of asArray(attribute.type)) {
@@ -54,25 +51,9 @@ export function resolveTypeLinks() {
       }
       attribute.type = ts;
 
-      /*
-      if (typeof property.type === "string") {
-        if (!baseTypes.has(property.type)) {
-          const type = types[property.type];
-          if (type) {
-            property.type = type;
-          } else {
-            console.error(
-              "Unknown type",
-              property.type,
-              type.name,
-              name
-            );
-          }
-        }
+      if (attribute.isKey) {
+        type.identifier = { name, ...attribute };
       }
-
-      property.type = asArray(property.type);
-      */
     }
   }
 

package/types/services/mosquitto.d.mts

@@ -440,7 +440,7 @@ export class MosquittoService extends Service {
         dir: any;
         sources: FileContentProvider[];
         outputs: Set<typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
-        attributes: {
+        properties: {
             name: string;
             description: string;
             access: string;

package/types/services/openldap.d.mts

@@ -470,7 +470,7 @@ export class OpenLDAPService extends Service {
         dir: any;
         sources: FileContentProvider[];
         outputs: Set<typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
-        attributes: {
+        properties: {
             name: string;
             description: string;
             access: string;