npm-pkgbuild 22.1.10 → 22.1.12

package/README.md

@@ -350,7 +350,7 @@ Source of package content.
 *   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 *   `destination` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 *   `defaultProperties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
-*   `permissions` **[Map](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Map)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object), [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)>**&#x20;
+*   `permissions` **([Map](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Map)<[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object), [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)> | [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object))**&#x20;
 
 ### propertiesFor
 
@@ -676,7 +676,7 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 
 ### Parameters
 
-*   `locations` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**  (optional, default `[]`)
+*   `locations` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 *   `properties` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?**&#x20;
 
     *   `properties.PKGBUILD_PUBLISH` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "22.1.10",
+  "version": "22.1.12",
   "publishConfig": {
     "access": "public",
     "provenance": false

package/src/output/debian.mjs

@@ -5,7 +5,8 @@ import {
   integer_attribute_writable,
   yesno_attribute_writable,
   string_attribute_writable,
-  string_collection_attribute_writable
+  string_collection_attribute_writable,
+  toExternal
 } from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
 import {
@@ -18,7 +19,8 @@ import {
   pkgbuild_version_attribute,
   pkgbuild_description_attribute,
   pkgbuild_name_attribute,
-  dependency_attribute_collection_writable
+  dependency_attribute_collection_writable,
+  architectureType
 } from "./packager.mjs";
 import { copyEntries, fieldProvider, aggregate } from "../util.mjs";
 
@@ -73,6 +75,7 @@ export class DEBIAN extends Packager {
       alias: "arch",
       default: "all",
       mandatory: true,
+      type: architectureType,
       mapping: { aarch64: "arm64" }
     },
     Homepage: {
@@ -153,7 +156,7 @@ export class DEBIAN extends Packager {
     const p = this.properties;
 
     // TODO utility to provide final values
-    const arch = this.attributes.Architecture.mapping[p.arch] || p.arch;
+    const arch = toExternal(p.arch, this.attributes.Architecture);
 
     // @ts-ignore
     return `${p.name}_${p.version}_${arch}${this.constructor.fileNameExtension}`;

package/src/output/packager.mjs

@@ -301,6 +301,21 @@ export const dependency_type = {
   }
 };
 
+export const architectureType = {
+  name: "dependency",
+  primitive: true,
+
+  toInternal: (value, attribute) => {
+ //   console.log("architectureType toInternal", value);
+    return value;
+  },
+
+  toExternal: (value, attribute) => {
+  //  console.log("architectureType toExternal", value);
+    return attribute.mapping[value] ?? value;
+  }
+};
+
 export const dependency_attribute_collection_writable = {
   ...string_collection_attribute_writable,
   type: dependency_type,

package/src/util.mjs

@@ -182,7 +182,7 @@ export function fieldProvider(properties, attributes) {
       }
     } else {
       const attribute = attributes[k];
-      yield [k, av(attribute, toExternal(properties[k] || v, attribute))];
+      yield [k, av(attribute, toExternal(properties[k] ?? v, attribute))];
     }
   };
 }
@@ -222,17 +222,20 @@ export async function* copyEntries(
       entry.destination = name;
       const destination = join(destinationDirectory, name);
 
+      let options;
+      const mode = await entry.mode;
+      if (mode) {
+        options = { mode };
+      }
+
       if (entry.isCollection) {
-        await mkdir(destination, { recursive: true, mode: await entry.mode });
+        await mkdir(destination, { recursive: true, ...options });
       } else {
         await mkdir(dirname(destination), { recursive: true });
 
         await pipeline(
           Readable.fromWeb(await entry.stream),
-          createWriteStream(
-            destination,
-            entry.mode ? { mode: await entry.mode } : undefined
-          )
+          createWriteStream(destination, options)
         );
       }