npm-pkgbuild 22.2.2 → 22.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "22.2.2",
+  "version": "22.2.4",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -61,7 +61,7 @@
     "key-value-transformer": "^3.3.2",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^11.3.0",
-    "pacc": "^11.13.0",
+    "pacc": "^11.13.2",
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "picomatch": "^4.0.7",

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

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { readFile } from "node:fs/promises";
 import { execa } from "execa";
-import { string_attribute } from "pacc";
+import { string_attribute_writable, types } from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
 import { aggregateFifo } from "aggregate-async-iterator";
@@ -64,12 +64,12 @@ export class DOCKER extends Packager {
   static attributes = {
     name: {
       ...pkgbuild_name_attribute,
-      set: value => value.toLowerCase()
+      type: types["lowercase-string"]
     },
     version: pkgbuild_version_attribute,
     description: pkgbuild_description_attribute,
-    author: { ...string_attribute, alias: "maintainer" },
-    workdir: { ...string_attribute, default: "/", mandatory: true }
+    maintainer: { ...string_attribute_writable, name: "maintainer", externalName: "author" },
+    workdir: { ...string_attribute_writable, default: "/", mandatory: true }
   };
 
   /**

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

@@ -5,8 +5,7 @@ import { execa } from "execa";
 import {
   integer_attribute_writable,
   url_attribute_writable,
-  string_attribute_writable,
-  string_collection_attribute_writable
+  string_attribute_writable
 } from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
@@ -82,7 +81,8 @@ export class RPM extends Packager {
     source: {
       ...string_attribute_writable,
       externalName: "Source0",
-      name: "source"
+      name: "source",
+      skipEmpty: true
     },
     groups: {
       ...string_attribute_writable,
@@ -115,10 +115,19 @@ export class RPM extends Packager {
     },
     dependencies: {
       ...dependency_attribute_collection_writable,
-      externalName: "Requires"
+      externalName: "Requires",
+      skipEmpty: true
+    },
+    Obsoletes: {
+      ...dependency_attribute_collection_writable,
+      name: "Obsoletes",
+      skipEmpty: true
     },
-    Obsoletes: { ...dependency_attribute_collection_writable, name: "Obsoletes" },
-    Conflicts: { ...dependency_attribute_collection_writable, name: "Conflicts" }
+    Conflicts: {
+      ...dependency_attribute_collection_writable,
+      name: "Conflicts",
+      skipEmpty: true
+    }
   };
 
   static get workspaceLayout() {

package/src/types.mjs

@@ -37,12 +37,10 @@ export const architecture_type = {
   name: "architecture",
 
   toInternal: (value, attribute) => {
-    //   console.log("architectureType toInternal", value);
     return value;
   },
 
   toExternal: (value, attribute) => {
-    //  console.log("architectureType toExternal", value);
     return attribute.mapping?.[value] ?? value;
   }
 };
@@ -64,7 +62,7 @@ export const pkgbuild_name_attribute = {
 export const dependency_attribute_collection_writable = {
   ...string_collection_attribute_writable,
   type: dependency_type,
-  separator: " ",
+  separator: undefined,
   pattern: /^[a-z_][a-z0-9_\-]*$/i
 };