npm-pkgbuild 20.7.11 → 20.8.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "npm-pkgbuild",
-  "version": "20.7.11",
+  "version": "20.8.0",
   "publishConfig": {
     "access": "public",
     "provenance": false
   },
-  "packageManager": "npm@11.16.0",
+  "packageManager": "npm@11.18.0",
   "exports": {
     ".": {
       "default": "./src/module.mjs"
@@ -46,7 +46,7 @@
     "lint:docs": "documentation lint ./src**/*.mjs"
   },
   "dependencies": {
-    "@npmcli/arborist": "^9.9.0",
+    "@npmcli/arborist": "^10.0.0",
     "@vercel/nft": "^1.10.2",
     "aggregate-async-iterator": "^1.2.5",
     "commander": "^15.0.0",
@@ -60,14 +60,14 @@
     "key-value-transformer": "^3.3.2",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^11.3.0",
-    "pacc": "^10.4.0",
+    "pacc": "^10.4.1",
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "tar-stream": "^3.1.7",
     "uti": "^8.11.2"
   },
   "devDependencies": {
-    "@types/node": "^26.1.0",
+    "@types/node": "^26.1.1",
     "ava": "^8.0.1",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",

package/src/output/arch.mjs

@@ -90,50 +90,77 @@ export class ARCH extends Packager {
   static attributes = {
     Maintainer: {
       ...string_collection_attribute_writable,
+      name: "Maintainer",
       alias: "maintainer",
       prefix: "# "
     },
-    packager: { ...string_collection_attribute_writable, alias: "maintainer" },
-    pkgname: { ...pkgbuild_name_attribute, collection: true },
-    pkgver: pkgbuild_version_attribute,
+    packager: {
+      ...string_collection_attribute_writable,
+      name: "packager",
+      alias: "maintainer"
+    },
+    pkgname: { ...pkgbuild_name_attribute, name: "pkgname", collection: true },
+    pkgver: { ...pkgbuild_version_attribute, name: "pkgver" },
     pkgrel: {
       ...integer_attribute,
+      name: "pkgrel",
       alias: "release",
       default: 1,
       mandatory: true
     },
-    epoch: { ...integer_attribute, default: 0 },
-    pkgdesc: pkgbuild_description_attribute,
-    url: { ...string_attribute, alias: "homepage" },
-    license: { ...string_collection_attribute_writable, mandatory: true },
-    install: string_attribute,
-    changelog: string_attribute,
-    source: string_collection_attribute_writable,
-    validpgpkeys: string_collection_attribute_writable,
-    noextract: default_attribute,
-    cksums: string_collection_attribute_writable,
-    md5sums: string_collection_attribute_writable,
-    sha1sums: string_collection_attribute_writable,
-    sha256sums: string_collection_attribute_writable,
-    sha384sums: string_collection_attribute_writable,
-    sha512sums: string_collection_attribute_writable,
-    groups: string_collection_attribute_writable,
+    epoch: { ...integer_attribute, name: "epoch", default: 0 },
+    pkgdesc: { ...pkgbuild_description_attribute, name: "pkgdesc" },
+    url: { ...string_attribute, name: "url", alias: "homepage" },
+    license: {
+      ...string_collection_attribute_writable,
+      name: "license",
+      mandatory: true
+    },
+    install: { ...string_attribute, name: "install" },
+    changelog: { ...string_attribute, name: "changelog" },
+    source: { ...string_collection_attribute_writable, name: "source" },
+    validpgpkeys: {
+      ...string_collection_attribute_writable,
+      name: "validpgpkeys"
+    },
+    noextract: { ...default_attribute, name: "noextract" },
+    cksums: { ...string_collection_attribute_writable, name: "cksums" },
+    md5sums: { ...string_collection_attribute_writable, name: "md5sums" },
+    sha1sums: { ...string_collection_attribute_writable, name: "sha1sums" },
+    sha256sums: { ...string_collection_attribute_writable, name: "sha256sums" },
+    sha384sums: { ...string_collection_attribute_writable, name: "sha384sums" },
+    sha512sums: { ...string_collection_attribute_writable, name: "sha512sums" },
+    groups: { ...string_collection_attribute_writable, name: "groups" },
     arch: {
       ...string_collection_attribute_writable,
+      name: "arch",
       default: ["any"],
       mandatory: true
     },
-    backup: string_collection_attribute_writable,
+    backup: { ...string_collection_attribute_writable, name: "backup" },
     depends: {
-      ...dependency_attribute_collection_writable /*, alias: "dependencies" */
+      ...dependency_attribute_collection_writable /*, alias: "dependencies" */,
+      name: "depends"
+    },
+    makedepends: {
+      ...dependency_attribute_collection_writable,
+      name: "makedepends"
+    },
+    checkdepends: {
+      ...dependency_attribute_collection_writable,
+      name: "checkdepends"
+    },
+    optdepends: {
+      ...dependency_attribute_collection_writable,
+      name: "optdepends"
+    },
+    conflicts: {
+      ...dependency_attribute_collection_writable,
+      name: "conflicts"
     },
-    makedepends: dependency_attribute_collection_writable,
-    checkdepends: dependency_attribute_collection_writable,
-    optdepends: dependency_attribute_collection_writable,
-    conflicts: dependency_attribute_collection_writable,
-    provides: dependency_attribute_collection_writable,
-    replaces: dependency_attribute_collection_writable,
-    options: default_attribute
+    provides: { ...dependency_attribute_collection_writable, name: "provides" },
+    replaces: { ...dependency_attribute_collection_writable, name: "replaces" },
+    options: { ...default_attribute, name: "options" }
   };
 
   static async prepare(options = {}, variant = {}) {
@@ -246,10 +273,7 @@ package() {
     const ownership = [];
 
     for await (const file of copyEntries(
-      transform(
-        aggregate(sources),
-        transformer
-      ),
+      transform(aggregate(sources), transformer),
       join(staging, "src"),
       expander
     )) {

package/src/output/debian.mjs

@@ -4,7 +4,8 @@ import { execa } from "execa";
 import {
   integer_attribute_writable,
   yesno_attribute_writable,
-  string_attribute_writable
+  string_attribute_writable,
+  string_collection_attribute_writable
 } from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
 import {
@@ -51,41 +52,82 @@ export class DEBIAN extends Packager {
   static attributes = {
     Package: {
       ...pkgbuild_name_attribute,
+      name: "Package",
       set: v => v.toLowerCase()
     },
-    Version: pkgbuild_version_attribute,
+    Version: { ...pkgbuild_version_attribute, name: "Version" },
     Maintainer: {
       ...string_attribute_writable,
+      name: "Maintainer",
       alias: "maintainer",
       mandatory: true
     },
-    Description: pkgbuild_description_attribute,
-    Section: { ...string_attribute_writable, alias: "groups" },
-    Priority: string_attribute_writable,
-    Essential: yesno_attribute_writable,
-    Origin: string_attribute_writable,
+    Description: { ...pkgbuild_description_attribute, name: "Description" },
+    Section: { ...string_attribute_writable, name: "Section", alias: "groups" },
+    Priority: { ...string_attribute_writable, name: "Priority" },
+    Essential: { ...yesno_attribute_writable, name: "Essential" },
+    Origin: { ...string_attribute_writable, name: "Origin" },
     Architecture: {
       ...string_attribute_writable,
+      name: "Architecture",
       alias: "arch",
       default: "all",
       mandatory: true,
       mapping: { aarch64: "arm64" }
     },
-    Homepage: { ...string_attribute_writable, alias: "homepage" },
-    Bugs: { ...string_attribute_writable, alias: "bugs" },
-    Depends: debian_dependency_attribute_collection_writable,
-    "Pre-Depends": debian_dependency_attribute_collection_writable,
-    "Build-Depends": debian_dependency_attribute_collection_writable,
-    "Build-Depends-Indep": debian_dependency_attribute_collection_writable,
-    "Build-Depends-Arch": debian_dependency_attribute_collection_writable,
-    Recommends: debian_dependency_attribute_collection_writable,
-    Suggests: debian_dependency_attribute_collection_writable,
-    Provides: debian_dependency_attribute_collection_writable,
-    Breaks: debian_dependency_attribute_collection_writable,
-    Replaces: debian_dependency_attribute_collection_writable,
-    Source: { ...string_attribute_writable, alias: "source" },
-    Uploaders: { mandatory: false },
-    "Installed-Size": integer_attribute_writable
+    Homepage: {
+      ...string_attribute_writable,
+      name: "Homepage",
+      alias: "homepage"
+    },
+    Bugs: { ...string_attribute_writable, name: "Bugs", alias: "bugs" },
+    Depends: {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Depends"
+    },
+    "Pre-Depends": {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Pre-Depends"
+    },
+    "Build-Depends": {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Build-Depends"
+    },
+    "Build-Depends-Indep": {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Build-Depends-Indep"
+    },
+    "Build-Depends-Arch": {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Build-Depends-Arch"
+    },
+    Recommends: {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Recommends"
+    },
+    Suggests: {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Suggests"
+    },
+    Provides: {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Provides"
+    },
+    Breaks: {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Breaks"
+    },
+    Replaces: {
+      ...debian_dependency_attribute_collection_writable,
+      name: "Replaces"
+    },
+    Source: { ...string_attribute_writable, name: "Source", alias: "source" },
+    Uploaders: {
+      ...string_collection_attribute_writable,
+      name: "Uploaders",
+      mandatory: false
+    },
+    "Installed-Size": { ...integer_attribute_writable, name: "Installed-Size" }
   };
 
   /**

package/src/output/packager.mjs

@@ -5,7 +5,8 @@ import { createReadStream } from "node:fs";
 import {
   expand,
   expandContextDoubbleCurly,
-  string_attribute,
+  string_collection_attribute_writable,
+  name_attribute,
   description_attribute,
   version_attribute_writable
 } from "pacc";
@@ -212,12 +213,15 @@ export class Packager {
    * @param {Object} options
    * @param {string} [options.staging]
    * @param {string} [options.destination]
+   * @param {boolean} [options.noPreserve] do not preserve (tmp) directories
    * @param {Object} [publishingDetail]
    * @returns {Promise<{properties:Object, destination:string, tmpdir:string, staging:string}>}
    */
   async prepare(options, publishingDetail) {
-    if (this.#prepared) {
-      return this.#prepared;
+    if (!options.noPreserve) {
+      if (this.#prepared) {
+        return this.#prepared;
+      }
     }
 
     const tmpdir = await this.tmpdir;
@@ -251,7 +255,9 @@ export class Packager {
       await mkdir(out.destination, mdo);
     }
 
-    this.#prepared = out;
+    if (!options.noPreserve) {
+      this.#prepared = out;
+    }
     return out;
   }
 
@@ -274,7 +280,7 @@ export class Packager {
 }
 
 export const pkgbuild_name_attribute = {
-  ...string_attribute,
+  ...name_attribute,
   alias: "name",
   mandatory: true,
   pattern: /^[a-z_][a-z0-9_\-]*$/i
@@ -302,10 +308,8 @@ export const dependency_type = {
 };
 
 export const dependency_attribute_collection_writable = {
-  ...string_attribute,
+  ...string_collection_attribute_writable,
   type: dependency_type,
-  writable: true,
-  collection: true,
   separator: " ",
   pattern: /^[a-z_][a-z0-9_\-]*$/i
 };