@jixo/cli 0.3.0 → 0.5.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 +13 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +1 -0
- package/dist/cli.js.map +1 -1
- package/dist/index.js +0 -0
- package/package.json +8 -5
- package/prompts/i18n.md +0 -108
- package/prompts/readme-writer.md +0 -120
- package/prompts/user.md +0 -88
- package/prompts/writer.md +0 -13
- package/scripts/gen-prompts.ts +0 -27
- package/src/cli.ts +0 -96
- package/src/commands/doctor/config.ts +0 -30
- package/src/commands/doctor/doctor.test.ts +0 -17
- package/src/commands/doctor/doctor.ts +0 -151
- package/src/commands/doctor/index.ts +0 -21
- package/src/commands/doctor/types.ts +0 -39
- package/src/commands/init.ts +0 -64
- package/src/commands/prompts/list.ts +0 -14
- package/src/commands/prompts/upgrade.ts +0 -16
- package/src/commands/tasks/ai-tools.ts +0 -65
- package/src/commands/tasks/model-providers.ts +0 -54
- package/src/commands/tasks/run-ai-task.ts +0 -263
- package/src/commands/tasks/run.ts +0 -52
- package/src/config.ts +0 -39
- package/src/env.ts +0 -32
- package/src/helper/find-changes.test.ts +0 -23
- package/src/helper/find-changes.ts +0 -109
- package/src/helper/prompts-loader.ts +0 -33
- package/src/helper/resolve-ai-tasks.ts +0 -126
- package/src/index.ts +0 -8
- package/src/prompts.json +0 -29
- package/tsconfig.json +0 -15
- package/tsconfig.tsbuildinfo +0 -1
@@ -1,151 +0,0 @@
|
|
1
|
-
// doctor.ts
|
2
|
-
import {blue, cyan, green, red, spinner, yellow} from "@gaubee/nodekit";
|
3
|
-
import {execSync} from "child_process";
|
4
|
-
import semver from "semver";
|
5
|
-
|
6
|
-
import {iter_map_not_null} from "@gaubee/util";
|
7
|
-
import type {DoctorConfig} from "./types.js"; // Assuming types.ts
|
8
|
-
|
9
|
-
const CHECK_MARK = green("✔");
|
10
|
-
const CROSS_MARK = red("✖");
|
11
|
-
const WARN_MARK = yellow("⚠");
|
12
|
-
|
13
|
-
export interface ToolCheckResult {
|
14
|
-
id: string;
|
15
|
-
displayName: string;
|
16
|
-
exists: boolean;
|
17
|
-
version?: string; // Actual version found
|
18
|
-
requiredVersion?: string; // From config
|
19
|
-
meetsVersionRequirement: boolean; // True if version >= minVersion or if minVersion not set & exists
|
20
|
-
isOptional: boolean;
|
21
|
-
message: string;
|
22
|
-
installationHint?: string;
|
23
|
-
}
|
24
|
-
|
25
|
-
export interface DoctorReport {
|
26
|
-
overallSuccess: boolean;
|
27
|
-
results: ToolCheckResult[];
|
28
|
-
}
|
29
|
-
|
30
|
-
async function executeCommand(command: string): Promise<{stdout: string; stderr: string; error?: Error}> {
|
31
|
-
return new Promise((resolve) => {
|
32
|
-
try {
|
33
|
-
const stdout = execSync(command, {encoding: "utf8", stdio: "pipe"});
|
34
|
-
resolve({stdout, stderr: ""});
|
35
|
-
} catch (e: any) {
|
36
|
-
resolve({stdout: "", stderr: e.stderr || "", error: e});
|
37
|
-
}
|
38
|
-
});
|
39
|
-
}
|
40
|
-
|
41
|
-
export async function runDoctor(config: DoctorConfig, enableLog: boolean = true): Promise<DoctorReport> {
|
42
|
-
const LOG_TITLE = "Running Environment Doctor 🏥\n\n";
|
43
|
-
const logger = spinner(LOG_TITLE);
|
44
|
-
if (enableLog) {
|
45
|
-
logger.start();
|
46
|
-
}
|
47
|
-
|
48
|
-
const results: ToolCheckResult[] = [];
|
49
|
-
let overallSuccess = true;
|
50
|
-
let overallWarn = false;
|
51
|
-
|
52
|
-
const tool_logs: string[] = [];
|
53
|
-
|
54
|
-
for (const [index, tool] of config.entries()) {
|
55
|
-
const TOOL_LOG_TITLE = `${blue(`[${tool.id}]`)} ${cyan(tool.displayName)}`;
|
56
|
-
const SUCCESS_MARK = () => CHECK_MARK;
|
57
|
-
const FAIL_MARK = () => {
|
58
|
-
overallWarn = true;
|
59
|
-
return tool.optional ? WARN_MARK : CROSS_MARK;
|
60
|
-
};
|
61
|
-
const setToolLog = (update: (cur: string) => string | (string | undefined | null)[]) => {
|
62
|
-
const log = update(tool_logs[index] ?? "");
|
63
|
-
tool_logs[index] = (Array.isArray(log) ? iter_map_not_null(log, (v) => (v ? v : null)) : [log]).map((line) => " " + line).join("\n");
|
64
|
-
logger.text = LOG_TITLE + tool_logs.join("\n");
|
65
|
-
};
|
66
|
-
setToolLog(() => `Checking ${TOOL_LOG_TITLE}... `);
|
67
|
-
let tool_log: (string | undefined | null)[] = [];
|
68
|
-
|
69
|
-
const result: ToolCheckResult = {
|
70
|
-
id: tool.id,
|
71
|
-
displayName: tool.displayName,
|
72
|
-
exists: false,
|
73
|
-
meetsVersionRequirement: false, // Assume failure until proven otherwise
|
74
|
-
isOptional: !!tool.optional,
|
75
|
-
message: "",
|
76
|
-
requiredVersion: tool.minVersion,
|
77
|
-
installationHint: tool.installationHint,
|
78
|
-
};
|
79
|
-
|
80
|
-
const execResult = await executeCommand(tool.versionCommand);
|
81
|
-
|
82
|
-
if (execResult.error || execResult.stderr.includes("command not found") || execResult.stderr.includes("not recognized")) {
|
83
|
-
result.exists = false;
|
84
|
-
result.message = `'${tool.id}' command not found or failed to execute.`;
|
85
|
-
tool_log = [
|
86
|
-
//
|
87
|
-
`${FAIL_MARK()} ${TOOL_LOG_TITLE}`,
|
88
|
-
` ${red(result.message)}`,
|
89
|
-
tool.installationHint && ` ${yellow("Hint:")} ${tool.installationHint}`,
|
90
|
-
];
|
91
|
-
} else {
|
92
|
-
result.exists = true;
|
93
|
-
const output = execResult.stdout.trim();
|
94
|
-
const match = output.match(tool.versionParseRegex);
|
95
|
-
|
96
|
-
if (match && match[1]) {
|
97
|
-
result.version = semver.clean(match[1]) || undefined; // Clean the version string
|
98
|
-
if (result.version) {
|
99
|
-
if (tool.minVersion) {
|
100
|
-
if (semver.gte(result.version, tool.minVersion)) {
|
101
|
-
result.meetsVersionRequirement = true;
|
102
|
-
result.message = `Version ${result.version} satisfies >=${tool.minVersion}.`;
|
103
|
-
tool_log.push(`${SUCCESS_MARK()} ${TOOL_LOG_TITLE} (v${result.version})`);
|
104
|
-
} else {
|
105
|
-
result.meetsVersionRequirement = false;
|
106
|
-
result.message = `Version ${result.version} is older than required >=${tool.minVersion}.`;
|
107
|
-
tool_log.push(`${FAIL_MARK()} ${TOOL_LOG_TITLE} (v${result.version} - required: >=${tool.minVersion})`);
|
108
|
-
tool_log.push(` ${red(result.message)}`);
|
109
|
-
if (tool.installationHint) {
|
110
|
-
tool_log.push(` ${yellow("Hint:")} ${tool.installationHint}`);
|
111
|
-
}
|
112
|
-
}
|
113
|
-
} else {
|
114
|
-
// No minimum version specified, just existence is enough
|
115
|
-
result.meetsVersionRequirement = true;
|
116
|
-
result.message = `Found version ${result.version}. No minimum version specified.`;
|
117
|
-
tool_log.push(`${SUCCESS_MARK()} ${TOOL_LOG_TITLE} (v${result.version} - existence check only)`);
|
118
|
-
}
|
119
|
-
} else {
|
120
|
-
// Regex matched but couldn't clean version (should be rare with semver.clean)
|
121
|
-
result.meetsVersionRequirement = false;
|
122
|
-
result.message = `Could not parse a valid version string from output: "${output}". Regex: ${tool.versionParseRegex}`;
|
123
|
-
tool_log.push(`${FAIL_MARK()} ${TOOL_LOG_TITLE}`);
|
124
|
-
tool_log.push(` ${red(result.message)}`);
|
125
|
-
}
|
126
|
-
} else {
|
127
|
-
result.meetsVersionRequirement = false;
|
128
|
-
result.message = `Could not parse version from output: "${output}". Regex: ${tool.versionParseRegex}`;
|
129
|
-
tool_log.push(`${FAIL_MARK}`);
|
130
|
-
tool_log.push(` ${red(result.message)}`);
|
131
|
-
}
|
132
|
-
}
|
133
|
-
|
134
|
-
setToolLog(() => tool_log);
|
135
|
-
|
136
|
-
results.push(result);
|
137
|
-
if (!result.meetsVersionRequirement && !result.isOptional) {
|
138
|
-
overallSuccess = false;
|
139
|
-
}
|
140
|
-
}
|
141
|
-
|
142
|
-
const LOG_SUMMERY = `${overallSuccess ? (overallWarn ? "⚠️ " : "✅") : "💊"} JIXO Environment Doctor 🏥\n\n`;
|
143
|
-
logger.stopAndPersist({
|
144
|
-
text: LOG_SUMMERY + tool_logs.join("\n") + "\n",
|
145
|
-
});
|
146
|
-
|
147
|
-
return {
|
148
|
-
overallSuccess,
|
149
|
-
results,
|
150
|
-
};
|
151
|
-
}
|
@@ -1,21 +0,0 @@
|
|
1
|
-
// import {bgGreen, bgRed, black, white} from "@gaubee/nodekit"; // For the final message
|
2
|
-
import {func_remember} from "@gaubee/util";
|
3
|
-
import {myDoctorConfig} from "./config.js";
|
4
|
-
import {runDoctor} from "./doctor.js";
|
5
|
-
|
6
|
-
export const doctor = func_remember(async (enableLog: boolean = true) => {
|
7
|
-
const report = await runDoctor(myDoctorConfig, enableLog);
|
8
|
-
|
9
|
-
// if (log) {
|
10
|
-
// console.log("\n\n--- Structured Report (for programmatic use) ---");
|
11
|
-
// console.log(JSON.stringify(report, null, 2));
|
12
|
-
|
13
|
-
// if (!report.overallSuccess) {
|
14
|
-
// console.error(bgRed(white("\nCritical environment checks failed. Please fix the issues above before proceeding.")));
|
15
|
-
// // process.exit(1); // Optionally exit if critical checks fail in a real CLI
|
16
|
-
// } else {
|
17
|
-
// console.log(bgGreen(black("\nAll critical checks passed successfully!")));
|
18
|
-
// }
|
19
|
-
// }
|
20
|
-
return report;
|
21
|
-
});
|
@@ -1,39 +0,0 @@
|
|
1
|
-
|
2
|
-
// types.ts (or directly in your doctor.ts)
|
3
|
-
|
4
|
-
export interface ToolCheckConfig {
|
5
|
-
/** A unique identifier for this check (e.g., 'pnpm', 'uvx-cli') */
|
6
|
-
id: string;
|
7
|
-
|
8
|
-
/** User-friendly name for display purposes (e.g., "PNPM Package Manager") */
|
9
|
-
displayName: string;
|
10
|
-
|
11
|
-
/** The command to execute to get the version (e.g., "pnpm --version") */
|
12
|
-
versionCommand: string;
|
13
|
-
|
14
|
-
/**
|
15
|
-
* A regular expression to parse the version string from the command's output.
|
16
|
-
* It MUST have at least one capturing group, which should capture the version string.
|
17
|
-
* Example: For "pnpm 10.11.0", regex could be /pnpm\s+([\d.]+)/ or simply /([\d.]+)/
|
18
|
-
*/
|
19
|
-
versionParseRegex: RegExp;
|
20
|
-
|
21
|
-
/**
|
22
|
-
* The minimum required version (Semantic Versioning string).
|
23
|
-
* If undefined, only existence is checked.
|
24
|
-
*/
|
25
|
-
minVersion?: string;
|
26
|
-
|
27
|
-
/**
|
28
|
-
* Optional: A hint or URL for installation if the tool is missing or version is too low.
|
29
|
-
*/
|
30
|
-
installationHint?: string;
|
31
|
-
|
32
|
-
/**
|
33
|
-
* Optional: If true, a failure for this tool won't cause the overall doctor check to fail.
|
34
|
-
* It will still be reported. Defaults to false.
|
35
|
-
*/
|
36
|
-
optional?: boolean;
|
37
|
-
}
|
38
|
-
|
39
|
-
export type DoctorConfig = ToolCheckConfig[];
|
package/src/commands/init.ts
DELETED
@@ -1,64 +0,0 @@
|
|
1
|
-
import {writeJson, writeMarkdown, writeText} from "@gaubee/nodekit";
|
2
|
-
import {str_trim_indent} from "@gaubee/util";
|
3
|
-
import fs from "node:fs";
|
4
|
-
import path from "node:path";
|
5
|
-
import type {JixoConfig} from "../config.js";
|
6
|
-
import {safeEnv} from "../env.js";
|
7
|
-
export const init = (dir: string) => {
|
8
|
-
const jixoDirname = path.join(dir, ".jixo");
|
9
|
-
/// 创建 .jixo 目录
|
10
|
-
fs.mkdirSync(jixoDirname, {recursive: true});
|
11
|
-
{
|
12
|
-
/// .jixo/readme.task.md
|
13
|
-
const readmeTaskFilepath = path.join(jixoDirname, "readme.task.md");
|
14
|
-
if (!fs.existsSync(readmeTaskFilepath)) {
|
15
|
-
writeMarkdown(
|
16
|
-
readmeTaskFilepath,
|
17
|
-
str_trim_indent(`
|
18
|
-
<!-- 您可以自定义 readme.md 文件的格式 -->
|
19
|
-
请JIXO帮我生成或者追加 README 文件
|
20
|
-
`),
|
21
|
-
{
|
22
|
-
agents: ["readme-writer"],
|
23
|
-
},
|
24
|
-
);
|
25
|
-
}
|
26
|
-
}
|
27
|
-
/// 配置文件
|
28
|
-
{
|
29
|
-
const jixoConfigFilepath = path.join(jixoDirname, "jixo.config.json");
|
30
|
-
if (!fs.existsSync(jixoConfigFilepath)) {
|
31
|
-
writeJson(jixoConfigFilepath, {
|
32
|
-
tasks: {type: "dir", dirname: ".jixo"},
|
33
|
-
} satisfies JixoConfig);
|
34
|
-
}
|
35
|
-
}
|
36
|
-
/// .jixo.env
|
37
|
-
{
|
38
|
-
const jixoEnvFilepath = path.join(dir, ".jixo.env");
|
39
|
-
if (!fs.existsSync(jixoEnvFilepath)) {
|
40
|
-
writeText(
|
41
|
-
jixoEnvFilepath,
|
42
|
-
Object.keys(safeEnv)
|
43
|
-
.filter((key) => key.startsWith("JIXO_"))
|
44
|
-
.map((key) => `${key}=""`)
|
45
|
-
.join("\n"),
|
46
|
-
);
|
47
|
-
}
|
48
|
-
}
|
49
|
-
/// .gitignore
|
50
|
-
{
|
51
|
-
const gitignoreFilepath = path.join(dir, ".gitignore");
|
52
|
-
const gitignoreLines = (fs.existsSync(gitignoreFilepath) ? fs.readFileSync(gitignoreFilepath, "utf-8") : "").split(/\n+/);
|
53
|
-
let changed = false;
|
54
|
-
for (const line of ["*.memory.json", "memory.json", ".jixo.env"]) {
|
55
|
-
if (!gitignoreLines.includes(line)) {
|
56
|
-
gitignoreLines.unshift(line);
|
57
|
-
changed = true;
|
58
|
-
}
|
59
|
-
}
|
60
|
-
if (changed) {
|
61
|
-
fs.writeFileSync(gitignoreFilepath, gitignoreLines.join("\n"));
|
62
|
-
}
|
63
|
-
}
|
64
|
-
};
|
@@ -1,14 +0,0 @@
|
|
1
|
-
import {cyan, gray} from "@gaubee/nodekit";
|
2
|
-
import {obj_props} from "@gaubee/util";
|
3
|
-
import {getPromptConfigs} from "../../helper/prompts-loader.js";
|
4
|
-
|
5
|
-
export const listPrompts = async () => {
|
6
|
-
const configs = await getPromptConfigs();
|
7
|
-
for (const key of obj_props(configs)) {
|
8
|
-
const config = configs[key];
|
9
|
-
console.log(`- ${cyan(key)}: ${gray(config.content.split("\n")[0])}...`);
|
10
|
-
if (config.data.parent.length) {
|
11
|
-
console.log(` parent: ${config.data.parent.map(cyan).join(", ")}`);
|
12
|
-
}
|
13
|
-
}
|
14
|
-
};
|
@@ -1,16 +0,0 @@
|
|
1
|
-
import {spinner, writeJson} from "@gaubee/nodekit";
|
2
|
-
|
3
|
-
export const upgradePrompts = async (dir: string, options: {mirrorUrl?: string}) => {
|
4
|
-
// TODO 下载最新的提示词集合
|
5
|
-
const mirrorUrl = options.mirrorUrl || "https://jixo.ai/jixo-prompts.json";
|
6
|
-
const loading = spinner("Upgrading prompts");
|
7
|
-
loading.start("Downloading...");
|
8
|
-
// await delay(1000);
|
9
|
-
try {
|
10
|
-
const prompts = await fetch(mirrorUrl).then((res) => res.json());
|
11
|
-
loading.stopAndPersist({symbol: "✅", text: "Download completed"});
|
12
|
-
writeJson(import.meta.resolve("jixo-prompts.json"), prompts);
|
13
|
-
} catch (e) {
|
14
|
-
loading.stopAndPersist({symbol: "❌", text: "Download failed"});
|
15
|
-
}
|
16
|
-
};
|
@@ -1,65 +0,0 @@
|
|
1
|
-
import {func_lazy, func_remember, map_get_or_put_async} from "@gaubee/util";
|
2
|
-
import {experimental_createMCPClient as createMCPClient, type ToolSet} from "ai";
|
3
|
-
import {Experimental_StdioMCPTransport} from "ai/mcp-stdio";
|
4
|
-
|
5
|
-
export const tools = {
|
6
|
-
fileSystem: func_lazy(() => {
|
7
|
-
const map = new Map<string, ToolSet>();
|
8
|
-
return (cwd: string) => {
|
9
|
-
return map_get_or_put_async(map, cwd, async () => {
|
10
|
-
const mcpClient = await createMCPClient({
|
11
|
-
transport: new Experimental_StdioMCPTransport({
|
12
|
-
command: "pnpx",
|
13
|
-
args: ["@modelcontextprotocol/server-filesystem", cwd],
|
14
|
-
}),
|
15
|
-
});
|
16
|
-
const tools = await mcpClient.tools();
|
17
|
-
return tools;
|
18
|
-
});
|
19
|
-
};
|
20
|
-
}),
|
21
|
-
memory: func_lazy(() => {
|
22
|
-
const map = new Map<string, ToolSet>();
|
23
|
-
return (memory_filepath: string) => {
|
24
|
-
return map_get_or_put_async(map, memory_filepath, async () => {
|
25
|
-
const mcpClient = await createMCPClient({
|
26
|
-
transport: new Experimental_StdioMCPTransport({
|
27
|
-
command: "pnpx",
|
28
|
-
args: ["@modelcontextprotocol/server-memory"],
|
29
|
-
env: {
|
30
|
-
MEMORY_FILE_PATH: memory_filepath,
|
31
|
-
},
|
32
|
-
}),
|
33
|
-
});
|
34
|
-
const tools = await mcpClient.tools();
|
35
|
-
return tools;
|
36
|
-
});
|
37
|
-
};
|
38
|
-
}),
|
39
|
-
fetch: func_remember(async () => {
|
40
|
-
const mcpClient = await createMCPClient({
|
41
|
-
transport: new Experimental_StdioMCPTransport({
|
42
|
-
command: "uvx",
|
43
|
-
args: ["mcp-server-fetch"],
|
44
|
-
}),
|
45
|
-
});
|
46
|
-
const tools = await mcpClient.tools();
|
47
|
-
return tools;
|
48
|
-
}),
|
49
|
-
git: func_lazy(() => {
|
50
|
-
const map = new Map<string, ToolSet>();
|
51
|
-
|
52
|
-
return (repo: string) => {
|
53
|
-
return map_get_or_put_async(map, repo, async () => {
|
54
|
-
const mcpClient = await createMCPClient({
|
55
|
-
transport: new Experimental_StdioMCPTransport({
|
56
|
-
command: "uvx",
|
57
|
-
args: ["mcp-server-git", "--repository", repo],
|
58
|
-
}),
|
59
|
-
});
|
60
|
-
const tools = await mcpClient.tools();
|
61
|
-
return tools;
|
62
|
-
});
|
63
|
-
};
|
64
|
-
}),
|
65
|
-
};
|
@@ -1,54 +0,0 @@
|
|
1
|
-
import {createAnthropic} from "@ai-sdk/anthropic";
|
2
|
-
import {createDeepInfra} from "@ai-sdk/deepinfra";
|
3
|
-
import {createDeepSeek} from "@ai-sdk/deepseek";
|
4
|
-
import {createGoogleGenerativeAI} from "@ai-sdk/google";
|
5
|
-
import {createOpenAI} from "@ai-sdk/openai";
|
6
|
-
import {createXai} from "@ai-sdk/xai";
|
7
|
-
import {obj_lazify} from "@gaubee/util";
|
8
|
-
import {safeEnv} from "../../env.js";
|
9
|
-
|
10
|
-
// const wrapper = (provider:)
|
11
|
-
export const providers = obj_lazify({
|
12
|
-
get deepseek() {
|
13
|
-
return createDeepSeek({
|
14
|
-
baseURL: safeEnv.JIXO_DEEPSEEK_BASE_URL || undefined,
|
15
|
-
apiKey: safeEnv.JIXO_DEEPSEEK_API_KEY,
|
16
|
-
});
|
17
|
-
},
|
18
|
-
get anthropic() {
|
19
|
-
// const bashTool = anthropic.tools.bash_20250124({
|
20
|
-
// execute: async ({command, restart}) => execSync(command).toString(),
|
21
|
-
// });
|
22
|
-
|
23
|
-
const provider = createAnthropic({
|
24
|
-
baseURL: safeEnv.JIXO_ANTHROPIC_BASE_URL || undefined,
|
25
|
-
apiKey: safeEnv.JIXO_ANTHROPIC_API_KEY,
|
26
|
-
});
|
27
|
-
return provider;
|
28
|
-
},
|
29
|
-
get google() {
|
30
|
-
return createGoogleGenerativeAI({
|
31
|
-
baseURL: safeEnv.JIXO_GOOGLE_BASE_URL || undefined,
|
32
|
-
apiKey: safeEnv.JIXO_GOOGLE_API_KEY,
|
33
|
-
});
|
34
|
-
},
|
35
|
-
get openai() {
|
36
|
-
return createOpenAI({
|
37
|
-
baseURL: safeEnv.JIXO_OPENAI_BASE_URL || undefined,
|
38
|
-
apiKey: safeEnv.JIXO_OPENAI_API_KEY,
|
39
|
-
organization: safeEnv.JIXO_OPENAI_ORGANIZATION || undefined,
|
40
|
-
});
|
41
|
-
},
|
42
|
-
get xai() {
|
43
|
-
return createXai({
|
44
|
-
baseURL: safeEnv.JIXO_XAI_BASE_URL || undefined,
|
45
|
-
apiKey: safeEnv.JIXO_XAI_API_KEY,
|
46
|
-
});
|
47
|
-
},
|
48
|
-
get deepinfra() {
|
49
|
-
return createDeepInfra({
|
50
|
-
baseURL: safeEnv.JIXO_DEEPINFRA_BASE_URL || undefined,
|
51
|
-
apiKey: safeEnv.JIXO_DEEPINFRA_API_KEY,
|
52
|
-
});
|
53
|
-
},
|
54
|
-
});
|