npm-pkgbuild 21.0.3 → 22.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "21.0.3",
+  "version": "22.0.0",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -53,8 +53,8 @@
     "commander": "^15.0.0",
     "compare-versions": "^6.1.1",
     "content-entry": "^15.0.2",
-    "content-entry-filesystem": "^9.1.1",
-    "content-entry-transform": "^1.7.3",
+    "content-entry-filesystem": "^9.1.2",
+    "content-entry-transform": "^1.7.4",
     "execa": "^10.0.1",
     "ini": "^7.0.0",
     "iterable-string-interceptor": "^3.0.8",
@@ -65,11 +65,11 @@
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "picomatch": "^4.0.7",
-    "tar-stream": "^3.1.7",
+    "tar-stream": "^3.2.1",
     "uti": "^8.11.3"
   },
   "devDependencies": {
-    "@types/node": "^26.3.0",
+    "@types/node": "^26.4.0",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",
@@ -77,7 +77,7 @@
     "stream-buffers": "^3.0.3"
   },
   "engines": {
-    "node": ">=24.19.0"
+    "node": ">=24.20.0"
   },
   "repository": {
     "type": "git",

package/src/content/content-provider.mjs

@@ -6,38 +6,40 @@ import { ContentEntry, CollectionEntry } from "content-entry";
  * @property {string} dir
  */
 export class ContentProvider {
-  entryProperties;
-  directoryProperties;
   dir;
-  properties;
 
   /**
    *
    * @param {Object} definitions
    * @param {string} [definitions.dir]
-   * @param {Object} [definitions.properties]
-   * @param {Object} [entryProperties]
-   * @param {string} [entryProperties.destination]
-   * @param {Object} [directoryProperties]
+   * @param {string} [definitions.destination]
+   * @param {Object} [definitions.permissions]
    */
-  constructor(definitions, entryProperties, directoryProperties) {
+  constructor(definitions) {
     this.dir = definitions.dir;
-    this.properties = definitions.properties ?? {};
-    this.entryProperties = entryProperties;
-    this.directoryProperties = directoryProperties;
-    if (this.entryProperties?.destination) {
-      this.directoryProperties = {
-        ...this.directoryProperties,
-        destination: this.entryProperties?.destination
-      };
+    this.defaultProperties = { destination: definitions.destination };
+
+    if (definitions.permissions) {
+      if (
+        Object.values(definitions.permissions).find(v => typeof v !== "object")
+      ) {
+        Object.assign(this.defaultProperties, definitions.permissions);
+      } else {
+        this.permissions = new Map(
+          Object.entries(definitions.permissions).map(
+            ([pattern, properties]) => [picomatch(pattern), properties]
+          )
+        );
+      }
     }
+  }
 
-    this.permissions = new Map(
-      Object.entries(this.properties).map(([pattern, properties]) => [
-        picomatch(pattern),
-        properties
-      ])
-    );
+  get destination() {
+    return this.defaultProperties.destination;
+  }
+
+  toString() {
+    return `${this.constructor.name}: ${this.dir} -> ${this.destination}`;
   }
 
   /**
@@ -47,18 +49,17 @@ export class ContentProvider {
    * @returns {Object|undefined}
    */
   propertiesFor(name, isCollection) {
-    for (const [matcher, properties] of this.permissions) {
-      if (matcher(name)) {
-        return isCollection && properties.collection
-          ? properties.collection
-          : properties;
+    if (this.permissions) {
+      for (const [matcher, properties] of this.permissions) {
+        if (matcher(name)) {
+          return isCollection && properties.collection
+            ? { ...properties.collection, destination: this.destination }
+            : { ...properties, destination: this.destination };
+        }
       }
     }
 
-    if (isCollection) {
-      return this.directoryProperties;
-    }
-    return this.entryProperties;
+    return this.defaultProperties;
   }
 
   /**

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

@@ -23,34 +23,37 @@ export class FileContentProvider extends ContentProvider {
     return "use plain files source";
   }
 
-  pattern = DEFAULT_PATTERN;
-
   /**
    * Content provided form the file system.
    * @param {Object|string} definitions
    * @param {string} [definitions.dir] base directory where to find the files
    * @param {string|string[]} [definitions.pattern]
+   * @param {string} [definitions.destination]
    */
-  constructor(definitions, entryProperties, directoryProperties) {
-    super(definitions, entryProperties, directoryProperties);
+  constructor(definitions) {
+    let dir;
 
     if (typeof definitions === "string") {
-      if (definitions.endsWith("/")) {
-        this.dir = definitions.substring(0, definitions.length - 1);
-        this.pattern = DEFAULT_PATTERN;
-      } else {
-        const dir = dirname(definitions);
-        this.dir = dir;
-        this.pattern = [definitions.substring(dir.length + 1)];
-      }
+      dir = definitions;
+      definitions = {};
     } else {
-      this.dir = definitions.dir;
-      if (definitions.pattern) {
-        this.pattern = asArray(definitions.pattern);
-      }
+      dir = definitions.dir;
     }
 
-    this.dir = resolve(cwd(), this.dir);
+    if (dir.endsWith("/")) {
+      definitions.dir = dir.substring(0, dir.length - 1);
+    } else if (!definitions.pattern) {
+      definitions.dir = dirname(dir);
+      definitions.pattern = [dir.substring(definitions.dir.length + 1)];
+    }
+
+    definitions.dir = resolve(cwd(), definitions.dir);
+
+    super(definitions);
+
+    this.pattern = definitions.pattern
+      ? asArray(definitions.pattern)
+      : DEFAULT_PATTERN;
   }
 
   get isPatternMatch() {
@@ -58,7 +61,7 @@ export class FileContentProvider extends ContentProvider {
   }
 
   toString() {
-    return `${this.constructor.name}: ${this.dir}, ${this.pattern} -> ${this.entryProperties?.destination}`;
+    return `${this.constructor.name}: ${this.dir}, ${this.pattern} -> ${this.destination}`;
   }
 
   /**

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

@@ -24,12 +24,10 @@ export class NFTContentProvider extends ContentProvider {
    * @param {Object|string} definitions
    * @param {string} definitions.start base directory where to find the files
    * @param {string} [definitions.dir]
-   * @param {Object} [entryProperties]
-   * @param {string} [entryProperties.destination]
-   * @param {Object} [directoryProperties]
+   * @param {string} [definitions.destination]
  */
-  constructor(definitions, entryProperties, directoryProperties) {
-    super(definitions, entryProperties, directoryProperties);
+  constructor(definitions) {
+    super(definitions);
 
     if (typeof definitions === "string") {
       this.start = [definitions];
@@ -39,7 +37,7 @@ export class NFTContentProvider extends ContentProvider {
   }
 
   toString() {
-    return `${this.constructor.name}: ${this.start} -> ${this.entryProperties.destination}`;
+    return `${this.constructor.name}: ${this.start} -> ${this.destination}`;
   }
 
   /**

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

@@ -33,19 +33,14 @@ export class NodeModulesContentProvider extends ContentProvider {
 
   withoutDevelpmentDependencies = true;
 
-  constructor(definitions, entryProperties, directoryProperties) {
-    if (
-      entryProperties?.destination &&
-      !entryProperties.destination.endsWith("/")
-    ) {
-      entryProperties.destination += "/";
+  constructor(definitions) {
+    if (definitions?.destination && !definitions.destination.endsWith("/")) {
+      definitions.destination += "/";
     }
-    super(definitions, entryProperties, directoryProperties);
-    Object.assign(this, definitions);
-  }
+    super(definitions);
 
-  toString() {
-    return `${this.constructor.name}: ${this.dir} -> ${this.entryProperties.destination}`;
+    this.withoutDevelpmentDependencies =
+      definitions.withoutDevelpmentDependencies;
   }
 
   /**

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

@@ -25,19 +25,11 @@ export class NPMPackContentProvider extends ContentProvider {
     return "use npm pack as source";
   }
 
-  constructor(definitions, entryProperties, directoryProperties) {
-    if (
-      entryProperties?.destination &&
-      !entryProperties.destination.endsWith("/")
-    ) {
-      entryProperties.destination += "/";
+  constructor(definitions) {
+    if (definitions?.destination && !definitions.destination.endsWith("/")) {
+      definitions.destination += "/";
     }
-    super(definitions, entryProperties, directoryProperties);
-    Object.assign(this, definitions);
-  }
-
-  toString() {
-    return `${this.constructor.name}: ${this.dir} -> ${this.entryProperties.destination}`;
+    super(definitions);
   }
 
   async *[Symbol.asyncIterator]() {

package/src/extract-from-package.mjs

@@ -67,23 +67,12 @@ function mergeArchs(a, b) {
  */
 function* content2Sources(content, dir) {
   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 (let 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);
+          yield new type({ ...definition, dir, destination });
         } else {
           throw new Error(`Unknown content provider '${type}'`);
         }
@@ -93,12 +82,12 @@ function* content2Sources(content, dir) {
             definition.dir = definition.dir ? join(dir, definition.dir) : dir;
             break;
           case "string":
-            definition = join(dir, definition);
+            definition = { dir: join(dir, definition) };
             break;
           default:
             throw new Error(`Unsupported content value '${definition}'`);
         }
-        yield new FileContentProvider(definition, entryProperties);
+        yield new FileContentProvider({ ...definition, destination });
       }
     }
   }

package/src/npm-pkgbuild-cli.mjs

@@ -98,12 +98,7 @@ program
                     dir = source;
                   }
 
-                  return new FileContentProvider(
-                    {
-                      dir
-                    },
-                    { destination }
-                  );
+                  return new FileContentProvider({ dir, destination });
                 })
             );