npm-pkgbuild 20.9.0 → 20.9.2

package/README.md

@@ -117,77 +117,77 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [ContentProvider](#contentprovider)
     *   [Parameters](#parameters-6)
     *   [Properties](#properties-3)
+    *   [propertiesFor](#propertiesfor)
+        *   [Parameters](#parameters-7)
     *   [asyncIterator](#asynciterator-3)
 *   [DEBIAN](#debian)
     *   [hookMapping](#hookmapping)
     *   [attributes](#attributes)
     *   [prepare](#prepare)
-        *   [Parameters](#parameters-7)
+        *   [Parameters](#parameters-8)
 *   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
 *   [attributes](#attributes-1)
 *   [quoteFile](#quotefile)
-    *   [Parameters](#parameters-8)
+    *   [Parameters](#parameters-9)
 *   [RPM](#rpm)
     *   [hookMapping](#hookmapping-1)
     *   [attributes](#attributes-2)
     *   [prepare](#prepare-1)
-        *   [Parameters](#parameters-9)
+        *   [Parameters](#parameters-10)
 *   [OCI](#oci)
 *   [DOCKER](#docker)
     *   [attributes](#attributes-3)
     *   [prepare](#prepare-2)
-        *   [Parameters](#parameters-10)
+        *   [Parameters](#parameters-11)
 *   [BUILDAH](#buildah)
 *   [Packager](#packager)
-    *   [Parameters](#parameters-11)
+    *   [Parameters](#parameters-12)
     *   [packageName](#packagename)
-        *   [Parameters](#parameters-12)
+        *   [Parameters](#parameters-13)
     *   [hookContent](#hookcontent)
     *   [dependencyExpression](#dependencyexpression)
-        *   [Parameters](#parameters-13)
+        *   [Parameters](#parameters-14)
     *   [tmpdir](#tmpdir)
     *   [prepare](#prepare-3)
-        *   [Parameters](#parameters-14)
-    *   [create](#create)
         *   [Parameters](#parameters-15)
+    *   [create](#create)
+        *   [Parameters](#parameters-16)
     *   [workspaceLayout](#workspacelayout)
     *   [prepare](#prepare-4)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [Packager](#packager-1)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-18)
     *   [packageName](#packagename-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-19)
     *   [hookContent](#hookcontent-1)
     *   [dependencyExpression](#dependencyexpression-1)
-        *   [Parameters](#parameters-19)
+        *   [Parameters](#parameters-20)
     *   [tmpdir](#tmpdir-1)
     *   [prepare](#prepare-5)
-        *   [Parameters](#parameters-20)
-    *   [create](#create-1)
         *   [Parameters](#parameters-21)
+    *   [create](#create-1)
+        *   [Parameters](#parameters-22)
     *   [workspaceLayout](#workspacelayout-1)
     *   [prepare](#prepare-6)
-        *   [Parameters](#parameters-22)
+        *   [Parameters](#parameters-23)
 *   [Field](#field)
     *   [Properties](#properties-4)
 *   [deleteKey](#deletekey)
-    *   [Parameters](#parameters-23)
-*   [copyNodeModules](#copynodemodules)
     *   [Parameters](#parameters-24)
+*   [copyNodeModules](#copynodemodules)
+    *   [Parameters](#parameters-25)
 *   [PublishingDetail](#publishingdetail)
     *   [Properties](#properties-5)
 *   [createPublishingDetails](#createpublishingdetails)
-    *   [Parameters](#parameters-25)
-*   [publish](#publish)
     *   [Parameters](#parameters-26)
+*   [publish](#publish)
+    *   [Parameters](#parameters-27)
 *   [utf8StreamOptions](#utf8streamoptions)
 *   [decodePassword](#decodepassword)
-    *   [Parameters](#parameters-27)
+    *   [Parameters](#parameters-28)
 *   [FunctionDecl](#functiondecl)
     *   [Properties](#properties-6)
 *   [extractFunctions](#extractfunctions)
-    *   [Parameters](#parameters-28)
-*   [asArray](#asarray)
     *   [Parameters](#parameters-29)
 *   [fieldProvider](#fieldprovider)
     *   [Parameters](#parameters-30)
@@ -358,6 +358,15 @@ Source of package content.
 
 *   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 
+### propertiesFor
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `isCollection` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** 
+
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+
 ### asyncIterator
 
 List all entries.
@@ -726,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.0",
+  "version": "20.9.2",
   "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.2.3",
+    "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/file-content-provider.mjs

@@ -3,7 +3,7 @@ import { cwd } from "node:process";
 import { glob } from "node:fs/promises";
 import { ContentEntry, CollectionEntry } from "content-entry";
 import { FileSystemEntry } from "content-entry-filesystem";
-import { asArray } from "../util.mjs";
+import { asArray } from "pacc";
 import { ContentProvider } from "./content-provider.mjs";
 
 const DEFAULT_PATTERN = ["**/*", "!.*"];

package/src/content/nft-content-provider.mjs

@@ -1,7 +1,7 @@
 import { nodeFileTrace } from "@vercel/nft";
 import { ContentEntry } from "content-entry";
 import { FileSystemEntry } from "content-entry-filesystem";
-import { asArray } from "../util.mjs";
+import { asArray } from "pacc";
 import { ContentProvider } from "./content-provider.mjs";
 
 /**

package/src/extract-from-package.mjs

@@ -1,9 +1,9 @@
 import { join, resolve } from "node:path";
 import { packageDirectory } from "package-directory";
 import { packageWalker } from "npm-package-walker";
-import { expand } from "pacc";
+import { expand, asArray } from "pacc";
 import { satisfies } from "compare-versions";
-import { asArray, mergeDependencies } from "./util.mjs";
+import { mergeDependencies } from "./util.mjs";
 import { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
 import { NodeModulesContentProvider } from "./content/node-modules-content-provider.mjs";
 import { FileContentProvider } from "./content/file-content-provider.mjs";

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.owner || file.group || file.mode) {
+        permissions.push(file);
       }
 
       if (options.verbose) {
@@ -286,15 +287,15 @@ 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 ###");
 
       content =
         content.substring(0, markerPos) +
-        ownership
-          .map(
+        permissions
+          .filter(f=>f.user||f.group).map(
             f =>
               `    chown ${[f.owner ?? "", f.group ?? ""].join(
                 ":"

package/src/util.mjs

@@ -3,7 +3,7 @@ import { mkdir } from "node:fs/promises";
 import { pipeline } from "node:stream/promises";
 import { Readable } from "node:stream";
 import { createWriteStream } from "node:fs";
-import { toExternal } from "pacc";
+import { toExternal, asArray } from "pacc";
 import { ContentEntry } from "content-entry";
 import { aggregateFifo } from "aggregate-async-iterator";
 
@@ -138,28 +138,6 @@ export function quote(v, qc = "'") {
     return v.match(/^\w+$/) ? v : qc + v + qc;
 }
 
-/**
- * Convert scalar or iterable into Array.
- * @param {any} value
- * @returns {Array<any>}
- */
-export function asArray(value) {
-  switch (typeof value) {
-    case "undefined":
-      return [];
-    case "object":
-      if (Array.isArray(value)) {
-        return value;
-      }
-
-      if (value instanceof Iterator || value[Symbol.iterator]) {
-        return [...value];
-      }
-  }
-
-  return [value];
-}
-
 /**
  *
  * @param {Object} properties