npm-pkgbuild 22.2.1 → 22.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "22.2.1",
+  "version": "22.2.3",
   "publishConfig": {
     "access": "public",
     "provenance": false

package/src/output/alpm.mjs

@@ -134,11 +134,13 @@ export class ALPM extends Packager {
     source: {
       ...string_collection_attribute_writable,
       name: "source",
+      separator: undefined,
       skipEmpty: true
     },
     validpgpkeys: {
       ...string_collection_attribute_writable,
       name: "validpgpkeys",
+      separator: undefined,
       skipEmpty: true
     },
     noextract: { ...default_attribute, name: "noextract", skipEmpty: true },
@@ -150,32 +152,37 @@ export class ALPM extends Packager {
     md5sums: {
       ...string_collection_attribute_writable,
       name: "md5sums",
+      separator: undefined,
       default: ["SKIP"]
-      // skipEmpty: true
     },
     sha1sums: {
       ...string_collection_attribute_writable,
       name: "sha1sums",
+      separator: undefined,
       skipEmpty: true
     },
     sha256sums: {
       ...string_collection_attribute_writable,
       name: "sha256sums",
+      separator: undefined,
       skipEmpty: true
     },
     sha384sums: {
       ...string_collection_attribute_writable,
       name: "sha384sums",
+      separator: undefined,
       skipEmpty: true
     },
     sha512sums: {
       ...string_collection_attribute_writable,
       name: "sha512sums",
+      separator: undefined,
       skipEmpty: true
     },
     groups: {
       ...string_collection_attribute_writable,
       name: "groups",
+      separator: undefined,
       skipEmpty: true
     },
     arch: {
@@ -185,6 +192,7 @@ export class ALPM extends Packager {
     backup: {
       ...string_collection_attribute_writable,
       name: "backup",
+      separator: undefined,
       skipEmpty: true
     },
     dependencies: {
@@ -223,7 +231,12 @@ export class ALPM extends Packager {
       name: "replaces",
       skipEmpty: true
     },
-    options: { ...default_attribute, name: "options", skipEmpty: true }
+    options: {
+      ...default_attribute,
+      name: "options",
+      separator: undefined,
+      skipEmpty: true
+    }
   };
 
   static async prepare(options = {}, variant = {}) {

package/src/output/packager.mjs

@@ -2,7 +2,12 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { mkdtemp, mkdir } from "node:fs/promises";
 import { createReadStream } from "node:fs";
-import { expand, expandContextDoubbleCurly, iterateToExternal } from "pacc";
+import {
+  expand,
+  expandContextDoubbleCurly,
+  attributeIterator,
+  iterateToExternal
+} from "pacc";
 import { StringContentEntry } from "content-entry";
 import { publish } from "../publish.mjs";
 import {
@@ -60,6 +65,14 @@ export class Packager {
    */
   constructor(properties) {
     this.properties = { ...properties, type: this.constructor.name };
+
+    for (const [path, attribute] of attributeIterator(
+      this.constructor.attributes,
+      attribute => attribute.default !== undefined
+    )) {
+      const name = path.join(".");
+      this.properties[name] ??= attribute.default;
+    }
   }
 
   get externalProperties() {

package/src/output/rpm.mjs

@@ -3,10 +3,9 @@ import { readFile } from "node:fs/promises";
 import { cp } from "node:fs/promises";
 import { execa } from "execa";
 import {
-  integer_attribute,
-  url_attribute,
-  string_attribute,
-  string_collection_attribute_writable
+  integer_attribute_writable,
+  url_attribute_writable,
+  string_attribute_writable
 } from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
@@ -20,7 +19,8 @@ import {
   pkgbuild_version_attribute,
   pkgbuild_description_attribute,
   pkgbuild_name_attribute,
-  arch_attribute_writable
+  arch_attribute_writable,
+  dependency_attribute_collection_writable
 } from "../types.mjs";
 import {
   copyEntries,
@@ -65,40 +65,69 @@ export class RPM extends Packager {
     name: { ...pkgbuild_name_attribute, externalName: "Name" },
     description: { ...pkgbuild_description_attribute, externalName: "Summary" },
     license: {
-      ...string_attribute,
+      ...string_attribute_writable,
       name: "license",
       externalName: "License",
       mandatory: true
     },
     version: { ...pkgbuild_version_attribute, externalName: "Version" },
     release: {
-      ...integer_attribute,
+      ...integer_attribute_writable,
       externalName: "Release",
       name: "release",
       default: 1,
       mandatory: true
     },
-    source: { ...string_attribute, externalName: "Source0", name: "source" },
-    groups: { ...string_attribute, externalName: "Group", name: "groups" },
+    source: {
+      ...string_attribute_writable,
+      externalName: "Source0",
+      name: "source",
+      skipEmpty: true
+    },
+    groups: {
+      ...string_attribute_writable,
+      externalName: "Group",
+      name: "groups",
+      skipEmpty: true
+    },
     maintainer: {
-      ...string_attribute,
+      ...string_attribute_writable,
       name: "maintainer",
       externalName: "Packager"
     },
-    vendor: { ...string_attribute, externalName: "Vendor", name: "vendor" },
+    vendor: {
+      ...string_attribute_writable,
+      externalName: "Vendor",
+      name: "vendor",
+      skipEmpty: true
+    },
     arch: {
       ...arch_attribute_writable,
       externalName: "BuildArch",
       default: "noarch",
       mapping: { any: "noarch" }
     },
-    URL: { ...url_attribute, name: "URL", alias: "homepage" },
+    URL: {
+      ...url_attribute_writable,
+      name: "URL",
+      alias: "homepage",
+      skipEmpty: true
+    },
     dependencies: {
-      ...string_collection_attribute_writable,
-      externalName: "Requires"
+      ...dependency_attribute_collection_writable,
+      externalName: "Requires",
+      skipEmpty: true
+    },
+    Obsoletes: {
+      ...dependency_attribute_collection_writable,
+      name: "Obsoletes",
+      skipEmpty: true
     },
-    Obsoletes: { ...string_collection_attribute_writable, name: "Obsoletes" },
-    Conflicts: { ...string_collection_attribute_writable, name: "Conflicts" }
+    Conflicts: {
+      ...dependency_attribute_collection_writable,
+      name: "Conflicts",
+      skipEmpty: true
+    }
   };
 
   static get workspaceLayout() {