@stechquick/studio-cli 4.1.1-0 → 4.1.2-0
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/studio-cli/src/control/controlClient.js +22 -15
- package/dist/studio-cli/src/control/controlClient.js.map +1 -1
- package/dist/studio-cli/src/control/convertToBlock.js +1 -1
- package/dist/studio-cli/src/control/convertToBlock.js.map +1 -1
- package/dist/studio-cli/src/control/pull.js +17 -8
- package/dist/studio-cli/src/control/pull.js.map +1 -1
- package/dist/studio-cli/src/control/startWorking.js +1 -1
- package/dist/studio-cli/src/control/startWorking.js.map +1 -1
- package/dist/studio-cli/src/server/bridgeServer.js +155 -122
- package/dist/studio-cli/src/server/bridgeServer.js.map +1 -1
- package/dist/studio-cli/src/server/serverInfo.js +26 -14
- package/dist/studio-cli/src/server/serverInfo.js.map +1 -1
- package/dist/studio-cli/src/util/trash.js +137 -0
- package/dist/studio-cli/src/util/trash.js.map +1 -0
- package/dist/studio-cli/src/version.js +1 -1
- package/package.json +1 -1
|
@@ -57,7 +57,7 @@ async function readNdjsonStream(body, onLine) {
|
|
|
57
57
|
/** @returns process çıkış kodu (0 ok, 1 hata) */
|
|
58
58
|
async function runControl(rootDir, cmd) {
|
|
59
59
|
const info = (0, serverInfo_1.readServerInfo)(rootDir);
|
|
60
|
-
if (!info) {
|
|
60
|
+
if (!info?.port) {
|
|
61
61
|
logger_1.logger.error("no studio server in this workspace — run `studio connect` first");
|
|
62
62
|
return 1;
|
|
63
63
|
}
|
|
@@ -75,20 +75,27 @@ async function runControl(rootDir, cmd) {
|
|
|
75
75
|
if (contentType.includes("application/x-ndjson") && res.body) {
|
|
76
76
|
let lastMessage;
|
|
77
77
|
const skippedLines = [];
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
78
|
+
try {
|
|
79
|
+
await readNdjsonStream(res.body, (data) => {
|
|
80
|
+
if (data["progress"] !== undefined && data["total"] !== undefined) {
|
|
81
|
+
progress.update(Number(data["progress"]), Number(data["total"]));
|
|
82
|
+
}
|
|
83
|
+
else if (data["skipped"] !== undefined) {
|
|
84
|
+
skippedLines.push(String(data["skipped"]));
|
|
85
|
+
}
|
|
86
|
+
else if (data["message"] !== undefined) {
|
|
87
|
+
lastMessage = String(data["message"]);
|
|
88
|
+
}
|
|
89
|
+
else if (data["error"] !== undefined) {
|
|
90
|
+
lastMessage = String(data["error"]);
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
catch (err) {
|
|
95
|
+
progress.stop();
|
|
96
|
+
logger_1.logger.error(`${cmd} failed: connection lost (${err.message}) — the server may still be applying changes; run \`studio pull\` to reconcile before retrying`);
|
|
97
|
+
return 1;
|
|
98
|
+
}
|
|
92
99
|
progress.stop();
|
|
93
100
|
for (const line of skippedLines)
|
|
94
101
|
logger_1.logger.warn(`skipped: ${line}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controlClient.js","sourceRoot":"","sources":["../../../../src/control/controlClient.ts"],"names":[],"mappings":";AAAA,kGAAkG;AAClG,qGAAqG;AACrG,yFAAyF;AACzF,iFAAiF;;;AAEjF,qDAAsD;AACtD,2CAAwC;AAExC,MAAM,SAAS,GAAG,EAAE,CAAC;AAErB,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK;QAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;IACvE,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,KAAK,GAAG,CAAC,IAAY,EAAE,EAAE;QAC7B,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IACpC,CAAC,CAAC;IACF,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IACnB,OAAO;QACL,MAAM,EAAE,CAAC,OAAe,EAAE,KAAa,EAAE,EAAE;YACzC,MAAM,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzE,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YACtD,KAAK,CAAC,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,IAAgC,EAChC,MAA+C;IAE/C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAClC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,OAAO,IAAI,EAAE;QACX,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,IAAI;YAAE,MAAM;QAChB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC;gBAAE,IAAI;oBAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAA4B,CAAC,CAAC;iBAAE;gBAAC,MAAM,EAAE,UAAU,EAAE;SACtF;KACF;IACD,IAAI,MAAM,CAAC,IAAI,EAAE;QAAE,IAAI;YAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAA4B,CAAC,CAAC;SAAE;QAAC,MAAM,EAAE,UAAU,EAAE;AAC/G,CAAC;AAED,iDAAiD;AAC1C,KAAK,UAAU,UAAU,CAAC,OAAe,EAAE,GAAW;IAC3D,MAAM,IAAI,GAAG,IAAA,2BAAc,EAAC,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"controlClient.js","sourceRoot":"","sources":["../../../../src/control/controlClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ async function runConvertToBlock(rootDir, filePath) {
|
|
|
24
24
|
}
|
|
25
25
|
const { id: modelId } = parsed.meta;
|
|
26
26
|
const info = (0, serverInfo_1.readServerInfo)(rootDir);
|
|
27
|
-
if (!info) {
|
|
27
|
+
if (!info?.port) {
|
|
28
28
|
logger_1.logger.error("no studio server in this workspace — run `studio connect` first");
|
|
29
29
|
return 1;
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertToBlock.js","sourceRoot":"","sources":["../../../../src/control/convertToBlock.ts"],"names":[],"mappings":";;;AAAA,+CAAuD;AACvD,yCAAoC;AACpC,qDAAsD;AACtD,gFAAwG;AACxG,2CAAwC;AAGxC,wGAAwG;AACjG,KAAK,UAAU,iBAAiB,CAAC,OAAe,EAAE,QAAgB;IACvE,MAAM,OAAO,GAAG,IAAA,mBAAO,EAAC,QAAQ,CAAC,CAAC;IAElC,IAAI,OAAe,CAAC;IACpB,IAAI;QACF,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3C;IAAC,MAAM;QACN,eAAM,CAAC,KAAK,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;QAC7C,OAAO,CAAC,CAAC;KACV;IAED,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE;QACX,eAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,mCAAmC,CAAC,CAAC;QACrF,OAAO,CAAC,CAAC;KACV;IAED,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;IAEpC,MAAM,IAAI,GAAG,IAAA,2BAAc,EAAC,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"convertToBlock.js","sourceRoot":"","sources":["../../../../src/control/convertToBlock.ts"],"names":[],"mappings":";;;AAAA,+CAAuD;AACvD,yCAAoC;AACpC,qDAAsD;AACtD,gFAAwG;AACxG,2CAAwC;AAGxC,wGAAwG;AACjG,KAAK,UAAU,iBAAiB,CAAC,OAAe,EAAE,QAAgB;IACvE,MAAM,OAAO,GAAG,IAAA,mBAAO,EAAC,QAAQ,CAAC,CAAC;IAElC,IAAI,OAAe,CAAC;IACpB,IAAI;QACF,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3C;IAAC,MAAM;QACN,eAAM,CAAC,KAAK,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;QAC7C,OAAO,CAAC,CAAC;KACV;IAED,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE;QACX,eAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,mCAAmC,CAAC,CAAC;QACrF,OAAO,CAAC,CAAC;KACV;IAED,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;IAEpC,MAAM,IAAI,GAAG,IAAA,2BAAc,EAAC,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE;QACf,eAAM,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;QAChF,OAAO,CAAC,CAAC;KACV;IAED,IAAI,GAAa,CAAC;IAClB,IAAI;QACF,GAAG,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,CAAC,IAAI,yBAAyB,EAAE;YACxE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC;SAClC,CAAC,CAAC;KACJ;IAAC,MAAM;QACN,eAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAC3E,OAAO,CAAC,CAAC;KACV;IAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI;YAAE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAuB,CAAC;YAAC,IAAI,CAAC,CAAC,KAAK;gBAAE,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC;SAAE;QAAC,MAAM,EAAE,cAAc,EAAE;QACjH,eAAM,CAAC,KAAK,CAAC,0BAA0B,MAAM,IAAI,QAAQ,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACzE,OAAO,CAAC,CAAC;KACV;IAED,MAAM,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAgC,CAAC;IAEjE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QACrB,eAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;QACpD,OAAO,CAAC,CAAC;KACV;IAED,oFAAoF;IACpF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE;QAC/B,MAAM,IAAA,oBAAS,EAAC,OAAO,EAAE,IAAA,kCAAoB,EAAC,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;KAC/G;IAED,eAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY;QAC7B,CAAC,CAAC,GAAG,QAAQ,+BAA+B;QAC5C,CAAC,CAAC,GAAG,QAAQ,+BAA+B,CAAC,CAAC;IAChD,OAAO,CAAC,CAAC;AACX,CAAC;AA7DD,8CA6DC"}
|
|
@@ -70,18 +70,27 @@ async function pull(root, payload, onProgress) {
|
|
|
70
70
|
const state = {};
|
|
71
71
|
let total = 0;
|
|
72
72
|
let readOnly = 0;
|
|
73
|
+
let processed = 0;
|
|
74
|
+
const failed = [];
|
|
75
|
+
// One model failing (bad path, write/parse error) must not abort the whole pull → keep going, report it.
|
|
73
76
|
for (const model of payload.models) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
77
|
+
try {
|
|
78
|
+
const result = await writeModel(root, model, readOnlyIds.has(model.ID));
|
|
79
|
+
if (result.hash !== undefined)
|
|
80
|
+
state[model.ID] = result.hash;
|
|
81
|
+
if (result.readOnly)
|
|
82
|
+
readOnly++;
|
|
83
|
+
total++;
|
|
84
|
+
}
|
|
85
|
+
catch (err) {
|
|
86
|
+
failed.push({ name: model.name, error: err.message });
|
|
87
|
+
logger_1.logger.warn(`pull failed for ${model.name}: ${err.message}`);
|
|
88
|
+
}
|
|
89
|
+
onProgress?.(++processed, modelTotal);
|
|
81
90
|
}
|
|
82
91
|
await (0, state_1.writeState)(root, state);
|
|
83
92
|
await (0, kitInstall_1.installKit)(root, kitName);
|
|
84
|
-
return { total, readOnly };
|
|
93
|
+
return { total, readOnly, failed };
|
|
85
94
|
}
|
|
86
95
|
exports.pull = pull;
|
|
87
96
|
//# sourceMappingURL=pull.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/control/pull.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/control/pull.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ async function runStartWorking(rootDir, filePath) {
|
|
|
25
25
|
}
|
|
26
26
|
const { id: modelId } = parsed.meta;
|
|
27
27
|
const info = (0, serverInfo_1.readServerInfo)(rootDir);
|
|
28
|
-
if (!info) {
|
|
28
|
+
if (!info?.port) {
|
|
29
29
|
logger_1.logger.error("no studio server in this workspace — run `studio connect` first");
|
|
30
30
|
return 1;
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startWorking.js","sourceRoot":"","sources":["../../../../src/control/startWorking.ts"],"names":[],"mappings":";;;AAAA,+CAAmD;AACnD,yCAAoC;AACpC,qDAAsD;AACtD,gFAAkF;AAClF,2CAAwC;AAGxC,MAAM,aAAa,GAAG,KAAK,CAAC;AAE5B,uGAAuG;AAChG,KAAK,UAAU,eAAe,CAAC,OAAe,EAAE,QAAgB;IACrE,MAAM,OAAO,GAAG,IAAA,mBAAO,EAAC,QAAQ,CAAC,CAAC;IAElC,IAAI,OAAe,CAAC;IACpB,IAAI;QACF,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3C;IAAC,MAAM;QACN,eAAM,CAAC,KAAK,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;QAC7C,OAAO,CAAC,CAAC;KACV;IAED,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE;QACX,eAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,mCAAmC,CAAC,CAAC;QACrF,OAAO,CAAC,CAAC;KACV;IAED,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;IAEpC,MAAM,IAAI,GAAG,IAAA,2BAAc,EAAC,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"startWorking.js","sourceRoot":"","sources":["../../../../src/control/startWorking.ts"],"names":[],"mappings":";;;AAAA,+CAAmD;AACnD,yCAAoC;AACpC,qDAAsD;AACtD,gFAAkF;AAClF,2CAAwC;AAGxC,MAAM,aAAa,GAAG,KAAK,CAAC;AAE5B,uGAAuG;AAChG,KAAK,UAAU,eAAe,CAAC,OAAe,EAAE,QAAgB;IACrE,MAAM,OAAO,GAAG,IAAA,mBAAO,EAAC,QAAQ,CAAC,CAAC;IAElC,IAAI,OAAe,CAAC;IACpB,IAAI;QACF,OAAO,GAAG,MAAM,IAAA,mBAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3C;IAAC,MAAM;QACN,eAAM,CAAC,KAAK,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;QAC7C,OAAO,CAAC,CAAC;KACV;IAED,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE;QACX,eAAM,CAAC,KAAK,CAAC,4BAA4B,OAAO,mCAAmC,CAAC,CAAC;QACrF,OAAO,CAAC,CAAC;KACV;IAED,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;IAEpC,MAAM,IAAI,GAAG,IAAA,2BAAc,EAAC,OAAO,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE;QACf,eAAM,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;QAChF,OAAO,CAAC,CAAC;KACV;IAED,IAAI,GAAa,CAAC;IAClB,IAAI;QACF,GAAG,GAAG,MAAM,KAAK,CAAC,oBAAoB,IAAI,CAAC,IAAI,uBAAuB,EAAE;YACtE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC;SAClC,CAAC,CAAC;KACJ;IAAC,MAAM;QACN,eAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAC3E,OAAO,CAAC,CAAC;KACV;IAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;QACX,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI;YAAE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAuB,CAAC;YAAC,IAAI,CAAC,CAAC,KAAK;gBAAE,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC;SAAE;QAAC,MAAM,EAAE,cAAc,EAAE;QACjH,eAAM,CAAC,KAAK,CAAC,wBAAwB,MAAM,IAAI,QAAQ,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACvE,OAAO,CAAC,CAAC;KACV;IAED,MAAM,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA8B,CAAC;IAE/D,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,eAAM,CAAC,KAAK,CAAC,6BAA6B,OAAO,uCAAuC,CAAC,CAAC;QAC1F,OAAO,CAAC,CAAC;KACV;IAED,MAAM,IAAA,gBAAK,EAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACpC,eAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,kBAAkB,CAAC,CAAC;IAC3C,OAAO,CAAC,CAAC;AACX,CAAC;AAvDD,0CAuDC"}
|