@typespec/spector 0.1.0-alpha.10-dev.6 → 0.1.0-alpha.10-dev.8
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/server/server.js.map +1 -1
- package/package.json +6 -7
- package/src/actions/helper.ts +10 -1
- package/src/actions/server-test.ts +9 -6
- package/src/server/server.ts +1 -1
- 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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,OAA0D,MAAM,SAAS,CAAC;AAEjF,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMhD,MAAM,YAAY,GAAwB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;IAClE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAE3B,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM;QAC5B,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE;QACd,CAAC,CAAC,GAAG,YAAY,KAAK;YACpB,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE;YAC5D,CAAC,CAAC,GAAG,CAAC;IAEV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;IAC9B,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,GAAe,EACf,GAAmB,EACnB,GAAW,EACX,QAAwB,EACxB,EAAE;IACF,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACtB,GAAG,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,GAAe,EACf,GAAmB,EACnB,GAAW,EACX,QAAwB,EACxB,EAAE;IACF,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACtB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC;IACpB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,KAAK,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;CACjD,CAAC;AAEF,MAAM,OAAO,aAAa;IAGJ;IAFZ,GAAG,CAAsB;IAEjC,YAAoB,MAA2B;QAA3B,WAAM,GAAN,MAAM,CAAqB;QAC7C,IAAI,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,CAAC,GAAG,CACV,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,8BAA8B;YACpC,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,KAAK;SACd,CAAC,CACH,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,GAAG,CACV,UAAU,CAAC,GAAG,CAAC;YACb,IAAI,EAAE,CAAC,0BAA0B,EAAE,WAAW,EAAE,mBAAmB,CAAC;YACpE,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,kBAAkB;SAC3B,CAAC,CACH,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,OAA0D,MAAM,SAAS,CAAC;AAEjF,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAMhD,MAAM,YAAY,GAAwB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;IAClE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAE3B,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM;QAC5B,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE;QACd,CAAC,CAAC,GAAG,YAAY,KAAK;YACpB,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE;YAC5D,CAAC,CAAC,GAAG,CAAC;IAEV,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;IAC9B,GAAG,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,GAAe,EACf,GAAmB,EACnB,GAAW,EACX,QAAwB,EACxB,EAAE;IACF,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACtB,GAAG,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,GAAe,EACf,GAAmB,EACnB,GAAW,EACX,QAAwB,EACxB,EAAE;IACF,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACtB,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC;IACpB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,KAAK,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;CACjD,CAAC;AAEF,MAAM,OAAO,aAAa;IAGJ;IAFZ,GAAG,CAAsB;IAEjC,YAAoB,MAA2B;QAA3B,WAAM,GAAN,MAAM,CAAqB;QAC7C,IAAI,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,CAAC,GAAG,CACV,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,8BAA8B;YACpC,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,KAAK;SACd,CAAC,CACH,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,GAAG,CACV,UAAU,CAAC,GAAG,CAAC;YACb,IAAI,EAAE,CAAC,0BAA0B,EAAE,WAAW,EAAE,mBAAmB,CAAC;YACpE,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,kBAAkB;SAC3B,CAAC,CACH,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,EAAS,CAAC,CAAC;IACtC,CAAC;IAEM,GAAG,CAAC,KAAa,EAAE,GAAG,QAA0B;QACrD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,CAAC;IACnC,CAAC;IAEM,KAAK;QACV,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAE3B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;YACpD,MAAM,CAAC,IAAI,CAAC,qBAAqB,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAID,MAAM,UAAU,GAAG,CAAC,MAAc,EAAU,EAAE;IAC5C,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC;IAClC,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,EAAE,IAAI,CAAC;AACnF,CAAC,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.8",
|
|
4
4
|
"description": "Typespec Core Tool to validate, run mock api, collect coverage.",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -26,24 +26,23 @@
|
|
|
26
26
|
},
|
|
27
27
|
"homepage": "https://github.com/microsoft/typespec#readme",
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@azure/identity": "~4.
|
|
29
|
+
"@azure/identity": "~4.8.0",
|
|
30
30
|
"@types/js-yaml": "^4.0.5",
|
|
31
31
|
"@typespec/compiler": "^0.67.1 || >=0.68.0-dev <0.68.0",
|
|
32
32
|
"@typespec/http": "^0.67.1 || >=0.68.0-dev <0.68.0",
|
|
33
33
|
"@typespec/rest": "^0.67.1 || >=0.68.0-dev <0.68.0",
|
|
34
34
|
"@typespec/spec-api": "^0.1.0-alpha.2 || >=0.1.0-alpha.3-dev <0.1.0-alpha.3",
|
|
35
|
-
"@typespec/spec-coverage-sdk": "^0.1.0-alpha.
|
|
35
|
+
"@typespec/spec-coverage-sdk": "^0.1.0-alpha.5 || >=0.1.0-alpha.6-dev <0.1.0-alpha.6",
|
|
36
36
|
"@typespec/versioning": "^0.67.1 || >=0.68.0-dev <0.68.0",
|
|
37
37
|
"ajv": "~8.17.1",
|
|
38
38
|
"body-parser": "^1.20.3",
|
|
39
39
|
"deep-equal": "^2.2.0",
|
|
40
40
|
"express": "^4.21.2",
|
|
41
|
-
"express-promise-router": "^4.1.1",
|
|
42
41
|
"globby": "~14.1.0",
|
|
43
42
|
"js-yaml": "^4.1.0",
|
|
44
43
|
"micromatch": "^4.0.8",
|
|
45
44
|
"morgan": "^1.10.0",
|
|
46
|
-
"multer": "
|
|
45
|
+
"multer": "1.4.5-lts.2",
|
|
47
46
|
"picocolors": "~1.1.1",
|
|
48
47
|
"source-map-support": "~0.5.21",
|
|
49
48
|
"xml2js": "^0.6.2",
|
|
@@ -52,11 +51,11 @@
|
|
|
52
51
|
"devDependencies": {
|
|
53
52
|
"@types/body-parser": "^1.19.2",
|
|
54
53
|
"@types/deep-equal": "^1.0.1",
|
|
55
|
-
"@types/express": "^5.0.
|
|
54
|
+
"@types/express": "^5.0.1",
|
|
56
55
|
"@types/micromatch": "^4.0.9",
|
|
57
56
|
"@types/morgan": "^1.9.4",
|
|
58
57
|
"@types/multer": "^1.4.10",
|
|
59
|
-
"@types/node": "~22.13.
|
|
58
|
+
"@types/node": "~22.13.11",
|
|
60
59
|
"@types/xml2js": "^0.4.11",
|
|
61
60
|
"@types/yargs": "~17.0.33",
|
|
62
61
|
"rimraf": "~6.0.1",
|
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) {
|