npm-pkgbuild 7.23.10 → 7.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "7.23.10",
+  "version": "7.25.0",
   "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,7 +41,7 @@ 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]() {

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]() {
@@ -61,7 +61,8 @@ export class NodeModulesContentProvider extends ContentProvider {
       if (!toBeSkipped.test(name)) {
         if (name.endsWith("package.json")) {
           const json = shrinkNPM(
-            JSON.parse(await readFile(join(tmp, name), utf8StreamOptions))
+            JSON.parse(await readFile(join(tmp, name), utf8StreamOptions)),
+            {}
           );
 
           if (json) {
@@ -180,6 +181,6 @@ const toBeSkipped = new RegExp(
       "chains and topics\\.md",
       "build_detect_platform"
     ].join("|") +
-    ")$|(node_modules\/(\@types|node\-addon\-api)|(win32|android|darwin)\-(ia32|x64|arm|arm64))",
+    ")$|(node_modules/(@types|node-addon-api)|(win32|android|darwin)-(ia32|x64|arm|arm64))",
   "i"
 );

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-shrink.mjs

@@ -1,7 +1,7 @@
-export function shrinkNPM(pkg) {
-  [
-    "version",
-    "name",
+const nameAndVersion = ["name", "version"];
+
+export function shrinkNPM(pkg, options = { removeKeys: nameAndVersion }) {
+  const toBeRemoved = [
     "dependencies",
     "sideEffects",
     "jspm",
@@ -95,11 +95,24 @@ export function shrinkNPM(pkg) {
     "readme",
     "node-gyp-build-optional",
     "node-gyp-build-test",
-    "jsdelivr"
-  ].map(key => {
+    "jsdelivr",
+    "types",
+    "unpkg",
+    "shim",
+    "browser",
+    "testling"
+  ];
+
+  toBeRemoved.map(key => {
     delete pkg[key];
   });
 
+  if (options && options.removeKeys) {
+    options.removeKeys.map(key => {
+      delete pkg[key];
+    });
+  }
+
   switch (pkg.main) {
     case "index":
     case "./index":
@@ -115,12 +128,5 @@ export function shrinkNPM(pkg) {
     }
   }
 
-  for (const toBeRemoved of ["types", "unpkg", "shim", "browser", "testling"]) {
-    // TODO mark files as to be skipped
-
-    delete pkg[toBeRemoved];
-  }
-
-  return Object.keys(pkg).length === 0 ? undefined : pkg
+  return Object.keys(pkg).length === 0 ? undefined : pkg;
 }
-