npm-pkgbuild 22.1.6 → 22.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "22.1.6",
+  "version": "22.1.8",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -61,7 +61,7 @@
     "key-value-transformer": "^3.3.2",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^11.3.0",
-    "pacc": "^11.9.0",
+    "pacc": "^11.10.0",
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "picomatch": "^4.0.7",
@@ -69,7 +69,7 @@
     "uti": "^8.11.3"
   },
   "devDependencies": {
-    "@types/node": "^26.5.0",
+    "@types/node": "^26.5.1",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",

package/src/content/content-provider.mjs

@@ -6,7 +6,7 @@ import { ContentEntry, CollectionEntry } from "content-entry";
  * @property {string} dir
  * @property {string} destination
  * @property {Object} defaultProperties
- * @property {Map<Object,Object>} permissions
+ * @property {Map<Object,Object>|Object} permissions
  */
 export class ContentProvider {
   dir;
@@ -21,17 +21,18 @@ export class ContentProvider {
    */
   constructor(definitions) {
     this.dir = definitions.dir;
-    this.defaultProperties = { destination: definitions.destination };
+    delete definitions.dir;
 
     if (definitions.permissions) {
-      if (
-        Object.values(definitions.permissions).find(v => typeof v !== "object")
-      ) {
-        Object.assign(this.defaultProperties, definitions.permissions);
+      const permissions = definitions.permissions;
+      delete definitions.permissions;
+
+      if (Object.values(permissions).find(v => typeof v !== "object")) {
+        Object.assign(definitions, permissions);
       } else {
-        const entries = definitions.permissions.entries
-          ? definitions.permissions.entries()
-          : Object.entries(definitions.permissions);
+        const entries = permissions.entries
+          ? permissions.entries()
+          : Object.entries(permissions);
 
         this.permissions = new Map(
           entries.map(([pattern, properties]) => [
@@ -41,6 +42,8 @@ export class ContentProvider {
         );
       }
     }
+
+    this.defaultProperties = { ...definitions };
   }
 
   get destination() {
@@ -48,7 +51,8 @@ export class ContentProvider {
   }
 
   toString() {
-    return `${this.constructor.name}: ${this.dir} -> ${this.destination}`;
+    const str = `${this.constructor.name}: ${this.dir}`;
+    return this.destination ? str + " -> " + this.destination : str;
   }
 
   /**
@@ -61,12 +65,6 @@ export class ContentProvider {
     if (this.permissions) {
       for (const [matcher, properties] of this.permissions) {
         if (matcher(name)) {
-          /*console.log("A",name, {
-            mode: properties.mode,
-            user: properties.user,
-            group: properties.group,
-            destination: this.destination
-          });*/
           return isCollection && properties.collection
             ? { ...properties.collection, destination: this.destination }
             : { ...properties, destination: this.destination };

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

@@ -61,7 +61,8 @@ export class FileContentProvider extends ContentProvider {
   }
 
   toString() {
-    return `${this.constructor.name}: ${this.dir}, ${this.pattern} -> ${this.destination}`;
+    const str = `${this.constructor.name}: ${this.dir}, ${this.pattern}`;
+    return this.destination ? str + " -> " + this.destination : str;
   }
 
   /**