npm-pkgbuild 10.19.9 → 10.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "10.19.9",
+  "version": "10.20.0",
   "publishConfig": {
     "access": "public"
   },

package/src/extract-from-package.mjs

@@ -113,6 +113,10 @@ export async function* extractFromPackage(options = {}, env = {}) {
       ? [packageContent.pkgbuild]
       : []) {
       const requires = pkgbuild.requires;
+      delete pkgbuild.requires;
+
+      let priority = 1;
+
       if (requires) {
         if (requires.properties) {
           let fullfilled = true;
@@ -125,13 +129,13 @@ export async function* extractFromPackage(options = {}, env = {}) {
           if (!fullfilled) {
             continue;
           }
-          delete pkgbuild.requires;
         }
 
         if (requires.environment) {
           if (env[requires.environment.has] === undefined) {
             continue;
           }
+          priority++;
         }
       }
 
@@ -139,7 +143,8 @@ export async function* extractFromPackage(options = {}, env = {}) {
         name: `${packageContent.name}[${i++}]`,
         depends: packageContent.engines || {},
         arch: new Set(),
-        restrictArch: new Set()
+        restrictArch: new Set(),
+        priority
       };
 
       if (packageContent.cpu) {
@@ -221,7 +226,6 @@ export async function* extractFromPackage(options = {}, env = {}) {
       fragments[fragment.name] = fragment;
 
       if (pkgbuild.variant) {
-        fragment.priority = 1;
         variants[pkgbuild.variant] = fragment;
       }
 
@@ -241,7 +245,9 @@ export async function* extractFromPackage(options = {}, env = {}) {
   //console.log("FRAGMENTS", Object.keys(fragments));
   //console.log("VARIANTS", variants);
 
-  for (const [name, variant] of Object.entries(variants)) {
+  for (const [name, variant] of Object.entries(variants).sort(
+    ([ua, a], [ub, b]) => a.priority - b.priority
+  )) {
     let arch = variant.arch;
     const properties = {};
     const depends = {};

package/src/npm-pkgbuild-cli.mjs

@@ -72,7 +72,7 @@ program
         for (const outputFactory of allOutputs.filter(
           o => options[o.name] === true || output[o.name] !== undefined
         )) {
-          if (options.available && !(await outputFactory.prepare)) {
+          if (options.available && !(await outputFactory.prepare(options))) {
             continute;
           }
 

package/src/output/arch.mjs

@@ -74,25 +74,28 @@ export class ARCH extends Packager {
     return fields;
   }
 
-  static async prepare() {
-    if(_prepared === undefined) {
-    try {
-      await execa("makepkg", ["-V"]);
-
-      const cfg = await readFile("/etc/makepkg.conf", utf8StreamOptions);
-      const i = cfg.indexOf("PKGEXT='");
-      if (i > 0) {
-        const m = cfg
-          .substring(i)
-          .split(/\n/)[0]
-          .match(/='([^']+)'/);
-        _ext = m[1];
+  static async prepare(options) {
+    if (_prepared === undefined) {
+      try {
+        await execa("makepkg", ["-V"]);
+
+        const cfg = await readFile("/etc/makepkg.conf", utf8StreamOptions);
+        if(options.verbose) {
+          console.log(cfg);
+        }
+        const i = cfg.indexOf("PKGEXT='");
+        if (i > 0) {
+          const m = cfg
+            .substring(i)
+            .split(/\n/)[0]
+            .match(/='([^']+)'/);
+          _ext = m[1];
+        }
+        _prepared = true;
+      } catch {
+        _prepared = false;
       }
-      _prepared = true;
-    } catch {
-      _prepared = false;
     }
-  }
     return _prepared;
   }