npm-pkgbuild 20.8.18 → 20.9.1

package/README.md

@@ -117,84 +117,86 @@ See [mf-hosting](https://www.npmjs.com/package/mf-hosting) or [mf-hosting-fronte
 *   [ContentProvider](#contentprovider)
     *   [Parameters](#parameters-6)
     *   [Properties](#properties-3)
+    *   [propertiesFor](#propertiesfor)
+        *   [Parameters](#parameters-7)
     *   [asyncIterator](#asynciterator-3)
 *   [DEBIAN](#debian)
     *   [hookMapping](#hookmapping)
     *   [attributes](#attributes)
     *   [prepare](#prepare)
-        *   [Parameters](#parameters-7)
+        *   [Parameters](#parameters-8)
 *   [pkgKeyValuePairOptions](#pkgkeyvaluepairoptions)
 *   [attributes](#attributes-1)
 *   [quoteFile](#quotefile)
-    *   [Parameters](#parameters-8)
+    *   [Parameters](#parameters-9)
 *   [RPM](#rpm)
     *   [hookMapping](#hookmapping-1)
     *   [attributes](#attributes-2)
     *   [prepare](#prepare-1)
-        *   [Parameters](#parameters-9)
+        *   [Parameters](#parameters-10)
 *   [OCI](#oci)
 *   [DOCKER](#docker)
     *   [attributes](#attributes-3)
     *   [prepare](#prepare-2)
-        *   [Parameters](#parameters-10)
+        *   [Parameters](#parameters-11)
 *   [BUILDAH](#buildah)
 *   [Packager](#packager)
-    *   [Parameters](#parameters-11)
+    *   [Parameters](#parameters-12)
     *   [packageName](#packagename)
-        *   [Parameters](#parameters-12)
+        *   [Parameters](#parameters-13)
     *   [hookContent](#hookcontent)
     *   [dependencyExpression](#dependencyexpression)
-        *   [Parameters](#parameters-13)
+        *   [Parameters](#parameters-14)
     *   [tmpdir](#tmpdir)
     *   [prepare](#prepare-3)
-        *   [Parameters](#parameters-14)
-    *   [create](#create)
         *   [Parameters](#parameters-15)
+    *   [create](#create)
+        *   [Parameters](#parameters-16)
     *   [workspaceLayout](#workspacelayout)
     *   [prepare](#prepare-4)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [Packager](#packager-1)
-    *   [Parameters](#parameters-17)
+    *   [Parameters](#parameters-18)
     *   [packageName](#packagename-1)
-        *   [Parameters](#parameters-18)
+        *   [Parameters](#parameters-19)
     *   [hookContent](#hookcontent-1)
     *   [dependencyExpression](#dependencyexpression-1)
-        *   [Parameters](#parameters-19)
+        *   [Parameters](#parameters-20)
     *   [tmpdir](#tmpdir-1)
     *   [prepare](#prepare-5)
-        *   [Parameters](#parameters-20)
-    *   [create](#create-1)
         *   [Parameters](#parameters-21)
+    *   [create](#create-1)
+        *   [Parameters](#parameters-22)
     *   [workspaceLayout](#workspacelayout-1)
     *   [prepare](#prepare-6)
-        *   [Parameters](#parameters-22)
+        *   [Parameters](#parameters-23)
 *   [Field](#field)
     *   [Properties](#properties-4)
 *   [deleteKey](#deletekey)
-    *   [Parameters](#parameters-23)
-*   [copyNodeModules](#copynodemodules)
     *   [Parameters](#parameters-24)
+*   [copyNodeModules](#copynodemodules)
+    *   [Parameters](#parameters-25)
 *   [PublishingDetail](#publishingdetail)
     *   [Properties](#properties-5)
 *   [createPublishingDetails](#createpublishingdetails)
-    *   [Parameters](#parameters-25)
-*   [publish](#publish)
     *   [Parameters](#parameters-26)
+*   [publish](#publish)
+    *   [Parameters](#parameters-27)
 *   [utf8StreamOptions](#utf8streamoptions)
 *   [decodePassword](#decodepassword)
-    *   [Parameters](#parameters-27)
+    *   [Parameters](#parameters-28)
 *   [FunctionDecl](#functiondecl)
     *   [Properties](#properties-6)
 *   [extractFunctions](#extractfunctions)
-    *   [Parameters](#parameters-28)
-*   [asArray](#asarray)
     *   [Parameters](#parameters-29)
-*   [fieldProvider](#fieldprovider)
+*   [asArray](#asarray)
     *   [Parameters](#parameters-30)
-*   [Expander](#expander)
+*   [fieldProvider](#fieldprovider)
     *   [Parameters](#parameters-31)
-*   [copyEntries](#copyentries)
+*   [Expander](#expander)
     *   [Parameters](#parameters-32)
+*   [copyEntries](#copyentries)
+    *   [Parameters](#parameters-33)
 
 ## allInputs
 
@@ -358,6 +360,15 @@ Source of package content.
 
 *   `dir` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 
+### propertiesFor
+
+#### Parameters
+
+*   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
+*   `isCollection` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** 
+
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
+
 ### asyncIterator
 
 List all entries.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "20.8.18",
+  "version": "20.9.1",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -60,7 +60,7 @@
     "key-value-transformer": "^3.3.2",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^11.3.0",
-    "pacc": "^11.2.3",
+    "pacc": "^11.3.0",
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "tar-stream": "^3.1.7",

package/src/content/content-provider.mjs

@@ -8,17 +8,20 @@ export class ContentProvider {
   entryProperties;
   directoryProperties;
   dir;
+  properties;
 
   /**
-   * 
-   * @param {Object} definitions 
+   *
+   * @param {Object} definitions
    * @param {string} [definitions.dir]
+   * @param {Object} [definitions.properties]
    * @param {Object} [entryProperties]
    * @param {string} [entryProperties.destination]
    * @param {Object} [directoryProperties]
    */
   constructor(definitions, entryProperties, directoryProperties) {
     this.dir = definitions.dir;
+    this.properties = definitions.properties ?? {};
     this.entryProperties = entryProperties;
     this.directoryProperties = directoryProperties;
     if (this.entryProperties?.destination) {
@@ -29,6 +32,39 @@ export class ContentProvider {
     }
   }
 
+  /**
+   *
+   * @param {string} name
+   * @param {boolean} isCollection
+   * @returns {Object}
+   */
+  propertiesFor(name, isCollection) {
+    for (const [pattern, properties] of Object.entries(this.properties)) {
+      if (pattern === name) {
+        return properties;
+      }
+      if (pattern.endsWith("**/*")) {
+        const prefix = pattern.substring(0, pattern.length - 4);
+        if (name.startsWith(prefix)) {
+          return properties;
+        }
+      }
+      if (pattern.endsWith("*")) {
+        const prefix = pattern.substring(0, pattern.length - 1);
+        if (name.startsWith(prefix)) {
+          if (name.substring(prefix.length).indexOf("/") < 0) {
+            return properties;
+          }
+        }
+      }
+    }
+
+    if (isCollection) {
+      return this.directoryProperties;
+    }
+    return this.entryProperties;
+  }
+
   /**
    * List all entries.
    * @return {AsyncIterable<ContentEntry|CollectionEntry>} all entries

package/src/content/file-content-provider.mjs

@@ -3,7 +3,7 @@ import { cwd } from "node:process";
 import { glob } from "node:fs/promises";
 import { ContentEntry, CollectionEntry } from "content-entry";
 import { FileSystemEntry } from "content-entry-filesystem";
-import { asArray } from "../util.mjs";
+import { asArray } from "pacc";
 import { ContentProvider } from "./content-provider.mjs";
 
 const DEFAULT_PATTERN = ["**/*", "!.*"];
@@ -74,15 +74,14 @@ export class FileContentProvider extends ContentProvider {
       withFileTypes: true
     })) {
       const name = join(entry.parentPath, entry.name).substring(startPos);
-
       if (entry.isFile()) {
         yield new FileSystemEntry(name, {
-          ...this.entryProperties,
+          ...this.propertiesFor(name),
           baseDir
         });
         count++;
       } else if (entry.isDirectory()) {
-        yield new CollectionEntry(name, this.directoryProperties);
+        yield new CollectionEntry(name, this.propertiesFor(name, true));
         count++;
       }
     }

package/src/content/nft-content-provider.mjs

@@ -1,7 +1,7 @@
 import { nodeFileTrace } from "@vercel/nft";
 import { ContentEntry } from "content-entry";
 import { FileSystemEntry } from "content-entry-filesystem";
-import { asArray } from "../util.mjs";
+import { asArray } from "pacc";
 import { ContentProvider } from "./content-provider.mjs";
 
 /**
@@ -52,7 +52,7 @@ export class NFTContentProvider extends ContentProvider {
     for (const name of fileList) {
       yield new FileSystemEntry(
         name,
-        { ...this.entryProperties, baseDir }
+        { ...this.propertiesFor(name), baseDir }
       );
     }
   }

package/src/content/node-modules-content-provider.mjs

@@ -143,7 +143,7 @@ export class NodeModulesContentProvider extends ContentProvider {
               if (json) {
                 yield new StringContentEntry(
                   name,
-                  this.entryProperties,
+                  this.propertiesFor(name),
                   JSON.stringify(json)
                 );
               }
@@ -154,11 +154,11 @@ export class NodeModulesContentProvider extends ContentProvider {
           }
 
           yield new FileSystemEntry(name, {
-            ...this.entryProperties,
+            ...this.propertiesFor(name),
             baseDir: nodeModulesDir
           });
         } else if (entry.isDirectory()) {
-          yield new CollectionEntry(name, this.directoryProperties);
+          yield new CollectionEntry(name, this.propertiesFor(name, true));
         }
       }
     } catch (e) {

package/src/content/npm-pack-content-provider.mjs

@@ -56,11 +56,12 @@ export class NPMPackContentProvider extends ContentProvider {
             chunks.push(chunk);
           }
 
+          const name = header.name.substring(8);
           entries.push(
             new BufferContentEntry(
-              header.name.substring(8),
+              name,
               {
-                ...this.entryProperties,
+                ...this.propertiesFor(name),
                 mtime: header.mtime,
                 mode: header.mode
               },

package/src/extract-from-package.mjs

@@ -1,9 +1,9 @@
 import { join, resolve } from "node:path";
 import { packageDirectory } from "package-directory";
 import { packageWalker } from "npm-package-walker";
-import { expand } from "pacc";
+import { expand, asArray } from "pacc";
 import { satisfies } from "compare-versions";
-import { asArray, mergeDependencies } from "./util.mjs";
+import { mergeDependencies } from "./util.mjs";
 import { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
 import { NodeModulesContentProvider } from "./content/node-modules-content-provider.mjs";
 import { FileContentProvider } from "./content/file-content-provider.mjs";

package/src/util.mjs

@@ -3,7 +3,7 @@ import { mkdir } from "node:fs/promises";
 import { pipeline } from "node:stream/promises";
 import { Readable } from "node:stream";
 import { createWriteStream } from "node:fs";
-import { toExternal } from "pacc";
+import { toExternal, asArray } from "pacc";
 import { ContentEntry } from "content-entry";
 import { aggregateFifo } from "aggregate-async-iterator";
 
@@ -138,28 +138,6 @@ export function quote(v, qc = "'") {
     return v.match(/^\w+$/) ? v : qc + v + qc;
 }
 
-/**
- * Convert scalar or iterable into Array.
- * @param {any} value
- * @returns {Array<any>}
- */
-export function asArray(value) {
-  switch (typeof value) {
-    case "undefined":
-      return [];
-    case "object":
-      if (Array.isArray(value)) {
-        return value;
-      }
-
-      if (value instanceof Iterator || value[Symbol.iterator]) {
-        return [...value];
-      }
-  }
-
-  return [value];
-}
-
 /**
  *
  * @param {Object} properties