npm-pkgbuild 18.2.2 → 18.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "18.2.2",
+  "version": "18.2.3",
   "publishConfig": {
     "access": "public",
     "provenance": false

package/src/content/content-provider.mjs

@@ -1,4 +1,4 @@
-import { ContentEntry } from "content-entry";
+import { ContentEntry, CollectionEntry } from "content-entry";
 
 /**
  * Source of package content.
@@ -24,7 +24,7 @@ export class ContentProvider {
 
   /**
    * List all entries.
-   * @return {AsyncIterable<ContentEntry>} all entries
+   * @return {AsyncIterable<ContentEntry|CollectionEntry>} all entries
    */
   async *[Symbol.asyncIterator]() {}
 }

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

@@ -59,7 +59,7 @@ export class FileContentProvider extends ContentProvider {
   }
 
   /**
-   * @return {AsyncIterable<ContentEntry>} all entries
+   * @return {AsyncIterable<ContentEntry|CollectionEntry>} all entries
    */
   async *[Symbol.asyncIterator]() {
     const definitions = this.definitions;

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

@@ -4,7 +4,11 @@ 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, CollectionEntry } from "content-entry";
+import {
+  ContentEntry,
+  StringContentEntry,
+  CollectionEntry
+} from "content-entry";
 import { FileSystemEntry } from "content-entry-filesystem";
 import { ContentProvider } from "./content-provider.mjs";
 import { utf8StreamOptions } from "../util.mjs";
@@ -44,6 +48,10 @@ export class NodeModulesContentProvider extends ContentProvider {
     return `${this.constructor.name}: ${this.dir} -> ${this.entryProperties.destination}`;
   }
 
+  /**
+   * List all entries.
+   * @return {AsyncIterable<ContentEntry|CollectionEntry>} all entries
+   */
   async *[Symbol.asyncIterator]() {
     try {
       let pkgSourceDir = this.dir;

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

@@ -57,18 +57,14 @@ export class NPMPackContentProvider extends ContentProvider {
           }
 
           entries.push(
-            Object.assign(
-              Object.create(
-                new BufferContentEntry(
-                  header.name.substring(8),
-                  Buffer.concat(chunks)
-                ),
-                {
-                  mtime: { value: header.mtime },
-                  mode: { value: header.mode }
-                }
-              ),
-              this.entryProperties
+            new BufferContentEntry(
+              header.name.substring(8),
+              {
+                ...this.entryProperties,
+                mtime: header.mtime,
+                mode: header.mode
+              },
+              Buffer.concat(chunks)
             )
           );
 

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

@@ -11,8 +11,9 @@ export class ContentProvider {
     dir: any;
     /**
      * List all entries.
-     * @return {AsyncIterable<ContentEntry>} all entries
+     * @return {AsyncIterable<ContentEntry|CollectionEntry>} all entries
      */
-    [Symbol.asyncIterator](): AsyncIterable<ContentEntry>;
+    [Symbol.asyncIterator](): AsyncIterable<ContentEntry | CollectionEntry>;
 }
 import { ContentEntry } from "content-entry";
+import { CollectionEntry } from "content-entry";

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

@@ -7,5 +7,10 @@
 export class NFTContentProvider extends ContentProvider {
     static get description(): string;
     definitions: any;
+    /**
+     * @return {AsyncIterable<ContentEntry>} all entries
+     */
+    [Symbol.asyncIterator](): AsyncIterable<ContentEntry>;
 }
 import { ContentProvider } from "./content-provider.mjs";
+import { ContentEntry } from "content-entry";

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

@@ -6,9 +6,5 @@
 export class NodeModulesContentProvider extends ContentProvider {
     static get description(): string;
     withoutDevelpmentDependencies: boolean;
-    [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/types/extract-from-package.d.mts

@@ -27,7 +27,7 @@ export function extractFromPackage(options?: {
 /**
  * All content providers (input)
  */
-export const allInputs: (typeof NPMPackContentProvider | typeof NFTContentProvider)[];
+export const allInputs: (typeof NPMPackContentProvider | typeof NodeModulesContentProvider | typeof FileContentProvider | typeof NFTContentProvider)[];
 /**
  * All output formats
  */
@@ -68,6 +68,8 @@ export type PackageDefinition = {
     };
 };
 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";
 import { NFTContentProvider } from "./content/nft-content-provider.mjs";
 import { ARCH } from "./output/arch.mjs";
 import { DOCKER } from "./output/docker.mjs";