aws-cdk 2.1132.1 → 2.1134.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 +4 -2
- package/THIRD_PARTY_LICENSES +254 -22
- package/build-info.json +2 -2
- package/db.json.gz +0 -0
- package/lib/cli/cdk-toolkit.d.ts +20 -5
- package/lib/cli/cdk-toolkit.js +174 -119
- package/lib/cli/cli-config.js +15 -1
- package/lib/cli/cli-type-registry.json +12 -1
- package/lib/cli/cli.js +5 -3
- package/lib/cli/convert-to-user-input.js +9 -3
- package/lib/cli/display-version.d.ts +28 -2
- package/lib/cli/display-version.js +25 -15
- package/lib/cli/io-host/cli-io-host.d.ts +24 -13
- package/lib/cli/io-host/cli-io-host.js +15 -10
- package/lib/cli/parse-command-line-arguments.js +13 -3
- package/lib/cli/user-configuration.js +2 -1
- package/lib/cli/user-input.d.ts +20 -1
- package/lib/cli/user-input.js +1 -1
- package/lib/cli/util/npm.d.ts +23 -4
- package/lib/cli/util/npm.js +106 -29
- package/lib/commands/doctor.d.ts +10 -1
- package/lib/commands/doctor.js +3 -3
- package/lib/commands/lsp.d.ts +9 -6
- package/lib/commands/lsp.js +18 -9
- package/lib/commands/migrate.js +3 -3
- package/lib/cxapp/cloud-executable.d.ts +8 -0
- package/lib/cxapp/cloud-executable.js +16 -1
- package/lib/index.js +17986 -9061
- package/lib/index_bg.wasm +0 -0
- package/lib/init-templates/.init-version.json +1 -1
- package/lib/init-templates/.recommended-feature-flags.json +2 -1
- package/lib/private/explorer.d.ts +1 -0
- package/lib/private/explorer.js +8 -0
- package/lib/private/tools.d.ts +1 -0
- package/lib/private/tools.js +21 -0
- package/package.json +19 -16
package/lib/cli/util/npm.js
CHANGED
|
@@ -1,34 +1,111 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
const
|
|
5
|
-
const util_1 = require("util");
|
|
36
|
+
exports.fetchNpmVersionInfo = fetchNpmVersionInfo;
|
|
37
|
+
const https = __importStar(require("node:https"));
|
|
6
38
|
const toolkit_lib_1 = require("@aws-cdk/toolkit-lib");
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
catch (err) {
|
|
30
|
-
throw err;
|
|
39
|
+
const NPM_REGISTRY_ROOT = 'https://registry.npmjs.org';
|
|
40
|
+
const REQUEST_TIMEOUT_MS = 3_000;
|
|
41
|
+
/**
|
|
42
|
+
* Query the public npm registry for version information about the `aws-cdk` package.
|
|
43
|
+
*
|
|
44
|
+
* This deliberately queries `registry.npmjs.org` directly (rather than shelling out
|
|
45
|
+
* to `npm view`, which honors the local npm configuration), so that stale metadata
|
|
46
|
+
* from corporate registry mirrors or the local npm cache cannot produce bogus
|
|
47
|
+
* upgrade recommendations.
|
|
48
|
+
*/
|
|
49
|
+
async function fetchNpmVersionInfo(currentVersion, agent) {
|
|
50
|
+
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
|
|
51
|
+
const [latestInfo, currentInfo] = await Promise.all([
|
|
52
|
+
getJson(`${NPM_REGISTRY_ROOT}/aws-cdk/latest`, agent),
|
|
53
|
+
// The running version may not exist on the registry (e.g. developer builds),
|
|
54
|
+
// in which case we simply have no deprecation information for it.
|
|
55
|
+
getJson(`${NPM_REGISTRY_ROOT}/aws-cdk/${encodeURIComponent(currentVersion)}`, agent, { allowNotFound: true }),
|
|
56
|
+
]);
|
|
57
|
+
if (typeof latestInfo?.version !== 'string') {
|
|
58
|
+
throw new toolkit_lib_1.ToolkitError('NpmRegistryUnexpectedResponse', 'npm registry response for aws-cdk@latest did not contain a version');
|
|
31
59
|
}
|
|
60
|
+
return {
|
|
61
|
+
latestVersion: latestInfo.version,
|
|
62
|
+
deprecated: typeof currentInfo?.deprecated === 'string' ? currentInfo.deprecated : undefined,
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function getJson(url, agent, options = {}) {
|
|
66
|
+
const requestOptions = {
|
|
67
|
+
agent,
|
|
68
|
+
headers: { Accept: 'application/json' },
|
|
69
|
+
};
|
|
70
|
+
return new Promise((resolve, reject) => {
|
|
71
|
+
let req;
|
|
72
|
+
const timer = setTimeout(() => {
|
|
73
|
+
if (req) {
|
|
74
|
+
req.destroy(new toolkit_lib_1.ToolkitError('NpmRegistryRequestTimeout', `request to ${url} timed out after ${REQUEST_TIMEOUT_MS}ms`));
|
|
75
|
+
}
|
|
76
|
+
}, REQUEST_TIMEOUT_MS);
|
|
77
|
+
timer.unref();
|
|
78
|
+
req = https.get(url, requestOptions, (res) => {
|
|
79
|
+
if (res.statusCode === 404 && options.allowNotFound) {
|
|
80
|
+
res.resume(); // discard the response body
|
|
81
|
+
resolve(undefined);
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
if (res.statusCode !== 200) {
|
|
85
|
+
res.resume(); // discard the response body
|
|
86
|
+
reject(new toolkit_lib_1.ToolkitError('NpmRegistryHttpError', `request to ${url} failed with status code ${res.statusCode}`));
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
res.setEncoding('utf8');
|
|
90
|
+
let rawData = '';
|
|
91
|
+
res.on('data', (chunk) => {
|
|
92
|
+
rawData += chunk;
|
|
93
|
+
});
|
|
94
|
+
res.on('end', () => {
|
|
95
|
+
try {
|
|
96
|
+
resolve(JSON.parse(rawData));
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
reject(toolkit_lib_1.ToolkitError.withCause('NpmRegistryParseError', `could not parse response from ${url}: ${e.message}`, e));
|
|
100
|
+
}
|
|
101
|
+
});
|
|
102
|
+
res.on('error', (e) => {
|
|
103
|
+
reject(toolkit_lib_1.ToolkitError.withCause('NpmRegistryResponseError', `response from ${url} failed: ${e.message}`, e));
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
req.on('error', (e) => {
|
|
107
|
+
reject(toolkit_lib_1.ToolkitError.withCause('NpmRegistryNetworkError', `request to ${url} failed: ${e.message}`, e));
|
|
108
|
+
});
|
|
109
|
+
});
|
|
32
110
|
}
|
|
33
|
-
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibnBtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBT0Esa0NBeUJDO0FBaENELGlEQUE4QztBQUM5QywrQkFBaUM7QUFDakMsc0RBQW9EO0FBRXBELE1BQU0sSUFBSSxHQUFHLElBQUEsZ0JBQVMsRUFBQyxvQkFBSyxDQUFDLENBQUM7QUFFOUIscUJBQXFCO0FBQ2QsS0FBSyxVQUFVLFdBQVcsQ0FBQyxjQUFzQjtJQUN0RCxJQUFJLENBQUM7UUFDSCx3RUFBd0U7UUFDeEUsTUFBTSxDQUFDLFlBQVksRUFBRSxhQUFhLENBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUM7WUFDdEQsSUFBSSxDQUFDLGlDQUFpQyxFQUFFLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO1lBQzFELElBQUksQ0FBQyxvQkFBb0IsY0FBYyxpQ0FBaUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztTQUM3RixDQUFDLENBQUM7UUFFSCxJQUFJLFlBQVksQ0FBQyxNQUFNLElBQUksWUFBWSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDakUsTUFBTSxJQUFJLDBCQUFZLENBQUMscUJBQXFCLEVBQUUsK0NBQStDLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQzdILENBQUM7UUFDRCxJQUFJLGFBQWEsQ0FBQyxNQUFNLElBQUksYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDbkUsTUFBTSxJQUFJLDBCQUFZLENBQUMsc0JBQXNCLEVBQUUsZ0RBQWdELGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ2hJLENBQUM7UUFFRCxNQUFNLGFBQWEsR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ2pELE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRXJELE9BQU87WUFDTCxhQUFhLEVBQUUsYUFBYTtZQUM1QixVQUFVLEVBQUUsV0FBVyxDQUFDLFVBQVU7U0FDbkMsQ0FBQztJQUNKLENBQUM7SUFBQyxPQUFPLEdBQVksRUFBRSxDQUFDO1FBQ3RCLE1BQU0sR0FBRyxDQUFDO0lBQ1osQ0FBQztBQUNILENBQUM7QUFDRCxvQkFBb0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBleGVjIGFzIF9leGVjIH0gZnJvbSAnY2hpbGRfcHJvY2Vzcyc7XG5pbXBvcnQgeyBwcm9taXNpZnkgfSBmcm9tICd1dGlsJztcbmltcG9ydCB7IFRvb2xraXRFcnJvciB9IGZyb20gJ0Bhd3MtY2RrL3Rvb2xraXQtbGliJztcblxuY29uc3QgZXhlYyA9IHByb21pc2lmeShfZXhlYyk7XG5cbi8qIGM4IGlnbm9yZSBzdGFydCAqL1xuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGV4ZWNOcG1WaWV3KGN1cnJlbnRWZXJzaW9uOiBzdHJpbmcpIHtcbiAgdHJ5IHtcbiAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQGNka2xhYnMvcHJvbWlzZWFsbC1uby11bmJvdW5kZWQtcGFyYWxsZWxpc21cbiAgICBjb25zdCBbbGF0ZXN0UmVzdWx0LCBjdXJyZW50UmVzdWx0XSA9IGF3YWl0IFByb21pc2UuYWxsKFtcbiAgICAgIGV4ZWMoJ25wbSB2aWV3IGF3cy1jZGtAbGF0ZXN0IHZlcnNpb24nLCB7IHRpbWVvdXQ6IDMwMDAgfSksXG4gICAgICBleGVjKGBucG0gdmlldyBhd3MtY2RrQCR7Y3VycmVudFZlcnNpb259IG5hbWUgdmVyc2lvbiBkZXByZWNhdGVkIC0tanNvbmAsIHsgdGltZW91dDogMzAwMCB9KSxcbiAgICBdKTtcblxuICAgIGlmIChsYXRlc3RSZXN1bHQuc3RkZXJyICYmIGxhdGVzdFJlc3VsdC5zdGRlcnIudHJpbSgpLmxlbmd0aCA+IDApIHtcbiAgICAgIHRocm93IG5ldyBUb29sa2l0RXJyb3IoJ05wbVZpZXdMYXRlc3RGYWlsZWQnLCBgbnBtIHZpZXcgY29tbWFuZCBmb3IgbGF0ZXN0IHZlcnNpb24gZmFpbGVkOiAke2xhdGVzdFJlc3VsdC5zdGRlcnIudHJpbSgpfWApO1xuICAgIH1cbiAgICBpZiAoY3VycmVudFJlc3VsdC5zdGRlcnIgJiYgY3VycmVudFJlc3VsdC5zdGRlcnIudHJpbSgpLmxlbmd0aCA+IDApIHtcbiAgICAgIHRocm93IG5ldyBUb29sa2l0RXJyb3IoJ05wbVZpZXdDdXJyZW50RmFpbGVkJywgYG5wbSB2aWV3IGNvbW1hbmQgZm9yIGN1cnJlbnQgdmVyc2lvbiBmYWlsZWQ6ICR7Y3VycmVudFJlc3VsdC5zdGRlcnIudHJpbSgpfWApO1xuICAgIH1cblxuICAgIGNvbnN0IGxhdGVzdFZlcnNpb24gPSBsYXRlc3RSZXN1bHQuc3Rkb3V0LnRyaW0oKTtcbiAgICBjb25zdCBjdXJyZW50SW5mbyA9IEpTT04ucGFyc2UoY3VycmVudFJlc3VsdC5zdGRvdXQpO1xuXG4gICAgcmV0dXJuIHtcbiAgICAgIGxhdGVzdFZlcnNpb246IGxhdGVzdFZlcnNpb24sXG4gICAgICBkZXByZWNhdGVkOiBjdXJyZW50SW5mby5kZXByZWNhdGVkLFxuICAgIH07XG4gIH0gY2F0Y2ggKGVycjogdW5rbm93bikge1xuICAgIHRocm93IGVycjtcbiAgfVxufVxuLyogYzggaWdub3JlIHN0b3AgKi9cbiJdfQ==
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"npm.js","sourceRoot":"","sources":["npm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,kDAiBC;AA9CD,kDAAoC;AACpC,sDAAoD;AAEpD,MAAM,iBAAiB,GAAG,4BAA4B,CAAC;AACvD,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAiBjC;;;;;;;GAOG;AACI,KAAK,UAAU,mBAAmB,CAAC,cAAsB,EAAE,KAAa;IAC7E,wEAAwE;IACxE,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClD,OAAO,CAAC,GAAG,iBAAiB,iBAAiB,EAAE,KAAK,CAAC;QACrD,6EAA6E;QAC7E,kEAAkE;QAClE,OAAO,CAAC,GAAG,iBAAiB,YAAY,kBAAkB,CAAC,cAAc,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;KAC9G,CAAC,CAAC;IAEH,IAAI,OAAO,UAAU,EAAE,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC5C,MAAM,IAAI,0BAAY,CAAC,+BAA+B,EAAE,oEAAoE,CAAC,CAAC;IAChI,CAAC;IAED,OAAO;QACL,aAAa,EAAE,UAAU,CAAC,OAAO;QACjC,UAAU,EAAE,OAAO,WAAW,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;KAC7F,CAAC;AACJ,CAAC;AAWD,SAAS,OAAO,CAAC,GAAW,EAAE,KAAa,EAAE,UAA0B,EAAE;IACvE,MAAM,cAAc,GAAmB;QACrC,KAAK;QACL,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE;KACxC,CAAC;IAEF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,GAA8B,CAAC;QAEnC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,GAAG,EAAE,CAAC;gBACR,GAAG,CAAC,OAAO,CAAC,IAAI,0BAAY,CAAC,2BAA2B,EAAE,cAAc,GAAG,oBAAoB,kBAAkB,IAAI,CAAC,CAAC,CAAC;YAC1H,CAAC;QACH,CAAC,EAAE,kBAAkB,CAAC,CAAC;QACvB,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,CAAC,GAAG,EAAE,EAAE;YAC3C,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;gBACpD,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,4BAA4B;gBAC1C,OAAO,CAAC,SAAS,CAAC,CAAC;gBACnB,OAAO;YACT,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;gBAC3B,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,4BAA4B;gBAC1C,MAAM,CAAC,IAAI,0BAAY,CAAC,sBAAsB,EAAE,cAAc,GAAG,4BAA4B,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBAChH,OAAO;YACT,CAAC;YAED,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACxB,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvB,OAAO,IAAI,KAAK,CAAC;YACnB,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,IAAI,CAAC;oBACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC/B,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,MAAM,CAAC,0BAAY,CAAC,SAAS,CAAC,uBAAuB,EAAE,iCAAiC,GAAG,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBACnH,CAAC;YACH,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBACpB,MAAM,CAAC,0BAAY,CAAC,SAAS,CAAC,0BAA0B,EAAE,iBAAiB,GAAG,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAC7G,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACpB,MAAM,CAAC,0BAAY,CAAC,SAAS,CAAC,yBAAyB,EAAE,cAAc,GAAG,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACzG,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { ClientRequest } from 'node:http';\nimport type { Agent, RequestOptions } from 'node:https';\nimport * as https from 'node:https';\nimport { ToolkitError } from '@aws-cdk/toolkit-lib';\n\nconst NPM_REGISTRY_ROOT = 'https://registry.npmjs.org';\nconst REQUEST_TIMEOUT_MS = 3_000;\n\n/**\n * Version information about the `aws-cdk` package, as reported by the npm registry\n */\nexport interface NpmVersionInfo {\n  /**\n   * The version the `latest` dist-tag points to\n   */\n  readonly latestVersion: string;\n\n  /**\n   * The deprecation message of the currently running version, if it is deprecated\n   */\n  readonly deprecated?: string;\n}\n\n/**\n * Query the public npm registry for version information about the `aws-cdk` package.\n *\n * This deliberately queries `registry.npmjs.org` directly (rather than shelling out\n * to `npm view`, which honors the local npm configuration), so that stale metadata\n * from corporate registry mirrors or the local npm cache cannot produce bogus\n * upgrade recommendations.\n */\nexport async function fetchNpmVersionInfo(currentVersion: string, agent?: Agent): Promise<NpmVersionInfo> {\n  // eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism\n  const [latestInfo, currentInfo] = await Promise.all([\n    getJson(`${NPM_REGISTRY_ROOT}/aws-cdk/latest`, agent),\n    // The running version may not exist on the registry (e.g. developer builds),\n    // in which case we simply have no deprecation information for it.\n    getJson(`${NPM_REGISTRY_ROOT}/aws-cdk/${encodeURIComponent(currentVersion)}`, agent, { allowNotFound: true }),\n  ]);\n\n  if (typeof latestInfo?.version !== 'string') {\n    throw new ToolkitError('NpmRegistryUnexpectedResponse', 'npm registry response for aws-cdk@latest did not contain a version');\n  }\n\n  return {\n    latestVersion: latestInfo.version,\n    deprecated: typeof currentInfo?.deprecated === 'string' ? currentInfo.deprecated : undefined,\n  };\n}\n\ninterface GetJsonOptions {\n  /**\n   * Resolve to `undefined` on a 404 response instead of failing\n   *\n   * @default false\n   */\n  readonly allowNotFound?: boolean;\n}\n\nfunction getJson(url: string, agent?: Agent, options: GetJsonOptions = {}): Promise<any> {\n  const requestOptions: RequestOptions = {\n    agent,\n    headers: { Accept: 'application/json' },\n  };\n\n  return new Promise((resolve, reject) => {\n    let req: ClientRequest | undefined;\n\n    const timer = setTimeout(() => {\n      if (req) {\n        req.destroy(new ToolkitError('NpmRegistryRequestTimeout', `request to ${url} timed out after ${REQUEST_TIMEOUT_MS}ms`));\n      }\n    }, REQUEST_TIMEOUT_MS);\n    timer.unref();\n\n    req = https.get(url, requestOptions, (res) => {\n      if (res.statusCode === 404 && options.allowNotFound) {\n        res.resume(); // discard the response body\n        resolve(undefined);\n        return;\n      }\n      if (res.statusCode !== 200) {\n        res.resume(); // discard the response body\n        reject(new ToolkitError('NpmRegistryHttpError', `request to ${url} failed with status code ${res.statusCode}`));\n        return;\n      }\n\n      res.setEncoding('utf8');\n      let rawData = '';\n      res.on('data', (chunk) => {\n        rawData += chunk;\n      });\n      res.on('end', () => {\n        try {\n          resolve(JSON.parse(rawData));\n        } catch (e: any) {\n          reject(ToolkitError.withCause('NpmRegistryParseError', `could not parse response from ${url}: ${e.message}`, e));\n        }\n      });\n      res.on('error', (e) => {\n        reject(ToolkitError.withCause('NpmRegistryResponseError', `response from ${url} failed: ${e.message}`, e));\n      });\n    });\n    req.on('error', (e) => {\n      reject(ToolkitError.withCause('NpmRegistryNetworkError', `request to ${url} failed: ${e.message}`, e));\n    });\n  });\n}\n"]}
|
package/lib/commands/doctor.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type * as https from 'node:https';
|
|
1
2
|
import type { Settings } from '../api/settings';
|
|
2
3
|
import type { IoHelper } from '../api-private';
|
|
3
4
|
export interface DoctorOptions {
|
|
@@ -9,5 +10,13 @@ export interface DoctorOptions {
|
|
|
9
10
|
* @default - configuration is not reported
|
|
10
11
|
*/
|
|
11
12
|
readonly settings?: Settings;
|
|
13
|
+
/**
|
|
14
|
+
* The agent used for the network request of the version check
|
|
15
|
+
*
|
|
16
|
+
* Use this to set up a proxy connection.
|
|
17
|
+
*
|
|
18
|
+
* @default - the shared global node agent
|
|
19
|
+
*/
|
|
20
|
+
readonly agent?: https.Agent;
|
|
12
21
|
}
|
|
13
|
-
export declare function doctor({ ioHelper, settings }: DoctorOptions): Promise<number>;
|
|
22
|
+
export declare function doctor({ ioHelper, settings, agent }: DoctorOptions): Promise<number>;
|
package/lib/commands/doctor.js
CHANGED
|
@@ -42,14 +42,14 @@ const cxapi = __importStar(require("@aws-cdk/cx-api"));
|
|
|
42
42
|
const chalk_1 = __importDefault(require("chalk"));
|
|
43
43
|
const display_version_1 = require("../cli/display-version");
|
|
44
44
|
const version_1 = require("../cli/version");
|
|
45
|
-
async function doctor({ ioHelper, settings }) {
|
|
45
|
+
async function doctor({ ioHelper, settings, agent }) {
|
|
46
46
|
let exitStatus = 0;
|
|
47
47
|
for (const verification of verifications) {
|
|
48
48
|
if (!await verification(ioHelper, settings)) {
|
|
49
49
|
exitStatus = -1;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
-
await (0, display_version_1.displayVersionMessage)(ioHelper);
|
|
52
|
+
await (0, display_version_1.displayVersionMessage)(ioHelper, { agent });
|
|
53
53
|
return exitStatus;
|
|
54
54
|
}
|
|
55
55
|
const verifications = [
|
|
@@ -117,4 +117,4 @@ function anonymizeAwsVariable(name, value) {
|
|
|
117
117
|
}
|
|
118
118
|
return value;
|
|
119
119
|
}
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"doctor.js","sourceRoot":"","sources":["doctor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoBA,wBASC;AA7BD,iDAAmC;AACnC,uDAAyC;AACzC,kDAA0B;AAG1B,4DAA+D;AAC/D,4CAAkD;AAc3C,KAAK,UAAU,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAiB;IAChE,IAAI,UAAU,GAAW,CAAC,CAAC;IAC3B,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC5C,UAAU,GAAG,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,MAAM,IAAA,uCAAqB,EAAC,QAAQ,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,aAAa,GAAmF;IACpG,yBAAyB;IACzB,uBAAuB;IACvB,8BAA8B;IAC9B,8BAA8B;CAC/B,CAAC;AAEF,wBAAwB;AAExB,KAAK,UAAU,uBAAuB,CAAC,QAAkB,EAAE,QAAmB;IAC5E,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,qBAAqB,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC;IAE/F,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,IAAI,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC;IAEnF,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAK,CAAC,IAAI,CAAC,MAAM,CAC5C,GAAG,OAAO,KAAK,SAAS,EAAE,CAC3B,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,QAAkB;IACzD,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,uBAAuB,eAAK,CAAC,KAAK,CAAC,IAAA,0BAAgB,GAAE,CAAC,EAAE,CAAC,CAAC;IACvF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,8BAA8B,CAAC,QAAkB;IAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACxE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAC9D,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,eAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACxH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,8BAA8B,CAAC,QAAkB;IAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACxE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IAC9D,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;QAC9B,IAAI,GAAG,KAAK,KAAK,CAAC,WAAW,IAAI,GAAG,KAAK,KAAK,CAAC,6BAA6B,IAAI,GAAG,KAAK,KAAK,CAAC,UAAU,EAAE,CAAC;YACzG,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,2CAA2C,CAAC,CAAC;YACnI,OAAO,GAAG,KAAK,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY,EAAE,KAAa;IACvD,IAAI,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC;IAC1C,CAAC,CAAC,+CAA+C;IACjD,IAAI,IAAI,KAAK,uBAAuB,IAAI,IAAI,KAAK,mBAAmB,IAAI,IAAI,KAAK,oBAAoB,EAAE,CAAC;QACtG,OAAO,YAAY,CAAC;IACtB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["import * as process from 'process';\nimport * as cxapi from '@aws-cdk/cx-api';\nimport chalk from 'chalk';\nimport type { Settings } from '../api/settings';\nimport type { IoHelper } from '../api-private';\nimport { displayVersionMessage } from '../cli/display-version';\nimport { versionWithBuild } from '../cli/version';\n\nexport interface DoctorOptions {\n  readonly ioHelper: IoHelper;\n\n  /**\n   * The resolved CLI settings, used to report the active CLI configuration\n   * (debug targets, verbosity, ...).\n   *\n   * @default - configuration is not reported\n   */\n  readonly settings?: Settings;\n}\n\nexport async function doctor({ ioHelper, settings }: DoctorOptions): Promise<number> {\n  let exitStatus: number = 0;\n  for (const verification of verifications) {\n    if (!await verification(ioHelper, settings)) {\n      exitStatus = -1;\n    }\n  }\n  await displayVersionMessage(ioHelper);\n  return exitStatus;\n}\n\nconst verifications: Array<(ioHelper: IoHelper, settings?: Settings) => boolean | Promise<boolean>> = [\n  displayVersionInformation,\n  displayCliConfiguration,\n  displayAwsEnvironmentVariables,\n  displayCdkEnvironmentVariables,\n];\n\n// ### Verifications ###\n\nasync function displayCliConfiguration(ioHelper: IoHelper, settings?: Settings) {\n  const verbosity = Number(settings?.get(['verbose']) ?? 0);\n  const verbose = verbosity ? `extra verbosity (-${'v'.repeat(verbosity)})` : 'normal verbosity';\n\n  const debug = [];\n  if (Boolean(settings?.get(['debugApp']))) {\n    debug.push('CDK app');\n  }\n  if (Boolean(settings?.get(['debugCli']))) {\n    debug.push('CLI');\n  }\n  const debugging = debug.length ? `debugging ${debug.join(' & ')}` : 'no debugging';\n\n  await ioHelper.defaults.info(chalk.gray.italic(\n    `${verbose}, ${debugging}`,\n  ));\n  return true;\n}\n\nasync function displayVersionInformation(ioHelper: IoHelper) {\n  await ioHelper.defaults.info(`ℹ️ CDK CLI Version: ${chalk.green(versionWithBuild())}`);\n  return true;\n}\n\nasync function displayAwsEnvironmentVariables(ioHelper: IoHelper) {\n  const keys = Object.keys(process.env).filter(s => s.startsWith('AWS_'));\n  if (keys.length === 0) {\n    await ioHelper.defaults.info('ℹ️ No AWS environment variables');\n    return true;\n  }\n  await ioHelper.defaults.info('ℹ️ AWS environment variables:');\n  for (const key of keys) {\n    await ioHelper.defaults.info(`  - ${chalk.blue(key)} = ${chalk.green(anonymizeAwsVariable(key, process.env[key]!))}`);\n  }\n  return true;\n}\n\nasync function displayCdkEnvironmentVariables(ioHelper: IoHelper) {\n  const keys = Object.keys(process.env).filter(s => s.startsWith('CDK_'));\n  if (keys.length === 0) {\n    await ioHelper.defaults.info('ℹ️ No CDK environment variables');\n    return true;\n  }\n  await ioHelper.defaults.info('ℹ️ CDK environment variables:');\n  let healthy = true;\n  for (const key of keys.sort()) {\n    if (key === cxapi.CONTEXT_ENV || key === cxapi.CONTEXT_OVERFLOW_LOCATION_ENV || key === cxapi.OUTDIR_ENV) {\n      await ioHelper.defaults.info(`  - ${chalk.red(key)} = ${chalk.green(process.env[key]!)} (⚠️ reserved for use by the CDK toolkit)`);\n      healthy = false;\n    } else {\n      await ioHelper.defaults.info(`  - ${chalk.blue(key)} = ${chalk.green(process.env[key]!)}`);\n    }\n  }\n  return healthy;\n}\n\nfunction anonymizeAwsVariable(name: string, value: string) {\n  if (name === 'AWS_ACCESS_KEY_ID') {\n    return value.slice(0, 4) + '<redacted>';\n  } // Show ASIA/AKIA key type, but hide identifier\n  if (name === 'AWS_SECRET_ACCESS_KEY' || name === 'AWS_SESSION_TOKEN' || name === 'AWS_SECURITY_TOKEN') {\n    return '<redacted>';\n  }\n  return value;\n}\n"]}
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"doctor.js","sourceRoot":"","sources":["doctor.ts"],"names":[],"mappings":"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","sourcesContent":["import type * as https from 'node:https';\nimport * as process from 'process';\nimport * as cxapi from '@aws-cdk/cx-api';\nimport chalk from 'chalk';\nimport type { Settings } from '../api/settings';\nimport type { IoHelper } from '../api-private';\nimport { displayVersionMessage } from '../cli/display-version';\nimport { versionWithBuild } from '../cli/version';\n\nexport interface DoctorOptions {\n  readonly ioHelper: IoHelper;\n\n  /**\n   * The resolved CLI settings, used to report the active CLI configuration\n   * (debug targets, verbosity, ...).\n   *\n   * @default - configuration is not reported\n   */\n  readonly settings?: Settings;\n\n  /**\n   * The agent used for the network request of the version check\n   *\n   * Use this to set up a proxy connection.\n   *\n   * @default - the shared global node agent\n   */\n  readonly agent?: https.Agent;\n}\n\nexport async function doctor({ ioHelper, settings, agent }: DoctorOptions): Promise<number> {\n  let exitStatus: number = 0;\n  for (const verification of verifications) {\n    if (!await verification(ioHelper, settings)) {\n      exitStatus = -1;\n    }\n  }\n  await displayVersionMessage(ioHelper, { agent });\n  return exitStatus;\n}\n\nconst verifications: Array<(ioHelper: IoHelper, settings?: Settings) => boolean | Promise<boolean>> = [\n  displayVersionInformation,\n  displayCliConfiguration,\n  displayAwsEnvironmentVariables,\n  displayCdkEnvironmentVariables,\n];\n\n// ### Verifications ###\n\nasync function displayCliConfiguration(ioHelper: IoHelper, settings?: Settings) {\n  const verbosity = Number(settings?.get(['verbose']) ?? 0);\n  const verbose = verbosity ? `extra verbosity (-${'v'.repeat(verbosity)})` : 'normal verbosity';\n\n  const debug = [];\n  if (Boolean(settings?.get(['debugApp']))) {\n    debug.push('CDK app');\n  }\n  if (Boolean(settings?.get(['debugCli']))) {\n    debug.push('CLI');\n  }\n  const debugging = debug.length ? `debugging ${debug.join(' & ')}` : 'no debugging';\n\n  await ioHelper.defaults.info(chalk.gray.italic(\n    `${verbose}, ${debugging}`,\n  ));\n  return true;\n}\n\nasync function displayVersionInformation(ioHelper: IoHelper) {\n  await ioHelper.defaults.info(`ℹ️ CDK CLI Version: ${chalk.green(versionWithBuild())}`);\n  return true;\n}\n\nasync function displayAwsEnvironmentVariables(ioHelper: IoHelper) {\n  const keys = Object.keys(process.env).filter(s => s.startsWith('AWS_'));\n  if (keys.length === 0) {\n    await ioHelper.defaults.info('ℹ️ No AWS environment variables');\n    return true;\n  }\n  await ioHelper.defaults.info('ℹ️ AWS environment variables:');\n  for (const key of keys) {\n    await ioHelper.defaults.info(`  - ${chalk.blue(key)} = ${chalk.green(anonymizeAwsVariable(key, process.env[key]!))}`);\n  }\n  return true;\n}\n\nasync function displayCdkEnvironmentVariables(ioHelper: IoHelper) {\n  const keys = Object.keys(process.env).filter(s => s.startsWith('CDK_'));\n  if (keys.length === 0) {\n    await ioHelper.defaults.info('ℹ️ No CDK environment variables');\n    return true;\n  }\n  await ioHelper.defaults.info('ℹ️ CDK environment variables:');\n  let healthy = true;\n  for (const key of keys.sort()) {\n    if (key === cxapi.CONTEXT_ENV || key === cxapi.CONTEXT_OVERFLOW_LOCATION_ENV || key === cxapi.OUTDIR_ENV) {\n      await ioHelper.defaults.info(`  - ${chalk.red(key)} = ${chalk.green(process.env[key]!)} (⚠️ reserved for use by the CDK toolkit)`);\n      healthy = false;\n    } else {\n      await ioHelper.defaults.info(`  - ${chalk.blue(key)} = ${chalk.green(process.env[key]!)}`);\n    }\n  }\n  return healthy;\n}\n\nfunction anonymizeAwsVariable(name: string, value: string) {\n  if (name === 'AWS_ACCESS_KEY_ID') {\n    return value.slice(0, 4) + '<redacted>';\n  } // Show ASIA/AKIA key type, but hide identifier\n  if (name === 'AWS_SECRET_ACCESS_KEY' || name === 'AWS_SESSION_TOKEN' || name === 'AWS_SECURITY_TOKEN') {\n    return '<redacted>';\n  }\n  return value;\n}\n"]}
|
package/lib/commands/lsp.d.ts
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* Runs the CDK Language Server command.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* With `--features`, prints the LSP capability manifest as JSON and exits.
|
|
5
|
+
* Otherwise starts the server, which speaks LSP/JSON-RPC on stdin/stdout -- in
|
|
6
|
+
* that mode the command must not write anything else to stdout (CDK CLI logs go
|
|
7
|
+
* to stderr, keeping the protocol channel clean). The server runs until the LSP
|
|
8
|
+
* client closes the stdio channel (stdin end), then exits 0.
|
|
8
9
|
*/
|
|
9
|
-
export declare function lsp(
|
|
10
|
+
export declare function lsp(options?: {
|
|
11
|
+
readonly features?: boolean;
|
|
12
|
+
}): Promise<number>;
|
package/lib/commands/lsp.js
CHANGED
|
@@ -35,17 +35,26 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.lsp = lsp;
|
|
37
37
|
const process = __importStar(require("process"));
|
|
38
|
-
const
|
|
38
|
+
const version_1 = require("../cli/version");
|
|
39
|
+
const explorer_1 = require("../private/explorer");
|
|
39
40
|
/**
|
|
40
|
-
*
|
|
41
|
+
* Runs the CDK Language Server command.
|
|
41
42
|
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
43
|
+
* With `--features`, prints the LSP capability manifest as JSON and exits.
|
|
44
|
+
* Otherwise starts the server, which speaks LSP/JSON-RPC on stdin/stdout -- in
|
|
45
|
+
* that mode the command must not write anything else to stdout (CDK CLI logs go
|
|
46
|
+
* to stderr, keeping the protocol channel clean). The server runs until the LSP
|
|
47
|
+
* client closes the stdio channel (stdin end), then exits 0.
|
|
46
48
|
*/
|
|
47
|
-
async function lsp() {
|
|
48
|
-
|
|
49
|
+
async function lsp(options = {}) {
|
|
50
|
+
// `--features` is a probe: print the capability manifest as JSON and exit
|
|
51
|
+
// without starting the server, so a client can detect LSP presence and
|
|
52
|
+
// features without opening a session.
|
|
53
|
+
if (options.features) {
|
|
54
|
+
process.stdout.write(JSON.stringify((0, explorer_1.cdkLspManifest)((0, version_1.versionNumber)())) + '\n');
|
|
55
|
+
return 0;
|
|
56
|
+
}
|
|
57
|
+
(0, explorer_1.startLspServer)((0, version_1.versionNumber)());
|
|
49
58
|
await new Promise((resolve) => {
|
|
50
59
|
const done = () => resolve();
|
|
51
60
|
process.stdin.once('end', done);
|
|
@@ -53,4 +62,4 @@ async function lsp() {
|
|
|
53
62
|
});
|
|
54
63
|
return 0;
|
|
55
64
|
}
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibHNwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsibHNwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBYUEsa0JBa0JDO0FBL0JELGlEQUFtQztBQUNuQyw0Q0FBK0M7QUFDL0Msa0RBQXFFO0FBRXJFOzs7Ozs7OztHQVFHO0FBQ0ksS0FBSyxVQUFVLEdBQUcsQ0FBQyxVQUEyQyxFQUFFO0lBQ3JFLDBFQUEwRTtJQUMxRSx1RUFBdUU7SUFDdkUsc0NBQXNDO0lBQ3RDLElBQUksT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ3JCLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBQSx5QkFBYyxFQUFDLElBQUEsdUJBQWEsR0FBRSxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUM3RSxPQUFPLENBQUMsQ0FBQztJQUNYLENBQUM7SUFFRCxJQUFBLHlCQUFjLEVBQUMsSUFBQSx1QkFBYSxHQUFFLENBQUMsQ0FBQztJQUVoQyxNQUFNLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLEVBQUU7UUFDbEMsTUFBTSxJQUFJLEdBQUcsR0FBRyxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDN0IsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ2hDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNwQyxDQUFDLENBQUMsQ0FBQztJQUVILE9BQU8sQ0FBQyxDQUFDO0FBQ1gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIHByb2Nlc3MgZnJvbSAncHJvY2Vzcyc7XG5pbXBvcnQgeyB2ZXJzaW9uTnVtYmVyIH0gZnJvbSAnLi4vY2xpL3ZlcnNpb24nO1xuaW1wb3J0IHsgY2RrTHNwTWFuaWZlc3QsIHN0YXJ0THNwU2VydmVyIH0gZnJvbSAnLi4vcHJpdmF0ZS9leHBsb3Jlcic7XG5cbi8qKlxuICogUnVucyB0aGUgQ0RLIExhbmd1YWdlIFNlcnZlciBjb21tYW5kLlxuICpcbiAqIFdpdGggYC0tZmVhdHVyZXNgLCBwcmludHMgdGhlIExTUCBjYXBhYmlsaXR5IG1hbmlmZXN0IGFzIEpTT04gYW5kIGV4aXRzLlxuICogT3RoZXJ3aXNlIHN0YXJ0cyB0aGUgc2VydmVyLCB3aGljaCBzcGVha3MgTFNQL0pTT04tUlBDIG9uIHN0ZGluL3N0ZG91dCAtLSBpblxuICogdGhhdCBtb2RlIHRoZSBjb21tYW5kIG11c3Qgbm90IHdyaXRlIGFueXRoaW5nIGVsc2UgdG8gc3Rkb3V0IChDREsgQ0xJIGxvZ3MgZ29cbiAqIHRvIHN0ZGVyciwga2VlcGluZyB0aGUgcHJvdG9jb2wgY2hhbm5lbCBjbGVhbikuIFRoZSBzZXJ2ZXIgcnVucyB1bnRpbCB0aGUgTFNQXG4gKiBjbGllbnQgY2xvc2VzIHRoZSBzdGRpbyBjaGFubmVsIChzdGRpbiBlbmQpLCB0aGVuIGV4aXRzIDAuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBsc3Aob3B0aW9uczogeyByZWFkb25seSBmZWF0dXJlcz86IGJvb2xlYW4gfSA9IHt9KTogUHJvbWlzZTxudW1iZXI+IHtcbiAgLy8gYC0tZmVhdHVyZXNgIGlzIGEgcHJvYmU6IHByaW50IHRoZSBjYXBhYmlsaXR5IG1hbmlmZXN0IGFzIEpTT04gYW5kIGV4aXRcbiAgLy8gd2l0aG91dCBzdGFydGluZyB0aGUgc2VydmVyLCBzbyBhIGNsaWVudCBjYW4gZGV0ZWN0IExTUCBwcmVzZW5jZSBhbmRcbiAgLy8gZmVhdHVyZXMgd2l0aG91dCBvcGVuaW5nIGEgc2Vzc2lvbi5cbiAgaWYgKG9wdGlvbnMuZmVhdHVyZXMpIHtcbiAgICBwcm9jZXNzLnN0ZG91dC53cml0ZShKU09OLnN0cmluZ2lmeShjZGtMc3BNYW5pZmVzdCh2ZXJzaW9uTnVtYmVyKCkpKSArICdcXG4nKTtcbiAgICByZXR1cm4gMDtcbiAgfVxuXG4gIHN0YXJ0THNwU2VydmVyKHZlcnNpb25OdW1iZXIoKSk7XG5cbiAgYXdhaXQgbmV3IFByb21pc2U8dm9pZD4oKHJlc29sdmUpID0+IHtcbiAgICBjb25zdCBkb25lID0gKCkgPT4gcmVzb2x2ZSgpO1xuICAgIHByb2Nlc3Muc3RkaW4ub25jZSgnZW5kJywgZG9uZSk7XG4gICAgcHJvY2Vzcy5zdGRpbi5vbmNlKCdjbG9zZScsIGRvbmUpO1xuICB9KTtcblxuICByZXR1cm4gMDtcbn1cbiJdfQ==
|