@typespec/spector 0.1.0-alpha.10-dev.5 → 0.1.0-alpha.10-dev.7
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/src/actions/helper.d.ts +1 -0
- package/dist/src/actions/helper.d.ts.map +1 -1
- package/dist/src/actions/helper.js +7 -1
- package/dist/src/actions/helper.js.map +1 -1
- package/dist/src/actions/server-test.d.ts.map +1 -1
- package/dist/src/actions/server-test.js +8 -5
- package/dist/src/actions/server-test.js.map +1 -1
- package/dist/src/actions/validate-mock-apis.js +1 -1
- package/dist/src/actions/validate-mock-apis.js.map +1 -1
- package/dist/src/logger.d.ts +16 -2
- package/dist/src/logger.d.ts.map +1 -1
- package/dist/src/logger.js +27 -8
- package/dist/src/logger.js.map +1 -1
- package/package.json +1 -2
- package/src/actions/helper.ts +10 -1
- package/src/actions/server-test.ts +9 -6
- package/src/actions/validate-mock-apis.ts +1 -1
- package/src/logger.ts +39 -8
- package/temp/.tsbuildinfo +1 -1
|
@@ -5,6 +5,7 @@ export interface ServiceRequest {
|
|
|
5
5
|
body?: MockBody | MockMultipartBody;
|
|
6
6
|
headers?: Record<string, unknown>;
|
|
7
7
|
query?: Record<string, unknown>;
|
|
8
|
+
pathParams?: Record<string, unknown>;
|
|
8
9
|
}
|
|
9
10
|
export declare function makeServiceCall(request: ServiceRequest): Promise<Response>;
|
|
10
11
|
type EncodingType = "utf-8" | "base64" | "base64url" | "hex";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/actions/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE7E,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,QAAQ,GAAG,iBAAiB,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../src/actions/helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE7E,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,QAAQ,GAAG,iBAAiB,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAiDD,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuBhF;AAED,KAAK,YAAY,GAAG,OAAO,GAAG,QAAQ,GAAG,WAAW,GAAG,KAAK,CAAC;AAC7D,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,GAAG,MAAM,CAElF"}
|
|
@@ -13,7 +13,13 @@ function renderMultipartRequest(body) {
|
|
|
13
13
|
return formData;
|
|
14
14
|
}
|
|
15
15
|
function resolveUrl(request) {
|
|
16
|
-
let endpoint = request.url
|
|
16
|
+
let endpoint = request.url;
|
|
17
|
+
if (request.pathParams) {
|
|
18
|
+
for (const [key, value] of Object.entries(request.pathParams)) {
|
|
19
|
+
endpoint = endpoint.replaceAll(`:${key}`, String(value));
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
endpoint = endpoint.replaceAll("[:]", ":");
|
|
17
23
|
if (request.query) {
|
|
18
24
|
const query = new URLSearchParams();
|
|
19
25
|
for (const [key, value] of Object.entries(request.query)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/actions/helper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../src/actions/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-test.d.ts","sourceRoot":"","sources":["../../../src/actions/server-test.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,qBAAqB;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;
|
|
1
|
+
{"version":3,"file":"server-test.d.ts","sourceRoot":"","sources":["../../../src/actions/server-test.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,qBAAqB;IACpC,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAmFD,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAuBD,wBAAsB,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,iBAAsB,iBA2EtF"}
|
|
@@ -24,6 +24,7 @@ class ServerTestsGenerator {
|
|
|
24
24
|
body: this.mockApiDefinition.request?.body,
|
|
25
25
|
headers: this.mockApiDefinition.request?.headers,
|
|
26
26
|
query: this.mockApiDefinition.request?.query,
|
|
27
|
+
pathParams: this.mockApiDefinition.request?.pathParams,
|
|
27
28
|
});
|
|
28
29
|
if (this.mockApiDefinition.response.status !== response.status) {
|
|
29
30
|
throw new ValidationError("Status code mismatch", this.mockApiDefinition.response.status, response.status);
|
|
@@ -94,15 +95,18 @@ export async function serverTest(scenariosPath, options = {}) {
|
|
|
94
95
|
const scenarios = await loadScenarioMockApis(scenariosPath);
|
|
95
96
|
const successfullScenarios = [];
|
|
96
97
|
const failureDiagnostics = [];
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
for (const [name, scenario] of scenarioEntries) {
|
|
98
|
+
const allScenarioEntries = Object.entries(scenarios);
|
|
99
|
+
const scenarioEntries = allScenarioEntries.filter(([name]) => {
|
|
100
100
|
const pathlikeName = name.replaceAll("_", "/").toLowerCase();
|
|
101
101
|
const filter = options.filter?.toLowerCase();
|
|
102
102
|
if (filter && !micromatch.isMatch(pathlikeName, filter)) {
|
|
103
103
|
logger.debug(`Skipping scenario: ${pathlikeName}, does not match filter: ${filter}`);
|
|
104
|
-
|
|
104
|
+
return false;
|
|
105
105
|
}
|
|
106
|
+
return true;
|
|
107
|
+
});
|
|
108
|
+
// 3. Execute each scenario
|
|
109
|
+
for (const [name, scenario] of scenarioEntries) {
|
|
106
110
|
if (!Array.isArray(scenario.apis))
|
|
107
111
|
continue;
|
|
108
112
|
for (const api of scenario.apis) {
|
|
@@ -113,7 +117,6 @@ export async function serverTest(scenariosPath, options = {}) {
|
|
|
113
117
|
await obj.executeScenario();
|
|
114
118
|
successfullScenarios.push({
|
|
115
119
|
name,
|
|
116
|
-
pathlikeName,
|
|
117
120
|
});
|
|
118
121
|
}
|
|
119
122
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-test.js","sourceRoot":"","sources":["../../../src/actions/server-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AAOjD,MAAM,oBAAoB;IAChB,IAAI,GAAW,EAAE,CAAC;IAClB,iBAAiB,CAAoB;IACrC,cAAc,GAAW,EAAE,CAAC;IAEpC,YAAY,IAAY,EAAE,iBAAoC,EAAE,cAAsB;QACpF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,GAAG,CAAC,aAAa,IAAI,CAAC,IAAI,uBAAuB,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;QAElF,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC;YACrC,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM;YACrC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE;YAC1D,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI;YAC1C,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO;YAChD,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"server-test.js","sourceRoot":"","sources":["../../../src/actions/server-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export async function validateMockApis({ scenariosPath, exitDueToPreviousError,
|
|
|
22
22
|
d.target.kind === "Namespace" &&
|
|
23
23
|
d.target.name === "DPG"));
|
|
24
24
|
if (programDiagnostics.length > 0) {
|
|
25
|
-
specCompiler.logDiagnostics(programDiagnostics,
|
|
25
|
+
specCompiler.logDiagnostics(programDiagnostics, specCompiler.NodeHost.logSink);
|
|
26
26
|
diagnostics.reportDiagnostic({
|
|
27
27
|
message: `Scenario ${name} is invalid.`,
|
|
28
28
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-mock-apis.js","sourceRoot":"","sources":["../../../src/actions/validate-mock-apis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAQ3E,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACrC,aAAa,EACb,sBAAsB,EACtB,gBAAgB,GACO;IACvB,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAEjE,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,wBAAwB,EAAE,CAAC;IAC/C,KAAK,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,aAAa,EAAE,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,mBAAmB,YAAY,GAAG,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE;YAC9E,MAAM,EAAE,IAAI;YACZ,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,6DAA6D;QAC7D,MAAM,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CACnD,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CACC,CAAC,CAAC,IAAI,KAAK,+CAA+C;YAC1D,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ;YAC5B,MAAM,IAAI,CAAC,CAAC,MAAM;YAClB,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW;YAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CACxB,CACJ,CAAC;QAEF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,YAAY,CAAC,cAAc,CAAC,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"validate-mock-apis.js","sourceRoot":"","sources":["../../../src/actions/validate-mock-apis.ts"],"names":[],"mappings":"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"}
|
package/dist/src/logger.d.ts
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
declare const levels: {
|
|
2
|
+
debug: number;
|
|
3
|
+
info: number;
|
|
4
|
+
warn: number;
|
|
5
|
+
error: number;
|
|
6
|
+
};
|
|
7
|
+
type Level = keyof typeof levels;
|
|
8
|
+
interface Logger {
|
|
9
|
+
level: Level;
|
|
10
|
+
debug: (message: string, ...data: unknown[]) => void;
|
|
11
|
+
info: (message: string, ...data: unknown[]) => void;
|
|
12
|
+
warn: (message: string, ...data: unknown[]) => void;
|
|
13
|
+
error: (message: string, ...data: unknown[]) => void;
|
|
14
|
+
}
|
|
15
|
+
export declare const logger: Logger;
|
|
16
|
+
export {};
|
|
3
17
|
//# sourceMappingURL=logger.d.ts.map
|
package/dist/src/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,MAAM;;;;;CAKX,CAAC;AAEF,KAAK,KAAK,GAAG,MAAM,OAAO,MAAM,CAAC;AAQjC,UAAU,MAAM;IACd,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACrD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACpD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACpD,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACtD;AAED,eAAO,MAAM,MAAM,EAAE,MAMpB,CAAC"}
|
package/dist/src/logger.js
CHANGED
|
@@ -1,10 +1,29 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
import pc from "picocolors";
|
|
3
|
+
const levels = {
|
|
4
|
+
debug: 10,
|
|
5
|
+
info: 20,
|
|
6
|
+
warn: 30,
|
|
7
|
+
error: 30,
|
|
8
|
+
};
|
|
9
|
+
const levelDisplay = {
|
|
10
|
+
debug: pc.blue("debug"),
|
|
11
|
+
info: pc.green("info"),
|
|
12
|
+
warn: pc.yellow("warn"),
|
|
13
|
+
error: pc.red("error"),
|
|
14
|
+
};
|
|
15
|
+
export const logger = {
|
|
3
16
|
level: "info",
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
17
|
+
debug: log("debug"),
|
|
18
|
+
info: log("info"),
|
|
19
|
+
warn: log("warn"),
|
|
20
|
+
error: log("error"),
|
|
21
|
+
};
|
|
22
|
+
function log(level) {
|
|
23
|
+
return (message, ...data) => {
|
|
24
|
+
if (levels[level] >= levels[logger.level]) {
|
|
25
|
+
console.log(levelDisplay[level], message, ...data);
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
}
|
|
10
29
|
//# sourceMappingURL=logger.js.map
|
package/dist/src/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,MAAM,GAAG;IACb,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,EAAE;IACR,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,EAAE;CACV,CAAC;AAGF,MAAM,YAAY,GAA0B;IAC1C,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;IACvB,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;IACtB,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IACvB,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;CACvB,CAAC;AAUF,MAAM,CAAC,MAAM,MAAM,GAAW;IAC5B,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;IACnB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC;CACpB,CAAC;AAEF,SAAS,GAAG,CAAC,KAAY;IACvB,OAAO,CAAC,OAAe,EAAE,GAAG,IAAe,EAAE,EAAE;QAC7C,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/spector",
|
|
3
|
-
"version": "0.1.0-alpha.10-dev.
|
|
3
|
+
"version": "0.1.0-alpha.10-dev.7",
|
|
4
4
|
"description": "Typespec Core Tool to validate, run mock api, collect coverage.",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -46,7 +46,6 @@
|
|
|
46
46
|
"multer": "^1.4.5-lts.1",
|
|
47
47
|
"picocolors": "~1.1.1",
|
|
48
48
|
"source-map-support": "~0.5.21",
|
|
49
|
-
"winston": "^3.17.0",
|
|
50
49
|
"xml2js": "^0.6.2",
|
|
51
50
|
"yargs": "~17.7.2"
|
|
52
51
|
},
|
package/src/actions/helper.ts
CHANGED
|
@@ -6,6 +6,7 @@ export interface ServiceRequest {
|
|
|
6
6
|
body?: MockBody | MockMultipartBody;
|
|
7
7
|
headers?: Record<string, unknown>;
|
|
8
8
|
query?: Record<string, unknown>;
|
|
9
|
+
pathParams?: Record<string, unknown>;
|
|
9
10
|
}
|
|
10
11
|
|
|
11
12
|
function renderMultipartRequest(body: MockMultipartBody) {
|
|
@@ -29,7 +30,15 @@ function renderMultipartRequest(body: MockMultipartBody) {
|
|
|
29
30
|
}
|
|
30
31
|
|
|
31
32
|
function resolveUrl(request: ServiceRequest) {
|
|
32
|
-
let endpoint = request.url
|
|
33
|
+
let endpoint = request.url;
|
|
34
|
+
|
|
35
|
+
if (request.pathParams) {
|
|
36
|
+
for (const [key, value] of Object.entries(request.pathParams)) {
|
|
37
|
+
endpoint = endpoint.replaceAll(`:${key}`, String(value));
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
endpoint = endpoint.replaceAll("[:]", ":");
|
|
33
42
|
|
|
34
43
|
if (request.query) {
|
|
35
44
|
const query = new URLSearchParams();
|
|
@@ -34,6 +34,7 @@ class ServerTestsGenerator {
|
|
|
34
34
|
body: this.mockApiDefinition.request?.body,
|
|
35
35
|
headers: this.mockApiDefinition.request?.headers,
|
|
36
36
|
query: this.mockApiDefinition.request?.query,
|
|
37
|
+
pathParams: this.mockApiDefinition.request?.pathParams,
|
|
37
38
|
});
|
|
38
39
|
|
|
39
40
|
if (this.mockApiDefinition.response.status !== response.status) {
|
|
@@ -124,18 +125,21 @@ export async function serverTest(scenariosPath: string, options: ServerTestOptio
|
|
|
124
125
|
const baseUrl = options.baseUrl ?? DEFAULT_BASE_URL;
|
|
125
126
|
await waitForServer(baseUrl);
|
|
126
127
|
const scenarios = await loadScenarioMockApis(scenariosPath);
|
|
127
|
-
const successfullScenarios: { name: string
|
|
128
|
+
const successfullScenarios: { name: string }[] = [];
|
|
128
129
|
const failureDiagnostics: ServerTestDiagnostics[] = [];
|
|
129
130
|
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
for (const [name, scenario] of scenarioEntries) {
|
|
131
|
+
const allScenarioEntries = Object.entries(scenarios);
|
|
132
|
+
const scenarioEntries = allScenarioEntries.filter(([name]) => {
|
|
133
133
|
const pathlikeName = name.replaceAll("_", "/").toLowerCase();
|
|
134
134
|
const filter = options.filter?.toLowerCase();
|
|
135
135
|
if (filter && !micromatch.isMatch(pathlikeName, filter)) {
|
|
136
136
|
logger.debug(`Skipping scenario: ${pathlikeName}, does not match filter: ${filter}`);
|
|
137
|
-
|
|
137
|
+
return false;
|
|
138
138
|
}
|
|
139
|
+
return true;
|
|
140
|
+
});
|
|
141
|
+
// 3. Execute each scenario
|
|
142
|
+
for (const [name, scenario] of scenarioEntries) {
|
|
139
143
|
if (!Array.isArray(scenario.apis)) continue;
|
|
140
144
|
for (const api of scenario.apis) {
|
|
141
145
|
if (api.kind !== "MockApiDefinition") continue;
|
|
@@ -144,7 +148,6 @@ export async function serverTest(scenariosPath: string, options: ServerTestOptio
|
|
|
144
148
|
await obj.executeScenario();
|
|
145
149
|
successfullScenarios.push({
|
|
146
150
|
name,
|
|
147
|
-
pathlikeName,
|
|
148
151
|
});
|
|
149
152
|
} catch (e: any) {
|
|
150
153
|
if (e instanceof ValidationError) {
|
|
@@ -41,7 +41,7 @@ export async function validateMockApis({
|
|
|
41
41
|
);
|
|
42
42
|
|
|
43
43
|
if (programDiagnostics.length > 0) {
|
|
44
|
-
specCompiler.logDiagnostics(programDiagnostics,
|
|
44
|
+
specCompiler.logDiagnostics(programDiagnostics, specCompiler.NodeHost.logSink);
|
|
45
45
|
diagnostics.reportDiagnostic({
|
|
46
46
|
message: `Scenario ${name} is invalid.`,
|
|
47
47
|
});
|
package/src/logger.ts
CHANGED
|
@@ -1,10 +1,41 @@
|
|
|
1
|
-
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
import pc from "picocolors";
|
|
2
3
|
|
|
3
|
-
|
|
4
|
+
const levels = {
|
|
5
|
+
debug: 10,
|
|
6
|
+
info: 20,
|
|
7
|
+
warn: 30,
|
|
8
|
+
error: 30,
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
type Level = keyof typeof levels;
|
|
12
|
+
const levelDisplay: Record<Level, string> = {
|
|
13
|
+
debug: pc.blue("debug"),
|
|
14
|
+
info: pc.green("info"),
|
|
15
|
+
warn: pc.yellow("warn"),
|
|
16
|
+
error: pc.red("error"),
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
interface Logger {
|
|
20
|
+
level: Level;
|
|
21
|
+
debug: (message: string, ...data: unknown[]) => void;
|
|
22
|
+
info: (message: string, ...data: unknown[]) => void;
|
|
23
|
+
warn: (message: string, ...data: unknown[]) => void;
|
|
24
|
+
error: (message: string, ...data: unknown[]) => void;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export const logger: Logger = {
|
|
4
28
|
level: "info",
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
29
|
+
debug: log("debug"),
|
|
30
|
+
info: log("info"),
|
|
31
|
+
warn: log("warn"),
|
|
32
|
+
error: log("error"),
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
function log(level: Level) {
|
|
36
|
+
return (message: string, ...data: unknown[]) => {
|
|
37
|
+
if (levels[level] >= levels[logger.level]) {
|
|
38
|
+
console.log(levelDisplay[level], message, ...data);
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
}
|