codemerge-cli 1.1.8 → 1.1.9
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/watch.d.ts.map +1 -1
- package/dist/commands/watch.js +7 -3
- package/dist/commands/watch.js.map +1 -1
- package/dist/core/httpServer.d.ts +4 -1
- package/dist/core/httpServer.d.ts.map +1 -1
- package/dist/core/httpServer.js +110 -6
- package/dist/core/httpServer.js.map +1 -1
- package/dist/types/merge.d.ts +19 -0
- package/dist/types/merge.d.ts.map +1 -1
- package/dist/utils/fileUtils.d.ts +2 -0
- package/dist/utils/fileUtils.d.ts.map +1 -1
- package/dist/utils/fileUtils.js +14 -1
- package/dist/utils/fileUtils.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../lib/commands/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,qBAAa,YAAY;IAChB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;YAIzB,OAAO;
|
|
1
|
+
{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../lib/commands/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,qBAAa,YAAY;IAChB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;YAIzB,OAAO;YAyCP,mBAAmB;YAenB,iBAAiB;IAK/B,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,qBAAqB;CAW9B"}
|
package/dist/commands/watch.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { basename } from 'path';
|
|
1
|
+
import { basename, resolve } from 'path';
|
|
2
2
|
import { HttpServer } from '../core/httpServer.js';
|
|
3
3
|
import { CodeMerger } from '../core/codeMerger.js';
|
|
4
4
|
import { Config } from '../core/config.js';
|
|
@@ -23,15 +23,19 @@ export class WatchCommand {
|
|
|
23
23
|
const projectName = this.getProjectName(mergeOptions.outputPath);
|
|
24
24
|
const port = parseInt(options.port || '9876', 10);
|
|
25
25
|
const cache = new MergeCache();
|
|
26
|
+
const basePath = resolve(mergeOptions.inputPath);
|
|
26
27
|
await this.performInitialMerge(mergeOptions, cache);
|
|
27
|
-
const server = new HttpServer(port, projectName, cache);
|
|
28
|
+
const server = new HttpServer(port, projectName, cache, basePath);
|
|
28
29
|
await server.start();
|
|
29
30
|
const watcher = new FileWatcher(mergeOptions, async () => {
|
|
30
31
|
await this.performInitialMerge(mergeOptions, cache);
|
|
31
32
|
});
|
|
32
33
|
watcher.start();
|
|
33
34
|
this.setupGracefulShutdown(server, watcher);
|
|
34
|
-
Logger.success(`Server running at http://localhost:${port}
|
|
35
|
+
Logger.success(`Server running at http://localhost:${port}`);
|
|
36
|
+
Logger.plain(` Merge endpoint: http://localhost:${port}/${projectName}`);
|
|
37
|
+
Logger.plain(` Upsert endpoint: http://localhost:${port}/upsert`);
|
|
38
|
+
Logger.plain(` Health endpoint: http://localhost:${port}/health`);
|
|
35
39
|
Logger.plain('Press Ctrl+C to stop');
|
|
36
40
|
}
|
|
37
41
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../lib/commands/watch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../lib/commands/watch.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,13 @@ export declare class HttpServer {
|
|
|
4
4
|
private port;
|
|
5
5
|
private projectName;
|
|
6
6
|
private cache;
|
|
7
|
-
|
|
7
|
+
private basePath;
|
|
8
|
+
constructor(port: number, projectName: string, cache: MergeCache, basePath?: string);
|
|
8
9
|
start(): Promise<void>;
|
|
9
10
|
stop(): void;
|
|
10
11
|
private handleRequest;
|
|
12
|
+
private handleUpsertEndpoint;
|
|
13
|
+
private processUpsert;
|
|
11
14
|
private handleMergeEndpoint;
|
|
12
15
|
private handleHealthEndpoint;
|
|
13
16
|
private handleNotFound;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpServer.d.ts","sourceRoot":"","sources":["../../lib/core/httpServer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"httpServer.d.ts","sourceRoot":"","sources":["../../lib/core/httpServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,QAAQ,CAAS;gBAEb,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,GAAE,MAAsB;IAOrF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB5B,IAAI,IAAI,IAAI;IAOnB,OAAO,CAAC,aAAa;IAsBrB,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,aAAa;IAoErB,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,cAAc;CAOvB"}
|
package/dist/core/httpServer.js
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
1
|
import { createServer } from 'http';
|
|
2
|
+
import { resolve } from 'path';
|
|
3
|
+
import { FileUtils } from '../utils/fileUtils.js';
|
|
2
4
|
import { Logger } from '../utils/logger.js';
|
|
3
5
|
export class HttpServer {
|
|
4
6
|
server = null;
|
|
5
7
|
port;
|
|
6
8
|
projectName;
|
|
7
9
|
cache;
|
|
8
|
-
|
|
10
|
+
basePath;
|
|
11
|
+
constructor(port, projectName, cache, basePath = process.cwd()) {
|
|
9
12
|
this.port = port;
|
|
10
13
|
this.projectName = projectName;
|
|
11
14
|
this.cache = cache;
|
|
15
|
+
this.basePath = basePath;
|
|
12
16
|
}
|
|
13
17
|
async start() {
|
|
14
18
|
return new Promise((resolve, reject) => {
|
|
@@ -23,9 +27,7 @@ export class HttpServer {
|
|
|
23
27
|
reject(error);
|
|
24
28
|
}
|
|
25
29
|
});
|
|
26
|
-
this.server.listen(this.port, () =>
|
|
27
|
-
resolve();
|
|
28
|
-
});
|
|
30
|
+
this.server.listen(this.port, () => resolve());
|
|
29
31
|
});
|
|
30
32
|
}
|
|
31
33
|
stop() {
|
|
@@ -36,6 +38,11 @@ export class HttpServer {
|
|
|
36
38
|
}
|
|
37
39
|
handleRequest(req, res) {
|
|
38
40
|
const url = req.url || '';
|
|
41
|
+
const method = req.method || 'GET';
|
|
42
|
+
if (url === '/upsert' && method === 'POST') {
|
|
43
|
+
this.handleUpsertEndpoint(req, res);
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
39
46
|
if (url === `/${this.projectName}` || url === `/${this.projectName}/`) {
|
|
40
47
|
this.handleMergeEndpoint(res);
|
|
41
48
|
return;
|
|
@@ -46,6 +53,99 @@ export class HttpServer {
|
|
|
46
53
|
}
|
|
47
54
|
this.handleNotFound(res);
|
|
48
55
|
}
|
|
56
|
+
handleUpsertEndpoint(req, res) {
|
|
57
|
+
let body = '';
|
|
58
|
+
req.on('data', chunk => body += chunk.toString());
|
|
59
|
+
req.on('end', () => {
|
|
60
|
+
try {
|
|
61
|
+
const data = JSON.parse(body);
|
|
62
|
+
const result = this.processUpsert(data);
|
|
63
|
+
res.writeHead(result.success ? 200 : 400, { 'Content-Type': 'application/json' });
|
|
64
|
+
res.end(JSON.stringify(result));
|
|
65
|
+
if (result.success) {
|
|
66
|
+
Logger.success(`Upserted ${result.filesProcessed} files`);
|
|
67
|
+
result.results.forEach(r => {
|
|
68
|
+
if (r.success)
|
|
69
|
+
Logger.plain(` ${r.action}: ${r.path}`);
|
|
70
|
+
else
|
|
71
|
+
Logger.error(` failed: ${r.path} - ${r.error}`);
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
catch (error) {
|
|
76
|
+
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
77
|
+
res.end(JSON.stringify({
|
|
78
|
+
success: false,
|
|
79
|
+
error: error instanceof Error ? error.message : 'Invalid request'
|
|
80
|
+
}));
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
req.on('error', error => {
|
|
84
|
+
res.writeHead(500, { 'Content-Type': 'application/json' });
|
|
85
|
+
res.end(JSON.stringify({ success: false, error: error.message }));
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
processUpsert(data) {
|
|
89
|
+
if (!data.files || !Array.isArray(data.files)) {
|
|
90
|
+
return {
|
|
91
|
+
success: false,
|
|
92
|
+
filesProcessed: 0,
|
|
93
|
+
errors: ['Invalid request: files array is required'],
|
|
94
|
+
results: []
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
const basePath = data.basePath ? resolve(data.basePath) : this.basePath;
|
|
98
|
+
const results = [];
|
|
99
|
+
const errors = [];
|
|
100
|
+
for (const file of data.files) {
|
|
101
|
+
try {
|
|
102
|
+
if (!file.path || typeof file.content !== 'string') {
|
|
103
|
+
errors.push(`Invalid file entry: missing path or content`);
|
|
104
|
+
results.push({
|
|
105
|
+
path: file.path || 'unknown',
|
|
106
|
+
action: 'created',
|
|
107
|
+
success: false,
|
|
108
|
+
error: 'Invalid file entry'
|
|
109
|
+
});
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
const fullPath = resolve(basePath, file.path);
|
|
113
|
+
if (!fullPath.startsWith(basePath)) {
|
|
114
|
+
errors.push(`Security error: path outside base directory - ${file.path}`);
|
|
115
|
+
results.push({
|
|
116
|
+
path: file.path,
|
|
117
|
+
action: 'created',
|
|
118
|
+
success: false,
|
|
119
|
+
error: 'Path outside base directory'
|
|
120
|
+
});
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
const action = FileUtils.upsert(fullPath, file.content);
|
|
124
|
+
results.push({
|
|
125
|
+
path: file.path,
|
|
126
|
+
action,
|
|
127
|
+
success: true
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
const errorMsg = error instanceof Error ? error.message : 'Unknown error';
|
|
132
|
+
errors.push(`Failed to process ${file.path}: ${errorMsg}`);
|
|
133
|
+
results.push({
|
|
134
|
+
path: file.path,
|
|
135
|
+
action: 'created',
|
|
136
|
+
success: false,
|
|
137
|
+
error: errorMsg
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
const successCount = results.filter(r => r.success).length;
|
|
142
|
+
return {
|
|
143
|
+
success: successCount > 0,
|
|
144
|
+
filesProcessed: successCount,
|
|
145
|
+
errors,
|
|
146
|
+
results
|
|
147
|
+
};
|
|
148
|
+
}
|
|
49
149
|
handleMergeEndpoint(res) {
|
|
50
150
|
const content = this.cache.get();
|
|
51
151
|
if (!content) {
|
|
@@ -61,7 +161,11 @@ export class HttpServer {
|
|
|
61
161
|
res.end(JSON.stringify({
|
|
62
162
|
status: 'ok',
|
|
63
163
|
project: this.projectName,
|
|
64
|
-
|
|
164
|
+
endpoints: {
|
|
165
|
+
merge: `/${this.projectName}`,
|
|
166
|
+
upsert: '/upsert',
|
|
167
|
+
health: '/health'
|
|
168
|
+
},
|
|
65
169
|
mergeReady: this.cache.get() !== null
|
|
66
170
|
}));
|
|
67
171
|
}
|
|
@@ -69,7 +173,7 @@ export class HttpServer {
|
|
|
69
173
|
res.writeHead(404, { 'Content-Type': 'application/json' });
|
|
70
174
|
res.end(JSON.stringify({
|
|
71
175
|
error: 'Not found',
|
|
72
|
-
availableEndpoints: ['/', '/health', `/${this.projectName}
|
|
176
|
+
availableEndpoints: ['/', '/health', `/${this.projectName}`, '/upsert']
|
|
73
177
|
}));
|
|
74
178
|
}
|
|
75
179
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpServer.js","sourceRoot":"","sources":["../../lib/core/httpServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA2C,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"httpServer.js","sourceRoot":"","sources":["../../lib/core/httpServer.ts"],"names":[],"mappings":"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"}
|
package/dist/types/merge.d.ts
CHANGED
|
@@ -19,4 +19,23 @@ export interface MergeResult {
|
|
|
19
19
|
filesProcessed: number;
|
|
20
20
|
errors: string[];
|
|
21
21
|
}
|
|
22
|
+
export interface UpsertFile {
|
|
23
|
+
path: string;
|
|
24
|
+
content: string;
|
|
25
|
+
}
|
|
26
|
+
export interface UpsertRequest {
|
|
27
|
+
files: UpsertFile[];
|
|
28
|
+
basePath?: string;
|
|
29
|
+
}
|
|
30
|
+
export interface UpsertResult {
|
|
31
|
+
success: boolean;
|
|
32
|
+
filesProcessed: number;
|
|
33
|
+
errors: string[];
|
|
34
|
+
results: Array<{
|
|
35
|
+
path: string;
|
|
36
|
+
action: 'created' | 'updated';
|
|
37
|
+
success: boolean;
|
|
38
|
+
error?: string;
|
|
39
|
+
}>;
|
|
40
|
+
}
|
|
22
41
|
//# sourceMappingURL=merge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../lib/types/merge.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB"}
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../lib/types/merge.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC;QAC9B,OAAO,EAAE,OAAO,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ"}
|
|
@@ -5,5 +5,7 @@ export declare class FileUtils {
|
|
|
5
5
|
static exists(path: string): boolean;
|
|
6
6
|
static isTextFile(filePath: string): boolean;
|
|
7
7
|
static readJson<T>(path: string): T;
|
|
8
|
+
static upsert(path: string, content: string): 'created' | 'updated';
|
|
9
|
+
static ensureDir(path: string): void;
|
|
8
10
|
}
|
|
9
11
|
//# sourceMappingURL=fileUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileUtils.d.ts","sourceRoot":"","sources":["../../lib/utils/fileUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fileUtils.d.ts","sourceRoot":"","sources":["../../lib/utils/fileUtils.ts"],"names":[],"mappings":"AAGA,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAMvC;WAEY,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAI1B,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;WAI1C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAI7B,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;WAKrC,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC;WAK5B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;WAU5D,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CAG5C"}
|
package/dist/utils/fileUtils.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { readFileSync, writeFileSync, existsSync } from 'fs';
|
|
1
|
+
import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
|
|
2
|
+
import { dirname } from 'path';
|
|
2
3
|
export class FileUtils {
|
|
3
4
|
static BINARY_EXTENSIONS = [
|
|
4
5
|
'.png', '.jpg', '.jpeg', '.gif', '.ico', '.bmp', '.svg',
|
|
@@ -24,5 +25,17 @@ export class FileUtils {
|
|
|
24
25
|
const content = this.read(path);
|
|
25
26
|
return JSON.parse(content);
|
|
26
27
|
}
|
|
28
|
+
static upsert(path, content) {
|
|
29
|
+
const exists = this.exists(path);
|
|
30
|
+
const dir = dirname(path);
|
|
31
|
+
if (!existsSync(dir))
|
|
32
|
+
mkdirSync(dir, { recursive: true });
|
|
33
|
+
this.write(path, content);
|
|
34
|
+
return exists ? 'updated' : 'created';
|
|
35
|
+
}
|
|
36
|
+
static ensureDir(path) {
|
|
37
|
+
if (!existsSync(path))
|
|
38
|
+
mkdirSync(path, { recursive: true });
|
|
39
|
+
}
|
|
27
40
|
}
|
|
28
41
|
//# sourceMappingURL=fileUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileUtils.js","sourceRoot":"","sources":["../../lib/utils/fileUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"fileUtils.js","sourceRoot":"","sources":["../../lib/utils/fileUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,MAAM,OAAO,SAAS;IACZ,MAAM,CAAU,iBAAiB,GAAG;QAC1C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;QACvD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK;QAC5C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ;QAC/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;QACtC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;KAClC,CAAC;IAEK,MAAM,CAAC,IAAI,CAAC,IAAY;QAC7B,OAAO,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAY,EAAE,OAAe;QAC/C,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,IAAY;QAC/B,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,QAAgB;QACvC,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,CAAC;IAEM,MAAM,CAAC,QAAQ,CAAI,IAAY;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAM,CAAC;IAClC,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,IAAY,EAAE,OAAe;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAE1B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,OAAO,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,IAAY;QAClC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC"}
|