npm-pkgbuild 7.23.8 → 7.24.1

package/package.json

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

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

@@ -30,7 +30,7 @@ export class FileContentProvider extends ContentProvider {
     } else {
       this.definitions = { pattern: ["**/*"], ...definitions };
       this.definitions.pattern = asArray(this.definitions.pattern);
-/*
+      /*
       if(entryProperties && entryProperties.destination && !entryProperties.destination.endsWith('/')) {
       	entryProperties.destination += '/';
       }
@@ -41,13 +41,14 @@ export class FileContentProvider extends ContentProvider {
   }
 
   toString() {
-    return `${this.constructor.name}: ${this.definitions.base}, ${this.definitions.pattern}`;
+    return `${this.constructor.name}: ${this.definitions.base}, ${this.definitions.pattern} -> ${this.entryProperties.destination}`;
   }
 
   async *[Symbol.asyncIterator]() {
     const definitions = this.definitions;
     const base = definitions.base;
 
+    console.log("XXX", base, definitions.pattern);
     for (const name of await globby(definitions.pattern, {
       cwd: base
     })) {

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

@@ -30,7 +30,7 @@ export class NodeModulesContentProvider extends ContentProvider {
   }
 
   toString() {
-    return `${this.constructor.name}: ${this.dir}`;
+    return `${this.constructor.name}: ${this.dir} -> ${this.entryProperties.destination}`;
   }
 
   async *[Symbol.asyncIterator]() {
@@ -85,6 +85,7 @@ const toBeSkipped = new RegExp(
   "(" +
     [
       "~",
+      "\\.\\d",
       "\\.map",
       "\\.ts",
       "\\.mts",
@@ -109,6 +110,7 @@ const toBeSkipped = new RegExp(
       "COPYING",
       "Copyrightnotice\\.txt",
       "Doxyfile",
+      "Dockerfile",
       "CODE_OF_CONDUCT(\\.md)?",
       "GOVERNANCE(\\.md)?",
       "CODEOWNERS(\\.md)?",
@@ -117,8 +119,9 @@ const toBeSkipped = new RegExp(
       "CONTRIBUT(ORS|ING)(\\.md)?",
       "CHANGELOG(\\.md)?",
       "HISTORY(\\.md)?",
-      "LICENSE(\\-\\w+|\\.md|\\.txt|\\.BSD)?",
-      "README(.*\\.md)?",
+      "LICENSE(\\-\\w+(\\.txt)?|\\.md|\\.txt|\\.BSD|\\.APACHE2|\\.MIT|\\.terms)?",
+      "README(.*\\.md|\\.txt)?",
+      "INSTALL(.*\\.md)?",
       "\\.armv6\\.node",
       "\\.py",
       "\\.o",
@@ -128,10 +131,11 @@ const toBeSkipped = new RegExp(
       "\\.cpp",
       "\\.h",
       "\\.in",
-      "Makefile",
+      "\\.vc",
+      "\\.m4",
+      "Makefile(\\.am|\\.fallback|\\.msc)?",
       "\\.cmake",
       "\\.mk",
-      "\\.d",
       "\\.patch",
       "\\.esl*",
       "\\.zuul\\.yml",
@@ -171,6 +175,7 @@ const toBeSkipped = new RegExp(
       "SECURITY\\.md",
       "SFTPStream\\.md",
       "LIMITS\\.md",
+      "DEPS",
       "Porting-Buffer\\.md",
       "chains and topics\\.md",
       "build_detect_platform"

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

@@ -28,7 +28,7 @@ export class NPMPackContentProvider extends ContentProvider {
 
   toString()
   {
-    return `${this.constructor.name}: ${this.dir}`;
+    return `${this.constructor.name}: ${this.dir} -> ${this.entryProperties.destination}`;
   }
 
   async *[Symbol.asyncIterator]() {

package/src/extract-from-package.mjs

@@ -1,5 +1,6 @@
 import { arch as hostArch } from "process";
 import { packageWalker } from "npm-package-walker";
+import { createContext } from "expression-expander";
 import { asArray } from "./util.mjs";
 import { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
 import { NodeModulesContentProvider } from "./content/node-modules-content-provider.mjs";
@@ -46,6 +47,11 @@ export async function extractFromPackage(pkg, dir) {
     properties.name = properties.name.replace(/^\@\w+\//, "");
   }
 
+  properties.access = "private";
+  if (pkg.publishConfig) {
+    properties.access = pkg.publishConfig.access;
+  }
+
   if (pkg.contributors) {
     properties.maintainer = pkg.contributors.map(
       c => `${c.name} <${c.email}>`
@@ -62,6 +68,8 @@ export async function extractFromPackage(pkg, dir) {
     }
   }
 
+  const context = createContext({ properties });
+
   let dependencies = { ...pkg.engines };
   let sources = [];
   let output = {};
@@ -77,10 +85,10 @@ export async function extractFromPackage(pkg, dir) {
             arch.add(npmArchMapping[a]);
           }
         }
-  
+
         if (pkgbuild.arch) {
           for (const a of asArray(pkgbuild.arch)) {
-              arch.add(a);
+            arch.add(a);
           }
         }
 
@@ -93,6 +101,8 @@ export async function extractFromPackage(pkg, dir) {
         if (pkgbuild.content && !modulePath) {
           Object.entries(pkgbuild.content).forEach(
             ([destination, definitions]) => {
+              destination = context.expand(destination);
+              definitions = context.expand(definitions);
               for (const definition of asArray(definitions)) {
                 const entryProperties = { destination };
 
@@ -130,7 +140,7 @@ export async function extractFromPackage(pkg, dir) {
   processPkg(pkg, dir);
 
   if (arch.size > 0) {
-    properties.arch = [...arch].filter(a => a === npmArchMapping[hostArch])
+    properties.arch = [...arch].filter(a => a === npmArchMapping[hostArch]);
   }
 
   return { properties, sources, dependencies, output };

package/src/npm-pkgbuild-cli.mjs

@@ -3,7 +3,7 @@
 import { readFileSync } from "fs";
 import { readFile } from "fs/promises";
 import { join } from "path";
-import { program } from "commander";
+import { program } from "commander";
 import { aggregateFifo } from "aggregate-async-iterator";
 import { createContext } from "expression-expander";
 import { packageDirectory } from "pkg-dir";