npm-pkgbuild 7.14.10 → 7.14.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.14.10",
+  "version": "7.14.14",
   "publishConfig": {
     "access": "public"
   },
@@ -40,8 +40,8 @@
   "dependencies": {
     "aggregate-async-iterator": "^1.1.7",
     "commander": "^8.3.0",
-    "content-entry": "^3.0.1",
-    "content-entry-filesystem": "^3.1.14",
+    "content-entry": "^3.0.3",
+    "content-entry-filesystem": "^3.1.15",
     "execa": "^6.0.0",
     "expression-expander": "^7.0.9",
     "globby": "^12.0.2",
@@ -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/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
@@ -54,11 +60,11 @@ export async function extractFromPackage(pkg, dir) {
   
   const processPkg = (pkg, dir) => {
 
-   if(pkg.cpu) {
-     for(const a of asArray(pkg.cpu)) {
-       arch.add(a);
-     }
-   } 
+    if(pkg.cpu) {
+      for(const a of asArray(pkg.cpu)) {
+        arch.add(npmArchMapping[a]);
+      }
+    } 
 
     if (pkg.pkg) {
       const pkgbuild = pkg.pkg;

package/src/output/arch.mjs

@@ -9,8 +9,14 @@ import {
   equalSeparatedKeyValuePairOptions
 } from "key-value-transformer";
 import { Packager } from "./packager.mjs";
-import { copyEntries, transform, fieldProvider } from "../util.mjs";
-import { quote, utf8StreamOptions } from "../util.mjs";
+import {
+  copyEntries,
+  transform,
+  fieldProvider,
+  createPropertiesInterceptor,
+  quote,
+  utf8StreamOptions
+} from "../util.mjs";
 
 /**
  * @type KeyValueTransformOptions
@@ -43,8 +49,7 @@ export class ARCH extends Packager {
     return "arch";
   }
 
-  static get description()
-  {
+  static get description() {
     return "generate Arch-Linux package";
   }
 
@@ -89,18 +94,13 @@ package() {
     }
 
     if (properties.hooks) {
-      async function* transformer(expression, remainder, source, cb) {
-        const value = properties[expression];
-        yield value === undefined ? "" : value;
-      }
-
       await pipeline(
         iterableStringInterceptor(
           createReadStream(
             join(options.pkgdir, properties.hooks),
             utf8StreamOptions
           ),
-          transformer
+          createPropertiesInterceptor(properties)
         ),
         createWriteStream(join(staging, properties.install), utf8StreamOptions)
       );
@@ -109,6 +109,7 @@ package() {
     const fp = fieldProvider(properties, fields);
 
     transformer.push({
+      name: "PKGBUILD",
       match: entry => entry.name === "PKGBUILD",
       transform: async entry =>
         new ReadableStreamContentEntry(

package/src/output/deb.mjs

@@ -32,7 +32,7 @@ export class DEB extends Packager {
     const properties = this.properties;
     const staging = await this.tmpdir;
 
-    transformer.push(createModeTransformer(0o775, entry => entry.name.match(/DEBIAN\/.*(inst|rm)/)));
+    transformer.push(createModeTransformer(0o775, entry => entry.name.match(/DEBIAN\/.*(inst|rm)/) ? true: false));
 
     const fp = fieldProvider(properties, fields);
     const debianControlName = "DEBIAN/control";

package/src/util.mjs

@@ -58,35 +58,41 @@ export function fieldProvider(properties, fields) {
   };
 }
 
-
 export function createModeTransformer(mode, match) {
   return {
+    name: "mode",
     match,
     transform: async entry => Object.create(entry, { mode: { value: mode } })
   };
 }
 
-export function createExpressionTransformer(
-  properties,
-  match = entry => entry.name.match(/\.(conf|json|html|txt|service|socket)$/)
-) {
-  async function* transformer(expression, remainder, source, cb) {
+export function createPropertiesInterceptor(properties) {
+  return async function* transformer(expression, remainder, source, cb) {
     const value = properties[expression];
     yield value === undefined ? "" : value;
-  }
+  };
+}
 
+export function createExpressionTransformer(
+  properties,
+  match = entry =>
+    entry.name.match(/\.(conf|json|html|txt|service|socket)$/) ? true : false
+) {
   return {
+    name: "expression",
     match,
     transform: async entry => {
+      //console.log("TRANSFORM",entry.name);
       const ne = new ReadableStreamContentEntry(
         entry.name,
         iterableStringInterceptor(
           await entry.getReadStream(utf8StreamOptions),
-          transformer
+          createPropertiesInterceptor(properties)
         )
       );
       ne.destination = entry.destination; // TODO all the other attributes ?
       return ne;
+      //return Object.assign(entry,ne);
     }
   };
 }
@@ -101,18 +107,17 @@ export async function* transform(source, transformers = [], onlyMatching) {
   const usedTransformers = new Set();
 
   for await (let entry of source) {
+    let didMatch = false;
     for (const t of transformers) {
+      //console.log(t.name,entry.name,t.match(entry));
       if (t.match(entry)) {
+        didMatch = true;
         entry = await t.transform(entry);
         usedTransformers.add(t);
-
-        if (onlyMatching) {
-          yield entry;
-        }
       }
     }
 
-    if (!onlyMatching) {
+    if ((onlyMatching && didMatch) || !onlyMatching) {
       yield entry;
     }
   }