@simplysm/sd-cli 14.0.9 → 14.0.11
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/commands/device.d.ts +13 -0
- package/dist/commands/device.d.ts.map +1 -0
- package/dist/commands/device.js +53 -0
- package/dist/commands/device.js.map +1 -0
- package/dist/orchestrators/DevWatchOrchestrator.d.ts.map +1 -1
- package/dist/orchestrators/DevWatchOrchestrator.js +2 -24
- package/dist/orchestrators/DevWatchOrchestrator.js.map +1 -1
- package/dist/sd-cli-entry.d.ts.map +1 -1
- package/dist/sd-cli-entry.js +30 -1
- package/dist/sd-cli-entry.js.map +1 -1
- package/package.json +4 -4
- package/src/commands/device.ts +65 -0
- package/src/orchestrators/DevWatchOrchestrator.ts +2 -26
- package/src/sd-cli-entry.ts +36 -1
- package/tests/commands/device.spec.ts +147 -0
- package/tests/orchestrators/dev-watch-orchestrator.spec.ts +21 -93
- package/tests/workers/ngtsc-build-worker.spec.ts +6 -6
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface DeviceOptions {
|
|
2
|
+
package: string;
|
|
3
|
+
url?: string;
|
|
4
|
+
options: string[];
|
|
5
|
+
}
|
|
6
|
+
/**
|
|
7
|
+
* Run native app on device/desktop.
|
|
8
|
+
*
|
|
9
|
+
* - Electron config takes priority over Capacitor when both are present.
|
|
10
|
+
* - If --url is not provided, auto-generates from sd.config.ts server port.
|
|
11
|
+
*/
|
|
12
|
+
export declare function runDevice(options: DeviceOptions): Promise<void>;
|
|
13
|
+
//# sourceMappingURL=device.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/commands/device.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA2CrE"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { consola } from "consola";
|
|
2
|
+
import { pathx } from "@simplysm/core-node";
|
|
3
|
+
import { SdError } from "@simplysm/core-common";
|
|
4
|
+
import { loadSdConfig } from "../utils/sd-config.js";
|
|
5
|
+
import { Capacitor } from "../capacitor/capacitor.js";
|
|
6
|
+
import { Electron } from "../electron/electron.js";
|
|
7
|
+
const logger = consola.withTag("sd:cli:device");
|
|
8
|
+
/**
|
|
9
|
+
* Run native app on device/desktop.
|
|
10
|
+
*
|
|
11
|
+
* - Electron config takes priority over Capacitor when both are present.
|
|
12
|
+
* - If --url is not provided, auto-generates from sd.config.ts server port.
|
|
13
|
+
*/
|
|
14
|
+
export async function runDevice(options) {
|
|
15
|
+
const cwd = process.cwd();
|
|
16
|
+
const sdConfig = await loadSdConfig({ cwd, dev: true, options: options.options });
|
|
17
|
+
const pkgConfig = sdConfig.packages[options.package];
|
|
18
|
+
if (pkgConfig == null) {
|
|
19
|
+
throw new SdError(`패키지를 찾을 수 없습니다: ${options.package}`);
|
|
20
|
+
}
|
|
21
|
+
if (pkgConfig.target !== "client") {
|
|
22
|
+
throw new SdError(`client 패키지만 device 실행이 가능합니다: ${options.package} (target: ${pkgConfig.target})`);
|
|
23
|
+
}
|
|
24
|
+
const clientConfig = pkgConfig;
|
|
25
|
+
const pkgDir = pathx.posixResolve(cwd, "packages", options.package);
|
|
26
|
+
// Determine server URL
|
|
27
|
+
let serverUrl = options.url;
|
|
28
|
+
if (serverUrl == null) {
|
|
29
|
+
if (typeof clientConfig.server === "number") {
|
|
30
|
+
serverUrl = `http://localhost:${clientConfig.server}`;
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
throw new SdError(`--url 옵션이 필요합니다. server가 패키지명으로 설정되어 있습니다: ${clientConfig.server}`);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
// Electron takes priority over Capacitor (v13 behavior)
|
|
37
|
+
if (clientConfig.electron != null) {
|
|
38
|
+
logger.start(`${options.package} (electron) 실행 중...`);
|
|
39
|
+
const electron = await Electron.create(pkgDir, clientConfig.electron, clientConfig.exclude);
|
|
40
|
+
await electron.run(serverUrl);
|
|
41
|
+
logger.success(`${options.package} (electron) 실행 완료`);
|
|
42
|
+
}
|
|
43
|
+
else if (clientConfig.capacitor != null) {
|
|
44
|
+
logger.start(`${options.package} (capacitor) 실행 중...`);
|
|
45
|
+
const cap = await Capacitor.create(pkgDir, clientConfig.capacitor, clientConfig.exclude);
|
|
46
|
+
await cap.run(serverUrl);
|
|
47
|
+
logger.success(`${options.package} (capacitor) 실행 완료`);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
throw new SdError(`${options.package}에 capacitor 또는 electron 설정이 없습니다.`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=device.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/commands/device.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWatchOrchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrators/DevWatchOrchestrator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DevWatchOrchestrator.d.ts","sourceRoot":"","sources":["../../src/orchestrators/DevWatchOrchestrator.ts"],"names":[],"mappings":"AA0BA;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,KAAK,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;;;GAKG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAGzB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkC;IAGjE,OAAO,CAAC,gBAAgB,CAA0B;IAClD,OAAO,CAAC,eAAe,CAA2E;IAClG,OAAO,CAAC,kBAAkB,CAAmG;IAC7H,OAAO,CAAC,eAAe,CAA2E;IAClG,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkC;IACjE,OAAO,CAAC,iBAAiB,CAA+B;IAGxD,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAoE;IAC1G,OAAO,CAAC,kBAAkB,CAA4C;IACtE,OAAO,CAAC,mBAAmB,CAA4C;IAGvE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAmB;IACtD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAmC;IACtE,OAAO,CAAC,kBAAkB,CAAoC;IAE9D,OAAO,CAAC,YAAY,CAAqC;IACzD,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,YAAY,CAAS;gBAEjB,OAAO,EAAE,2BAA2B;IAM1C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAkI3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IActB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAwCjB,eAAe;IA+C7B,OAAO,CAAC,gBAAgB;YAsBV,aAAa;IA2E3B,OAAO,CAAC,mBAAmB;YAeb,eAAe;IA6B7B,OAAO,CAAC,qBAAqB;IAO7B,sEAAsE;IACtE,OAAO,CAAC,cAAc;IAKtB,4DAA4D;IAC5D,OAAO,CAAC,mBAAmB;YAYb,mBAAmB;CAyDlC"}
|
|
@@ -14,7 +14,6 @@ import { SignalHandler } from "../infra/SignalHandler.js";
|
|
|
14
14
|
import { createBuildEngine } from "../engines/index.js";
|
|
15
15
|
import { watchCopySrcFiles } from "../utils/copy-src.js";
|
|
16
16
|
import { Capacitor } from "../capacitor/capacitor.js";
|
|
17
|
-
import { Electron } from "../electron/electron.js";
|
|
18
17
|
/**
|
|
19
18
|
* Unified Orchestrator for watch and dev modes.
|
|
20
19
|
*
|
|
@@ -313,42 +312,21 @@ export class DevWatchOrchestrator {
|
|
|
313
312
|
}
|
|
314
313
|
}
|
|
315
314
|
}
|
|
316
|
-
//
|
|
315
|
+
// Initialize Capacitor for client packages (device execution is handled by the `device` command)
|
|
317
316
|
for (const { name, config } of this._clientPackages) {
|
|
318
317
|
const port = this._getClientPort(name);
|
|
319
318
|
if (port == null)
|
|
320
319
|
continue;
|
|
321
|
-
const devServerUrl = `http://localhost:${port}`;
|
|
322
320
|
const pkgDir = pathx.posixResolve(this._cwd, "packages", name);
|
|
323
321
|
if (config.capacitor != null) {
|
|
324
322
|
try {
|
|
325
323
|
const cap = await Capacitor.create(pkgDir, config.capacitor, config.exclude);
|
|
326
324
|
await cap.initialize();
|
|
327
|
-
await cap.run(devServerUrl);
|
|
328
325
|
}
|
|
329
326
|
catch (err) {
|
|
330
|
-
this._logger.error(`[${name}] Capacitor
|
|
327
|
+
this._logger.error(`[${name}] Capacitor 초기화 실패: ${errNs.message(err)}`);
|
|
331
328
|
}
|
|
332
329
|
}
|
|
333
|
-
if (config.electron != null) {
|
|
334
|
-
void (async () => {
|
|
335
|
-
try {
|
|
336
|
-
const elc = await Electron.create(pkgDir, config.electron, config.exclude);
|
|
337
|
-
await elc.initialize();
|
|
338
|
-
await elc.run(devServerUrl);
|
|
339
|
-
}
|
|
340
|
-
catch (err) {
|
|
341
|
-
this._logger.error(`[${name}] Electron 실행 실패: ${errNs.message(err)}`);
|
|
342
|
-
this._resultCollector.add({
|
|
343
|
-
name,
|
|
344
|
-
target: "client",
|
|
345
|
-
type: "build",
|
|
346
|
-
status: "error",
|
|
347
|
-
message: `Electron 실행 실패: ${errNs.message(err)}`,
|
|
348
|
-
});
|
|
349
|
-
}
|
|
350
|
-
})();
|
|
351
|
-
}
|
|
352
330
|
}
|
|
353
331
|
// Print initial results
|
|
354
332
|
printErrors(this._resultCollector.toMap());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevWatchOrchestrator.js","sourceRoot":"","sources":["../../src/orchestrators/DevWatchOrchestrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,MAAM,EAAoB,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAQrD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACtJ,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAA8B,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAA2F,MAAM,kBAAkB,CAAC;AAC9I,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAkBhD;;;;;GAKG;AACH,MAAM,OAAO,oBAAoB;IACd,IAAI,CAAS;IACb,QAAQ,CAA8B;IACtC,OAAO,CAAC;IAEzB,iBAAiB;IACT,gBAAgB,CAAmB;IACnC,cAAc,CAAiB;IAC/B,eAAe,CAAkB;IAEzC,UAAU;IACO,eAAe,GAAkB,EAAE,CAAC;IACpC,cAAc,GAAG,IAAI,GAAG,EAAuB,CAAC;IAEjE,eAAe;IACP,gBAAgB,GAAuB,EAAE,CAAC;IAC1C,eAAe,GAAwE,EAAE,CAAC;IAC1F,kBAAkB,GAAgG,EAAE,CAAC;IACrH,eAAe,GAAwE,EAAE,CAAC;IACjF,cAAc,GAAG,IAAI,GAAG,EAAuB,CAAC;IACzD,iBAAiB,GAAG,IAAI,GAAG,EAAoB,CAAC;IAExD,4BAA4B;IACpB,QAAQ,CAA2C;IAC1C,qBAAqB,GAAG,IAAI,GAAG,EAAyD,CAAC;IAClG,kBAAkB,CAA4C;IAC9D,mBAAmB,CAA4C;IAEvE,WAAW;IACH,gBAAgB,GAAgB,EAAE,CAAC;IAC1B,kBAAkB,GAAgB,EAAE,CAAC;IACrC,kBAAkB,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC9D,kBAAkB,CAAoC;IAEtD,YAAY,CAAqC;IACjD,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IACrC,YAAY,GAAG,KAAK,CAAC;IAE7B,YAAY,OAAoC;QAC9C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAEnF,kBAAkB;QAClB,IAAI,QAAkB,CAAC;QACvB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,YAAY,CAAC;gBAC5B,GAAG,EAAE,IAAI,CAAC,IAAI;gBACd,GAAG,EAAE,IAAI;gBACT,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;aAC/B,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YACtF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,MAAM,GAAG,CAAC;QACZ,CAAC;QAED,uFAAuF;QACvF,IAAI,CAAC,QAAQ,GAAG,sBAAsB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE1D,mBAAmB;QACnB,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE1D,wCAAwC;QACxC,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC;QAEzC,2CAA2C;QAC3C,IAAI,QAAQ,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,kBAAkB,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QACpF,CAAC;QAED,sDAAsD;QACtD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,QAAQ,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAChD,CAAC;QAED,oBAAoB;QACpB,MAAM,WAAW,GAAG,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAEtF,kCAAkC;QAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChF,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,eAAe,CAAC;YACnD,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,iBAAiB,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9E,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC;YACjD,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC;YACjD,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,gBAAgB,CAAC;QACvD,CAAC;QAED,yCAAyC;QACzC,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAChJ,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAC/D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS,kBAAkB,CAAC,CAAC;YACvD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,4BAA4B;QAC5B,IAAI,CAAC,cAAc,GAAG,IAAI,aAAa,EAAE,CAAC;QAC1C,IAAI,CAAC,gBAAgB,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,IAAI,CAAC,eAAe,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAExD,yBAAyB;QACzB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACnC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,cAAc,EAAE,EAAE;gBAC1D,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,aAAa,EAAE,EAAE;gBACzD,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;QACL,CAAC;QAED,6DAA6D;QAC7D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxC,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,EAAE;gBACpC,GAAG,EAAE,IAAI,CAAC,IAAI;gBACd,WAAW,EAAE,IAAI,CAAC,YAAY;gBAC9B,eAAe,EAAE,IAAI,CAAC,gBAAgB;gBACtC,cAAc,EAAE,IAAI,CAAC,eAAe;aACrC,CAAC,CAAC;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;QAED,0CAA0C;QAC1C,KAAK,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK;gBAC/C,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,EAAE;gBACzD,CAAC,CAAC,MAAM,CAAC;YAEX,MAAM,MAAM,GAAG,iBAAiB,CAC9B,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAuB,EACxD;gBACE,GAAG,EAAE,IAAI,CAAC,IAAI;gBACd,WAAW,EAAE,IAAI,CAAC,YAAY;gBAC9B,eAAe,EAAE,IAAI,CAAC,gBAAgB;gBACtC,cAAc,EAAE,IAAI,CAAC,eAAe;aACrC,CACF,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;QAED,0DAA0D;QAC1D,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACvE,WAAW,EAAE,CAAC,CAAC,UAAU;YACzB,UAAU,EAAE,CAAC,CAAC,kBAAkB;SACjC,CAAC,CAAC,CAAC;QAEJ,KAAK,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzD,MAAM,YAAY,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC;YAC7E,MAAM,MAAM,GAAG,iBAAiB,CAC9B,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAuB,EACxD;gBACE,GAAG,EAAE,IAAI,CAAC,IAAI;gBACd,WAAW,EAAE,IAAI,CAAC,YAAY;gBAC9B,mBAAmB;gBACnB,eAAe,EAAE,IAAI,CAAC,gBAAgB;gBACtC,cAAc,EAAE,IAAI,CAAC,eAAe;aACrC,CACF,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACnC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAElC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAEpC,MAAM,aAAa,GAAyB,EAAE,CAAC;QAE/C,mBAAmB;QACnB,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACjE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9E,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAE9E,8BAA8B;QAC9B,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACnE,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAErE,4BAA4B;QAC5B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC;YACrD,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;gBAC3B,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,CAAC;QACH,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;QAEhC,uCAAuC;QACvC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAE1F,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACjC,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE,CAAC;QAEnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IAED,qBAAqB;IAEb,KAAK,CAAC,eAAe;QAC3B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAClC,8CAA8C;QAC9C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACrE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAED,oBAAoB;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,KAAK,QAAQ,CAAC,CAAC;QACpD,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE;YACjE,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC9C,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9D,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,SAAS,IAAI,KAAK,KAAK,OAAO,KAAK,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAEpC,8BAA8B;QAC9B,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC;QAE3C,uDAAuD;QACvD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,KAAM,CAAC;YACtC,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;YAEnF,mBAAmB;YACnB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;YAE5E,iBAAiB;YACjB,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACpD,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE;gBACpC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;YAC9E,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEtC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,OAAe,EAAE,GAAW,EAAE,GAAW,EAAE,IAAe;QACjF,8CAA8C;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAE5C,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACxB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,cAAc,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACzB,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,cAAc,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAClE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB;IAEX,KAAK,CAAC,aAAa;QACzB,8CAA8C;QAC9C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/B,MAAM,oBAAoB,GAAoD,EAAE,CAAC;QAEjF,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACjD,oBAAoB,CAAC,IAAI,CAAC;gBACxB,IAAI,EAAE,GAAG,IAAI,WAAW;gBACxB,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;aAClE,CAAC,CAAC;QACL,CAAC;QAED,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACjD,oBAAoB,CAAC,IAAI,CAAC;gBACxB,IAAI,EAAE,GAAG,IAAI,WAAW;gBACxB,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;aAClE,CAAC,CAAC;QACL,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,UAAU,CAC7C,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CACjD,CAAC;QAEF,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC;YAClD,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gBACjC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,QAAQ,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,QAAQ,YAAY,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,wDAAwD;QACxD,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAC5C,MAAM,iBAAiB,GAAG,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CACjE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CACpC,CAAC;YACF,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;gBACvC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;oBACjB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;wBACxB,IAAI;wBACJ,MAAM,EAAE,QAAQ;wBAChB,IAAI,EAAE,QAAQ;wBACd,MAAM,EAAE,SAAS;wBACjB,IAAI;qBACL,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,uEAAuE;QACvE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACpD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,IAAI,IAAI,IAAI;gBAAE,SAAS;YAE3B,MAAM,YAAY,GAAG,oBAAoB,IAAI,EAAE,CAAC;YAChD,MAAM,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;YAE/D,IAAI,MAAM,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;gBAC7B,IAAI,CAAC;oBACH,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC7E,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;oBACvB,MAAM,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC9B,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,IAAI,IAAI,sBAAsB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CACnD,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,MAAM,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;gBAC5B,KAAK,CAAC,KAAK,IAAI,EAAE;oBACf,IAAI,CAAC;wBACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;wBAC5E,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;wBACvB,MAAM,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;oBAC9B,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,IAAI,CAAC,OAAO,CAAC,KAAK,CAChB,IAAI,IAAI,qBAAqB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAClD,CAAC;wBACF,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;4BACxB,IAAI;4BACJ,MAAM,EAAE,QAAQ;4BAChB,IAAI,EAAE,OAAO;4BACb,MAAM,EAAE,OAAO;4BACf,OAAO,EAAE,mBAAmB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;yBACjD,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC,CAAC,EAAE,CAAC;YACP,CAAC;QACH,CAAC;QAED,wBAAwB;QACxB,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3C,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtE,CAAC;IAEO,mBAAmB,CAAC,aAAuB;QACjD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAI;YAAE,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC7E,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC,GAAG,EAAE;YACzC,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;YACrC,KAAK,IAAI,CAAC,eAAe,EAAE,CAAC;QAC9B,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChC,MAAM,eAAe,GAAyB,EAAE,CAAC;QACjD,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACpD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;YAC/D,IAAI,WAAW,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;gBACtC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;gBACtF,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;gBACnD,eAAe,CAAC,IAAI,CAClB,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC;qBACzF,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;oBACtB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;oBAClE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;wBACxB,IAAI;wBACJ,MAAM,EAAE,QAAQ;wBAChB,IAAI,EAAE,QAAQ;wBACd,MAAM,EAAE,OAAO;wBACf,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;qBAC5B,CAAC,CAAC;gBACL,CAAC,CAAC,CACL,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAEO,qBAAqB;QAC3B,IAAI,IAAI,CAAC,kBAAkB,IAAI,IAAI;YAAE,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC3E,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtE,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;IAED,sEAAsE;IAC9D,cAAc,CAAC,IAAY;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAkC,CAAC;QAC9E,OAAO,MAAM,EAAE,IAAI,CAAC;IACtB,CAAC;IAED,4DAA4D;IACpD,mBAAmB,CAAC,UAAkB;QAC5C,MAAM,WAAW,GAA2B,EAAE,CAAC;QAC/C,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QACtE,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACjB,WAAW,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YACjC,CAAC;QACH,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,UAAkB,EAClB,UAAkB,EAClB,GAA4B,EAC5B,WAAoC;QAEpC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,UAAU,gBAAgB,UAAU,EAAE,CAAC,CAAC;QAE/D,6BAA6B;QAC7B,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACnE,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,eAAe,CAAC,CAAC;YACjD,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC;QACpC,CAAC;QAED,sCAAsC;QACtC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;QAClF,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAmC,iBAAiB,CAAC,CAAC;QACzF,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAE1D,yBAAyB;QACzB,aAAa,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,SAAS,EAAE,EAAE;YAC5C,MAAM,UAAU,GAAG,SAAiC,CAAC;YACrD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;gBACxB,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,SAAS;gBACjB,IAAI,EAAE,UAAU,CAAC,IAAI;aACtB,CAAC,CAAC;YACH,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,EAAE;YACtC,MAAM,UAAU,GAAG,SAA2B,CAAC;YAC/C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;gBACxB,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,UAAU,CAAC,OAAO;aAC5B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,aAAa;aACV,KAAK,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;aACvC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,UAAU,qBAAqB,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5E,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;gBACxB,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;aAC5B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"DevWatchOrchestrator.js","sourceRoot":"","sources":["../../src/orchestrators/DevWatchOrchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-entry.d.ts","sourceRoot":"","sources":["../src/sd-cli-entry.ts"],"names":[],"mappings":";AAIA,OAAO,uBAAuB,CAAC;AAC/B,OAAc,EAAE,KAAK,IAAI,EAAE,MAAM,OAAO,CAAC;AAuCzC;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"sd-cli-entry.d.ts","sourceRoot":"","sources":["../src/sd-cli-entry.ts"],"names":[],"mappings":";AAIA,OAAO,uBAAuB,CAAC;AAC/B,OAAc,EAAE,KAAK,IAAI,EAAE,MAAM,OAAO,CAAC;AAuCzC;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CA4QpD"}
|
package/dist/sd-cli-entry.js
CHANGED
|
@@ -19,7 +19,7 @@ import { SdCliReporter } from "./utils/SdCliReporter.js";
|
|
|
19
19
|
Error.stackTraceLimit = Infinity;
|
|
20
20
|
EventEmitter.defaultMaxListeners = 100;
|
|
21
21
|
consola.options.reporters = [new SdCliReporter()];
|
|
22
|
-
const COMMAND_NAMES = ["check", "watch", "dev", "build", "publish", "replace-deps"];
|
|
22
|
+
const COMMAND_NAMES = ["check", "watch", "dev", "device", "build", "publish", "replace-deps"];
|
|
23
23
|
async function collectYargsHelp(argv) {
|
|
24
24
|
const lines = [];
|
|
25
25
|
const orig = console.log;
|
|
@@ -147,6 +147,35 @@ export function createCliParser(argv) {
|
|
|
147
147
|
targets: args.targets,
|
|
148
148
|
options: args.opt,
|
|
149
149
|
});
|
|
150
|
+
})
|
|
151
|
+
.command("device", "Run native app on device/desktop", (cmd) => cmd
|
|
152
|
+
.version(false)
|
|
153
|
+
.hide("help")
|
|
154
|
+
.options({
|
|
155
|
+
"package": {
|
|
156
|
+
type: "string",
|
|
157
|
+
alias: "p",
|
|
158
|
+
description: "Client package name to run",
|
|
159
|
+
demandOption: true,
|
|
160
|
+
},
|
|
161
|
+
"url": {
|
|
162
|
+
type: "string",
|
|
163
|
+
description: "Dev server URL (auto-detected from sd.config.ts if omitted)",
|
|
164
|
+
},
|
|
165
|
+
"opt": {
|
|
166
|
+
type: "string",
|
|
167
|
+
array: true,
|
|
168
|
+
alias: "o",
|
|
169
|
+
description: "Options to pass to sd.config.ts (e.g., -o key=value)",
|
|
170
|
+
default: [],
|
|
171
|
+
},
|
|
172
|
+
}), async (args) => {
|
|
173
|
+
const { runDevice } = await import("./commands/device.js");
|
|
174
|
+
await runDevice({
|
|
175
|
+
package: args.package,
|
|
176
|
+
url: args.url,
|
|
177
|
+
options: args.opt,
|
|
178
|
+
});
|
|
150
179
|
})
|
|
151
180
|
.command("build [targets..]", "Run production build", (cmd) => cmd
|
|
152
181
|
.version(false)
|
package/dist/sd-cli-entry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-entry.js","sourceRoot":"","sources":["../src/sd-cli-entry.ts"],"names":[],"mappings":";AACA,+BAA+B;AAE/B,kEAAkE;AAClE,OAAO,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,EAAa,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,KAAK,CAAC,eAAe,GAAG,QAAQ,CAAC;AACjC,YAAY,CAAC,mBAAmB,GAAG,GAAG,CAAC;AAEvC,OAAO,CAAC,OAAO,CAAC,SAAS,GAAG,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;AAElD,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-cli-entry.js","sourceRoot":"","sources":["../src/sd-cli-entry.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.11",
|
|
4
4
|
"description": "Simplysm package - CLI tool",
|
|
5
5
|
"author": "simplysm",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -39,9 +39,9 @@
|
|
|
39
39
|
"vite-plugin-pwa": "^1.2.0",
|
|
40
40
|
"vite-tsconfig-paths": "^6.1.1",
|
|
41
41
|
"yargs": "^18.0.0",
|
|
42
|
-
"@simplysm/core-common": "14.0.
|
|
43
|
-
"@simplysm/
|
|
44
|
-
"@simplysm/
|
|
42
|
+
"@simplysm/core-common": "14.0.11",
|
|
43
|
+
"@simplysm/core-node": "14.0.11",
|
|
44
|
+
"@simplysm/storage": "14.0.11"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
47
|
"@types/semver": "^7.7.1",
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { consola } from "consola";
|
|
2
|
+
import { pathx } from "@simplysm/core-node";
|
|
3
|
+
import { SdError } from "@simplysm/core-common";
|
|
4
|
+
import { loadSdConfig } from "../utils/sd-config";
|
|
5
|
+
import { Capacitor } from "../capacitor/capacitor";
|
|
6
|
+
import { Electron } from "../electron/electron";
|
|
7
|
+
|
|
8
|
+
const logger = consola.withTag("sd:cli:device");
|
|
9
|
+
|
|
10
|
+
export interface DeviceOptions {
|
|
11
|
+
package: string;
|
|
12
|
+
url?: string;
|
|
13
|
+
options: string[];
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Run native app on device/desktop.
|
|
18
|
+
*
|
|
19
|
+
* - Electron config takes priority over Capacitor when both are present.
|
|
20
|
+
* - If --url is not provided, auto-generates from sd.config.ts server port.
|
|
21
|
+
*/
|
|
22
|
+
export async function runDevice(options: DeviceOptions): Promise<void> {
|
|
23
|
+
const cwd = process.cwd();
|
|
24
|
+
const sdConfig = await loadSdConfig({ cwd, dev: true, options: options.options });
|
|
25
|
+
|
|
26
|
+
const pkgConfig = sdConfig.packages[options.package];
|
|
27
|
+
if (pkgConfig == null) {
|
|
28
|
+
throw new SdError(`패키지를 찾을 수 없습니다: ${options.package}`);
|
|
29
|
+
}
|
|
30
|
+
if (pkgConfig.target !== "client") {
|
|
31
|
+
throw new SdError(`client 패키지만 device 실행이 가능합니다: ${options.package} (target: ${pkgConfig.target})`);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
const clientConfig = pkgConfig;
|
|
35
|
+
const pkgDir = pathx.posixResolve(cwd, "packages", options.package);
|
|
36
|
+
|
|
37
|
+
// Determine server URL
|
|
38
|
+
let serverUrl = options.url;
|
|
39
|
+
if (serverUrl == null) {
|
|
40
|
+
if (typeof clientConfig.server === "number") {
|
|
41
|
+
serverUrl = `http://localhost:${clientConfig.server}`;
|
|
42
|
+
} else {
|
|
43
|
+
throw new SdError(
|
|
44
|
+
`--url 옵션이 필요합니다. server가 패키지명으로 설정되어 있습니다: ${clientConfig.server}`,
|
|
45
|
+
);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
// Electron takes priority over Capacitor (v13 behavior)
|
|
50
|
+
if (clientConfig.electron != null) {
|
|
51
|
+
logger.start(`${options.package} (electron) 실행 중...`);
|
|
52
|
+
const electron = await Electron.create(pkgDir, clientConfig.electron, clientConfig.exclude);
|
|
53
|
+
await electron.run(serverUrl);
|
|
54
|
+
logger.success(`${options.package} (electron) 실행 완료`);
|
|
55
|
+
} else if (clientConfig.capacitor != null) {
|
|
56
|
+
logger.start(`${options.package} (capacitor) 실행 중...`);
|
|
57
|
+
const cap = await Capacitor.create(pkgDir, clientConfig.capacitor, clientConfig.exclude);
|
|
58
|
+
await cap.run(serverUrl);
|
|
59
|
+
logger.success(`${options.package} (capacitor) 실행 완료`);
|
|
60
|
+
} else {
|
|
61
|
+
throw new SdError(
|
|
62
|
+
`${options.package}에 capacitor 또는 electron 설정이 없습니다.`,
|
|
63
|
+
);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
@@ -21,7 +21,6 @@ import { SignalHandler } from "../infra/SignalHandler";
|
|
|
21
21
|
import { createBuildEngine, type BuildEngine, type BuildPackageInfo, type ClientPackageInfo, type ServerPackageInfo } from "../engines/index";
|
|
22
22
|
import { watchCopySrcFiles } from "../utils/copy-src";
|
|
23
23
|
import { Capacitor } from "../capacitor/capacitor";
|
|
24
|
-
import { Electron } from "../electron/electron";
|
|
25
24
|
import type * as ServerRuntimeWorkerModule from "../workers/server-runtime.worker";
|
|
26
25
|
import type { ServerReadyEventData, ErrorEventData } from "../utils/worker-events";
|
|
27
26
|
|
|
@@ -400,46 +399,23 @@ export class DevWatchOrchestrator {
|
|
|
400
399
|
}
|
|
401
400
|
}
|
|
402
401
|
|
|
403
|
-
//
|
|
402
|
+
// Initialize Capacitor for client packages (device execution is handled by the `device` command)
|
|
404
403
|
for (const { name, config } of this._clientPackages) {
|
|
405
404
|
const port = this._getClientPort(name);
|
|
406
405
|
if (port == null) continue;
|
|
407
406
|
|
|
408
|
-
const devServerUrl = `http://localhost:${port}`;
|
|
409
407
|
const pkgDir = pathx.posixResolve(this._cwd, "packages", name);
|
|
410
408
|
|
|
411
409
|
if (config.capacitor != null) {
|
|
412
410
|
try {
|
|
413
411
|
const cap = await Capacitor.create(pkgDir, config.capacitor, config.exclude);
|
|
414
412
|
await cap.initialize();
|
|
415
|
-
await cap.run(devServerUrl);
|
|
416
413
|
} catch (err) {
|
|
417
414
|
this._logger.error(
|
|
418
|
-
`[${name}] Capacitor
|
|
415
|
+
`[${name}] Capacitor 초기화 실패: ${errNs.message(err)}`,
|
|
419
416
|
);
|
|
420
417
|
}
|
|
421
418
|
}
|
|
422
|
-
|
|
423
|
-
if (config.electron != null) {
|
|
424
|
-
void (async () => {
|
|
425
|
-
try {
|
|
426
|
-
const elc = await Electron.create(pkgDir, config.electron!, config.exclude);
|
|
427
|
-
await elc.initialize();
|
|
428
|
-
await elc.run(devServerUrl);
|
|
429
|
-
} catch (err) {
|
|
430
|
-
this._logger.error(
|
|
431
|
-
`[${name}] Electron 실행 실패: ${errNs.message(err)}`,
|
|
432
|
-
);
|
|
433
|
-
this._resultCollector.add({
|
|
434
|
-
name,
|
|
435
|
-
target: "client",
|
|
436
|
-
type: "build",
|
|
437
|
-
status: "error",
|
|
438
|
-
message: `Electron 실행 실패: ${errNs.message(err)}`,
|
|
439
|
-
});
|
|
440
|
-
}
|
|
441
|
-
})();
|
|
442
|
-
}
|
|
443
419
|
}
|
|
444
420
|
|
|
445
421
|
// Print initial results
|
package/src/sd-cli-entry.ts
CHANGED
|
@@ -23,7 +23,7 @@ EventEmitter.defaultMaxListeners = 100;
|
|
|
23
23
|
|
|
24
24
|
consola.options.reporters = [new SdCliReporter()];
|
|
25
25
|
|
|
26
|
-
const COMMAND_NAMES = ["check", "watch", "dev", "build", "publish", "replace-deps"];
|
|
26
|
+
const COMMAND_NAMES = ["check", "watch", "dev", "device", "build", "publish", "replace-deps"];
|
|
27
27
|
|
|
28
28
|
async function collectYargsHelp(argv: string[]): Promise<string> {
|
|
29
29
|
const lines: string[] = [];
|
|
@@ -185,6 +185,41 @@ export function createCliParser(argv: string[]): Argv {
|
|
|
185
185
|
});
|
|
186
186
|
},
|
|
187
187
|
)
|
|
188
|
+
.command(
|
|
189
|
+
"device",
|
|
190
|
+
"Run native app on device/desktop",
|
|
191
|
+
(cmd) =>
|
|
192
|
+
cmd
|
|
193
|
+
.version(false)
|
|
194
|
+
.hide("help")
|
|
195
|
+
.options({
|
|
196
|
+
"package": {
|
|
197
|
+
type: "string",
|
|
198
|
+
alias: "p",
|
|
199
|
+
description: "Client package name to run",
|
|
200
|
+
demandOption: true,
|
|
201
|
+
},
|
|
202
|
+
"url": {
|
|
203
|
+
type: "string",
|
|
204
|
+
description: "Dev server URL (auto-detected from sd.config.ts if omitted)",
|
|
205
|
+
},
|
|
206
|
+
"opt": {
|
|
207
|
+
type: "string",
|
|
208
|
+
array: true,
|
|
209
|
+
alias: "o",
|
|
210
|
+
description: "Options to pass to sd.config.ts (e.g., -o key=value)",
|
|
211
|
+
default: [] as string[],
|
|
212
|
+
},
|
|
213
|
+
}),
|
|
214
|
+
async (args) => {
|
|
215
|
+
const { runDevice } = await import("./commands/device");
|
|
216
|
+
await runDevice({
|
|
217
|
+
package: args.package,
|
|
218
|
+
url: args.url,
|
|
219
|
+
options: args.opt,
|
|
220
|
+
});
|
|
221
|
+
},
|
|
222
|
+
)
|
|
188
223
|
.command(
|
|
189
224
|
"build [targets..]",
|
|
190
225
|
"Run production build",
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
2
|
+
|
|
3
|
+
// Capacitor mock
|
|
4
|
+
const mockCapacitorInstance = {
|
|
5
|
+
initialize: vi.fn().mockResolvedValue(undefined),
|
|
6
|
+
run: vi.fn().mockResolvedValue(undefined),
|
|
7
|
+
build: vi.fn().mockResolvedValue(undefined),
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
vi.mock("../../src/capacitor/capacitor", () => ({
|
|
11
|
+
Capacitor: {
|
|
12
|
+
create: vi.fn().mockResolvedValue(mockCapacitorInstance),
|
|
13
|
+
},
|
|
14
|
+
}));
|
|
15
|
+
|
|
16
|
+
// Electron mock
|
|
17
|
+
const mockElectronInstance = {
|
|
18
|
+
initialize: vi.fn().mockResolvedValue(undefined),
|
|
19
|
+
run: vi.fn().mockResolvedValue(undefined),
|
|
20
|
+
build: vi.fn().mockResolvedValue(undefined),
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
vi.mock("../../src/electron/electron", () => ({
|
|
24
|
+
Electron: {
|
|
25
|
+
create: vi.fn().mockResolvedValue(mockElectronInstance),
|
|
26
|
+
},
|
|
27
|
+
}));
|
|
28
|
+
|
|
29
|
+
// loadSdConfig mock
|
|
30
|
+
vi.mock("../../src/utils/sd-config", () => ({
|
|
31
|
+
loadSdConfig: vi.fn(),
|
|
32
|
+
}));
|
|
33
|
+
|
|
34
|
+
const { Capacitor } = await import("../../src/capacitor/capacitor");
|
|
35
|
+
const { Electron } = await import("../../src/electron/electron");
|
|
36
|
+
const { loadSdConfig } = await import("../../src/utils/sd-config");
|
|
37
|
+
const { runDevice } = await import("../../src/commands/device");
|
|
38
|
+
|
|
39
|
+
describe("runDevice", () => {
|
|
40
|
+
beforeEach(() => {
|
|
41
|
+
vi.clearAllMocks();
|
|
42
|
+
mockCapacitorInstance.run.mockResolvedValue(undefined);
|
|
43
|
+
mockElectronInstance.run.mockResolvedValue(undefined);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
// Acceptance: Scenario "device 명령어로 Capacitor 앱 실행"
|
|
47
|
+
it("runs Capacitor.create + run when capacitor config exists", async () => {
|
|
48
|
+
vi.mocked(loadSdConfig).mockResolvedValue({
|
|
49
|
+
packages: {
|
|
50
|
+
"client-pda": {
|
|
51
|
+
target: "client",
|
|
52
|
+
server: 40480,
|
|
53
|
+
capacitor: { appId: "com.test.app", appName: "TestApp" },
|
|
54
|
+
},
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
await runDevice({ package: "client-pda", options: [] });
|
|
59
|
+
|
|
60
|
+
expect(Capacitor.create).toHaveBeenCalledWith(
|
|
61
|
+
expect.stringContaining("client-pda"),
|
|
62
|
+
{ appId: "com.test.app", appName: "TestApp" },
|
|
63
|
+
undefined,
|
|
64
|
+
);
|
|
65
|
+
expect(mockCapacitorInstance.run).toHaveBeenCalledWith("http://localhost:40480");
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
// Acceptance: Scenario "device 명령어로 Electron 앱 실행"
|
|
69
|
+
it("runs Electron.create + run when electron config exists", async () => {
|
|
70
|
+
vi.mocked(loadSdConfig).mockResolvedValue({
|
|
71
|
+
packages: {
|
|
72
|
+
"my-client": {
|
|
73
|
+
target: "client",
|
|
74
|
+
server: 4200,
|
|
75
|
+
electron: { appId: "com.test.electron" },
|
|
76
|
+
},
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
await runDevice({ package: "my-client", options: [] });
|
|
81
|
+
|
|
82
|
+
expect(Electron.create).toHaveBeenCalledWith(
|
|
83
|
+
expect.stringContaining("my-client"),
|
|
84
|
+
{ appId: "com.test.electron" },
|
|
85
|
+
undefined,
|
|
86
|
+
);
|
|
87
|
+
expect(mockElectronInstance.run).toHaveBeenCalledWith("http://localhost:4200");
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
// Acceptance: Scenario "device 명령어에 URL 옵션 지정"
|
|
91
|
+
it("uses provided URL instead of auto-generated one", async () => {
|
|
92
|
+
vi.mocked(loadSdConfig).mockResolvedValue({
|
|
93
|
+
packages: {
|
|
94
|
+
"client-pda": {
|
|
95
|
+
target: "client",
|
|
96
|
+
server: 40480,
|
|
97
|
+
capacitor: { appId: "com.test.app", appName: "TestApp" },
|
|
98
|
+
},
|
|
99
|
+
},
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
await runDevice({ package: "client-pda", url: "http://192.168.1.100:4200", options: [] });
|
|
103
|
+
|
|
104
|
+
expect(mockCapacitorInstance.run).toHaveBeenCalledWith("http://192.168.1.100:4200");
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
// Unit: electron이 capacitor보다 우선 (v13 동작)
|
|
108
|
+
it("prefers electron over capacitor when both are configured", async () => {
|
|
109
|
+
vi.mocked(loadSdConfig).mockResolvedValue({
|
|
110
|
+
packages: {
|
|
111
|
+
"my-client": {
|
|
112
|
+
target: "client",
|
|
113
|
+
server: 4200,
|
|
114
|
+
capacitor: { appId: "com.test.app", appName: "TestApp" },
|
|
115
|
+
electron: { appId: "com.test.electron" },
|
|
116
|
+
},
|
|
117
|
+
},
|
|
118
|
+
});
|
|
119
|
+
|
|
120
|
+
await runDevice({ package: "my-client", options: [] });
|
|
121
|
+
|
|
122
|
+
expect(Electron.create).toHaveBeenCalled();
|
|
123
|
+
expect(Capacitor.create).not.toHaveBeenCalled();
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
// Unit: 존재하지 않는 패키지 에러
|
|
127
|
+
it("throws when package does not exist", async () => {
|
|
128
|
+
vi.mocked(loadSdConfig).mockResolvedValue({
|
|
129
|
+
packages: {
|
|
130
|
+
"other-pkg": { target: "node" },
|
|
131
|
+
},
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
await expect(runDevice({ package: "nonexistent", options: [] })).rejects.toThrow();
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
// Unit: client가 아닌 패키지 에러
|
|
138
|
+
it("throws when package is not a client target", async () => {
|
|
139
|
+
vi.mocked(loadSdConfig).mockResolvedValue({
|
|
140
|
+
packages: {
|
|
141
|
+
"my-server": { target: "server" },
|
|
142
|
+
},
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
await expect(runDevice({ package: "my-server", options: [] })).rejects.toThrow();
|
|
146
|
+
});
|
|
147
|
+
});
|
|
@@ -1373,8 +1373,8 @@ describe("DevWatchOrchestrator", () => {
|
|
|
1373
1373
|
});
|
|
1374
1374
|
}
|
|
1375
1375
|
|
|
1376
|
-
// Acceptance: Scenario "Capacitor
|
|
1377
|
-
it("runs Capacitor.create + initialize
|
|
1376
|
+
// Acceptance: Scenario "Capacitor 초기화만 수행 (run 미호출)"
|
|
1377
|
+
it("runs Capacitor.create + initialize but NOT run in dev mode", async () => {
|
|
1378
1378
|
setupDefaults(createConfig({
|
|
1379
1379
|
packages: {
|
|
1380
1380
|
"my-client": {
|
|
@@ -1396,11 +1396,11 @@ describe("DevWatchOrchestrator", () => {
|
|
|
1396
1396
|
undefined,
|
|
1397
1397
|
);
|
|
1398
1398
|
expect(mockCapacitorInstance.initialize).toHaveBeenCalled();
|
|
1399
|
-
expect(mockCapacitorInstance.run).
|
|
1399
|
+
expect(mockCapacitorInstance.run).not.toHaveBeenCalled();
|
|
1400
1400
|
});
|
|
1401
1401
|
|
|
1402
|
-
// Acceptance: Scenario "Electron
|
|
1403
|
-
it("
|
|
1402
|
+
// Acceptance: Scenario "dev 모드에서 Electron 미처리"
|
|
1403
|
+
it("does not run Electron in dev mode even when electron config exists", async () => {
|
|
1404
1404
|
setupDefaults(createConfig({
|
|
1405
1405
|
packages: {
|
|
1406
1406
|
"my-client": {
|
|
@@ -1416,17 +1416,13 @@ describe("DevWatchOrchestrator", () => {
|
|
|
1416
1416
|
await orchestrator.initialize();
|
|
1417
1417
|
await orchestrator.start();
|
|
1418
1418
|
|
|
1419
|
-
expect(Electron.create).
|
|
1420
|
-
|
|
1421
|
-
|
|
1422
|
-
undefined,
|
|
1423
|
-
);
|
|
1424
|
-
expect(mockElectronInstance.initialize).toHaveBeenCalled();
|
|
1425
|
-
expect(mockElectronInstance.run).toHaveBeenCalledWith("http://localhost:4200");
|
|
1419
|
+
expect(Electron.create).not.toHaveBeenCalled();
|
|
1420
|
+
expect(mockElectronInstance.initialize).not.toHaveBeenCalled();
|
|
1421
|
+
expect(mockElectronInstance.run).not.toHaveBeenCalled();
|
|
1426
1422
|
});
|
|
1427
1423
|
|
|
1428
|
-
// Acceptance: Scenario "Capacitor + Electron 동시
|
|
1429
|
-
it("
|
|
1424
|
+
// Acceptance: Scenario "Capacitor + Electron 동시 설정 시 Capacitor만 초기화"
|
|
1425
|
+
it("initializes Capacitor but ignores Electron when both are configured", async () => {
|
|
1430
1426
|
setupDefaults(createConfig({
|
|
1431
1427
|
packages: {
|
|
1432
1428
|
"my-client": {
|
|
@@ -1444,9 +1440,9 @@ describe("DevWatchOrchestrator", () => {
|
|
|
1444
1440
|
await orchestrator.start();
|
|
1445
1441
|
|
|
1446
1442
|
expect(Capacitor.create).toHaveBeenCalled();
|
|
1447
|
-
expect(mockCapacitorInstance.
|
|
1448
|
-
expect(
|
|
1449
|
-
expect(
|
|
1443
|
+
expect(mockCapacitorInstance.initialize).toHaveBeenCalled();
|
|
1444
|
+
expect(mockCapacitorInstance.run).not.toHaveBeenCalled();
|
|
1445
|
+
expect(Electron.create).not.toHaveBeenCalled();
|
|
1450
1446
|
});
|
|
1451
1447
|
|
|
1452
1448
|
// Acceptance: Scenario "네이티브 설정 없는 dev 모드"
|
|
@@ -1466,11 +1462,9 @@ describe("DevWatchOrchestrator", () => {
|
|
|
1466
1462
|
expect(Electron.create).not.toHaveBeenCalled();
|
|
1467
1463
|
});
|
|
1468
1464
|
|
|
1469
|
-
// Acceptance: Scenario "dev 모드 종료 시
|
|
1470
|
-
//
|
|
1471
|
-
|
|
1472
|
-
// This scenario verifies that shutdown() completes without error when native apps are running.
|
|
1473
|
-
it("shutdown completes when native apps were launched", async () => {
|
|
1465
|
+
// Acceptance: Scenario "dev 모드 종료 시 Capacitor 초기화 후 정상 종료"
|
|
1466
|
+
// Capacitor.initialize()만 호출되므로 별도 정리 불필요.
|
|
1467
|
+
it("shutdown completes when Capacitor was initialized", async () => {
|
|
1474
1468
|
setupDefaults(createConfig({
|
|
1475
1469
|
packages: {
|
|
1476
1470
|
"my-client": {
|
|
@@ -1493,8 +1487,8 @@ describe("DevWatchOrchestrator", () => {
|
|
|
1493
1487
|
}
|
|
1494
1488
|
});
|
|
1495
1489
|
|
|
1496
|
-
// Unit:
|
|
1497
|
-
it("logs error but does not crash when Capacitor.
|
|
1490
|
+
// Unit: Capacitor.initialize 에러는 로그만 남기고 크래시하지 않음
|
|
1491
|
+
it("logs error but does not crash when Capacitor.initialize throws", async () => {
|
|
1498
1492
|
setupDefaults(createConfig({
|
|
1499
1493
|
packages: {
|
|
1500
1494
|
"my-client": {
|
|
@@ -1505,81 +1499,15 @@ describe("DevWatchOrchestrator", () => {
|
|
|
1505
1499
|
},
|
|
1506
1500
|
}));
|
|
1507
1501
|
setupEngineWithPort(4200);
|
|
1508
|
-
mockCapacitorInstance.
|
|
1502
|
+
mockCapacitorInstance.initialize.mockRejectedValue(new Error("init failed"));
|
|
1509
1503
|
|
|
1510
1504
|
const orchestrator = new DevWatchOrchestrator({ mode: "dev", targets: [], options: [] });
|
|
1511
1505
|
await orchestrator.initialize();
|
|
1512
1506
|
// Should not throw
|
|
1513
1507
|
await orchestrator.start();
|
|
1514
1508
|
|
|
1515
|
-
expect(mockCapacitorInstance.
|
|
1516
|
-
|
|
1517
|
-
|
|
1518
|
-
// Unit: Electron.run is fire-and-forget (does not block dev mode start)
|
|
1519
|
-
it("does not await Electron.run (fire-and-forget)", async () => {
|
|
1520
|
-
let electronRunResolved = false;
|
|
1521
|
-
mockElectronInstance.run.mockImplementation(() => {
|
|
1522
|
-
return new Promise<void>((resolve) => {
|
|
1523
|
-
// Simulate long-running Electron process — never resolves during test
|
|
1524
|
-
setTimeout(() => {
|
|
1525
|
-
electronRunResolved = true;
|
|
1526
|
-
resolve();
|
|
1527
|
-
}, 10_000);
|
|
1528
|
-
});
|
|
1529
|
-
});
|
|
1530
|
-
|
|
1531
|
-
setupDefaults(createConfig({
|
|
1532
|
-
packages: {
|
|
1533
|
-
"my-client": {
|
|
1534
|
-
target: "client",
|
|
1535
|
-
server: 4200,
|
|
1536
|
-
electron: { appId: "com.test.electron" },
|
|
1537
|
-
},
|
|
1538
|
-
},
|
|
1539
|
-
}));
|
|
1540
|
-
setupEngineWithPort(4200);
|
|
1541
|
-
|
|
1542
|
-
const orchestrator = new DevWatchOrchestrator({ mode: "dev", targets: [], options: [] });
|
|
1543
|
-
await orchestrator.initialize();
|
|
1544
|
-
await orchestrator.start();
|
|
1545
|
-
|
|
1546
|
-
// start() returned without waiting for Electron.run to resolve
|
|
1547
|
-
expect(electronRunResolved).toBe(false);
|
|
1548
|
-
expect(mockElectronInstance.run).toHaveBeenCalled();
|
|
1549
|
-
});
|
|
1550
|
-
|
|
1551
|
-
// Unit: DESIGN-004 — Electron run failure registers error in ResultCollector
|
|
1552
|
-
it("registers error in ResultCollector when Electron.run fails", async () => {
|
|
1553
|
-
mockElectronInstance.run.mockRejectedValue(new Error("electron crashed"));
|
|
1554
|
-
|
|
1555
|
-
setupDefaults(createConfig({
|
|
1556
|
-
packages: {
|
|
1557
|
-
"my-client": {
|
|
1558
|
-
target: "client",
|
|
1559
|
-
server: 4200,
|
|
1560
|
-
electron: { appId: "com.test.electron" },
|
|
1561
|
-
},
|
|
1562
|
-
},
|
|
1563
|
-
}));
|
|
1564
|
-
setupEngineWithPort(4200);
|
|
1565
|
-
|
|
1566
|
-
const orchestrator = new DevWatchOrchestrator({ mode: "dev", targets: [], options: [] });
|
|
1567
|
-
await orchestrator.initialize();
|
|
1568
|
-
await orchestrator.start();
|
|
1569
|
-
|
|
1570
|
-
// Wait a tick for the fire-and-forget async to settle
|
|
1571
|
-
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
1572
|
-
|
|
1573
|
-
const resultCollector = vi.mocked(ResultCollector).mock.instances[0];
|
|
1574
|
-
expect(resultCollector.add).toHaveBeenCalledWith(
|
|
1575
|
-
expect.objectContaining({
|
|
1576
|
-
name: "my-client",
|
|
1577
|
-
target: "client",
|
|
1578
|
-
type: "build",
|
|
1579
|
-
status: "error",
|
|
1580
|
-
message: expect.stringContaining("electron crashed"),
|
|
1581
|
-
}),
|
|
1582
|
-
);
|
|
1509
|
+
expect(mockCapacitorInstance.initialize).toHaveBeenCalled();
|
|
1510
|
+
expect(mockCapacitorInstance.run).not.toHaveBeenCalled();
|
|
1583
1511
|
});
|
|
1584
1512
|
});
|
|
1585
1513
|
|
|
@@ -11,14 +11,14 @@ describe("ngtsc-build-core: NgtscProgram AOT compilation", () => {
|
|
|
11
11
|
beforeAll(() => {
|
|
12
12
|
// Clean dist before tests
|
|
13
13
|
if (fs.existsSync(distDir)) {
|
|
14
|
-
fs.rmSync(distDir, { recursive: true, force: true });
|
|
14
|
+
fs.rmSync(distDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
|
15
15
|
}
|
|
16
16
|
});
|
|
17
17
|
|
|
18
18
|
afterAll(() => {
|
|
19
19
|
// Clean up dist after tests
|
|
20
20
|
if (fs.existsSync(distDir)) {
|
|
21
|
-
fs.rmSync(distDir, { recursive: true, force: true });
|
|
21
|
+
fs.rmSync(distDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
|
22
22
|
}
|
|
23
23
|
});
|
|
24
24
|
|
|
@@ -63,7 +63,7 @@ describe("ngtsc-build-core: NgtscProgram AOT compilation", () => {
|
|
|
63
63
|
it("outputs .d.ts files with Angular type metadata", async () => {
|
|
64
64
|
// Clean dist and run with dts: true
|
|
65
65
|
if (fs.existsSync(distDir)) {
|
|
66
|
-
fs.rmSync(distDir, { recursive: true, force: true });
|
|
66
|
+
fs.rmSync(distDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
|
67
67
|
}
|
|
68
68
|
|
|
69
69
|
const result = await runNgtscBuild({
|
|
@@ -96,7 +96,7 @@ describe("ngtsc-build-core: NgtscProgram AOT compilation", () => {
|
|
|
96
96
|
// Acceptance: Scenario "run()에서 dts: false면 .d.ts를 생략한다"
|
|
97
97
|
it("omits .d.ts when output is {js: true, dts: false}", async () => {
|
|
98
98
|
if (fs.existsSync(distDir)) {
|
|
99
|
-
fs.rmSync(distDir, { recursive: true, force: true });
|
|
99
|
+
fs.rmSync(distDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
|
100
100
|
}
|
|
101
101
|
|
|
102
102
|
const result = await runNgtscBuild({
|
|
@@ -119,7 +119,7 @@ describe("ngtsc-build-core: NgtscProgram AOT compilation", () => {
|
|
|
119
119
|
// Acceptance: Scenario "TypeScript + Angular diagnostics를 통합 수집한다"
|
|
120
120
|
it("collects diagnostics from both TypeScript and Angular compiler", async () => {
|
|
121
121
|
if (fs.existsSync(distDir)) {
|
|
122
|
-
fs.rmSync(distDir, { recursive: true, force: true });
|
|
122
|
+
fs.rmSync(distDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
const result = await runNgtscBuild({
|
|
@@ -153,7 +153,7 @@ describe("ngtsc-build-core: NgtscProgram AOT compilation", () => {
|
|
|
153
153
|
// Acceptance: Scenario "scss/styles.scss가 CSS로 컴파일되어 dist에 출력된다"
|
|
154
154
|
it("compiles scss/styles.scss to dist/styles.css", async () => {
|
|
155
155
|
if (fs.existsSync(distDir)) {
|
|
156
|
-
fs.rmSync(distDir, { recursive: true, force: true });
|
|
156
|
+
fs.rmSync(distDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
|
|
157
157
|
}
|
|
158
158
|
|
|
159
159
|
const result = await runNgtscBuild({
|