feat: mix in output related content

arlac77 · Mar 14, 2024 · 3da4782 · 3da4782
1 parent f75bd59
commit 3da4782
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/src/extract-from-package.mjs b/src/extract-from-package.mjs
@@ -325,6 +325,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
         properties = { ...fragment.properties, ...properties };
         dependencies = mergeDependencies(dependencies, fragment.dependencies);
         Object.assign(output, fragment.output);
+
         if (fragment.content) {
           content.push([fragment.content, fragment.dir]);
         }
@@ -333,7 +334,6 @@ export async function* extractFromPackage(options = {}, env = {}) {
       }
     }
 
-
     // @ts-ignore
     Object.assign(properties, root.properties);
     delete properties.dependencies;
@@ -346,7 +346,6 @@ export async function* extractFromPackage(options = {}, env = {}) {
       return a;
     }, []);
 
-
     const result = {
       context,
       variant: { name, priority: variant.priority },
@@ -380,11 +379,22 @@ export async function* extractFromPackage(options = {}, env = {}) {
           result.properties.arch = arch;
         }
 
+        let sources = [];
+
+        if (output.content) {
+          sources = context
+            .expand([[output.content, root.dir]])
+            .reduce((a, c) => {
+              a.push(...content2Sources(c[0], c[1]));
+              return a;
+            }, []);
+        }
+
         yield {
           ...result,
           variant: { ...result.variant, output: name },
           output: { [name]: output },
-          // sources: [...result.sources, ...output.sources],
+          sources: [...result.sources, ...sources],
           dependencies: mergeDependencies(
             result.dependencies,
             output.dependencies

diff --git a/tests/extract-from-package-ava.mjs b/tests/extract-from-package-ava.mjs
@@ -178,14 +178,18 @@ test(
       sources: [
         new FileContentProvider(
           {
-            base: new URL(
-              "../build/efpt-n2",
-              import.meta.url
-            ).pathname,
+            base: new URL("../build/efpt-n2", import.meta.url).pathname,
             pattern: ["*"]
           },
           { destination: "/service/myservice" }
-        )  
+        ),
+        new FileContentProvider(
+          {
+            base: new URL("../build/efpt-n2/pkg", import.meta.url).pathname,
+            pattern: ["myconfig.json"]
+          },
+          { destination: "/etc/myconfig.json" }
+        )
       ]
     }
   ]