@simplysm/sd-cli 12.13.12 → 12.13.14
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/dist/entry/sd-cli-ai-command.js +16 -5
- package/dist/entry/sd-cli-ai-command.js.map +1 -1
- package/dist/entry/sd-cli-cordova.js +11 -21
- package/dist/entry/sd-cli-cordova.js.map +1 -1
- package/dist/entry/sd-cli-electron.js +5 -5
- package/dist/entry/sd-cli-electron.js.map +1 -1
- package/dist/entry/sd-cli-project.js +20 -10
- package/dist/entry/sd-cli-project.js.map +1 -1
- package/dist/types/config.types.d.ts +4 -1
- package/package.json +12 -12
- package/src/entry/sd-cli-ai-command.ts +22 -11
- package/src/entry/sd-cli-cordova.ts +56 -30
- package/src/entry/sd-cli-electron.ts +7 -10
- package/src/entry/sd-cli-project.ts +31 -21
- package/src/types/config.types.ts +5 -1
|
@@ -7,9 +7,19 @@ export class SdCliAiCommand {
|
|
|
7
7
|
throw new Error("ANTHROPIC_API_KEY 환경변수가 설정되어 있지 않습니다.");
|
|
8
8
|
}
|
|
9
9
|
process.stdout.write("add 실행\n");
|
|
10
|
-
await SdProcess.spawnAsync("git add .");
|
|
10
|
+
await SdProcess.spawnAsync("git", ["add", "."]);
|
|
11
11
|
process.stdout.write(`diff 실행\n`);
|
|
12
|
-
const diff = await SdProcess.spawnAsync(
|
|
12
|
+
const diff = await SdProcess.spawnAsync("git", [
|
|
13
|
+
"diff",
|
|
14
|
+
"--no-textconv",
|
|
15
|
+
"--staged",
|
|
16
|
+
"--",
|
|
17
|
+
".",
|
|
18
|
+
`:(exclude).*`,
|
|
19
|
+
`:(exclude)_*`,
|
|
20
|
+
`:(exclude)yarn.lock`,
|
|
21
|
+
`:(exclude)packages/*/styles.css`,
|
|
22
|
+
]);
|
|
13
23
|
if (StringUtils.isNullOrEmpty(diff.trim())) {
|
|
14
24
|
throw new Error("변경사항이 없습니다.");
|
|
15
25
|
}
|
|
@@ -42,12 +52,13 @@ ${diff}`,
|
|
|
42
52
|
process.stdout.write("\n\n-------------------------\n" +
|
|
43
53
|
message.content[0].text +
|
|
44
54
|
"\n-------------------------\n\n");
|
|
45
|
-
const messages = message.content[0].text
|
|
55
|
+
const messages = message.content[0].text
|
|
56
|
+
.replaceAll(/"/g, '\\"')
|
|
46
57
|
.matchAll(/```(?:\w*\n)?([\s\S]*?)```/g);
|
|
47
58
|
const commitMessage = Array.from(messages)
|
|
48
|
-
.map(item => item[1].trim())
|
|
59
|
+
.map((item) => item[1].trim())
|
|
49
60
|
.join("\n\n\n");
|
|
50
|
-
await SdProcess.spawnAsync(
|
|
61
|
+
await SdProcess.spawnAsync("git", ["commit", "-m", commitMessage]);
|
|
51
62
|
process.stdout.write("커밋이 완료되었습니다. 위 커밋메시지가 맘에들지 않을경우, 직접 커밋을 취소하세요.\n");
|
|
52
63
|
}
|
|
53
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-ai-command.js","sourceRoot":"","sources":["../../src/entry/sd-cli-ai-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAE1C,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,KAAK,CAAC,WAAW;QACtB,IAAI,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACjC,MAAM,SAAS,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"sd-cli-ai-command.js","sourceRoot":"","sources":["../../src/entry/sd-cli-ai-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAE1C,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,KAAK,CAAC,WAAW;QACtB,IAAI,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACjC,MAAM,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QAEhD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE;YAC7C,MAAM;YACN,eAAe;YACf,UAAU;YACV,IAAI;YACJ,GAAG;YACH,cAAc;YACd,cAAc;YACd,qBAAqB;YACrB,iCAAiC;SAClC,CAAC,CAAC;QAEH,IAAI,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAE3E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QAChF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3C,KAAK,EAAE,yBAAyB;YAChC,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE;;;;;;;;;;;EAWjB,IAAI,EAAE;iBACC;aACF;SACF,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACvC,MAAM,IAAI,eAAe,EAAE,CAAC;QAC9B,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,iCAAiC;YAC/B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;YACvB,iCAAiC,CACpC,CAAC;QAEF,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;aACrC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;aACvB,QAAQ,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;aACvC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aAC7B,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElB,MAAM,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;QACnE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,kDAAkD,CACnD,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -26,20 +26,10 @@ export class SdCliCordova {
|
|
|
26
26
|
this.#npmConfig = FsUtils.readJson(path.resolve(this._opt.pkgPath, "package.json"));
|
|
27
27
|
}
|
|
28
28
|
static #logger = SdLogger.get(["simplysm", "sd-cli", "SdCliCordova"]);
|
|
29
|
-
static async #execAsync(cmd, cwd) {
|
|
30
|
-
this.#logger.debug(`실행 명령: ${cmd}`);
|
|
31
|
-
const msg = await SdProcess.spawnAsync(cmd, { cwd });
|
|
29
|
+
static async #execAsync(cmd, args, cwd) {
|
|
30
|
+
this.#logger.debug(`실행 명령: ${cmd + " " + args.join(" ")}`);
|
|
31
|
+
const msg = await SdProcess.spawnAsync(cmd, args, { cwd });
|
|
32
32
|
this.#logger.debug(`실행 결과: ${msg}`);
|
|
33
|
-
/*try {
|
|
34
|
-
this._logger.debug(`실행 명령: ${cmd}`);
|
|
35
|
-
const msg = await SdProcess.spawnAsync(cmd, { cwd });
|
|
36
|
-
this._logger.debug(`실행 결과: ${msg}`);
|
|
37
|
-
}
|
|
38
|
-
catch (err) {
|
|
39
|
-
this._logger.error(`명령 실행 실패: ${cmd}`);
|
|
40
|
-
this._logger.error(`오류: ${err instanceof Error ? err.message : String(err)}`);
|
|
41
|
-
throw err;
|
|
42
|
-
}*/
|
|
43
33
|
}
|
|
44
34
|
async initializeAsync() {
|
|
45
35
|
const cordovaPath = path.resolve(this._opt.pkgPath, this.#CORDOVA_DIR_NAME);
|
|
@@ -58,7 +48,7 @@ export class SdCliCordova {
|
|
|
58
48
|
// 7. XML 설정 구성
|
|
59
49
|
this.#configureXml(cordovaPath);
|
|
60
50
|
// 8. 각 플랫폼 www 준비
|
|
61
|
-
await _a.#execAsync(
|
|
51
|
+
await _a.#execAsync("npx", ["cordova", "prepare"], cordovaPath);
|
|
62
52
|
}
|
|
63
53
|
// 1. Cordova 프로젝트 초기화
|
|
64
54
|
async #initializeCordovaProjectAsync(cordovaPath) {
|
|
@@ -66,9 +56,9 @@ export class SdCliCordova {
|
|
|
66
56
|
_a.#logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
|
|
67
57
|
}
|
|
68
58
|
else {
|
|
69
|
-
await _a.#execAsync(
|
|
59
|
+
await _a.#execAsync("npx", ["cordova", "telemetry", "on"], this._opt.pkgPath);
|
|
70
60
|
// 프로젝트 생성
|
|
71
|
-
await _a.#execAsync(
|
|
61
|
+
await _a.#execAsync("npx", ["cordova", "create", cordovaPath, this._opt.config.appId, this._opt.config.appName], process.cwd());
|
|
72
62
|
}
|
|
73
63
|
// platforms 폴더 혹시 없으면 생성
|
|
74
64
|
FsUtils.mkdirs(path.resolve(cordovaPath, this.#PLATFORMS_DIR_NAME));
|
|
@@ -82,7 +72,7 @@ export class SdCliCordova {
|
|
|
82
72
|
for (const platform of this.#platforms) {
|
|
83
73
|
if (alreadyPlatforms.includes(platform))
|
|
84
74
|
continue;
|
|
85
|
-
await _a.#execAsync(
|
|
75
|
+
await _a.#execAsync("npx", ["cordova", "platform", "add", platform], cordovaPath);
|
|
86
76
|
}
|
|
87
77
|
}
|
|
88
78
|
// 3. 플러그인 관리
|
|
@@ -103,7 +93,7 @@ export class SdCliCordova {
|
|
|
103
93
|
for (const alreadyPlugin of alreadyPlugins) {
|
|
104
94
|
if (!usePlugins.includes(alreadyPlugin.id) && !usePlugins.includes(alreadyPlugin.name)) {
|
|
105
95
|
try {
|
|
106
|
-
await _a.#execAsync(
|
|
96
|
+
await _a.#execAsync("npx", ["cordova", "plugin", "remove", alreadyPlugin.name], cordovaPath);
|
|
107
97
|
}
|
|
108
98
|
catch (err) {
|
|
109
99
|
// 의존성으로 인한 skip 메시지는 무시 (로그 생략)
|
|
@@ -120,7 +110,7 @@ export class SdCliCordova {
|
|
|
120
110
|
for (const usePlugin of usePlugins) {
|
|
121
111
|
const isPluginAlreadyInstalled = alreadyPlugins.some((plugin) => usePlugin === plugin.id || usePlugin === plugin.name);
|
|
122
112
|
if (!isPluginAlreadyInstalled) {
|
|
123
|
-
await _a.#execAsync(
|
|
113
|
+
await _a.#execAsync("npx", ["cordova", "plugin", "add", usePlugin], cordovaPath);
|
|
124
114
|
}
|
|
125
115
|
}
|
|
126
116
|
}
|
|
@@ -342,7 +332,7 @@ export class SdCliCordova {
|
|
|
342
332
|
// 빌드 실행 - 병렬 처리로 개선
|
|
343
333
|
const buildType = this._opt.config.debug ? "debug" : "release";
|
|
344
334
|
// 모든 플랫폼 동시에 빌드
|
|
345
|
-
await Promise.all(this.#platforms.map((platform) => _a.#execAsync(
|
|
335
|
+
await Promise.all(this.#platforms.map((platform) => _a.#execAsync("npx", ["cordova", "build", platform, `--${buildType}`], cordovaPath)));
|
|
346
336
|
// 결과물 복사 및 ZIP 파일 생성 - 병렬 처리
|
|
347
337
|
await Promise.all(Object.keys(this._opt.config.platform ?? {}).map(async (platform) => {
|
|
348
338
|
await this.#processBuildOutputAsync(cordovaPath, outPath, platform, buildType);
|
|
@@ -401,7 +391,7 @@ export class SdCliCordova {
|
|
|
401
391
|
}, 3000);
|
|
402
392
|
</script>`.trim());
|
|
403
393
|
}
|
|
404
|
-
await this.#execAsync(
|
|
394
|
+
await this.#execAsync("npx", ["cordova", "run", opt.platform, "--device"], cordovaPath);
|
|
405
395
|
}
|
|
406
396
|
}
|
|
407
397
|
_a = SdCliCordova;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-cordova.js","sourceRoot":"","sources":["../../src/entry/sd-cli-cordova.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sd-cli-cordova.js","sourceRoot":"","sources":["../../src/entry/sd-cli-cordova.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGjF,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAE7D,MAAM,OAAO,YAAY;IACvB,QAAQ;IACR,iBAAiB,GAAG,UAAU,CAAC;IAC/B,mBAAmB,GAAG,WAAW,CAAC;IAClC,aAAa,GAAG,KAAK,CAAC;IAEtB,iBAAiB,GAAG,SAAS,CAAC;IAC9B,mBAAmB,GAAG,YAAY,CAAC;IACnC,oBAAoB,GAAG,IAAI,CAAC,CAAC,oBAAoB;IACjD,mBAAmB,GAAG,kBAAkB,CAAC;IACzC,qBAAqB,GAAG,YAAY,CAAC;IACrC,4BAA4B,GAAG,gBAAgB,CAAC;IAChD,qBAAqB,GAAG,YAAY,CAAC;IACrC,0BAA0B,GAAG,8CAA8C,CAAC;IAC5E,cAAc,GAAG,WAAW,CAAC;IAC7B,uBAAuB,GAAG,oBAAoB,CAAC;IAC/C,uBAAuB,GAAG,kBAAkB,CAAC;IAE7C,UAAU,CAAW;IACrB,UAAU,CAAa;IAEvB,YAA6B,IAAgE;QAAhE,SAAI,GAAJ,IAAI,CAA4D;QAC3F,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;IAEtE,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,IAAc,EAAE,GAAW;QAC9D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3D,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE5E,sBAAsB;QACtB,MAAM,IAAI,CAAC,8BAA8B,CAAC,WAAW,CAAC,CAAC;QAEvD,YAAY;QACZ,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;QAE9C,aAAa;QACb,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAE5C,iBAAiB;QACjB,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAEpC,iBAAiB;QACjB,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAErC,uBAAuB;QACvB,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAC;QAE5C,eAAe;QACf,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAEhC,kBAAkB;QAClB,MAAM,EAAY,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,CAAC;IAC5E,CAAC;IAED,sBAAsB;IACtB,KAAK,CAAC,8BAA8B,CAAC,WAAmB;QACtD,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAChC,EAAY,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,EAAY,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAExF,UAAU;YACV,MAAM,EAAY,CAAC,UAAU,CAC3B,KAAK,EACL,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EACpF,OAAO,CAAC,GAAG,EAAE,CACd,CAAC;QACJ,CAAC;QAED,yBAAyB;QACzB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAEpE,mBAAmB;QACnB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,YAAY;IACZ,KAAK,CAAC,qBAAqB,CAAC,WAAmB;QAC7C,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAE9F,mBAAmB;QACnB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACvC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAAE,SAAS;YAElD,MAAM,EAAY,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAED,aAAa;IACb,KAAK,CAAC,mBAAmB,CAAC,WAAmB;QAC3C,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CACnC,WAAW,EACX,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,mBAAmB,CACzB,CAAC;QACF,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEhG,MAAM,cAAc,GAIf,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3C,IAAI,EAAE,GAAG;YACT,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE;YAC/B,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,YAAY;SAC7C,CAAC,CAAC,CAAC;QAEJ,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE/D,8CAA8C;QAC9C,MAAM,IAAI,CAAC,yBAAyB,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;QAC9E,MAAM,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC7B,WAAmB,EACnB,cAA4E,EAC5E,UAAoB;QAEpB,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;YAC3C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;gBACvF,IAAI,CAAC;oBACH,MAAM,EAAY,CAAC,UAAU,CAC3B,KAAK,EACL,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,IAAI,CAAC,EACnD,WAAW,CACZ,CAAC;gBACJ,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,gCAAgC;oBAChC,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAC7D,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;wBAChF,MAAM,GAAG,CAAC;oBACZ,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,WAAmB,EACnB,cAA4E,EAC5E,UAAoB;QAEpB,sCAAsC;QACtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,wBAAwB,GAAG,cAAc,CAAC,IAAI,CAClD,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,KAAK,MAAM,CAAC,EAAE,IAAI,SAAS,KAAK,MAAM,CAAC,IAAI,CACjE,CAAC;YAEF,IAAI,CAAC,wBAAwB,EAAE,CAAC;gBAC9B,MAAM,EAAY,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,CAAC;YAC7F,CAAC;QACH,CAAC;IACH,CAAC;IAED,iBAAiB;IACjB,iBAAiB,CAAC,WAAmB;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACzE,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEpF,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAC7C,OAAO,CAAC,IAAI,CACV,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAChF,YAAY,CACb,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC7B,iCAAiC;YACjC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,iBAAiB;IACjB,kBAAkB,CAAC,WAAmB;QACpC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAEzE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO;YACtD,CAAC,CAAC;gBACE,OAAO,EAAE;oBACP,OAAO,EAAE;wBACP,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK;wBACxE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI;4BACxC,CAAC,CAAC;gCACE,QAAQ,EAAE,YAAY;gCACtB,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa;gCACnE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK;gCACnD,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ;gCACzD,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY;6BAClE;4BACH,CAAC,CAAC,EAAE,CAAC;qBACR;iBACF;aACF;YACH,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO,CAAC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClD,CAAC;IAED,uBAAuB;IACvB,yBAAyB,CAAC,WAAmB;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACnE,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACjF,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAEzF,aAAa;QACb,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YAClC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC5B,OAAO,CAAC,IAAI,CACV,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EACtD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAChE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC;QAED,qBAAqB;QACrB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YACxE,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACjC,OAAO,CAAC,SAAS,CACf,mBAAmB,EACnB;;;;;;;;cAQM,CAAC,IAAI,EAAE,CACd,CAAC;QACJ,CAAC;IACH,CAAC;IAED,eAAe;IACf,aAAa,CAAC,WAAmB;QAC/B,iBAAiB;QACjB,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC7E,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAExF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QACnD,CAAC;QAED,iBAAiB;QACjB,MAAM,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEtD,gBAAgB;QAChB,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,CAAC;QAE3C,mBAAmB;QACnB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;YACvC,IAAI,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC;QAC/C,CAAC;QAED,mBAAmB;QACnB,MAAM,mBAAmB,GAAG,UAAU,CAAC,SAAS,CAAC,SAAS,EAAE;YAC1D,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;QACH,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;IACzD,CAAC;IAED,0BAA0B,CAAC,SAAc;QACvC,QAAQ;QACR,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAErD,UAAU;QACV,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;YAClC,SAAS,CAAC,MAAM,CAAC,IAAI,GAAG;gBACtB;oBACE,CAAC,EAAE;wBACD,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;qBACtE;iBACF;aACF,CAAC;QACJ,CAAC;QAED,UAAU;QACV,SAAS,CAAC,MAAM,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,6BAA6B,EAAE,EAAE,CAAC,CAAC;QAC3E,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACnD,SAAS,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC9D,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC1D,SAAS,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,4BAA4B,CAAC,SAAc;QACzC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,4CAA4C,CAAC;QACnF,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,kCAAkC,CAAC;QAEvE,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;QAE5D,MAAM,eAAe,GAAG;YACtB,GAAG,EAAE;gBACH,IAAI,EAAE,SAAS;aAChB;YACD,YAAY,EAAE;gBACZ;oBACE,CAAC,EAAE;wBACD,IAAI,EAAE,uCAAuC;wBAC7C,KAAK,EAAE,GAAG,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC,uBAAuB,EAAE;qBACzE;iBACF;aACF;YACD,aAAa,EAAE;gBACb;oBACE,CAAC,EAAE;wBACD,IAAI,EAAE,kCAAkC;wBACxC,IAAI,EAAE,OAAO;wBACb,MAAM,EAAE,WAAW;qBACpB;oBACD,QAAQ,EAAE;wBACR;4BACE,CAAC,EAAE;gCACD,aAAa,EAAE,kCAAkC;6BAClD;yBACF;qBACF;iBACF;gBACD;oBACE,CAAC,EAAE;wBACD,IAAI,EAAE,kCAAkC;wBACxC,IAAI,EAAE,OAAO;wBACb,MAAM,EAAE,uBAAuB;qBAChC;oBACD,WAAW,EAAE;wBACX;4BACE,CAAC,EAAE;gCACD,8BAA8B,EAAE,MAAM;gCACtC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,MAAM;oCAC5C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,CAC9D,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,EACzB,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,MAAO,CAAC,GAAG,CAAC,CAC1D;oCACH,CAAC,CAAC,EAAE,CAAC;6BACR;yBACF;qBACF;iBACF;aACF;SACF,CAAC;QAEF,YAAY;QACZ,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC;YAC3D,eAAe,CAAC,UAAU,CAAC,IAAI,CAC7B,GAAG;gBACD;oBACE,CAAC,EAAE;wBACD,IAAI,EAAE,uBAAuB;wBAC7B,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,UAAU,EAAE;qBAC3D;iBACF;gBACD;oBACE,CAAC,EAAE;wBACD,IAAI,EAAE,uBAAuB;wBAC7B,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,UAAU,EAAE;qBAC3D;iBACF;gBACD;oBACE,CAAC,EAAE;wBACD,IAAI,EAAE,0BAA0B;wBAChC,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,UAAU,EAAE;qBAC3D;iBACF;gBACD;oBACE,CAAC,EAAE;wBACD,IAAI,EAAE,2BAA2B;wBACjC,KAAK,EAAE,IAAI,CAAC,oBAAoB;qBACjC;iBACF;aACF,CACF,CAAC;QACJ,CAAC;QAED,QAAQ;QACR,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,WAAW,EAAE,CAAC;YACpD,eAAe,CAAC,aAAa,CAAC,GAAG,eAAe,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YACtE,eAAe,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC;gBAClC,GAAG,EAAE;oBACH,MAAM,EAAE,qBAAqB;oBAC7B,MAAM,EAAE,IAAI;iBACb;gBACD,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAChF,CAAC,EAAE;wBACD,cAAc,EAAE,sBAAsB,IAAI,CAAC,IAAI,EAAE;wBACjD,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI;4BAC5B,CAAC,CAAC;gCACE,uBAAuB,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE;6BACjD;4BACH,CAAC,CAAC,EAAE,CAAC;wBACP,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI;4BACrB,CAAC,CAAC;gCACE,cAAc,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE;6BACjC;4BACH,CAAC,CAAC,EAAE,CAAC;qBACR;iBACF,CAAC,CAAC;aACJ,CAAC,CAAC;QACL,CAAC;QAED,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE5E,oBAAoB;QACpB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAE/D,gBAAgB;QAChB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC/B,EAAY,CAAC,UAAU,CACrB,KAAK,EACL,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,SAAS,EAAE,CAAC,EAChD,WAAW,CACZ,CACF,CACF,CAAC;QAEF,6BAA6B;QAC7B,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAClE,MAAM,IAAI,CAAC,wBAAwB,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACjF,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,WAAmB,EACnB,OAAe,EACf,QAAgB,EAChB,SAAiB;QAEjB,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEtD,kBAAkB;QAClB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QACtE,CAAC;QAED,mBAAmB;QACnB,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACnE,CAAC;IAED,uBAAuB,CAAC,WAAmB,EAAE,aAAqB,EAAE,SAAiB;QACnF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,IAAI;YAC1D,CAAC,CAAC,OAAO,SAAS,MAAM;YACxB,CAAC,CAAC,OAAO,SAAS,eAAe,CAAC;QAEpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CACzC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAS,CAAC,OAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,aAAa,CACvG,CAAC;QAEF,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,CACV,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,yCAAyC,EAAE,SAAS,EAAE,WAAW,CAAC,EAC5F,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,qBAAqB,CAAC,CACnD,CAAC;QAEF,SAAS;QACT,OAAO,CAAC,IAAI,CACV,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,yCAAyC,EAAE,SAAS,EAAE,WAAW,CAAC,EAC5F,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CACzE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,WAAmB,EACnB,OAAe,EACf,QAAgB;QAEhB,MAAM,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAC9D,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAClC,WAAW,EACX,IAAI,CAAC,mBAAmB,EACxB,QAAQ,EACR,cAAc,CACf,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAE1C,YAAY;QACZ,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC9B,OAAO,CAAC,SAAS,CACf,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,EAC7D,MAAM,GAAG,CAAC,aAAa,EAAE,CAC1B,CAAC;IACJ,CAAC;IAED,cAAc,CAAC,GAAU,EAAE,OAAe;QACxC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAChD,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,GAIpC;QACC,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAe,CAAC;QAChG,MAAM,WAAW,GAAG,WAAW,CAAC,UAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3D,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,CACnD,CAAC;QAEF,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAC9B,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAE,EACzD,UAAU,CACX,CAAC;QAEF,IAAI,GAAG,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;YACjD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;YACjD,OAAO,CAAC,SAAS,CACf,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EAC3C;GACL,GAAG,CAAC,GAAG;;;8BAGoB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,OAAO;;UAE7D,CAAC,IAAI,EAAE,CACV,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC;IAC1F,CAAC"}
|
|
@@ -11,7 +11,7 @@ export class SdCliElectron {
|
|
|
11
11
|
this.#logger.log("준비...");
|
|
12
12
|
await this.#prepareAsync({ pkgPath, electronPath, electronConfig });
|
|
13
13
|
this.#logger.log("실행...");
|
|
14
|
-
await SdProcess.spawnAsync(
|
|
14
|
+
await SdProcess.spawnAsync("npx", ["electron", "."], { cwd: electronPath, showMessage: true });
|
|
15
15
|
}
|
|
16
16
|
static async buildForDevAsync(opt) {
|
|
17
17
|
this.#logger.log("설정 가져오기...");
|
|
@@ -67,8 +67,8 @@ export class SdCliElectron {
|
|
|
67
67
|
: {}),
|
|
68
68
|
dependencies: reinstallPkgNames.toObject((item) => item, (item) => npmConfig.dependencies[item]),
|
|
69
69
|
});
|
|
70
|
-
await SdProcess.spawnAsync(
|
|
71
|
-
await SdProcess.spawnAsync(
|
|
70
|
+
await SdProcess.spawnAsync("npm", ["install"], { cwd: opt.electronPath, showMessage: true });
|
|
71
|
+
await SdProcess.spawnAsync("npx", ["electron-rebuild"], {
|
|
72
72
|
cwd: opt.electronPath,
|
|
73
73
|
showMessage: true,
|
|
74
74
|
});
|
|
@@ -85,7 +85,7 @@ export class SdCliElectron {
|
|
|
85
85
|
win: {
|
|
86
86
|
target: opt.electronConfig.portable ? "portable" : "nsis",
|
|
87
87
|
},
|
|
88
|
-
nsis: {},
|
|
88
|
+
nsis: opt.electronConfig.nsisOptions ?? {},
|
|
89
89
|
directories: {
|
|
90
90
|
app: opt.electronPath,
|
|
91
91
|
output: opt.electronDistPath,
|
|
@@ -101,7 +101,7 @@ export class SdCliElectron {
|
|
|
101
101
|
};
|
|
102
102
|
const configFilePath = path.resolve(opt.pkgPath, ".electron/builder-config.json");
|
|
103
103
|
FsUtils.writeJson(configFilePath, electronConfig);
|
|
104
|
-
await SdProcess.spawnAsync(
|
|
104
|
+
await SdProcess.spawnAsync("npx", ["electron-builder", "--win", "--config", configFilePath]);
|
|
105
105
|
FsUtils.copy(path.resolve(opt.electronDistPath, `${opt.npmConfig.description} ${opt.electronConfig.portable ? "" : "Setup "}${opt.npmConfig.version}.exe`), path.resolve(opt.pkgPath, `dist/electron/${opt.npmConfig.description}${opt.electronConfig.portable ? "-portable" : ""}-latest.exe`));
|
|
106
106
|
FsUtils.copy(path.resolve(opt.electronDistPath, `${opt.npmConfig.description} ${opt.electronConfig.portable ? "" : "Setup "}${opt.npmConfig.version}.exe`), path.resolve(opt.pkgPath, `dist/electron/updates/${opt.npmConfig.version}.exe`));
|
|
107
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-electron.js","sourceRoot":"","sources":["../../src/entry/sd-cli-electron.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,MAAM,OAAO,aAAa;IACxB,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC;IAEvE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAA4D;QAChF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAEjF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1B,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC,CAAC;QAEpE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1B,MAAM,SAAS,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"sd-cli-electron.js","sourceRoot":"","sources":["../../src/entry/sd-cli-electron.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,7 +105,7 @@ export class SdCliProject {
|
|
|
105
105
|
// GIT 사용중일 경우, 커밋되지 않은 수정사항이 있는지 확인
|
|
106
106
|
if (FsUtils.exists(path.resolve(process.cwd(), ".git"))) {
|
|
107
107
|
logger.debug("GIT 커밋여부 확인...");
|
|
108
|
-
const gitStatusResult = await SdProcess.spawnAsync("git status");
|
|
108
|
+
const gitStatusResult = await SdProcess.spawnAsync("git", ["status"]);
|
|
109
109
|
if (gitStatusResult.includes("Changes") || gitStatusResult.includes("Untracked")) {
|
|
110
110
|
throw new Error("커밋되지 않은 정보가 있습니다.\n" + gitStatusResult);
|
|
111
111
|
}
|
|
@@ -145,18 +145,24 @@ export class SdCliProject {
|
|
|
145
145
|
this.#logging(messages.mapMany(), logger);
|
|
146
146
|
}
|
|
147
147
|
catch (err) {
|
|
148
|
-
await SdProcess.spawnAsync("git checkout .");
|
|
148
|
+
await SdProcess.spawnAsync("git", ["checkout", "."]);
|
|
149
149
|
throw err;
|
|
150
150
|
}
|
|
151
151
|
// GIT 사용중일경우, 새 버전 커밋 및 TAG 생성
|
|
152
152
|
if (FsUtils.exists(path.resolve(process.cwd(), ".git"))) {
|
|
153
153
|
logger.debug("새 버전 커밋 및 TAG 생성...");
|
|
154
|
-
await SdProcess.spawnAsync("git add .");
|
|
155
|
-
await SdProcess.spawnAsync(
|
|
156
|
-
await SdProcess.spawnAsync(
|
|
154
|
+
await SdProcess.spawnAsync("git", ["add", "."]);
|
|
155
|
+
await SdProcess.spawnAsync("git", ["commit", "-m", `v${projNpmConf.version}`]);
|
|
156
|
+
await SdProcess.spawnAsync("git", [
|
|
157
|
+
"tag",
|
|
158
|
+
"-a",
|
|
159
|
+
`v${projNpmConf.version}`,
|
|
160
|
+
"-m",
|
|
161
|
+
`v${projNpmConf.version}`,
|
|
162
|
+
]);
|
|
157
163
|
logger.debug("새 버전 푸쉬...");
|
|
158
|
-
await SdProcess.spawnAsync("git push");
|
|
159
|
-
await SdProcess.spawnAsync("git push --tags");
|
|
164
|
+
await SdProcess.spawnAsync("git", ["push"]);
|
|
165
|
+
await SdProcess.spawnAsync("git", ["push", "--tags"]);
|
|
160
166
|
}
|
|
161
167
|
}
|
|
162
168
|
logger.debug("배포 시작...");
|
|
@@ -174,7 +180,7 @@ export class SdCliProject {
|
|
|
174
180
|
for (const postPublishItem of projConf.postPublish) {
|
|
175
181
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
176
182
|
if (postPublishItem.type === "script") {
|
|
177
|
-
const
|
|
183
|
+
const replaceEnvPath = (str) => str.replace(/%([^%]*)%/g, (item) => {
|
|
178
184
|
const envName = item.replace(/%/g, "");
|
|
179
185
|
if (!StringUtils.isNullOrEmpty(projNpmConf.version) && envName === "SD_VERSION") {
|
|
180
186
|
return projNpmConf.version;
|
|
@@ -184,7 +190,9 @@ export class SdCliProject {
|
|
|
184
190
|
}
|
|
185
191
|
return process.env[envName] ?? item;
|
|
186
192
|
});
|
|
187
|
-
|
|
193
|
+
const cmd = replaceEnvPath(postPublishItem.cmd);
|
|
194
|
+
const args = postPublishItem.args.map((arg) => replaceEnvPath(arg));
|
|
195
|
+
await SdProcess.spawnAsync(cmd, args);
|
|
188
196
|
}
|
|
189
197
|
else {
|
|
190
198
|
throw new NeverEntryError();
|
|
@@ -195,7 +203,9 @@ export class SdCliProject {
|
|
|
195
203
|
}
|
|
196
204
|
static async #publishPkgAsync(pkgPath, pkgPubConf) {
|
|
197
205
|
if (pkgPubConf === "npm") {
|
|
198
|
-
await SdProcess.spawnAsync("yarn npm publish --access public", {
|
|
206
|
+
await SdProcess.spawnAsync("yarn", ["npm", "publish", "--access", "public"], {
|
|
207
|
+
cwd: pkgPath,
|
|
208
|
+
});
|
|
199
209
|
}
|
|
200
210
|
else if (pkgPubConf?.type === "local-directory") {
|
|
201
211
|
const pkgNpmConf = FsUtils.readJson(path.resolve(pkgPath, "package.json"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-project.js","sourceRoot":"","sources":["../../src/entry/sd-cli-project.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sd-cli-project.js","sourceRoot":"","sources":["../../src/entry/sd-cli-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import electronBuilder from "electron-builder";
|
|
1
2
|
export interface ISdProjectConfig {
|
|
2
3
|
packages: Record<string, TSdPackageConfig | undefined>;
|
|
3
4
|
localUpdates?: Record<string, string>;
|
|
@@ -64,6 +65,7 @@ export interface ISdClientBuilderElectronConfig {
|
|
|
64
65
|
installerIcon?: string;
|
|
65
66
|
portable?: boolean;
|
|
66
67
|
postInstallScript?: string;
|
|
68
|
+
nsisOptions?: electronBuilder.NsisOptions;
|
|
67
69
|
reinstallDependencies?: string[];
|
|
68
70
|
env?: Record<string, string>;
|
|
69
71
|
}
|
|
@@ -102,5 +104,6 @@ export interface ISdClientBuilderCordovaConfig {
|
|
|
102
104
|
export type TSdPostPublishConfig = ISdPostPublishScriptConfig;
|
|
103
105
|
export interface ISdPostPublishScriptConfig {
|
|
104
106
|
type: "script";
|
|
105
|
-
|
|
107
|
+
cmd: string;
|
|
108
|
+
args: string[];
|
|
106
109
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "12.13.
|
|
3
|
+
"version": "12.13.14",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -12,21 +12,21 @@
|
|
|
12
12
|
"bin": "./dist/sd-cli.js",
|
|
13
13
|
"type": "module",
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@angular/build": "^20.
|
|
16
|
-
"@angular/compiler": "^20.1
|
|
17
|
-
"@angular/compiler-cli": "^20.1
|
|
15
|
+
"@angular/build": "^20.2.0",
|
|
16
|
+
"@angular/compiler": "^20.2.1",
|
|
17
|
+
"@angular/compiler-cli": "^20.2.1",
|
|
18
18
|
"@anthropic-ai/sdk": "^0.60.0",
|
|
19
19
|
"@electron/rebuild": "^4.0.1",
|
|
20
|
-
"@simplysm/sd-core-common": "12.13.
|
|
21
|
-
"@simplysm/sd-core-node": "12.13.
|
|
22
|
-
"@simplysm/sd-service-server": "12.13.
|
|
23
|
-
"@simplysm/sd-storage": "12.13.
|
|
24
|
-
"browserslist": "^4.25.
|
|
20
|
+
"@simplysm/sd-core-common": "12.13.14",
|
|
21
|
+
"@simplysm/sd-core-node": "12.13.14",
|
|
22
|
+
"@simplysm/sd-service-server": "12.13.14",
|
|
23
|
+
"@simplysm/sd-storage": "12.13.14",
|
|
24
|
+
"browserslist": "^4.25.3",
|
|
25
25
|
"cordova": "^12.0.0",
|
|
26
|
-
"electron": "^37.3.
|
|
26
|
+
"electron": "^37.3.1",
|
|
27
27
|
"electron-builder": "26.0.12",
|
|
28
|
-
"esbuild": "0.25.
|
|
29
|
-
"eslint": "^9.
|
|
28
|
+
"esbuild": "0.25.9",
|
|
29
|
+
"eslint": "^9.34.0",
|
|
30
30
|
"glob": "^11.0.3",
|
|
31
31
|
"node-stdlib-browser": "^1.3.1",
|
|
32
32
|
"rxjs": "^7.8.2",
|
|
@@ -9,12 +9,20 @@ export class SdCliAiCommand {
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
process.stdout.write("add 실행\n");
|
|
12
|
-
await SdProcess.spawnAsync("git add .");
|
|
12
|
+
await SdProcess.spawnAsync("git", ["add", "."]);
|
|
13
13
|
|
|
14
14
|
process.stdout.write(`diff 실행\n`);
|
|
15
|
-
const diff = await SdProcess.spawnAsync(
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
const diff = await SdProcess.spawnAsync("git", [
|
|
16
|
+
"diff",
|
|
17
|
+
"--no-textconv",
|
|
18
|
+
"--staged",
|
|
19
|
+
"--",
|
|
20
|
+
".",
|
|
21
|
+
`:(exclude).*`,
|
|
22
|
+
`:(exclude)_*`,
|
|
23
|
+
`:(exclude)yarn.lock`,
|
|
24
|
+
`:(exclude)packages/*/styles.css`,
|
|
25
|
+
]);
|
|
18
26
|
|
|
19
27
|
if (StringUtils.isNullOrEmpty(diff.trim())) {
|
|
20
28
|
throw new Error("변경사항이 없습니다.");
|
|
@@ -50,17 +58,20 @@ ${diff}`,
|
|
|
50
58
|
|
|
51
59
|
process.stdout.write(
|
|
52
60
|
"\n\n-------------------------\n" +
|
|
53
|
-
|
|
54
|
-
|
|
61
|
+
message.content[0].text +
|
|
62
|
+
"\n-------------------------\n\n",
|
|
55
63
|
);
|
|
56
64
|
|
|
57
|
-
const messages = message.content[0].text
|
|
65
|
+
const messages = message.content[0].text
|
|
66
|
+
.replaceAll(/"/g, '\\"')
|
|
58
67
|
.matchAll(/```(?:\w*\n)?([\s\S]*?)```/g);
|
|
59
68
|
const commitMessage = Array.from(messages)
|
|
60
|
-
.map(item => item[1].trim())
|
|
69
|
+
.map((item) => item[1].trim())
|
|
61
70
|
.join("\n\n\n");
|
|
62
71
|
|
|
63
|
-
await SdProcess.spawnAsync(
|
|
64
|
-
process.stdout.write(
|
|
72
|
+
await SdProcess.spawnAsync("git", ["commit", "-m", commitMessage]);
|
|
73
|
+
process.stdout.write(
|
|
74
|
+
"커밋이 완료되었습니다. 위 커밋메시지가 맘에들지 않을경우, 직접 커밋을 취소하세요.\n",
|
|
75
|
+
);
|
|
65
76
|
}
|
|
66
|
-
}
|
|
77
|
+
}
|
|
@@ -32,21 +32,10 @@ export class SdCliCordova {
|
|
|
32
32
|
|
|
33
33
|
static #logger = SdLogger.get(["simplysm", "sd-cli", "SdCliCordova"]);
|
|
34
34
|
|
|
35
|
-
static async #execAsync(cmd: string, cwd: string): Promise<void> {
|
|
36
|
-
this.#logger.debug(`실행 명령: ${cmd}`);
|
|
37
|
-
const msg = await SdProcess.spawnAsync(cmd, { cwd });
|
|
35
|
+
static async #execAsync(cmd: string, args: string[], cwd: string): Promise<void> {
|
|
36
|
+
this.#logger.debug(`실행 명령: ${cmd + " " + args.join(" ")}`);
|
|
37
|
+
const msg = await SdProcess.spawnAsync(cmd, args, { cwd });
|
|
38
38
|
this.#logger.debug(`실행 결과: ${msg}`);
|
|
39
|
-
|
|
40
|
-
/*try {
|
|
41
|
-
this._logger.debug(`실행 명령: ${cmd}`);
|
|
42
|
-
const msg = await SdProcess.spawnAsync(cmd, { cwd });
|
|
43
|
-
this._logger.debug(`실행 결과: ${msg}`);
|
|
44
|
-
}
|
|
45
|
-
catch (err) {
|
|
46
|
-
this._logger.error(`명령 실행 실패: ${cmd}`);
|
|
47
|
-
this._logger.error(`오류: ${err instanceof Error ? err.message : String(err)}`);
|
|
48
|
-
throw err;
|
|
49
|
-
}*/
|
|
50
39
|
}
|
|
51
40
|
|
|
52
41
|
async initializeAsync(): Promise<void> {
|
|
@@ -74,7 +63,7 @@ export class SdCliCordova {
|
|
|
74
63
|
this.#configureXml(cordovaPath);
|
|
75
64
|
|
|
76
65
|
// 8. 각 플랫폼 www 준비
|
|
77
|
-
await SdCliCordova.#execAsync(
|
|
66
|
+
await SdCliCordova.#execAsync("npx", ["cordova", "prepare"], cordovaPath);
|
|
78
67
|
}
|
|
79
68
|
|
|
80
69
|
// 1. Cordova 프로젝트 초기화
|
|
@@ -82,11 +71,12 @@ export class SdCliCordova {
|
|
|
82
71
|
if (FsUtils.exists(cordovaPath)) {
|
|
83
72
|
SdCliCordova.#logger.log("이미 생성되어있는 '.cordova'를 사용합니다.");
|
|
84
73
|
} else {
|
|
85
|
-
await SdCliCordova.#execAsync(
|
|
74
|
+
await SdCliCordova.#execAsync("npx", ["cordova", "telemetry", "on"], this._opt.pkgPath);
|
|
86
75
|
|
|
87
76
|
// 프로젝트 생성
|
|
88
77
|
await SdCliCordova.#execAsync(
|
|
89
|
-
|
|
78
|
+
"npx",
|
|
79
|
+
["cordova", "create", cordovaPath, this._opt.config.appId, this._opt.config.appName],
|
|
90
80
|
process.cwd(),
|
|
91
81
|
);
|
|
92
82
|
}
|
|
@@ -106,13 +96,17 @@ export class SdCliCordova {
|
|
|
106
96
|
for (const platform of this.#platforms) {
|
|
107
97
|
if (alreadyPlatforms.includes(platform)) continue;
|
|
108
98
|
|
|
109
|
-
await SdCliCordova.#execAsync(
|
|
99
|
+
await SdCliCordova.#execAsync("npx", ["cordova", "platform", "add", platform], cordovaPath);
|
|
110
100
|
}
|
|
111
101
|
}
|
|
112
102
|
|
|
113
103
|
// 3. 플러그인 관리
|
|
114
104
|
async #managePluginsAsync(cordovaPath: string): Promise<void> {
|
|
115
|
-
const pluginsFetchPath = path.resolve(
|
|
105
|
+
const pluginsFetchPath = path.resolve(
|
|
106
|
+
cordovaPath,
|
|
107
|
+
this.#PLUGINS_DIR_NAME,
|
|
108
|
+
this.#PLUGINS_FETCH_FILE,
|
|
109
|
+
);
|
|
116
110
|
const pluginsFetch = FsUtils.exists(pluginsFetchPath) ? FsUtils.readJson(pluginsFetchPath) : {};
|
|
117
111
|
|
|
118
112
|
const alreadyPlugins: Array<{
|
|
@@ -140,7 +134,11 @@ export class SdCliCordova {
|
|
|
140
134
|
for (const alreadyPlugin of alreadyPlugins) {
|
|
141
135
|
if (!usePlugins.includes(alreadyPlugin.id) && !usePlugins.includes(alreadyPlugin.name)) {
|
|
142
136
|
try {
|
|
143
|
-
await SdCliCordova.#execAsync(
|
|
137
|
+
await SdCliCordova.#execAsync(
|
|
138
|
+
"npx",
|
|
139
|
+
["cordova", "plugin", "remove", alreadyPlugin.name],
|
|
140
|
+
cordovaPath,
|
|
141
|
+
);
|
|
144
142
|
} catch (err) {
|
|
145
143
|
// 의존성으로 인한 skip 메시지는 무시 (로그 생략)
|
|
146
144
|
const msg = err instanceof Error ? err.message : String(err);
|
|
@@ -164,7 +162,7 @@ export class SdCliCordova {
|
|
|
164
162
|
);
|
|
165
163
|
|
|
166
164
|
if (!isPluginAlreadyInstalled) {
|
|
167
|
-
await SdCliCordova.#execAsync(
|
|
165
|
+
await SdCliCordova.#execAsync("npx", ["cordova", "plugin", "add", usePlugin], cordovaPath);
|
|
168
166
|
}
|
|
169
167
|
}
|
|
170
168
|
}
|
|
@@ -175,7 +173,10 @@ export class SdCliCordova {
|
|
|
175
173
|
const signingPropsPath = path.resolve(cordovaPath, this.#ANDROID_SIGNING_PROP_PATH);
|
|
176
174
|
|
|
177
175
|
if (this._opt.config.platform?.android?.sign) {
|
|
178
|
-
FsUtils.copy(
|
|
176
|
+
FsUtils.copy(
|
|
177
|
+
path.resolve(this._opt.pkgPath, this._opt.config.platform.android.sign.keystore),
|
|
178
|
+
keystorePath,
|
|
179
|
+
);
|
|
179
180
|
} else {
|
|
180
181
|
FsUtils.remove(keystorePath);
|
|
181
182
|
// SIGN을 안쓸경우 아래 파일이 생성되어 있으면 오류남
|
|
@@ -423,7 +424,11 @@ export class SdCliCordova {
|
|
|
423
424
|
// 모든 플랫폼 동시에 빌드
|
|
424
425
|
await Promise.all(
|
|
425
426
|
this.#platforms.map((platform) =>
|
|
426
|
-
SdCliCordova.#execAsync(
|
|
427
|
+
SdCliCordova.#execAsync(
|
|
428
|
+
"npx",
|
|
429
|
+
["cordova", "build", platform, `--${buildType}`],
|
|
430
|
+
cordovaPath,
|
|
431
|
+
),
|
|
427
432
|
),
|
|
428
433
|
);
|
|
429
434
|
|
|
@@ -474,10 +479,19 @@ export class SdCliCordova {
|
|
|
474
479
|
);
|
|
475
480
|
}
|
|
476
481
|
|
|
477
|
-
async #createUpdateZipAsync(
|
|
482
|
+
async #createUpdateZipAsync(
|
|
483
|
+
cordovaPath: string,
|
|
484
|
+
outPath: string,
|
|
485
|
+
platform: string,
|
|
486
|
+
): Promise<void> {
|
|
478
487
|
const zip = new SdZip();
|
|
479
488
|
const wwwPath = path.resolve(cordovaPath, this.#WWW_DIR_NAME);
|
|
480
|
-
const platformWwwPath = path.resolve(
|
|
489
|
+
const platformWwwPath = path.resolve(
|
|
490
|
+
cordovaPath,
|
|
491
|
+
this.#PLATFORMS_DIR_NAME,
|
|
492
|
+
platform,
|
|
493
|
+
"platform_www",
|
|
494
|
+
);
|
|
481
495
|
|
|
482
496
|
this.#addFilesToZip(zip, wwwPath);
|
|
483
497
|
this.#addFilesToZip(zip, platformWwwPath);
|
|
@@ -485,7 +499,10 @@ export class SdCliCordova {
|
|
|
485
499
|
// ZIP 파일 생성
|
|
486
500
|
const updateDirPath = path.resolve(outPath, platform, "updates");
|
|
487
501
|
FsUtils.mkdirs(updateDirPath);
|
|
488
|
-
FsUtils.writeFile(
|
|
502
|
+
FsUtils.writeFile(
|
|
503
|
+
path.resolve(updateDirPath, this.#npmConfig.version + ".zip"),
|
|
504
|
+
await zip.compressAsync(),
|
|
505
|
+
);
|
|
489
506
|
}
|
|
490
507
|
|
|
491
508
|
#addFilesToZip(zip: SdZip, dirPath: string) {
|
|
@@ -497,11 +514,20 @@ export class SdCliCordova {
|
|
|
497
514
|
}
|
|
498
515
|
}
|
|
499
516
|
|
|
500
|
-
static async runWebviewOnDeviceAsync(opt: {
|
|
517
|
+
static async runWebviewOnDeviceAsync(opt: {
|
|
518
|
+
platform: string;
|
|
519
|
+
package: string;
|
|
520
|
+
url?: string;
|
|
521
|
+
}): Promise<void> {
|
|
501
522
|
const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json")) as INpmConfig;
|
|
502
|
-
const allPkgPaths = projNpmConf.workspaces!.mapMany((item) =>
|
|
523
|
+
const allPkgPaths = projNpmConf.workspaces!.mapMany((item) =>
|
|
524
|
+
FsUtils.glob(PathUtils.posix(process.cwd(), item)),
|
|
525
|
+
);
|
|
503
526
|
|
|
504
|
-
const cordovaPath = path.resolve(
|
|
527
|
+
const cordovaPath = path.resolve(
|
|
528
|
+
allPkgPaths.single((item) => item.endsWith(opt.package))!,
|
|
529
|
+
".cordova",
|
|
530
|
+
);
|
|
505
531
|
|
|
506
532
|
if (opt.url !== undefined) {
|
|
507
533
|
FsUtils.remove(path.resolve(cordovaPath, "www"));
|
|
@@ -518,6 +544,6 @@ export class SdCliCordova {
|
|
|
518
544
|
);
|
|
519
545
|
}
|
|
520
546
|
|
|
521
|
-
await this.#execAsync(
|
|
547
|
+
await this.#execAsync("npx", ["cordova", "run", opt.platform, "--device"], cordovaPath);
|
|
522
548
|
}
|
|
523
549
|
}
|
|
@@ -18,7 +18,7 @@ export class SdCliElectron {
|
|
|
18
18
|
await this.#prepareAsync({ pkgPath, electronPath, electronConfig });
|
|
19
19
|
|
|
20
20
|
this.#logger.log("실행...");
|
|
21
|
-
await SdProcess.spawnAsync(
|
|
21
|
+
await SdProcess.spawnAsync("npx", ["electron", "."], { cwd: electronPath, showMessage: true });
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
static async buildForDevAsync(opt: { package: string; config: string; options?: string[] }) {
|
|
@@ -52,11 +52,7 @@ export class SdCliElectron {
|
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
static async #loadDevConfig(opt: {
|
|
56
|
-
package: string;
|
|
57
|
-
config: string;
|
|
58
|
-
options?: string[];
|
|
59
|
-
}) {
|
|
55
|
+
static async #loadDevConfig(opt: { package: string; config: string; options?: string[] }) {
|
|
60
56
|
const projConf = await loadProjConfAsync(process.cwd(), true, opt);
|
|
61
57
|
const pkgConf = projConf.packages[opt.package];
|
|
62
58
|
if (pkgConf?.type !== "client" || pkgConf.builder?.electron === undefined) {
|
|
@@ -99,9 +95,9 @@ export class SdCliElectron {
|
|
|
99
95
|
),
|
|
100
96
|
});
|
|
101
97
|
|
|
102
|
-
await SdProcess.spawnAsync(
|
|
98
|
+
await SdProcess.spawnAsync("npm", ["install"], { cwd: opt.electronPath, showMessage: true });
|
|
103
99
|
|
|
104
|
-
await SdProcess.spawnAsync(
|
|
100
|
+
await SdProcess.spawnAsync("npx", ["electron-rebuild"], {
|
|
105
101
|
cwd: opt.electronPath,
|
|
106
102
|
showMessage: true,
|
|
107
103
|
});
|
|
@@ -129,7 +125,7 @@ export class SdCliElectron {
|
|
|
129
125
|
win: {
|
|
130
126
|
target: opt.electronConfig.portable ? "portable" : "nsis",
|
|
131
127
|
},
|
|
132
|
-
nsis: {},
|
|
128
|
+
nsis: opt.electronConfig.nsisOptions ?? {},
|
|
133
129
|
directories: {
|
|
134
130
|
app: opt.electronPath,
|
|
135
131
|
output: opt.electronDistPath,
|
|
@@ -143,9 +139,10 @@ export class SdCliElectron {
|
|
|
143
139
|
npmRebuild: false,
|
|
144
140
|
forceCodeSigning: false,
|
|
145
141
|
};
|
|
142
|
+
|
|
146
143
|
const configFilePath = path.resolve(opt.pkgPath, ".electron/builder-config.json");
|
|
147
144
|
FsUtils.writeJson(configFilePath, electronConfig);
|
|
148
|
-
await SdProcess.spawnAsync(
|
|
145
|
+
await SdProcess.spawnAsync("npx", ["electron-builder", "--win", "--config", configFilePath]);
|
|
149
146
|
|
|
150
147
|
FsUtils.copy(
|
|
151
148
|
path.resolve(
|
|
@@ -144,7 +144,7 @@ export class SdCliProject {
|
|
|
144
144
|
// GIT 사용중일 경우, 커밋되지 않은 수정사항이 있는지 확인
|
|
145
145
|
if (FsUtils.exists(path.resolve(process.cwd(), ".git"))) {
|
|
146
146
|
logger.debug("GIT 커밋여부 확인...");
|
|
147
|
-
const gitStatusResult = await SdProcess.spawnAsync("git status");
|
|
147
|
+
const gitStatusResult = await SdProcess.spawnAsync("git", ["status"]);
|
|
148
148
|
if (gitStatusResult.includes("Changes") || gitStatusResult.includes("Untracked")) {
|
|
149
149
|
throw new Error("커밋되지 않은 정보가 있습니다.\n" + gitStatusResult);
|
|
150
150
|
}
|
|
@@ -189,22 +189,26 @@ export class SdCliProject {
|
|
|
189
189
|
|
|
190
190
|
this.#logging(messages.mapMany(), logger);
|
|
191
191
|
} catch (err) {
|
|
192
|
-
await SdProcess.spawnAsync("git checkout .");
|
|
192
|
+
await SdProcess.spawnAsync("git", ["checkout", "."]);
|
|
193
193
|
throw err;
|
|
194
194
|
}
|
|
195
195
|
|
|
196
196
|
// GIT 사용중일경우, 새 버전 커밋 및 TAG 생성
|
|
197
197
|
if (FsUtils.exists(path.resolve(process.cwd(), ".git"))) {
|
|
198
198
|
logger.debug("새 버전 커밋 및 TAG 생성...");
|
|
199
|
-
await SdProcess.spawnAsync("git add .");
|
|
200
|
-
await SdProcess.spawnAsync(
|
|
201
|
-
await SdProcess.spawnAsync(
|
|
202
|
-
|
|
203
|
-
|
|
199
|
+
await SdProcess.spawnAsync("git", ["add", "."]);
|
|
200
|
+
await SdProcess.spawnAsync("git", ["commit", "-m", `v${projNpmConf.version}`]);
|
|
201
|
+
await SdProcess.spawnAsync("git", [
|
|
202
|
+
"tag",
|
|
203
|
+
"-a",
|
|
204
|
+
`v${projNpmConf.version}`,
|
|
205
|
+
"-m",
|
|
206
|
+
`v${projNpmConf.version}`,
|
|
207
|
+
]);
|
|
204
208
|
|
|
205
209
|
logger.debug("새 버전 푸쉬...");
|
|
206
|
-
await SdProcess.spawnAsync("git push");
|
|
207
|
-
await SdProcess.spawnAsync("git push --tags");
|
|
210
|
+
await SdProcess.spawnAsync("git", ["push"]);
|
|
211
|
+
await SdProcess.spawnAsync("git", ["push", "--tags"]);
|
|
208
212
|
}
|
|
209
213
|
}
|
|
210
214
|
|
|
@@ -224,17 +228,21 @@ export class SdCliProject {
|
|
|
224
228
|
for (const postPublishItem of projConf.postPublish) {
|
|
225
229
|
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
226
230
|
if (postPublishItem.type === "script") {
|
|
227
|
-
const
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
231
|
+
const replaceEnvPath = (str: string) =>
|
|
232
|
+
str.replace(/%([^%]*)%/g, (item) => {
|
|
233
|
+
const envName = item.replace(/%/g, "");
|
|
234
|
+
if (!StringUtils.isNullOrEmpty(projNpmConf.version) && envName === "SD_VERSION") {
|
|
235
|
+
return projNpmConf.version;
|
|
236
|
+
}
|
|
237
|
+
if (envName === "SD_PROJECT_PATH") {
|
|
238
|
+
return process.cwd();
|
|
239
|
+
}
|
|
240
|
+
return process.env[envName] ?? item;
|
|
241
|
+
});
|
|
242
|
+
|
|
243
|
+
const cmd = replaceEnvPath(postPublishItem.cmd);
|
|
244
|
+
const args = postPublishItem.args.map((arg) => replaceEnvPath(arg));
|
|
245
|
+
await SdProcess.spawnAsync(cmd, args);
|
|
238
246
|
} else {
|
|
239
247
|
throw new NeverEntryError();
|
|
240
248
|
}
|
|
@@ -249,7 +257,9 @@ export class SdCliProject {
|
|
|
249
257
|
pkgPubConf: TSdPackageConfig["publish"],
|
|
250
258
|
): Promise<void> {
|
|
251
259
|
if (pkgPubConf === "npm") {
|
|
252
|
-
await SdProcess.spawnAsync("yarn npm publish --access public", {
|
|
260
|
+
await SdProcess.spawnAsync("yarn", ["npm", "publish", "--access", "public"], {
|
|
261
|
+
cwd: pkgPath,
|
|
262
|
+
});
|
|
253
263
|
} else if (pkgPubConf?.type === "local-directory") {
|
|
254
264
|
const pkgNpmConf = FsUtils.readJson(path.resolve(pkgPath, "package.json")) as INpmConfig;
|
|
255
265
|
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import electronBuilder from "electron-builder";
|
|
2
|
+
|
|
1
3
|
export interface ISdProjectConfig {
|
|
2
4
|
packages: Record<string, TSdPackageConfig | undefined>;
|
|
3
5
|
// types: Record<string, TSdPackageConfig | undefined>;
|
|
@@ -81,6 +83,7 @@ export interface ISdClientBuilderElectronConfig {
|
|
|
81
83
|
installerIcon?: string;
|
|
82
84
|
portable?: boolean;
|
|
83
85
|
postInstallScript?: string;
|
|
86
|
+
nsisOptions?: electronBuilder.NsisOptions;
|
|
84
87
|
// devServerHost?: string;
|
|
85
88
|
// devServerPort?: number;
|
|
86
89
|
reinstallDependencies?: string[];
|
|
@@ -127,5 +130,6 @@ export type TSdPostPublishConfig = ISdPostPublishScriptConfig;
|
|
|
127
130
|
|
|
128
131
|
export interface ISdPostPublishScriptConfig {
|
|
129
132
|
type: "script";
|
|
130
|
-
|
|
133
|
+
cmd: string;
|
|
134
|
+
args: string[];
|
|
131
135
|
}
|