npm-pkgbuild 10.19.4 → 10.19.7

package/package.json

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

package/src/extract-from-package.mjs

@@ -51,31 +51,29 @@ const entryAttributeNames = ["owner", "group", "mode"];
  * @returns {Iterator<ContentProvider>}
  */
 function* content2Sources(content, dir) {
-  if (content) {
-    for (const [destination, definitions] of Object.entries(content)) {
-      const allEntryProperties = {};
-
-      for (const a of entryAttributeNames) {
-        if (definitions[a] !== undefined) {
-          allEntryProperties[a] = definitions[a];
-          delete definitions[a];
-        }
+  for (const [destination, definitions] of Object.entries(content)) {
+    const allEntryProperties = {};
+
+    for (const a of entryAttributeNames) {
+      if (definitions[a] !== undefined) {
+        allEntryProperties[a] = definitions[a];
+        delete definitions[a];
       }
+    }
 
-      for (const definition of asArray(definitions)) {
-        const entryProperties = { ...allEntryProperties, destination };
+    for (const definition of asArray(definitions)) {
+      const entryProperties = { ...allEntryProperties, destination };
 
-        if (definition.type) {
-          const type = allInputs.find(i => i.name === definition.type);
-          if (type) {
-            delete definition.type;
-            yield new type({ ...definition, dir }, entryProperties);
-          } else {
-            console.error(`Unknown type '${type}'`);
-          }
+      if (definition.type) {
+        const type = allInputs.find(i => i.name === definition.type);
+        if (type) {
+          delete definition.type;
+          yield new type({ ...definition, dir }, entryProperties);
         } else {
-          yield new FileContentProvider(definition, entryProperties);
+          console.error(`Unknown type '${type}'`);
         }
+      } else {
+        yield new FileContentProvider(definition, entryProperties);
       }
     }
   }
@@ -167,10 +165,12 @@ export async function* extractFromPackage(options = {}, env = {}) {
         }
       }
 
-      for (const k of ["output", "content", "depends"]) {
-        if (pkgbuild[k]) {
-          fragment[k] = pkgbuild[k];
-          delete pkgbuild[k];
+      if (modulePath.length === 0 || pkgbuild.variant) {
+        for (const k of ["output", "content", "depends"]) {
+          if (pkgbuild[k]) {
+            fragment[k] = pkgbuild[k];
+            delete pkgbuild[k];
+          }
         }
       }
 
@@ -191,12 +191,6 @@ export async function* extractFromPackage(options = {}, env = {}) {
       if (modulePath.length >= 1) {
         fragment.parent =
           modulePath.length === 1 ? parent : modulePath[modulePath.length - 2];
-        /*console.log(
-          "FRAGMENT",
-          fragment.name,
-          fragment.parent,
-          fragments[fragment.parent] ? "exists" : "missing"
-        );*/
       } else {
         if (properties.name) {
           properties.name = properties.name.replace(/^\@[^\/]+\//, "");
@@ -243,39 +237,41 @@ export async function* extractFromPackage(options = {}, env = {}) {
   if (root && Object.keys(variants).length === 0) {
     variants.default = root;
   }
-  /*
-  console.log("FRAGMENTS", Object.keys(fragments));
-  console.log("VARIANTS", variants);
-  */
+
+  //console.log("FRAGMENTS", Object.keys(fragments));
+  //console.log("VARIANTS", variants);
 
   for (const [name, variant] of Object.entries(variants)) {
     let arch = variant.arch;
     const properties = {};
     const depends = {};
     const output = {};
-    const sources = [];
+    const content = [];
 
     for (
       let fragment = variant;
       fragment;
       fragment = fragments[fragment.parent]
     ) {
-      const context = createContext({ properties: fragment.properties });
-
+      arch = new Set([...arch, ...fragment.arch]);
       Object.assign(properties, fragment.properties);
       Object.assign(depends, fragment.depends);
       Object.assign(output, fragment.output);
-      arch = new Set([...arch, ...fragment.arch]);
-
-      sources.push(
-        ...content2Sources(context.expand(fragment.content), fragment.dir)
-      );
+      if (fragment.content) {
+        content.push(fragment.content);
+      }
     }
 
     properties.variant = name;
 
     const context = createContext({ properties });
 
+    const sources = [];
+
+    for (const s of context.expand(content)) {
+      sources.push(...content2Sources(s, root.dir));
+    }
+
     const result = {
       context,
       variant: { name },