fix: repair config items using raw values when possible

closes #6085
npm · Feb 1, 2023 · 328c3d8 · 328c3d8
1 parent e5ecc7f
commit 328c3d8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/workspaces/config/lib/index.js b/workspaces/config/lib/index.js
@@ -482,8 +482,9 @@ class Config {
  if (problem.action === 'delete') {
  this.delete(problem.key, problem.where)
  } else if (problem.action === 'rename') {
- const old = this.get(problem.from, problem.where)
- this.set(problem.to, old, problem.where)
+ const raw = this.data.get(problem.where).raw?.[problem.from]
+ const calculated = this.get(problem.from, problem.where)
+ this.set(problem.to, raw || calculated, problem.where)
  this.delete(problem.from, problem.where)
  }
  }

diff --git a/workspaces/config/tap-snapshots/test/index.js.test.cjs b/workspaces/config/tap-snapshots/test/index.js.test.cjs
@@ -25,6 +25,18 @@ exports[`test/index.js TAP credentials management def_auth > other registry 1`]
 Object {}
 `
 
+exports[`test/index.js TAP credentials management def_authEnv > default registry 1`] = `
+Object {
+ "auth": "\${PATH}",
+ "password": "",
+ "username": "<\\u0004�",
+}
+`
+
+exports[`test/index.js TAP credentials management def_authEnv > other registry 1`] = `
+Object {}
+`
+
 exports[`test/index.js TAP credentials management def_passNoUser > default registry 1`] = `
 Object {
  "email": "i@izs.me",

diff --git a/workspaces/config/test/index.js b/workspaces/config/test/index.js
@@ -701,6 +701,9 @@ email = i@izs.me
  '.npmrc': `_auth = ${Buffer.from('hello:world').toString('base64')}
 always-auth = true`,
  },
+ def_authEnv: {
+ '.npmrc': '_auth = ${PATH}',
+ },
  none_authToken: { '.npmrc': '_authToken = 0bad1de4' },
  none_lcAuthToken: { '.npmrc': '_authtoken = 0bad1de4' },
  none_emptyConfig: { '.npmrc': '' },