proto-update-tool 1.0.0 → 1.0.1

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.
Files changed (14) hide show
  1. package/bin/git.factory.d.ts +4 -4
  2. package/bin/git.factory.d.ts.map +1 -1
  3. package/bin/git.factory.js +162 -50
  4. package/bin/git.factory.js.map +1 -1
  5. package/bin/index.js +2 -9
  6. package/bin/index.js.map +1 -1
  7. package/bin/transform.d.ts +2 -2
  8. package/bin/transform.d.ts.map +1 -1
  9. package/bin/transform.js +1 -1
  10. package/bin/transform.js.map +1 -1
  11. package/package.json +1 -1
  12. package/src/git.factory.ts +176 -46
  13. package/src/index.ts +1 -9
  14. package/src/transform.ts +3 -3
package/bin/git.factory.d.ts CHANGED
@@ -1,9 +1,9 @@
1
- export interface GitImportOption {
1
+ export type RepoConfig = {
2
2
  repository: string;
3
3
  ref: string;
4
4
  outDir: string;
5
- fileFilter: string;
6
5
  destPath: string;
7
- }
8
- export declare function gitFactory(options: GitImportOption[]): Promise<void>;
6
+ };
7
+ export declare function gitConfigFactory(configs: RepoConfig[]): Promise<void>;
8
+ export declare function gitFactory(configPath: string): Promise<void>;
9
9
  //# sourceMappingURL=git.factory.d.ts.map
package/bin/git.factory.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"git.factory.d.ts","sourceRoot":"","sources":["../src/git.factory.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,iBA4C1D"}
1
+ {"version":3,"file":"git.factory.d.ts","sourceRoot":"","sources":["../src/git.factory.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,UAAU,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AA2IF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,iBAiC3D;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,iBAGlD"}
package/bin/git.factory.js CHANGED
@@ -3,58 +3,170 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.gitConfigFactory = gitConfigFactory;
6
7
  exports.gitFactory = gitFactory;
8
+ const path_1 = __importDefault(require("path"));
9
+ const os_1 = __importDefault(require("os"));
10
+ const child_process_1 = require("child_process");
7
11
  const fs_extra_1 = require("fs-extra");
8
- const os_1 = require("os");
9
- const path_1 = require("path");
10
- const simple_git_1 = __importDefault(require("simple-git"));
11
- async function gitFactory(options) {
12
- const tempDir = (0, path_1.join)((0, os_1.homedir)(), '.proto-import-cache');
13
- // console.log('tempDir:', tempDir);
14
- if (!(0, fs_extra_1.existsSync)(tempDir))
15
- (0, fs_extra_1.mkdirSync)(tempDir, { recursive: true });
16
- await Promise.all(options.map(async (config) => {
17
- const path = (0, path_1.join)(__dirname, '..', config.destPath);
18
- if (!(0, fs_extra_1.existsSync)(path)) {
19
- (0, fs_extra_1.mkdirSync)(path, { recursive: true });
20
- }
21
- const tempPath = (0, path_1.join)(tempDir, config.repository);
22
- let isCloned = false;
23
- if (!(0, fs_extra_1.existsSync)(tempPath)) {
24
- (0, fs_extra_1.mkdirSync)(tempPath, { recursive: true });
25
- isCloned = true;
26
- }
27
- const git = (0, simple_git_1.default)(tempPath);
28
- if (isCloned) {
29
- await git.clone(config.repository, tempPath);
30
- }
31
- await git.fetch(tempPath, 'origin', ['--tags']);
32
- const tags = await git.tags();
33
- console.log('可用 tags:', tags.all);
34
- if (!tags.all.includes(config.ref)) {
35
- throw new Error(`tag ${config.ref} not found`);
36
- }
37
- await git.checkout(config.ref);
38
- const destPath = (0, path_1.join)(process.cwd(), config.destPath);
39
- (0, fs_extra_1.removeSync)(destPath);
40
- if (!(0, fs_extra_1.existsSync)(destPath))
41
- (0, fs_extra_1.mkdirSync)(destPath, { recursive: true });
42
- (0, fs_extra_1.copySync)((0, path_1.join)(tempPath, config.outDir), destPath, {
43
- overwrite: true,
44
- filter: (src) => {
45
- if (src.startsWith('.git'))
46
- return false;
47
- if ((0, fs_extra_1.statSync)(src).isDirectory())
48
- return true;
49
- const regExp = new RegExp(eval(config.fileFilter));
50
- if (regExp.test(src)) {
51
- console.info(`copy ${src} to .${destPath.replace(process.cwd(), '')}`);
52
- return true;
53
- }
54
- return false;
55
- },
12
+ async function readConfig(filename = "proto.config.json") {
13
+ const cfgPath = path_1.default.resolve(process.cwd(), filename);
14
+ const raw = await (0, fs_extra_1.readFileSync)(cfgPath, "utf-8");
15
+ const data = JSON.parse(raw);
16
+ if (!Array.isArray(data)) {
17
+ throw new Error("格式错误：应为数组");
18
+ }
19
+ return data.map((x) => {
20
+ if (!x.repository || !x.ref || !x.outDir || !x.destPath) {
21
+ throw new Error("配置缺少必要字段 repository/ref/outDir/destPath");
22
+ }
23
+ return { repository: String(x.repository), ref: String(x.ref), outDir: String(x.outDir), destPath: String(x.destPath) };
24
+ });
25
+ }
26
+ function execCmd(cmd, args, cwd) {
27
+ return new Promise((resolve, reject) => {
28
+ const child = (0, child_process_1.spawn)(cmd, args, {
29
+ cwd,
30
+ stdio: "inherit",
31
+ });
32
+ child.on("error", reject);
33
+ child.on("exit", (code) => {
34
+ if (code === 0)
35
+ resolve();
36
+ else
37
+ reject(new Error(`${cmd} ${args.join(" ")} 退出码: ${code}`));
38
+ });
39
+ });
40
+ }
41
+ function execCmdCapture(cmd, args, cwd) {
42
+ return new Promise((resolve, reject) => {
43
+ const child = (0, child_process_1.spawn)(cmd, args, {
44
+ cwd,
45
+ stdio: ["ignore", "pipe", "pipe"],
56
46
  });
57
- return true;
58
- }));
47
+ let stdout = "";
48
+ let stderr = "";
49
+ child.stdout.on("data", (d) => {
50
+ stdout += d.toString();
51
+ });
52
+ child.stderr.on("data", (d) => {
53
+ stderr += d.toString();
54
+ });
55
+ child.on("error", reject);
56
+ child.on("exit", (code) => {
57
+ resolve({ code: code ?? 0, stdout, stderr });
58
+ });
59
+ });
60
+ }
61
+ async function copyDirFilterTs(src, dest) {
62
+ const entries = await (0, fs_extra_1.readdir)(src, { withFileTypes: true });
63
+ await (0, fs_extra_1.mkdirSync)(dest, { recursive: true });
64
+ for (const entry of entries) {
65
+ const s = path_1.default.join(src, entry.name);
66
+ const d = path_1.default.join(dest, entry.name);
67
+ if (entry.isDirectory()) {
68
+ await copyDirFilterTs(s, d);
69
+ }
70
+ else if (entry.isFile() && entry.name.endsWith(".ts")) {
71
+ await (0, fs_extra_1.copyFile)(s, d);
72
+ }
73
+ }
74
+ }
75
+ async function processRepo(conf) {
76
+ const tmpBase = path_1.default.join(os_1.default.tmpdir(), '.proto-import-cache');
77
+ const repoDirName = conf.destPath.replace(/[^\w.-]/g, "_") + "_" + conf.ref.replace(/[^\w.-]/g, "_");
78
+ const cloneDir = path_1.default.join(tmpBase, repoDirName);
79
+ await (0, fs_extra_1.mkdirSync)(tmpBase, { recursive: true });
80
+ await (0, fs_extra_1.removeSync)(cloneDir);
81
+ console.log(`开始处理: ${conf.repository} @ ${conf.ref}`);
82
+ try {
83
+ await execCmd("git", ["clone", "--depth", "1", "--branch", conf.ref, conf.repository, cloneDir]);
84
+ }
85
+ catch (e) {
86
+ console.warn(`直接克隆分支失败，回退到默认分支后切换: ${e.message}`);
87
+ await execCmd("git", ["clone", conf.repository, cloneDir]);
88
+ await execCmd("git", ["fetch", "--all"], cloneDir);
89
+ try {
90
+ await execCmd("git", ["checkout", conf.ref], cloneDir);
91
+ }
92
+ catch {
93
+ await execCmd("git", ["checkout", `origin/${conf.ref}`], cloneDir);
94
+ }
95
+ }
96
+ const srcGen = path_1.default.join(cloneDir, conf.outDir);
97
+ const destRoot = path_1.default.resolve(process.cwd(), conf.destPath);
98
+ const destGen = path_1.default.join(destRoot, conf.outDir);
99
+ let last = undefined;
100
+ try {
101
+ if (!(0, fs_extra_1.statSync)(srcGen).isDirectory()) {
102
+ throw new Error(`源仓库中不存在 ${conf.outDir} 目录`);
103
+ }
104
+ }
105
+ catch {
106
+ throw new Error(`源仓库 ${conf.repository} 的 ${conf.ref} 未找到 ${conf.outDir} 目录`);
107
+ }
108
+ try {
109
+ const info = await execCmdCapture("git", ["log", "-1", "--pretty=format:%H|||%an|||%ad|||%s", "--date=iso"], cloneDir);
110
+ const body = await execCmdCapture("git", ["log", "-1", "--pretty=format:%B"], cloneDir);
111
+ const parts = info.stdout.trim().split("|||");
112
+ if (parts.length >= 4) {
113
+ last = {
114
+ hash: parts[0] ?? "",
115
+ author: parts[1] ?? "",
116
+ date: parts[2] ?? "",
117
+ subject: parts[3] ?? "",
118
+ body: body.stdout ?? "",
119
+ };
120
+ }
121
+ }
122
+ catch {
123
+ }
124
+ await (0, fs_extra_1.mkdirSync)(destRoot, { recursive: true });
125
+ await (0, fs_extra_1.removeSync)(destGen);
126
+ await (0, fs_extra_1.mkdirSync)(destGen);
127
+ await copyDirFilterTs(srcGen, destGen);
128
+ console.log(`已拷贝 ${conf.repository} 的 ${conf.ref} 下 ${conf.outDir} 目录下 .ts 文件到 ${destGen}`);
129
+ await (0, fs_extra_1.removeSync)(cloneDir);
130
+ return { path: conf.repository, version: conf.ref, destGen, ...last ? { last } : {} };
131
+ }
132
+ async function gitConfigFactory(configs) {
133
+ const results = [];
134
+ for (const conf of configs) {
135
+ const r = await processRepo(conf);
136
+ results.push(r);
137
+ }
138
+ console.log("所有 Proto TS 更新完成");
139
+ await (0, fs_extra_1.removeSync)(path_1.default.join(os_1.default.tmpdir(), '.proto-import-cache'));
140
+ for (const r of results) {
141
+ await execCmd("git", ["add", r.destGen], process.cwd());
142
+ const staged = await execCmdCapture("git", ["diff", "--cached", "--name-only", "--", r.destGen], process.cwd());
143
+ if (staged.stdout.trim().length > 0) {
144
+ const msg1 = `更新${r.path}仓库协议版本${r.version}`;
145
+ const extras = [];
146
+ if (r.last) {
147
+ extras.push(`上游提交 ${r.last.hash}`);
148
+ extras.push(`作者: ${r.last.author} 日期: ${r.last.date}`);
149
+ extras.push(`内容: ${r.last.subject}`);
150
+ const bodyTrim = (r.last.body || "").trim();
151
+ if (bodyTrim.length) {
152
+ const bodyShort = bodyTrim.length > 1000 ? bodyTrim.slice(0, 1000) + "…" : bodyTrim;
153
+ extras.push(bodyShort);
154
+ }
155
+ }
156
+ const args = ["commit", "-m", msg1];
157
+ for (const e of extras)
158
+ args.push("-m", e);
159
+ args.push("--", r.destGen);
160
+ await execCmd("git", args, process.cwd());
161
+ console.log("已提交更新提交：", msg1);
162
+ }
163
+ else {
164
+ console.log(`无变更，跳过提交：${r.path}`);
165
+ }
166
+ }
167
+ }
168
+ async function gitFactory(configPath) {
169
+ const configs = await readConfig(configPath);
170
+ return await gitConfigFactory(configs);
59
171
  }
60
172
  //# sourceMappingURL=git.factory.js.map
package/bin/git.factory.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"git.factory.js","sourceRoot":"","sources":["../src/git.factory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git.factory.js","sourceRoot":"","sources":["../src/git.factory.ts"],"names":[],"mappings":"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"}
package/bin/index.js CHANGED
@@ -3,9 +3,6 @@
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  const commander_1 = require("commander");
5
5
  const package_json_1 = require("../package.json");
6
- const path_1 = require("path");
7
- const fs_extra_1 = require("fs-extra");
8
- const fs_1 = require("fs");
9
6
  const git_factory_1 = require("./git.factory");
10
7
  async function bootstrap() {
11
8
  const program = new commander_1.Command();
@@ -21,12 +18,8 @@ async function bootstrap() {
21
18
  process.exit(0);
22
19
  }
23
20
  const path = options.path || './proto.config.json';
24
- const configPath = (0, path_1.join)(process.cwd(), path);
25
- if (!(0, fs_extra_1.existsSync)(configPath)) {
26
- throw new Error(`Proto 配置文件不存在: ${configPath}`);
27
- }
28
- const config = JSON.parse((0, fs_1.readFileSync)(configPath, 'utf-8'));
29
- await (0, git_factory_1.gitFactory)(config);
21
+ if (path)
22
+ (0, git_factory_1.gitFactory)(path);
30
23
  return true;
31
24
  }
32
25
  bootstrap();
package/bin/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AACpC,kDAA0C;AAC1C,+BAA4B;AAC5B,uCAAsC;AACtC,2BAAkC;AAClC,+CAA2C;AAE3C,KAAK,UAAU,SAAS;IACpB,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAE9B,OAAO,CAAC,OAAO,CAAC,sBAAO,CAAC;SACnB,IAAI,CAAC,UAAU,CAAC;SAChB,WAAW,CAAC,2BAA2B,CAAC;SACxC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC;SAC9B,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,qBAAqB,CAAC;SACrE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,qBAAqB,CAAC;IACnD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,IAAA,qBAAU,EAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,kBAAkB,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,IAAA,wBAAU,EAAC,MAAM,CAAC,CAAC;IACzB,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,EAAE,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AACpC,kDAA0C;AAC1C,+CAA2C;AAE3C,KAAK,UAAU,SAAS;IACpB,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAE9B,OAAO,CAAC,OAAO,CAAC,sBAAO,CAAC;SACnB,IAAI,CAAC,UAAU,CAAC;SAChB,WAAW,CAAC,2BAA2B,CAAC;SACxC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC;SAC9B,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,qBAAqB,CAAC;SACrE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,qBAAqB,CAAC;IACnD,IAAG,IAAI;QAAE,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC;IAC1B,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,EAAE,CAAC"}
package/bin/transform.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  import * as ts from 'typescript';
2
- import { GitImportOption } from './git.factory';
2
+ import { RepoConfig } from './git.factory';
3
3
  export interface GitImportPluginOptions {
4
4
  transform: string;
5
5
  type: string;
6
- options: GitImportOption[];
6
+ options: RepoConfig[];
7
7
  }
8
8
  export declare enum GitImportStatus {
9
9
  Waiting = "waiting",
package/bin/transform.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAc,eAAe,EAAE,MAAM,eAAe,CAAC;AAE5D,MAAM,WAAW,sBAAsB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,eAAe,EAAE,CAAC;CAC9B;AACD,oBAAY,eAAe;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;CACpB;AAKD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,sBAAsB;uBAUlD,EAAE,CAAC,qBAAqB,MAEvC,YAAY,EAAE,CAAC,UAAU;EAOxC"}
1
+ {"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAoB,UAAU,EAAE,MAAM,eAAe,CAAC;AAE7D,MAAM,WAAW,sBAAsB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,UAAU,EAAE,CAAC;CACzB;AACD,oBAAY,eAAe;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;CACpB;AAKD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,sBAAsB;uBAUlD,EAAE,CAAC,qBAAqB,MAEvC,YAAY,EAAE,CAAC,UAAU;EAOxC"}
package/bin/transform.js CHANGED
@@ -18,7 +18,7 @@ function default_1(program, { options }) {
18
18
  if (buildStatus.status === GitImportStatus.Waiting) {
19
19
  // console.log(111111, buildStatus, options);
20
20
  buildStatus.status = GitImportStatus.Pending;
21
- (0, git_factory_1.gitFactory)(options).then(() => {
21
+ (0, git_factory_1.gitConfigFactory)(options).then(() => {
22
22
  buildStatus.status = GitImportStatus.Success;
23
23
  }).catch(() => {
24
24
  buildStatus.status = GitImportStatus.Failed;
package/bin/transform.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":";;;AAkBA,4BAmBC;AApCD,+CAA4D;AAO5D,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACrB,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AACD,MAAM,WAAW,GAAG;IAChB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;IAClD,MAAM,EAAE,eAAe,CAAC,OAAO;CAClC,CAAC;AACF,mBAAyB,OAAmB,EAAE,EAAE,OAAO,EAA0B;IAC7E,IAAI,WAAW,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;QACjD,6CAA6C;QAC7C,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QAC7C,IAAA,wBAAU,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAC1B,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QACjD,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACV,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC;IACD,SAAS,QAAQ,CAAC,OAAiC;QAC/C,qBAAqB;QACrB,OAAO,CAAC,UAAyB,EAAE,EAAE;YACjC,0CAA0C;YAC1C,OAAO;YACP,OAAO,UAAU,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":";;;AAkBA,4BAmBC;AApCD,+CAA6D;AAO7D,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACrB,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AACD,MAAM,WAAW,GAAG;IAChB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;IAClD,MAAM,EAAE,eAAe,CAAC,OAAO;CAClC,CAAC;AACF,mBAAyB,OAAmB,EAAE,EAAE,OAAO,EAA0B;IAC7E,IAAI,WAAW,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;QACjD,6CAA6C;QAC7C,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QAC7C,IAAA,8BAAgB,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAChC,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QACjD,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACV,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC;IACD,SAAS,QAAQ,CAAC,OAAiC;QAC/C,qBAAqB;QACrB,OAAO,CAAC,UAAyB,EAAE,EAAE;YACjC,0CAA0C;YAC1C,OAAO;YACP,OAAO,UAAU,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;AAClC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "proto-update-tool",
3
- "version": "1.0.0",
3
+ "version": "1.0.1",
4
4
  "description": "",
5
5
  "license": "ISC",
6
6
  "author": "huaqingyi",
package/src/git.factory.ts CHANGED
@@ -1,58 +1,188 @@
1
- import { copySync, existsSync, mkdirSync, removeSync, statSync } from 'fs-extra';
2
- import { homedir } from 'os';
3
- import { join } from 'path';
4
- import simpleGit from 'simple-git';
1
+ import path from "path";
2
+ import os from "os";
3
+ import { spawn } from "child_process";
4
+ import { copyFile, mkdirSync, readdir, readFileSync, removeSync, statSync } from "fs-extra";
5
5
 
6
- export interface GitImportOption {
6
+ export type RepoConfig = {
7
7
  repository: string;
8
8
  ref: string;
9
9
  outDir: string;
10
- fileFilter: string;
11
10
  destPath: string;
11
+ };
12
+
13
+ type RepoResult = {
14
+ path: string;
15
+ version: string;
16
+ destGen: string;
17
+ last?: {
18
+ hash: string;
19
+ author: string;
20
+ date: string;
21
+ subject: string;
22
+ body: string;
23
+ };
24
+ };
25
+
26
+ async function readConfig(filename: string = "proto.config.json"): Promise<RepoConfig[]> {
27
+ const cfgPath = path.resolve(process.cwd(), filename);
28
+ const raw = await readFileSync(cfgPath, "utf-8");
29
+ const data = JSON.parse(raw) as RepoConfig[];
30
+ if (!Array.isArray(data)) {
31
+ throw new Error("格式错误：应为数组");
32
+ }
33
+ return data.map((x) => {
34
+ if (!x.repository || !x.ref || !x.outDir || !x.destPath) {
35
+ throw new Error("配置缺少必要字段 repository/ref/outDir/destPath");
36
+ }
37
+ return { repository: String(x.repository), ref: String(x.ref), outDir: String(x.outDir), destPath: String(x.destPath) };
38
+ });
39
+ }
40
+
41
+ function execCmd(cmd: string, args: string[], cwd?: string): Promise<void> {
42
+ return new Promise((resolve, reject) => {
43
+ const child = spawn(cmd, args, {
44
+ cwd,
45
+ stdio: "inherit",
46
+ });
47
+ child.on("error", reject);
48
+ child.on("exit", (code) => {
49
+ if (code === 0) resolve();
50
+ else reject(new Error(`${cmd} ${args.join(" ")} 退出码: ${code}`));
51
+ });
52
+ });
12
53
  }
13
54
 
14
- export async function gitFactory(options: GitImportOption[]) {
15
- const tempDir = join(homedir(), '.proto-import-cache');
16
- // console.log('tempDir:', tempDir);
17
- if (!existsSync(tempDir)) mkdirSync(tempDir, { recursive: true });
18
- await Promise.all(options.map(async (config) => {
19
- const path = join(__dirname, '..', config.destPath);
20
- if (!existsSync(path)) {
21
- mkdirSync(path, { recursive: true });
55
+ function execCmdCapture(cmd: string, args: string[], cwd?: string): Promise<{ code: number; stdout: string; stderr: string }> {
56
+ return new Promise((resolve, reject) => {
57
+ const child = spawn(cmd, args, {
58
+ cwd,
59
+ stdio: ["ignore", "pipe", "pipe"],
60
+ });
61
+ let stdout = "";
62
+ let stderr = "";
63
+ child.stdout.on("data", (d) => {
64
+ stdout += d.toString();
65
+ });
66
+ child.stderr.on("data", (d) => {
67
+ stderr += d.toString();
68
+ });
69
+ child.on("error", reject);
70
+ child.on("exit", (code) => {
71
+ resolve({ code: code ?? 0, stdout, stderr });
72
+ });
73
+ });
74
+ }
75
+
76
+ async function copyDirFilterTs(src: string, dest: string) {
77
+ const entries = await readdir(src, { withFileTypes: true });
78
+ await mkdirSync(dest, { recursive: true });
79
+ for (const entry of entries) {
80
+ const s = path.join(src, entry.name);
81
+ const d = path.join(dest, entry.name);
82
+ if (entry.isDirectory()) {
83
+ await copyDirFilterTs(s, d);
84
+ } else if (entry.isFile() && entry.name.endsWith(".ts")) {
85
+ await copyFile(s, d);
22
86
  }
23
- const tempPath = join(tempDir, config.repository);
24
- let isCloned = false;
25
- if (!existsSync(tempPath)) {
26
- mkdirSync(tempPath, { recursive: true });
27
- isCloned = true;
87
+ }
88
+ }
89
+
90
+ async function processRepo(conf: RepoConfig): Promise<RepoResult> {
91
+ const tmpBase = path.join(os.tmpdir(), '.proto-import-cache');
92
+ const repoDirName = conf.destPath.replace(/[^\w.-]/g, "_") + "_" + conf.ref.replace(/[^\w.-]/g, "_");
93
+ const cloneDir = path.join(tmpBase, repoDirName);
94
+
95
+ await mkdirSync(tmpBase, { recursive: true });
96
+ await removeSync(cloneDir);
97
+
98
+ console.log(`开始处理: ${conf.repository} @ ${conf.ref}`);
99
+ try {
100
+ await execCmd("git", ["clone", "--depth", "1", "--branch", conf.ref, conf.repository, cloneDir]);
101
+ } catch (e) {
102
+ console.warn(`直接克隆分支失败，回退到默认分支后切换: ${(e as Error).message}`);
103
+ await execCmd("git", ["clone", conf.repository, cloneDir]);
104
+ await execCmd("git", ["fetch", "--all"], cloneDir);
105
+ try {
106
+ await execCmd("git", ["checkout", conf.ref], cloneDir);
107
+ } catch {
108
+ await execCmd("git", ["checkout", `origin/${conf.ref}`], cloneDir);
28
109
  }
29
- const git = simpleGit(tempPath);
30
- if (isCloned) {
31
- await git.clone(config.repository, tempPath);
110
+ }
111
+
112
+ const srcGen = path.join(cloneDir, conf.outDir);
113
+ const destRoot = path.resolve(process.cwd(), conf.destPath);
114
+ const destGen = path.join(destRoot, conf.outDir);
115
+ let last: RepoResult["last"] | undefined = undefined;
116
+
117
+ try {
118
+ if (!statSync(srcGen).isDirectory()) {
119
+ throw new Error(`源仓库中不存在 ${conf.outDir} 目录`);
32
120
  }
33
- await git.fetch(tempPath, 'origin', ['--tags']);
34
- const tags = await git.tags();
35
- console.log('可用 tags:', tags.all);
36
- if (!tags.all.includes(config.ref)) {
37
- throw new Error(`tag ${config.ref} not found`);
121
+ } catch {
122
+ throw new Error(`源仓库 ${conf.repository} 的 ${conf.ref} 未找到 ${conf.outDir} 目录`);
123
+ }
124
+
125
+ try {
126
+ const info = await execCmdCapture("git", ["log", "-1", "--pretty=format:%H|||%an|||%ad|||%s", "--date=iso"], cloneDir);
127
+ const body = await execCmdCapture("git", ["log", "-1", "--pretty=format:%B"], cloneDir);
128
+ const parts = info.stdout.trim().split("|||");
129
+ if (parts.length >= 4) {
130
+ last = {
131
+ hash: parts[0] ?? "",
132
+ author: parts[1] ?? "",
133
+ date: parts[2] ?? "",
134
+ subject: parts[3] ?? "",
135
+ body: body.stdout ?? "",
136
+ };
38
137
  }
39
- await git.checkout(config.ref);
40
- const destPath = join(process.cwd(), config.destPath);
41
- removeSync(destPath);
42
- if (!existsSync(destPath)) mkdirSync(destPath, { recursive: true })
43
- copySync(join(tempPath, config.outDir), destPath, {
44
- overwrite: true,
45
- filter: (src) => {
46
- if (src.startsWith('.git')) return false;
47
- if (statSync(src).isDirectory()) return true;
48
- const regExp = new RegExp(eval(config.fileFilter));
49
- if (regExp.test(src)) {
50
- console.info(`copy ${src} to .${destPath.replace(process.cwd(), '')}`);
51
- return true;
138
+ } catch {
139
+ }
140
+
141
+ await mkdirSync(destRoot, { recursive: true });
142
+ await removeSync(destGen);
143
+ await mkdirSync(destGen);
144
+ await copyDirFilterTs(srcGen, destGen);
145
+ console.log(`已拷贝 ${conf.repository} 的 ${conf.ref} 下 ${conf.outDir} 目录下 .ts 文件到 ${destGen}`);
146
+ await removeSync(cloneDir);
147
+ return { path: conf.repository, version: conf.ref, destGen, ...last ? { last } : {} };
148
+ }
149
+
150
+ export async function gitConfigFactory(configs: RepoConfig[]) {
151
+ const results: RepoResult[] = [];
152
+ for (const conf of configs) {
153
+ const r = await processRepo(conf);
154
+ results.push(r);
155
+ }
156
+ console.log("所有 Proto TS 更新完成");
157
+ await removeSync(path.join(os.tmpdir(), '.proto-import-cache'));
158
+ for (const r of results) {
159
+ await execCmd("git", ["add", r.destGen], process.cwd());
160
+ const staged = await execCmdCapture("git", ["diff", "--cached", "--name-only", "--", r.destGen], process.cwd());
161
+ if (staged.stdout.trim().length > 0) {
162
+ const msg1 = `更新${r.path}仓库协议版本${r.version}`;
163
+ const extras: string[] = [];
164
+ if (r.last) {
165
+ extras.push(`上游提交 ${r.last.hash}`);
166
+ extras.push(`作者: ${r.last.author} 日期: ${r.last.date}`);
167
+ extras.push(`内容: ${r.last.subject}`);
168
+ const bodyTrim = (r.last.body || "").trim();
169
+ if (bodyTrim.length) {
170
+ const bodyShort = bodyTrim.length > 1000 ? bodyTrim.slice(0, 1000) + "…" : bodyTrim;
171
+ extras.push(bodyShort);
52
172
  }
53
- return false;
54
- },
55
- });
56
- return true;
57
- }));
58
- }
173
+ }
174
+ const args = ["commit", "-m", msg1];
175
+ for (const e of extras) args.push("-m", e);
176
+ args.push("--", r.destGen);
177
+ await execCmd("git", args, process.cwd());
178
+ console.log("已提交更新提交：", msg1);
179
+ } else {
180
+ console.log(`无变更，跳过提交：${r.path}`);
181
+ }
182
+ }
183
+ }
184
+
185
+ export async function gitFactory(configPath: string) {
186
+ const configs = await readConfig(configPath);
187
+ return await gitConfigFactory(configs);
188
+ }
package/src/index.ts CHANGED
@@ -2,9 +2,6 @@
2
2
 
3
3
  import { Command } from "commander";
4
4
  import { version } from '../package.json';
5
- import { join } from 'path';
6
- import { existsSync } from "fs-extra";
7
- import { readFileSync } from "fs";
8
5
  import { gitFactory } from "./git.factory";
9
6
 
10
7
  async function bootstrap() {
@@ -23,12 +20,7 @@ async function bootstrap() {
23
20
  process.exit(0);
24
21
  }
25
22
  const path = options.path || './proto.config.json';
26
- const configPath = join(process.cwd(), path);
27
- if (!existsSync(configPath)) {
28
- throw new Error(`Proto 配置文件不存在: ${configPath}`);
29
- }
30
- const config = JSON.parse(readFileSync(configPath, 'utf-8'));
31
- await gitFactory(config);
23
+ if(path) gitFactory(path);
32
24
  return true;
33
25
  }
34
26
 
package/src/transform.ts CHANGED
@@ -1,10 +1,10 @@
1
1
  import * as ts from 'typescript';
2
- import { gitFactory, GitImportOption } from './git.factory';
2
+ import { gitConfigFactory, RepoConfig } from './git.factory';
3
3
 
4
4
  export interface GitImportPluginOptions {
5
5
  transform: string;
6
6
  type: string;
7
- options: GitImportOption[];
7
+ options: RepoConfig[];
8
8
  }
9
9
  export enum GitImportStatus {
10
10
  Waiting = 'waiting',
@@ -20,7 +20,7 @@ export default function (program: ts.Program, { options }: GitImportPluginOption
20
20
  if (buildStatus.status === GitImportStatus.Waiting) {
21
21
  // console.log(111111, buildStatus, options);
22
22
  buildStatus.status = GitImportStatus.Pending;
23
- gitFactory(options).then(() => {
23
+ gitConfigFactory(options).then(() => {
24
24
  buildStatus.status = GitImportStatus.Success;
25
25
  }).catch(() => {
26
26
  buildStatus.status = GitImportStatus.Failed;