npm-pkgbuild 18.1.3 → 18.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "18.1.3",
+  "version": "18.2.2",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -51,20 +51,20 @@
     "tsc:types": "tsc -d --allowJs --declarationDir dist --emitDeclarationOnly ./src/extract-from-package.mjs"
   },
   "dependencies": {
-    "@npmcli/arborist": "^9.0.2",
-    "@vercel/nft": "^0.29.2",
-    "aggregate-async-iterator": "^1.2.1",
-    "commander": "^13.1.0",
+    "@npmcli/arborist": "^9.1.0",
+    "@vercel/nft": "^0.29.3",
+    "aggregate-async-iterator": "^1.2.2",
+    "commander": "^14.0.0",
     "compare-versions": "^6.1.1",
-    "content-entry": "^11.1.3",
-    "content-entry-filesystem": "^6.0.0",
-    "content-entry-transform": "^1.4.29",
-    "execa": "^9.5.2",
+    "content-entry": "^14.2.2",
+    "content-entry-filesystem": "^9.0.9",
+    "content-entry-transform": "^1.5.5",
+    "execa": "^9.5.3",
     "expression-expander": "^7.2.7",
     "ini": "^5.0.0",
     "iterable-string-interceptor": "^3.0.2",
-    "key-value-transformer": "^3.2.3",
-    "npm-package-walker": "^8.0.8",
+    "key-value-transformer": "^3.3.0",
+    "npm-package-walker": "^8.0.9",
     "npm-packlist": "^10.0.0",
     "pacote": "^21.0.0",
     "pkg-dir": "^8.0.0",
@@ -72,11 +72,11 @@
     "uti": "^8.7.4"
   },
   "devDependencies": {
-    "@types/node": "^22.15.14",
+    "@types/node": "^22.15.18",
     "ava": "^6.3.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.3",
+    "semantic-release": "^24.2.4",
     "stream-buffers": "^3.0.3",
     "typescript": "^5.8.3"
   },

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

@@ -1,9 +1,8 @@
 import { dirname, join, resolve } from "node:path";
 import { cwd } from "node:process";
 import { glob } from "node:fs/promises";
-import { ContentEntry } from "content-entry";
-import { FileSystemEntryWithPermissions } from "./file-system-entry-with-permissions.mjs";
-import { CollectionEntryWithPermissions } from "./collection-entry-with-permissions.mjs";
+import { ContentEntry, CollectionEntry } from "content-entry";
+import { FileSystemEntry } from "content-entry-filesystem";
 import { asArray } from "../util.mjs";
 import { ContentProvider } from "./content-provider.mjs";
 
@@ -64,34 +63,30 @@ export class FileContentProvider extends ContentProvider {
    */
   async *[Symbol.asyncIterator]() {
     const definitions = this.definitions;
-    const base = definitions.base;
-    const startPos = base.length + 1;
+    const baseDir = definitions.base;
+    const startPos = baseDir.length + 1;
 
     let count = 0;
     for await (const entry of glob(definitions.pattern, {
-      cwd: base,
+      cwd: baseDir,
       withFileTypes: true
     })) {
       const name = join(entry.parentPath, entry.name).substring(startPos);
 
       if (entry.isFile()) {
-        yield new FileSystemEntryWithPermissions(
-          name,
-          base,
-          this.entryProperties
-        );
+        yield new FileSystemEntry(name, {
+          ...this.entryProperties,
+          baseDir
+        });
         count++;
       } else if (entry.isDirectory()) {
-        yield new CollectionEntryWithPermissions(
-          name,
-          this.directoryProperties
-        );
+        yield new CollectionEntry(name, this.directoryProperties);
         count++;
       }
     }
 
     if (!this.isPatternMatch && count < 1) {
-      const file = join(base, this.definitions.pattern[0]);
+      const file = join(baseDir, this.definitions.pattern[0]);
       const error = new Error(`File not found ${file}`);
       error.file = file;
       throw error;

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

@@ -1,6 +1,6 @@
 import { nodeFileTrace } from "@vercel/nft";
 import { ContentEntry } from "content-entry";
-import { FileSystemEntryWithPermissions } from "./file-system-entry-with-permissions.mjs";
+import { FileSystemEntry } from "content-entry-filesystem";
 import { asArray } from "../util.mjs";
 import { ContentProvider } from "./content-provider.mjs";
 
@@ -42,15 +42,14 @@ export class NFTContentProvider extends ContentProvider {
    */
   async *[Symbol.asyncIterator]() {
     const definitions = this.definitions;
-    const base = definitions.base || process.cwd();
+    const baseDir = definitions.base || process.cwd();
 
     const { fileList } = await nodeFileTrace(definitions.start);
 
     for (const name of fileList) {
-      yield new FileSystemEntryWithPermissions(
+      yield new FileSystemEntry(
         name,
-        base,
-        this.entryProperties
+        { ...this.entryProperties, baseDir }
       );
     }
   }

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

@@ -4,9 +4,8 @@ import { mkdtemp, readFile, writeFile } from "node:fs/promises";
 import { glob } from "node:fs/promises";
 import Arborist from "@npmcli/arborist";
 import { parse } from "ini";
-import { StringContentEntry } from "content-entry";
-import { FileSystemEntryWithPermissions } from "./file-system-entry-with-permissions.mjs";
-import { CollectionEntryWithPermissions } from "./collection-entry-with-permissions.mjs";
+import { StringContentEntry, CollectionEntry } from "content-entry";
+import { FileSystemEntry } from "content-entry-filesystem";
 import { ContentProvider } from "./content-provider.mjs";
 import { utf8StreamOptions } from "../util.mjs";
 import { shrinkNPM } from "../npm-shrink.mjs";
@@ -120,26 +119,24 @@ export class NodeModulesContentProvider extends ContentProvider {
               );
 
               if (json) {
-                yield Object.assign(
-                  new StringContentEntry(name, JSON.stringify(json)),
-                  this.entryProperties
+                yield new StringContentEntry(
+                  name,
+                  this.entryProperties,
+                  JSON.stringify(json)
                 );
               }
-
-              continue;
             } catch (e) {
               console.error(e, entry.name);
             }
           }
 
           if (entry.isFile()) {
-            yield new FileSystemEntryWithPermissions(
-              name,
-              nodeModulesDir,
-              this.entryProperties
-            );
+            yield new FileSystemEntry(name, {
+              ...this.entryProperties,
+              baseDir: nodeModulesDir
+            });
           } else if (entry.isDirectory()) {
-              yield new CollectionEntryWithPermissions(name,this.directoryProperties);
+            yield new CollectionEntry(name, this.directoryProperties);
           }
         }
       }

package/src/output/arch.mjs

@@ -2,11 +2,12 @@ import { join } from "node:path";
 import { createWriteStream } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { execa } from "execa";
-import { ContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { ContentEntry, IteratorContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
 import {
   keyValueTransformer,
-  equalSeparatedKeyValuePairOptions
+  equalSeparatedKeyValuePairOptions,
+  Uint8ArraysToLines
 } from "key-value-transformer";
 import { aggregateFifo } from "aggregate-async-iterator";
 import {
@@ -145,7 +146,6 @@ export class ARCH extends Packager {
 
     const self = this;
     async function* trailingLines() {
-      console.log();
       yield `
 package() {
   depends=(${self.makeDepends(properties.dependencies).join(" ")})
@@ -170,9 +170,10 @@ package() {
       name: PKGBUILD,
       match: entry => entry.name === PKGBUILD,
       transform: async entry =>
-        new ReadableStreamContentEntry(
+        new IteratorContentEntry(
           "../" + entry.name,
-          keyValueTransformer(await entry.readStream, fp, {
+          undefined,
+          keyValueTransformer(Uint8ArraysToLines(await entry.stream), fp, {
             ...pkgKeyValuePairOptions,
             trailingLines
           })

package/src/output/debian.mjs

@@ -1,13 +1,13 @@
 import { join } from "node:path";
 import { readFile } from "node:fs/promises";
 import { execa } from "execa";
-import { ContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { ContentEntry, IteratorContentEntry } from "content-entry";
 import {
   transform,
   createPropertiesTransformer
 } from "content-entry-transform";
 import { aggregateFifo } from "aggregate-async-iterator";
-import { keyValueTransformer } from "key-value-transformer";
+import { keyValueTransformer, Uint8ArraysToLines } from "key-value-transformer";
 import {
   Packager,
   VERSION_FIELD,
@@ -102,9 +102,10 @@ export class DEBIAN extends Packager {
     transformer.push({
       match: entry => entry.name === debianControlName,
       transform: async entry =>
-        new ReadableStreamContentEntry(
+        new IteratorContentEntry(
           entry.name,
-          keyValueTransformer(await entry.readStream, fp)
+          undefined,
+          keyValueTransformer(Uint8ArraysToLines(await entry.readStream), fp)
         ),
       createEntryWhenMissing: () => new ContentEntry(debianControlName)
     });

package/src/output/docker.mjs

@@ -1,12 +1,13 @@
 import { join } from "node:path";
 import { readFile } from "node:fs/promises";
 import { execa } from "execa";
-import { ContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { ContentEntry, IteratorContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
 import { aggregateFifo } from "aggregate-async-iterator";
 import {
   keyValueTransformer,
-  equalSeparatedKeyValuePairOptions
+  equalSeparatedKeyValuePairOptions,
+  Uint8ArraysToLines
 } from "key-value-transformer";
 import {
   Packager,
@@ -117,9 +118,10 @@ export class DOCKER extends Packager {
       name: DOCKERFILE,
       match: entry => entry.name === DOCKERFILE,
       transform: async entry =>
-        new ReadableStreamContentEntry(
+        new IteratorContentEntry(
           entry.name,
-          keyValueTransformer(await entry.readStream, fp, {
+          undefined,
+          keyValueTransformer(Uint8ArraysToLines(await entry.stream), fp, {
             ...labelKeyValuePairs,
             headLines,
             trailingLines

package/src/output/oci.mjs

@@ -135,7 +135,7 @@ export class OCI extends Packager {
       ).replace(/^\//, "");
 
       into(header, 0, 100, name);
-      intoOctal(header, 100, 8, entry.mode);
+      intoOctal(header, 100, 8, await entry.mode);
       into(header, 124, 12, encodeOctal(size, 12));
       into(header, 136, 12, encodeOctal((await entry.mtime).getTime() / 1000, 12));
      // into(header, 148, 8, encodeOctal(chksum(header), 8));

package/src/output/packager.mjs

@@ -91,6 +91,7 @@ export class Packager {
           if (name) {
             yield new StringContentEntry(
               name,
+              undefined,
               f.body.replaceAll(
                 /\{\{(\w+)\}\}/gm,
                 (match, key, offset, string) =>
@@ -105,6 +106,7 @@ export class Packager {
         for (const [name, content] of Object.entries(properties.hooks)) {
           yield new StringContentEntry(
             name,
+            undefined,
             content.replaceAll(
               /\{\{(\w+)\}\}/gm,
               (match, key, offset, string) =>

package/src/output/rpm.mjs

@@ -1,13 +1,13 @@
 import { join } from "node:path";
-import { createReadStream } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { cp } from "node:fs/promises";
 import { execa } from "execa";
-import { ContentEntry, ReadableStreamContentEntry } from "content-entry";
+import { ContentEntry, IteratorContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
 import {
   keyValueTransformer,
-  colonSeparatedKeyValuePairOptionsDoublingKeys
+  colonSeparatedKeyValuePairOptionsDoublingKeys,
+  Uint8ArraysToLines
 } from "key-value-transformer";
 import { aggregateFifo } from "aggregate-async-iterator";
 import {
@@ -160,9 +160,10 @@ export class RPM extends Packager {
         {
           match: entry => entry.name === specFileName,
           transform: async entry =>
-            new ReadableStreamContentEntry(
+            new IteratorContentEntry(
               entry.name,
-              keyValueTransformer(await entry.readStream, fp, {
+              undefined,
+              keyValueTransformer(Uint8ArraysToLines(await entry.stream), fp, {
                 ...colonSeparatedKeyValuePairOptionsDoublingKeys,
                 trailingLines
               })

package/src/util.mjs

@@ -1,6 +1,8 @@
 import { join, dirname } from "node:path";
 import { mkdir } from "node:fs/promises";
 import { pipeline } from "node:stream/promises";
+import { Readable} from "node:stream";
+
 import { createWriteStream } from "node:fs";
 import { ContentEntry } from "content-entry";
 
@@ -223,15 +225,15 @@ export async function* copyEntries(
     const destination = join(destinationDirectory, name);
 
     if (entry.isCollection) {
-      await mkdir(destination, { recursive: true, mode: entry.mode });
+      await mkdir(destination, { recursive: true, mode: await entry.mode });
     } else {
       await mkdir(dirname(destination), { recursive: true });
 
       await pipeline(
-        await entry.readStream,
+        Readable.fromWeb(await entry.stream),
         createWriteStream(
           destination,
-          entry.mode ? { mode: entry.mode } : undefined
+          entry.mode ? { mode: await entry.mode } : undefined
         )
       );
     }

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

@@ -6,6 +6,9 @@
 export class NodeModulesContentProvider extends ContentProvider {
     static get description(): string;
     withoutDevelpmentDependencies: boolean;
-    [Symbol.asyncIterator](): AsyncGenerator<any, void, unknown>;
+    [Symbol.asyncIterator](): AsyncGenerator<CollectionEntry | StringContentEntry | FileSystemEntry, void, unknown>;
 }
 import { ContentProvider } from "./content-provider.mjs";
+import { CollectionEntry } from "content-entry";
+import { StringContentEntry } from "content-entry";
+import { FileSystemEntry } from "content-entry-filesystem";

package/src/content/collection-entry-with-permissions.mjs

@@ -1,18 +0,0 @@
-import { CollectionEntry } from "content-entry";
-
-export class CollectionEntryWithPermissions extends CollectionEntry {
-  constructor(name, properties) {
-    super(name);
-    Object.assign(this, properties);
-  }
-
-  #mode;
-
-  set mode(value) {
-    this.#mode = value;
-  }
-
-  get mode() {
-    return this.#mode || super.mode;
-  }
-}

package/src/content/file-system-entry-with-permissions.mjs

@@ -1,18 +0,0 @@
-import { FileSystemEntry } from "content-entry-filesystem";
-
-export class FileSystemEntryWithPermissions extends FileSystemEntry {
-  constructor(name, baseDir, properties) {
-    super(name, baseDir);
-    Object.assign(this, properties);
-  }
-
-  #mode;
-
-  set mode(value) {
-    this.#mode = value;
-  }
-
-  get mode() {
-    return this.#mode || super.mode;
-  }
-}

package/types/content/collection-entry-with-permissions.d.mts

@@ -1,7 +0,0 @@
-export class CollectionEntryWithPermissions extends CollectionEntry {
-    constructor(name: any, properties: any);
-    set mode(value: any);
-    get mode(): any;
-    #private;
-}
-import { CollectionEntry } from "content-entry";

package/types/content/file-system-entry-with-permissions.d.mts

@@ -1,7 +0,0 @@
-export class FileSystemEntryWithPermissions extends FileSystemEntry {
-    constructor(name: any, baseDir: any, properties: any);
-    set mode(value: any);
-    get mode(): any;
-    #private;
-}
-import { FileSystemEntry } from "content-entry-filesystem";