@typespec/spector 0.1.0-alpha.14-dev.1 → 0.1.0-alpha.15-dev.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/CHANGELOG.md +7 -0
- package/dist/src/app/app.d.ts.map +1 -1
- package/dist/src/app/app.js +5 -4
- package/dist/src/app/app.js.map +1 -1
- package/dist/src/server/server.d.ts +1 -1
- package/dist/src/server/server.d.ts.map +1 -1
- package/dist/src/server/server.js +17 -4
- package/dist/src/server/server.js.map +1 -1
- package/package.json +6 -6
- package/src/app/app.ts +6 -5
- package/src/server/server.ts +19 -5
- package/temp/.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAQhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,qBAAa,UAAU;IAMT,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAQhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,WAAW,6BAA6B;IAC5C,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC3C,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,qBAAa,UAAU;IAMT,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,cAAc,CAAkB;gBAEpB,MAAM,EAAE,gBAAgB;IAK/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCnC,OAAO,CAAC,gBAAgB;CAqBzB"}
|
package/dist/src/app/app.js
CHANGED
|
@@ -17,9 +17,6 @@ export class MockApiApp {
|
|
|
17
17
|
this.config = config;
|
|
18
18
|
this.server = new MockApiServer({ port: config.port });
|
|
19
19
|
this.coverageTracker = new CoverageTracker(config.coverageFile);
|
|
20
|
-
this.resolverConfig = {
|
|
21
|
-
baseUrl: `http://localhost:${config.port}`,
|
|
22
|
-
};
|
|
23
20
|
}
|
|
24
21
|
async start() {
|
|
25
22
|
this.server.use("/", internalRouter);
|
|
@@ -46,7 +43,11 @@ export class MockApiApp {
|
|
|
46
43
|
res.json(this.coverageTracker.computeCoverage());
|
|
47
44
|
});
|
|
48
45
|
this.server.use("/", this.router);
|
|
49
|
-
|
|
46
|
+
// Getting the resolved port as setting 0 in the config will have express resolve on of the available ports
|
|
47
|
+
const port = await this.server.start();
|
|
48
|
+
this.resolverConfig = {
|
|
49
|
+
baseUrl: `http://localhost:${port}`,
|
|
50
|
+
};
|
|
50
51
|
}
|
|
51
52
|
registerScenario(name, scenario) {
|
|
52
53
|
for (const endpoint of scenario.apis) {
|
package/dist/src/app/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GAQX,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAY,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAOxD,MAAM,OAAO,UAAU;IAMD;IALZ,MAAM,GAAG,MAAM,EAAE,CAAC;IAClB,MAAM,CAAgB;IACtB,eAAe,CAAkB;IACjC,cAAc,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/app/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare class MockApiServer {
|
|
|
8
8
|
private app;
|
|
9
9
|
constructor(config: MockApiServerConfig);
|
|
10
10
|
use(route: string, ...handlers: RequestHandler[]): void;
|
|
11
|
-
start():
|
|
11
|
+
start(): Promise<number>;
|
|
12
12
|
}
|
|
13
13
|
export type ServerRequestHandler = (request: RequestExt, response: Response) => void;
|
|
14
14
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAgB,EAAuB,cAAc,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAOjF,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;CACd;AAyCD,qBAAa,aAAa;IAGZ,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,GAAG,CAAsB;gBAEb,MAAM,EAAE,mBAAmB;IAyBxC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,cAAc,EAAE,GAAG,IAAI;IAIvD,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAgB,EAAuB,cAAc,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAOjF,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;CACd;AAyCD,qBAAa,aAAa;IAGZ,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,GAAG,CAAsB;gBAEb,MAAM,EAAE,mBAAmB;IAyBxC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,cAAc,EAAE,GAAG,IAAI;IAIvD,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;CAqBhC;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC"}
|
|
@@ -56,13 +56,26 @@ export class MockApiServer {
|
|
|
56
56
|
}
|
|
57
57
|
start() {
|
|
58
58
|
this.app.use(errorHandler);
|
|
59
|
-
|
|
60
|
-
|
|
59
|
+
return new Promise((resolve, reject) => {
|
|
60
|
+
const server = this.app.listen(this.config.port, () => {
|
|
61
|
+
const resolvedPort = getPort(server);
|
|
62
|
+
if (!resolvedPort) {
|
|
63
|
+
logger.error("Failed to resolve port");
|
|
64
|
+
reject(new Error("Failed to resolve port"));
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
logger.info(`Started server on ${resolvedPort}`);
|
|
68
|
+
resolve(resolvedPort);
|
|
69
|
+
});
|
|
70
|
+
server.on("error", (err) => {
|
|
71
|
+
logger.error("Error starting server", err);
|
|
72
|
+
reject(err);
|
|
73
|
+
});
|
|
61
74
|
});
|
|
62
75
|
}
|
|
63
76
|
}
|
|
64
|
-
const
|
|
77
|
+
const getPort = (server) => {
|
|
65
78
|
const address = server?.address();
|
|
66
|
-
return typeof address === "string" ?
|
|
79
|
+
return typeof address === "string" ? null : address?.port;
|
|
67
80
|
};
|
|
68
81
|
//# sourceMappingURL=server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/spector",
|
|
3
|
-
"version": "0.1.0-alpha.
|
|
3
|
+
"version": "0.1.0-alpha.15-dev.0",
|
|
4
4
|
"description": "Typespec Core Tool to validate, run mock api, collect coverage.",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -28,12 +28,12 @@
|
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@azure/identity": "~4.8.0",
|
|
30
30
|
"@types/js-yaml": "^4.0.5",
|
|
31
|
-
"@typespec/compiler": "^1.0.0
|
|
32
|
-
"@typespec/http": "^1.0.
|
|
33
|
-
"@typespec/rest": "^0.
|
|
31
|
+
"@typespec/compiler": "^1.0.0",
|
|
32
|
+
"@typespec/http": "^1.0.1",
|
|
33
|
+
"@typespec/rest": "^0.70.0 || >=0.71.0-dev <0.71.0",
|
|
34
34
|
"@typespec/spec-api": "^0.1.0-alpha.6 || >=0.1.0-alpha.7-dev <0.1.0-alpha.7",
|
|
35
35
|
"@typespec/spec-coverage-sdk": "^0.1.0-alpha.6 || >=0.1.0-alpha.7-dev <0.1.0-alpha.7",
|
|
36
|
-
"@typespec/versioning": "^0.
|
|
36
|
+
"@typespec/versioning": "^0.70.0 || >=0.71.0-dev <0.71.0",
|
|
37
37
|
"ajv": "~8.17.1",
|
|
38
38
|
"body-parser": "^1.20.3",
|
|
39
39
|
"deep-equal": "^2.2.0",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"@types/node": "~22.13.11",
|
|
59
59
|
"@types/xml2js": "^0.4.11",
|
|
60
60
|
"@types/yargs": "~17.0.33",
|
|
61
|
-
"@typespec/tspd": "^0.
|
|
61
|
+
"@typespec/tspd": "^0.70.0 || >=0.71.0-dev <0.71.0",
|
|
62
62
|
"rimraf": "~6.0.1",
|
|
63
63
|
"typescript": "~5.8.2"
|
|
64
64
|
},
|
package/src/app/app.ts
CHANGED
|
@@ -28,14 +28,11 @@ export class MockApiApp {
|
|
|
28
28
|
private router = Router();
|
|
29
29
|
private server: MockApiServer;
|
|
30
30
|
private coverageTracker: CoverageTracker;
|
|
31
|
-
private resolverConfig
|
|
31
|
+
private resolverConfig!: ResolverConfig;
|
|
32
32
|
|
|
33
33
|
constructor(private config: ApiMockAppConfig) {
|
|
34
34
|
this.server = new MockApiServer({ port: config.port });
|
|
35
35
|
this.coverageTracker = new CoverageTracker(config.coverageFile);
|
|
36
|
-
this.resolverConfig = {
|
|
37
|
-
baseUrl: `http://localhost:${config.port}`,
|
|
38
|
-
};
|
|
39
36
|
}
|
|
40
37
|
|
|
41
38
|
public async start(): Promise<void> {
|
|
@@ -67,7 +64,11 @@ export class MockApiApp {
|
|
|
67
64
|
});
|
|
68
65
|
|
|
69
66
|
this.server.use("/", this.router);
|
|
70
|
-
|
|
67
|
+
// Getting the resolved port as setting 0 in the config will have express resolve on of the available ports
|
|
68
|
+
const port = await this.server.start();
|
|
69
|
+
this.resolverConfig = {
|
|
70
|
+
baseUrl: `http://localhost:${port}`,
|
|
71
|
+
};
|
|
71
72
|
}
|
|
72
73
|
|
|
73
74
|
private registerScenario(name: string, scenario: ScenarioMockApi) {
|
package/src/server/server.ts
CHANGED
|
@@ -82,18 +82,32 @@ export class MockApiServer {
|
|
|
82
82
|
this.app.use(route, ...handlers);
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
public start():
|
|
85
|
+
public start(): Promise<number> {
|
|
86
86
|
this.app.use(errorHandler);
|
|
87
87
|
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
return new Promise((resolve, reject) => {
|
|
89
|
+
const server = this.app.listen(this.config.port, () => {
|
|
90
|
+
const resolvedPort = getPort(server);
|
|
91
|
+
if (!resolvedPort) {
|
|
92
|
+
logger.error("Failed to resolve port");
|
|
93
|
+
reject(new Error("Failed to resolve port"));
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
logger.info(`Started server on ${resolvedPort}`);
|
|
97
|
+
resolve(resolvedPort);
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
server.on("error", (err) => {
|
|
101
|
+
logger.error("Error starting server", err);
|
|
102
|
+
reject(err);
|
|
103
|
+
});
|
|
90
104
|
});
|
|
91
105
|
}
|
|
92
106
|
}
|
|
93
107
|
|
|
94
108
|
export type ServerRequestHandler = (request: RequestExt, response: Response) => void;
|
|
95
109
|
|
|
96
|
-
const
|
|
110
|
+
const getPort = (server: Server): number | undefined | null => {
|
|
97
111
|
const address = server?.address();
|
|
98
|
-
return typeof address === "string" ?
|
|
112
|
+
return typeof address === "string" ? null : address?.port;
|
|
99
113
|
};
|