From c531b8b56e5776252309ae73ac61f0d722cf7490 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Sun, 10 Aug 2025 13:36:10 +0800 Subject: [PATCH] Rename to `JavaScript` --- src/chsrc-main.c | 14 ++++---- src/recipe/lang/{Node.js => JavaScript}/Bun.c | 18 +++++------ .../Node.js.c => JavaScript/JavaScript.c} | 32 +++++++++---------- .../lang/{Node.js => JavaScript}/Yarn.c | 22 ++++++------- .../lang/{Node.js => JavaScript}/common.h | 22 ++++++------- src/recipe/lang/{Node.js => JavaScript}/npm.c | 16 +++++----- src/recipe/lang/{Node.js => JavaScript}/nvm.c | 16 +++++----- .../lang/{Node.js => JavaScript}/pnpm.c | 16 +++++----- src/recipe/lang/rawstr4c.h | 2 +- src/recipe/menu.c | 12 +++---- 10 files changed, 85 insertions(+), 85 deletions(-) rename src/recipe/lang/{Node.js => JavaScript}/Bun.c (77%) rename src/recipe/lang/{Node.js/Node.js.c => JavaScript/JavaScript.c} (76%) rename src/recipe/lang/{Node.js => JavaScript}/Yarn.c (82%) rename src/recipe/lang/{Node.js => JavaScript}/common.h (80%) rename src/recipe/lang/{Node.js => JavaScript}/npm.c (78%) rename src/recipe/lang/{Node.js => JavaScript}/nvm.c (78%) rename src/recipe/lang/{Node.js => JavaScript}/pnpm.c (79%) diff --git a/src/chsrc-main.c b/src/chsrc-main.c index 809f542..227cdc1 100644 --- a/src/chsrc-main.c +++ b/src/chsrc-main.c @@ -58,13 +58,13 @@ #include "recipe/lang/Python/uv.c" #include "recipe/lang/Python/Python.c" -#include "recipe/lang/Node.js/common.h" - #include "recipe/lang/Node.js/npm.c" - #include "recipe/lang/Node.js/pnpm.c" - #include "recipe/lang/Node.js/Yarn.c" -#include "recipe/lang/Node.js/Node.js.c" -#include "recipe/lang/Node.js/Bun.c" -#include "recipe/lang/Node.js/nvm.c" +#include "recipe/lang/JavaScript/common.h" + #include "recipe/lang/JavaScript/npm.c" + #include "recipe/lang/JavaScript/pnpm.c" + #include "recipe/lang/JavaScript/Yarn.c" +#include "recipe/lang/JavaScript/JavaScript.c" +#include "recipe/lang/JavaScript/Bun.c" +#include "recipe/lang/JavaScript/nvm.c" #include "recipe/lang/Perl.c" #include "recipe/lang/PHP.c" diff --git a/src/recipe/lang/Node.js/Bun.c b/src/recipe/lang/JavaScript/Bun.c similarity index 77% rename from src/recipe/lang/Node.js/Bun.c rename to src/recipe/lang/JavaScript/Bun.c index 517027b..5360783 100644 --- a/src/recipe/lang/Node.js/Bun.c +++ b/src/recipe/lang/JavaScript/Bun.c @@ -11,7 +11,7 @@ * chsrc get bun */ void -pl_nodejs_bun_getsrc (char *option) +pl_js_bun_getsrc (char *option) { chsrc_view_file ("~/.bunfig.toml"); } @@ -25,12 +25,12 @@ pl_nodejs_bun_getsrc (char *option) * chsrc set bun */ void -pl_nodejs_bun_setsrc (char *option) +pl_js_bun_setsrc (char *option) { // 用的是 npm Registry 的源 - chsrc_yield_source (pl_nodejs_group); + chsrc_yield_source (pl_js_group); - char *content = RAWSTR_pl_nodejs_bun_config; + char *content = RAWSTR_pl_js_bun_config; content = xy_str_gsub (content, "@url@", source.url); @@ -54,9 +54,9 @@ pl_nodejs_bun_setsrc (char *option) * chsrc reset bun */ void -pl_nodejs_bun_resetsrc (char *option) +pl_js_bun_resetsrc (char *option) { - pl_nodejs_bun_setsrc (option); + pl_js_bun_setsrc (option); } @@ -64,7 +64,7 @@ pl_nodejs_bun_resetsrc (char *option) * chsrc ls bun */ Feature_t -pl_nodejs_bun_feat (char *option) +pl_js_bun_feat (char *option) { Feature_t f = {0}; @@ -80,5 +80,5 @@ pl_nodejs_bun_feat (char *option) return f; } -// def_target_gsrf(pl_nodejs_bun); -Target_t pl_nodejs_bun_target = {def_target_inner_gsrf(pl_nodejs_bun),def_target_sourcesn(pl_nodejs_group)}; +// def_target_gsrf(pl_js_bun); +Target_t pl_js_bun_target = {def_target_inner_gsrf(pl_js_bun),def_target_sourcesn(pl_js_group)}; diff --git a/src/recipe/lang/Node.js/Node.js.c b/src/recipe/lang/JavaScript/JavaScript.c similarity index 76% rename from src/recipe/lang/Node.js/Node.js.c rename to src/recipe/lang/JavaScript/JavaScript.c index b3afb04..9670b45 100644 --- a/src/recipe/lang/Node.js/Node.js.c +++ b/src/recipe/lang/JavaScript/JavaScript.c @@ -10,7 +10,7 @@ * ------------------------------------------------------------*/ void -pl_nodejs_check_cmd (bool *npm_exist, bool *yarn_exist, bool *pnpm_exist) +pl_js_check_cmd (bool *npm_exist, bool *yarn_exist, bool *pnpm_exist) { *npm_exist = chsrc_check_program ("npm"); *yarn_exist = chsrc_check_program ("yarn"); @@ -30,28 +30,28 @@ pl_nodejs_check_cmd (bool *npm_exist, bool *yarn_exist, bool *pnpm_exist) * chsrc get nodejs */ void -pl_nodejs_group_getsrc (char *option) +pl_js_group_getsrc (char *option) { bool npm_exist, yarn_exist, pnpm_exist; - pl_nodejs_check_cmd (&npm_exist, &yarn_exist, &pnpm_exist); + pl_js_check_cmd (&npm_exist, &yarn_exist, &pnpm_exist); hr(); if (npm_exist) { - pl_nodejs_npm_getsrc (option); + pl_js_npm_getsrc (option); br(); } if (yarn_exist) { - pl_nodejs_yarn_getsrc (option); + pl_js_yarn_getsrc (option); br(); } if (pnpm_exist) { - pl_nodejs_pnpm_getsrc (option); + pl_js_pnpm_getsrc (option); br(); } } @@ -61,7 +61,7 @@ pl_nodejs_group_getsrc (char *option) * chsrc set nodejs */ void -pl_nodejs_group_setsrc (char *option) +pl_js_group_setsrc (char *option) { { char *msg = ENGLISH ? "Three package managers will be replaced for you at the same time: " @@ -72,26 +72,26 @@ pl_nodejs_group_setsrc (char *option) } bool npm_exist, yarn_exist, pnpm_exist; - pl_nodejs_check_cmd (&npm_exist, &yarn_exist, &pnpm_exist); + pl_js_check_cmd (&npm_exist, &yarn_exist, &pnpm_exist); chsrc_set_target_group_mode (); - chsrc_yield_source_and_confirm (pl_nodejs_group); + chsrc_yield_source_and_confirm (pl_js_group); if (npm_exist) { - pl_nodejs_npm_setsrc (option); + pl_js_npm_setsrc (option); br(); } if (yarn_exist) { - pl_nodejs_yarn_setsrc (option); + pl_js_yarn_setsrc (option); br(); } if (pnpm_exist) { - pl_nodejs_pnpm_setsrc (option); + pl_js_pnpm_setsrc (option); } chsrc_determine_chgtype (ChgType_Auto); @@ -103,9 +103,9 @@ pl_nodejs_group_setsrc (char *option) * chsrc reset nodejs */ void -pl_nodejs_group_resetsrc (char *option) +pl_js_group_resetsrc (char *option) { - pl_nodejs_group_setsrc (option); + pl_js_group_setsrc (option); } @@ -113,7 +113,7 @@ pl_nodejs_group_resetsrc (char *option) * chsrc ls nodejs */ Feature_t -pl_nodejs_group_feat (char *option) +pl_js_group_feat (char *option) { Feature_t f = {0}; @@ -128,4 +128,4 @@ pl_nodejs_group_feat (char *option) return f; } -def_target_gsrf (pl_nodejs_group); +def_target_gsrf (pl_js_group); diff --git a/src/recipe/lang/Node.js/Yarn.c b/src/recipe/lang/JavaScript/Yarn.c similarity index 82% rename from src/recipe/lang/Node.js/Yarn.c rename to src/recipe/lang/JavaScript/Yarn.c index 1c900b7..6cdf906 100644 --- a/src/recipe/lang/Node.js/Yarn.c +++ b/src/recipe/lang/JavaScript/Yarn.c @@ -9,7 +9,7 @@ * ------------------------------------------------------------*/ static double -pl_nodejs_yarn_get_yarn_version () +pl_js_yarn_get_yarn_version () { char *ver = xy_run ("yarn --version", 0); double version = atof (ver); @@ -21,10 +21,10 @@ pl_nodejs_yarn_get_yarn_version () * chsrc get yarn */ void -pl_nodejs_yarn_getsrc (char *option) +pl_js_yarn_getsrc (char *option) { // 最后一个版本应该是 v1.22.22 - if (pl_nodejs_yarn_get_yarn_version () >= 2) + if (pl_js_yarn_get_yarn_version () >= 2) // https://github.com/RubyMetric/chsrc/issues/53 // 从 Yarn V2 开始,使用新的配置名 chsrc_run ("yarn config get npmRegistryServer", RunOpt_No_Last_New_Line); @@ -38,16 +38,16 @@ pl_nodejs_yarn_getsrc (char *option) * @consult https://yarnpkg.com/cli/config/set */ void -pl_nodejs_yarn_setsrc (char *option) +pl_js_yarn_setsrc (char *option) { - chsrc_yield_source (pl_nodejs_group); + chsrc_yield_source (pl_js_group); if (chsrc_in_standalone_mode()) chsrc_confirm_source(); char *cmd = NULL; // 从 Yarn V2 开始,使用新的配置名 - if (pl_nodejs_yarn_get_yarn_version () >= 2) + if (pl_js_yarn_get_yarn_version () >= 2) { if (chsrc_in_local_mode()) // Yarn 默认情况下就是基于本项目换源 cmd = xy_2strjoin ("yarn config set npmRegistryServer ", source.url); @@ -82,9 +82,9 @@ pl_nodejs_yarn_setsrc (char *option) * chsrc reset yarn */ void -pl_nodejs_yarn_resetsrc (char *option) +pl_js_yarn_resetsrc (char *option) { - pl_nodejs_yarn_setsrc (option); + pl_js_yarn_setsrc (option); } @@ -92,7 +92,7 @@ pl_nodejs_yarn_resetsrc (char *option) * chsrc ls yarn */ Feature_t -pl_nodejs_yarn_feat (char *option) +pl_js_yarn_feat (char *option) { Feature_t f = {0}; @@ -108,5 +108,5 @@ pl_nodejs_yarn_feat (char *option) return f; } -// def_target_gsrf(pl_nodejs_yarn); -Target_t pl_nodejs_yarn_target = {def_target_inner_gsrf(pl_nodejs_yarn),def_target_sourcesn(pl_nodejs_group)}; +// def_target_gsrf(pl_js_yarn); +Target_t pl_js_yarn_target = {def_target_inner_gsrf(pl_js_yarn),def_target_sourcesn(pl_js_group)}; diff --git a/src/recipe/lang/Node.js/common.h b/src/recipe/lang/JavaScript/common.h similarity index 80% rename from src/recipe/lang/Node.js/common.h rename to src/recipe/lang/JavaScript/common.h index 18395b5..dbfd401 100644 --- a/src/recipe/lang/Node.js/common.h +++ b/src/recipe/lang/JavaScript/common.h @@ -9,9 +9,9 @@ * Last Modified : <2025-07-11> * ------------------------------------------------------------*/ -#define PL_Nodejs_Group_Speed_URL_Postfix "/@tensorflow/tfjs/-/tfjs-4.22.0.tgz" +#define PL_JS_Group_Speed_URL_Postfix "/@tensorflow/tfjs/-/tfjs-4.22.0.tgz" -static SourceProvider_t pl_nodejs_npm_upstream = +static SourceProvider_t pl_js_npm_upstream = { def_upstream, "https://www.npmjs.com/", {NotSkip, NA, NA, "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-4.22.0.tgz", ACCURATE} @@ -33,23 +33,23 @@ static MirrorSite_t NpmMirror = * @note * Sjtug, Tuna, Lzuoss, Jlu, Bfsu, 网易,搜狐 都没有 */ -static Source_t pl_nodejs_group_sources[] = +static Source_t pl_js_group_sources[] = { - {&pl_nodejs_npm_upstream, "https://registry.npmjs.org/", DelegateToUpstream}, /* @note 根据 pnpm 官网,有最后的斜线 */ + {&pl_js_npm_upstream, "https://registry.npmjs.org/", DelegateToUpstream}, /* @note 根据 pnpm 官网,有最后的斜线 */ {&NpmMirror, "https://registry.npmmirror.com", DelegateToMirror}, {&Huawei, "https://mirrors.huaweicloud.com/repository/npm/", - "https://mirrors.huaweicloud.com/repository/npm/" PL_Nodejs_Group_Speed_URL_Postfix}, + "https://mirrors.huaweicloud.com/repository/npm/" PL_JS_Group_Speed_URL_Postfix}, {&Tencent, "https://mirrors.cloud.tencent.com/npm/", - "https://mirrors.cloud.tencent.com/npm/" PL_Nodejs_Group_Speed_URL_Postfix}, + "https://mirrors.cloud.tencent.com/npm/" PL_JS_Group_Speed_URL_Postfix}, }; -def_sources_n(pl_nodejs_group); +def_sources_n(pl_js_group); #define PL_Nodejs_Binary_Speed_URL_Postfix "/v23.4.0/node-v23.4.0-linux-x64.tar.xz" -static SourceProvider_t pl_nodejs_binary_release_upstream = +static SourceProvider_t pl_js_binary_release_upstream = { def_upstream, "https://nodejs.org/", {NotSkip, NA, NA, "https://nodejs.org/dist/v23.4.0/node-v23.4.0.tar.gz", ACCURATE} // 100MB @@ -61,9 +61,9 @@ static SourceProvider_t pl_nodejs_binary_release_upstream = * @sync https://github.com/RubyMetric/chsrc/discussions/85 * */ -static Source_t pl_nodejs_binary_release_sources[] = +static Source_t pl_js_binary_release_sources[] = { - {&pl_nodejs_binary_release_upstream, "https://nodejs.org/dist/", DelegateToUpstream}, + {&pl_js_binary_release_upstream, "https://nodejs.org/dist/", DelegateToUpstream}, {&NpmMirror, "https://npmmirror.com/mirrors", "https://registry.npmmirror.com/-/binary/node/v23.4.0/node-v23.4.0.tar.gz"}, @@ -83,4 +83,4 @@ static Source_t pl_nodejs_binary_release_sources[] = {&Tencent, "https://mirrors.cloud.tencent.com/nodejs-release/", "https://mirrors.cloud.tencent.com/nodejs-release/" PL_Nodejs_Binary_Speed_URL_Postfix} }; -def_sources_n(pl_nodejs_binary_release); +def_sources_n(pl_js_binary_release); diff --git a/src/recipe/lang/Node.js/npm.c b/src/recipe/lang/JavaScript/npm.c similarity index 78% rename from src/recipe/lang/Node.js/npm.c rename to src/recipe/lang/JavaScript/npm.c index 97c087d..799ca45 100644 --- a/src/recipe/lang/Node.js/npm.c +++ b/src/recipe/lang/JavaScript/npm.c @@ -12,7 +12,7 @@ * chsrc get npm */ void -pl_nodejs_npm_getsrc (char *option) +pl_js_npm_getsrc (char *option) { chsrc_run ("npm config get registry", RunOpt_No_Last_New_Line); } @@ -24,9 +24,9 @@ pl_nodejs_npm_getsrc (char *option) * chsrc set npm */ void -pl_nodejs_npm_setsrc (char *option) +pl_js_npm_setsrc (char *option) { - chsrc_yield_source (pl_nodejs_group); + chsrc_yield_source (pl_js_group); if (chsrc_in_standalone_mode()) chsrc_confirm_source(); @@ -51,9 +51,9 @@ pl_nodejs_npm_setsrc (char *option) * chsrc reset npm */ void -pl_nodejs_npm_resetsrc (char *option) +pl_js_npm_resetsrc (char *option) { - pl_nodejs_npm_setsrc (option); + pl_js_npm_setsrc (option); } @@ -61,7 +61,7 @@ pl_nodejs_npm_resetsrc (char *option) * chsrc ls npm */ Feature_t -pl_nodejs_npm_feat (char *option) +pl_js_npm_feat (char *option) { Feature_t f = {0}; @@ -77,5 +77,5 @@ pl_nodejs_npm_feat (char *option) return f; } -// def_target_gsrf(pl_nodejs_npm); -Target_t pl_nodejs_npm_target = {def_target_inner_gsrf(pl_nodejs_npm),def_target_sourcesn(pl_nodejs_group)}; +// def_target_gsrf(pl_js_npm); +Target_t pl_js_npm_target = {def_target_inner_gsrf(pl_js_npm),def_target_sourcesn(pl_js_group)}; diff --git a/src/recipe/lang/Node.js/nvm.c b/src/recipe/lang/JavaScript/nvm.c similarity index 78% rename from src/recipe/lang/Node.js/nvm.c rename to src/recipe/lang/JavaScript/nvm.c index 5f0de63..c23d823 100644 --- a/src/recipe/lang/Node.js/nvm.c +++ b/src/recipe/lang/JavaScript/nvm.c @@ -12,7 +12,7 @@ * chsrc get nvm */ void -pl_nodejs_nvm_getsrc (char *option) +pl_js_nvm_getsrc (char *option) { chsrc_view_env ("NVM_NODEJS_ORG_MIRROR", NULL); } @@ -28,9 +28,9 @@ pl_nodejs_nvm_getsrc (char *option) * @note nvm does not support Fish */ void -pl_nodejs_nvm_setsrc (char *option) +pl_js_nvm_setsrc (char *option) { - chsrc_yield_source_and_confirm (pl_nodejs_binary_release); + chsrc_yield_source_and_confirm (pl_js_binary_release); char *w = xy_strjoin (3, "export NVM_NODEJS_ORG_MIRROR=", source.url, "\n"); @@ -51,9 +51,9 @@ pl_nodejs_nvm_setsrc (char *option) * chsrc reset nvm */ void -pl_nodejs_nvm_resetsrc (char *option) +pl_js_nvm_resetsrc (char *option) { - // pl_nodejs_nvm_setsrc (ChgType_Reset); + // pl_js_nvm_setsrc (ChgType_Reset); chsrc_error ("暂不支持对 nvm 重置"); exit (Exit_Unsupported); } @@ -63,7 +63,7 @@ pl_nodejs_nvm_resetsrc (char *option) * chsrc ls nvm */ Feature_t -pl_nodejs_nvm_feat (char *option) +pl_js_nvm_feat (char *option) { Feature_t f = {0}; @@ -79,5 +79,5 @@ pl_nodejs_nvm_feat (char *option) return f; } -// def_target_gsrf(pl_nodejs_nvm); -Target_t pl_nodejs_nvm_target = {def_target_inner_gsrf(pl_nodejs_nvm),def_target_sourcesn(pl_nodejs_binary_release)}; +// def_target_gsrf(pl_js_nvm); +Target_t pl_js_nvm_target = {def_target_inner_gsrf(pl_js_nvm),def_target_sourcesn(pl_js_binary_release)}; diff --git a/src/recipe/lang/Node.js/pnpm.c b/src/recipe/lang/JavaScript/pnpm.c similarity index 79% rename from src/recipe/lang/Node.js/pnpm.c rename to src/recipe/lang/JavaScript/pnpm.c index 6571ba3..47d5263 100644 --- a/src/recipe/lang/Node.js/pnpm.c +++ b/src/recipe/lang/JavaScript/pnpm.c @@ -12,7 +12,7 @@ * chsrc get pnpm */ void -pl_nodejs_pnpm_getsrc (char *option) +pl_js_pnpm_getsrc (char *option) { chsrc_run ("pnpm config get registry", RunOpt_No_Last_New_Line); } @@ -25,9 +25,9 @@ pl_nodejs_pnpm_getsrc (char *option) * chsrc set pnpm */ void -pl_nodejs_pnpm_setsrc (char *option) +pl_js_pnpm_setsrc (char *option) { - chsrc_yield_source (pl_nodejs_group); + chsrc_yield_source (pl_js_group); if (chsrc_in_standalone_mode()) chsrc_confirm_source(); @@ -52,9 +52,9 @@ pl_nodejs_pnpm_setsrc (char *option) * chsrc reset pnpm */ void -pl_nodejs_pnpm_resetsrc (char *option) +pl_js_pnpm_resetsrc (char *option) { - pl_nodejs_pnpm_setsrc (option); + pl_js_pnpm_setsrc (option); } @@ -62,7 +62,7 @@ pl_nodejs_pnpm_resetsrc (char *option) * chsrc ls pnpm */ Feature_t -pl_nodejs_pnpm_feat (char *option) +pl_js_pnpm_feat (char *option) { Feature_t f = {0}; @@ -79,5 +79,5 @@ 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_group)}; +// def_target_gsrf(pl_js_pnpm); +Target_t pl_js_pnpm_target = {def_target_inner_gsrf(pl_js_pnpm),def_target_sourcesn(pl_js_group)}; diff --git a/src/recipe/lang/rawstr4c.h b/src/recipe/lang/rawstr4c.h index 4c363ba..5e7c6b0 100644 --- a/src/recipe/lang/rawstr4c.h +++ b/src/recipe/lang/rawstr4c.h @@ -4,7 +4,7 @@ * Generated by rawstr4c v1.0.0-2025/08/09 */ -char RAWSTR_pl_nodejs_bun_config[] = "\133\151\156\163\164\141\154\154\135\012\162\145\147\151\163\164\162\171\040\075\040\042\100\165\162\154\100\042"; +char RAWSTR_pl_js_bun_config[] = "\133\151\156\163\164\141\154\154\135\012\162\145\147\151\163\164\162\171\040\075\040\042\100\165\162\154\100\042"; char RAWSTR_pl_java_maven_config[] = "\074\155\151\162\162\157\162\076\012\040\040\040\040\074\151\144\076\100\061\100\074\057\151\144\076\012\040\040\040\040\074\155\151\162\162\157\162\117\146\076\052\074\057\155\151\162\162\157\162\117\146\076\012\040\040\040\040\074\156\141\155\145\076\100\156\141\155\145\100\074\057\156\141\155\145\076\012\040\040\040\040\074\165\162\154\076\100\165\162\154\100\074\057\165\162\154\076\012\074\057\155\151\162\162\157\162\076"; diff --git a/src/recipe/menu.c b/src/recipe/menu.c index 6f42bd3..b87d6ad 100644 --- a/src/recipe/menu.c +++ b/src/recipe/menu.c @@ -19,12 +19,12 @@ chsrc_pl_menu[] = {&pl_python_pdm_target, NULL, "pdm"}, {&pl_python_rye_target, NULL, "rye"}, {&pl_python_uv_target, NULL, "uv"}, - {&pl_nodejs_group_target, NULL, "node nodejs"}, - {&pl_nodejs_bun_target, NULL, "bun"}, - {&pl_nodejs_npm_target, NULL, "npm"}, - {&pl_nodejs_yarn_target, NULL, "yarn"}, - {&pl_nodejs_pnpm_target, NULL, "pnpm"}, - {&pl_nodejs_nvm_target, NULL, "nvm"}, + {&pl_js_group_target, NULL, "node nodejs"}, + {&pl_js_bun_target, NULL, "bun"}, + {&pl_js_npm_target, NULL, "npm"}, + {&pl_js_yarn_target, NULL, "yarn"}, + {&pl_js_pnpm_target, NULL, "pnpm"}, + {&pl_js_nvm_target, NULL, "nvm"}, {&pl_perl_target, NULL, "perl cpan"}, {&pl_php_target, NULL, "php composer"}, {&pl_lua_target, NULL, "lua luarocks"},