npm-pkgbuild 22.2.0 → 22.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "22.2.0",
+  "version": "22.2.2",
   "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.12.6",
+    "pacc": "^11.13.0",
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "picomatch": "^4.0.7",

package/src/output/alpm.mjs

@@ -20,7 +20,8 @@ import {
   pkgbuild_version_attribute,
   pkgbuild_description_attribute,
   pkgbuild_name_attribute,
-  dependency_attribute_collection_writable
+  dependency_attribute_collection_writable,
+  arch_attribute_writable
 } from "../types.mjs";
 import {
   copyEntries,
@@ -124,6 +125,7 @@ export class ALPM extends Packager {
     },
     license: {
       ...string_collection_attribute_writable,
+      separator: undefined,
       name: "license",
       skipEmpty: true
     },
@@ -177,10 +179,8 @@ export class ALPM extends Packager {
       skipEmpty: true
     },
     arch: {
-      ...string_collection_attribute_writable,
-      name: "arch",
-      default: ["any"],
-      mandatory: true
+      ...arch_attribute_writable,
+      default: ["any"]
     },
     backup: {
       ...string_collection_attribute_writable,

package/src/output/debian.mjs

@@ -21,7 +21,7 @@ import {
   pkgbuild_description_attribute,
   pkgbuild_name_attribute,
   dependency_attribute_collection_writable,
-  architectureType
+  arch_attribute_writable
 } from "../types.mjs";
 
 const debian_dependency_attribute_collection_writable = {
@@ -70,13 +70,10 @@ export class DEBIAN extends Packager {
       mandatory: true
     },
     arch: {
-      ...string_attribute_writable,
-      name: "arch",
+      ...arch_attribute_writable,
       externalName: "Architecture",
       default: "all",
-      mandatory: true,
-      type: architectureType,
-      mapping: { aarch64: "arm64" }
+      mapping: { aarch64: "arm64", any: "all" }
     },
     groups: {
       ...string_attribute_writable,

package/src/output/rpm.mjs

@@ -3,9 +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,
+  integer_attribute_writable,
+  url_attribute_writable,
+  string_attribute_writable,
   string_collection_attribute_writable
 } from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
@@ -19,7 +19,9 @@ import { Packager } from "./packager.mjs";
 import {
   pkgbuild_version_attribute,
   pkgbuild_description_attribute,
-  pkgbuild_name_attribute
+  pkgbuild_name_attribute,
+  arch_attribute_writable,
+  dependency_attribute_collection_writable
 } from "../types.mjs";
 import {
   copyEntries,
@@ -64,34 +66,59 @@ 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" },
-    maintainer: { ...string_attribute, name: "maintainer", externalName: "Packager" },
-    vendor: { ...string_attribute, externalName: "Vendor", name: "vendor" },
+    source: {
+      ...string_attribute_writable,
+      externalName: "Source0",
+      name: "source"
+    },
+    groups: {
+      ...string_attribute_writable,
+      externalName: "Group",
+      name: "groups",
+      skipEmpty: true
+    },
+    maintainer: {
+      ...string_attribute_writable,
+      name: "maintainer",
+      externalName: "Packager"
+    },
+    vendor: {
+      ...string_attribute_writable,
+      externalName: "Vendor",
+      name: "vendor",
+      skipEmpty: true
+    },
     arch: {
-      ...string_attribute,
+      ...arch_attribute_writable,
       externalName: "BuildArch",
-      name: "arch",
       default: "noarch",
-      mandatory: true
+      mapping: { any: "noarch" }
+    },
+    URL: {
+      ...url_attribute_writable,
+      name: "URL",
+      alias: "homepage",
+      skipEmpty: true
+    },
+    dependencies: {
+      ...dependency_attribute_collection_writable,
+      externalName: "Requires"
     },
-    URL: { ...url_attribute, name: "URL", alias: "homepage" },
-    Requires: { ...string_collection_attribute_writable, name: "Requires" },
-    Obsoletes: { ...string_collection_attribute_writable, name: "Obsoletes" },
-    Conflicts: { ...string_collection_attribute_writable, name: "Conflicts" }
+    Obsoletes: { ...dependency_attribute_collection_writable, name: "Obsoletes" },
+    Conflicts: { ...dependency_attribute_collection_writable, name: "Conflicts" }
   };
 
   static get workspaceLayout() {
@@ -152,7 +179,7 @@ export class RPM extends Packager {
     const { properties, tmpdir, staging, destination } =
       await this.prepare(options);
 
-    properties.Requires = this.makeDepends(properties.dependencies);
+    properties.dependencies = this.makeDepends(properties.dependencies);
 
     if (properties.Packager?.length > 1) {
       // TODO how to write several Packages ?

package/src/types.mjs

@@ -1,20 +1,16 @@
 import {
   types,
+  primitive_type,
   string_collection_attribute_writable,
   name_attribute,
   description_attribute,
-  version_attribute_writable
+  version_attribute_writable,
+  string_attribute_writable
 } from "pacc";
 
-export const pkgbuild_name_attribute = {
-  ...name_attribute,
-  mandatory: true,
-  pattern: /^[a-z_][a-z0-9_\-]*$/i
-};
-
 export const dependency_type = {
+  ...primitive_type,
   name: "dependency",
-  primitive: false,
   toExternal: (value, attribute) => {
     switch (typeof value) {
       case "string":
@@ -36,9 +32,9 @@ export const dependency_type = {
   }
 };
 
-export const architectureType = {
+export const architecture_type = {
+  ...primitive_type,
   name: "architecture",
-  primitive: true,
 
   toInternal: (value, attribute) => {
     //   console.log("architectureType toInternal", value);
@@ -47,10 +43,24 @@ export const architectureType = {
 
   toExternal: (value, attribute) => {
     //  console.log("architectureType toExternal", value);
-    return attribute.mapping[value] ?? value;
+    return attribute.mapping?.[value] ?? value;
   }
 };
 
+export const arch_attribute_writable = {
+  ...string_attribute_writable,
+  name: "arch",
+  default: "all",
+  mandatory: true,
+  type: architecture_type
+};
+
+export const pkgbuild_name_attribute = {
+  ...name_attribute,
+  mandatory: true,
+  pattern: /^[a-z_][a-z0-9_\-]*$/i
+};
+
 export const dependency_attribute_collection_writable = {
   ...string_collection_attribute_writable,
   type: dependency_type,

package/src/util.mjs

@@ -145,15 +145,11 @@ export function quote(v, qc = "'") {
  * @returns {Function}
  */
 export function fieldProvider(properties, attributes) {
-  function av(attribute, value) {
-    return attribute.collection ? asArray(value) : value;
-  }
-
-  return function* controlProperties(k, v, presentKeys) {
+  return function* controlProperties(key, value, presentKeys) {
     let filter;
 
-    if (k) {
-      filter = attribute => attribute.name === k;
+    if (key) {
+      filter = attribute => attribute.name === key;
     }
 
     for (const [name, value] of iterateToExternal(