npm-pkgbuild 20.9.1 → 20.9.3

package/README.md

@@ -189,14 +189,12 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
     *   [Properties](#properties-6)
 *   [extractFunctions](#extractfunctions)
     *   [Parameters](#parameters-29)
-*   [asArray](#asarray)
-    *   [Parameters](#parameters-30)
 *   [fieldProvider](#fieldprovider)
-    *   [Parameters](#parameters-31)
+    *   [Parameters](#parameters-30)
 *   [Expander](#expander)
-    *   [Parameters](#parameters-32)
+    *   [Parameters](#parameters-31)
 *   [copyEntries](#copyentries)
-    *   [Parameters](#parameters-33)
+    *   [Parameters](#parameters-32)
 
 ## allInputs
 
@@ -737,16 +735,6 @@ Extract shell functions from a given text.
 
 Returns **AsyncIterable<[FunctionDecl](#functiondecl)>**&#x20;
 
-## asArray
-
-Convert scalar or iterable into Array.
-
-### Parameters
-
-*   `value` **any**&#x20;
-
-Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<any>**&#x20;
-
 ## fieldProvider
 
 ### Parameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "20.9.1",
+  "version": "20.9.3",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -60,7 +60,7 @@
     "key-value-transformer": "^3.3.2",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^11.3.0",
-    "pacc": "^11.3.0",
+    "pacc": "^11.5.1",
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "tar-stream": "^3.1.7",
@@ -75,7 +75,7 @@
     "stream-buffers": "^3.0.3"
   },
   "engines": {
-    "node": ">=24.16.0"
+    "node": ">=24.19.0"
   },
   "repository": {
     "type": "git",

package/src/content/content-provider.mjs

@@ -36,7 +36,7 @@ export class ContentProvider {
    *
    * @param {string} name
    * @param {boolean} isCollection
-   * @returns {Object}
+   * @returns {Object|undefined}
    */
   propertiesFor(name, isCollection) {
     for (const [pattern, properties] of Object.entries(this.properties)) {

package/src/output/arch.mjs

@@ -230,18 +230,19 @@ export class ARCH extends Packager {
       out.end();
     }
 
+    const depends = this.makeDepends(properties.dependencies).join(" ");
+    const dependsStatement = depends.length ? `depends=(${depends})` : "";
     const verbose = options.verbose ? 'ls -laR "$pkgdir"' : "";
 
-    const self = this;
     async function* trailingLines() {
       yield `
 package() {
-  depends=(${self.makeDepends(properties.dependencies).join(" ")})
+  ${dependsStatement}
 
   if [ "$(ls -A $srcdir)" ]
   then
     cp -rp $srcdir/* "$pkgdir"
-### CHOWN ###
+### PERMISSION ###
 
     ${verbose}
   fi
@@ -270,15 +271,15 @@ package() {
       createEntryWhenMissing: () => new ContentEntry(PKGBUILD)
     });
 
-    const ownership = [];
+    const permissions = [];
 
     for await (const file of copyEntries(
       transform(aggregate(sources), transformer),
       join(staging, "src"),
       expander
     )) {
-      if (file.owner || file.group) {
-        ownership.push(file);
+      if (file.user || file.group || file.mode) {
+        permissions.push(file);
       }
 
       if (options.verbose) {
@@ -286,22 +287,30 @@ package() {
       }
     }
 
-    if (ownership.length) {
+    if (permissions.length) {
       const pkgbuild = join(staging, PKGBUILD);
       let content = await readFile(pkgbuild, utf8StreamOptions);
-      const markerPos = content.indexOf("### CHOWN ###");
+      const markerPos = content.indexOf("### PERMISSION ###");
+
+      const flags = {
+        user: ["-u", f => f.user],
+        group: ["-g", f => f.group],
+        mode: ["-m", f => Number(f.mode).toString(8)]
+      };
 
       content =
         content.substring(0, markerPos) +
-        ownership
-          .map(
-            f =>
-              `    chown ${[f.owner ?? "", f.group ?? ""].join(
-                ":"
-              )} \"$pkgdir/${f.destination}\"`
-          )
+        permissions
+          .filter(f=>f.isBlob)
+          .map(f => {
+            const options = Object.keys(flags)
+              .filter(name => f[name])
+              .map(name => `${flags[name][0]} ${flags[name][1](f)}`)
+              .join(" ");
+            return `    install -D ${options} \"$srcdir/${f.name}\" \"$pkgdir/${f.destination}\"`;
+          })
           .join("\n") +
-        content.substring(markerPos + 14);
+        content.substring(markerPos + 18);
 
       await writeFile(pkgbuild, content, utf8StreamOptions);
     }