checkly 5.6.0 → 6.0.0-prerelease-541d8e1
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/baseCommand.d.ts +1 -1
- package/dist/commands/baseCommand.js +3 -3
- package/dist/commands/baseCommand.js.map +1 -1
- package/dist/commands/deploy.js +37 -18
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/import/plan.js +54 -27
- package/dist/commands/import/plan.js.map +1 -1
- package/dist/commands/test.js +84 -53
- package/dist/commands/test.js.map +1 -1
- package/dist/commands/trigger.d.ts +0 -1
- package/dist/commands/trigger.js +4 -6
- package/dist/commands/trigger.js.map +1 -1
- package/dist/constructs/api-check-bundle.d.ts +57 -0
- package/dist/constructs/api-check-bundle.js +34 -0
- package/dist/constructs/api-check-bundle.js.map +1 -0
- package/dist/constructs/api-check.d.ts +14 -20
- package/dist/constructs/api-check.js +86 -83
- package/dist/constructs/api-check.js.map +1 -1
- package/dist/constructs/browser-check-bundle.d.ts +58 -0
- package/dist/constructs/browser-check-bundle.js +31 -0
- package/dist/constructs/browser-check-bundle.js.map +1 -0
- package/dist/constructs/browser-check.d.ts +10 -22
- package/dist/constructs/browser-check.js +54 -67
- package/dist/constructs/browser-check.js.map +1 -1
- package/dist/constructs/check-group-codegen.d.ts +6 -5
- package/dist/constructs/check-group-codegen.js +14 -7
- package/dist/constructs/check-group-codegen.js.map +1 -1
- package/dist/constructs/check-group-ref.d.ts +14 -0
- package/dist/constructs/check-group-ref.js +37 -0
- package/dist/constructs/check-group-ref.js.map +1 -0
- package/dist/constructs/check-group-v1.d.ts +294 -0
- package/dist/constructs/check-group-v1.js +271 -0
- package/dist/constructs/check-group-v1.js.map +1 -0
- package/dist/constructs/check-group-v2.d.ts +120 -0
- package/dist/constructs/check-group-v2.js +87 -0
- package/dist/constructs/check-group-v2.js.map +1 -0
- package/dist/constructs/check-group.d.ts +4 -175
- package/dist/constructs/check-group.js +8 -246
- package/dist/constructs/check-group.js.map +1 -1
- package/dist/constructs/check.d.ts +2 -2
- package/dist/constructs/construct-diagnostics.d.ts +33 -0
- package/dist/constructs/construct-diagnostics.js +101 -0
- package/dist/constructs/construct-diagnostics.js.map +1 -0
- package/dist/constructs/construct.d.ts +35 -1
- package/dist/constructs/construct.js +48 -1
- package/dist/constructs/construct.js.map +1 -1
- package/dist/constructs/dashboard-bundle.d.ts +11 -0
- package/dist/constructs/dashboard-bundle.js +19 -0
- package/dist/constructs/dashboard-bundle.js.map +1 -0
- package/dist/constructs/dashboard.d.ts +26 -22
- package/dist/constructs/dashboard.js +39 -46
- package/dist/constructs/dashboard.js.map +1 -1
- package/dist/constructs/diagnostics.d.ts +36 -0
- package/dist/constructs/diagnostics.js +69 -0
- package/dist/constructs/diagnostics.js.map +1 -0
- package/dist/constructs/index.d.ts +1 -0
- package/dist/constructs/index.js +1 -0
- package/dist/constructs/index.js.map +1 -1
- package/dist/constructs/multi-step-check-bundle.d.ts +46 -0
- package/dist/constructs/multi-step-check-bundle.js +25 -0
- package/dist/constructs/multi-step-check-bundle.js.map +1 -0
- package/dist/constructs/multi-step-check.d.ts +9 -11
- package/dist/constructs/multi-step-check.js +50 -65
- package/dist/constructs/multi-step-check.js.map +1 -1
- package/dist/constructs/playwright-check-bundle.d.ts +49 -0
- package/dist/constructs/playwright-check-bundle.js +28 -0
- package/dist/constructs/playwright-check-bundle.js.map +1 -0
- package/dist/constructs/playwright-check.d.ts +9 -15
- package/dist/constructs/playwright-check.js +37 -33
- package/dist/constructs/playwright-check.js.map +1 -1
- package/dist/constructs/private-location.d.ts +2 -0
- package/dist/constructs/private-location.js +7 -5
- package/dist/constructs/private-location.js.map +1 -1
- package/dist/constructs/project-bundle.d.ts +30 -0
- package/dist/constructs/project-bundle.js +44 -0
- package/dist/constructs/project-bundle.js.map +1 -0
- package/dist/constructs/project.d.ts +41 -18
- package/dist/constructs/project.js +72 -31
- package/dist/constructs/project.js.map +1 -1
- package/dist/reporters/util.d.ts +0 -1
- package/dist/reporters/util.js +1 -5
- package/dist/reporters/util.js.map +1 -1
- package/dist/rest/projects.d.ts +2 -0
- package/dist/rest/projects.js.map +1 -1
- package/dist/rest/test-sessions.d.ts +2 -1
- package/dist/rest/test-sessions.js.map +1 -1
- package/dist/services/check-parser/package-files/json-source-file.js +2 -1
- package/dist/services/check-parser/package-files/json-source-file.js.map +1 -1
- package/dist/services/check-parser/package-files/loader.d.ts +2 -2
- package/dist/services/check-parser/package-files/loader.js +2 -2
- package/dist/services/check-parser/package-files/loader.js.map +1 -1
- package/dist/services/check-parser/package-files/resolver.d.ts +8 -8
- package/dist/services/check-parser/package-files/resolver.js +34 -32
- package/dist/services/check-parser/package-files/resolver.js.map +1 -1
- package/dist/services/check-parser/package-files/source-file.d.ts +1 -1
- package/dist/services/check-parser/package-files/source-file.js +5 -4
- package/dist/services/check-parser/package-files/source-file.js.map +1 -1
- package/dist/services/check-parser/parser.d.ts +3 -3
- package/dist/services/check-parser/parser.js +22 -23
- package/dist/services/check-parser/parser.js.map +1 -1
- package/dist/services/checkly-config-codegen.js +0 -3
- package/dist/services/checkly-config-codegen.js.map +1 -1
- package/dist/services/checkly-config-loader.d.ts +0 -1
- package/dist/services/checkly-config-loader.js.map +1 -1
- package/dist/services/project-parser.d.ts +4 -2
- package/dist/services/project-parser.js +109 -67
- package/dist/services/project-parser.js.map +1 -1
- package/dist/services/test-runner.d.ts +6 -4
- package/dist/services/test-runner.js +33 -22
- package/dist/services/test-runner.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/oclif.manifest.json +3 -3
- package/package.json +1 -1
|
@@ -22,18 +22,26 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
25
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
29
|
exports.Session = exports.Project = void 0;
|
|
30
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
27
31
|
const api = __importStar(require("../rest/api"));
|
|
28
32
|
const parser_1 = require("../services/check-parser/parser");
|
|
29
33
|
const construct_1 = require("./construct");
|
|
30
34
|
const validator_error_1 = require("./validator-error");
|
|
31
35
|
const _1 = require("./");
|
|
32
36
|
const loader_1 = require("../loader");
|
|
37
|
+
const construct_diagnostics_1 = require("./construct-diagnostics");
|
|
38
|
+
const project_bundle_1 = require("./project-bundle");
|
|
39
|
+
const util_1 = require("../services/util");
|
|
33
40
|
class Project extends construct_1.Construct {
|
|
34
41
|
name;
|
|
35
42
|
repoUrl;
|
|
36
43
|
logicalId;
|
|
44
|
+
testOnlyAllowed = false;
|
|
37
45
|
data = {
|
|
38
46
|
check: {},
|
|
39
47
|
'check-group': {},
|
|
@@ -56,14 +64,27 @@ class Project extends construct_1.Construct {
|
|
|
56
64
|
*/
|
|
57
65
|
constructor(logicalId, props) {
|
|
58
66
|
super(Project.__checklyType, logicalId);
|
|
59
|
-
if (!props.name) {
|
|
60
|
-
// TODO: Can we collect a list of validation errors and return them all at once? This might be better UX.
|
|
61
|
-
throw new validator_error_1.ValidationError('Please give your project a name in the "name" property.');
|
|
62
|
-
}
|
|
63
67
|
this.name = props.name;
|
|
64
68
|
this.repoUrl = props.repoUrl;
|
|
65
69
|
this.logicalId = logicalId;
|
|
66
70
|
}
|
|
71
|
+
async validate(diagnostics) {
|
|
72
|
+
if (!this.name) {
|
|
73
|
+
diagnostics.add(new construct_diagnostics_1.InvalidPropertyValueDiagnostic('name', new Error(`Value must not be empty.`)));
|
|
74
|
+
}
|
|
75
|
+
const data = this.data;
|
|
76
|
+
const constructDiagnostics = await Promise.all(Object.entries(data).flatMap(([, records]) => {
|
|
77
|
+
return Object.values(records).map(async (construct) => {
|
|
78
|
+
const diagnostics = new construct_diagnostics_1.ConstructDiagnostics(construct);
|
|
79
|
+
await construct.validate(diagnostics);
|
|
80
|
+
return diagnostics;
|
|
81
|
+
});
|
|
82
|
+
}));
|
|
83
|
+
diagnostics.extend(...constructDiagnostics);
|
|
84
|
+
}
|
|
85
|
+
allowTestOnly(enabled) {
|
|
86
|
+
this.testOnlyAllowed = enabled;
|
|
87
|
+
}
|
|
67
88
|
addResource(type, logicalId, resource) {
|
|
68
89
|
const existingResource = this.data[type][logicalId];
|
|
69
90
|
if (existingResource) {
|
|
@@ -77,7 +98,33 @@ class Project extends construct_1.Construct {
|
|
|
77
98
|
}
|
|
78
99
|
this.data[type][logicalId] = resource;
|
|
79
100
|
}
|
|
80
|
-
|
|
101
|
+
async bundle() {
|
|
102
|
+
const data = {
|
|
103
|
+
...this.data,
|
|
104
|
+
// Filter out testOnly checks before bundling.
|
|
105
|
+
check: Object.fromEntries(Object.entries(this.data.check)
|
|
106
|
+
.filter(([, check]) => !check.testOnly || this.testOnlyAllowed)
|
|
107
|
+
.filter(([, check]) => Session.checkFilter?.(check) ?? true)),
|
|
108
|
+
};
|
|
109
|
+
const constructBundles = await Promise.all(Object.entries(data).flatMap(([, records]) => {
|
|
110
|
+
return Object.entries(records).map(async ([, construct]) => {
|
|
111
|
+
const bundle = await construct.bundle();
|
|
112
|
+
return {
|
|
113
|
+
construct,
|
|
114
|
+
bundle,
|
|
115
|
+
};
|
|
116
|
+
});
|
|
117
|
+
}));
|
|
118
|
+
const dataBundle = Object.fromEntries(Object.entries(data).map(([type]) => {
|
|
119
|
+
return [type, {}];
|
|
120
|
+
}));
|
|
121
|
+
for (const constructBundle of constructBundles) {
|
|
122
|
+
const { construct: { type, logicalId } } = constructBundle;
|
|
123
|
+
dataBundle[type][logicalId] = constructBundle;
|
|
124
|
+
}
|
|
125
|
+
return new project_bundle_1.ProjectBundle(this, dataBundle);
|
|
126
|
+
}
|
|
127
|
+
synthesize() {
|
|
81
128
|
const project = {
|
|
82
129
|
logicalId: this.logicalId,
|
|
83
130
|
name: this.name,
|
|
@@ -85,21 +132,7 @@ class Project extends construct_1.Construct {
|
|
|
85
132
|
};
|
|
86
133
|
return {
|
|
87
134
|
project,
|
|
88
|
-
|
|
89
|
-
// Create status pages before checks because checks may refer to
|
|
90
|
-
// status page services via incident triggers.
|
|
91
|
-
...this.synthesizeRecord(this.data['status-page-service']),
|
|
92
|
-
...this.synthesizeRecord(this.data['status-page']),
|
|
93
|
-
...this.synthesizeRecord(this.data.check, addTestOnly),
|
|
94
|
-
...this.synthesizeRecord(this.data['check-group']),
|
|
95
|
-
...this.synthesizeRecord(this.data['alert-channel']),
|
|
96
|
-
...this.synthesizeRecord(this.data['alert-channel-subscription']),
|
|
97
|
-
...this.synthesizeRecord(this.data['maintenance-window']),
|
|
98
|
-
...this.synthesizeRecord(this.data['private-location']),
|
|
99
|
-
...this.synthesizeRecord(this.data['private-location-check-assignment']),
|
|
100
|
-
...this.synthesizeRecord(this.data['private-location-group-assignment']),
|
|
101
|
-
...this.synthesizeRecord(this.data.dashboard),
|
|
102
|
-
],
|
|
135
|
+
sharedFiles: Session.sharedFiles,
|
|
103
136
|
};
|
|
104
137
|
}
|
|
105
138
|
getTestOnlyConstructs() {
|
|
@@ -115,17 +148,6 @@ class Project extends construct_1.Construct {
|
|
|
115
148
|
.filter((construct) => construct instanceof _1.HeartbeatCheck)
|
|
116
149
|
.map((construct) => construct.logicalId);
|
|
117
150
|
}
|
|
118
|
-
synthesizeRecord(record, addTestOnly = true) {
|
|
119
|
-
return Object.entries(record)
|
|
120
|
-
.filter(([, construct]) => construct instanceof _1.Check ? !construct.testOnly || addTestOnly : true)
|
|
121
|
-
.map(([key, construct]) => ({
|
|
122
|
-
logicalId: key,
|
|
123
|
-
type: construct.type,
|
|
124
|
-
physicalId: construct.physicalId,
|
|
125
|
-
member: construct.member,
|
|
126
|
-
payload: construct.synthesize(),
|
|
127
|
-
}));
|
|
128
|
-
}
|
|
129
151
|
}
|
|
130
152
|
exports.Project = Project;
|
|
131
153
|
class Session {
|
|
@@ -133,6 +155,7 @@ class Session {
|
|
|
133
155
|
static project;
|
|
134
156
|
static basePath;
|
|
135
157
|
static checkDefaults;
|
|
158
|
+
static checkFilter;
|
|
136
159
|
static browserCheckDefaults;
|
|
137
160
|
static multiStepCheckDefaults;
|
|
138
161
|
static checkFilePath;
|
|
@@ -236,6 +259,24 @@ class Session {
|
|
|
236
259
|
Session.parsers.set(runtime.name, parser);
|
|
237
260
|
return parser;
|
|
238
261
|
}
|
|
262
|
+
static relativePosixPath(filePath) {
|
|
263
|
+
return (0, util_1.pathToPosix)(node_path_1.default.relative(Session.basePath, filePath));
|
|
264
|
+
}
|
|
265
|
+
static sharedFileRefs = new Map();
|
|
266
|
+
static sharedFiles = [];
|
|
267
|
+
static registerSharedFile(file) {
|
|
268
|
+
const ref = Session.sharedFileRefs.get(file.path);
|
|
269
|
+
if (ref !== undefined) {
|
|
270
|
+
return ref;
|
|
271
|
+
}
|
|
272
|
+
const newRef = Session.sharedFiles.push(file) - 1;
|
|
273
|
+
Session.sharedFileRefs.set(file.path, newRef);
|
|
274
|
+
return newRef;
|
|
275
|
+
}
|
|
276
|
+
static resetSharedFiles() {
|
|
277
|
+
Session.sharedFileRefs.clear();
|
|
278
|
+
Session.sharedFiles.splice(0);
|
|
279
|
+
}
|
|
239
280
|
}
|
|
240
281
|
exports.Session = Session;
|
|
241
282
|
//# sourceMappingURL=project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/constructs/project.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/constructs/project.ts"],"names":[],"mappings":"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"}
|
package/dist/reporters/util.d.ts
CHANGED
|
@@ -17,4 +17,3 @@ export declare function print(text: string): void;
|
|
|
17
17
|
export declare function printLn(text: string, afterLnCount?: number, beforeLnCount?: number): void;
|
|
18
18
|
export declare function getTestSessionUrl(testSessionId: string): string;
|
|
19
19
|
export declare function getTraceUrl(traceUrl: string): string;
|
|
20
|
-
export declare function printDeprecationWarning(text: string): void;
|
package/dist/reporters/util.js
CHANGED
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.
|
|
29
|
+
exports.getTraceUrl = exports.getTestSessionUrl = exports.printLn = exports.print = exports.resultToCheckStatus = exports.formatCheckResult = exports.formatCheckTitle = exports.formatDuration = exports.CheckStatus = void 0;
|
|
30
30
|
const chalk_1 = __importDefault(require("chalk"));
|
|
31
31
|
const indent_string_1 = __importDefault(require("indent-string"));
|
|
32
32
|
const luxon_1 = require("luxon");
|
|
@@ -420,8 +420,4 @@ function getTraceUrl(traceUrl) {
|
|
|
420
420
|
return `https://trace.playwright.dev/?trace=${encodeURIComponent(traceUrl)}`;
|
|
421
421
|
}
|
|
422
422
|
exports.getTraceUrl = getTraceUrl;
|
|
423
|
-
function printDeprecationWarning(text) {
|
|
424
|
-
process.stdout.write(chalk_1.default.yellow(`\n${logSymbols.warning} Deprecation warning: ${text} \n`));
|
|
425
|
-
}
|
|
426
|
-
exports.printDeprecationWarning = printDeprecationWarning;
|
|
427
423
|
//# sourceMappingURL=util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/reporters/util.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/reporters/util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,kEAAwC;AACxC,iCAAgC;AAChC,wDAAyC;AAGzC,qCAAyC;AAEzC,gDAAgD;AAChD,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,yDAAU,CAAA;IACV,mDAAO,CAAA;IACP,mDAAO,CAAA;IACP,iDAAM,CAAA;IACN,yDAAU,CAAA;IACV,qDAAQ,CAAA;AACV,CAAC,EAPW,WAAW,2BAAX,WAAW,QAOtB;AAED,SAAgB,cAAc,CAAE,EAAU;IACxC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;QACd,OAAO,GAAG,EAAE,IAAI,CAAA;IAClB,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,CAAA;IACnC,CAAC;AACH,CAAC;AAND,wCAMC;AAED,SAAgB,gBAAgB,CAC9B,MAAmB,EACnB,KAAU,EACV,OAAsE,EAAE;IAExE,IAAI,QAAQ,CAAA;IACZ,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACtG,MAAM,UAAU,GAAG,gBAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;aACjD,IAAI,CAAC,gBAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;aACvC,QAAQ,EAAE,CAAA;QACb,QAAQ,GAAG,cAAc,CAAC,UAAU,CAAC,CAAA;IACvC,CAAC;IAED,IAAI,YAAY,CAAA;IAChB,IAAI,MAAM,CAAA;IACV,IAAI,MAAM,KAAK,WAAW,CAAC,UAAU,EAAE,CAAC;QACtC,YAAY,GAAG,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACnD,MAAM,GAAG,eAAK,CAAC,IAAI,CAAA;IACrB,CAAC;SAAM,IAAI,MAAM,KAAK,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,YAAY,GAAG,UAAU,CAAC,KAAK,CAAA;QAC/B,MAAM,GAAG,eAAK,CAAC,IAAI,CAAC,GAAG,CAAA;IACzB,CAAC;SAAM,IAAI,MAAM,KAAK,WAAW,CAAC,QAAQ,EAAE,CAAC;QAC3C,YAAY,GAAG,UAAU,CAAC,OAAO,CAAA;QACjC,MAAM,GAAG,eAAK,CAAC,IAAI,CAAC,MAAM,CAAA;IAC5B,CAAC;SAAM,IAAI,MAAM,KAAK,WAAW,CAAC,UAAU,EAAE,CAAC;QAC7C,YAAY,GAAG,GAAG,CAAA;QAClB,MAAM,GAAG,eAAK,CAAC,IAAI,CAAC,GAAG,CAAA;IACzB,CAAC;SAAM,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QAC1C,YAAY,GAAG,GAAG,CAAA;QAClB,MAAM,GAAG,eAAK,CAAC,IAAI,CAAA;IACrB,CAAC;SAAM,CAAC;QACN,YAAY,GAAG,GAAG,CAAA;QAClB,MAAM,GAAG,eAAK,CAAC,IAAI,CAAC,GAAG,CAAA;IACzB,CAAC;IAED,OAAO;QACL,MAAM,CAAC,YAAY,CAAC;QACpB,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;QACpE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;QAClB,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,SAAS;KACvC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC7B,CAAC;AAzCD,4CAyCC;AAED,SAAgB,iBAAiB,CAAE,WAAgB;IACjD,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,IAAI,WAAW,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;QACpC,sEAAsE;QACtE,IAAI,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC;gBACV,kBAAkB,CAAC,eAAe,CAAC;gBACnC,WAAW,CAAC,YAAY,CAAC,YAAY;aACtC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,WAAW,CAAC,YAAY,EAAE,OAAO,EAAE,CAAC;gBACtC,MAAM,CAAC,IAAI,CAAC;oBACV,kBAAkB,CAAC,cAAc,CAAC;oBAClC,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC;iBACpD,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,WAAW,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,CAAC;oBACV,kBAAkB,CAAC,eAAe,CAAC;oBACnC,kBAAkB,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC;iBACtD,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,WAAW,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBACjD,MAAM,CAAC,IAAI,CAAC;oBACV,kBAAkB,CAAC,YAAY,CAAC;oBAChC,gBAAgB,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC;iBACtD,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;gBACnC,MAAM,CAAC,IAAI,CAAC;oBACV,kBAAkB,CAAC,mBAAmB,CAAC;oBACvC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC;iBACnC,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACtC,MAAM,CAAC,IAAI,CAAC;oBACV,kBAAkB,CAAC,sBAAsB,CAAC;oBAC1C,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC;iBACtC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAAC,IAAI,WAAW,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;QACtC,IAAI,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC;gBACV,kBAAkB,CAAC,eAAe,CAAC;gBACnC,WAAW,CAAC,YAAY,CAAC,YAAY;aACtC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,WAAW,CAAC,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;gBAC9C,MAAM,CAAC,IAAI,CAAC;oBACV,kBAAkB,CAAC,kBAAkB,CAAC;oBACtC,qBAAqB,CAAC,WAAW,CAAC,YAAY,EAAE,QAAQ,EAAE,KAAK,CAAC;iBACjE,CAAC,CAAA;YACJ,CAAC;YACD,IAAI,WAAW,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBACjD,MAAM,CAAC,IAAI,CAAC;oBACV,kBAAkB,CAAC,YAAY,CAAC;oBAChC,gBAAgB,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC;iBACtD,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC;YACV,kBAAkB,CAAC,MAAM,CAAC;YAC1B,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC;SAC7B,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC;YACV,kBAAkB,CAAC,iBAAiB,CAAC;YACrC,cAAc,CAAC,WAAW,CAAC,QAAQ,CAAC;SACrC,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,WAAW,CAAC,aAAa,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC;YACV,kBAAkB,CAAC,kBAAkB,CAAC;YACtC,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC;SAC1C,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AACxE,CAAC;AAjFD,8CAiFC;AAED,MAAM,gBAAgB,GAAQ;IAC5B,WAAW,EAAE,aAAa;IAC1B,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,WAAW;IACtB,aAAa,EAAE,eAAe;IAC9B,aAAa,EAAE,eAAe;CAC/B,CAAA;AAED,MAAM,oBAAoB,GAAQ;IAChC,MAAM,EAAE,QAAQ;IAChB,UAAU,EAAE,gBAAgB;IAC5B,OAAO,EAAE,SAAS;IAClB,WAAW,EAAE,mBAAmB;IAChC,SAAS,EAAE,WAAW;IACtB,aAAa,EAAE,qBAAqB;IACpC,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,cAAc;IACzB,YAAY,EAAE,iBAAiB;IAC/B,SAAS,EAAE,cAAc;IACzB,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,kBAAkB;IAChC,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,aAAa;CACxB,CAAA;AAED,SAAS,gBAAgB,CAAE,UAA2D;IACpF,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE;QACvF,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAA;QAC/B,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAA;QACtD,MAAM,eAAe,GAAG,oBAAoB,CAAC,UAAU,CAAC,IAAI,UAAU,CAAA;QACtE,IAAI,YAAY,CAAA;QAChB,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE;gBAChF,KAAK,EAAE,GAAG;gBACV,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,eAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC;aAC3C,CAAC,CAAA;YAEF,IAAI,oBAAoB,IAAI,CAAC,EAAE,CAAC;gBAC9B,YAAY,GAAG,aAAa,eAAe,GAAG,CAAA;YAChD,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,cAAc,IAAA,uBAAY,EAAC,eAAe,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,CAAA;YAClF,CAAC;QACH,CAAC;QACD,MAAM,OAAO,GAAG;YACd,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO;YACvD,WAAW;YACX,QAAQ,CAAC,CAAC,CAAC,aAAa,QAAQ,GAAG,CAAC,CAAC,CAAC,SAAS;YAC/C,KAAK,CAAC,CAAC,CAAC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS;YACtC,eAAe;YACf,WAAW,MAAM,IAAI;YACrB,YAAY;SACb,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC3B,OAAO,eAAe,CAAC,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACpE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACf,CAAC;AAED,SAAS,iBAAiB,CAAE,OAAY;IACtC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE;QACpD,KAAK,EAAE,EAAE,GAAG,GAAG;QACf,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,eAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC;KAC3C,CAAC,CAAA;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5G,OAAO;QACL,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE;QAClC,UAAU;QACV,IAAA,uBAAY,EAAC,aAAa,EAAE,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QAClC,IAAA,uBAAY,EAAC,UAAU,EAAE,CAAC,CAAC;KAC5B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC9B,CAAC;AAED,SAAS,kBAAkB,CAAE,QAAa;IACxC,4FAA4F;IAC5F,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE;QACrD,KAAK,EAAE,EAAE,GAAG,GAAG;QACf,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,eAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC;KAC3C,CAAC,CAAA;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC7G,OAAO;QACL,gBAAgB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE;QACxD,UAAU;QACV,IAAA,uBAAY,EAAC,aAAa,EAAE,CAAC,CAAC;QAC9B,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QACnC,IAAA,uBAAY,EAAC,UAAU,EAAE,CAAC,CAAC;KAC5B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC9B,CAAC;AAuBD,SAAS,uBAAuB,CAAE,KAAU;IAC1C,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW;QAC/B,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QACjC,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAA;AACtC,CAAC;AAoBD,SAAS,wBAAwB,CAAE,KAAU;IAC3C,OAAO,KAAK,CAAC,IAAI,KAAK,cAAc;QAClC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QACjC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QACjC,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;QAC9B,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,QAAQ,CAAA;AAC1C,CAAC;AAeD,SAAS,oBAAoB,CAAE,KAAU;IACvC,OAAO,KAAK,CAAC,IAAI,KAAK,gBAAgB;QACpC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QACjC,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAA;AAClC,CAAC;AAWD,SAAS,uBAAuB,CAAE,KAAU;IAC1C,OAAO,KAAK,CAAC,IAAI,KAAK,wBAAwB,CAAA;AAChD,CAAC;AAED,SAAS,qBAAqB,CAAE,KAAU;IACxC,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG;YACd,UAAU,CAAC,KAAK;YAChB,mBAAmB,KAAK,CAAC,QAAQ,UAAU;YAC3C,aAAa,KAAK,CAAC,OAAO,GAAG;SAC9B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,OAAO,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAED,IAAI,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG;YACd,UAAU,CAAC,KAAK;YAChB,kBAAkB,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,eAAe;YAC5D,aAAa,KAAK,CAAC,OAAO,YAAY,KAAK,CAAC,KAAK,IAAI,QAAQ,GAAG;SACjE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,OAAO,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAED,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,OAAO,GAAG;YACd,UAAU,CAAC,KAAK;YAChB,kBAAkB,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,IAAI,mDAAmD;SACjG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,OAAO,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAED,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,OAAO,GAAG;YACd,UAAU,CAAC,KAAK;YAChB,kEAAkE;SACnE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,OAAO,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAED,gDAAgD;IAChD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,GAAG,KAAK,CAAA;QAChC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;QAC3C,MAAM,OAAO,GAAG;YACd,UAAU,CAAC,KAAK;YAChB,GAAG,IAAI,cAAc,aAAa,GAAG;SACtC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACX,OAAO,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC3B,CAAC;IAED,oEAAoE;IACpE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAC3C,MAAM,OAAO,GAAG;QACd,UAAU,CAAC,KAAK;QAChB,mBAAmB,aAAa,GAAG;KACpC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACX,OAAO,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,UAAU,CAAE,IAAyD;IAC5E,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;QAC3C,MAAM,SAAS,GAAG,gBAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,gBAAQ,CAAC,oBAAoB,CAAC,CAAA;QACzF,IAAI,MAAM,GAAG,eAAK,CAAC,GAAG,CAAA;QACtB,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YACrB,MAAM,GAAG,eAAK,CAAC,GAAG,CAAC,MAAM,CAAA;QAC3B,CAAC;aAAM,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;YAC7B,MAAM,GAAG,eAAK,CAAC,GAAG,CAAC,GAAG,CAAA;QACxB,CAAC;QACD,MAAM,CAAC,SAAS,EAAE,GAAG,cAAc,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACtD,OAAO;YACL,GAAG,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3D,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC9C,CAAA;IACH,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACf,CAAC;AAED,SAAS,cAAc,CAAE,GAAmB;IAC1C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAA;IACZ,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,CAAC,OAAO,CAAA;IACpB,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAE,KAAa;IACxC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAA;IAChE,wFAAwF;IACxF,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC5C,MAAM,iBAAiB,GAAG,CAAC,CAAA,CAAC,4CAA4C;IACxE,2CAA2C;IAC3C,kFAAkF;IAClF,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,gBAAgB,GAAG,KAAK,CAAC,MAAM,GAAG,iBAAiB,CAAC,CAAA;IAC3F,OAAO,KAAK,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE,CAAA;AAClE,CAAC;AAED,SAAS,QAAQ,CAAE,GAAQ,EAAE,IAAyD;IACpF,IAAI,SAAS,GAAG,KAAK,CAAA;IACrB,IAAI,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;IAC1B,IAAI,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1C,SAAS,GAAG,IAAI,CAAA;QAChB,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IAC1C,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAChC,IAAI,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC5C,SAAS,GAAG,IAAI,CAAA;QAChB,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC;IACD,OAAO;QACL,SAAS;QACT,MAAM,EAAE,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;QAChE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM;KACtE,CAAA;AACH,CAAC;AAED,SAAS,QAAQ,CAAE,GAAQ;IACzB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACrC,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAA;IACvB,CAAC;AACH,CAAC;AAED,SAAgB,mBAAmB,CAAE,WAAgB;IACnD,OAAO,WAAW,CAAC,WAAW;QAC5B,CAAC,CAAC,WAAW,CAAC,MAAM;QACpB,CAAC,CAAC,WAAW,CAAC,UAAU;YACtB,CAAC,CAAC,WAAW,CAAC,QAAQ;YACtB,CAAC,CAAC,WAAW,CAAC,UAAU,CAAA;AAC9B,CAAC;AAND,kDAMC;AAED,SAAgB,KAAK,CAAE,IAAY;IACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AAC5B,CAAC;AAFD,sBAEC;AAED,SAAgB,OAAO,CAAE,IAAY,EAAE,YAAY,GAAG,CAAC,EAAE,aAAa,GAAG,CAAC;IACxE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;AAC1F,CAAC;AAFD,0BAEC;AAED,SAAgB,iBAAiB,CAAE,aAAqB;IACtD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,iBAAW,GAAE,CAAA;IACjC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,aAAa,EAAE,CAAA;AAC1E,CAAC;AAHD,8CAGC;AAED,SAAgB,WAAW,CAAE,QAAgB;IAC3C,OAAO,uCAAuC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAA;AAC9E,CAAC;AAFD,kCAEC"}
|
package/dist/rest/projects.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type AxiosInstance } from 'axios';
|
|
2
2
|
import type { GitInformation } from '../services/util';
|
|
3
|
+
import { SharedFile } from '../constructs';
|
|
3
4
|
export interface Project {
|
|
4
5
|
name: string;
|
|
5
6
|
logicalId: string;
|
|
@@ -50,6 +51,7 @@ export interface AuxiliaryResourceSync {
|
|
|
50
51
|
}
|
|
51
52
|
export interface ProjectSync {
|
|
52
53
|
project: Project;
|
|
54
|
+
sharedFiles?: SharedFile[];
|
|
53
55
|
resources: Array<ResourceSync>;
|
|
54
56
|
repoInfo: GitInformation | null;
|
|
55
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projects.js","sourceRoot":"","sources":["../../src/rest/projects.ts"],"names":[],"mappings":";;;AAAA,iCAAwD;AAExD,iCAA4C;
|
|
1
|
+
{"version":3,"file":"projects.js","sourceRoot":"","sources":["../../src/rest/projects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import type { AxiosInstance } from 'axios';
|
|
2
2
|
import { GitInformation } from '../services/util';
|
|
3
|
-
import { RetryStrategy } from '../constructs';
|
|
3
|
+
import { RetryStrategy, SharedFile } from '../constructs';
|
|
4
4
|
type RunTestSessionRequest = {
|
|
5
5
|
name: string;
|
|
6
6
|
checkRunJobs: any[];
|
|
7
7
|
project: {
|
|
8
8
|
logicalId: string;
|
|
9
9
|
};
|
|
10
|
+
sharedFiles?: SharedFile[];
|
|
10
11
|
runLocation: string | {
|
|
11
12
|
type: 'PUBLIC';
|
|
12
13
|
region: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-sessions.js","sourceRoot":"","sources":["../../src/rest/test-sessions.ts"],"names":[],"mappings":";;AAGA,iCAA4C;
|
|
1
|
+
{"version":3,"file":"test-sessions.js","sourceRoot":"","sources":["../../src/rest/test-sessions.ts"],"names":[],"mappings":";;AAGA,iCAA4C;AAgC5C,MAAM,YAAY;IAChB,GAAG,CAAe;IAClB,YAAa,GAAkB;QAC7B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;IAChB,CAAC;IAED,GAAG,CAAE,OAA8B;QACjC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,EAAE;YACvD,gBAAgB,EAAE,0BAAmB;SACtC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,CAAE,OAAkC;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAA;IAC9D,CAAC;IAED,YAAY,CAAE,EAAU;QACtB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAmB,uBAAuB,EAAE,OAAO,CAAC,CAAA;IACzE,CAAC;IAED,mBAAmB,CAAE,aAAqB,EAAE,YAAoB;QAC9D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAwB,uBAAuB,aAAa,YAAY,YAAY,QAAQ,CAAC,CAAA;IAClH,CAAC;CACF;AAED,kBAAe,YAAY,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-source-file.js","sourceRoot":"","sources":["../../../../src/services/check-parser/package-files/json-source-file.ts"],"names":[],"mappings":";;;AAEA,MAAa,cAAc;IACzB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAA;IACL,EAAE,GAAG,EAAE,cAAc,CAAC,GAAG,CAAA;IAElC,UAAU,CAAY;IACtB,IAAI,CAAQ;IAEZ,YAAa,UAAsB,EAAE,IAAY;QAC/C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAA;IAC7B,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAU,UAAsB;QACvD,IAAI,CAAC;YACH,MAAM,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;YAEpD,OAAO,IAAI,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAC7C,CAAC;QAAC,
|
|
1
|
+
{"version":3,"file":"json-source-file.js","sourceRoot":"","sources":["../../../../src/services/check-parser/package-files/json-source-file.ts"],"names":[],"mappings":";;;AAEA,MAAa,cAAc;IACzB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAA;IACL,EAAE,GAAG,EAAE,cAAc,CAAC,GAAG,CAAA;IAElC,UAAU,CAAY;IACtB,IAAI,CAAQ;IAEZ,YAAa,UAAsB,EAAE,IAAY;QAC/C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAA;IAC7B,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAU,UAAsB;QACvD,IAAI,CAAC;YACH,MAAM,IAAI,GAAW,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;YAEpD,OAAO,IAAI,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;QAC7C,CAAC;QAAC,MAAM,CAAC;YACP,UAAU;QACZ,CAAC;IACH,CAAC;;AAxBH,wCAyBC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
export type LoadFile<T> = (filePath: string) => T | undefined
|
|
1
|
+
export type LoadFile<T> = (filePath: string) => Promise<T | undefined>;
|
|
2
2
|
export declare class FileLoader<T> {
|
|
3
3
|
loader: LoadFile<T>;
|
|
4
4
|
cache: Map<string, T | undefined>;
|
|
5
5
|
constructor(loader: LoadFile<T>);
|
|
6
|
-
load(filePath: string): T | undefined
|
|
6
|
+
load(filePath: string): Promise<T | undefined>;
|
|
7
7
|
}
|
|
@@ -7,11 +7,11 @@ class FileLoader {
|
|
|
7
7
|
constructor(loader) {
|
|
8
8
|
this.loader = loader;
|
|
9
9
|
}
|
|
10
|
-
load(filePath) {
|
|
10
|
+
async load(filePath) {
|
|
11
11
|
if (this.cache.has(filePath)) {
|
|
12
12
|
return this.cache.get(filePath);
|
|
13
13
|
}
|
|
14
|
-
const file = this.loader(filePath);
|
|
14
|
+
const file = await this.loader(filePath);
|
|
15
15
|
this.cache.set(filePath, file);
|
|
16
16
|
return file;
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../../src/services/check-parser/package-files/loader.ts"],"names":[],"mappings":";;;AAEA,MAAa,UAAU;IACrB,MAAM,CAAa;IACnB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAA;IAExC,YAAa,MAAmB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,IAAI,CAAE,QAAgB;
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../../src/services/check-parser/package-files/loader.ts"],"names":[],"mappings":";;;AAEA,MAAa,UAAU;IACrB,MAAM,CAAa;IACnB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAA;IAExC,YAAa,MAAmB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,IAAI,CAAE,QAAgB;QAC1B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACxC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAC9B,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAhBD,gCAgBC"}
|
|
@@ -6,16 +6,16 @@ import { PathResult } from './paths';
|
|
|
6
6
|
import { LookupContext } from './lookup';
|
|
7
7
|
declare class PackageFilesCache {
|
|
8
8
|
#private;
|
|
9
|
-
sourceFile(filePath: string, context: LookupContext): SourceFile | undefined
|
|
10
|
-
packageJson(filePath: string): PackageJsonFile | undefined
|
|
11
|
-
tsconfigJson(filePath: string): TSConfigFile | undefined
|
|
12
|
-
jsconfigJson(filePath: string): JSConfigFile | undefined
|
|
9
|
+
sourceFile(filePath: string, context: LookupContext): Promise<SourceFile | undefined>;
|
|
10
|
+
packageJson(filePath: string): Promise<PackageJsonFile | undefined>;
|
|
11
|
+
tsconfigJson(filePath: string): Promise<TSConfigFile | undefined>;
|
|
12
|
+
jsconfigJson(filePath: string): Promise<JSConfigFile | undefined>;
|
|
13
13
|
}
|
|
14
14
|
declare class PackageFiles {
|
|
15
15
|
packageJson?: PackageJsonFile;
|
|
16
16
|
tsconfigJson?: TSConfigFile;
|
|
17
17
|
jsconfigJson?: JSConfigFile;
|
|
18
|
-
satisfyFromDirPath(dirPath: string, cache: PackageFilesCache): boolean
|
|
18
|
+
satisfyFromDirPath(dirPath: string, cache: PackageFilesCache): Promise<boolean>;
|
|
19
19
|
get satisfied(): boolean;
|
|
20
20
|
}
|
|
21
21
|
type TSConfigFileLocalDependency = {
|
|
@@ -61,9 +61,9 @@ export interface WalkUpOptions {
|
|
|
61
61
|
}
|
|
62
62
|
export declare class PackageFilesResolver {
|
|
63
63
|
cache: PackageFilesCache;
|
|
64
|
-
loadPackageJsonFile(filePath: string, options?: WalkUpOptions): PackageJsonFile | undefined
|
|
65
|
-
loadPackageFiles(filePath: string, options?: WalkUpOptions): PackageFiles
|
|
64
|
+
loadPackageJsonFile(filePath: string, options?: WalkUpOptions): Promise<PackageJsonFile | undefined>;
|
|
65
|
+
loadPackageFiles(filePath: string, options?: WalkUpOptions): Promise<PackageFiles>;
|
|
66
66
|
private resolveSourceFile;
|
|
67
|
-
resolveDependenciesForFilePath(filePath: string, dependencies: string[]): Dependencies
|
|
67
|
+
resolveDependenciesForFilePath(filePath: string, dependencies: string[]): Promise<Dependencies>;
|
|
68
68
|
}
|
|
69
69
|
export {};
|
|
@@ -16,8 +16,8 @@ const lookup_1 = require("./lookup");
|
|
|
16
16
|
class PackageFilesCache {
|
|
17
17
|
#sourceFileCache = new loader_1.FileLoader(source_file_1.SourceFile.loadFromFilePath);
|
|
18
18
|
#jsonFileLoader(load) {
|
|
19
|
-
return filePath => {
|
|
20
|
-
const sourceFile = this.#sourceFileCache.load(filePath);
|
|
19
|
+
return async (filePath) => {
|
|
20
|
+
const sourceFile = await this.#sourceFileCache.load(filePath);
|
|
21
21
|
if (sourceFile === undefined) {
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
@@ -31,22 +31,22 @@ class PackageFilesCache {
|
|
|
31
31
|
#packageJsonCache = new loader_1.FileLoader(this.#jsonFileLoader(package_json_file_1.PackageJsonFile.loadFromJsonSourceFile));
|
|
32
32
|
#tsconfigJsonCache = new loader_1.FileLoader(this.#jsonFileLoader(tsconfig_json_file_1.TSConfigFile.loadFromJsonSourceFile));
|
|
33
33
|
#jsconfigJsonCache = new loader_1.FileLoader(this.#jsonFileLoader(jsconfig_json_file_1.JSConfigFile.loadFromJsonSourceFile));
|
|
34
|
-
sourceFile(filePath, context) {
|
|
34
|
+
async sourceFile(filePath, context) {
|
|
35
35
|
for (const lookupPath of context.collectLookupPaths(filePath)) {
|
|
36
|
-
const sourceFile = this.#sourceFileCache.load(lookupPath);
|
|
36
|
+
const sourceFile = await this.#sourceFileCache.load(lookupPath);
|
|
37
37
|
if (sourceFile === undefined) {
|
|
38
38
|
continue;
|
|
39
39
|
}
|
|
40
40
|
return sourceFile;
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
-
packageJson(filePath) {
|
|
43
|
+
async packageJson(filePath) {
|
|
44
44
|
return this.#packageJsonCache.load(filePath);
|
|
45
45
|
}
|
|
46
|
-
tsconfigJson(filePath) {
|
|
46
|
+
async tsconfigJson(filePath) {
|
|
47
47
|
return this.#tsconfigJsonCache.load(filePath);
|
|
48
48
|
}
|
|
49
|
-
jsconfigJson(filePath) {
|
|
49
|
+
async jsconfigJson(filePath) {
|
|
50
50
|
return this.#jsconfigJsonCache.load(filePath);
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -54,15 +54,15 @@ class PackageFiles {
|
|
|
54
54
|
packageJson;
|
|
55
55
|
tsconfigJson;
|
|
56
56
|
jsconfigJson;
|
|
57
|
-
satisfyFromDirPath(dirPath, cache) {
|
|
57
|
+
async satisfyFromDirPath(dirPath, cache) {
|
|
58
58
|
if (this.packageJson === undefined) {
|
|
59
|
-
this.packageJson = cache.packageJson(package_json_file_1.PackageJsonFile.filePath(dirPath));
|
|
59
|
+
this.packageJson = await cache.packageJson(package_json_file_1.PackageJsonFile.filePath(dirPath));
|
|
60
60
|
}
|
|
61
61
|
if (this.tsconfigJson === undefined && this.jsconfigJson === undefined) {
|
|
62
|
-
this.tsconfigJson = cache.tsconfigJson(tsconfig_json_file_1.TSConfigFile.filePath(dirPath));
|
|
62
|
+
this.tsconfigJson = await cache.tsconfigJson(tsconfig_json_file_1.TSConfigFile.filePath(dirPath));
|
|
63
63
|
}
|
|
64
64
|
if (this.jsconfigJson === undefined && this.tsconfigJson === undefined) {
|
|
65
|
-
this.jsconfigJson = cache.jsconfigJson(jsconfig_json_file_1.JSConfigFile.filePath(dirPath));
|
|
65
|
+
this.jsconfigJson = await cache.jsconfigJson(jsconfig_json_file_1.JSConfigFile.filePath(dirPath));
|
|
66
66
|
}
|
|
67
67
|
return this.satisfied;
|
|
68
68
|
}
|
|
@@ -79,7 +79,7 @@ class PackageFiles {
|
|
|
79
79
|
return true;
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
function walkUp(filePath, find, options) {
|
|
82
|
+
async function walkUp(filePath, find, options) {
|
|
83
83
|
let currentPath = filePath;
|
|
84
84
|
if (options?.isDir === true) {
|
|
85
85
|
// To keep things simple, just add a dummy component.
|
|
@@ -92,7 +92,8 @@ function walkUp(filePath, find, options) {
|
|
|
92
92
|
if (prevPath === currentPath) {
|
|
93
93
|
break;
|
|
94
94
|
}
|
|
95
|
-
|
|
95
|
+
const found = await find(currentPath);
|
|
96
|
+
if (found) {
|
|
96
97
|
return true;
|
|
97
98
|
}
|
|
98
99
|
// Stop if we reach the user-specified root directory.
|
|
@@ -105,24 +106,25 @@ function walkUp(filePath, find, options) {
|
|
|
105
106
|
}
|
|
106
107
|
class PackageFilesResolver {
|
|
107
108
|
cache = new PackageFilesCache();
|
|
108
|
-
loadPackageJsonFile(filePath, options) {
|
|
109
|
+
async loadPackageJsonFile(filePath, options) {
|
|
109
110
|
let packageJson;
|
|
110
|
-
walkUp(filePath, dirPath => {
|
|
111
|
-
packageJson = this.cache.packageJson(package_json_file_1.PackageJsonFile.filePath(dirPath));
|
|
111
|
+
await walkUp(filePath, async (dirPath) => {
|
|
112
|
+
packageJson = await this.cache.packageJson(package_json_file_1.PackageJsonFile.filePath(dirPath));
|
|
112
113
|
return packageJson !== undefined;
|
|
113
114
|
}, options);
|
|
114
115
|
return packageJson;
|
|
115
116
|
}
|
|
116
|
-
loadPackageFiles(filePath, options) {
|
|
117
|
+
async loadPackageFiles(filePath, options) {
|
|
117
118
|
const files = new PackageFiles();
|
|
118
|
-
walkUp(filePath, dirPath => {
|
|
119
|
-
|
|
119
|
+
await walkUp(filePath, async (dirPath) => {
|
|
120
|
+
const found = await files.satisfyFromDirPath(dirPath, this.cache);
|
|
121
|
+
return found;
|
|
120
122
|
}, options);
|
|
121
123
|
return files;
|
|
122
124
|
}
|
|
123
|
-
resolveSourceFile(sourceFile, context) {
|
|
125
|
+
async resolveSourceFile(sourceFile, context) {
|
|
124
126
|
if (sourceFile.meta.basename === package_json_file_1.PackageJsonFile.FILENAME) {
|
|
125
|
-
const packageJson = this.cache.packageJson(sourceFile.meta.filePath);
|
|
127
|
+
const packageJson = await this.cache.packageJson(sourceFile.meta.filePath);
|
|
126
128
|
if (packageJson === undefined) {
|
|
127
129
|
// This should never happen unless the package.json is invalid or
|
|
128
130
|
// something.
|
|
@@ -132,7 +134,7 @@ class PackageFilesResolver {
|
|
|
132
134
|
// find a tsconfig for the main file, look it up and attempt to find
|
|
133
135
|
// the original TypeScript sources roughly the same way tsc does it.
|
|
134
136
|
for (const mainPath of packageJson.mainPaths) {
|
|
135
|
-
const { tsconfigJson, jsconfigJson } = this.loadPackageFiles(mainPath, {
|
|
137
|
+
const { tsconfigJson, jsconfigJson } = await this.loadPackageFiles(mainPath, {
|
|
136
138
|
root: packageJson.basePath,
|
|
137
139
|
});
|
|
138
140
|
// TODO: Prefer jsconfig.json when dealing with a JavaScript file.
|
|
@@ -144,7 +146,7 @@ class PackageFilesResolver {
|
|
|
144
146
|
return context.collectLookupPaths(filePath);
|
|
145
147
|
});
|
|
146
148
|
for (const candidatePath of candidatePaths) {
|
|
147
|
-
const mainSourceFile = this.cache.sourceFile(candidatePath, context);
|
|
149
|
+
const mainSourceFile = await this.cache.sourceFile(candidatePath, context);
|
|
148
150
|
if (mainSourceFile === undefined) {
|
|
149
151
|
continue;
|
|
150
152
|
}
|
|
@@ -152,7 +154,7 @@ class PackageFilesResolver {
|
|
|
152
154
|
return [sourceFile, mainSourceFile, configJson.jsonFile.sourceFile];
|
|
153
155
|
}
|
|
154
156
|
}
|
|
155
|
-
const mainSourceFile = this.cache.sourceFile(mainPath, context);
|
|
157
|
+
const mainSourceFile = await this.cache.sourceFile(mainPath, context);
|
|
156
158
|
if (mainSourceFile === undefined) {
|
|
157
159
|
continue;
|
|
158
160
|
}
|
|
@@ -163,14 +165,14 @@ class PackageFilesResolver {
|
|
|
163
165
|
}
|
|
164
166
|
return [sourceFile];
|
|
165
167
|
}
|
|
166
|
-
resolveDependenciesForFilePath(filePath, dependencies) {
|
|
168
|
+
async resolveDependenciesForFilePath(filePath, dependencies) {
|
|
167
169
|
const resolved = {
|
|
168
170
|
external: [],
|
|
169
171
|
missing: [],
|
|
170
172
|
local: [],
|
|
171
173
|
};
|
|
172
174
|
const dirname = node_path_1.default.dirname(filePath);
|
|
173
|
-
const { tsconfigJson, jsconfigJson } = this.loadPackageFiles(filePath);
|
|
175
|
+
const { tsconfigJson, jsconfigJson } = await this.loadPackageFiles(filePath);
|
|
174
176
|
const context = lookup_1.LookupContext.forFilePath(filePath);
|
|
175
177
|
resolve: for (const importPath of dependencies) {
|
|
176
178
|
if ((0, paths_1.isBuiltinPath)(importPath)) {
|
|
@@ -181,9 +183,9 @@ class PackageFilesResolver {
|
|
|
181
183
|
}
|
|
182
184
|
if ((0, paths_1.isLocalPath)(importPath)) {
|
|
183
185
|
const relativeDepPath = node_path_1.default.resolve(dirname, importPath);
|
|
184
|
-
const sourceFile = this.cache.sourceFile(relativeDepPath, context);
|
|
186
|
+
const sourceFile = await this.cache.sourceFile(relativeDepPath, context);
|
|
185
187
|
if (sourceFile !== undefined) {
|
|
186
|
-
const resolvedFiles = this.resolveSourceFile(sourceFile, context);
|
|
188
|
+
const resolvedFiles = await this.resolveSourceFile(sourceFile, context);
|
|
187
189
|
let found = false;
|
|
188
190
|
for (const resolvedFile of resolvedFiles) {
|
|
189
191
|
resolved.local.push({
|
|
@@ -212,9 +214,9 @@ class PackageFilesResolver {
|
|
|
212
214
|
let found = false;
|
|
213
215
|
for (const { source, target } of resolvedPaths) {
|
|
214
216
|
const relativePath = node_path_1.default.resolve(configJson.basePath, target.path);
|
|
215
|
-
const sourceFile = this.cache.sourceFile(relativePath, context);
|
|
217
|
+
const sourceFile = await this.cache.sourceFile(relativePath, context);
|
|
216
218
|
if (sourceFile !== undefined) {
|
|
217
|
-
const resolvedFiles = this.resolveSourceFile(sourceFile, context);
|
|
219
|
+
const resolvedFiles = await this.resolveSourceFile(sourceFile, context);
|
|
218
220
|
for (const resolvedFile of resolvedFiles) {
|
|
219
221
|
configJson.registerRelatedSourceFile(resolvedFile);
|
|
220
222
|
resolved.local.push({
|
|
@@ -248,9 +250,9 @@ class PackageFilesResolver {
|
|
|
248
250
|
}
|
|
249
251
|
if (configJson.baseUrl !== undefined) {
|
|
250
252
|
const relativePath = node_path_1.default.resolve(configJson.basePath, configJson.baseUrl, importPath);
|
|
251
|
-
const sourceFile = this.cache.sourceFile(relativePath, context);
|
|
253
|
+
const sourceFile = await this.cache.sourceFile(relativePath, context);
|
|
252
254
|
if (sourceFile !== undefined) {
|
|
253
|
-
const resolvedFiles = this.resolveSourceFile(sourceFile, context);
|
|
255
|
+
const resolvedFiles = await this.resolveSourceFile(sourceFile, context);
|
|
254
256
|
let found = false;
|
|
255
257
|
for (const resolvedFile of resolvedFiles) {
|
|
256
258
|
configJson.registerRelatedSourceFile(resolvedFile);
|