@tyvm/knowhow 0.0.108-dev.4a8ba55 → 0.0.108-dev.80f1ac6
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/package.json +1 -1
- package/src/chat/CliChatService.ts +3 -0
- package/src/cli.ts +14 -0
- package/src/clients/index.ts +6 -5
- package/src/commands/misc.ts +5 -0
- package/src/commands/services.ts +5 -0
- package/src/fileSync.ts +14 -2
- package/src/logger.ts +197 -0
- package/src/services/EventService.ts +61 -1
- package/src/services/KnowhowClient.ts +12 -2
- package/src/services/S3.ts +0 -10
- package/src/services/modules/index.ts +17 -6
- package/src/services/modules/types.ts +2 -0
- package/tests/unit/commands/github-credentials.test.ts +211 -0
- package/tests/unit/modules/moduleLoading.test.ts +39 -12
- package/ts_build/package.json +1 -1
- package/ts_build/src/chat/CliChatService.js +3 -0
- package/ts_build/src/chat/CliChatService.js.map +1 -1
- package/ts_build/src/cli.js +7 -0
- package/ts_build/src/cli.js.map +1 -1
- package/ts_build/src/clients/index.js +2 -4
- package/ts_build/src/clients/index.js.map +1 -1
- package/ts_build/src/commands/misc.js +2 -0
- package/ts_build/src/commands/misc.js.map +1 -1
- package/ts_build/src/commands/services.js +2 -1
- package/ts_build/src/commands/services.js.map +1 -1
- package/ts_build/src/fileSync.js +10 -2
- package/ts_build/src/fileSync.js.map +1 -1
- package/ts_build/src/logger.d.ts +21 -0
- package/ts_build/src/logger.js +106 -0
- package/ts_build/src/logger.js.map +1 -0
- package/ts_build/src/services/EventService.d.ts +6 -1
- package/ts_build/src/services/EventService.js +29 -0
- package/ts_build/src/services/EventService.js.map +1 -1
- package/ts_build/src/services/KnowhowClient.d.ts +1 -1
- package/ts_build/src/services/KnowhowClient.js +8 -2
- package/ts_build/src/services/KnowhowClient.js.map +1 -1
- package/ts_build/src/services/S3.js +0 -7
- package/ts_build/src/services/S3.js.map +1 -1
- package/ts_build/src/services/modules/index.d.ts +1 -1
- package/ts_build/src/services/modules/index.js +10 -5
- package/ts_build/src/services/modules/index.js.map +1 -1
- package/ts_build/src/services/modules/types.d.ts +2 -0
- package/ts_build/tests/unit/commands/github-credentials.test.d.ts +1 -0
- package/ts_build/tests/unit/commands/github-credentials.test.js +146 -0
- package/ts_build/tests/unit/commands/github-credentials.test.js.map +1 -0
- package/ts_build/tests/unit/modules/moduleLoading.test.js +20 -7
- package/ts_build/tests/unit/modules/moduleLoading.test.js.map +1 -1
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
jest.mock("../../../src/config", () => ({
|
|
4
|
+
getConfig: jest.fn().mockResolvedValue({ modules: [] }),
|
|
5
|
+
getGlobalConfig: jest.fn().mockResolvedValue({ modules: [] }),
|
|
6
|
+
getConfigSync: jest.fn().mockReturnValue({}),
|
|
7
|
+
migrateConfig: jest.fn().mockResolvedValue(undefined),
|
|
8
|
+
}));
|
|
9
|
+
jest.mock("../../../src/clients", () => ({
|
|
10
|
+
AIClient: jest.fn(),
|
|
11
|
+
Clients: { registerClient: jest.fn(), registerModels: jest.fn() },
|
|
12
|
+
}));
|
|
13
|
+
jest.mock("../../../src/services/KnowhowClient", () => ({
|
|
14
|
+
KnowhowSimpleClient: jest.fn().mockImplementation(() => ({
|
|
15
|
+
getGitCredential: jest.fn().mockResolvedValue({
|
|
16
|
+
protocol: "https",
|
|
17
|
+
host: "github.com",
|
|
18
|
+
username: "x-access-token",
|
|
19
|
+
password: "ghu_TESTTOKEN123",
|
|
20
|
+
}),
|
|
21
|
+
})),
|
|
22
|
+
}));
|
|
23
|
+
jest.mock("readline", () => ({
|
|
24
|
+
createInterface: jest.fn().mockReturnValue({
|
|
25
|
+
on: jest.fn().mockImplementation(function (event, cb) {
|
|
26
|
+
if (event === "close") {
|
|
27
|
+
setImmediate(() => cb());
|
|
28
|
+
}
|
|
29
|
+
return this;
|
|
30
|
+
}),
|
|
31
|
+
}),
|
|
32
|
+
}));
|
|
33
|
+
const commander_1 = require("commander");
|
|
34
|
+
const misc_1 = require("../../../src/commands/misc");
|
|
35
|
+
const logger_1 = require("../../../src/logger");
|
|
36
|
+
describe("github-credentials command", () => {
|
|
37
|
+
describe("early silencing (pre-module-load)", () => {
|
|
38
|
+
beforeEach(() => {
|
|
39
|
+
logger_1.logger.unsilence();
|
|
40
|
+
logger_1.logger.installConsoleOverload();
|
|
41
|
+
});
|
|
42
|
+
afterEach(() => {
|
|
43
|
+
logger_1.logger.unsilence();
|
|
44
|
+
logger_1.logger.uninstallConsoleOverload();
|
|
45
|
+
});
|
|
46
|
+
it("silences before module loading when github-credentials is in argv", () => {
|
|
47
|
+
const originalArgv = process.argv;
|
|
48
|
+
process.argv = ["node", "knowhow", "github-credentials", "get"];
|
|
49
|
+
const rawArgs = process.argv.slice(2);
|
|
50
|
+
const SILENT_COMMANDS = ["github-credentials"];
|
|
51
|
+
if (rawArgs.some((a) => SILENT_COMMANDS.includes(a))) {
|
|
52
|
+
logger_1.logger.silence();
|
|
53
|
+
}
|
|
54
|
+
const consoleSpy = jest.spyOn(process.stdout, "write");
|
|
55
|
+
console.warn("⚠️ Terminal module: no TunnelHandler in context — terminal addon not registered");
|
|
56
|
+
console.log("some other module loading noise");
|
|
57
|
+
expect(consoleSpy).not.toHaveBeenCalled();
|
|
58
|
+
consoleSpy.mockRestore();
|
|
59
|
+
process.argv = originalArgv;
|
|
60
|
+
});
|
|
61
|
+
it("does NOT silence for other commands", () => {
|
|
62
|
+
const originalArgv = process.argv;
|
|
63
|
+
process.argv = ["node", "knowhow", "chat"];
|
|
64
|
+
const rawArgs = process.argv.slice(2);
|
|
65
|
+
const SILENT_COMMANDS = ["github-credentials"];
|
|
66
|
+
if (rawArgs.some((a) => SILENT_COMMANDS.includes(a))) {
|
|
67
|
+
logger_1.logger.silence();
|
|
68
|
+
}
|
|
69
|
+
expect(logger_1.logger.isSilenced()).toBe(false);
|
|
70
|
+
process.argv = originalArgv;
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
let program;
|
|
74
|
+
let stdoutSpy;
|
|
75
|
+
let writtenToStdout;
|
|
76
|
+
beforeEach(() => {
|
|
77
|
+
jest.clearAllMocks();
|
|
78
|
+
logger_1.logger.unsilence();
|
|
79
|
+
writtenToStdout = [];
|
|
80
|
+
stdoutSpy = jest
|
|
81
|
+
.spyOn(process.stdout, "write")
|
|
82
|
+
.mockImplementation((chunk) => {
|
|
83
|
+
writtenToStdout.push(typeof chunk === "string" ? chunk : chunk.toString());
|
|
84
|
+
return true;
|
|
85
|
+
});
|
|
86
|
+
program = new commander_1.Command();
|
|
87
|
+
program.exitOverride();
|
|
88
|
+
(0, misc_1.addGithubCredentialsCommand)(program);
|
|
89
|
+
});
|
|
90
|
+
afterEach(() => {
|
|
91
|
+
stdoutSpy.mockRestore();
|
|
92
|
+
logger_1.logger.unsilence();
|
|
93
|
+
});
|
|
94
|
+
it("outputs only credential lines to stdout for 'get' action", async () => {
|
|
95
|
+
await program.parseAsync([
|
|
96
|
+
"node", "knowhow", "github-credentials", "get", "--repo", "myorg/myrepo",
|
|
97
|
+
]);
|
|
98
|
+
expect(writtenToStdout).toHaveLength(1);
|
|
99
|
+
expect(writtenToStdout[0]).toBe("protocol=https\nhost=github.com\nusername=x-access-token\npassword=ghu_TESTTOKEN123\n");
|
|
100
|
+
});
|
|
101
|
+
it("silences the logger immediately so module logs don't pollute stdout", async () => {
|
|
102
|
+
await program.parseAsync([
|
|
103
|
+
"node", "knowhow", "github-credentials", "get", "--repo", "myorg/myrepo",
|
|
104
|
+
]);
|
|
105
|
+
expect(logger_1.logger.isSilenced()).toBe(true);
|
|
106
|
+
});
|
|
107
|
+
it("produces exactly 4 credential field lines and nothing else", async () => {
|
|
108
|
+
await program.parseAsync([
|
|
109
|
+
"node", "knowhow", "github-credentials", "get", "--repo", "myorg/myrepo",
|
|
110
|
+
]);
|
|
111
|
+
const allOutput = writtenToStdout.join("");
|
|
112
|
+
const lines = allOutput.trim().split("\n");
|
|
113
|
+
expect(lines).toHaveLength(4);
|
|
114
|
+
expect(lines[0]).toMatch(/^protocol=/);
|
|
115
|
+
expect(lines[1]).toMatch(/^host=/);
|
|
116
|
+
expect(lines[2]).toMatch(/^username=/);
|
|
117
|
+
expect(lines[3]).toMatch(/^password=/);
|
|
118
|
+
});
|
|
119
|
+
it("exits cleanly for 'store' action without writing credentials", async () => {
|
|
120
|
+
let exitCode;
|
|
121
|
+
const exitSpy = jest
|
|
122
|
+
.spyOn(process, "exit")
|
|
123
|
+
.mockImplementation(((code) => {
|
|
124
|
+
exitCode = code ?? 0;
|
|
125
|
+
throw new Error(`process.exit(${exitCode})`);
|
|
126
|
+
}));
|
|
127
|
+
await expect(program.parseAsync(["node", "knowhow", "github-credentials", "store"])).rejects.toThrow("process.exit(0)");
|
|
128
|
+
expect(exitCode).toBe(0);
|
|
129
|
+
expect(writtenToStdout).toHaveLength(0);
|
|
130
|
+
exitSpy.mockRestore();
|
|
131
|
+
});
|
|
132
|
+
it("exits cleanly for 'erase' action without writing credentials", async () => {
|
|
133
|
+
let exitCode;
|
|
134
|
+
const exitSpy = jest
|
|
135
|
+
.spyOn(process, "exit")
|
|
136
|
+
.mockImplementation(((code) => {
|
|
137
|
+
exitCode = code ?? 0;
|
|
138
|
+
throw new Error(`process.exit(${exitCode})`);
|
|
139
|
+
}));
|
|
140
|
+
await expect(program.parseAsync(["node", "knowhow", "github-credentials", "erase"])).rejects.toThrow("process.exit(0)");
|
|
141
|
+
expect(exitCode).toBe(0);
|
|
142
|
+
expect(writtenToStdout).toHaveLength(0);
|
|
143
|
+
exitSpy.mockRestore();
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
//# sourceMappingURL=github-credentials.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"github-credentials.test.js","sourceRoot":"","sources":["../../../../tests/unit/commands/github-credentials.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,9 @@ const mockGetConfig = config_1.getConfig;
|
|
|
23
23
|
const mockGetGlobalConfig = config_1.getGlobalConfig;
|
|
24
24
|
function makeContext(overrides) {
|
|
25
25
|
return {
|
|
26
|
+
Events: {
|
|
27
|
+
log: jest.fn(),
|
|
28
|
+
},
|
|
26
29
|
Agents: {
|
|
27
30
|
registerAgent: jest.fn(),
|
|
28
31
|
},
|
|
@@ -70,7 +73,8 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
70
73
|
});
|
|
71
74
|
const service = new modules_1.ModulesService();
|
|
72
75
|
const context = makeContext();
|
|
73
|
-
const requireSpy = jest
|
|
76
|
+
const requireSpy = jest
|
|
77
|
+
.spyOn(service, "loadModulesFromConfig")
|
|
74
78
|
.mockImplementation(async (ctx) => {
|
|
75
79
|
const resolvedCtx = ctx || context;
|
|
76
80
|
await mockModule.init({ config: {}, cwd: process.cwd() });
|
|
@@ -93,11 +97,14 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
93
97
|
};
|
|
94
98
|
const mockToolHandler = jest.fn();
|
|
95
99
|
const mockModule = makeModule({
|
|
96
|
-
tools: [
|
|
100
|
+
tools: [
|
|
101
|
+
{ name: "myTool", handler: mockToolHandler, definition: mockToolDef },
|
|
102
|
+
],
|
|
97
103
|
});
|
|
98
104
|
const service = new modules_1.ModulesService();
|
|
99
105
|
const context = makeContext();
|
|
100
|
-
const spy = jest
|
|
106
|
+
const spy = jest
|
|
107
|
+
.spyOn(service, "loadModulesFromConfig")
|
|
101
108
|
.mockImplementation(async (ctx) => {
|
|
102
109
|
const resolvedCtx = ctx || context;
|
|
103
110
|
await mockModule.init({ config: {}, cwd: process.cwd() });
|
|
@@ -121,13 +128,16 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
121
128
|
callMany: () => Promise.resolve(""),
|
|
122
129
|
embed: () => Promise.resolve([]),
|
|
123
130
|
};
|
|
124
|
-
const MockPluginClass = jest
|
|
131
|
+
const MockPluginClass = jest
|
|
132
|
+
.fn()
|
|
133
|
+
.mockImplementation(() => mockPluginInstance);
|
|
125
134
|
const mockModule = makeModule({
|
|
126
135
|
plugins: [{ name: "test-plugin", plugin: MockPluginClass }],
|
|
127
136
|
});
|
|
128
137
|
const service = new modules_1.ModulesService();
|
|
129
138
|
const context = makeContext();
|
|
130
|
-
const spy = jest
|
|
139
|
+
const spy = jest
|
|
140
|
+
.spyOn(service, "loadModulesFromConfig")
|
|
131
141
|
.mockImplementation(async (ctx) => {
|
|
132
142
|
const resolvedCtx = ctx || context;
|
|
133
143
|
await mockModule.init({ config: {}, cwd: process.cwd() });
|
|
@@ -141,7 +151,9 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
141
151
|
spy.mockRestore();
|
|
142
152
|
});
|
|
143
153
|
it("should load modules from both global and local config paths", async () => {
|
|
144
|
-
const globalModule = makeModule({
|
|
154
|
+
const globalModule = makeModule({
|
|
155
|
+
agents: [{ name: "GlobalAgent" }],
|
|
156
|
+
});
|
|
145
157
|
const localModule = makeModule({ agents: [{ name: "LocalAgent" }] });
|
|
146
158
|
mockGetConfig.mockResolvedValue({
|
|
147
159
|
modules: ["./local-module"],
|
|
@@ -152,7 +164,8 @@ describe("ModulesService.loadModulesFromConfig", () => {
|
|
|
152
164
|
const service = new modules_1.ModulesService();
|
|
153
165
|
const context = makeContext();
|
|
154
166
|
const loadedPaths = [];
|
|
155
|
-
const spy = jest
|
|
167
|
+
const spy = jest
|
|
168
|
+
.spyOn(service, "loadModulesFromConfig")
|
|
156
169
|
.mockImplementation(async (ctx) => {
|
|
157
170
|
const resolvedCtx = ctx || context;
|
|
158
171
|
for (const [path, mod] of [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moduleLoading.test.js","sourceRoot":"","sources":["../../../../tests/unit/modules/moduleLoading.test.ts"],"names":[],"mappings":";;AAGA,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;IACpB,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;IAC1B,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAC,CAAC;AAGJ,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;IACnB,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;CACnB,CAAC,CAAC,CAAC;AAGJ,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QAClC,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,EAAE;KACV,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,2DAA+D;
|
|
1
|
+
{"version":3,"file":"moduleLoading.test.js","sourceRoot":"","sources":["../../../../tests/unit/modules/moduleLoading.test.ts"],"names":[],"mappings":";;AAGA,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACtC,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE;IACpB,eAAe,EAAE,IAAI,CAAC,EAAE,EAAE;IAC1B,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAC,CAAC;AAGJ,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC,CAAC;IACvC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;IACnB,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;CACnB,CAAC,CAAC,CAAC;AAGJ,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QAClC,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,EAAE;QACX,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,EAAE;KACV,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,2DAA+D;AAK/D,gDAAiE;AAEjE,MAAM,aAAa,GAAG,kBAAkD,CAAC;AACzE,MAAM,mBAAmB,GAAG,wBAE3B,CAAC;AAEF,SAAS,WAAW,CAAC,SAAkC;IACrD,OAAO;QACL,MAAM,EAAE;YACN,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;SACR;QACR,MAAM,EAAE;YACN,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;SAClB;QACR,OAAO,EAAE;YACP,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;SACnB;QACR,OAAO,EAAE;YACP,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;YACzB,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;SACnB;QACR,KAAK,EAAE;YACL,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;YAClB,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE;SAChB;QACR,UAAU,EAAE;YACV,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE;YAC7B,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;YACxB,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;SACb;QACR,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,SAAkC;IACpD,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;QAC5C,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,EAAE;QACX,QAAQ,EAAE,EAAE;QACZ,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;IACpD,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,aAAa,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAuB,CAAC,CAAC;QACtE,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAuB,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,WAAW,EAAS,CAAC;QAC/C,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAEvD,aAAa,CAAC,iBAAiB,CAAC;YAC9B,OAAO,EAAE,CAAC,eAAe,CAAC;SACN,CAAC,CAAC;QAExB,MAAM,OAAO,GAAG,IAAI,wBAAc,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,WAAW,EAAE,CAAC;QAG9B,MAAM,UAAU,GAAG,IAAI;aACpB,KAAK,CAAC,OAAc,EAAE,uBAAuB,CAAC;aAC9C,kBAAkB,CAAC,KAAK,EAAE,GAAmB,EAAE,EAAE;YAChD,MAAM,WAAW,GAAG,GAAG,IAAI,OAAO,CAAC;YACnC,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAY,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACpE,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACrE,UAAU,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,WAAW,GAAG;YAClB,IAAI,EAAE,UAAmB;YACzB,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,aAAa;gBAC1B,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;aAC7D;SACF,CAAC;QACF,MAAM,eAAe,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,UAAU,CAAC;YAC5B,KAAK,EAAE;gBACL,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,WAAW,EAAE;aACtE;SACF,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,wBAAc,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,WAAW,EAAE,CAAC;QAE9B,MAAM,GAAG,GAAG,IAAI;aACb,KAAK,CAAC,OAAc,EAAE,uBAAuB,CAAC;aAC9C,kBAAkB,CAAC,KAAK,EAAE,GAAmB,EAAE,EAAE;YAChD,MAAM,WAAW,GAAG,GAAG,IAAI,OAAO,CAAC;YACnC,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAY,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACpE,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACpC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC3C,WAAW,CAAC,KAAK,CAAC,WAAW,CAC3B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,EAC7B,IAAI,CAAC,OAAO,CACb,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAChE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,oBAAoB,CACpD,QAAQ,EACR,eAAe,CAChB,CAAC;QACF,GAAG,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,kBAAkB,GAAG;YACzB,IAAI,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE;YACjD,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI;YACrB,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC;YAChB,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;YACjB,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;SACjC,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI;aACzB,EAAE,EAAE;aACJ,kBAAkB,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,UAAU,CAAC;YAC5B,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,eAAsB,EAAE,CAAC;SACnE,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,wBAAc,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,WAAW,EAAE,CAAC;QAE9B,MAAM,GAAG,GAAG,IAAI;aACb,KAAK,CAAC,OAAc,EAAE,uBAAuB,CAAC;aAC9C,kBAAkB,CAAC,KAAK,EAAE,GAAmB,EAAE,EAAE;YAChD,MAAM,WAAW,GAAG,GAAG,IAAI,OAAO,CAAC;YACnC,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAY,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACpE,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxC,MAAM,QAAQ,GAAG,IAAK,MAAM,CAAC,MAAc,CAAC,WAAW,CAAC,CAAC;gBACzD,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,oBAAoB,CACzD,aAAa,EACb,kBAAkB,CACnB,CAAC;QACF,GAAG,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC3E,MAAM,YAAY,GAAG,UAAU,CAAC;YAC9B,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAS,CAAC;SACzC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,YAAY,EAAS,CAAC,EAAE,CAAC,CAAC;QAE5E,aAAa,CAAC,iBAAiB,CAAC;YAC9B,OAAO,EAAE,CAAC,gBAAgB,CAAC;SACP,CAAC,CAAC;QACxB,mBAAmB,CAAC,iBAAiB,CAAC;YACpC,OAAO,EAAE,CAAC,iBAAiB,CAAC;SACR,CAAC,CAAC;QAExB,MAAM,OAAO,GAAG,IAAI,wBAAc,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,WAAW,EAAE,CAAC;QAE9B,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,IAAI;aACb,KAAK,CAAC,OAAc,EAAE,uBAAuB,CAAC;aAC9C,kBAAkB,CAAC,KAAK,EAAE,GAAmB,EAAE,EAAE;YAChD,MAAM,WAAW,GAAG,GAAG,IAAI,OAAO,CAAC;YACnC,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI;gBACxB,CAAC,iBAAiB,EAAE,YAAY,CAAC;gBACjC,CAAC,gBAAgB,EAAE,WAAW,CAAC;aACH,EAAE,CAAC;gBAC/B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvB,MAAM,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAY,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC7D,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;oBAC/B,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,MAAM,OAAO,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC9D,GAAG,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|