@solidxai/solidctl 0.1.46-beta.0 → 0.1.46-beta.2
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/agent-helper.d.ts +9 -2
- package/dist/commands/agent-helper.js +31 -15
- package/dist/commands/agent-helper.js.map +1 -1
- package/dist/commands/agent.command.js +3 -3
- package/dist/commands/agent.command.js.map +1 -1
- package/dist/commands/create-app/create-app.command.js +24 -2
- package/dist/commands/create-app/create-app.command.js.map +1 -1
- package/dist/commands/create-app/helpers.d.ts +1 -0
- package/dist/commands/create-app/helpers.js +40 -0
- package/dist/commands/create-app/helpers.js.map +1 -1
- package/dist/commands/create-app/setup-questions.d.ts +0 -7
- package/dist/commands/create-app/setup-questions.js +0 -7
- package/dist/commands/create-app/setup-questions.js.map +1 -1
- package/dist/commands/local-upgrade.command.js +2 -0
- package/dist/commands/local-upgrade.command.js.map +1 -1
- package/dist/commands/mcp-launch.d.ts +20 -0
- package/dist/commands/mcp-launch.js +116 -0
- package/dist/commands/mcp-launch.js.map +1 -0
- package/dist/commands/mcp.command.js +4 -49
- package/dist/commands/mcp.command.js.map +1 -1
- package/dist/commands/migration.command.js +56 -5
- package/dist/commands/migration.command.js.map +1 -1
- package/dist/commands/start.command.js +146 -39
- package/dist/commands/start.command.js.map +1 -1
- package/dist/helper.d.ts +1 -0
- package/dist/helper.js +33 -0
- package/dist/helper.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/version-check.d.ts +2 -0
- package/dist/version-check.js +2 -0
- package/dist/version-check.js.map +1 -1
- package/package.json +1 -1
- package/templates/api-template/nodemon.json +1 -0
|
@@ -42,13 +42,6 @@ export declare const setupQuestions: ({
|
|
|
42
42
|
default: string;
|
|
43
43
|
choices?: undefined;
|
|
44
44
|
when?: undefined;
|
|
45
|
-
} | {
|
|
46
|
-
type: string;
|
|
47
|
-
name: string;
|
|
48
|
-
message: string;
|
|
49
|
-
choices: string[];
|
|
50
|
-
default: string;
|
|
51
|
-
when?: undefined;
|
|
52
45
|
} | {
|
|
53
46
|
type: string;
|
|
54
47
|
name: string;
|
|
@@ -30,13 +30,6 @@ exports.setupQuestions = [
|
|
|
30
30
|
message: 'What is the name of your project?',
|
|
31
31
|
default: 'my-solid-app',
|
|
32
32
|
},
|
|
33
|
-
{
|
|
34
|
-
type: 'list',
|
|
35
|
-
name: 'solidxVersion',
|
|
36
|
-
message: 'Which SolidX version would you like to use?',
|
|
37
|
-
choices: ['stable', 'beta'],
|
|
38
|
-
default: 'stable',
|
|
39
|
-
},
|
|
40
33
|
{
|
|
41
34
|
type: 'input',
|
|
42
35
|
name: 'solidApiPort',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-questions.js","sourceRoot":"","sources":["../../../src/commands/create-app/setup-questions.ts"],"names":[],"mappings":";;;AAgBa,QAAA,cAAc,GAAG;IAC5B,WAAW,EAAmB,cAAc;IAC5C,aAAa,EAAiB,QAAQ;IACtC,YAAY,EAAkB,MAAM;IACpC,YAAY,EAAkB,UAAU;IACxC,sBAAsB,EAAQ,YAAY;IAC1C,oBAAoB,EAAU,WAAW;IACzC,4BAA4B,EAAE,MAAM;IACpC,yBAAyB,EAAK,MAAM;IACpC,yBAAyB,EAAK,MAAM;IACpC,oBAAoB,EAAU,eAAe;IAC7C,wBAAwB,EAAM,iBAAiB;IAC/C,wBAAwB,EAAM,gBAAgB;IAC9C,2BAA2B,EAAG,KAAK;IACnC,cAAc,EAAgB,KAAK;IACnC,WAAW,EAAmB,MAAM;CAC5B,CAAC;AAEE,QAAA,gBAAgB,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAU,CAAC;AAC7D,QAAA,cAAc,GAAG,CAAC,UAAU,EAAE,UAAU,CAAU,CAAC;AACnD,QAAA,mBAAmB,GAAG,CAAC,KAAK,EAAE,IAAI,CAAU,CAAC;AAC7C,QAAA,uBAAuB,GAAG,CAAC,KAAK,EAAE,IAAI,CAAU,CAAC;AACjD,QAAA,sBAAsB,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAU,CAAC;AAErD,QAAA,cAAc,GAAG;IAC5B;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE,cAAc;KACxB;IACD;QACE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"setup-questions.js","sourceRoot":"","sources":["../../../src/commands/create-app/setup-questions.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,6 +117,8 @@ Required environment variables:
|
|
|
117
117
|
if (doUi) {
|
|
118
118
|
console.log('\n=== solid-ui → solid-ui ===');
|
|
119
119
|
packAndInstall(process.env.SOLID_UI_PATH, './solid-ui', showNpmLogs);
|
|
120
|
+
console.log('\n▶ Syncing UI resources (postinstall)');
|
|
121
|
+
exec('npm run postinstall', './solid-ui');
|
|
120
122
|
}
|
|
121
123
|
if (doCodeBuilder) {
|
|
122
124
|
console.log('\n=== solid-code-builder → solid-api ===');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-upgrade.command.js","sourceRoot":"","sources":["../../src/commands/local-upgrade.command.ts"],"names":[],"mappings":";;;;;AA4GA,
|
|
1
|
+
{"version":3,"file":"local-upgrade.command.js","sourceRoot":"","sources":["../../src/commands/local-upgrade.command.ts"],"names":[],"mappings":";;;;;AA4GA,kEAwDC;AAnKD,iDAAyC;AACzC,4CAAoB;AACpB,gDAAwB;AACxB,sCAAgD;AAOhD,SAAS,IAAI,CAAC,GAAW,EAAE,GAAY,EAAE,OAAqB;IAC5D,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,KAAK,CAAC;IACtC,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC;IAExD,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,IAAA,wBAAQ,EAAC,GAAG,EAAE;gBACZ,GAAG;gBACH,GAAG;gBACH,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;gBACjC,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAA,wBAAQ,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,MAAM,GAAG,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,MAAM,MAAM,GAAG,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACzD,IAAI,MAAM;gBAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACzC,IAAI,MAAM;gBAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,GAAW,EAAE,GAAY,EAAE,QAAkB;IAC5D,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACf,OAAO;IACT,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE;QACb,KAAK,EAAE,IAAI;QACX,GAAG,EAAE;YACH,mBAAmB,EAAE,OAAO;YAC5B,eAAe,EAAE,OAAO;YACxB,gBAAgB,EAAE,OAAO;SAC1B;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,SAAS,CAAC,IAAc;IAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CACX,gCAAgC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACrD,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CACrB,WAAmB,EACnB,WAAmB,EACnB,WAAqB;IAErB,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAE9D,OAAO,CAAC,GAAG,CAAC,eAAe,cAAc,EAAE,CAAC,CAAC;IAG7C,YAAE,CAAC,WAAW,CAAC,cAAc,CAAC;SAC3B,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC/B,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAG7D,OAAO,CAAC,UAAU,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;IAGjD,MAAM,GAAG,GAAG,YAAE,CAAC,WAAW,CAAC,cAAc,CAAC;SACvC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC/B,IAAI,EAAE;SACN,GAAG,EAAE,CAAC;IAET,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,sCAAsC,cAAc,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,YAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAEzC,YAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhC,OAAO,CAAC,GAAG,CAAC,gBAAgB,MAAM,EAAE,CAAC,CAAC;IACtC,OAAO,CAAC,UAAU,MAAM,GAAG,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;AAC5D,CAAC;AAED,SAAgB,2BAA2B,CAAC,OAAgB;IAC1D,OAAO;SACJ,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CACV,iEAAiE,CAClE;SACA,WAAW,CACV,OAAO,EACP;;;;;CAKL,CACI,CAAC,MAAM,CAAC,QAAQ,EAAE,oBAAoB,CAAC;SACvC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC;SAClC,MAAM,CAAC,gBAAgB,EAAE,4BAA4B,CAAC;SACtD,MAAM,CAAC,YAAY,EAAE,iBAAiB,CAAC;SACvC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QAClB,IAAA,4BAAmB,GAAE,CAAC;QACtB,SAAS,CAAC;YACR,wBAAwB;YACxB,eAAe;YACf,yBAAyB;SAC1B,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;QAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC;QAC3B,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;QAC7C,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7C,MAAM,eAAe,GAAG,CAAC,SAAS,IAAI,CAAC,OAAO,IAAI,CAAC,gBAAgB,CAAC;QAEpE,MAAM,MAAM,GAAG,SAAS,IAAI,eAAe,CAAC;QAC5C,MAAM,IAAI,GAAG,OAAO,IAAI,eAAe,CAAC;QACxC,MAAM,aAAa,GAAG,gBAAgB,IAAI,eAAe,CAAC;QAE1D,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;YACvD,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAuB,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAClF,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;YAC7C,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,aAAc,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;YACtE,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;YACtD,IAAI,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YACxD,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAwB,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QACnF,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { getAgentVersion, printAgentVersion } from './agent-helper';
|
|
2
|
+
export interface McpOptions {
|
|
3
|
+
port: string;
|
|
4
|
+
host: string;
|
|
5
|
+
logLevel: string;
|
|
6
|
+
mountPath: string;
|
|
7
|
+
local?: boolean;
|
|
8
|
+
}
|
|
9
|
+
export declare const MCP_DEFAULT_OPTIONS: McpOptions;
|
|
10
|
+
export declare function buildBridgedEnv(projectRoot?: string): Record<string, string>;
|
|
11
|
+
export declare function printBridgeSummary(env: Record<string, string>): void;
|
|
12
|
+
export interface McpLaunchConfig {
|
|
13
|
+
command: string;
|
|
14
|
+
args: string[];
|
|
15
|
+
cwd: string;
|
|
16
|
+
env: Record<string, string>;
|
|
17
|
+
}
|
|
18
|
+
export declare function resolveMcpLaunchConfig(options: McpOptions, projectRoot?: string): Promise<McpLaunchConfig>;
|
|
19
|
+
export { getAgentVersion, printAgentVersion };
|
|
20
|
+
export declare function spawnMcpServer(launchConfig: McpLaunchConfig): import("child_process").ChildProcessByStdio<null, import("stream").Readable, import("stream").Readable>;
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.printAgentVersion = exports.getAgentVersion = exports.MCP_DEFAULT_OPTIONS = void 0;
|
|
7
|
+
exports.buildBridgedEnv = buildBridgedEnv;
|
|
8
|
+
exports.printBridgeSummary = printBridgeSummary;
|
|
9
|
+
exports.resolveMcpLaunchConfig = resolveMcpLaunchConfig;
|
|
10
|
+
exports.spawnMcpServer = spawnMcpServer;
|
|
11
|
+
const child_process_1 = require("child_process");
|
|
12
|
+
const path_1 = __importDefault(require("path"));
|
|
13
|
+
const dotenv_1 = require("dotenv");
|
|
14
|
+
const helper_1 = require("../helper");
|
|
15
|
+
const agent_helper_1 = require("./agent-helper");
|
|
16
|
+
Object.defineProperty(exports, "getAgentVersion", { enumerable: true, get: function () { return agent_helper_1.getAgentVersion; } });
|
|
17
|
+
Object.defineProperty(exports, "printAgentVersion", { enumerable: true, get: function () { return agent_helper_1.printAgentVersion; } });
|
|
18
|
+
exports.MCP_DEFAULT_OPTIONS = {
|
|
19
|
+
port: '9000',
|
|
20
|
+
host: '0.0.0.0',
|
|
21
|
+
logLevel: 'INFO',
|
|
22
|
+
mountPath: '/mcp',
|
|
23
|
+
};
|
|
24
|
+
function resolveDatabaseUrl() {
|
|
25
|
+
if (process.env.DATABASE_URL) {
|
|
26
|
+
return (0, helper_1.normalizeDatabaseUrl)(process.env.DATABASE_URL);
|
|
27
|
+
}
|
|
28
|
+
const host = process.env.DEFAULT_DATABASE_HOST;
|
|
29
|
+
const port = process.env.DEFAULT_DATABASE_PORT;
|
|
30
|
+
const user = process.env.DEFAULT_DATABASE_USER;
|
|
31
|
+
const password = process.env.DEFAULT_DATABASE_PASSWORD;
|
|
32
|
+
const name = process.env.DEFAULT_DATABASE_NAME;
|
|
33
|
+
const dbType = (process.env.SOLID_CORE_DB_TYPE || 'postgres').toLowerCase();
|
|
34
|
+
if (!host || !port || !user || !name)
|
|
35
|
+
return undefined;
|
|
36
|
+
const encodedPw = password ? ':' + encodeURIComponent(password) : '';
|
|
37
|
+
if (dbType === 'mssql') {
|
|
38
|
+
return `mssql+pyodbc://${user}${encodedPw}@${host}:${port}/${name}?driver=ODBC+Driver+18+for+SQL+Server&TrustServerCertificate=yes&Encrypt=no`;
|
|
39
|
+
}
|
|
40
|
+
if (dbType === 'mysql') {
|
|
41
|
+
return `mysql+pymysql://${user}${encodedPw}@${host}:${port}/${name}`;
|
|
42
|
+
}
|
|
43
|
+
return `postgresql://${user}${encodedPw}@${host}:${port}/${name}`;
|
|
44
|
+
}
|
|
45
|
+
function buildBridgedEnv(projectRoot = process.cwd()) {
|
|
46
|
+
(0, dotenv_1.config)({ path: path_1.default.join(projectRoot, 'solid-api', '.env') });
|
|
47
|
+
const databaseUrl = resolveDatabaseUrl();
|
|
48
|
+
return {
|
|
49
|
+
...process.env,
|
|
50
|
+
SOLIDX_PROJECT_ROOT: projectRoot,
|
|
51
|
+
...(databaseUrl ? { DATABASE_URL: databaseUrl } : {}),
|
|
52
|
+
...(process.env.BASE_URL ? { BASE_URL: process.env.BASE_URL } : {}),
|
|
53
|
+
...(process.env.FRONTEND_BASE_URL
|
|
54
|
+
? { FRONTEND_BASE_URL: process.env.FRONTEND_BASE_URL }
|
|
55
|
+
: {}),
|
|
56
|
+
...(process.env.APP_ENCRYPTION_KEY
|
|
57
|
+
? { APP_ENCRYPTION_KEY: process.env.APP_ENCRYPTION_KEY }
|
|
58
|
+
: {}),
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
function printBridgeSummary(env) {
|
|
62
|
+
const bridgedKeys = [
|
|
63
|
+
'DATABASE_URL',
|
|
64
|
+
'SOLIDX_PROJECT_ROOT',
|
|
65
|
+
'BASE_URL',
|
|
66
|
+
'FRONTEND_BASE_URL',
|
|
67
|
+
'APP_ENCRYPTION_KEY',
|
|
68
|
+
];
|
|
69
|
+
const bridged = bridgedKeys.filter((k) => env[k]);
|
|
70
|
+
const missing = bridgedKeys.filter((k) => !env[k]);
|
|
71
|
+
console.log(`✔ Bridged env: ${bridged.join(', ') || 'none'}`);
|
|
72
|
+
if (missing.length)
|
|
73
|
+
console.warn(`⚠ Missing env: ${missing.join(', ')}`);
|
|
74
|
+
}
|
|
75
|
+
async function resolveMcpLaunchConfig(options, projectRoot = process.cwd()) {
|
|
76
|
+
await (0, agent_helper_1.checkAgentUpdate)({
|
|
77
|
+
isLocal: Boolean(options.local),
|
|
78
|
+
exitMode: 'throw',
|
|
79
|
+
});
|
|
80
|
+
const env = buildBridgedEnv(projectRoot);
|
|
81
|
+
if (!env.DATABASE_URL) {
|
|
82
|
+
throw new Error('DATABASE_URL is required for MCP mode.\n' +
|
|
83
|
+
' It is needed to validate API keys and write audit logs.\n' +
|
|
84
|
+
' Set it in your solid-api/.env or environment.');
|
|
85
|
+
}
|
|
86
|
+
const agentCommand = options.local
|
|
87
|
+
? (0, agent_helper_1.ensureAgentInstalledLocal)('throw')
|
|
88
|
+
: (0, agent_helper_1.ensureAgentInstalled)('throw');
|
|
89
|
+
(0, agent_helper_1.printAgentVersion)(agentCommand);
|
|
90
|
+
return {
|
|
91
|
+
command: agentCommand,
|
|
92
|
+
args: [
|
|
93
|
+
'mcp-remote',
|
|
94
|
+
'--host',
|
|
95
|
+
options.host,
|
|
96
|
+
'--port',
|
|
97
|
+
options.port,
|
|
98
|
+
'--log-level',
|
|
99
|
+
options.logLevel,
|
|
100
|
+
'--mount-path',
|
|
101
|
+
options.mountPath,
|
|
102
|
+
],
|
|
103
|
+
cwd: env.SOLIDX_PROJECT_ROOT,
|
|
104
|
+
env,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
function spawnMcpServer(launchConfig) {
|
|
108
|
+
return (0, child_process_1.spawn)(launchConfig.command, launchConfig.args, {
|
|
109
|
+
cwd: launchConfig.cwd,
|
|
110
|
+
env: launchConfig.env,
|
|
111
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
112
|
+
shell: process.platform === 'win32',
|
|
113
|
+
detached: process.platform !== 'win32',
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
//# sourceMappingURL=mcp-launch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-launch.js","sourceRoot":"","sources":["../../src/commands/mcp-launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,55 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.registerMcpCommand = registerMcpCommand;
|
|
7
4
|
const child_process_1 = require("child_process");
|
|
8
|
-
const path_1 = __importDefault(require("path"));
|
|
9
|
-
const dotenv_1 = require("dotenv");
|
|
10
5
|
const helper_1 = require("../helper");
|
|
11
6
|
const agent_helper_1 = require("./agent-helper");
|
|
12
|
-
|
|
13
|
-
if (process.env.DATABASE_URL)
|
|
14
|
-
return process.env.DATABASE_URL;
|
|
15
|
-
const host = process.env.DEFAULT_DATABASE_HOST;
|
|
16
|
-
const port = process.env.DEFAULT_DATABASE_PORT;
|
|
17
|
-
const user = process.env.DEFAULT_DATABASE_USER;
|
|
18
|
-
const password = process.env.DEFAULT_DATABASE_PASSWORD;
|
|
19
|
-
const name = process.env.DEFAULT_DATABASE_NAME;
|
|
20
|
-
const dbType = (process.env.SOLID_CORE_DB_TYPE || 'postgres').toLowerCase();
|
|
21
|
-
if (!host || !port || !user || !name)
|
|
22
|
-
return undefined;
|
|
23
|
-
const encodedPw = password ? ':' + encodeURIComponent(password) : '';
|
|
24
|
-
if (dbType === 'mssql') {
|
|
25
|
-
return `mssql+pyodbc://${user}${encodedPw}@${host}:${port}/${name}?driver=ODBC+Driver+18+for+SQL+Server&TrustServerCertificate=yes&Encrypt=no`;
|
|
26
|
-
}
|
|
27
|
-
if (dbType === 'mysql') {
|
|
28
|
-
return `mysql+pymysql://${user}${encodedPw}@${host}:${port}/${name}`;
|
|
29
|
-
}
|
|
30
|
-
return `postgresql://${user}${encodedPw}@${host}:${port}/${name}`;
|
|
31
|
-
}
|
|
32
|
-
function buildBridgedEnv() {
|
|
33
|
-
const projectRoot = process.cwd();
|
|
34
|
-
(0, dotenv_1.config)({ path: path_1.default.join(projectRoot, 'solid-api', '.env') });
|
|
35
|
-
const databaseUrl = resolveDatabaseUrl();
|
|
36
|
-
return {
|
|
37
|
-
...process.env,
|
|
38
|
-
SOLIDX_PROJECT_ROOT: projectRoot,
|
|
39
|
-
...(databaseUrl ? { DATABASE_URL: databaseUrl } : {}),
|
|
40
|
-
...(process.env.BASE_URL ? { BASE_URL: process.env.BASE_URL } : {}),
|
|
41
|
-
...(process.env.FRONTEND_BASE_URL ? { FRONTEND_BASE_URL: process.env.FRONTEND_BASE_URL } : {}),
|
|
42
|
-
...(process.env.APP_ENCRYPTION_KEY ? { APP_ENCRYPTION_KEY: process.env.APP_ENCRYPTION_KEY } : {}),
|
|
43
|
-
};
|
|
44
|
-
}
|
|
45
|
-
function printBridgeSummary(env) {
|
|
46
|
-
const bridgedKeys = ['DATABASE_URL', 'SOLIDX_PROJECT_ROOT', 'BASE_URL', 'FRONTEND_BASE_URL', 'APP_ENCRYPTION_KEY'];
|
|
47
|
-
const bridged = bridgedKeys.filter((k) => env[k]);
|
|
48
|
-
const missing = bridgedKeys.filter((k) => !env[k]);
|
|
49
|
-
console.log(`✔ Bridged env: ${bridged.join(', ') || 'none'}`);
|
|
50
|
-
if (missing.length)
|
|
51
|
-
console.warn(`⚠ Missing env: ${missing.join(', ')}`);
|
|
52
|
-
}
|
|
7
|
+
const mcp_launch_1 = require("./mcp-launch");
|
|
53
8
|
function registerMcpCommand(program) {
|
|
54
9
|
const mcp = program
|
|
55
10
|
.command('mcp')
|
|
@@ -74,9 +29,9 @@ function registerMcpCommand(program) {
|
|
|
74
29
|
.option('--mount-path <path>', 'Path under which to mount the MCP app', '/mcp')
|
|
75
30
|
.option('--local', 'Install agent from local source (pip install -e .[full]) instead of PyPI')
|
|
76
31
|
.action(async (options) => {
|
|
77
|
-
(0, helper_1.validateProjectRoot)();
|
|
78
32
|
await (0, agent_helper_1.checkAgentUpdate)({ isLocal: Boolean(options.local) });
|
|
79
|
-
|
|
33
|
+
(0, helper_1.validateProjectRoot)();
|
|
34
|
+
const env = (0, mcp_launch_1.buildBridgedEnv)();
|
|
80
35
|
if (!env.DATABASE_URL) {
|
|
81
36
|
console.error('❌ DATABASE_URL is required for MCP mode.\n' +
|
|
82
37
|
' It is needed to validate API keys and write audit logs.\n' +
|
|
@@ -85,7 +40,7 @@ function registerMcpCommand(program) {
|
|
|
85
40
|
}
|
|
86
41
|
const agentCommand = options.local ? (0, agent_helper_1.ensureAgentInstalledLocal)() : (0, agent_helper_1.ensureAgentInstalled)();
|
|
87
42
|
(0, agent_helper_1.printAgentVersion)(agentCommand);
|
|
88
|
-
printBridgeSummary(env);
|
|
43
|
+
(0, mcp_launch_1.printBridgeSummary)(env);
|
|
89
44
|
console.log(`▶ Starting SolidX MCP Server on ${options.host}:${options.port}`);
|
|
90
45
|
const result = (0, child_process_1.spawnSync)(agentCommand, [
|
|
91
46
|
'mcp-remote',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.command.js","sourceRoot":"","sources":["../../src/commands/mcp.command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mcp.command.js","sourceRoot":"","sources":["../../src/commands/mcp.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,21 +69,28 @@ function runTypeormCli(args, solidApiDir, failureLabel) {
|
|
|
69
69
|
function registerMigrationCommand(program) {
|
|
70
70
|
program
|
|
71
71
|
.command('migration <action> [migrationName]')
|
|
72
|
-
.description('Generate, run, or
|
|
73
|
-
.
|
|
72
|
+
.description('Generate, run, revert, or remove-field TypeORM migrations for a datasource')
|
|
73
|
+
.option('-d, --datasource <datasource>', 'Datasource name (maps to src/typeorm-<datasource>-datasource.ts), required for generate/run/revert')
|
|
74
74
|
.option('-m, --module <module>', 'Module name, required for generate')
|
|
75
|
+
.option('-n, --name <modelName>', 'Model name (singularName), required for remove-field')
|
|
76
|
+
.option('--apply', 'Apply the cleanup instead of running a dry-run preview (used with remove-field)')
|
|
75
77
|
.addHelpText('after', `
|
|
76
78
|
Examples:
|
|
77
79
|
npx @solidxai/solidctl migration -d default -m onboarding generate AddPreApplicationMaster
|
|
78
80
|
npx @solidxai/solidctl migration -d default run
|
|
79
|
-
npx @solidxai/solidctl migration -d default revert
|
|
81
|
+
npx @solidxai/solidctl migration -d default revert
|
|
82
|
+
npx @solidxai/solidctl migration -n book remove-field
|
|
83
|
+
npx @solidxai/solidctl migration -n book remove-field --apply`)
|
|
80
84
|
.action((action, migrationName, options) => {
|
|
81
85
|
(0, helper_1.validateProjectRoot)();
|
|
82
86
|
const normalizedAction = action.trim().toLowerCase();
|
|
83
87
|
const projectRoot = process.cwd();
|
|
84
88
|
const solidApiDir = path_1.default.join(projectRoot, 'solid-api');
|
|
85
|
-
ensureDatasourceFile(solidApiDir, options.datasource);
|
|
86
89
|
if (normalizedAction === 'generate') {
|
|
90
|
+
if (!options.datasource) {
|
|
91
|
+
fail('Option --datasource <datasource> is required for generate.');
|
|
92
|
+
}
|
|
93
|
+
ensureDatasourceFile(solidApiDir, options.datasource);
|
|
87
94
|
const { migrationTargetPath } = validateGenerateInputs(solidApiDir, options.datasource, options.module, migrationName);
|
|
88
95
|
runTypeormCli([
|
|
89
96
|
'typeorm-ts-node-commonjs',
|
|
@@ -95,18 +102,62 @@ Examples:
|
|
|
95
102
|
return;
|
|
96
103
|
}
|
|
97
104
|
if (normalizedAction === 'run') {
|
|
105
|
+
if (!options.datasource) {
|
|
106
|
+
fail('Option --datasource <datasource> is required for run.');
|
|
107
|
+
}
|
|
108
|
+
ensureDatasourceFile(solidApiDir, options.datasource);
|
|
98
109
|
console.log(`✅ Using datasource: src/typeorm-${options.datasource}-datasource.ts`);
|
|
99
110
|
console.log('➡ Running migrations...');
|
|
100
111
|
runTypeormCli(['typeorm-ts-node-commonjs', 'migration:run', '-d', `src/typeorm-${options.datasource}-datasource.ts`], solidApiDir, 'run migrations');
|
|
101
112
|
return;
|
|
102
113
|
}
|
|
103
114
|
if (normalizedAction === 'revert') {
|
|
115
|
+
if (!options.datasource) {
|
|
116
|
+
fail('Option --datasource <datasource> is required for revert.');
|
|
117
|
+
}
|
|
118
|
+
ensureDatasourceFile(solidApiDir, options.datasource);
|
|
104
119
|
console.log(`✅ Using datasource: src/typeorm-${options.datasource}-datasource.ts`);
|
|
105
120
|
console.log('➡ Reverting last migration...');
|
|
106
121
|
runTypeormCli(['typeorm-ts-node-commonjs', 'migration:revert', '-d', `src/typeorm-${options.datasource}-datasource.ts`], solidApiDir, 'revert migration');
|
|
107
122
|
return;
|
|
108
123
|
}
|
|
109
|
-
|
|
124
|
+
if (normalizedAction === 'remove-field') {
|
|
125
|
+
if (!options.name) {
|
|
126
|
+
console.error('Option --name <model> is required for remove-field.');
|
|
127
|
+
process.exit(1);
|
|
128
|
+
}
|
|
129
|
+
const mainCliPath = path_1.default.join(solidApiDir, 'dist', 'main-cli.js');
|
|
130
|
+
if (!fs_1.default.existsSync(mainCliPath)) {
|
|
131
|
+
console.error(`solid-api CLI not found at ${mainCliPath}. Run "npx @solidxai/solidctl build" or "cd solid-api && npm run build" first.`);
|
|
132
|
+
process.exit(1);
|
|
133
|
+
}
|
|
134
|
+
const args = [
|
|
135
|
+
path_1.default.relative(solidApiDir, mainCliPath),
|
|
136
|
+
'migrate-removed-fields',
|
|
137
|
+
'-n',
|
|
138
|
+
options.name,
|
|
139
|
+
];
|
|
140
|
+
if (options.apply) {
|
|
141
|
+
args.push('-d', 'false');
|
|
142
|
+
}
|
|
143
|
+
console.log(`▶ Running removed-field cleanup for model "${options.name}"${options.apply ? ' (apply)' : ' (dry-run)'}`);
|
|
144
|
+
const result = (0, child_process_1.spawnSync)(process.execPath, args, {
|
|
145
|
+
cwd: solidApiDir,
|
|
146
|
+
stdio: 'inherit',
|
|
147
|
+
env: process.env,
|
|
148
|
+
});
|
|
149
|
+
if (result.error) {
|
|
150
|
+
console.error(`Failed to run cleanup-removed-fields: ${result.error.message}`);
|
|
151
|
+
process.exit(1);
|
|
152
|
+
}
|
|
153
|
+
if (result.status !== 0) {
|
|
154
|
+
console.error(`cleanup-removed-fields exited with code ${result.status}`);
|
|
155
|
+
process.exit(result.status ?? 1);
|
|
156
|
+
}
|
|
157
|
+
console.log(`✔ cleanup-removed-fields completed for model "${options.name}"`);
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
fail(`Unknown action "${action}". Expected generate, run, revert, or remove-field.`);
|
|
110
161
|
});
|
|
111
162
|
}
|
|
112
163
|
//# sourceMappingURL=migration.command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.command.js","sourceRoot":"","sources":["../../src/commands/migration.command.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"migration.command.js","sourceRoot":"","sources":["../../src/commands/migration.command.ts"],"names":[],"mappings":";;;;;AAyFA,4DAmIC;AA5ND,iDAA0C;AAE1C,4CAAoB;AACpB,gDAAwB;AACxB,sCAAgD;AAShD,SAAS,aAAa;IACpB,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1D,CAAC;AAED,SAAS,IAAI,CAAC,OAAe;IAC3B,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;IAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAmB,EAAE,UAAkB;IACnE,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,WAAW,UAAU,gBAAgB,CAAC,CAAC;IAE5F,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACnC,IAAI,CAAC,8BAA8B,cAAc,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,SAAS,sBAAsB,CAAC,WAAmB,EAAE,UAAkB,EAAE,UAA8B,EAAE,aAAiC;IACxI,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,IAAI,CAAC,oDAAoD,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,CAAC,0CAA0C,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,SAAS,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAC5D,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAErE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QACvE,IAAI,CAAC,mCAAmC,UAAU,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,YAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QAC3E,IAAI,CAAC,4CAA4C,UAAU,UAAU,UAAU,WAAW,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,WAAW,GAAG,YAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;IAE9F,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,qCAAqC,UAAU,WAAW,CAAC,CAAC;IACnE,CAAC;IAED,YAAE,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEjD,OAAO,CAAC,GAAG,CAAC,mCAAmC,UAAU,gBAAgB,CAAC,CAAC;IAC3E,OAAO,CAAC,GAAG,CAAC,aAAa,UAAU,EAAE,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,qBAAqB,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,+BAA+B,UAAU,eAAe,UAAU,EAAE,CAAC,CAAC;IAClF,OAAO,CAAC,GAAG,CAAC,+BAA+B,UAAU,eAAe,UAAU,IAAI,aAAa,EAAE,CAAC,CAAC;IAEnG,OAAO;QACL,mBAAmB,EAAE,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,CAAC;KACjG,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,IAAc,EAAE,WAAmB,EAAE,YAAoB;IAC9E,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,aAAa,EAAE,EAAE,IAAI,EAAE;QAC9C,GAAG,EAAE,WAAW;QAChB,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;KACpC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,aAAa,YAAY,KAAK,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,YAAY,qBAAqB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC;AAED,SAAgB,wBAAwB,CAAC,OAAgB;IACvD,OAAO;SACJ,OAAO,CAAC,oCAAoC,CAAC;SAC7C,WAAW,CAAC,4EAA4E,CAAC;SACzF,MAAM,CAAC,+BAA+B,EAAE,oGAAoG,CAAC;SAC7I,MAAM,CAAC,uBAAuB,EAAE,oCAAoC,CAAC;SACrE,MAAM,CAAC,wBAAwB,EAAE,sDAAsD,CAAC;SACxF,MAAM,CAAC,SAAS,EAAE,iFAAiF,CAAC;SACpG,WAAW,CAAC,OAAO,EAAE;;;;;;gEAMsC,CAAC;SAC5D,MAAM,CAAC,CAAC,MAAc,EAAE,aAAiC,EAAE,OAAyB,EAAE,EAAE;QACvF,IAAA,4BAAmB,GAAE,CAAC;QAEtB,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAExD,IAAI,gBAAgB,KAAK,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACxB,IAAI,CAAC,4DAA4D,CAAC,CAAC;YACrE,CAAC;YAED,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;YAEtD,MAAM,EAAE,mBAAmB,EAAE,GAAG,sBAAsB,CACpD,WAAW,EACX,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,MAAM,EACd,aAAa,CACd,CAAC;YAEF,aAAa,CACX;gBACE,0BAA0B;gBAC1B,oBAAoB;gBACpB,IAAI;gBACJ,eAAe,OAAO,CAAC,UAAU,gBAAgB;gBACjD,mBAAmB;aACpB,EACD,WAAW,EACX,oBAAoB,CACrB,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,gBAAgB,KAAK,KAAK,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACxB,IAAI,CAAC,uDAAuD,CAAC,CAAC;YAChE,CAAC;YAED,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;YAEtD,OAAO,CAAC,GAAG,CAAC,mCAAmC,OAAO,CAAC,UAAU,gBAAgB,CAAC,CAAC;YACnF,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,aAAa,CACX,CAAC,0BAA0B,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,OAAO,CAAC,UAAU,gBAAgB,CAAC,EACtG,WAAW,EACX,gBAAgB,CACjB,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACxB,IAAI,CAAC,0DAA0D,CAAC,CAAC;YACnE,CAAC;YAED,oBAAoB,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;YAEtD,OAAO,CAAC,GAAG,CAAC,mCAAmC,OAAO,CAAC,UAAU,gBAAgB,CAAC,CAAC;YACnF,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;YAC7C,aAAa,CACX,CAAC,0BAA0B,EAAE,kBAAkB,EAAE,IAAI,EAAE,eAAe,OAAO,CAAC,UAAU,gBAAgB,CAAC,EACzG,WAAW,EACX,kBAAkB,CACnB,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,gBAAgB,KAAK,cAAc,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAClB,OAAO,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;YAElE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,KAAK,CAAC,8BAA8B,WAAW,gFAAgF,CAAC,CAAC;gBACzI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,MAAM,IAAI,GAAG;gBACX,cAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;gBACvC,wBAAwB;gBACxB,IAAI;gBACJ,OAAO,CAAC,IAAI;aACb,CAAC;YAEF,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBAClB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC3B,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,8CAA8C,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;YACvH,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE;gBAC/C,GAAG,EAAE,WAAW;gBAChB,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;aACjB,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,OAAO,CAAC,KAAK,CAAC,yCAAyC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC/E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO,CAAC,KAAK,CAAC,2CAA2C,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC1E,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;YACnC,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,iDAAiD,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;YAC9E,OAAO;QACT,CAAC;QAED,IAAI,CAAC,mBAAmB,MAAM,qDAAqD,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;AACP,CAAC"}
|