Merge pull request #26 from beezen/dev

fix: 优化环境异常时help日志不打印问题

.babelrc

@@ -1,4 +1,8 @@
 {
-  "presets": ["@babel/env"],
-  "plugins": ["@babel/plugin-transform-runtime"]
-}
+  "presets": [
+    "@babel/preset-env"
+  ],
+  "plugins": [
+    "@babel/plugin-transform-runtime"
+  ]
+}

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.10.1](https://github.com/beezen/nucm/compare/v1.10.0...v1.10.1) (2024-01-31)
+
+
+### Bug Fixes
+
+* 优化 colors 模块的引入规则 ([8122ed5](https://github.com/beezen/nucm/commit/8122ed5d4f1df8cb101407c92051bfdc904e218e))
+
+## [1.10.0](https://github.com/beezen/nucm/compare/v1.9.3...v1.10.0) (2024-01-31)
+
+
+### Features
+
+* 项目调整为TS语法 ([0b34ad4](https://github.com/beezen/nucm/commit/0b34ad42b43bc5b61ff1e34abb01df0bb146b466))
+
+
+### Bug Fixes
+
+* 优化环境异常时help日志不打印问题 ([29d4945](https://github.com/beezen/nucm/commit/29d4945db37e4015bb80c1f902f2ba89bb1802f5))
+* 优化文件导入方式 ([f05c988](https://github.com/beezen/nucm/commit/f05c988a5f9d574bc79a5c3ce95ae96f4a51aaeb))
+
+### [1.9.3](https://github.com/beezen/nucm/compare/v1.9.2...v1.9.3) (2024-01-29)
+
 ### [1.9.2](https://github.com/beezen/nucm/compare/v1.9.1...v1.9.2) (2024-01-22)
 
 

__tests__/actions/base.spec.ts

@@ -1,50 +1,52 @@
-import { addUser, getUserList, removeUser, changeUser } from "../../src/actions/base.js";
-import { getConfig, getRegistryConfig, prepareEnv } from "../../src/common";
+import { addUser, getUserList, removeUser, changeUser } from "../../src/actions/base";
+import { getConfig, getRegistryConfig, prepareEnv, initLanguage } from "../../src/common";
+import type { BaseConfig, RegistryConfig } from "../../src/common";
+
 describe("action_base", () => {
   const name1 = "example1";
   const name2 = "example2";
   const token1 = "example_token1";
   const token2 = "example_token2";
-  prepareEnv(() => {
-    let config = getConfig();
-    let nucmrcConfig = config.nucm;
-    let registryName = getRegistryConfig(config).registryName;
-    let accountObject = nucmrcConfig[registryName];
-    let currentAccountName = ""; // 当前账号名
-    Object.keys(accountObject).forEach((name) => {
-      if (accountObject[name]["is-current"]) {
-        currentAccountName = name;
-      }
-    });
-    it("addUser", () => {
-      addUser(name1, token1);
-      addUser(name2, token2);
-      config = getConfig();
-      expect(config.nucm[registryName][name1]).toBeDefined();
-      expect(config.nucm[registryName][name2]).toBeDefined();
-    });
+  initLanguage();
+  prepareEnv()();
+  let config = getConfig() as BaseConfig;
+  let nucmrcConfig = config.nucm;
+  let registryName = (getRegistryConfig(config) as RegistryConfig).registryName;
+  let accountObject = nucmrcConfig?.[registryName];
+  let currentAccountName = ""; // 当前账号名
+  Object.keys(accountObject).forEach((name) => {
+    if (accountObject[name]["is-current"]) {
+      currentAccountName = name;
+    }
+  });
+  it("addUser", () => {
+    addUser(name1, token1);
+    addUser(name2, token2);
+    config = getConfig();
+    expect(config.nucm?.[registryName][name1]).toBeDefined();
+    expect(config.nucm?.[registryName][name2]).toBeDefined();
+  });
 
-    it("changeUser", () => {
-      expect(config.nucm[registryName][name1]["is-current"]).toBeUndefined();
-      changeUser(name2);
-      config = getConfig();
-      expect(config.nucm[registryName][name2]["is-current"]).toBeDefined();
-    });
+  it("changeUser", () => {
+    expect(config.nucm?.[registryName][name1]["is-current"]).toBeUndefined();
+    changeUser(name2);
+    config = getConfig();
+    expect(config.nucm?.[registryName][name2]["is-current"]).toBeDefined();
+  });
 
-    it("removeUser", () => {
-      removeUser(name1);
-      config = getConfig();
-      expect(config.nucm[registryName][name1]).toBeUndefined();
-    });
+  it("removeUser", () => {
+    removeUser(name1);
+    config = getConfig();
+    expect(config.nucm?.[registryName][name1]).toBeUndefined();
+  });
 
-    it("getUserList", () => {
-      expect(getUserList({}).indexOf(name2) > -1).toBeTruthy();
-      expect(getUserList({ all: true }).indexOf(name2) > -1).toBeTruthy();
-    });
-    // 还原单测前状态
-    it("backup", () => {
-      removeUser(name2);
-      changeUser(currentAccountName);
-    });
+  it("getUserList", () => {
+    expect(getUserList({}).indexOf(name2) > -1).toBeTruthy();
+    expect(getUserList({ all: true }).indexOf(name2) > -1).toBeTruthy();
+  });
+  // 还原单测前状态
+  it("backup", () => {
+    removeUser(name2);
+    changeUser(currentAccountName);
   });
 });

__tests__/utils/index.spec.ts

@@ -9,6 +9,8 @@ import {
 } from "../../src/utils/index";
 import { getConfig, getRegistryConfig, isEnabled, initLanguage } from "../../src/common";
 
+import type { RegistryConfig } from "../../src/common";
+initLanguage(); // 初始化 i18next
 describe("utils", () => {
   it("getConfig", () => {
     const { nucm, npm, nrm } = getConfig();
@@ -18,7 +20,6 @@ describe("utils", () => {
   });
 
   it("printLog", () => {
-    initLanguage(); // 初始化 i18next
     const langCn = require("../../src/lang/default/zh/base.json");
     const langEn = require("../../src/lang/default/en/base.json");
     expect(printLog("command.version", { isPrint: false, lng: "en" })).toBe(langEn.command.version);
@@ -37,8 +38,8 @@ describe("utils", () => {
 
   it("desensitize", () => {
     expect(desensitize("ce")).toBe("ce");
-    expect(desensitize("ceshi", 10)).toBe("......eshi");
-    expect(desensitize("ceshi1ceshi2ceshi3", 10)).toBe("ceshi1......shi3");
+    expect(desensitize("ceshi")).toBe("......eshi");
+    expect(desensitize("ceshi1ceshi2ceshi3")).toBe("ceshi1......shi3");
   });
 
   it("compareVersion", () => {
@@ -52,8 +53,7 @@ describe("utils", () => {
   });
 
   it("getRegistryConfig", () => {
-    expect(getRegistryConfig()).toEqual({});
-    const { registry, registryName, _authtoken } = getRegistryConfig(getConfig());
+    const { registry, registryName, _authtoken } = getRegistryConfig(getConfig()) as RegistryConfig;
     expect(registry).toBeDefined();
     expect(registryName).toBeDefined();
     expect(_authtoken).toBeDefined();