Merge pull request #23 from beezen/dev

fix: 优化项目级存在.npmrc文件时,账号信息不准确问题
beezen · Jan 16, 2024 · 5be1ef6 · 5be1ef6
2 parents ca92e10 + 9f5359b
commit 5be1ef6
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 89 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.9.1](https://github.com/beezen/nucm/compare/v1.9.0...v1.9.1) (2024-01-16)
+
+
+### Bug Fixes
+
+* 优化项目级存在.npmrc文件时,账号信息不准确问题 ([6e3a4f5](https://github.com/beezen/nucm/commit/6e3a4f5d571f21292b547a2144448876d635f5d5))
+
 ## [1.9.0](https://github.com/beezen/nucm/compare/v1.8.9...v1.9.0) (2024-01-15)
 
 

diff --git a/__tests__/utils/index.spec.ts b/__tests__/utils/index.spec.ts
@@ -3,7 +3,9 @@ import {
   desensitize,
   compareVersion,
   printLog,
-  getPackageManager
+  getPackageManager,
+  getNrmModule,
+  getRegistryUrl
 } from "../../src/utils/index";
 import { getConfig, getRegistryConfig, isEnabled, initLanguage } from "../../src/common";
 
@@ -61,4 +63,13 @@ describe("utils", () => {
     expect(isEnabled(getRegistryConfig(getConfig()))).toBeTruthy();
     expect(isEnabled({})).not.toBeTruthy();
   });
+
+  it("getNrmModule", () => {
+    expect(getNrmModule()).not.toBe("");
+    expect(getNrmModule()).not.toBeUndefined();
+  });
+
+  it("getRegistryUrl", () => {
+    expect(getRegistryUrl()).toBeDefined();
+  });
 });
diff --git a/coverage/clover.xml b/coverage/clover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1705310205693" clover="3.2.0">
-  <project timestamp="1705310205693" name="All files">
-    <metrics statements="145" coveredstatements="124" conditionals="77" coveredconditionals="54" methods="23" coveredmethods="21" elements="245" coveredelements="199" complexity="0" loc="145" ncloc="145" packages="4" files="5" classes="5"/>
+<coverage generated="1705369566423" clover="3.2.0">
+  <project timestamp="1705369566423" name="All files">
+    <metrics statements="147" coveredstatements="129" conditionals="81" coveredconditionals="59" methods="24" coveredmethods="23" elements="252" coveredelements="211" complexity="0" loc="147" ncloc="147" packages="4" files="5" classes="5"/>
     <package name="actions">
       <metrics statements="55" coveredstatements="50" conditionals="27" coveredconditionals="18" methods="8" coveredmethods="8"/>
       <file name="base.js" path="/Users/beezen/mine/github/nucm/src/actions/base.js">
@@ -10,18 +10,18 @@
         <line num="10" count="2" type="stmt"/>
         <line num="11" count="2" type="stmt"/>
         <line num="12" count="2" type="cond" truecount="0" falsecount="1"/>
-        <line num="13" count="4" type="stmt"/>
-        <line num="15" count="11" type="cond" truecount="1" falsecount="1"/>
-        <line num="18" count="11" type="cond" truecount="2" falsecount="0"/>
-        <line num="19" count="4" type="stmt"/>
-        <line num="21" count="7" type="stmt"/>
+        <line num="13" count="5" type="stmt"/>
+        <line num="15" count="13" type="cond" truecount="1" falsecount="1"/>
+        <line num="18" count="13" type="cond" truecount="2" falsecount="0"/>
+        <line num="19" count="5" type="stmt"/>
+        <line num="21" count="8" type="stmt"/>
         <line num="25" count="2" type="stmt"/>
         <line num="26" count="2" type="stmt"/>
         <line num="29" count="2" type="cond" truecount="2" falsecount="0"/>
         <line num="30" count="1" type="stmt"/>
         <line num="31" count="1" type="stmt"/>
-        <line num="34" count="3" type="cond" truecount="2" falsecount="0"/>
-        <line num="37" count="3" type="stmt"/>
+        <line num="34" count="4" type="cond" truecount="2" falsecount="0"/>
+        <line num="37" count="4" type="stmt"/>
         <line num="40" count="1" type="stmt"/>
         <line num="42" count="1" type="stmt"/>
         <line num="43" count="1" type="stmt"/>
@@ -36,7 +36,7 @@
         <line num="57" count="0" type="stmt"/>
         <line num="59" count="2" type="stmt"/>
         <line num="61" count="2" type="stmt"/>
-        <line num="62" count="6" type="cond" truecount="2" falsecount="0"/>
+        <line num="62" count="8" type="cond" truecount="2" falsecount="0"/>
         <line num="63" count="1" type="stmt"/>
         <line num="66" count="2" type="stmt"/>
         <line num="67" count="2" type="stmt"/>
@@ -64,14 +64,14 @@
       </file>
     </package>
     <package name="common">
-      <metrics statements="54" coveredstatements="43" conditionals="29" coveredconditionals="18" methods="9" coveredmethods="8"/>
+      <metrics statements="54" coveredstatements="43" conditionals="33" coveredconditionals="22" methods="9" coveredmethods="8"/>
       <file name="env.js" path="/Users/beezen/mine/github/nucm/src/common/env.js">
         <metrics statements="2" coveredstatements="2" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
         <line num="1" count="2" type="stmt"/>
         <line num="9" count="2" type="stmt"/>
       </file>
       <file name="index.js" path="/Users/beezen/mine/github/nucm/src/common/index.js">
-        <metrics statements="52" coveredstatements="41" conditionals="29" coveredconditionals="18" methods="9" coveredmethods="8"/>
+        <metrics statements="52" coveredstatements="41" conditionals="33" coveredconditionals="22" methods="9" coveredmethods="8"/>
         <line num="14" count="2" type="stmt"/>
         <line num="15" count="2" type="stmt"/>
         <line num="16" count="2" type="stmt"/>
@@ -93,8 +93,8 @@
         <line num="65" count="0" type="stmt"/>
         <line num="66" count="0" type="stmt"/>
         <line num="68" count="1" type="stmt"/>
-        <line num="77" count="5" type="stmt"/>
-        <line num="78" count="5" type="cond" truecount="2" falsecount="0"/>
+        <line num="77" count="5" type="cond" truecount="1" falsecount="1"/>
+        <line num="78" count="5" type="cond" truecount="4" falsecount="0"/>
         <line num="79" count="4" type="stmt"/>
         <line num="80" count="4" type="stmt"/>
         <line num="81" count="4" type="stmt"/>
@@ -134,13 +134,13 @@
       </file>
     </package>
     <package name="utils">
-      <metrics statements="35" coveredstatements="30" conditionals="21" coveredconditionals="18" methods="6" coveredmethods="5"/>
+      <metrics statements="37" coveredstatements="35" conditionals="21" coveredconditionals="19" methods="7" coveredmethods="7"/>
       <file name="index.js" path="/Users/beezen/mine/github/nucm/src/utils/index.js">
-        <metrics statements="35" coveredstatements="30" conditionals="21" coveredconditionals="18" methods="6" coveredmethods="5"/>
-        <line num="13" count="14" type="stmt"/>
-        <line num="22" count="14" type="cond" truecount="2" falsecount="0"/>
-        <line num="23" count="13" type="cond" truecount="2" falsecount="0"/>
-        <line num="24" count="8" type="stmt"/>
+        <metrics statements="37" coveredstatements="35" conditionals="21" coveredconditionals="19" methods="7" coveredmethods="7"/>
+        <line num="13" count="16" type="stmt"/>
+        <line num="22" count="16" type="cond" truecount="2" falsecount="0"/>
+        <line num="23" count="15" type="cond" truecount="2" falsecount="0"/>
+        <line num="24" count="6" type="stmt"/>
         <line num="34" count="7" type="stmt"/>
         <line num="35" count="7" type="stmt"/>
         <line num="36" count="7" type="stmt"/>
@@ -168,10 +168,12 @@
         <line num="87" count="13" type="cond" truecount="2" falsecount="0"/>
         <line num="88" count="5" type="stmt"/>
         <line num="90" count="8" type="stmt"/>
-        <line num="95" count="0" type="stmt"/>
-        <line num="96" count="0" type="stmt"/>
-        <line num="97" count="0" type="cond" truecount="0" falsecount="2"/>
+        <line num="95" count="2" type="stmt"/>
+        <line num="96" count="2" type="stmt"/>
+        <line num="97" count="2" type="cond" truecount="1" falsecount="1"/>
         <line num="98" count="0" type="stmt"/>
+        <line num="106" count="6" type="stmt"/>
+        <line num="107" count="6" type="stmt"/>
       </file>
     </package>
   </project>

diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
diff --git a/coverage/lcov.info b/coverage/lcov.info
@@ -11,29 +11,29 @@ FN:89,removeUser
 FNF:8
 FNH:8
 FNDA:2,getUserList
-FNDA:4,(anonymous_1)
-FNDA:11,(anonymous_2)
-FNDA:3,(anonymous_3)
+FNDA:5,(anonymous_1)
+FNDA:13,(anonymous_2)
+FNDA:4,(anonymous_3)
 FNDA:2,changeUser
-FNDA:6,(anonymous_5)
+FNDA:8,(anonymous_5)
 FNDA:2,addUser
 FNDA:2,removeUser
 DA:9,2
 DA:10,2
 DA:11,2
 DA:12,2
-DA:13,4
-DA:15,11
-DA:18,11
-DA:19,4
-DA:21,7
+DA:13,5
+DA:15,13
+DA:18,13
+DA:19,5
+DA:21,8
 DA:25,2
 DA:26,2
 DA:29,2
 DA:30,1
 DA:31,1
-DA:34,3
-DA:37,3
+DA:34,4
+DA:37,4
 DA:40,1
 DA:42,1
 DA:43,1
@@ -48,7 +48,7 @@ DA:56,0
 DA:57,0
 DA:59,2
 DA:61,2
-DA:62,6
+DA:62,8
 DA:63,1
 DA:66,2
 DA:67,2
@@ -77,21 +77,21 @@ LF:55
 LH:50
 BRDA:12,0,0,0
 BRDA:15,1,0,0
-BRDA:15,1,1,11
-BRDA:18,2,0,4
-BRDA:18,2,1,7
+BRDA:15,1,1,13
+BRDA:18,2,0,5
+BRDA:18,2,1,8
 BRDA:29,3,0,1
 BRDA:29,3,1,1
 BRDA:34,4,0,1
-BRDA:34,4,1,2
+BRDA:34,4,1,3
 BRDA:44,5,0,1
 BRDA:44,5,1,0
 BRDA:54,6,0,2
 BRDA:54,6,1,0
 BRDA:55,7,0,0
 BRDA:55,7,1,2
 BRDA:62,8,0,1
-BRDA:62,8,1,5
+BRDA:62,8,1,7
 BRDA:76,9,0,2
 BRDA:76,9,1,0
 BRDA:77,10,0,2
@@ -202,27 +202,31 @@ BRDA:54,3,0,0
 BRDA:54,3,1,1
 BRDA:58,4,0,0
 BRDA:58,4,1,1
-BRDA:78,5,0,1
-BRDA:78,5,1,4
-BRDA:85,6,0,4
-BRDA:85,6,1,44
-BRDA:101,7,0,1
-BRDA:101,7,1,2
-BRDA:126,8,0,0
-BRDA:126,8,1,0
-BRDA:128,9,0,0
-BRDA:128,9,1,0
-BRDA:143,10,0,0
-BRDA:143,10,1,1
-BRDA:146,11,0,0
-BRDA:146,11,1,1
-BRDA:151,12,0,1
-BRDA:151,12,1,0
-BRDA:154,13,0,1
-BRDA:154,13,1,1
-BRDA:161,14,0,2
-BRF:29
-BRH:18
+BRDA:77,5,0,5
+BRDA:77,5,1,0
+BRDA:78,6,0,1
+BRDA:78,6,1,4
+BRDA:78,7,0,5
+BRDA:78,7,1,5
+BRDA:85,8,0,4
+BRDA:85,8,1,44
+BRDA:101,9,0,1
+BRDA:101,9,1,2
+BRDA:126,10,0,0
+BRDA:126,10,1,0
+BRDA:128,11,0,0
+BRDA:128,11,1,0
+BRDA:143,12,0,0
+BRDA:143,12,1,1
+BRDA:146,13,0,0
+BRDA:146,13,1,1
+BRDA:151,14,0,1
+BRDA:151,14,1,1
+BRDA:154,15,0,1
+BRDA:154,15,1,1
+BRDA:161,16,0,2
+BRF:33
+BRH:22
 end_of_record
 TN:
 SF:src/lang/default/index.js
@@ -242,18 +246,20 @@ FN:33,compareVersion
 FN:59,getPackageManager
 FN:77,printLog
 FN:94,getNrmModule
-FNF:6
-FNH:5
-FNDA:14,line
-FNDA:14,desensitize
+FN:105,getRegistryUrl
+FNF:7
+FNH:7
+FNDA:16,line
+FNDA:16,desensitize
 FNDA:7,compareVersion
 FNDA:1,getPackageManager
 FNDA:13,printLog
-FNDA:0,getNrmModule
-DA:13,14
-DA:22,14
-DA:23,13
-DA:24,8
+FNDA:2,getNrmModule
+FNDA:6,getRegistryUrl
+DA:13,16
+DA:22,16
+DA:23,15
+DA:24,6
 DA:34,7
 DA:35,7
 DA:36,7
@@ -281,16 +287,18 @@ DA:86,13
 DA:87,13
 DA:88,5
 DA:90,8
-DA:95,0
-DA:96,0
-DA:97,0
+DA:95,2
+DA:96,2
+DA:97,2
 DA:98,0
-LF:35
-LH:30
+DA:106,6
+DA:107,6
+LF:37
+LH:35
 BRDA:22,0,0,1
-BRDA:22,0,1,13
-BRDA:23,1,0,5
-BRDA:23,1,1,8
+BRDA:22,0,1,15
+BRDA:23,1,0,9
+BRDA:23,1,1,6
 BRDA:49,2,0,3
 BRDA:49,2,1,13
 BRDA:51,3,0,2
@@ -306,8 +314,8 @@ BRDA:86,9,0,13
 BRDA:86,9,1,8
 BRDA:87,10,0,5
 BRDA:87,10,1,8
-BRDA:97,11,0,0
+BRDA:97,11,0,2
 BRDA:97,11,1,0
 BRF:21
-BRH:18
+BRH:19
 end_of_record
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nucm",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "NPM User Change Manager（NPM 用户账号切换管理）",
   "main": "./bin/index.js",
   "scripts": {

diff --git a/src/common/index.js b/src/common/index.js
@@ -6,7 +6,7 @@ import inquirer from "inquirer";
 import shell from "shelljs";
 import "colors";
 import { init, changeLanguage } from "i18next";
-import { printLog, getNrmModule } from "../utils/index";
+import { printLog, getNrmModule, getRegistryUrl } from "../utils/index";
 import registries from "../constants/registries.json";
 import { resourcesAll } from "../lang/default/index";
 import { baseInitConfig } from "./env";
@@ -74,8 +74,8 @@ export function checkConfigInit() {
  * @return 当前源相关信息 {registry,registryName,_authtoken}
  */
 export function getRegistryConfig(config) {
-  const registry = config?.npm?.registry; // 当前启用源地址
-  if (!registry) return {};
+  const registry = getRegistryUrl() || config?.npm?.registry; // 当前启用源地址
+  if (!registry || !config) return {};
   let registriesList = { ...registries, ...config.nrm }; // 源注册表
   let registryName = "";
   let _authtoken = config.npm[`${registry.replace(/^https?:/, "")}:_authToken`]; // 当前源的用户账号令牌

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -97,3 +97,12 @@ export function getNrmModule() {
   if (fs.existsSync(nrmCli)) return nrmCli;
   return "";
 }
+
+/**
+ * 获取 npm 的 registry
+ * @return registry 镜像源地址
+ */
+export function getRegistryUrl() {
+  const registryUrl = shell.exec("npm config get registry", { silent: true }).stdout.trim();
+  return registryUrl;
+}