From 4fed086f7d9f073269d1a1961a84b45a34590918 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Fri, 11 Jul 2025 13:11:25 +0800 Subject: [PATCH] Explicitly use group as name for `Node.js` --- src/recipe/lang/Node.js/Bun.c | 6 +++--- src/recipe/lang/Node.js/Node.js.c | 24 ++++++++++++------------ src/recipe/lang/Node.js/Yarn.c | 4 ++-- src/recipe/lang/Node.js/common.h | 6 +++--- src/recipe/lang/Node.js/npm.c | 4 ++-- src/recipe/lang/Node.js/pnpm.c | 4 ++-- src/recipe/menu.c | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/recipe/lang/Node.js/Bun.c b/src/recipe/lang/Node.js/Bun.c index 9c7288e..d4adfcd 100644 --- a/src/recipe/lang/Node.js/Bun.c +++ b/src/recipe/lang/Node.js/Bun.c @@ -4,7 +4,7 @@ * File Authors : Aoran Zeng * Contributors : Lontten * Created On : <2024-09-29> - * Last Modified : <2024-10-02> + * Last Modified : <2025-07-11> * ------------------------------------------------------------*/ /** @@ -28,7 +28,7 @@ void pl_nodejs_bun_setsrc (char *option) { // 用的是 npm Registry 的源 - chsrc_yield_source (pl_nodejs); + chsrc_yield_source (pl_nodejs_group); char *file = xy_strjoin(3, "[install]\n" "registry = \"", source.url, "\""); @@ -80,4 +80,4 @@ pl_nodejs_bun_feat (char *option) } // def_target_gsrf(pl_nodejs_bun); -Target_t pl_nodejs_bun_target = {def_target_inner_gsrf(pl_nodejs_bun),def_target_sourcesn(pl_nodejs)}; +Target_t pl_nodejs_bun_target = {def_target_inner_gsrf(pl_nodejs_bun),def_target_sourcesn(pl_nodejs_group)}; diff --git a/src/recipe/lang/Node.js/Node.js.c b/src/recipe/lang/Node.js/Node.js.c index e103ba0..37f6bb8 100644 --- a/src/recipe/lang/Node.js/Node.js.c +++ b/src/recipe/lang/Node.js/Node.js.c @@ -6,7 +6,7 @@ * | * Created On : <2023-08-30> * Major Revision : 2 - * Last Modified : <2024-11-08> + * Last Modified : <2025-07-11> * ------------------------------------------------------------*/ void @@ -30,7 +30,7 @@ pl_nodejs_check_cmd (bool *npm_exist, bool *yarn_exist, bool *pnpm_exist) * chsrc get nodejs */ void -pl_nodejs_getsrc (char *option) +pl_nodejs_group_getsrc (char *option) { bool npm_exist, yarn_exist, pnpm_exist; pl_nodejs_check_cmd (&npm_exist, &yarn_exist, &pnpm_exist); @@ -61,13 +61,13 @@ pl_nodejs_getsrc (char *option) * chsrc set nodejs */ void -pl_nodejs_setsrc (char *option) +pl_nodejs_group_setsrc (char *option) { { - char *msg = ENGLISH ? "Three package managers will be replaced for you at the same time: " \ - "npm, pnpm, yarn. If you need to change the source independently, " \ - "please run independently `chsrc set `" - : "将同时为您更换3个包管理器 npm, pnpm, Yarn 的源，若需要独立换源，请独立运行 chsrc set "; + char *msg = ENGLISH ? "Three package managers will be replaced for you at the same time: " + "npm, pnpm, yarn. If you need to change the source independently, " + "please run independently `chsrc set `" + : "将同时为您更换3个包管理器 npm, pnpm, Yarn 的源，若需要独立换源，请独立运行 chsrc set "; chsrc_note2 (msg); } @@ -75,7 +75,7 @@ pl_nodejs_setsrc (char *option) pl_nodejs_check_cmd (&npm_exist, &yarn_exist, &pnpm_exist); chsrc_set_target_group_mode (); - chsrc_yield_source_and_confirm (pl_nodejs); + chsrc_yield_source_and_confirm (pl_nodejs_group); if (npm_exist) { @@ -103,9 +103,9 @@ pl_nodejs_setsrc (char *option) * chsrc reset nodejs */ void -pl_nodejs_resetsrc (char *option) +pl_nodejs_group_resetsrc (char *option) { - pl_nodejs_setsrc (option); + pl_nodejs_group_setsrc (option); } @@ -113,7 +113,7 @@ pl_nodejs_resetsrc (char *option) * chsrc ls nodejs */ Feature_t -pl_nodejs_feat (char *option) +pl_nodejs_group_feat (char *option) { Feature_t f = {0}; @@ -128,4 +128,4 @@ pl_nodejs_feat (char *option) return f; } -def_target_gsrf (pl_nodejs); +def_target_gsrf (pl_nodejs_group); diff --git a/src/recipe/lang/Node.js/Yarn.c b/src/recipe/lang/Node.js/Yarn.c index c86b46f..ea189c6 100644 --- a/src/recipe/lang/Node.js/Yarn.c +++ b/src/recipe/lang/Node.js/Yarn.c @@ -40,7 +40,7 @@ pl_nodejs_yarn_getsrc (char *option) void pl_nodejs_yarn_setsrc (char *option) { - chsrc_yield_source (pl_nodejs); + chsrc_yield_source (pl_nodejs_group); if (chsrc_in_standalone_mode()) chsrc_confirm_source; @@ -109,4 +109,4 @@ pl_nodejs_yarn_feat (char *option) } // def_target_gsrf(pl_nodejs_yarn); -Target_t pl_nodejs_yarn_target = {def_target_inner_gsrf(pl_nodejs_yarn),def_target_sourcesn(pl_nodejs)}; +Target_t pl_nodejs_yarn_target = {def_target_inner_gsrf(pl_nodejs_yarn),def_target_sourcesn(pl_nodejs_group)}; diff --git a/src/recipe/lang/Node.js/common.h b/src/recipe/lang/Node.js/common.h index e1bf40c..89ab597 100644 --- a/src/recipe/lang/Node.js/common.h +++ b/src/recipe/lang/Node.js/common.h @@ -6,7 +6,7 @@ * | * Created On : <2023-09-09> * Major Revision : 1 - * Last Modified : <2024-12-18> + * Last Modified : <2025-07-11> * ------------------------------------------------------------*/ static SourceProvider_t pl_nodejs_npm_upstream = @@ -32,14 +32,14 @@ static MirrorSite_t NpmMirror = * } * */ -static Source_t pl_nodejs_sources[] = +static Source_t pl_nodejs_group_sources[] = { {&pl_nodejs_npm_upstream, "https://registry.npmjs.org/"}, /* @note 根据 pnpm 官网，有最后的斜线 */ {&NpmMirror, "https://registry.npmmirror.com"}, {&Huawei, "https://mirrors.huaweicloud.com/repository/npm/"}, {&Tencent, "https://mirrors.cloud.tencent.com/npm/"}, }; -def_sources_n(pl_nodejs); +def_sources_n(pl_nodejs_group); diff --git a/src/recipe/lang/Node.js/npm.c b/src/recipe/lang/Node.js/npm.c index 5af7c9f..63390b3 100644 --- a/src/recipe/lang/Node.js/npm.c +++ b/src/recipe/lang/Node.js/npm.c @@ -26,7 +26,7 @@ pl_nodejs_npm_getsrc (char *option) void pl_nodejs_npm_setsrc (char *option) { - chsrc_yield_source (pl_nodejs); + chsrc_yield_source (pl_nodejs_group); if (chsrc_in_standalone_mode()) chsrc_confirm_source; @@ -78,4 +78,4 @@ pl_nodejs_npm_feat (char *option) } // def_target_gsrf(pl_nodejs_npm); -Target_t pl_nodejs_npm_target = {def_target_inner_gsrf(pl_nodejs_npm),def_target_sourcesn(pl_nodejs)}; +Target_t pl_nodejs_npm_target = {def_target_inner_gsrf(pl_nodejs_npm),def_target_sourcesn(pl_nodejs_group)}; diff --git a/src/recipe/lang/Node.js/pnpm.c b/src/recipe/lang/Node.js/pnpm.c index 604efe8..26c2bb4 100644 --- a/src/recipe/lang/Node.js/pnpm.c +++ b/src/recipe/lang/Node.js/pnpm.c @@ -27,7 +27,7 @@ pl_nodejs_pnpm_getsrc (char *option) void pl_nodejs_pnpm_setsrc (char *option) { - chsrc_yield_source (pl_nodejs); + chsrc_yield_source (pl_nodejs_group); if (chsrc_in_standalone_mode()) chsrc_confirm_source; @@ -80,4 +80,4 @@ pl_nodejs_pnpm_feat (char *option) // def_target_gsrf(pl_nodejs_pnpm); -Target_t pl_nodejs_pnpm_target = {def_target_inner_gsrf(pl_nodejs_pnpm),def_target_sourcesn(pl_nodejs)}; +Target_t pl_nodejs_pnpm_target = {def_target_inner_gsrf(pl_nodejs_pnpm),def_target_sourcesn(pl_nodejs_group)}; diff --git a/src/recipe/menu.c b/src/recipe/menu.c index 1768ff6..a48a66f 100644 --- a/src/recipe/menu.c +++ b/src/recipe/menu.c @@ -6,7 +6,7 @@ * | * Created On : <2023-09-01> * Major Revision : 1 - * Last Modified : <2025-06-17> + * Last Modified : <2025-07-11> * ------------------------------------------------------------*/ /* Begin Target Matrix */ @@ -21,7 +21,7 @@ static const char *pl_python_rye[] = {"rye", NULL, t(&pl_python_rye_target)}, *pl_python_uv[] = {"uv", NULL, t(&pl_python_uv_target)}, -*pl_nodejs[] = {"node", "nodejs", NULL, t(&pl_nodejs_target)}, +*pl_nodejs[] = {"node", "nodejs", NULL, t(&pl_nodejs_group_target)}, *pl_nodejs_bun[] = {"bun", NULL, t(&pl_nodejs_bun_target)}, *pl_nodejs_npm[] = {"npm", NULL, t(&pl_nodejs_npm_target)}, *pl_nodejs_yarn[] = {"yarn", NULL, t(&pl_nodejs_yarn_target)},