@kevlns/xlmerge 2.0.5 → 2.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS.md +25 -25
- package/LICENSE +21 -21
- package/README.md +113 -111
- package/bin/xlmerge.js +152 -152
- package/package.json +2 -2
- package/python/xlsx_merge_engine/__init__.py +2 -2
- package/python/xlsx_merge_engine/xlsx_git_merge_bridge.py +1614 -1614
- package/python/xlsx_resolver/__init__.py +2 -2
- package/python/xlsx_resolver/__main__.py +4 -4
- package/python/xlsx_resolver/formula_values.py +677 -677
- package/python/xlsx_resolver/merge_ui.html +1635 -1635
- package/python/xlsx_resolver/recalculate_workbook.ps1 +140 -140
- package/python/xlsx_resolver/xlsx_conflict.py +2381 -2381
- package/skills/xlmerge/SKILL.md +8 -8
- package/skills/xlmerge/references/project.md +59 -171
- package/v-cli.plugin.json +305 -305
package/AGENTS.md
CHANGED
|
@@ -1,25 +1,25 @@
|
|
|
1
|
-
# Vant 表格合并开发规范
|
|
2
|
-
|
|
3
|
-
## 定位
|
|
4
|
-
|
|
5
|
-
本文件仅指导维护 xlmerge 仓库。运行时技能正本为 skills/xlmerge/SKILL.md;命令机器契约为 v-cli.plugin.json。
|
|
6
|
-
|
|
7
|
-
## 调用流程
|
|
8
|
-
|
|
9
|
-
修改前读取相关源文件与 package.json 中的检查命令,保留已有工作区改动。
|
|
10
|
-
|
|
11
|
-
## 调用规范
|
|
12
|
-
|
|
13
|
-
技能正文与 references 独立维护,不从本文件生成运行规范。修改命令时同步机器清单及生成的命令文档。宿主配置和状态使用 VANT_HOME(默认 ~/.vant),项目数据保留在工程 .vant;安装不扫描其他 Agent 目录。外部宿主仅显式适配。
|
|
14
|
-
|
|
15
|
-
## 结果验证
|
|
16
|
-
|
|
17
|
-
运行 package.json 中与改动相关的检查;区分单测、真实后端、界面和安装验证。不得将模拟结果报告为真实生图或发布成功。
|
|
18
|
-
|
|
19
|
-
## 参考资料
|
|
20
|
-
|
|
21
|
-
[使用说明](README.md) · [运行技能](skills/xlmerge/SKILL.md)
|
|
22
|
-
|
|
23
|
-
## 许可与版权
|
|
24
|
-
|
|
25
|
-
MIT。Copyright © 2026 Vant。
|
|
1
|
+
# Vant 表格合并开发规范
|
|
2
|
+
|
|
3
|
+
## 定位
|
|
4
|
+
|
|
5
|
+
本文件仅指导维护 xlmerge 仓库。运行时技能正本为 skills/xlmerge/SKILL.md;命令机器契约为 v-cli.plugin.json。
|
|
6
|
+
|
|
7
|
+
## 调用流程
|
|
8
|
+
|
|
9
|
+
修改前读取相关源文件与 package.json 中的检查命令,保留已有工作区改动。
|
|
10
|
+
|
|
11
|
+
## 调用规范
|
|
12
|
+
|
|
13
|
+
技能正文与 references 独立维护,不从本文件生成运行规范。修改命令时同步机器清单及生成的命令文档。宿主配置和状态使用 VANT_HOME(默认 ~/.vant),项目数据保留在工程 .vant;安装不扫描其他 Agent 目录。外部宿主仅显式适配。
|
|
14
|
+
|
|
15
|
+
## 结果验证
|
|
16
|
+
|
|
17
|
+
运行 package.json 中与改动相关的检查;区分单测、真实后端、界面和安装验证。不得将模拟结果报告为真实生图或发布成功。
|
|
18
|
+
|
|
19
|
+
## 参考资料
|
|
20
|
+
|
|
21
|
+
[使用说明](README.md) · [运行技能](skills/xlmerge/SKILL.md)
|
|
22
|
+
|
|
23
|
+
## 许可与版权
|
|
24
|
+
|
|
25
|
+
MIT。Copyright © 2026 Vant。
|
package/LICENSE
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
MIT License
|
|
2
|
-
|
|
3
|
-
Copyright © 2026 Vant
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright © 2026 Vant
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -1,111 +1,113 @@
|
|
|
1
|
-
# Vant 表格合并工具
|
|
2
|
-
|
|
3
|
-
`@kevlns/xlmerge`
|
|
4
|
-
|
|
5
|
-
## 功能
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
## 环境要求
|
|
10
|
-
|
|
11
|
-
Node.js 16 及以上、Python 3.9 及以上;包含公式的工作簿需要 Windows 桌面版 Excel 生成可靠的计算快照。
|
|
12
|
-
|
|
13
|
-
## 安装
|
|
14
|
-
|
|
15
|
-
```sh
|
|
16
|
-
npm install -g @kevlns/xlmerge
|
|
17
|
-
```
|
|
18
|
-
|
|
19
|
-
## 快速开始
|
|
20
|
-
|
|
21
|
-
```sh
|
|
22
|
-
xlmerge --repo <仓库目录> detect
|
|
23
|
-
xlmerge --repo <仓库目录>
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
-
|
|
35
|
-
-
|
|
36
|
-
-
|
|
37
|
-
-
|
|
38
|
-
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
npm
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
1
|
+
# Vant 表格合并工具
|
|
2
|
+
|
|
3
|
+
`@kevlns/xlmerge`
|
|
4
|
+
|
|
5
|
+
## 功能
|
|
6
|
+
|
|
7
|
+
处理 Git 中的 Excel 三方冲突,支持 Agent 根据项目规则裁决并写回,也支持浏览器逐项审阅。
|
|
8
|
+
|
|
9
|
+
## 环境要求
|
|
10
|
+
|
|
11
|
+
Node.js 16 及以上、Python 3.9 及以上;包含公式的工作簿需要 Windows 桌面版 Excel 生成可靠的计算快照。
|
|
12
|
+
|
|
13
|
+
## 安装
|
|
14
|
+
|
|
15
|
+
```sh
|
|
16
|
+
npm install -g @kevlns/xlmerge
|
|
17
|
+
```
|
|
18
|
+
|
|
19
|
+
## 快速开始
|
|
20
|
+
|
|
21
|
+
```sh
|
|
22
|
+
xlmerge --repo <仓库目录> detect
|
|
23
|
+
xlmerge --repo <仓库目录> prepare
|
|
24
|
+
# 根据清单生成 decisions.json 后写回并暂存
|
|
25
|
+
xlmerge --repo <仓库目录> apply --manifest <manifest.json> --decisions <decisions.json> --no-commit
|
|
26
|
+
```
|
|
27
|
+
|
|
28
|
+
## 使用说明
|
|
29
|
+
|
|
30
|
+
### 功能说明
|
|
31
|
+
|
|
32
|
+
Git 对二进制 `.xlsx`/`.xlsm` 只会整文件冲突,无法像文本一样逐行合并。xlmerge 用**公式最终值快照 + 三方结构化差异引擎 + 本地可视化 UI**把这件事变得可控:自动提取 Git index 的 base/ours/theirs 三方版本,按 Sheet、逻辑行、逻辑列、Cell 四级计算差异,浏览器中逐 Cell 选择本地/远端版本,最终原子写回工作簿并生成结构化 commit。
|
|
33
|
+
|
|
34
|
+
- **逻辑 ID 定位** - 冲突身份用逻辑 ID(非物理坐标),插行删行后选择不会漂移
|
|
35
|
+
- **公式感知** - 三方工作簿先各自完整计算;diff 使用最终值,受影响 Sheet 固化为静态值,未受影响 Sheet 保留原公式及缓存
|
|
36
|
+
- **安全写回** - apply 校验三方来源、值快照与工作树指纹;批次替换失败自动回滚,并保留所选来源的样式、批注、合并单元格、冻结窗格、行高列宽
|
|
37
|
+
- **VBA 安全** - `.xlsm` 全程 `keep_vba`,保存后逐字节校验 VBA/ActiveX 负载
|
|
38
|
+
- **Luban 表头识别** - 自动识别 `##var` / `##type` / `##group`,注释列、占位列参与对齐
|
|
39
|
+
- **可配置整表过滤** - 仓库可把生成表加入过滤列表;命中时直接采用 Git stage 3 的远端原始文件
|
|
40
|
+
- **默认不越权** - 服务只监听 `127.0.0.1`,不自动 push
|
|
41
|
+
|
|
42
|
+
### 操作流程
|
|
43
|
+
|
|
44
|
+
```bash
|
|
45
|
+
# 检测未合并的 .xlsx/.xlsm(输出 JSON)
|
|
46
|
+
xlmerge --repo <仓库路径> detect
|
|
47
|
+
|
|
48
|
+
# 添加整表过滤项(写入仓库根目录 .xlmerge.json)
|
|
49
|
+
xlmerge --repo <仓库路径> filter add <相对路径或路径后缀.xlsx>
|
|
50
|
+
|
|
51
|
+
# 提取三方版本并后台启动可视化解析器,返回 url(自动打开浏览器)
|
|
52
|
+
xlmerge --repo <仓库路径> launch
|
|
53
|
+
|
|
54
|
+
# 只处理单个文件
|
|
55
|
+
xlmerge --repo <仓库路径> launch --path new_meta/Items.xlsx
|
|
56
|
+
|
|
57
|
+
# 前台阻塞式运行(与 launch 等价,进程前台等待完成)
|
|
58
|
+
xlmerge --repo <仓库路径> resolve
|
|
59
|
+
|
|
60
|
+
# Agent 自主裁决或自动化处理:先 prepare 再 apply
|
|
61
|
+
xlmerge --repo <仓库路径> prepare
|
|
62
|
+
xlmerge --repo <仓库路径> apply --manifest <manifest.json> --decisions <decisions.json> [--no-commit] [--message <text>] [--push]
|
|
63
|
+
```
|
|
64
|
+
|
|
65
|
+
`--repo` 缺省为当前目录(向上查找 Git 根)。
|
|
66
|
+
|
|
67
|
+
过滤列表默认为空,保存在仓库根目录的 `.xlmerge.json`:
|
|
68
|
+
|
|
69
|
+
```json
|
|
70
|
+
{
|
|
71
|
+
"autoTheirs": [
|
|
72
|
+
"locale/Key.xlsx"
|
|
73
|
+
]
|
|
74
|
+
}
|
|
75
|
+
```
|
|
76
|
+
|
|
77
|
+
过滤项按路径段做不区分大小写的后缀匹配。命中的冲突工作簿不做 Cell 分析,而是逐字节采用 Git stage 3(theirs)并随同本批次提交;如果整批冲突都命中过滤项,`launch`/`resolve` 会直接写回并提交,不启动空白 UI。命令可重复执行,已有项不会重复写入。
|
|
78
|
+
|
|
79
|
+
decisions.json 格式(Cell 用 manifest 中的稳定逻辑 ID,如 `row:base:4|name`):
|
|
80
|
+
|
|
81
|
+
```json
|
|
82
|
+
{
|
|
83
|
+
"files": {
|
|
84
|
+
"new_meta/Items.xlsx": {
|
|
85
|
+
"sheets": {
|
|
86
|
+
"Items": { "cells": { "row:base:4|name": "theirs" } }
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
```
|
|
92
|
+
|
|
93
|
+
#### Agent 调用规范
|
|
94
|
+
|
|
95
|
+
运行规范见 [xlmerge 技能](skills/xlmerge/SKILL.md)。首次处理工作簿冲突前,读取技能中链接的操作参考,核对目标仓库、冲突文件和写回条件。
|
|
96
|
+
|
|
97
|
+
## 开发与验证
|
|
98
|
+
|
|
99
|
+
```sh
|
|
100
|
+
npm ci
|
|
101
|
+
npm test
|
|
102
|
+
npm run test:python
|
|
103
|
+
```
|
|
104
|
+
|
|
105
|
+
命令返回、结构校验、模拟测试与外部平台实际运行分别核验。发布版本和依赖以随包 `package.json` 为准。
|
|
106
|
+
|
|
107
|
+
## 文档
|
|
108
|
+
|
|
109
|
+
[Agent 调用规范](skills/xlmerge/SKILL.md) · [文档规范](docs/documentation.md)
|
|
110
|
+
|
|
111
|
+
## 许可与版权
|
|
112
|
+
|
|
113
|
+
本工具采用 [MIT 许可](LICENSE)。Copyright © 2026 Vant。Vant 为工具集品牌;Figma、Unity、Steam、微信及其组件归各自权利人所有,第三方组件适用各自许可。
|
package/bin/xlmerge.js
CHANGED
|
@@ -1,152 +1,152 @@
|
|
|
1
|
-
#!/usr/bin/env node
|
|
2
|
-
/**
|
|
3
|
-
* xlmerge 启动垫片:定位可用 Python 解释器后透传参数给包内 CLI。
|
|
4
|
-
* - 解释器优先级:XLMERGE_PYTHON > python3 > python > py -3(需 >= 3.9)
|
|
5
|
-
* - 系统解释器已有 openpyxl/bottle 时直接使用;否则在 ~/.xlmerge/venv
|
|
6
|
-
* 创建用户级 venv 并安装固定版本依赖
|
|
7
|
-
* - 所有诊断信息输出到 stderr,保证 stdout 只有 Python CLI 的 JSON 结果
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
|
-
"use strict";
|
|
11
|
-
|
|
12
|
-
const { spawnSync, spawn } = require("child_process");
|
|
13
|
-
const fs = require("fs");
|
|
14
|
-
const os = require("os");
|
|
15
|
-
const path = require("path");
|
|
16
|
-
|
|
17
|
-
const PKG_ROOT = path.resolve(__dirname, "..");
|
|
18
|
-
const ENTRY = path.join(PKG_ROOT, "python", "xlsx_resolver", "resolve_xlsx_conflict.py");
|
|
19
|
-
const PY_ROOT = path.join(PKG_ROOT, "python");
|
|
20
|
-
const VENV_DIR = process.env.XLMERGE_VENV || path.join(os.homedir(), ".xlmerge", "venv");
|
|
21
|
-
const DEPS = ["openpyxl==3.1.5", "bottle==0.13.4"];
|
|
22
|
-
|
|
23
|
-
function log(msg) {
|
|
24
|
-
process.stderr.write(`[xlmerge] ${msg}\n`);
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
/** 候选解释器命令(数组形式,兼容 "py -3") */
|
|
28
|
-
function candidates() {
|
|
29
|
-
const list = [];
|
|
30
|
-
if (process.env.XLMERGE_PYTHON) list.push([process.env.XLMERGE_PYTHON]);
|
|
31
|
-
if (process.platform !== "win32") list.push(["python3"]);
|
|
32
|
-
list.push(["python"]);
|
|
33
|
-
if (process.platform === "win32") list.push(["py", "-3"]);
|
|
34
|
-
// 去重
|
|
35
|
-
const seen = new Set();
|
|
36
|
-
return list.filter((c) => {
|
|
37
|
-
const key = c.join(" ");
|
|
38
|
-
if (seen.has(key)) return false;
|
|
39
|
-
seen.add(key);
|
|
40
|
-
return true;
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
/** 探测候选解释器,返回 { cmd, version } 或 null */
|
|
45
|
-
function probeInterpreter() {
|
|
46
|
-
for (const cmd of candidates()) {
|
|
47
|
-
let result;
|
|
48
|
-
try {
|
|
49
|
-
result = spawnSync(cmd[0], [...cmd.slice(1), "-c", "import sys; print(sys.version_info >= (3, 9))"], {
|
|
50
|
-
encoding: "utf-8",
|
|
51
|
-
timeout: 20000,
|
|
52
|
-
});
|
|
53
|
-
} catch {
|
|
54
|
-
continue;
|
|
55
|
-
}
|
|
56
|
-
if (result.error || result.status !== 0) continue;
|
|
57
|
-
if (result.stdout.trim() === "True") {
|
|
58
|
-
return cmd;
|
|
59
|
-
}
|
|
60
|
-
if (result.stdout.trim() === "False") {
|
|
61
|
-
log(`跳过 ${cmd.join(" ")}:Python 版本低于 3.9`);
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
return null;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
function venvPython(venvDir) {
|
|
68
|
-
return process.platform === "win32"
|
|
69
|
-
? path.join(venvDir, "Scripts", "python.exe")
|
|
70
|
-
: path.join(venvDir, "bin", "python");
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
function hasDeps(cmd) {
|
|
74
|
-
const result = spawnSync(cmd[0], [...cmd.slice(1), "-c", "import openpyxl, bottle"], {
|
|
75
|
-
encoding: "utf-8",
|
|
76
|
-
timeout: 20000,
|
|
77
|
-
});
|
|
78
|
-
return result.status === 0 && !result.error;
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
/** 确保依赖可用:优先系统解释器,其次用户级 venv;返回解释器命令 */
|
|
82
|
-
function ensureInterpreter() {
|
|
83
|
-
const system = probeInterpreter();
|
|
84
|
-
if (!system) {
|
|
85
|
-
log("未找到可用的 Python >= 3.9,请安装 Python 或设置 XLMERGE_PYTHON 指向解释器路径。");
|
|
86
|
-
process.exit(1);
|
|
87
|
-
}
|
|
88
|
-
if (hasDeps(system)) return system;
|
|
89
|
-
|
|
90
|
-
const vpy = venvPython(VENV_DIR);
|
|
91
|
-
if (fs.existsSync(vpy)) {
|
|
92
|
-
if (hasDeps([vpy])) return [vpy];
|
|
93
|
-
log("已有 venv 缺少依赖,重新安装...");
|
|
94
|
-
} else {
|
|
95
|
-
log(`系统 Python 缺少 openpyxl/bottle,创建用户级 venv:${VENV_DIR}`);
|
|
96
|
-
const created = spawnSync(system[0], [...system.slice(1), "-m", "venv", VENV_DIR], {
|
|
97
|
-
stdio: ["ignore", "ignore", "inherit"],
|
|
98
|
-
timeout: 180000,
|
|
99
|
-
});
|
|
100
|
-
if (created.status !== 0) {
|
|
101
|
-
log("venv 创建失败,请手动执行:python -m venv \"" + VENV_DIR + '" 并 pip 安装 ' + DEPS.join(" "));
|
|
102
|
-
process.exit(1);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
const installed = spawnSync(vpy, ["-m", "pip", "install", "--quiet", ...DEPS], {
|
|
106
|
-
stdio: ["ignore", "ignore", "inherit"],
|
|
107
|
-
timeout: 600000,
|
|
108
|
-
});
|
|
109
|
-
if (installed.status !== 0) {
|
|
110
|
-
log(`pip 安装失败(${DEPS.join(" ")}),请检查网络或手动安装。`);
|
|
111
|
-
process.exit(1);
|
|
112
|
-
}
|
|
113
|
-
return [vpy];
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
function main() {
|
|
117
|
-
if (!fs.existsSync(ENTRY)) {
|
|
118
|
-
log(`找不到入口脚本:${ENTRY}`);
|
|
119
|
-
process.exit(1);
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
if (process.argv.includes("--selfcheck")) {
|
|
123
|
-
const system = probeInterpreter();
|
|
124
|
-
const cmd = system ? ensureInterpreter() : null;
|
|
125
|
-
process.stdout.write(
|
|
126
|
-
JSON.stringify(
|
|
127
|
-
{
|
|
128
|
-
ok: Boolean(cmd),
|
|
129
|
-
entry: ENTRY,
|
|
130
|
-
python: cmd ? cmd.join(" ") : null,
|
|
131
|
-
venv: fs.existsSync(venvPython(VENV_DIR)) ? VENV_DIR : null,
|
|
132
|
-
},
|
|
133
|
-
null,
|
|
134
|
-
2,
|
|
135
|
-
) + "\n",
|
|
136
|
-
);
|
|
137
|
-
process.exit(cmd ? 0 : 1);
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
const cmd = ensureInterpreter();
|
|
141
|
-
const child = spawn(cmd[0], [...cmd.slice(1), ENTRY, ...process.argv.slice(2)], {
|
|
142
|
-
stdio: "inherit",
|
|
143
|
-
env: process.env,
|
|
144
|
-
});
|
|
145
|
-
child.on("error", (err) => {
|
|
146
|
-
log(`启动失败:${err.message}`);
|
|
147
|
-
process.exit(1);
|
|
148
|
-
});
|
|
149
|
-
child.on("exit", (code) => process.exit(code === null ? 1 : code));
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
main();
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* xlmerge 启动垫片:定位可用 Python 解释器后透传参数给包内 CLI。
|
|
4
|
+
* - 解释器优先级:XLMERGE_PYTHON > python3 > python > py -3(需 >= 3.9)
|
|
5
|
+
* - 系统解释器已有 openpyxl/bottle 时直接使用;否则在 ~/.xlmerge/venv
|
|
6
|
+
* 创建用户级 venv 并安装固定版本依赖
|
|
7
|
+
* - 所有诊断信息输出到 stderr,保证 stdout 只有 Python CLI 的 JSON 结果
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
"use strict";
|
|
11
|
+
|
|
12
|
+
const { spawnSync, spawn } = require("child_process");
|
|
13
|
+
const fs = require("fs");
|
|
14
|
+
const os = require("os");
|
|
15
|
+
const path = require("path");
|
|
16
|
+
|
|
17
|
+
const PKG_ROOT = path.resolve(__dirname, "..");
|
|
18
|
+
const ENTRY = path.join(PKG_ROOT, "python", "xlsx_resolver", "resolve_xlsx_conflict.py");
|
|
19
|
+
const PY_ROOT = path.join(PKG_ROOT, "python");
|
|
20
|
+
const VENV_DIR = process.env.XLMERGE_VENV || path.join(os.homedir(), ".xlmerge", "venv");
|
|
21
|
+
const DEPS = ["openpyxl==3.1.5", "bottle==0.13.4"];
|
|
22
|
+
|
|
23
|
+
function log(msg) {
|
|
24
|
+
process.stderr.write(`[xlmerge] ${msg}\n`);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** 候选解释器命令(数组形式,兼容 "py -3") */
|
|
28
|
+
function candidates() {
|
|
29
|
+
const list = [];
|
|
30
|
+
if (process.env.XLMERGE_PYTHON) list.push([process.env.XLMERGE_PYTHON]);
|
|
31
|
+
if (process.platform !== "win32") list.push(["python3"]);
|
|
32
|
+
list.push(["python"]);
|
|
33
|
+
if (process.platform === "win32") list.push(["py", "-3"]);
|
|
34
|
+
// 去重
|
|
35
|
+
const seen = new Set();
|
|
36
|
+
return list.filter((c) => {
|
|
37
|
+
const key = c.join(" ");
|
|
38
|
+
if (seen.has(key)) return false;
|
|
39
|
+
seen.add(key);
|
|
40
|
+
return true;
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/** 探测候选解释器,返回 { cmd, version } 或 null */
|
|
45
|
+
function probeInterpreter() {
|
|
46
|
+
for (const cmd of candidates()) {
|
|
47
|
+
let result;
|
|
48
|
+
try {
|
|
49
|
+
result = spawnSync(cmd[0], [...cmd.slice(1), "-c", "import sys; print(sys.version_info >= (3, 9))"], {
|
|
50
|
+
encoding: "utf-8",
|
|
51
|
+
timeout: 20000,
|
|
52
|
+
});
|
|
53
|
+
} catch {
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
if (result.error || result.status !== 0) continue;
|
|
57
|
+
if (result.stdout.trim() === "True") {
|
|
58
|
+
return cmd;
|
|
59
|
+
}
|
|
60
|
+
if (result.stdout.trim() === "False") {
|
|
61
|
+
log(`跳过 ${cmd.join(" ")}:Python 版本低于 3.9`);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
function venvPython(venvDir) {
|
|
68
|
+
return process.platform === "win32"
|
|
69
|
+
? path.join(venvDir, "Scripts", "python.exe")
|
|
70
|
+
: path.join(venvDir, "bin", "python");
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
function hasDeps(cmd) {
|
|
74
|
+
const result = spawnSync(cmd[0], [...cmd.slice(1), "-c", "import openpyxl, bottle"], {
|
|
75
|
+
encoding: "utf-8",
|
|
76
|
+
timeout: 20000,
|
|
77
|
+
});
|
|
78
|
+
return result.status === 0 && !result.error;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/** 确保依赖可用:优先系统解释器,其次用户级 venv;返回解释器命令 */
|
|
82
|
+
function ensureInterpreter() {
|
|
83
|
+
const system = probeInterpreter();
|
|
84
|
+
if (!system) {
|
|
85
|
+
log("未找到可用的 Python >= 3.9,请安装 Python 或设置 XLMERGE_PYTHON 指向解释器路径。");
|
|
86
|
+
process.exit(1);
|
|
87
|
+
}
|
|
88
|
+
if (hasDeps(system)) return system;
|
|
89
|
+
|
|
90
|
+
const vpy = venvPython(VENV_DIR);
|
|
91
|
+
if (fs.existsSync(vpy)) {
|
|
92
|
+
if (hasDeps([vpy])) return [vpy];
|
|
93
|
+
log("已有 venv 缺少依赖,重新安装...");
|
|
94
|
+
} else {
|
|
95
|
+
log(`系统 Python 缺少 openpyxl/bottle,创建用户级 venv:${VENV_DIR}`);
|
|
96
|
+
const created = spawnSync(system[0], [...system.slice(1), "-m", "venv", VENV_DIR], {
|
|
97
|
+
stdio: ["ignore", "ignore", "inherit"],
|
|
98
|
+
timeout: 180000,
|
|
99
|
+
});
|
|
100
|
+
if (created.status !== 0) {
|
|
101
|
+
log("venv 创建失败,请手动执行:python -m venv \"" + VENV_DIR + '" 并 pip 安装 ' + DEPS.join(" "));
|
|
102
|
+
process.exit(1);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
const installed = spawnSync(vpy, ["-m", "pip", "install", "--quiet", ...DEPS], {
|
|
106
|
+
stdio: ["ignore", "ignore", "inherit"],
|
|
107
|
+
timeout: 600000,
|
|
108
|
+
});
|
|
109
|
+
if (installed.status !== 0) {
|
|
110
|
+
log(`pip 安装失败(${DEPS.join(" ")}),请检查网络或手动安装。`);
|
|
111
|
+
process.exit(1);
|
|
112
|
+
}
|
|
113
|
+
return [vpy];
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
function main() {
|
|
117
|
+
if (!fs.existsSync(ENTRY)) {
|
|
118
|
+
log(`找不到入口脚本:${ENTRY}`);
|
|
119
|
+
process.exit(1);
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
if (process.argv.includes("--selfcheck")) {
|
|
123
|
+
const system = probeInterpreter();
|
|
124
|
+
const cmd = system ? ensureInterpreter() : null;
|
|
125
|
+
process.stdout.write(
|
|
126
|
+
JSON.stringify(
|
|
127
|
+
{
|
|
128
|
+
ok: Boolean(cmd),
|
|
129
|
+
entry: ENTRY,
|
|
130
|
+
python: cmd ? cmd.join(" ") : null,
|
|
131
|
+
venv: fs.existsSync(venvPython(VENV_DIR)) ? VENV_DIR : null,
|
|
132
|
+
},
|
|
133
|
+
null,
|
|
134
|
+
2,
|
|
135
|
+
) + "\n",
|
|
136
|
+
);
|
|
137
|
+
process.exit(cmd ? 0 : 1);
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
const cmd = ensureInterpreter();
|
|
141
|
+
const child = spawn(cmd[0], [...cmd.slice(1), ENTRY, ...process.argv.slice(2)], {
|
|
142
|
+
stdio: "inherit",
|
|
143
|
+
env: process.env,
|
|
144
|
+
});
|
|
145
|
+
child.on("error", (err) => {
|
|
146
|
+
log(`启动失败:${err.message}`);
|
|
147
|
+
process.exit(1);
|
|
148
|
+
});
|
|
149
|
+
child.on("exit", (code) => process.exit(code === null ? 1 : code));
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
main();
|
package/package.json
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
"""XLSX/XLSM 三方结构化差异引擎(源自 XlsxGitMergeBridge)。"""
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""XLSX/XLSM 三方结构化差异引擎(源自 XlsxGitMergeBridge)。"""
|