npm-pkgbuild 22.2.5 → 22.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "22.2.5",
+  "version": "22.2.6",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -52,15 +52,15 @@
     "aggregate-async-iterator": "^1.2.5",
     "commander": "^15.0.0",
     "compare-versions": "^6.1.1",
-    "content-entry": "^15.0.2",
-    "content-entry-filesystem": "^9.1.2",
-    "content-entry-transform": "^1.7.7",
+    "content-entry": "^15.0.3",
+    "content-entry-filesystem": "^9.1.3",
+    "content-entry-transform": "^1.7.8",
     "execa": "^10.0.1",
     "ini": "^7.0.0",
     "key-value-transformer": "^3.3.2",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^11.3.0",
-    "pacc": "^11.13.2",
+    "pacc": "^11.15.0",
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "picomatch": "^4.0.7",
@@ -68,7 +68,7 @@
     "uti": "^8.11.3"
   },
   "devDependencies": {
-    "@types/node": "^26.6.1",
+    "@types/node": "^26.6.2",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",

package/src/output/alpm.mjs

@@ -287,9 +287,6 @@ export class ALPM extends Packager {
   async create(sources, transformer, publishingDetails, options, expander) {
     const { properties, staging, destination } = await this.prepare(options);
 
-    /*if (properties.source) {
-      properties.md5sums = ["SKIP"];
-    }*/
     if (properties.hooks) {
       properties.install = `${properties.name}.install`;
 
@@ -306,7 +303,15 @@ export class ALPM extends Packager {
       out.end();
     }
 
-    const depends = this.makeDepends(properties.dependencies).join(" ");
+    if (properties.backup?.[0] === "/") {
+      properties.backup = properties.backup.replace(/\//, "");
+    }
+
+    const dependencies = properties.dependencies;
+    delete properties.dependencies;
+    const fp = fieldProvider(properties, this.attributes);
+
+    const depends = this.makeDepends(dependencies).join(" ");
     const dependsStatement = depends.length ? `depends=(${depends})` : "";
     const verbose = options.verbose ? 'ls -laR "$pkgdir"' : "";
 
@@ -326,12 +331,6 @@ package() {
 `;
     }
 
-    if (properties.backup?.[0] === "/") {
-      properties.backup = properties.backup.replace(/\//, "");
-    }
-
-    const fp = fieldProvider(properties, this.attributes);
-
     transformer.push({
       name: PKGBUILD,
       match: entry => entry.name === PKGBUILD,

package/src/output/packager.mjs

@@ -3,6 +3,7 @@ import { tmpdir } from "node:os";
 import { mkdtemp, mkdir } from "node:fs/promises";
 import { createReadStream } from "node:fs";
 import {
+  asArray,
   expand,
   expandContextDoubbleCurly,
   attributeIterator,
@@ -154,14 +155,15 @@ export class Packager {
       return [];
     }
 
-    if (Array.isArray(dependencies)) {
+    if (Array.isArray(dependencies) || dependencies instanceof Set) {
       dependencies = Object.fromEntries(
-        dependencies.map(d => {
+        asArray(dependencies).map(d => {
           const m = d.match(/^([^=<>]+)(.*)/);
           return [m[1], m[2]];
         })
       );
     }
+    
     return Object.entries(dependencies)
       .filter(filterOutUnwantedDependencies())
       .map(([name, expression]) => this.dependencyExpression(name, expression));

package/src/types.mjs

@@ -1,6 +1,7 @@
 import {
+  asArray,
   types,
-  primitive_type,
+  string_type,
   string_collection_attribute_writable,
   name_attribute,
   description_attribute,
@@ -9,7 +10,7 @@ import {
 } from "pacc";
 
 export const dependency_type = {
-  ...primitive_type,
+  ...string_type,
   name: "dependency",
   toExternal: (value, attribute) => {
     switch (typeof value) {
@@ -26,6 +27,14 @@ export const dependency_type = {
       return value;
     }
 
+    if (value instanceof Set) {
+      if (value.size === 0 && attribute.skipEmpty) {
+        return undefined;
+      }
+
+      return asArray(value);
+    }
+
     return Object.entries(value).map(([name, expression]) =>
       typeof expression === "string" ? `${name}${expression}` : name
     );
@@ -33,7 +42,7 @@ export const dependency_type = {
 };
 
 export const architecture_type = {
-  ...primitive_type,
+  ...string_type,
   name: "architecture",
 
   toInternal: (value, attribute) => {