npm-pkgbuild 7.19.6 → 7.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.19.6",
+  "version": "7.20.0",
   "publishConfig": {
     "access": "public"
   },

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

@@ -55,7 +55,7 @@ export class NodeModulesContentProvider extends ContentProvider {
     })) {
       if (
         !name.match(
-          /(~|\.orig|\.log|\.tmp|\.bak|\.bat|yarn\.lock|\.DS_Store|\.travis\.yml|\.npm.*|\.git.*|rollup\.config\.(js|mjs|cjs)|readme.*\.md|\.c|\.cc|\.h|Makefile|\.cmake|\.mk|\.\d)$/i
+          /(~|\.orig|\.log|\.tmp|\.bak|\.bat|\.gyp|yarn\.lock|\.DS_Store|\.travis\.yml|\.npm.*|\.git.*|rollup\.config\.(js|mjs|cjs)|CONTRIBUTING(.md)?|CHANGELOG(\.md)?|HISTORY(\.md)?|LICENSE(\-\w+|\.md)?|README(.*\.md)?|\.o|\.a|\.c|\.cc|\.h|Makefile(\.in)?|\.cmake|\.mk|\.\d)$/i
         )
       ) {
         yield Object.assign(
@@ -74,7 +74,6 @@ const toBeIgnored = [
       "*.d.ts*",
       "*.patch",
       "*.h.in",
-      "*.gyp",
       ".jshintrc*",
       ".esl*",
       ".zuul.yml",
@@ -110,13 +109,10 @@ const toBeIgnored = [
   {
     options: { ignoreCase: true },
     pattern: [
-      "CONTRIBUTING*",
       "Contributors*",
-      "CHANGES*",
       "PATENTS*",
       "AUTHORS*",
       "NOTICE*",
-      "HISTORY*",
       "SUMMARY.md",
       "MIGRAT*.md",
       "UPGRAD*.md",
@@ -130,8 +126,7 @@ const toBeIgnored = [
       "Porting-Buffer.md",
       "chains and topics.md",
       "CODE_OF_CONDUCT*",
-      "CODEOWNERS",
-      "LICENSE.DOCS*"
+      "CODEOWNERS"
     ]
   }
 ];

package/src/npm-pkgbuild-cli.mjs

@@ -49,7 +49,16 @@ program
   .addOption(
     new program.Option("--publish <url>", "publishing url of the package").env(
       "PACMAN_PUBLISH"
-    )
+    ).argParser((value) => {
+        let [url, user, password] = value.split(/,/);
+        if(user) {
+        	url = process.env[url];
+        	console.log(this,url,user,password);
+        	return url;	
+        }
+
+        return value;
+    })
   )
   .action(async options => {
     try {

package/src/output/packager.mjs

@@ -1,6 +1,7 @@
 import { join, dirname } from "path";
 import { tmpdir } from "os";
 import { mkdtemp, mkdir } from "fs/promises";
+import { analysePublish } from "../publish.mjs";
 
 /**
  * @typedef {Object} Field
@@ -83,14 +84,9 @@ export class Packager {
     }
 
     if (options.publish) {
-      const m = options.publish.match(/^([\w_\+]+):\/\/(.*)/);
+      const { publish, scheme } = analysePublish(options.publish, out.properties);
 
-      if (m) {
-        out.destination = m[1] === "file" ? m[2] : tmpdir;
-      }
-      else {
-        out.destination = options.publish;
-      }
+      out.destination = scheme === 'file:' ? publish : tmpdir;
 
       await mkdir(dirname(out.destination), { recursive: true });
     }

package/src/publish.mjs

@@ -2,24 +2,30 @@ 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(
+export function analysePublish(publish, properties) {
+  publish = publish.replace(
     /\{\{(\w+)\}\}/m,
     (match, key, offset, string) => properties[key]
   );
 
-  destination = destination + '/' + basename(fileName);
+  const m = publish.match(/^([\w_\+]+:)\/\/(.*)/);
+  const scheme = m ? m[0] : "file:";
 
-  console.log(destination);
+  return { publish, scheme };
+}
 
-  //  const m = destination.match(/^([^:]+):/);
+export async function publish(fileName, destination, properties) {
+  if (!destination) {
+    return;
+  }
+
+  let { publish, scheme } = analysePublish(destination, properties);
 
-  if (destination.startsWith("http://") || destination.startsWith("https://")) {
+  publish = publish + "/" + basename(fileName);
+
+  console.log(publish);
+
+  if (scheme === "http:" || scheme === "https:") {
     const headers = {};
 
     if (properties.username) {
@@ -28,11 +34,9 @@ export async function publish(fileName, destination, properties) {
         Buffer.from(properties.username + ":" + properties.password).toString(
           "base64"
         );
-
-      console.log(headers.authorization);
     }
 
-    const response = await fetch(destination, {
+    const response = await fetch(publish, {
       method: "PUT",
       headers,
       body: createReadStream(fileName)