fixup: cleaner packageEnvs

Author: wraithgar

lib/package-envs.js

@@ -1,16 +1,15 @@
-
-const packageEnvs = (env, vals, prefix) => {
+const packageEnvs = (vals, prefix, env = {}) => {
  for (const [key, val] of Object.entries(vals)) {
  if (val === undefined) {
  continue
  } else if (val === null || val === false) {
  env[`${prefix}${key}`] = ''
  } else if (Array.isArray(val)) {
  val.forEach((item, index) => {
- packageEnvs(env, { [`${key}_${index}`]: item }, `${prefix}`)
+ packageEnvs({ [`${key}_${index}`]: item }, `${prefix}`, env)
  })
  } else if (typeof val === 'object') {
- packageEnvs(env, val, `${prefix}${key}_`)
+ packageEnvs(val, `${prefix}${key}_`, env)
  } else {
  env[`${prefix}${key}`] = String(val)
  }
@@ -19,10 +18,12 @@ const packageEnvs = (env, vals, prefix) => {
 }
 
 // https://github.com/npm/rfcs/pull/183 defines which fields we put into the environment
-module.exports = (env, pkg) => packageEnvs({ ...env }, {
- name: pkg.name,
- version: pkg.version,
- config: pkg.config,
- engines: pkg.engines,
- bin: pkg.bin,
-}, 'npm_package_')
+module.exports = pkg => {
+ return packageEnvs({
+ name: pkg.name,
+ version: pkg.version,
+ config: pkg.config,
+ engines: pkg.engines,
+ bin: pkg.bin,
+ }, 'npm_package_')
+}

lib/run-script-pkg.js

@@ -69,7 +69,7 @@ const runScriptPkg = async options => {
  path,
  scriptShell,
  binPaths,
- env: packageEnvs(env, pkg),
+ env: { ...env, ...packageEnvs(pkg) },
  stdio,
  cmd,
  args,