npm-pkgbuild 7.15.6 → 7.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.15.6",
+  "version": "7.17.0",
   "publishConfig": {
     "access": "public"
   },
@@ -38,16 +38,18 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "dependencies": {
+    "@npmcli/arborist": "^4.2.0",
     "aggregate-async-iterator": "^1.1.7",
     "commander": "^8.3.0",
-    "content-entry": "^4.1.0",
-    "content-entry-filesystem": "^4.0.1",
-    "content-entry-transform": "^1.3.2",
+    "content-entry": "^4.1.2",
+    "content-entry-filesystem": "^4.0.3",
+    "content-entry-transform": "^1.3.4",
     "execa": "^6.0.0",
     "expression-expander": "^7.0.9",
-    "globby": "^12.0.2",
+    "globby": "^12.2.0",
     "iterable-string-interceptor": "^1.0.8",
     "key-value-transformer": "^2.0.0",
+    "node-fetch": "^3.1.1",
     "npm-package-walker": "^5.0.3",
     "npm-packlist": "^3.0.0",
     "pacote": "^12.0.2",
@@ -58,7 +60,7 @@
     "ava": "^4.0.1",
     "c8": "^7.11.0",
     "documentation": "^13.2.5",
-    "semantic-release": "^18.0.1",
+    "semantic-release": "^19.0.2",
     "stream-buffers": "^3.0.2"
   },
   "engines": {

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

@@ -1,5 +1,5 @@
-import { join } from "path";
 import { globby } from "globby";
+import Arborist from "@npmcli/arborist";
 import { FileSystemEntry } from "content-entry-filesystem";
 import { ContentProvider } from "./content-provider.mjs";
 
@@ -26,10 +26,15 @@ export class NodeModulesContentProvider extends ContentProvider {
 
   async *[Symbol.asyncIterator]() {
     const cwd = this.dir;
+
+    const arb = new Arborist({ path: cwd });
+    await arb.buildIdealTree({ saveType: "prod" });
+    await arb.reify({ save: true });
+
     for (const name of await globby("node_modules/**/*", {
       cwd
     })) {
-      yield Object.assign(new FileSystemEntry(name, cwd),this.entryProperties);
+      yield Object.assign(new FileSystemEntry(name, cwd), this.entryProperties);
     }
   }
 }

package/src/module.mjs

@@ -1,5 +1,6 @@
 
 export * from "./util.mjs";
+export * from "./publish.mjs";
 export * from "./extract-from-package.mjs";
 export * from "./content/content-provider.mjs";
 export * from "./content/file-content-provider.mjs";

package/src/npm-cleanup.mjs

@@ -1,5 +1,5 @@
 import { unlink, readFile, writeFile } from "fs/promises";
-import { globby} from "globby";
+import { globby} from "globby";
 import { join, dirname } from "path";
 import { utf8StreamOptions } from "./util.mjs";
 

package/src/npm-pkgbuild-cli.mjs

@@ -16,7 +16,8 @@ import {
   FileContentProvider,
   allInputs,
   allOutputs,
-  extractFromPackage
+  extractFromPackage,
+  publish
 } from "npm-pkgbuild";
 
 const { version, description } = JSON.parse(
@@ -33,8 +34,8 @@ allInputs.forEach(i => program.option(`--${i.name}`, i.description));
 
 program
   .option("--verbose", "be more verbose", false)
-  .option("-D --define <a=b>", "define property", str =>
-    Object.fromEntries([str.split(/=/)])
+  .option("-D --define <a=b>", "define property", (str, former = {}) =>
+    Object.assign(former, Object.fromEntries([str.split(/=/)]))
   )
   .option(
     "-d --destination <dir>",
@@ -82,13 +83,16 @@ program
         o => options[o.name] === true || output[o.name] !== undefined
       )) {
         Object.assign(properties, options.define);
-        
-        for(const [k,v] of Object.entries(properties)) {
-          if(typeof(v) === 'string') {
-            properties[k] = v.replace(/\$\{([^\}]+)\}/m,(m,k) => properties[k]);
+
+        for (const [k, v] of Object.entries(properties)) {
+          if (typeof v === "string") {
+            properties[k] = v.replace(
+              /\$\{([^\}]+)\}/m,
+              (m, k) => properties[k]
+            );
           }
         }
-        
+
         sources.push(
           ...[...options.content, ...options.meta]
             .filter(x => x)
@@ -128,16 +132,7 @@ program
           path => context.expand(path)
         );
 
-        /*
-        console.log(`#<CI>publish ${fileName}`);
-
-        if (publish !== undefined) {
-          context.properties.arch = arch;
-      
-          publish = publish.replace(/\{\{(\w+)\}\}/m, (match, key, offset, string) =>
-            context.evaluate(key)
-          );
-      */
+        await publish(fileName, options.publish, properties);
       }
     } catch (e) {
       console.log(e);

package/src/output/arch.mjs

@@ -3,7 +3,10 @@ import { createReadStream, createWriteStream } from "fs";
 import { pipeline } from "stream/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
-import { transform, createPropertiesInterceptor } from "content-entry-transform";
+import {
+  transform,
+  createPropertiesInterceptor
+} from "content-entry-transform";
 import { iterableStringInterceptor } from "iterable-string-interceptor";
 import {
   keyValueTransformer,
@@ -43,6 +46,8 @@ function keyPrefix(key) {
   return f && f.prefix ? f.prefix + key : key;
 }
 
+const PKGBUILD = "PKGBUILD";
+
 export class ARCH extends Packager {
   static get name() {
     return "arch";
@@ -66,7 +71,7 @@ export class ARCH extends Packager {
   }
 
   async execute(sources, transformer, dependencies, options, expander) {
-    const properties = this.properties;
+    const { properties, staging, destination } = await this.prepareExecute(options);
 
     if (properties.source) {
       properties.md5sums = ["SKIP"];
@@ -75,8 +80,6 @@ export class ARCH extends Packager {
       properties.install = `${properties.name}.install`;
     }
 
-    const staging = await this.tmpdir;
-
     async function* trailingLines() {
       yield `
 package() {
@@ -108,8 +111,8 @@ package() {
     const fp = fieldProvider(properties, fields);
 
     transformer.push({
-      name: "PKGBUILD",
-      match: entry => entry.name === "PKGBUILD",
+      name: PKGBUILD,
+      match: entry => entry.name === PKGBUILD,
       transform: async entry =>
         new ReadableStreamContentEntry(
           "../" + entry.name,
@@ -118,7 +121,7 @@ package() {
             trailingLines
           })
         ),
-      createEntryWhenMissing: () => new EmptyContentEntry("PKGBUILD")
+      createEntryWhenMissing: () => new EmptyContentEntry(PKGBUILD)
     });
 
     for await (const file of copyEntries(
@@ -131,20 +134,16 @@ package() {
       }
     }
 
-    if (options.verbose) {
-      console.log(`stagingDir: ${staging}`);
-    }
-
     const makepkg = await execa("makepkg", ["-f", "-e"], {
       cwd: staging,
-      env: { PKGDEST: options.destination }
+      env: { PKGDEST: destination }
     });
 
     if (options.verbose) {
       console.log(makepkg.stdout);
     }
 
-    return join(options.destination, this.packageFileName);
+    return join(destination, this.packageFileName);
   }
 }
 

package/src/output/deb.mjs

@@ -32,8 +32,7 @@ export class DEB extends Packager {
   }
 
   async execute(sources, transformer, dependencies, options, expander) {
-    const properties = this.properties;
-    const staging = await this.tmpdir;
+    const { properties, staging, destination } = await this.prepareExecute(options);
 
     transformer.push(
       createPropertiesTransformer(
@@ -66,13 +65,13 @@ export class DEB extends Packager {
       }
     }
 
-    const dpkg = await execa("dpkg", ["-b", staging, options.destination]);
+    const dpkg = await execa("dpkg", ["-b", staging, destination]);
 
     if (options.verbose) {
       console.log(dpkg.stdout);
     }
 
-    return join(options.destination, this.packageFileName);
+    return join(destination, this.packageFileName);
   }
 }
 

package/src/output/packager.mjs

@@ -1,6 +1,6 @@
 import { join } from "path";
 import { tmpdir } from "os";
-import { mkdtemp } from "fs/promises";
+import { mkdtemp, mkdir } from "fs/promises";
 
 /**
  * @typedef {Object} Field
@@ -18,6 +18,15 @@ export class Packager {
     return {};
   }
 
+  static get workspaceLayout() {
+    return {
+      named: {
+        staging: ""
+      },
+      others: []
+    };
+  }
+
   constructor(properties) {
     this._properties = { ...properties };
   }
@@ -44,6 +53,41 @@ export class Packager {
     return properties;
   }
 
+  async prepareExecute(options) {
+    const tmpdir = await this.tmpdir;
+
+    const out = {
+      properties: this.properties,
+      destination: options.destination || tmpdir,
+      tmpdir
+    };
+
+    const l = this.constructor.workspaceLayout;
+
+    const mdo = { recursive: true };
+
+    await Promise.all(l.others.map(d => mkdir(join(tmpdir, d), mdo)));
+
+    for (const nd of Object.entries(l.named).map(([name, d]) => [
+      name,
+      join(tmpdir, d),
+      mkdir(join(tmpdir, d), mdo)
+    ])) {
+      await nd[2];
+      out[nd[0]] = nd[1]; 
+    }
+
+    if (options.publish) {
+      const m = options.publish.match(/^([\w_\+]+):\/\/(.*)/);
+
+      if (m) {
+        out.destination = m[1] === "file" ? m[2] : tmpdir;
+      }
+    }
+
+    return out;
+  }
+
   /**
    * Create tmp directory.
    * @return {Promise<string>} directory path

package/src/output/rpm.mjs

@@ -1,5 +1,5 @@
 import { join } from "path";
-import { mkdir, cp } from "fs/promises";
+import { cp } from "fs/promises";
 import { execa } from "execa";
 import { EmptyContentEntry, ReadableStreamContentEntry } from "content-entry";
 import { transform } from "content-entry-transform";
@@ -15,8 +15,7 @@ export class RPM extends Packager {
     return "rpm";
   }
 
-  static get description()
-  {
+  static get description() {
     return "generate RPM package";
   }
 
@@ -33,25 +32,22 @@ export class RPM extends Packager {
     return fields;
   }
 
-  async execute(
-    sources,
-    transformer,
-    dependencies,
-    options,
-    expander
-  ) {
-    const properties = this.properties;
-    const tmp = await this.tmpdir;
-
-    properties.Requires = Object.entries(dependencies).map(([n,e]) => `${n}${e}`).join(' ');
-    
-    await Promise.all(
-      ["BUILDROOT", "RPMS", "SRPMS", "SOURCES", "SPECS"].map(d =>
-        mkdir(join(tmp, d))
-      )
-    );
+  static get workspaceLayout() {
+    return {
+      named: {
+        staging: "BUILDROOT"
+      },
+      others: ["RPMS", "SRPMS", "SOURCES", "SPECS"],
+    };
+  }
+
+  async execute(sources, transformer, dependencies, options, expander) {
+    const { properties, tmpdir, staging, destination } = await this.prepareExecute(options);
+
+    properties.Requires = Object.entries(dependencies)
+      .map(([n, e]) => `${n}${e}`)
+      .join(" ");
 
-    const staging = join(tmp, "BUILDROOT");
     const specFileName = `${properties.name}.spec`;
 
     const files = [];
@@ -108,7 +104,7 @@ export class RPM extends Packager {
 
     const rpmbuild = await execa("rpmbuild", [
       "--define",
-      `_topdir ${tmp}`,
+      `_topdir ${tmpdir}`,
       "--buildroot",
       staging,
       "-vv",
@@ -121,11 +117,11 @@ export class RPM extends Packager {
     }
 
     await cp(
-      join(tmp, "RPMS", properties.arch, this.packageFileName),
-      join(options.destination, this.packageFileName),
+      join(tmpdir, "RPMS", properties.arch, this.packageFileName),
+      join(destination, this.packageFileName),
       { preserveTimestamps: true }
     );
-    return join(options.destination, this.packageFileName);
+    return join(destination, this.packageFileName);
   }
 }
 

package/src/publish.mjs

@@ -0,0 +1,49 @@
+import { basename } from "path";
+import { createReadStream } from "fs";
+import fetch from "node-fetch";
+
+export async function publish(fileName, destination, properties) {
+
+  if(!destination) {
+    return;
+  }
+
+  destination = destination.replace(
+    /\{\{(\w+)\}\}/m,
+    (match, key, offset, string) => properties[key]
+  );
+
+  destination = destination + basename(fileName);
+
+  console.log(destination);
+
+  //  const m = destination.match(/^([^:]+):/);
+
+  if (destination.startsWith("http://") || destination.startsWith("https://")) {
+    const headers = {};
+
+    if (properties.username) {
+      headers.authorization =
+        "Basic " +
+        Buffer.from(properties.username + ":" + properties.password).toString(
+          "base64"
+        );
+
+      console.log(headers.authorization);
+    }
+
+    const response = await fetch(destination, {
+      method: "PUT",
+      headers,
+      body: createReadStream(fileName)
+    });
+
+    console.log(response);
+
+    return;
+  }
+
+  /*
+    console.log(`#<CI>publish ${fileName}`);
+    */
+}