npm-pkgbuild 7.14.7 → 7.14.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.14.7",
+  "version": "7.14.11",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "tar-stream": "^2.2.0"
   },
   "devDependencies": {
-    "ava": "^4.0.0",
+    "ava": "^4.0.1",
     "c8": "^7.11.0",
     "documentation": "^13.2.5",
     "semantic-release": "^18.0.1",

package/src/content/npm-pack-content-provider.mjs

@@ -33,7 +33,6 @@ export class NPMPackContentProvider extends ContentProvider {
       const extract = tar.extract();
 
       extract.on("entry", async (header, stream, next) => {
-        console.log(header.name);
         stream.on("end", () => next());
 
         const chunks = [];

package/src/extract-from-package.mjs

@@ -10,6 +10,12 @@ import { RPM } from "./output/rpm.mjs";
 export const allInputs = [NPMPackContentProvider, NodeModulesContentProvider];
 export const allOutputs = [DEB, ARCH, RPM];
 
+const npmArchMapping = {
+	"arm64" : "aarch64",
+	"armv7h": "armv7h",
+	"x86" : "a86_64"
+};
+
 /**
  * Extract package definition from package.json.
  * @param {Object} pkg package.json content
@@ -50,11 +56,25 @@ export async function extractFromPackage(pkg, dir) {
   let dependencies = { ...pkg.engines };
   let sources = [];
   let output = {};
-
+  let arch = new Set();
+  
   const processPkg = (pkg, dir) => {
+
+    if(pkg.cpu) {
+      for(const a of asArray(pkg.cpu)) {
+        arch.add(npmArchMapping[a]);
+      }
+    } 
+
     if (pkg.pkg) {
       const pkgbuild = pkg.pkg;
 
+      if(pkgbuild.arch) {
+        for(const a of asArray(pkgbuild.arch)) {
+          arch.add(a);
+        }
+      }
+      
       Object.assign(output, pkgbuild.output);
 
       Object.entries(pkgbuild)
@@ -75,7 +95,7 @@ export async function extractFromPackage(pkg, dir) {
                     new type({ ...definition, dir }, entryProperties)
                   );
                 } else {
-                  console.error("Unknown type '${type}'");
+                  console.error(`Unknown type '${type}'`);
                 }
               } else {
                 sources.push(
@@ -98,5 +118,9 @@ export async function extractFromPackage(pkg, dir) {
 
   processPkg(pkg, dir);
 
+  if(arch.size > 0) {
+    properties.arch = [...arch];
+  }
+  
   return { properties, sources, dependencies, output };
 }

package/src/npm-pkgbuild-cli.mjs

@@ -94,7 +94,7 @@ program
         );
 
         const context = createContext({ properties });
-        const output = new outputFactory(properties);
+        const output = new outputFactory(context.expand(properties));
         const transformer = [createExpressionTransformer(properties)];
 
         if (options.verbose) {

package/src/output/arch.mjs

@@ -28,7 +28,7 @@ export const pkgKeyValuePairOptions = {
   keyValueLine: (key, value, lineEnding) =>
     `${keyPrefix(key)}=${
       Array.isArray(value)
-        ? "(" + value.map(v => quote(v)).join(",") + ")"
+        ? "(" + value.map(v => quote(v)).join(" ") + ")"
         : quote(value)
     }${lineEnding}`
 };

package/src/output/packager.mjs

@@ -34,8 +34,9 @@ export class Packager {
       if (e !== undefined) {
         properties[k] = e;
       } else {
-        if (v.default !== undefined) {
-          properties[v.alias || k] = v.default;
+        const vak = v.alias || k;
+        if (properties[vak] === undefined && v.default !== undefined) {
+          properties[vak] = v.default;
         }
       }
     });