npm-pkgbuild 10.6.0 → 10.7.0

package/README.md

@@ -27,18 +27,18 @@ This will create a arch, rpm and a debian package of the build dir.
 ## upload package
 
 ```shell
-npm-pkgbuild --rpm --debian --arch --content build --publish 'https://my.package-service.com/binaries/linux/{{type}}/{{access}}/{{arch}}'
+npm-pkgbuild --arch --content build --publish 'https://my.package-service.com/binaries/linux/{{type}}/{{access}}/{{arch}}'
 ```
 
 You can specify the package content in package.json.
 
 ```json
 {
-	"pkgbuild": {
-		"content": {
-			"/some/location/" : { "base": "build" },
-			"/etc/myconfig.json" : "sample-config.json",
-			"/erc/secret" : { "name":  "secret", "mode": "600" },
+  "pkgbuild": {
+    "content": {
+      "/some/location/" : { "base": "build" },
+      "/etc/myconfig.json" : "sample-config.json",
+      "/erc/secret" : { "name":  "secret", "mode": "600" },
       "/opt/myapp": [
         {
           "type": "npm-pack"
@@ -48,15 +48,15 @@ You can specify the package content in package.json.
           "withoutDevelpmentDependencies": true
         }
       ]
-		},
-		"hooks" : "pkg/hooks",
-		"output": {
-			"debian" : {},
-			"rpm" : {},
-			"arch" : {}
-		},
-		"dependencies": { "nginx" : ">=1.12" }
-	}
+    },
+    "hooks" : "pkg/hooks",
+    "output": {
+      "debian" : {},
+      "rpm" : {},
+      "arch" : {}
+    },
+  "dependencies": { "nginx" : ">=1.12" }
+  }
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "10.6.0",
+  "version": "10.7.0",
   "publishConfig": {
     "access": "public"
   },
@@ -67,7 +67,7 @@
     "stream-buffers": "^3.0.2"
   },
   "engines": {
-    "node": ">=16.14.2"
+    "node": ">=16.15.0"
   },
   "repository": {
     "type": "git",

package/src/extract-from-package.mjs

@@ -1,6 +1,9 @@
+import { readFile } from "fs/promises";
+import { join } from "path";
+import { packageDirectory } from "pkg-dir";
 import { packageWalker } from "npm-package-walker";
 import { createContext } from "expression-expander";
-import { asArray } from "./util.mjs";
+import { asArray, utf8StreamOptions } from "./util.mjs";
 import { NPMPackContentProvider } from "./content/npm-pack-content-provider.mjs";
 import { NodeModulesContentProvider } from "./content/node-modules-content-provider.mjs";
 import { FileContentProvider } from "./content/file-content-provider.mjs";
@@ -45,12 +48,23 @@ const entryAttributeNames = ["owner", "group", "mode"];
  * - if not architecture is given one result set is provided nethertheless
  * - architectures are taken from cpu (node arch ids) and from pkgbuild.arch (raw arch ids)
  * - architecture given in a abstract definition are used to reduce the set of avaliable architectures
- * @param {Object} pkg package.json content
- * @param {string} dir
  * @param {Object} options
+ * @param {Object} options.json package.json content
+ * @param {string} options.pkgDir
  * @returns {AsyncIter<PackageDefinition>}
  */
-export async function* extractFromPackage(json, dir, options = {}) {
+export async function* extractFromPackage(options = {}) {
+  let json = options.json;
+  let dir = options.pkgDir;
+
+  if (!json) {
+    dir = await packageDirectory({ cwd: dir });
+
+    json = JSON.parse(
+      await readFile(join(dir, "package.json"), utf8StreamOptions)
+    );
+  }
+
   const properties = Object.fromEntries(
     ["name", "version", "description", "homepage", "license"]
       .map(key => [key, json[key]])
@@ -174,17 +188,19 @@ export async function* extractFromPackage(json, dir, options = {}) {
     }
   };
 
-  await packageWalker(async (json, base, modulePath) => {
-    if (modulePath.length > 0) {
-      processPkg(json, base, modulePath);
-    }
-    return true;
-  }, dir);
+  if (dir) {
+    await packageWalker(async (json, base, modulePath) => {
+      if (modulePath.length > 0) {
+        processPkg(json, base, modulePath);
+      }
+      return true;
+    }, dir);
+  }
 
   processPkg(json, dir);
 
   properties.variant = variant;
-
+  
   if (arch.size > 0) {
     // provide each arch separadly
 
@@ -197,7 +213,7 @@ export async function* extractFromPackage(json, dir, options = {}) {
         } else {
           numberOfArchs++;
           properties.arch = [a];
-          yield { properties, sources, dependencies, output, variant };
+          yield { properties: context.expand(properties), sources, dependencies, output, variant, context };
         }
       }
     }
@@ -206,6 +222,6 @@ export async function* extractFromPackage(json, dir, options = {}) {
     }
   } else {
     // or one set if no arch is given
-    yield { properties, sources, dependencies, output, variant };
+    yield { properties: context.expand(properties), sources, dependencies, output, variant, context };
   }
 }

package/src/npm-pkgbuild-cli.mjs

@@ -2,11 +2,7 @@
 
 import { readFileSync } from "fs";
 import { fileURLToPath } from "url";
-import { readFile } from "fs/promises";
-import { join } from "path";
 import { program } from "commander";
-import { createContext } from "expression-expander";
-import { packageDirectory } from "pkg-dir";
 import {
   createExpressionTransformer,
   nameExtensionMatcher
@@ -37,7 +33,7 @@ program
   .option("-D --define <a=b>", "define property", (str, former = {}) =>
     Object.assign(former, Object.fromEntries([str.split(/=/)]))
   )
-  .option("-p --pkgdir <dir>", "which package to use", process.cwd())
+  .option("-p --dir <dir>", "which package to use", process.cwd())
   .option("-a --available", "only execute availabe output methods", false)
   .option("--continue", "continue on error")
   .option(
@@ -69,25 +65,15 @@ program
   )
   .action(async options => {
     try {
-      const pkgDir = await packageDirectory({ cwd: options.pkgdir });
-
-      if (options.verbose) {
-        console.log(`pkgdir: ${pkgDir}`);
-      }
+      const publishOptions = options.publish;
 
       for await (const {
         properties,
         sources,
         output,
         dependencies,
-        variant
-      } of extractFromPackage(
-        JSON.parse(
-          await readFile(join(pkgDir, "package.json"), utf8StreamOptions)
-        ),
-        pkgDir,
-        options
-      )) {
+        context
+      } of extractFromPackage(options)) {
         for (const inputFactory of allInputs.filter(
           inputFactory => options[inputFactory.name] === true
         )) {
@@ -101,6 +87,9 @@ program
             continute;
           }
 
+          // start with a fresh copy
+          options.publish = Object.assign({}, publishOptions);
+
           Object.assign(
             properties,
             {
@@ -121,8 +110,7 @@ program
               )
           );
 
-          const context = createContext({ properties });
-          const output = new outputFactory(context.expand(properties));
+          const output = new outputFactory(properties);
           const transformer = [
             createExpressionTransformer(
               nameExtensionMatcher([
@@ -135,7 +123,7 @@ program
                 ".socket",
                 ".rules"
               ]),
-              context.expand(properties)
+              properties
             )
           ];
 
@@ -150,7 +138,7 @@ program
             transformer,
             dependencies,
             options,
-            path => context.expand(path)
+            context.expand
           );
 
           await publish(fileName, options.publish, properties);