npm-pkgbuild 8.3.3 → 8.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "8.3.3",
+  "version": "8.3.6",
   "publishConfig": {
     "access": "public"
   },
@@ -45,17 +45,17 @@
     "commander": "^9.1.0",
     "content-entry": "^4.1.9",
     "content-entry-filesystem": "^4.0.9",
-    "content-entry-transform": "^1.3.15",
+    "content-entry-transform": "^1.3.16",
     "execa": "^6.1.0",
     "expression-expander": "^7.0.16",
     "globby": "^13.1.0",
-    "ini": "^2.0.0",
+    "ini": "^3.0.0",
     "iterable-string-interceptor": "^1.0.15",
     "key-value-transformer": "^2.1.1",
     "node-fetch": "^3.2.3",
     "npm-package-walker": "^5.0.6",
     "npm-packlist": "^4.0.0",
-    "pacote": "^13.0.5",
+    "pacote": "^13.1.0",
     "pkg-dir": "^6.0.1",
     "tar-stream": "^2.2.0"
   },

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

@@ -1,12 +1,15 @@
 import { pipeline } from "stream/promises";
 import { createGunzip } from "zlib";
 import pacote from "pacote";
-import tar from "tar-stream";
-import { ContentProvider } from "./content-provider.mjs";
+import { extract as tarExtract } from "tar-stream";
 import { BufferContentEntry } from "content-entry";
+import { ContentProvider } from "./content-provider.mjs";
 
 /**
  * Content from npm pack.
+ * 
+ * @param {Object} definitions 
+ * @param {Object} entryProperties to be set for each entry
  */
 export class NPMPackContentProvider extends ContentProvider {
   /**
@@ -23,11 +26,13 @@ export class NPMPackContentProvider extends ContentProvider {
   constructor(definitions, entryProperties) {
     super();
     Object.assign(this, definitions);
-    this.entryProperties = entryProperties;
+
+    this.entryProperties = Object.fromEntries(
+      Object.entries(entryProperties).map(([key, value]) => [key, { value }])
+    );
   }
 
-  toString()
-  {
+  toString() {
     return `${this.constructor.name}: ${this.dir} -> ${this.entryProperties.destination}`;
   }
 
@@ -35,7 +40,7 @@ export class NPMPackContentProvider extends ContentProvider {
     const entries = [];
 
     await pacote.tarball.stream(this.dir, async stream => {
-      const extract = tar.extract();
+      const extract = tarExtract();
 
       extract.on("entry", async (header, stream, next) => {
         stream.on("end", () => next());
@@ -46,12 +51,15 @@ export class NPMPackContentProvider extends ContentProvider {
         }
 
         entries.push(
-          Object.assign(
+          Object.create(
             new BufferContentEntry(
               header.name.substring(8),
               Buffer.concat(chunks)
             ),
-            this.entryProperties
+            {
+              mode: { value: header.mode },
+              ...this.entryProperties
+            }
           )
         );
 

package/src/output/rpm.mjs

@@ -31,13 +31,13 @@ const hookMapping = {
   post_upgrade:*/
 };
 
-export function requiresFromDependencies(dependencies)
-{
+export function requiresFromDependencies(dependencies) {
   return Object.entries(dependencies).map(
     ([name, e]) =>
-      `${
-        packageNameMapping[name] ? packageNameMapping[name] : name
-      } ${e.replace(/([<=>])(\d)/, (match, p1,p2) => `${p1} ${p2}`)}`
+      `${packageNameMapping[name] ? packageNameMapping[name] : name}${e
+        .replace(/^\s*(\w+)/,  (match, p1) => ` = ${p1}`)
+        .replace(/^\s*$/,  "")
+        .replace(/^\s*(<|<=|>|>=|=)\s*(\w+)/, (match, p1, p2) => ` ${p1} ${p2}`)}`
   );
 }
 

package/src/util.mjs

@@ -39,18 +39,28 @@ export function decodePassword(password)
  */
 export async function* extractFunctions(source) {
   let name;
+  let insideBody;
   const body = [];
 
   for await (const line of asLines(source)) {
     let m;
 
-    if ((m = line.match(/^\s*(function\s*)?([\w_]+)\s*\(\s*\)/))) {
+    if ((m = line.match(/^\s*(function\s*)?([\w_]+)\s*\(\s*\)\s*(\{)?/))) {
       name = m[2];
+      insideBody = m[3] ? true : false;
       continue;
     }
 
     if (name) {
-      if (line.match(/^}$/)) {
+      if (line.match(/^\s*{\s*$/)) {
+        if(insideBody) {
+          body.push(line);
+        }
+        else {
+          insideBody = true;
+        }
+      }
+      else if (line.match(/^}$/)) {
         yield { name, body: body.join("\n")};
         name = undefined;
         body.length = 0;
@@ -114,7 +124,7 @@ export function fieldProvider(properties, fields) {
           if (value === undefined) {
             if (field.default === undefined) {
               if (field.mandatory) {
-                console.log(`Missing value for mandatory field ${name}`);
+                console.error(`Missing value for mandatory field ${name}`);
               }
             } else {
               yield [name, field.default];