npm-pkgbuild 19.2.1 → 20.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "19.2.1",
+  "version": "20.0.1",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -59,7 +59,7 @@
     "compare-versions": "^6.1.1",
     "content-entry": "^14.2.7",
     "content-entry-filesystem": "^9.0.14",
-    "content-entry-transform": "^1.5.17",
+    "content-entry-transform": "^1.5.18",
     "execa": "^9.6.0",
     "expression-expander": "^7.2.8",
     "ini": "^6.0.0",

package/src/content/content-provider.mjs

@@ -3,10 +3,8 @@ import { ContentEntry, CollectionEntry } from "content-entry";
 /**
  * Source of package content.
  * @property {string} dir
- * @property {Transformer[]} transformers
  */
 export class ContentProvider {
-  transformers;
   entryProperties;
   directoryProperties;
   dir;
@@ -14,14 +12,12 @@ export class ContentProvider {
   /**
    * 
    * @param {Object} definitions 
-   * @param {Array<Transformer>} [definitions.transformers]
    * @param {string} [definitions.dir]
    * @param {Object} [entryProperties]
    * @param {string} [entryProperties.destination]
    * @param {Object} [directoryProperties]
    */
   constructor(definitions, entryProperties, directoryProperties) {
-    this.transformers = definitions.transformers || [];
     this.dir = definitions.dir;
     this.entryProperties = entryProperties;
     this.directoryProperties = directoryProperties;

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

@@ -23,35 +23,34 @@ export class FileContentProvider extends ContentProvider {
     return "use plain files source";
   }
 
-  base;
   pattern = DEFAULT_PATTERN;
 
   /**
    * Content provided form the file system.
    * @param {Object|string} definitions
    * @param {string|string[]} [definitions.pattern]
-   * @param {string} [definitions.base] base directory where to find the files
+   * @param {string} [definitions.dir] base directory where to find the files
    */
   constructor(definitions, entryProperties, directoryProperties) {
     super(definitions, entryProperties, directoryProperties);
 
     if (typeof definitions === "string") {
       if (definitions.endsWith("/")) {
-        this.base = definitions.substring(0, definitions.length - 1);
+        this.dir = definitions.substring(0, definitions.length - 1);
         this.pattern = DEFAULT_PATTERN;
       } else {
-        const base = dirname(definitions);
-        this.base = base;
-        this.pattern = [definitions.substring(base.length + 1)];
+        const dir = dirname(definitions);
+        this.dir = dir;
+        this.pattern = [definitions.substring(dir.length + 1)];
       }
     } else {
-      this.base = definitions.base;
-      if(definitions.pattern) {
+      this.dir = definitions.dir;
+      if (definitions.pattern) {
         this.pattern = asArray(definitions.pattern);
       }
     }
 
-    this.base = resolve(cwd(), this.base);
+    this.dir = resolve(cwd(), this.dir);
   }
 
   get isPatternMatch() {
@@ -59,14 +58,14 @@ export class FileContentProvider extends ContentProvider {
   }
 
   toString() {
-    return `${this.constructor.name}: ${this.base}, ${this.pattern} -> ${this.entryProperties?.destination}`;
+    return `${this.constructor.name}: ${this.dir}, ${this.pattern} -> ${this.entryProperties?.destination}`;
   }
 
   /**
    * @return {AsyncIterable<ContentEntry|CollectionEntry>} all entries
    */
   async *[Symbol.asyncIterator]() {
-    const baseDir = this.base;
+    const baseDir = this.dir;
     const startPos = baseDir.length + 1;
 
     let count = 0;
@@ -90,9 +89,7 @@ export class FileContentProvider extends ContentProvider {
 
     if (!this.isPatternMatch && count < 1) {
       const file = join(baseDir, this.pattern[0]);
-      const error = new Error(`File not found ${file}`);
-      error.file = file;
-      throw error;
+      throw new Error(`File not found ${file}`, { cause: file });
     }
   }
 }

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

@@ -23,7 +23,6 @@ export class NFTContentProvider extends ContentProvider {
    * Content provided form the file system.
    * @param {Object|string} definitions
    * @param {string} definitions.start base directory where to find the files
-   * @param {Array<Transformer>} [definitions.transformers]
    * @param {string} [definitions.dir]
    * @param {Object} [entryProperties]
    * @param {string} [entryProperties.destination]
@@ -47,7 +46,7 @@ export class NFTContentProvider extends ContentProvider {
    * @return {AsyncIterable<ContentEntry>} all entries
    */
   async *[Symbol.asyncIterator]() {
-    const baseDir = this.base || process.cwd();
+    const baseDir = this.dir || process.cwd();
     const { fileList } = await nodeFileTrace(this.start);
 
     for (const name of fileList) {

package/src/extract-from-package.mjs

@@ -90,8 +90,8 @@ function* content2Sources(content, dir) {
       } else {
         switch (typeof definition) {
           case "object":
-            definition.base = definition.base
-              ? join(dir, definition.base)
+            definition.dir = definition.dir
+              ? join(dir, definition.dir)
               : dir;
             break;
           case "string":

package/src/npm-pkgbuild-cli.mjs

@@ -92,15 +92,15 @@ program
               ...[...options.content, ...options.meta]
                 .filter(x => x)
                 .map(source => {
-                  let [destination, base] = source.split(/:/);
-                  if (!base) {
+                  let [destination, dir] = source.split(/:/);
+                  if (!dir) {
                     destination = "/";
-                    base = source;
+                    dir = source;
                   }
 
                   return new FileContentProvider(
                     {
-                      base
+                      dir
                     },
                     { destination }
                   );

package/types/content/content-provider.d.mts

@@ -1,25 +1,21 @@
 /**
  * Source of package content.
  * @property {string} dir
- * @property {Transformer[]} transformers
  */
 export class ContentProvider {
     /**
      *
      * @param {Object} definitions
-     * @param {Array<Transformer>} [definitions.transformers]
      * @param {string} [definitions.dir]
      * @param {Object} [entryProperties]
      * @param {string} [entryProperties.destination]
      * @param {Object} [directoryProperties]
      */
     constructor(definitions: {
-        transformers?: Array<Transformer>;
         dir?: string;
     }, entryProperties?: {
         destination?: string;
     }, directoryProperties?: any);
-    transformers: Transformer<any, any>[];
     entryProperties: {
         destination?: string;
     };

package/types/content/file-content-provider.d.mts

@@ -7,10 +7,9 @@ export class FileContentProvider extends ContentProvider {
      * Content provided form the file system.
      * @param {Object|string} definitions
      * @param {string|string[]} [definitions.pattern]
-     * @param {string} [definitions.base] base directory where to find the files
+     * @param {string} [definitions.dir] base directory where to find the files
      */
     constructor(definitions: any | string, entryProperties: any, directoryProperties: any);
-    base: string;
     pattern: string[];
     get isPatternMatch(): string;
 }

package/types/content/nft-content-provider.d.mts

@@ -7,7 +7,6 @@ export class NFTContentProvider extends ContentProvider {
      * Content provided form the file system.
      * @param {Object|string} definitions
      * @param {string} definitions.start base directory where to find the files
-     * @param {Array<Transformer>} [definitions.transformers]
      * @param {string} [definitions.dir]
      * @param {Object} [entryProperties]
      * @param {string} [entryProperties.destination]