clanka 0.26.1 → 0.27.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/README.md +2 -3
- package/dist/Acp.test.js +0 -1
- package/dist/Acp.test.js.map +1 -1
- package/dist/AcpImage.test.js +0 -1
- package/dist/AcpImage.test.js.map +1 -1
- package/dist/Agent.d.ts.map +1 -1
- package/dist/Agent.js +1 -2
- package/dist/Agent.js.map +1 -1
- package/dist/Agent.test.js +0 -1
- package/dist/Agent.test.js.map +1 -1
- package/dist/AgentCallerConfig.test.js +0 -1
- package/dist/AgentCallerConfig.test.js.map +1 -1
- package/dist/AgentExecutor.d.ts +2 -3
- package/dist/AgentExecutor.d.ts.map +1 -1
- package/dist/AgentExecutor.js +4 -13
- package/dist/AgentExecutor.js.map +1 -1
- package/dist/AgentImage.test.js +0 -1
- package/dist/AgentImage.test.js.map +1 -1
- package/dist/AgentSkills.test.js +0 -2
- package/dist/AgentSkills.test.js.map +1 -1
- package/dist/AgentTools.d.ts +2 -235
- package/dist/AgentTools.d.ts.map +1 -1
- package/dist/AgentTools.js +2 -32
- package/dist/AgentTools.js.map +1 -1
- package/dist/ClaudeAgent.test.js +0 -1
- package/dist/ClaudeAgent.test.js.map +1 -1
- package/dist/ScriptFormatting.d.ts +5 -0
- package/dist/ScriptFormatting.d.ts.map +1 -1
- package/dist/ScriptFormatting.js +255 -53
- package/dist/ScriptFormatting.js.map +1 -1
- package/dist/ScriptFormatting.test.js +16 -0
- package/dist/ScriptFormatting.test.js.map +1 -1
- package/dist/bin/{Latch-DOdbsGMQ.mjs → Latch-BE6_TYRL.mjs} +1 -1
- package/dist/bin/{McpClient-B-FFG6Pg.mjs → McpClient-DCt4v5W5.mjs} +2 -2
- package/dist/bin/{OutputFormatter-DhhP2i-7.mjs → OutputFormatter-DaFv_C_I.mjs} +2 -3
- package/dist/bin/{Schema-CFdSO6iH.mjs → Schema-B3MiG1aD.mjs} +204 -568
- package/dist/bin/cli.mjs +5093 -2468
- package/dist/bin/{upgrade-C4aOEWJH.mjs → upgrade-WqgIU_21.mjs} +3 -3
- package/dist/cli.js +2 -25
- package/dist/cli.js.map +1 -1
- package/dist/index.d.ts +0 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +0 -8
- package/dist/index.js.map +1 -1
- package/package.json +1 -7
- package/src/Acp.test.ts +0 -1
- package/src/AcpImage.test.ts +0 -1
- package/src/Agent.test.ts +0 -1
- package/src/Agent.ts +0 -4
- package/src/AgentCallerConfig.test.ts +0 -1
- package/src/AgentExecutor.ts +4 -16
- package/src/AgentImage.test.ts +0 -1
- package/src/AgentSkills.test.ts +0 -2
- package/src/AgentTools.ts +4 -41
- package/src/ClaudeAgent.test.ts +0 -1
- package/src/ScriptFormatting.test.ts +20 -0
- package/src/ScriptFormatting.ts +234 -47
- package/src/cli.ts +1 -56
- package/src/index.ts +0 -10
- package/dist/ChunkRepo.d.ts +0 -173
- package/dist/ChunkRepo.d.ts.map +0 -1
- package/dist/ChunkRepo.js +0 -168
- package/dist/ChunkRepo.js.map +0 -1
- package/dist/ChunkRepo.test.d.ts +0 -2
- package/dist/ChunkRepo.test.d.ts.map +0 -1
- package/dist/ChunkRepo.test.js +0 -63
- package/dist/ChunkRepo.test.js.map +0 -1
- package/dist/CodeChunker.d.ts +0 -84
- package/dist/CodeChunker.d.ts.map +0 -1
- package/dist/CodeChunker.js +0 -658
- package/dist/CodeChunker.js.map +0 -1
- package/dist/CodeChunker.test.d.ts +0 -2
- package/dist/CodeChunker.test.d.ts.map +0 -1
- package/dist/CodeChunker.test.js +0 -434
- package/dist/CodeChunker.test.js.map +0 -1
- package/dist/SemanticSearch/Service.d.ts +0 -31
- package/dist/SemanticSearch/Service.d.ts.map +0 -1
- package/dist/SemanticSearch/Service.js +0 -29
- package/dist/SemanticSearch/Service.js.map +0 -1
- package/dist/SemanticSearch.d.ts +0 -34
- package/dist/SemanticSearch.d.ts.map +0 -1
- package/dist/SemanticSearch.js +0 -171
- package/dist/SemanticSearch.js.map +0 -1
- package/dist/SemanticSearch.test.d.ts +0 -2
- package/dist/SemanticSearch.test.d.ts.map +0 -1
- package/dist/SemanticSearch.test.js +0 -34
- package/dist/SemanticSearch.test.js.map +0 -1
- package/dist/Sqlite.d.ts +0 -15
- package/dist/Sqlite.d.ts.map +0 -1
- package/dist/Sqlite.js +0 -44
- package/dist/Sqlite.js.map +0 -1
- package/dist/bin/AiError-DBaKz35C.mjs +0 -2723
- package/dist/bin/SemanticSearch-C3a7LAQr.mjs +0 -2558
- package/src/ChunkRepo.test.ts +0 -89
- package/src/ChunkRepo.ts +0 -260
- package/src/CodeChunker.test.ts +0 -493
- package/src/CodeChunker.ts +0 -1018
- package/src/SemanticSearch/Service.ts +0 -50
- package/src/SemanticSearch.test.ts +0 -51
- package/src/SemanticSearch.ts +0 -282
- package/src/Sqlite.ts +0 -60
package/dist/ScriptFormatting.js
CHANGED
|
@@ -1,61 +1,263 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
1
|
+
/**
|
|
2
|
+
* Display-only line breaks for model-generated scripts. A small scanner finds
|
|
3
|
+
* statement boundaries, skipping literals and comments, so no parser is
|
|
4
|
+
* needed. Scripts it cannot scan are returned unchanged.
|
|
5
|
+
*/
|
|
6
|
+
// Tokens after which `{` opens a statement block rather than an expression.
|
|
7
|
+
const blockOpeners = new Set([
|
|
8
|
+
"",
|
|
9
|
+
";",
|
|
10
|
+
"{",
|
|
11
|
+
"}",
|
|
12
|
+
")",
|
|
13
|
+
"=>",
|
|
14
|
+
"else",
|
|
15
|
+
"try",
|
|
16
|
+
"finally",
|
|
17
|
+
"do",
|
|
18
|
+
]);
|
|
19
|
+
// Tokens after which `/` starts a regular expression rather than a division.
|
|
20
|
+
const regexKeywords = new Set([
|
|
21
|
+
"return",
|
|
22
|
+
"typeof",
|
|
23
|
+
"instanceof",
|
|
24
|
+
"in",
|
|
25
|
+
"of",
|
|
26
|
+
"new",
|
|
27
|
+
"delete",
|
|
28
|
+
"void",
|
|
29
|
+
"throw",
|
|
30
|
+
"case",
|
|
31
|
+
"do",
|
|
32
|
+
"else",
|
|
33
|
+
"yield",
|
|
34
|
+
"await",
|
|
35
|
+
]);
|
|
36
|
+
// Words that continue the statement a block belongs to.
|
|
37
|
+
const continuations = new Set([
|
|
38
|
+
"else",
|
|
39
|
+
"catch",
|
|
40
|
+
"finally",
|
|
41
|
+
"instanceof",
|
|
42
|
+
"in",
|
|
43
|
+
"as",
|
|
44
|
+
"satisfies",
|
|
45
|
+
]);
|
|
46
|
+
const isWord = (char) => /[\w$]/.test(char) || char.charCodeAt(0) > 127;
|
|
47
|
+
const isSpace = (char) => /\s/.test(char);
|
|
48
|
+
// `prev` is "" at the start, a punctuator, a word, "id" for a property name,
|
|
49
|
+
// or "str" for a literal. After ")" a slash is not decided here: see below.
|
|
50
|
+
const regexAllowed = (prev) => prev === "" ||
|
|
51
|
+
regexKeywords.has(prev) ||
|
|
52
|
+
(!isWord(prev[0]) && !["]", "}o", "++", "--"].includes(prev));
|
|
53
|
+
/** Returns the positions of statement boundaries, or undefined if the script cannot be scanned. */
|
|
54
|
+
const findBreaks = (script) => {
|
|
55
|
+
const breaks = new Set();
|
|
56
|
+
const stack = [];
|
|
57
|
+
// Inside a template literal, including its substitutions, nothing is broken.
|
|
58
|
+
let opaque = 0;
|
|
59
|
+
let prev = "";
|
|
60
|
+
let prevEnd = 0;
|
|
61
|
+
const top = () => stack.at(-1)?.type;
|
|
62
|
+
const inStatements = () => {
|
|
63
|
+
const type = top();
|
|
64
|
+
return type === undefined || type === "block" || type === "brace";
|
|
65
|
+
};
|
|
66
|
+
// Skips whitespace and comments, or returns undefined for an unterminated comment.
|
|
67
|
+
const skipTrivia = (from) => {
|
|
68
|
+
let i = from;
|
|
69
|
+
while (i < script.length) {
|
|
70
|
+
if (isSpace(script[i]))
|
|
71
|
+
i++;
|
|
72
|
+
else if (script.startsWith("//", i)) {
|
|
73
|
+
const end = script.indexOf("\n", i);
|
|
74
|
+
i = end === -1 ? script.length : end;
|
|
75
|
+
}
|
|
76
|
+
else if (script.startsWith("/*", i)) {
|
|
77
|
+
const end = script.indexOf("*/", i + 2);
|
|
78
|
+
if (end === -1)
|
|
79
|
+
return undefined;
|
|
80
|
+
i = end + 2;
|
|
36
81
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
82
|
+
else
|
|
83
|
+
break;
|
|
84
|
+
}
|
|
85
|
+
return i;
|
|
86
|
+
};
|
|
87
|
+
const nextToken = (from) => {
|
|
88
|
+
const i = skipTrivia(from);
|
|
89
|
+
if (i === undefined || i >= script.length)
|
|
90
|
+
return "";
|
|
91
|
+
if (!isWord(script[i]))
|
|
92
|
+
return script[i];
|
|
93
|
+
let end = i;
|
|
94
|
+
while (end < script.length && isWord(script[end]))
|
|
95
|
+
end++;
|
|
96
|
+
return script.slice(i, end);
|
|
97
|
+
};
|
|
98
|
+
let i = 0;
|
|
99
|
+
while (i < script.length) {
|
|
100
|
+
const char = script[i];
|
|
101
|
+
if (top() === "template") {
|
|
102
|
+
if (char === "\\")
|
|
103
|
+
i += 2;
|
|
104
|
+
else if (char === "`") {
|
|
105
|
+
stack.pop();
|
|
106
|
+
opaque--;
|
|
107
|
+
prev = "str";
|
|
108
|
+
prevEnd = ++i;
|
|
109
|
+
}
|
|
110
|
+
else if (script.startsWith("${", i)) {
|
|
111
|
+
stack.push({ type: "subst" });
|
|
112
|
+
prev = "(";
|
|
113
|
+
i += 2;
|
|
114
|
+
}
|
|
115
|
+
else
|
|
116
|
+
i++;
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
if (isSpace(char) ||
|
|
120
|
+
script.startsWith("//", i) ||
|
|
121
|
+
script.startsWith("/*", i)) {
|
|
122
|
+
const end = skipTrivia(i);
|
|
123
|
+
if (end === undefined)
|
|
124
|
+
return undefined;
|
|
125
|
+
i = end;
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
const start = i;
|
|
129
|
+
if (char === '"' || char === "'") {
|
|
130
|
+
i++;
|
|
131
|
+
while (script[i] !== char) {
|
|
132
|
+
if (i >= script.length || script[i] === "\n")
|
|
133
|
+
return undefined;
|
|
134
|
+
i += script[i] === "\\" ? 2 : 1;
|
|
135
|
+
}
|
|
136
|
+
i++;
|
|
137
|
+
prev = "str";
|
|
138
|
+
}
|
|
139
|
+
else if (char === "`") {
|
|
140
|
+
stack.push({ type: "template" });
|
|
141
|
+
opaque++;
|
|
142
|
+
i++;
|
|
143
|
+
continue;
|
|
144
|
+
}
|
|
145
|
+
else if (char === "/" && prev === ")") {
|
|
146
|
+
// After a control header such as `if (x)` it starts a regex, after a
|
|
147
|
+
// call or a parenthesized expression it divides. Telling these apart
|
|
148
|
+
// needs a parser, so leave the script unchanged.
|
|
149
|
+
return undefined;
|
|
150
|
+
}
|
|
151
|
+
else if (char === "/" && regexAllowed(prev)) {
|
|
152
|
+
let inClass = false;
|
|
153
|
+
i++;
|
|
154
|
+
while (inClass || script[i] !== "/") {
|
|
155
|
+
if (i >= script.length || script[i] === "\n")
|
|
156
|
+
return undefined;
|
|
157
|
+
if (script[i] === "[")
|
|
158
|
+
inClass = true;
|
|
159
|
+
else if (script[i] === "]")
|
|
160
|
+
inClass = false;
|
|
161
|
+
i += script[i] === "\\" ? 2 : 1;
|
|
162
|
+
}
|
|
163
|
+
i++;
|
|
164
|
+
while (i < script.length && isWord(script[i]))
|
|
165
|
+
i++;
|
|
166
|
+
prev = "str";
|
|
167
|
+
}
|
|
168
|
+
else if (isWord(char)) {
|
|
169
|
+
while (i < script.length && isWord(script[i]))
|
|
170
|
+
i++;
|
|
171
|
+
// A name after "." is a property, even when it is spelled like a keyword.
|
|
172
|
+
prev = prev === "." ? "id" : script.slice(start, i);
|
|
173
|
+
}
|
|
174
|
+
else if (char === "{") {
|
|
175
|
+
if (blockOpeners.has(prev)) {
|
|
176
|
+
stack.push({ type: "block", start: i, opener: prev });
|
|
177
|
+
if (opaque === 0)
|
|
178
|
+
breaks.add(i + 1);
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
stack.push({ type: "brace" });
|
|
182
|
+
}
|
|
183
|
+
prev = "{";
|
|
184
|
+
i++;
|
|
185
|
+
}
|
|
186
|
+
else if (char === "}") {
|
|
187
|
+
const frame = stack.pop();
|
|
188
|
+
if (frame === undefined ||
|
|
189
|
+
!["block", "brace", "subst"].includes(frame.type)) {
|
|
190
|
+
return undefined;
|
|
191
|
+
}
|
|
192
|
+
i++;
|
|
193
|
+
if (frame.type === "subst")
|
|
48
194
|
continue;
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
195
|
+
prev = "}o";
|
|
196
|
+
if (frame.type === "block") {
|
|
197
|
+
prev = "}";
|
|
198
|
+
if (opaque === 0) {
|
|
199
|
+
// End the block's last statement, then the statement the block ends.
|
|
200
|
+
if (prevEnd > frame.start + 1)
|
|
201
|
+
breaks.add(prevEnd);
|
|
202
|
+
const next = nextToken(i);
|
|
203
|
+
if (inStatements() &&
|
|
204
|
+
frame.opener !== "do" &&
|
|
205
|
+
(next === "" ||
|
|
206
|
+
next === "{" ||
|
|
207
|
+
next === '"' ||
|
|
208
|
+
next === "'" ||
|
|
209
|
+
(isWord(next[0]) && !continuations.has(next)))) {
|
|
210
|
+
breaks.add(i);
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
}
|
|
54
214
|
}
|
|
55
|
-
|
|
215
|
+
else if (char === "(" || char === "[") {
|
|
216
|
+
stack.push({ type: char === "(" ? "paren" : "bracket" });
|
|
217
|
+
prev = char;
|
|
218
|
+
i++;
|
|
219
|
+
}
|
|
220
|
+
else if (char === ")" || char === "]") {
|
|
221
|
+
if (top() !== (char === ")" ? "paren" : "bracket"))
|
|
222
|
+
return undefined;
|
|
223
|
+
stack.pop();
|
|
224
|
+
prev = char;
|
|
225
|
+
i++;
|
|
226
|
+
}
|
|
227
|
+
else if (char === ";") {
|
|
228
|
+
if (opaque === 0 && inStatements())
|
|
229
|
+
breaks.add(i + 1);
|
|
230
|
+
prev = char;
|
|
231
|
+
i++;
|
|
232
|
+
}
|
|
233
|
+
else {
|
|
234
|
+
const pair = script.slice(i, i + 2);
|
|
235
|
+
prev = pair === "=>" || pair === "++" || pair === "--" ? pair : char;
|
|
236
|
+
i += prev.length;
|
|
237
|
+
}
|
|
238
|
+
prevEnd = i;
|
|
56
239
|
}
|
|
57
|
-
|
|
240
|
+
return stack.length === 0 ? breaks : undefined;
|
|
241
|
+
};
|
|
242
|
+
/** Adds display-only line breaks, leaving execution and model history untouched. */
|
|
243
|
+
export const formatScript = (script) => {
|
|
244
|
+
const breaks = findBreaks(script);
|
|
245
|
+
if (breaks === undefined)
|
|
58
246
|
return script;
|
|
247
|
+
let output = "";
|
|
248
|
+
let start = 0;
|
|
249
|
+
const newline = script.includes("\r\n") ? "\r\n" : "\n";
|
|
250
|
+
for (const index of [...breaks].toSorted((a, b) => a - b)) {
|
|
251
|
+
// Keep existing newlines / indentation, and avoid adding a trailing line.
|
|
252
|
+
const rest = script.slice(index);
|
|
253
|
+
if (/^[ \t]*(?:[\r\n]|$)/.test(rest))
|
|
254
|
+
continue;
|
|
255
|
+
output += script.slice(start, index) + newline;
|
|
256
|
+
start = index;
|
|
257
|
+
// Separators on the original line are not indentation for the new one.
|
|
258
|
+
while (script[start] === " " || script[start] === "\t")
|
|
259
|
+
start++;
|
|
59
260
|
}
|
|
261
|
+
return output + script.slice(start);
|
|
60
262
|
};
|
|
61
263
|
//# sourceMappingURL=ScriptFormatting.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScriptFormatting.js","sourceRoot":"","sources":["../src/ScriptFormatting.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"ScriptFormatting.js","sourceRoot":"","sources":["../src/ScriptFormatting.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,12 @@ describe("formatScript", () => {
|
|
|
36
36
|
expect(formatScript(input)).toBe(output);
|
|
37
37
|
expect(formatScript(output)).toBe(output);
|
|
38
38
|
});
|
|
39
|
+
it("breaks statement blocks but not the expressions around them", () => {
|
|
40
|
+
const input = "const a=b/2;if(a){x()}else{y()}run(function(){go();});";
|
|
41
|
+
const output = "const a=b/2;\nif(a){\nx()\n}else{\ny()\n}\nrun(function(){\ngo();\n});";
|
|
42
|
+
expect(formatScript(input)).toBe(output);
|
|
43
|
+
expect(formatScript(output)).toBe(output);
|
|
44
|
+
});
|
|
39
45
|
it("preserves literals, comments, and line-sensitive expressions", () => {
|
|
40
46
|
const input = [
|
|
41
47
|
`const text="😀;{}";const re=/[;{}]/g;`,
|
|
@@ -50,9 +56,19 @@ describe("formatScript", () => {
|
|
|
50
56
|
expect(output).toContain("// comment ;{}\n");
|
|
51
57
|
expect(output).toContain("/* comment ;{} */");
|
|
52
58
|
expect(output).toContain("return {value: 1};");
|
|
59
|
+
expect(formatScript("n=a.in/2;re=/x;y/;")).toBe("n=a.in/2;\nre=/x;y/;");
|
|
60
|
+
// A slash after ")" may start a regex or divide, so nothing is changed.
|
|
61
|
+
for (const input of [
|
|
62
|
+
"if (a) /x;y/.test(s);n=1;",
|
|
63
|
+
"for await (const x of []) /x;y/.test(s);n=1;",
|
|
64
|
+
"n=obj.with()/2;re=/x;y/;",
|
|
65
|
+
]) {
|
|
66
|
+
expect(formatScript(input)).toBe(input);
|
|
67
|
+
}
|
|
53
68
|
});
|
|
54
69
|
it("leaves incomplete scripts and existing whitespace alone", () => {
|
|
55
70
|
expect(formatScript("const x = {;")).toBe("const x = {;");
|
|
71
|
+
expect(formatScript("const x=1; /* unfinished")).toBe("const x=1; /* unfinished");
|
|
56
72
|
const input = "if (true) {\r\n console.log(1);\r\n}\r\n";
|
|
57
73
|
expect(formatScript(input)).toBe(input);
|
|
58
74
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScriptFormatting.test.js","sourceRoot":"","sources":["../src/ScriptFormatting.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAEpD,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,KAAK,GAAG;YACZ,sIAAsI;YACtI,4FAA4F;YAC5F,aAAa;YACb,mBAAmB;YACnB,mBAAmB;YACnB,GAAG;SACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACZ,MAAM,QAAQ,GAAG;YACf,6BAA6B;YAC7B,mDAAmD;YACnD,sDAAsD;YACtD,aAAa;YACb,8BAA8B;YAC9B,gDAAgD;YAChD,GAAG;YACH,aAAa;YACb,mBAAmB;YACnB,mBAAmB;YACnB,GAAG;SACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACZ,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC1C,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC/C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,WAAW,GAAG,eAAe,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAA;QACzD,MAAM,CAAC,YAAY,CAAC,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAC3D,WAAW,GAAG,sBAAsB,CACrC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;QACzF,MAAM,KAAK,GAAG,oDAAoD,CAAA;QAClE,MAAM,MAAM,GAAG,4DAA4D,CAAA;QAC3E,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,KAAK,GAAG;YACZ,uCAAuC;YACvC,qDAAqD;YACrD,gBAAgB;YAChB,oDAAoD;YACpD,uEAAuE;SACxE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACZ,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA;QAClC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,yCAAyC,CAAC,CAAA;QACnE,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,qCAAqC,CAAC,CAAA;QAC/D,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;QAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"ScriptFormatting.test.js","sourceRoot":"","sources":["../src/ScriptFormatting.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { cc as makeLatchUnsafe, sc as makeLatch } from "./Schema-B3MiG1aD.mjs";
|
|
2
2
|
// node_modules/.pnpm/effect@4.1.3/node_modules/effect/dist/Latch.js
|
|
3
3
|
const makeUnsafe = makeLatchUnsafe;
|
|
4
4
|
const make = makeLatch;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Cl as Service, H as TaggedError, Jo as effect, Jr as acquireRelease, Oi as fn, Pa as sync, Ri as gen, Va as tryPromise, da as promise, u as Defect } from "./Schema-B3MiG1aD.mjs";
|
|
2
|
+
import { i as Client, r as StreamableHTTPClientTransport } from "./cli.mjs";
|
|
3
3
|
// src/McpClient.ts
|
|
4
4
|
var McpClient = class extends Service()("clanka/McpClient") {};
|
|
5
5
|
var McpClientError = class extends TaggedError()("McpClientError", { cause: Defect() }) {};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { c as ReasoningEnd, l as ScriptEnd } from "./cli.mjs";
|
|
1
|
+
import { Cl as Service, Hu as identity, Jo as effect, Mu as isTagged, Oo as fail, Pi as forkIn, Ri as gen, Uo as pretty$1, Ya as void_, aa as onExit, ki as fnUntraced, ni as asVoid, wa as scope } from "./Schema-B3MiG1aD.mjs";
|
|
2
|
+
import { C as succeed, D as unbounded, E as makeUnsafe, S as runIntoPubSub, T as tap, _ as failCause, b as fromPubSub, g as die, h as concat, m as catchIf, n as ScriptEnd, p as catchCause, t as ReasoningEnd, v as flattenIterable, w as suspend, x as map, y as fromIterable } from "./cli.mjs";
|
|
4
3
|
import os from "node:os";
|
|
5
4
|
import process from "node:process";
|
|
6
5
|
import tty from "node:tty";
|