npm-pkgbuild 15.0.0 → 15.1.0

package/README.md

@@ -97,24 +97,24 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [FileContentProvider](#filecontentprovider)
     *   [Parameters](#parameters-1)
     *   [name](#name)
+*   [NFTContentProvider](#nftcontentprovider)
+    *   [Parameters](#parameters-2)
+    *   [name](#name-1)
 *   [utf8StreamOptions](#utf8streamoptions)
     *   [Properties](#properties-1)
 *   [packageNameMapping](#packagenamemapping)
 *   [decodePassword](#decodepassword)
-    *   [Parameters](#parameters-2)
+    *   [Parameters](#parameters-3)
 *   [FunctionDecl](#functiondecl)
     *   [Properties](#properties-2)
 *   [extractFunctions](#extractfunctions)
-    *   [Parameters](#parameters-3)
-*   [fieldProvider](#fieldprovider)
     *   [Parameters](#parameters-4)
-*   [Expander](#expander)
+*   [fieldProvider](#fieldprovider)
     *   [Parameters](#parameters-5)
-*   [copyEntries](#copyentries)
+*   [Expander](#expander)
     *   [Parameters](#parameters-6)
-*   [NFTContentProvider](#nftcontentprovider)
+*   [copyEntries](#copyentries)
     *   [Parameters](#parameters-7)
-    *   [name](#name-1)
 *   [NodeModulesContentProvider](#nodemodulescontentprovider)
     *   [Parameters](#parameters-8)
     *   [Properties](#properties-3)
@@ -210,6 +210,24 @@ Content provided form the file system.
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
 
+## NFTContentProvider
+
+**Extends ContentProvider**
+
+Content provided form the file system.
+
+### Parameters
+
+*   `definitions` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))** 
+
+    *   `definitions.pattern` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>)**&#x20;
+    *   `definitions.base` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** base directory where to find the files
+*   `entryProperties` &#x20;
+
+### name
+
+Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
+
 ## utf8StreamOptions
 
 Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
@@ -281,24 +299,6 @@ Destination paths a generated without leading '/' (as for entry names too).
 *   `destinationDirectory` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)**&#x20;
 *   `expander` **[Expander](#expander)**  (optional, default `v=>v`)
 
-## NFTContentProvider
-
-**Extends ContentProvider**
-
-Content provided form the file system.
-
-### Parameters
-
-*   `definitions` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))**&#x20;
-
-    *   `definitions.pattern` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>)**&#x20;
-    *   `definitions.base` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** base directory where to find the files
-*   `entryProperties` &#x20;
-
-### name
-
-Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** name of the content provider
-
 ## NodeModulesContentProvider
 
 **Extends ContentProvider**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "15.0.0",
+  "version": "15.1.0",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/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