@flun/nodejs-mobile-gyp 1.2.2 → 1.2.3

package/lib/create-config-gypi.js

@@ -1,109 +1,120 @@
 import gracefulFs from 'graceful-fs';
-import * as log from './log.js';
 import path from 'path';
+import * as log from './log.js';
 
-const fs = gracefulFs.promises,
-  /**
-   * 解析 config.gypi 内容为 JSON 对象
-   * 逻辑翻译自 Node.js 的 tools/js2c.py
-   */
-  parseConfigGypi = config => {
-    // 去掉 # 注释,拼接多行字符串,把单引号字符串归一化为双引号
-    config = config.replace(/#.*/g, ''), config = config.replace(/'$\s+'/mg, ''), config = config.replace(/'/g, '"');
-    return JSON.parse(config);
-  },
-  /**
-   * 读取基础 config.gypi
-   */
-  getBaseConfigGypi = async ({ gyp, nodeDir }) => {
-    // 在以下情况优先读取 $nodeDir/include/node/config.gypi:
-    // 1. 指定了 --dist-url 或 --nodedir
-    // 2. 且没有指定 --force-process-config
-    const useCustomHeaders = gyp.opts.nodedir || gyp.opts.disturl || gyp.opts['dist-url'],
-      shouldReadConfigGypi = useCustomHeaders && !gyp.opts['force-process-config'];
-    if (shouldReadConfigGypi && nodeDir) {
-      try {
-        const baseConfigGypi = await fs.readFile(path.resolve(nodeDir, 'include/node/config.gypi'));
-        return parseConfigGypi(baseConfigGypi.toString());
-      } catch (err) { log.warn('读取 config.gypi', err.message) }
-    }
+const fs = gracefulFs.promises;
+/**
+ * 解析 config.gypi 内容为 JSON 对象,逻辑翻译自 Node.js 的 tools/js2c.py
+ * >查看定义:@see {@link parseConfigGypi}
+ * @param {string} config config.gypi 文本内容
+ * @returns {object} 解析后的配置对象
+ */
+const parseConfigGypi = config => {
+  // 去掉 # 注释,拼接多行字符串,把单引号字符串归一化为双引号
+  config = config.replace(/#.*/g, ''), config = config.replace(/'$\s+'/mg, ''), config = config.replace(/'/g, '"');
+  return JSON.parse(config);
+};
 
-    return JSON.parse(JSON.stringify(process.config)); // 回退到 process.config
-  },
+/**
+ * 读取基础 config.gypi
+ * @param {object} options 含 gyp、nodeDir 的对象
+ * @returns {Promise<object>} 基础配置对象
+ */
+const getBaseConfigGypi = async ({ gyp, nodeDir }) => {
+  // 在以下情况优先读取 $nodeDir/include/node/config.gypi:
+  // 1. 指定了 --dist-url 或 --nodedir
+  // 2. 且没有指定 --force-process-config
+  const useCustomHeaders = gyp.opts.nodedir || gyp.opts.disturl || gyp.opts['dist-url'],
+    shouldReadConfigGypi = useCustomHeaders && !gyp.opts['force-process-config'];
+  if (shouldReadConfigGypi && nodeDir) {
+    try {
+      const baseConfigGypi = await fs.readFile(path.resolve(nodeDir, 'include/node/config.gypi'));
+      return parseConfigGypi(baseConfigGypi.toString());
+    } catch (err) { log.warn('读取 config.gypi', err.message) }
+  }
 
-  /**
-   * 基于当前环境生成 config.gypi 内容
-   */
-  getCurrentConfigGypi = async ({ gyp, nodeDir, vsInfo, python }) => {
-    const config = await getBaseConfigGypi({ gyp, nodeDir });
-    if (!config.target_defaults) config.target_defaults = {};
-    if (!config.variables) config.variables = {};
+  return JSON.parse(JSON.stringify(process.config)); // 回退到 process.config
+};
 
-    const defaults = config.target_defaults, variables = config.variables;
-    // 不要继承 base config.gypi 的 defaults,
-    // 否则当 node 可执行文件在另一台机器编译(lib/include 路径不同)时会出问题
-    defaults.cflags = [], defaults.defines = [], defaults.include_dirs = [], defaults.libraries = [];
+/**
+ * 基于当前环境生成 config.gypi 内容
+ * >查看定义:@see {@link getCurrentConfigGypi}
+ * @param {object} options 含 gyp、nodeDir、vsInfo、python 的对象
+ * @returns {Promise<object>} 生成的配置对象
+ */
+const getCurrentConfigGypi = async ({ gyp, nodeDir, vsInfo, python }) => {
+  const config = await getBaseConfigGypi({ gyp, nodeDir });
+  if (!config.target_defaults) config.target_defaults = {};
+  if (!config.variables) config.variables = {};
 
-    // 设置 default_configuration
-    if ('debug' in gyp.opts) defaults.default_configuration = gyp.opts.debug ? 'Debug' : 'Release'
-    if (!defaults.default_configuration) defaults.default_configuration = 'Release';
+  const defaults = config.target_defaults, variables = config.variables;
+  // 不要继承 base config.gypi 的 defaults,
+  // 否则当 node 可执行文件在另一台机器编译(lib/include 路径不同)时会出问题
+  defaults.cflags = [], defaults.defines = [], defaults.include_dirs = [], defaults.libraries = [];
 
-    // 设置 target_arch
-    variables.target_arch = gyp.opts.arch || process.arch || 'ia32';
-    if (variables.target_arch === 'arm64')
-      defaults.msvs_configuration_platform = 'ARM64', defaults.xcode_configuration_platform = 'arm64';
+  // 设置 default_configuration
+  if ('debug' in gyp.opts) defaults.default_configuration = gyp.opts.debug ? 'Debug' : 'Release'
+  if (!defaults.default_configuration) defaults.default_configuration = 'Release';
 
-    // 设置 Node 开发目录和 Python 路径,默认禁用 -T "thin" 静态归档
-    variables.nodedir = nodeDir, variables.python = python;
-    variables.standalone_static_library = gyp.opts.thin ? 0 : 1;
+  // 设置 target_arch
+  variables.target_arch = gyp.opts.arch || process.arch || 'ia32';
+  if (variables.target_arch === 'arm64')
+    defaults.msvs_configuration_platform = 'ARM64', defaults.xcode_configuration_platform = 'arm64';
 
-    if (process.platform === 'win32') {
-      defaults.msbuild_toolset = vsInfo.toolset;
-      if (vsInfo.sdk) defaults.msvs_windows_target_platform_version = vsInfo.sdk;
-      if (variables.target_arch === 'arm64') {
-        if (vsInfo.versionMajor > 15 || (vsInfo.versionMajor === 15 && vsInfo.versionMajor >= 9))
-          defaults.msvs_enable_marmasm = 1;
-        else log.warn('仅 Visual Studio 2017 15.9 及以上版本支持编译 ARM64 汇编');
-      }
-      variables.msbuild_path = vsInfo.msBuild;
-      // Windows 原生构建走 MSVC 工具集:必须关闭 clang 与 LTO,
-      // 否则 common.gypi 会把 toolset 设为 ClangCL,并向 MSVC 链接器传入 Clang 专用参数
-      // (-flto=thin、/opt:lldltojobs),导致 MSB8020 或 LNK1117
-      if (!gyp.opts.format || gyp.opts.format === 'msvs')
-        variables.clang = 0, variables.enable_lto = 'false', variables.enable_thin_lto = 'false', variables.lto_jobs = '';
-    }
+  // 设置 Node 开发目录和 Python 路径,默认禁用 -T "thin" 静态归档
+  variables.nodedir = nodeDir, variables.python = python;
+  variables.standalone_static_library = gyp.opts.thin ? 0 : 1;
 
-    // 把其余未知选项当作变量写入,支持模块自定义 configure 参数,例如:
-    //   $ node-gyp configure --shared-libxml2
-    for (const [k, v] of Object.entries(gyp.opts)) {
-      if (k === 'argv' || k in gyp.configDefs) continue;
-      variables[k.replace(/-/g, '_')] = v;
+  if (process.platform === 'win32') {
+    defaults.msbuild_toolset = vsInfo.toolset;
+    if (vsInfo.sdk) defaults.msvs_windows_target_platform_version = vsInfo.sdk;
+    if (variables.target_arch === 'arm64') {
+      if (vsInfo.versionMajor > 15 || (vsInfo.versionMajor === 15 && vsInfo.versionMajor >= 9))
+        defaults.msvs_enable_marmasm = 1;
+      else log.warn('仅 Visual Studio 2017 15.9 及以上版本支持编译 ARM64 汇编');
     }
+    variables.msbuild_path = vsInfo.msBuild;
+    // Windows 原生构建走 MSVC 工具集:必须关闭 clang 与 LTO,
+    // 否则 common.gypi 会把 toolset 设为 ClangCL,并向 MSVC 链接器传入 Clang 专用参数
+    // (-flto=thin、/opt:lldltojobs),导致 MSB8020 或 LNK1117
+    if (!gyp.opts.format || gyp.opts.format === 'msvs')
+      variables.clang = 0, variables.enable_lto = 'false', variables.enable_thin_lto = 'false', variables.lto_jobs = '';
+  }
+
+  // 把其余未知选项当作变量写入,支持模块自定义 configure 参数,例如:
+  //   $ node-gyp configure --shared-libxml2
+  for (const [k, v] of Object.entries(gyp.opts)) {
+    if (k === 'argv' || k in gyp.configDefs) continue;
+    variables[k.replace(/-/g, '_')] = v;
+  }
 
-    return config;
-  },
+  return config;
+};
 
-  /**
-   * 生成并写出 config.gypi 文件
-   */
-  createConfigGypi = async ({ gyp, buildDir, nodeDir, vsInfo, python }) => {
-    const configFilename = 'config.gypi', configPath = path.resolve(buildDir, configFilename);
+/**
+ * 生成并写出 config.gypi 文件
+ * >查看定义:@see {@link createConfigGypi}
+ * @param {object} options 含 gyp、buildDir、nodeDir、vsInfo、python 的对象
+ * @returns {Promise<string>} 生成的 config.gypi 路径
+ */
+const createConfigGypi = async ({ gyp, buildDir, nodeDir, vsInfo, python }) => {
+  const configFilename = 'config.gypi', configPath = path.resolve(buildDir, configFilename);
 
-    log.verbose('build/' + configFilename, '正在创建配置文件');
-    const config = await getCurrentConfigGypi({ gyp, nodeDir, vsInfo, python }),
-      // 保证 config.gypi 中的布尔值都转成字符串
-      boolsToString = (k, v) => {
-        if (typeof v === 'boolean') return String(v);
-        return v;
-      };
+  log.verbose('build/' + configFilename, '正在创建配置文件');
+  const config = await getCurrentConfigGypi({ gyp, nodeDir, vsInfo, python }),
+    // 保证 config.gypi 中的布尔值都转成字符串
+    boolsToString = (k, v) => {
+      if (typeof v === 'boolean') return String(v);
+      return v;
+    };
 
-    log.silly('build/' + configFilename, config);
-    // 把 config.gypi 写入 build/ 目录
-    const prefix = '# Do not edit. File was generated by node-gyp\'s "configure" step',
-      json = JSON.stringify(config, boolsToString, 2);
-    log.verbose('build/' + configFilename, '正在写出配置文件: %s', configPath);
-    await fs.writeFile(configPath, [prefix, json, ''].join('\n'));
-    return configPath;
-  };
+  log.silly('build/' + configFilename, config);
+  // 把 config.gypi 写入 build/ 目录
+  const prefix = '# Do not edit. File was generated by node-gyp\'s "configure" step',
+    json = JSON.stringify(config, boolsToString, 2);
+  log.verbose('build/' + configFilename, '正在写出配置文件: %s', configPath);
+  await fs.writeFile(configPath, [prefix, json, ''].join('\n'));
+  return configPath;
+};
 
-export { createConfigGypi, parseConfigGypi, getCurrentConfigGypi }
+export { createConfigGypi, getCurrentConfigGypi, parseConfigGypi };

package/lib/download.js

@@ -2,30 +2,38 @@ import fetch from 'make-fetch-happen';
 import gracefulFs from 'graceful-fs';
 import * as log from './log.js';
 
-const { promises: fs } = gracefulFs,
-  /**
-   * 读取 CA 证书文件,按证书边界切分为多个证书
-   */
-  readCAFile = async filename => {
-    // CA 文件可能包含多份证书,按证书边界切分; [\S\s]*? 用于匹配包括换行在内的所有内容;
-    const ca = await fs.readFile(filename, 'utf8'), re = /(-----BEGIN CERTIFICATE-----[\S\s]*?-----END CERTIFICATE-----)/g;
-    return ca.match(re);
-  },
-  /**
-   * 使用 make-fetch-happen 下载指定 URL
-   */
-  download = async (gyp, url) => {
-    log.http('GET', url);
+const { promises: fs } = gracefulFs;
+/**
+ * 读取 CA 证书文件,按证书边界切分为多个证书
+ * >查看定义:@see {@link readCAFile}
+ * @param {string} filename CA 文件路径
+ * @returns {Promise<string[]>} 证书字符串数组
+ */
+const readCAFile = async filename => {
+  // CA 文件可能包含多份证书,按证书边界切分; [\S\s]*? 用于匹配包括换行在内的所有内容;
+  const ca = await fs.readFile(filename, 'utf8'), re = /(-----BEGIN CERTIFICATE-----[\S\s]*?-----END CERTIFICATE-----)/g;
+  return ca.match(re);
+};
 
-    const requestOpts = {
-      headers: { 'User-Agent': `node-gyp v${gyp.version} (node ${process.version})`, Connection: 'keep-alive' },
-      proxy: gyp.opts.proxy, noProxy: gyp.opts.noproxy
-    }, cafile = gyp.opts.cafile;
+/**
+ * 使用 make-fetch-happen 下载指定 URL
+ * >查看定义:@see {@link download}
+ * @param {object} gyp gyp 实例
+ * @param {string} url 下载地址
+ * @returns {Promise<object>} fetch 响应对象
+ */
+const download = async (gyp, url) => {
+  log.http('GET', url);
 
-    if (cafile) requestOpts.ca = await readCAFile(cafile);
-    const res = await fetch(url, requestOpts);
-    log.http(res.status, res.url);
-    return res;
-  }
+  const requestOpts = {
+    headers: { 'User-Agent': `node-gyp v${gyp.version} (node ${process.version})`, Connection: 'keep-alive' },
+    proxy: gyp.opts.proxy, noProxy: gyp.opts.noproxy
+  }, cafile = gyp.opts.cafile;
 
-export { readCAFile, download }
+  if (cafile) requestOpts.ca = await readCAFile(cafile);
+  const res = await fetch(url, requestOpts);
+  log.http(res.status, res.url);
+  return res;
+};
+
+export { download, readCAFile };

package/lib/find-node-directory.js

@@ -2,44 +2,46 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import * as log from './log.js';
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url)),
-  /**
-   * 从脚本位置或进程对象推断 Node 根目录
-   */
-  findNodeDirectory = (scriptLocation, processObj) => {
-    // 未传入时使用默认值,便于回归测试
-    if (scriptLocation === undefined) scriptLocation = __dirname;
-    if (processObj === undefined) processObj = process;
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+/**
+ * 定位 Node.js 源码目录
+ * >查看定义:@see {@link findNodeDirectory}
+ * @returns {string} 目录路径
+ */
+const findNodeDirectory = (scriptLocation, processObj) => {
+  // 未传入时使用默认值,便于回归测试
+  if (scriptLocation === undefined) scriptLocation = __dirname;
+  if (processObj === undefined) processObj = process;
 
-    // 看看上层目录结构,判断当前所处位置
-    const npmParentDirectory = path.join(scriptLocation, '../../../..');
-    log.verbose('nodejs-mobile-gyp 根目录', 'npm 上级目录为 ' + path.basename(npmParentDirectory));
-    log.verbose('nodejs-mobile-gyp 根目录', '正在查找 node 根目录');
-    let nodeRootDir = '';
-    if (path.basename(npmParentDirectory) === 'deps') {
-      // 处于构建目录中,脚本位于 deps/npm/node_modules/node-gyp/lib
-      nodeRootDir = path.join(npmParentDirectory, '..');
-      log.verbose('nodejs-mobile-gyp 根目录', '在构建目录中,根目录 = ' + nodeRootDir);
-    } else if (path.basename(npmParentDirectory) === 'node_modules') {
-      // 处于 Node 安装目录中,脚本位于
-      // lib/node_modules/npm/node_modules/node-gyp/lib 或
-      // node_modules/npm/node_modules/node-gyp/lib(视平台而定)
-      if (processObj.platform === 'win32') nodeRootDir = path.join(npmParentDirectory, '..');
-      else nodeRootDir = path.join(npmParentDirectory, '../..');
-      log.verbose('nodejs-mobile-gyp 根目录', '在安装目录中,根目录 = ' + nodeRootDir);
-    } else {
-      // 无法判断,尝试从 node 可执行文件的位置推断
-      const nodeDir = path.dirname(processObj.execPath), directoryUp = path.basename(nodeDir);
-      if (directoryUp === 'bin') nodeRootDir = path.join(nodeDir, '..');
-      else if (directoryUp === 'Release' || directoryUp === 'Debug') {
-        // 如果是刚构建的 node,且目录结构为仓库结构:
-        // Windows 只需上一层,其余平台两层
-        if (processObj.platform === 'win32') nodeRootDir = path.join(nodeDir, '..');
-        else nodeRootDir = path.join(nodeDir, '../..');
-      }
-      // 否则返回默认空串 ""
+  // 看看上层目录结构,判断当前所处位置
+  const npmParentDirectory = path.join(scriptLocation, '../../../..');
+  log.verbose('nodejs-mobile-gyp 根目录', 'npm 上级目录为 ' + path.basename(npmParentDirectory));
+  log.verbose('nodejs-mobile-gyp 根目录', '正在查找 node 根目录');
+  let nodeRootDir = '';
+  if (path.basename(npmParentDirectory) === 'deps') {
+    // 处于构建目录中,脚本位于 deps/npm/node_modules/node-gyp/lib
+    nodeRootDir = path.join(npmParentDirectory, '..');
+    log.verbose('nodejs-mobile-gyp 根目录', '在构建目录中,根目录 = ' + nodeRootDir);
+  } else if (path.basename(npmParentDirectory) === 'node_modules') {
+    // 处于 Node 安装目录中,脚本位于
+    // lib/node_modules/npm/node_modules/node-gyp/lib 或
+    // node_modules/npm/node_modules/node-gyp/lib(视平台而定)
+    if (processObj.platform === 'win32') nodeRootDir = path.join(npmParentDirectory, '..');
+    else nodeRootDir = path.join(npmParentDirectory, '../..');
+    log.verbose('nodejs-mobile-gyp 根目录', '在安装目录中,根目录 = ' + nodeRootDir);
+  } else {
+    // 无法判断,尝试从 node 可执行文件的位置推断
+    const nodeDir = path.dirname(processObj.execPath), directoryUp = path.basename(nodeDir);
+    if (directoryUp === 'bin') nodeRootDir = path.join(nodeDir, '..');
+    else if (directoryUp === 'Release' || directoryUp === 'Debug') {
+      // 如果是刚构建的 node,且目录结构为仓库结构:
+      // Windows 只需上一层,其余平台两层
+      if (processObj.platform === 'win32') nodeRootDir = path.join(nodeDir, '..');
+      else nodeRootDir = path.join(nodeDir, '../..');
     }
-    return nodeRootDir;
+    // 否则返回默认空串 ""
   }
+  return nodeRootDir;
+};
 
-export { findNodeDirectory }
+export { findNodeDirectory };

package/lib/find-python.js

@@ -1,8 +1,8 @@
-import * as log from './log.js';
+import fs from 'fs';
+import os from 'os';
 import semver from 'semver';
+import * as log from './log.js';
 import { execFile } from './util.js';
-import os from 'os';
-import fs from 'fs';
 
 const win = process.platform === 'win32',
   /**
@@ -47,6 +47,7 @@ const win = process.platform === 'win32',
 
 /**
  * Python 查找器:按顺序尝试多种途径定位可用的 Python 3.6+
+ * >查看定义:@see {@link PythonFinder}
  */
 class PythonFinder {
   static findPython = (...args) => new PythonFinder(...args).findPython();
@@ -62,15 +63,10 @@ class PythonFinder {
   pyLauncher = 'py.exe';
   winDefaultLocations = win ? scanWindowsPythonLocations() : [];
 
-  constructor(configPython) {
-    this.configPython = configPython, this.errorLog = [];
-  }
+  constructor(configPython) { this.configPython = configPython, this.errorLog = []; }
 
   // 以 verbose 级别记录日志,同时保存下来,出错时以 error 级别展示,便于诊断
-  addLog(message) {
-    this.log.verbose(message), this.errorLog.push(message);
-  }
-
+  addLog(message) { this.log.verbose(message), this.errorLog.push(message); }
   // 依次尝试多种 Python 定位方式;忽略错误,直到找到可用版本
   async findPython() {
     const SKIP = 0, FAIL = 1,
@@ -102,8 +98,7 @@ class PythonFinder {
               }
               this.addLog('检查是否从环境变量 PYTHON 显式指定 Python');
               this.addLog(`- process.env.PYTHON 为 "${this.env.PYTHON}"`);
-            },
-            check: () => this.checkCommand(this.env.PYTHON)
+            }, check: () => this.checkCommand(this.env.PYTHON)
           }
         ];
 
@@ -114,29 +109,19 @@ class PythonFinder {
               check: () => this.checkPyLauncher(launcher)
             });
           }
-          checks.push({
-            before: () => this.addLog('通过 "py -0p" 枚举已安装的 Python'),
-            check: () => this.checkPyList()
-          });
+          checks.push({ before: () => this.addLog('通过 "py -0p" 枚举已安装的 Python'), check: () => this.checkPyList() });
         }
 
         checks.push(...[
-          {
-            before: () => { this.addLog('检查能否使用 "python3"'); },
-            check: () => this.checkCommand('python3')
-          },
-          {
-            before: () => { this.addLog('检查能否使用 "python"'); },
-            check: () => this.checkCommand('python')
-          }
+          { before: () => { this.addLog('检查能否使用 "python3"'); }, check: () => this.checkCommand('python3') },
+          { before: () => { this.addLog('检查能否使用 "python"'); }, check: () => this.checkCommand('python') }
         ]);
 
         if (this.win) {
           for (let i = 0; i < this.winDefaultLocations.length; ++i) {
             const location = this.winDefaultLocations[i];
             checks.push({
-              before: () => this.addLog(`检查 Python 是否位于 ${location}`),
-              check: () => this.checkExecPath(location)
+              before: () => this.addLog(`检查 Python 是否位于 ${location}`), check: () => this.checkExecPath(location)
             });
           }
         }
@@ -190,8 +175,7 @@ class PythonFinder {
     let lastErr;
     for (const launcher of pyLauncherCandidates) {
       try {
-        const stdout = await this.run(launcher, ['-0p'], false);
-        const paths = [];
+        const stdout = await this.run(launcher, ['-0p'], false), paths = [];
         for (const line of stdout.split(/\r?\n/)) {
           const m = line.match(/([A-Za-z]:\\[^\s]+)/);
           if (m && /python\.exe$/i.test(m[1])) paths.push(m[1]);
@@ -201,13 +185,11 @@ class PythonFinder {
           try {
             return await this.checkExecPath(p);
           } catch (err) {
-            lastErr = err;
-            this.log.silly('checkPyList: 跳过 %s: %s', p, err.message);
+            lastErr = err, this.log.silly('checkPyList: 跳过 %s: %s', p, err.message);
           }
         }
       } catch (err) {
-        lastErr = err;
-        this.addLog(`- 经 "${launcher}" 执行 "py -0p" 失败`);
+        lastErr = err, this.addLog(`- 经 "${launcher}" 执行 "py -0p" 失败`);
       }
     }
     throw lastErr || new Error('py -0p 未返回可用的 Python');
@@ -226,13 +208,11 @@ class PythonFinder {
         valid = range.test(version);
       } catch (err) {
         this.log.silly('range.test() threw:\n%s', err.stack);
-        this.addLog(`- "${execPath}" 的版本无效`);
-        this.addLog('- 它是不是 Python 可执行文件?');
+        this.addLog(`- "${execPath}" 的版本无效`), this.addLog('- 它是不是 Python 可执行文件?');
         throw err;
       }
       if (!valid) {
-        this.addLog(`- 版本为 ${version},应为 ${this.semverRange}`);
-        this.addLog('- 此版本的 Python 不受支持');
+        this.addLog(`- 版本为 ${version},应为 ${this.semverRange}`), this.addLog('- 此版本的 Python 不受支持');
         throw new Error(`不支持的 Python 版本 ${version}`);
       }
       return this.succeed(execPath, version);
@@ -286,4 +266,4 @@ class PythonFinder {
   }
 }
 
-export { PythonFinder }
+export { PythonFinder };

package/lib/find-visualstudio.js

@@ -1,12 +1,13 @@
-import * as log from './log.js';
 import { existsSync } from 'fs';
 import nodePath from 'path';
 import { fileURLToPath } from 'url';
-import { regSearchKeys, execFile } from './util.js';
+import * as log from './log.js';
+import { execFile, regSearchKeys } from './util.js';
 
 const path = nodePath.win32, __dirname = nodePath.dirname(fileURLToPath(import.meta.url));
 /**
  * Visual Studio 查找器:定位可用的 VS 安装
+ * >查看定义:@see {@link VisualStudioFinder}
  */
 class VisualStudioFinder {
   static findVisualStudio = (...args) => new VisualStudioFinder(...args).findVisualStudio();
@@ -38,8 +39,7 @@ class VisualStudioFinder {
 
     if (process.env.VCINSTALLDIR) {
       this.envVcInstallDir = path.resolve(process.env.VCINSTALLDIR, '..');
-      this.addLog('运行在 VS 命令提示符中,安装路径为:\n' +
-        `"${this.envVcInstallDir}"\n- will only use this version`);
+      this.addLog('运行在 VS 命令提示符中,安装路径为:\n' + `"${this.envVcInstallDir}"\n- will only use this version`);
     }
     else this.addLog('未设置 VCINSTALLDIR,不在 VS 命令提示符中运行');
 
@@ -63,8 +63,7 @@ class VisualStudioFinder {
 
   fail() {
     if (this.configMsvsVersion && this.envVcInstallDir)
-      this.errorLog.push(
-        'msvs_version 与当前 VS 命令提示符不匹配,或该安装不可用');
+      this.errorLog.push('msvs_version 与当前 VS 命令提示符不匹配,或该安装不可用');
     else if (this.configMsvsVersion) {
       // 指定了 msvs_version 但没找到 VS,输出可接受的版本
       this.errorLog.push('');
@@ -107,8 +106,7 @@ class VisualStudioFinder {
     this.log.silly('PS 标准错误 = %j', stderr)
 
     const failPowershell = () => {
-      this.addLog(`无法用 PowerShell 找到 Visual Studio 2017 或更新版本,
-         可加 '--loglevel silly' 重新运行以获取更多细节`);
+      this.addLog(`无法用 PowerShell 找到 Visual Studio 2017 或更新版本,可加 '--loglevel silly' 重新运行以获取更多细节`);
       return null;
     }
 
@@ -158,22 +156,16 @@ class VisualStudioFinder {
 
       if (info.msBuild) this.addLog('- 找到 "Visual Studio C++ 核心功能"');
       else {
-        this.addLog('- 缺少 "Visual Studio C++ 核心功能"');
-        continue;
+        this.addLog('- 缺少 "Visual Studio C++ 核心功能"'); continue;
       }
-
       if (info.toolset) this.addLog(`- 找到 VC++ 工具集: ${info.toolset}`);
       else {
-        this.addLog('- 缺少任何 VC++ 工具集');
-        continue;
+        this.addLog('- 缺少任何 VC++ 工具集'); continue;
       }
-
       if (info.sdk) this.addLog(`- 找到 Windows SDK: ${info.sdk}`);
       else {
-        this.addLog('- 缺少任何 Windows SDK');
-        continue;
+        this.addLog('- 缺少任何 Windows SDK'); continue;
       }
-
       if (!this.checkConfigVersion(info.versionYear, info.path)) continue;
       return info
     }
@@ -346,4 +338,4 @@ class VisualStudioFinder {
   }
 }
 
-export { VisualStudioFinder }
+export { VisualStudioFinder };