npm-pkgbuild 17.2.0 → 17.2.1

package/package.json

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

package/src/output/arch.mjs

@@ -20,8 +20,8 @@ import {
   fieldProvider,
   quote,
   utf8StreamOptions,
-  filterOutUnwantedDependencies,
-  compileFields
+  compileFields,
+  normalizeExpression
 } from "../util.mjs";
 
 function* keyValueLines(key, value, options) {
@@ -117,28 +117,7 @@ export class ARCH extends Packager {
     return `${p.name}-${p.version}-${p.release}-${p.arch}${this.fileNameExtension}`;
   }
 
-  makeDepends(dependencies={}) {
-    if(Array.isArray(dependencies)) {
-      dependencies = Object.fromEntries(dependencies.map(d => {
-        const m = d.match(/^([^=<>]+)(.*)/)
-        return [m[1],m[2]];
-      }));
-    }
-    return Object.entries(dependencies)
-      .filter(filterOutUnwantedDependencies())
-      .map(
-        ([name, version]) =>
-          `${this.packageName(name)}${normalizeExpression(version)}`
-      );
-  }
-
-  async create(
-    sources,
-    transformer,
-    publishingDetails,
-    options,
-    expander
-  ) {
+  async create(sources, transformer, publishingDetails, options, expander) {
     const { properties, staging, destination } = await this.prepare(options);
 
     if (properties.source) {
@@ -153,8 +132,9 @@ export class ARCH extends Packager {
       yield `
 package() {
   depends=(${self
-    .makeDepends(properties.dependencies)
-    .map(v => quote(v))
+    .makeDepends(properties.dependencies, (name, expression) =>
+      quote(`${self.packageName(name)}${normalizeExpression(expression)}`)
+    )
     .join(" ")})
 
   if [ "$(ls -A $srcdir)" ]
@@ -283,12 +263,3 @@ const fields = compileFields({
   replaces: default_attribute,
   options: default_attribute
 });
-
-function normalizeExpression(e) {
-  e = e.replace(/\-([\w\d]+)$/, "");
-  if (e.match(/^\d+/)) {
-    return `>=${e}`;
-  }
-
-  return e;
-}

package/src/output/debian.mjs

@@ -19,7 +19,6 @@ import {
   fieldProvider,
   extractFunctions,
   utf8StreamOptions,
-  filterOutUnwantedDependencies,
   compileFields
 } from "../util.mjs";
 
@@ -115,9 +114,10 @@ export class DEBIAN extends Packager {
       properties.dependencies &&
       Object.keys(properties.dependencies).length > 0
     ) {
-      properties.Depends = Object.entries(properties.dependencies)
-        .filter(filterOutUnwantedDependencies())
-        .map(([name, e]) => `${this.packageName(name)} (${e})`);
+      properties.Depends = this.makeDepends(
+        properties.dependencies,
+        (name, expression) => `${this.packageName(name)} (${expression})`
+      );
     }
 
     const fp = fieldProvider(properties, fields);

package/src/output/packager.mjs

@@ -2,6 +2,7 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { mkdtemp, mkdir } from "node:fs/promises";
 import { publish } from "../publish.mjs";
+import { filterOutUnwantedDependencies } from "../util.mjs";
 
 /**
  * @typedef {import('../publish.mjs').PublishingDetail} PublishingDetail
@@ -68,6 +69,19 @@ export class Packager {
     return mapping[name] || name;
   }
 
+  makeDepends(dependencies, exp=(name,expression)=>`${name}${expression}`) {
+    if(Array.isArray(dependencies)) {
+      dependencies = Object.fromEntries(dependencies.map(d => {
+        const m = d.match(/^([^=<>]+)(.*)/)
+        return [m[1],m[2]];
+      }));
+    }
+    return dependencies && Object.entries(dependencies)
+      .filter(filterOutUnwantedDependencies())
+      .map(([name, expression]) => exp(name,expression)
+      );
+  }
+
   get fileNameExtension() {
     // @ts-ignore
     return this.constructor.fileNameExtension;

package/src/output/rpm.mjs

@@ -16,7 +16,6 @@ import {
   fieldProvider,
   utf8StreamOptions,
   extractFunctions,
-  filterOutUnwantedDependencies,
   compileFields
 } from "../util.mjs";
 
@@ -95,33 +94,23 @@ export class RPM extends Packager {
     return false;
   }
 
-  requiresFromDependencies(dependencies={}) {
-    return Object.entries(dependencies)
-      .filter(filterOutUnwantedDependencies())
-      .map(
-        ([name, e]) =>
-          `${this.packageName(name)}${e
-            .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
-            .replace(/^\s*$/, "")
-            .replace(
-              /^\s*(<|<=|>|>=|=)\s*(\w+)/,
-              (match, p1, p2) => ` ${p1} ${p2}`
-            )}`
-      );
+  makeDepends(deps) {
+    return super.makeDepends(deps,(name, expression) =>
+      `${this.packageName(name)}${expression
+        .replace(/^\s*(\w+)/, (match, p1) => ` = ${p1}`)
+        .replace(/^\s*$/, "")
+        .replace(
+          /^\s*(<|<=|>|>=|=)\s*(\w+)/,
+          (match, p1, p2) => ` ${p1} ${p2}`
+        )}`);
   }
 
-  async create(
-    sources,
-    transformer,
-    publishingDetails,
-    options,
-    expander
-  ) {
+  async create(sources, transformer, publishingDetails, options, expander) {
     const { properties, tmpdir, staging, destination } = await this.prepare(
       options
     );
 
-    properties.Requires = this.requiresFromDependencies(properties.dependencies);
+    properties.Requires = this.makeDepends(properties.dependencies);
 
     if (properties.Packager?.length > 1) {
       // TODO how to write several Packages ?

package/src/util.mjs

@@ -21,6 +21,15 @@ export function filterOutUnwantedDependencies() {
   return ([name, version]) => version !== "-";
 }
 
+export function normalizeExpression(e) {
+  e = e.replace(/\-([\w\d]+)$/, "");
+  if (e.match(/^\d+/)) {
+    return `>=${e}`;
+  }
+
+  return e;
+}
+
 export function mergeDependencies(a, b) {
   if (!b) {
     return a;

package/types/extract-from-package.d.mts

@@ -31,7 +31,7 @@ export const allInputs: (typeof NPMPackContentProvider)[];
 /**
  * All output formats
  */
-export const allOutputs: (typeof ARCH | typeof OCI | typeof DOCKER)[];
+export const allOutputs: (typeof ARCH | typeof DOCKER)[];
 export namespace npmArchMapping {
     let arm64: string;
     let arm: string;
@@ -69,6 +69,5 @@ export type PackageDefinition = {
 };
 import { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
 import { ARCH } from "./output/arch.mjs";
-import { OCI } from "./output/oci.mjs";
 import { DOCKER } from "./output/docker.mjs";
 import { ContentProvider } from "./content/content-provider.mjs";

package/types/output/arch.d.mts

@@ -9,7 +9,6 @@ export class ARCH extends Packager {
     static get fields(): any;
     static prepare(options?: {}, variant?: {}): Promise<boolean>;
     get packageFileName(): string;
-    makeDepends(dependencies?: {}): string[];
     create(sources: any, transformer: any, publishingDetails: any, options: any, expander: any): Promise<string>;
 }
 import { Packager } from "./packager.mjs";

package/types/output/packager.d.mts

@@ -38,6 +38,7 @@ export class Packager {
      * @return {string} package name in the target eco-system
      */
     packageName(name: string): string;
+    makeDepends(dependencies: any, exp?: (name: any, expression: any) => string): string[];
     get fileNameExtension(): any;
     get fields(): any;
     get properties(): any;

package/types/output/rpm.d.mts

@@ -22,7 +22,7 @@ export class RPM extends Packager {
         arch: string;
     }): Promise<boolean>;
     get packageFileName(): string;
-    requiresFromDependencies(dependencies?: {}): string[];
+    makeDepends(deps: any): string[];
     create(sources: any, transformer: any, publishingDetails: any, options: any, expander: any): Promise<string>;
 }
 export type PublishingDetail = import("../publish.mjs").PublishingDetail;

package/types/util.d.mts

@@ -1,5 +1,6 @@
 export function compileFields(fields: any): any;
 export function filterOutUnwantedDependencies(): ([name, version]: [any, any]) => boolean;
+export function normalizeExpression(e: any): any;
 export function mergeDependencies(a: any, b: any): any;
 /**
  * Decode a password