checkly 8.10.0 → 8.11.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/dist/ai-context/skills-command/references/initialize.md +1 -10
- package/dist/commands/baseCommand.d.ts +1 -0
- package/dist/commands/baseCommand.js +31 -2
- package/dist/commands/baseCommand.js.map +1 -1
- package/dist/commands/destroy.d.ts +1 -0
- package/dist/commands/destroy.js +30 -3
- package/dist/commands/destroy.js.map +1 -1
- package/dist/commands/init.js +7 -5
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/login.js +6 -6
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.js +3 -0
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/rules.d.ts +1 -2
- package/dist/commands/rules.js +5 -119
- package/dist/commands/rules.js.map +1 -1
- package/dist/commands/skills/install.d.ts +0 -6
- package/dist/commands/skills/install.js +3 -82
- package/dist/commands/skills/install.js.map +1 -1
- package/dist/commands/switch.js +0 -5
- package/dist/commands/switch.js.map +1 -1
- package/dist/commands/whoami.js +6 -0
- package/dist/commands/whoami.js.map +1 -1
- package/dist/helpers/onboarding/detect-project.d.ts +1 -1
- package/dist/helpers/onboarding/detect-project.js +4 -13
- package/dist/helpers/onboarding/detect-project.js.map +1 -1
- package/dist/helpers/onboarding/skill-install.js +1 -1
- package/dist/helpers/onboarding/skill-install.js.map +1 -1
- package/dist/helpers/result-assets.js.map +1 -1
- package/dist/messages/common-messages.d.ts +1 -0
- package/dist/messages/common-messages.js +2 -0
- package/dist/messages/common-messages.js.map +1 -1
- package/dist/reporters/abstract-list.d.ts +1 -0
- package/dist/reporters/abstract-list.js +14 -1
- package/dist/reporters/abstract-list.js.map +1 -1
- package/dist/reporters/dot.js +1 -0
- package/dist/reporters/dot.js.map +1 -1
- package/dist/reporters/github.d.ts +1 -0
- package/dist/reporters/github.js +16 -4
- package/dist/reporters/github.js.map +1 -1
- package/dist/reporters/util.d.ts +1 -0
- package/dist/reporters/util.js +1 -1
- package/dist/reporters/util.js.map +1 -1
- package/dist/rest/assets.js +3 -2
- package/dist/rest/assets.js.map +1 -1
- package/dist/rest/errors.d.ts +6 -0
- package/dist/rest/errors.js +80 -0
- package/dist/rest/errors.js.map +1 -1
- package/dist/rest/projects.d.ts +23 -4
- package/dist/rest/projects.js +52 -15
- package/dist/rest/projects.js.map +1 -1
- package/dist/services/check-parser/package-files/jsconfig-json-file.d.ts +2 -2
- package/dist/services/check-parser/package-files/jsconfig-json-file.js +3 -3
- package/dist/services/check-parser/package-files/jsconfig-json-file.js.map +1 -1
- package/dist/services/check-parser/package-files/resolver.d.ts +8 -1
- package/dist/services/check-parser/package-files/resolver.js +100 -4
- package/dist/services/check-parser/package-files/resolver.js.map +1 -1
- package/dist/services/check-parser/package-files/tsconfig-json-file.d.ts +53 -3
- package/dist/services/check-parser/package-files/tsconfig-json-file.js +107 -32
- package/dist/services/check-parser/package-files/tsconfig-json-file.js.map +1 -1
- package/dist/services/proxy.d.ts +32 -2
- package/dist/services/proxy.js +59 -26
- package/dist/services/proxy.js.map +1 -1
- package/dist/services/skills.d.ts +12 -0
- package/dist/services/skills.js +127 -0
- package/dist/services/skills.js.map +1 -0
- package/dist/services/socket-client.js +6 -27
- package/dist/services/socket-client.js.map +1 -1
- package/oclif.manifest.json +214 -207
- package/package.json +16 -15
- package/dist/ai-context/checkly.rules.md +0 -916
package/dist/rest/assets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/rest/assets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/rest/assets.ts"],"names":[],"mappings":"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"}
|
package/dist/rest/errors.d.ts
CHANGED
|
@@ -86,4 +86,10 @@ export declare function parseErrorData(data: any, options: ErrorDataOptions): Er
|
|
|
86
86
|
export declare class MissingResponseError extends Error {
|
|
87
87
|
constructor(options: ErrorOptions);
|
|
88
88
|
}
|
|
89
|
+
/**
|
|
90
|
+
* Error thrown when the configured proxy cannot be reached.
|
|
91
|
+
*/
|
|
92
|
+
export declare class ProxyConnectionError extends Error {
|
|
93
|
+
constructor(proxyUrl: string, options: ErrorOptions);
|
|
94
|
+
}
|
|
89
95
|
export declare function handleErrorResponse(err: Error): never;
|
package/dist/rest/errors.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { isAxiosError } from 'axios';
|
|
2
|
+
import { getProxyUrl } from '../services/proxy.js';
|
|
2
3
|
export class ApiError extends Error {
|
|
3
4
|
data;
|
|
4
5
|
constructor(data, options) {
|
|
@@ -166,9 +167,88 @@ export class MissingResponseError extends Error {
|
|
|
166
167
|
this.name = 'MissingResponseError';
|
|
167
168
|
}
|
|
168
169
|
}
|
|
170
|
+
/**
|
|
171
|
+
* Error thrown when the configured proxy cannot be reached.
|
|
172
|
+
*/
|
|
173
|
+
export class ProxyConnectionError extends Error {
|
|
174
|
+
constructor(proxyUrl, options) {
|
|
175
|
+
super(`Could not connect to the proxy at ${proxyUrl}. `
|
|
176
|
+
+ `Check that the proxy is running and that the http_proxy/https_proxy/all_proxy `
|
|
177
|
+
+ `environment variables point to the correct address.`
|
|
178
|
+
+ `\n\n`
|
|
179
|
+
+ `Details: ${options.cause}`, options);
|
|
180
|
+
this.name = 'ProxyConnectionError';
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
// Codes that indicate a connection to a host could not be established (refused,
|
|
184
|
+
// timed out, unreachable, or unresolvable). When a proxy is configured the
|
|
185
|
+
// connection is made to the proxy first, so these signal that the proxy itself
|
|
186
|
+
// could not be reached.
|
|
187
|
+
const CONNECTION_FAILURE_CODES = new Set([
|
|
188
|
+
'ECONNREFUSED',
|
|
189
|
+
'ETIMEDOUT',
|
|
190
|
+
'EHOSTUNREACH',
|
|
191
|
+
'ENETUNREACH',
|
|
192
|
+
'ENOTFOUND',
|
|
193
|
+
'EAI_AGAIN',
|
|
194
|
+
]);
|
|
195
|
+
// Walks an error's `cause` chain and any aggregated `errors` (e.g. happy-eyeballs
|
|
196
|
+
// AggregateError) collecting every `code` encountered.
|
|
197
|
+
function collectErrorCodes(err, codes = new Set(), seen = new Set()) {
|
|
198
|
+
if (!err || typeof err !== 'object' || seen.has(err)) {
|
|
199
|
+
return codes;
|
|
200
|
+
}
|
|
201
|
+
seen.add(err);
|
|
202
|
+
const { code, cause, errors } = err;
|
|
203
|
+
if (typeof code === 'string') {
|
|
204
|
+
codes.add(code);
|
|
205
|
+
}
|
|
206
|
+
collectErrorCodes(cause, codes, seen);
|
|
207
|
+
if (Array.isArray(errors)) {
|
|
208
|
+
for (const nested of errors) {
|
|
209
|
+
collectErrorCodes(nested, codes, seen);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
return codes;
|
|
213
|
+
}
|
|
214
|
+
// Returns the proxy that the failed request was routed through, with any
|
|
215
|
+
// credentials stripped, or undefined when no proxy applied.
|
|
216
|
+
function redactedProxyForRequest(config) {
|
|
217
|
+
if (!config) {
|
|
218
|
+
return undefined;
|
|
219
|
+
}
|
|
220
|
+
let targetUrl;
|
|
221
|
+
try {
|
|
222
|
+
targetUrl = new URL(config.url ?? '', config.baseURL || undefined).toString();
|
|
223
|
+
}
|
|
224
|
+
catch {
|
|
225
|
+
if (!config.baseURL) {
|
|
226
|
+
return undefined;
|
|
227
|
+
}
|
|
228
|
+
targetUrl = config.baseURL;
|
|
229
|
+
}
|
|
230
|
+
const proxyUrl = getProxyUrl(targetUrl);
|
|
231
|
+
if (!proxyUrl) {
|
|
232
|
+
return undefined;
|
|
233
|
+
}
|
|
234
|
+
try {
|
|
235
|
+
return new URL(proxyUrl).origin;
|
|
236
|
+
}
|
|
237
|
+
catch {
|
|
238
|
+
// Never surface a proxy URL we cannot parse — it may carry credentials.
|
|
239
|
+
return undefined;
|
|
240
|
+
}
|
|
241
|
+
}
|
|
169
242
|
export function handleErrorResponse(err) {
|
|
170
243
|
if (isAxiosError(err)) {
|
|
171
244
|
if (!err.response) {
|
|
245
|
+
const proxyUrl = redactedProxyForRequest(err.config);
|
|
246
|
+
if (proxyUrl) {
|
|
247
|
+
const codes = collectErrorCodes(err);
|
|
248
|
+
if ([...codes].some(code => CONNECTION_FAILURE_CODES.has(code))) {
|
|
249
|
+
throw new ProxyConnectionError(proxyUrl, { cause: err });
|
|
250
|
+
}
|
|
251
|
+
}
|
|
172
252
|
throw new MissingResponseError({ cause: err });
|
|
173
253
|
}
|
|
174
254
|
const { status: statusCode, data } = err.response;
|
package/dist/rest/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/rest/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/rest/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/rest/projects.d.ts
CHANGED
|
@@ -149,11 +149,30 @@ declare class Projects {
|
|
|
149
149
|
*/
|
|
150
150
|
create(project: Project): Promise<import("axios").AxiosResponse<any, any, {}>>;
|
|
151
151
|
/**
|
|
152
|
-
*
|
|
152
|
+
* Delete a project. The deletion runs asynchronously on the backend: this
|
|
153
|
+
* submits it, then follows its progress stream to completion, so large projects
|
|
154
|
+
* are no longer bound by the API gateway request timeout. A project that does
|
|
155
|
+
* not exist is treated as already deleted (the endpoint is idempotent).
|
|
156
|
+
*
|
|
157
|
+
* @throws {ProjectDeployFailedError} If the deletion finishes unsuccessfully.
|
|
158
|
+
*/
|
|
159
|
+
deleteProject(logicalId: string, { preserveResources, cancelInProgress, onProgress, onStatus }?: {
|
|
160
|
+
preserveResources?: boolean;
|
|
161
|
+
/**
|
|
162
|
+
* On a 409 (a deploy or delete is already in progress), cancel that
|
|
163
|
+
* operation instead of waiting for it to finish, then retry.
|
|
164
|
+
*/
|
|
165
|
+
cancelInProgress?: boolean;
|
|
166
|
+
onProgress?: (progress: number) => void;
|
|
167
|
+
/** Human-readable status updates (e.g. while waiting on a predecessor). */
|
|
168
|
+
onStatus?: (message: string) => void;
|
|
169
|
+
}): Promise<void>;
|
|
170
|
+
/**
|
|
171
|
+
* Submit the async delete and follow it to completion. The endpoint responds
|
|
172
|
+
* either with a deployment to follow (202), or — when there is nothing to delete
|
|
173
|
+
* (the project does not exist) — a plain result with no deployment to follow.
|
|
153
174
|
*/
|
|
154
|
-
|
|
155
|
-
preserveResources?: boolean | undefined;
|
|
156
|
-
}): Promise<import("axios").AxiosResponse<any, any, {}>>;
|
|
175
|
+
private submitDeletion;
|
|
157
176
|
/**
|
|
158
177
|
* Deploy a project. The deployment runs asynchronously on the backend: this
|
|
159
178
|
* submits it, then follows its progress stream to completion, so large projects
|
package/dist/rest/projects.js
CHANGED
|
@@ -90,9 +90,9 @@ export class InvalidImportPlanStateError extends Error {
|
|
|
90
90
|
this.name = 'InvalidImportPlanStateError';
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
|
-
// How long deploy() will keep waiting-and-retrying behind an
|
|
94
|
-
//
|
|
95
|
-
// predecessor deploy can legitimately run for many minutes.
|
|
93
|
+
// How long deploy() and deleteProject() will keep waiting-and-retrying behind an
|
|
94
|
+
// in-progress operation before giving up and surfacing the 409. Generous, since a
|
|
95
|
+
// large predecessor deploy or delete can legitimately run for many minutes.
|
|
96
96
|
const DEPLOY_CONFLICT_WAIT_DEADLINE_MS = 30 * 60_000;
|
|
97
97
|
class Projects {
|
|
98
98
|
api;
|
|
@@ -132,20 +132,57 @@ class Projects {
|
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
134
|
/**
|
|
135
|
-
*
|
|
135
|
+
* Delete a project. The deletion runs asynchronously on the backend: this
|
|
136
|
+
* submits it, then follows its progress stream to completion, so large projects
|
|
137
|
+
* are no longer bound by the API gateway request timeout. A project that does
|
|
138
|
+
* not exist is treated as already deleted (the endpoint is idempotent).
|
|
139
|
+
*
|
|
140
|
+
* @throws {ProjectDeployFailedError} If the deletion finishes unsuccessfully.
|
|
136
141
|
*/
|
|
137
|
-
async deleteProject(logicalId, { preserveResources = false } = {}) {
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
142
|
+
async deleteProject(logicalId, { preserveResources = false, cancelInProgress = false, onProgress, onStatus } = {}) {
|
|
143
|
+
// On a 409 the project already has an operation (deploy or delete) in
|
|
144
|
+
// progress. By default we wait for it to reach a final state then retry; with
|
|
145
|
+
// cancelInProgress we cancel it first. Bounded by an overall deadline so a
|
|
146
|
+
// stuck predecessor can't make us wait forever.
|
|
147
|
+
const deadlineAt = Date.now() + DEPLOY_CONFLICT_WAIT_DEADLINE_MS;
|
|
148
|
+
for (;;) {
|
|
149
|
+
try {
|
|
150
|
+
await this.submitDeletion(logicalId, { preserveResources, onProgress });
|
|
151
|
+
return;
|
|
147
152
|
}
|
|
148
|
-
|
|
153
|
+
catch (err) {
|
|
154
|
+
if (!(err instanceof ConflictError)
|
|
155
|
+
|| typeof err.data.deploymentId !== 'string'
|
|
156
|
+
|| Date.now() >= deadlineAt) {
|
|
157
|
+
throw err;
|
|
158
|
+
}
|
|
159
|
+
await this.resolveInProgressDeployment(logicalId, err.data.deploymentId, {
|
|
160
|
+
cancel: cancelInProgress,
|
|
161
|
+
onStatus,
|
|
162
|
+
deadlineAt,
|
|
163
|
+
});
|
|
164
|
+
// loop → re-submit, now that the predecessor has reached a final state
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* Submit the async delete and follow it to completion. The endpoint responds
|
|
170
|
+
* either with a deployment to follow (202), or — when there is nothing to delete
|
|
171
|
+
* (the project does not exist) — a plain result with no deployment to follow.
|
|
172
|
+
*/
|
|
173
|
+
async submitDeletion(logicalId, { preserveResources, onProgress }) {
|
|
174
|
+
const { data } = await this.api.delete(`/v1/projects/${encodeURIComponent(logicalId)}`, { params: { preserveResources, dryRun: false } });
|
|
175
|
+
// A missing project completes synchronously with a plain result body and no
|
|
176
|
+
// deployment to follow — already deleted (idempotent).
|
|
177
|
+
if (!('status' in data)) {
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
const completed = await this.streamDeploymentEvents(logicalId, data.id, { onProgress });
|
|
181
|
+
if (completed.status === 'CANCELLED') {
|
|
182
|
+
throw new ProjectDeployCancelledError('The deletion was cancelled before it finished. A newer operation may have superseded it.');
|
|
183
|
+
}
|
|
184
|
+
if (completed.status !== 'SUCCEEDED') {
|
|
185
|
+
throw new ProjectDeployFailedError(completed.error?.message ?? 'The deletion did not complete successfully.');
|
|
149
186
|
}
|
|
150
187
|
}
|
|
151
188
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projects.js","sourceRoot":"","sources":["../../src/rest/projects.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"projects.js","sourceRoot":"","sources":["../../src/rest/projects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TSConfigFile, Schema } from './tsconfig-json-file.js';
|
|
1
|
+
import { TSConfigFile, Schema, ResolveExtends } from './tsconfig-json-file.js';
|
|
2
2
|
import { JsonSourceFile } from './json-source-file.js';
|
|
3
3
|
/**
|
|
4
4
|
* JSConfigFile is essentially the exact same as TSConfigFile but with
|
|
@@ -13,5 +13,5 @@ export declare class JSConfigFile extends TSConfigFile {
|
|
|
13
13
|
static FILENAME: string;
|
|
14
14
|
readonly id: number;
|
|
15
15
|
static filePath(dirPath: string): string;
|
|
16
|
-
static loadFromJsonSourceFile(jsonFile: JsonSourceFile<Schema
|
|
16
|
+
static loadFromJsonSourceFile(jsonFile: JsonSourceFile<Schema>, resolveExtends: ResolveExtends): Promise<JSConfigFile | undefined>;
|
|
17
17
|
}
|
|
@@ -15,9 +15,9 @@ export class JSConfigFile extends TSConfigFile {
|
|
|
15
15
|
static filePath(dirPath) {
|
|
16
16
|
return path.join(dirPath, JSConfigFile.FILENAME);
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
return new JSConfigFile(jsonFile);
|
|
18
|
+
static async loadFromJsonSourceFile(jsonFile, resolveExtends) {
|
|
19
|
+
const chain = await JSConfigFile.buildChain(jsonFile, false, resolveExtends, new Set());
|
|
20
|
+
return new JSConfigFile(jsonFile, chain);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=jsconfig-json-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsconfig-json-file.js","sourceRoot":"","sources":["../../../../src/services/check-parser/package-files/jsconfig-json-file.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"jsconfig-json-file.js","sourceRoot":"","sources":["../../../../src/services/check-parser/package-files/jsconfig-json-file.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,YAAY,EAA0B,MAAM,yBAAyB,CAAA;AAG9E;;;;;;;GAOG;AACH,MAAM,OAAO,YAAa,SAAQ,YAAY;IAC5C,MAAM,CAAC,QAAQ,GAAG,eAAe,CAAA;IAEjC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAA;IACL,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,CAAA;IAEhC,MAAM,CAAC,QAAQ,CAAE,OAAe;QAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,sBAAsB,CACjC,QAAgC,EAChC,cAA8B;QAE9B,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;QACvF,OAAO,IAAI,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC"}
|
|
@@ -8,6 +8,7 @@ import { LineageOptions } from './walk.js';
|
|
|
8
8
|
import { Package, Workspace } from './workspace.js';
|
|
9
9
|
declare class PackageFilesCache {
|
|
10
10
|
#private;
|
|
11
|
+
constructor(workspace?: Workspace);
|
|
11
12
|
exactSourceFile(filePath: string): Promise<SourceFile | undefined>;
|
|
12
13
|
sourceFile(filePath: string, context: LookupContext): Promise<SourceFile | undefined>;
|
|
13
14
|
packageJson(filePath: string): Promise<PackageJsonFile | undefined>;
|
|
@@ -66,6 +67,12 @@ type SupportingTSConfigFileLocalDependency = {
|
|
|
66
67
|
sourceFile: SourceFile;
|
|
67
68
|
configFile: TSConfigFile;
|
|
68
69
|
};
|
|
70
|
+
type ExtendedTSConfigFileLocalDependency = {
|
|
71
|
+
kind: 'extended-tsconfig-file';
|
|
72
|
+
importPath: string;
|
|
73
|
+
sourceFile: SourceFile;
|
|
74
|
+
configFile: TSConfigFile;
|
|
75
|
+
};
|
|
69
76
|
type SupportingTSConfigResolvedPathLocalDependency = {
|
|
70
77
|
kind: 'supporting-tsconfig-resolved-path';
|
|
71
78
|
importPath: string;
|
|
@@ -90,7 +97,7 @@ type WorkspaceNeighborLocalDependency = {
|
|
|
90
97
|
importPath: string;
|
|
91
98
|
sourceFile: SourceFile;
|
|
92
99
|
};
|
|
93
|
-
type LocalDependency = WorkspaceRootPackageJsonFileLocalDependency | WorkspaceRootTSConfigFileLocalDependency | WorkspaceRootLockfileLocalDependency | WorkspaceRootConfigFileLocalDependency | NearestPackageJsonFileLocalDependency | NearestTSConfigFileLocalDependency | SupportingTSConfigFileLocalDependency | SupportingTSConfigResolvedPathLocalDependency | SupportingTSConfigBaseUrlRelativePathLocalDependency | RelativePathLocalDependency | WorkspaceNeighborLocalDependency;
|
|
100
|
+
type LocalDependency = WorkspaceRootPackageJsonFileLocalDependency | WorkspaceRootTSConfigFileLocalDependency | WorkspaceRootLockfileLocalDependency | WorkspaceRootConfigFileLocalDependency | NearestPackageJsonFileLocalDependency | NearestTSConfigFileLocalDependency | SupportingTSConfigFileLocalDependency | ExtendedTSConfigFileLocalDependency | SupportingTSConfigResolvedPathLocalDependency | SupportingTSConfigBaseUrlRelativePathLocalDependency | RelativePathLocalDependency | WorkspaceNeighborLocalDependency;
|
|
94
101
|
type MissingDependency = {
|
|
95
102
|
importPath: string;
|
|
96
103
|
filePath: string;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { createRequire } from 'node:module';
|
|
1
2
|
import path from 'node:path';
|
|
2
3
|
import Debug from 'debug';
|
|
3
4
|
import { SourceFile } from './source-file.js';
|
|
@@ -11,7 +12,19 @@ import { JsonTextSourceFile } from './json-text-source-file.js';
|
|
|
11
12
|
import { LookupContext } from './lookup.js';
|
|
12
13
|
import { lineage } from './walk.js';
|
|
13
14
|
const debug = Debug('checkly:cli:services:check-parser:resolver');
|
|
15
|
+
/**
|
|
16
|
+
* Candidate file paths for an `extends` target. TypeScript appends `.json` when
|
|
17
|
+
* the specifier has no extension and falls back to `<dir>/tsconfig.json` when it
|
|
18
|
+
* points at a directory.
|
|
19
|
+
*/
|
|
20
|
+
function configFileCandidates(base) {
|
|
21
|
+
if (base.endsWith('.json')) {
|
|
22
|
+
return [base];
|
|
23
|
+
}
|
|
24
|
+
return [`${base}.json`, path.join(base, TSConfigFile.FILENAME)];
|
|
25
|
+
}
|
|
14
26
|
class PackageFilesCache {
|
|
27
|
+
#workspace;
|
|
15
28
|
#sourceFileCache = new FileLoader(SourceFile.loadFromFilePath);
|
|
16
29
|
#fileLoader(load) {
|
|
17
30
|
return async (filePath) => {
|
|
@@ -40,9 +53,67 @@ class PackageFilesCache {
|
|
|
40
53
|
return load(jsonFile);
|
|
41
54
|
});
|
|
42
55
|
}
|
|
56
|
+
// Loads any file path as a raw tsconfig/jsconfig schema, tolerating JSONC
|
|
57
|
+
// (comments and trailing commas). Used to pull in the configs referenced by a
|
|
58
|
+
// config's `extends` property, whatever their filename.
|
|
59
|
+
#tsconfigSchemaCache = new FileLoader(async (filePath) => {
|
|
60
|
+
const sourceFile = await this.#sourceFileCache.load(filePath);
|
|
61
|
+
if (sourceFile === undefined) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
return JsonTextSourceFile.loadFromSourceFile(sourceFile);
|
|
65
|
+
});
|
|
66
|
+
// Resolves a config referenced by another config's `extends` property. A
|
|
67
|
+
// relative/absolute path or a workspace-member package is bundled; an external
|
|
68
|
+
// node_modules package is read for its options but left to the runner to
|
|
69
|
+
// restore from package.json (so it is not bundled).
|
|
70
|
+
#resolveExtends = async (specifier, fromDir) => {
|
|
71
|
+
if (isLocalPath(specifier) || path.isAbsolute(specifier)) {
|
|
72
|
+
const base = path.resolve(fromDir, specifier);
|
|
73
|
+
return this.#loadExtendedConfig(configFileCandidates(base), true);
|
|
74
|
+
}
|
|
75
|
+
const { name, path: subPath } = splitExternalPath(specifier);
|
|
76
|
+
const member = this.#workspace?.memberByName(name);
|
|
77
|
+
if (member !== undefined) {
|
|
78
|
+
const base = path.resolve(member.path, subPath === '' ? TSConfigFile.FILENAME : subPath);
|
|
79
|
+
const resolved = await this.#loadExtendedConfig(configFileCandidates(base), true);
|
|
80
|
+
if (resolved !== undefined) {
|
|
81
|
+
return resolved;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
// External node_modules package. Let Node resolve it the way tsc does,
|
|
85
|
+
// falling back to `<package>/tsconfig.json` for the common case of a package
|
|
86
|
+
// that exposes a config but no main entry point.
|
|
87
|
+
try {
|
|
88
|
+
const require = createRequire(path.join(fromDir, TSConfigFile.FILENAME));
|
|
89
|
+
let resolvedPath;
|
|
90
|
+
try {
|
|
91
|
+
resolvedPath = require.resolve(specifier);
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
resolvedPath = require.resolve(path.posix.join(specifier, TSConfigFile.FILENAME));
|
|
95
|
+
}
|
|
96
|
+
return await this.#loadExtendedConfig([resolvedPath], false);
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
// Could not resolve the extended config; behave as if `extends` were
|
|
100
|
+
// absent, matching the behavior before `extends` was supported.
|
|
101
|
+
}
|
|
102
|
+
};
|
|
103
|
+
async #loadExtendedConfig(candidates, bundle) {
|
|
104
|
+
for (const candidate of candidates) {
|
|
105
|
+
const jsonFile = await this.#tsconfigSchemaCache.load(candidate);
|
|
106
|
+
if (jsonFile !== undefined) {
|
|
107
|
+
return { jsonFile, bundle };
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
43
111
|
#packageJsonCache = new FileLoader(this.#jsonFileLoader(PackageJsonFile.loadFromJsonSourceFile));
|
|
44
|
-
#tsconfigJsonCache = new FileLoader(this.#jsonTextFileLoader(TSConfigFile.loadFromJsonTextSourceFile));
|
|
45
|
-
#jsconfigJsonCache = new FileLoader(this.#jsonFileLoader(JSConfigFile.loadFromJsonSourceFile));
|
|
112
|
+
#tsconfigJsonCache = new FileLoader(this.#jsonTextFileLoader((jsonFile) => TSConfigFile.loadFromJsonTextSourceFile(jsonFile, this.#resolveExtends)));
|
|
113
|
+
#jsconfigJsonCache = new FileLoader(this.#jsonFileLoader((jsonFile) => JSConfigFile.loadFromJsonSourceFile(jsonFile, this.#resolveExtends)));
|
|
114
|
+
constructor(workspace) {
|
|
115
|
+
this.#workspace = workspace;
|
|
116
|
+
}
|
|
46
117
|
async exactSourceFile(filePath) {
|
|
47
118
|
return await this.#sourceFileCache.load(filePath);
|
|
48
119
|
}
|
|
@@ -95,12 +166,13 @@ class PackageFiles {
|
|
|
95
166
|
}
|
|
96
167
|
}
|
|
97
168
|
export class PackageFilesResolver {
|
|
98
|
-
cache
|
|
169
|
+
cache;
|
|
99
170
|
workspace;
|
|
100
171
|
restricted;
|
|
101
172
|
constructor(options) {
|
|
102
173
|
this.workspace = options?.workspace;
|
|
103
174
|
this.restricted = options?.restricted ?? false;
|
|
175
|
+
this.cache = new PackageFilesCache(options?.workspace);
|
|
104
176
|
}
|
|
105
177
|
async loadPackageFiles(filePath, options) {
|
|
106
178
|
const files = new PackageFiles();
|
|
@@ -157,7 +229,12 @@ export class PackageFilesResolver {
|
|
|
157
229
|
continue;
|
|
158
230
|
}
|
|
159
231
|
configJson.registerRelatedSourceFile(mainSourceFile);
|
|
160
|
-
return [
|
|
232
|
+
return [
|
|
233
|
+
sourceFile,
|
|
234
|
+
mainSourceFile,
|
|
235
|
+
configJson.jsonFile.sourceFile,
|
|
236
|
+
...configJson.bundledExtendsSourceFiles,
|
|
237
|
+
];
|
|
161
238
|
}
|
|
162
239
|
}
|
|
163
240
|
const mainSourceFile = await this.cache.sourceFile(searchPath, context);
|
|
@@ -182,6 +259,19 @@ export class PackageFilesResolver {
|
|
|
182
259
|
references: [],
|
|
183
260
|
},
|
|
184
261
|
};
|
|
262
|
+
// Whenever a config is included as a dependency, the local configs it
|
|
263
|
+
// reaches through `extends` must be included too, so that path resolution
|
|
264
|
+
// still works at runtime.
|
|
265
|
+
const pushExtendedConfigs = (importPath, configFile) => {
|
|
266
|
+
for (const sourceFile of configFile.bundledExtendsSourceFiles) {
|
|
267
|
+
resolved.local.push({
|
|
268
|
+
kind: 'extended-tsconfig-file',
|
|
269
|
+
importPath,
|
|
270
|
+
sourceFile,
|
|
271
|
+
configFile,
|
|
272
|
+
});
|
|
273
|
+
}
|
|
274
|
+
};
|
|
185
275
|
const dirname = path.dirname(filePath);
|
|
186
276
|
const { packageJson, tsconfigJson, jsconfigJson, } = await this.loadPackageFiles(filePath, {
|
|
187
277
|
root: this.workspace?.root.path,
|
|
@@ -214,6 +304,7 @@ export class PackageFilesResolver {
|
|
|
214
304
|
sourceFile: tsconfigJson.jsonFile.sourceFile,
|
|
215
305
|
configFile: tsconfigJson,
|
|
216
306
|
});
|
|
307
|
+
pushExtendedConfigs(filePath, tsconfigJson);
|
|
217
308
|
}
|
|
218
309
|
if (jsconfigJson) {
|
|
219
310
|
debug('Found workspace root jsconfig.json file %s', jsconfigJson.meta.filePath);
|
|
@@ -223,6 +314,7 @@ export class PackageFilesResolver {
|
|
|
223
314
|
sourceFile: jsconfigJson.jsonFile.sourceFile,
|
|
224
315
|
configFile: jsconfigJson,
|
|
225
316
|
});
|
|
317
|
+
pushExtendedConfigs(filePath, jsconfigJson);
|
|
226
318
|
}
|
|
227
319
|
if (this.workspace.lockfile.isOk()) {
|
|
228
320
|
const lockfile = await this.cache.exactSourceFile(this.workspace.lockfile.ok());
|
|
@@ -275,6 +367,7 @@ export class PackageFilesResolver {
|
|
|
275
367
|
sourceFile: tsconfigJson.jsonFile.sourceFile,
|
|
276
368
|
configFile: tsconfigJson,
|
|
277
369
|
});
|
|
370
|
+
pushExtendedConfigs(filePath, tsconfigJson);
|
|
278
371
|
}
|
|
279
372
|
if (jsconfigJson) {
|
|
280
373
|
debug('Found nearest jsconfig.json file %s', jsconfigJson.meta.filePath);
|
|
@@ -284,6 +377,7 @@ export class PackageFilesResolver {
|
|
|
284
377
|
sourceFile: jsconfigJson.jsonFile.sourceFile,
|
|
285
378
|
configFile: jsconfigJson,
|
|
286
379
|
});
|
|
380
|
+
pushExtendedConfigs(filePath, jsconfigJson);
|
|
287
381
|
}
|
|
288
382
|
}
|
|
289
383
|
const usedNeighbors = new Set();
|
|
@@ -362,6 +456,7 @@ export class PackageFilesResolver {
|
|
|
362
456
|
sourceFile: configJson.jsonFile.sourceFile,
|
|
363
457
|
configFile: configJson,
|
|
364
458
|
});
|
|
459
|
+
pushExtendedConfigs(importPath, configJson);
|
|
365
460
|
found = true;
|
|
366
461
|
}
|
|
367
462
|
if (found) {
|
|
@@ -397,6 +492,7 @@ export class PackageFilesResolver {
|
|
|
397
492
|
sourceFile: configJson.jsonFile.sourceFile,
|
|
398
493
|
configFile: configJson,
|
|
399
494
|
});
|
|
495
|
+
pushExtendedConfigs(importPath, configJson);
|
|
400
496
|
found = true;
|
|
401
497
|
}
|
|
402
498
|
if (found) {
|