npm-pkgbuild 10.19.10 → 10.20.1

package/package.json

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

package/src/extract-from-package.mjs

@@ -113,25 +113,32 @@ export async function* extractFromPackage(options = {}, env = {}) {
       ? [packageContent.pkgbuild]
       : []) {
       const requires = pkgbuild.requires;
+      delete pkgbuild.requires;
+
+      let priority = 1;
+
       if (requires) {
+        let fullfilled = true;
+
         if (requires.properties) {
-          let fullfilled = true;
           for (const [k, v] of Object.entries(requires.properties)) {
             if (root.properties[k] !== v) {
               fullfilled = false;
               break;
             }
           }
-          if (!fullfilled) {
-            continue;
-          }
-          delete pkgbuild.requires;
         }
 
         if (requires.environment) {
           if (env[requires.environment.has] === undefined) {
-            continue;
+            fullfilled = false;
           }
+          priority++;
+        }
+
+        if (!fullfilled) {
+          console.log("requirement not fullfilled", requires);
+          continue;
         }
       }
 
@@ -139,7 +146,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 +229,6 @@ export async function* extractFromPackage(options = {}, env = {}) {
       fragments[fragment.name] = fragment;
 
       if (pkgbuild.variant) {
-        fragment.priority = 1;
         variants[pkgbuild.variant] = fragment;
       }
 
@@ -241,7 +248,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 = {};