@typespec/spector 0.1.0-alpha.21-dev.0 → 0.1.0-alpha.21-dev.2
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/config/config.js +2 -2
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/coverage/scenario-manifest.d.ts +2 -2
- package/dist/src/coverage/scenario-manifest.d.ts.map +1 -1
- package/dist/src/coverage/scenario-manifest.js +1 -0
- package/dist/src/coverage/scenario-manifest.js.map +1 -1
- package/dist/src/utils/misc-utils.d.ts +5 -3
- package/dist/src/utils/misc-utils.d.ts.map +1 -1
- package/dist/src/utils/misc-utils.js.map +1 -1
- package/package.json +2 -3
- package/src/config/config.ts +2 -2
- package/src/coverage/scenario-manifest.ts +3 -2
- package/src/utils/misc-utils.ts +5 -3
- package/temp/.tsbuildinfo +1 -1
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { readFile } from "fs/promises";
|
|
2
|
-
import yaml from "
|
|
2
|
+
import yaml from "yaml";
|
|
3
3
|
import { SpecConfigJsonSchema } from "./config-schema.js";
|
|
4
4
|
import { SchemaValidator } from "./schema-validator.js";
|
|
5
5
|
const validator = new SchemaValidator(SpecConfigJsonSchema);
|
|
6
6
|
export async function loadSpecConfig(path) {
|
|
7
7
|
const content = await readFile(path);
|
|
8
|
-
const config = yaml.
|
|
8
|
+
const config = yaml.parse(content.toString());
|
|
9
9
|
const diagnostics = validator.validate(config, path);
|
|
10
10
|
return [config, diagnostics];
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,SAAS,GAAG,IAAI,eAAe,CAAC,oBAAoB,CAAC,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY;IAC/C,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,MAAM,GAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAC/B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Diagnostic } from "../utils/diagnostic-reporter.js";
|
|
2
|
+
import { type SpectorPackageJson } from "../utils/misc-utils.js";
|
|
2
3
|
import { ScenarioManifest } from "@typespec/spec-coverage-sdk";
|
|
3
|
-
import { PackageJson } from "@typespec/compiler";
|
|
4
4
|
import type { Scenario } from "../lib/decorators.js";
|
|
5
5
|
export declare function computeScenarioManifest(scenariosPath: string): Promise<[ScenarioManifest | undefined, readonly Diagnostic[]]>;
|
|
6
|
-
export declare function createScenarioManifest(scenariosPath: string, pkg:
|
|
6
|
+
export declare function createScenarioManifest(scenariosPath: string, pkg: SpectorPackageJson | undefined, commit: string, scenarios: Scenario[]): ScenarioManifest;
|
|
7
7
|
//# sourceMappingURL=scenario-manifest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scenario-manifest.d.ts","sourceRoot":"","sources":["../../../src/coverage/scenario-manifest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"scenario-manifest.d.ts","sourceRoot":"","sources":["../../../src/coverage/scenario-manifest.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAA6B,KAAK,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAoB,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAGjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,CAAC,gBAAgB,GAAG,SAAS,EAAE,SAAS,UAAU,EAAE,CAAC,CAAC,CAShE;AAWD,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,EACrB,GAAG,EAAE,kBAAkB,GAAG,SAAS,EACnC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,QAAQ,EAAE,GACpB,gBAAgB,CAmBlB"}
|
|
@@ -25,6 +25,7 @@ export function createScenarioManifest(scenariosPath, pkg, commit, scenarios) {
|
|
|
25
25
|
return {
|
|
26
26
|
version: pkg?.version ?? "?",
|
|
27
27
|
repo: pkg && getRepo(pkg),
|
|
28
|
+
sourceUrl: pkg?.spector?.sourceUrl,
|
|
28
29
|
packageName: pkg?.name,
|
|
29
30
|
displayName: pkg && ("displayName" in pkg ? pkg.displayName : undefined),
|
|
30
31
|
commit,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scenario-manifest.js","sourceRoot":"","sources":["../../../src/coverage/scenario-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"scenario-manifest.js","sourceRoot":"","sources":["../../../src/coverage/scenario-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAe,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,aAAqB;IAErB,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,CAAC;IACpE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,CAAC;IAChD,OAAO,CAAC,sBAAsB,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,OAAO,CAAC,GAAgB;IAC/B,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;IAClC,MAAM,MAAM,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC;IAC7E,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,2EAA2E;IAC3E,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AAC5D,CAAC;AACD,MAAM,UAAU,sBAAsB,CACpC,aAAqB,EACrB,GAAmC,EACnC,MAAc,EACd,SAAqB;IAErB,MAAM,eAAe,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACpF,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,OAAO,IAAI,GAAG;QAC5B,IAAI,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;QACzB,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS;QAClC,WAAW,EAAE,GAAG,EAAE,IAAI;QACtB,WAAW,EAAE,GAAG,IAAI,CAAC,aAAa,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,WAAqB,CAAC,CAAC,CAAC,SAAS,CAAC;QAClF,MAAM;QACN,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE;YAC/D,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAqB;gBACjC,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnE,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,GAAG,CAAC;gBACtE,GAAG,EAAE,WAAW,CAAC,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,GAAG,CAAC;aACrE,CAAC;YACF,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;QACzC,CAAC,CAAC;KACH,CAAC;AACJ,CAAC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import type { PackageJson } from "@typespec/compiler";
|
|
1
2
|
export declare function ensureScenariosPathExists(scenariosPath: string): Promise<void>;
|
|
2
3
|
export declare function getCommit(path: string): string;
|
|
3
|
-
export interface PackageJson {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
export interface SpectorPackageJson extends PackageJson {
|
|
5
|
+
spector?: {
|
|
6
|
+
sourceUrl?: string;
|
|
7
|
+
};
|
|
6
8
|
}
|
|
7
9
|
export declare function getPackageJson(path: string): Promise<PackageJson | undefined>;
|
|
8
10
|
//# sourceMappingURL=misc-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/misc-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"misc-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/misc-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAMtD,wBAAsB,yBAAyB,CAAC,aAAa,EAAE,MAAM,iBASpE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CASnF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc-utils.js","sourceRoot":"","sources":["../../../src/utils/misc-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"misc-utils.js","sourceRoot":"","sources":["../../../src/utils/misc-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,aAAqB;IACnE,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,kBAAkB,aAAa,sBAAsB,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,kBAAkB,aAAa,kBAAkB,CAAC,CAAC;IACrE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,QAAQ,CAAC,oBAAoB,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;AACzE,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY;IAC/C,MAAM,CAAC,KAAK,CAAC,kCAAkC,IAAI,GAAG,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,uBAAuB,WAAW,GAAG,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAY;IACzC,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC;YAClC,IAAI,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;gBACpB,OAAO,OAAO,CAAC;YACjB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;YACvB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,GAAG,MAAM,CAAC;IACnB,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/spector",
|
|
3
|
-
"version": "0.1.0-alpha.21-dev.
|
|
3
|
+
"version": "0.1.0-alpha.21-dev.2",
|
|
4
4
|
"description": "Typespec Core Tool to validate, run mock api, collect coverage.",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -27,7 +27,6 @@
|
|
|
27
27
|
"homepage": "https://github.com/microsoft/typespec#readme",
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@azure/identity": "~4.13.0",
|
|
30
|
-
"@types/js-yaml": "^4.0.5",
|
|
31
30
|
"@typespec/compiler": "^1.6.0",
|
|
32
31
|
"@typespec/http": "^1.6.0",
|
|
33
32
|
"@typespec/rest": "^0.76.0 || >=0.77.0-dev <0.77.0",
|
|
@@ -39,13 +38,13 @@
|
|
|
39
38
|
"deep-equal": "^2.2.0",
|
|
40
39
|
"express": "^5.1.0",
|
|
41
40
|
"globby": "~15.0.0",
|
|
42
|
-
"js-yaml": "^4.1.0",
|
|
43
41
|
"micromatch": "^4.0.8",
|
|
44
42
|
"morgan": "^1.10.0",
|
|
45
43
|
"multer": "^2.0.1",
|
|
46
44
|
"picocolors": "~1.1.1",
|
|
47
45
|
"source-map-support": "~0.5.21",
|
|
48
46
|
"xml2js": "^0.6.2",
|
|
47
|
+
"yaml": "~2.8.0",
|
|
49
48
|
"yargs": "~18.0.0"
|
|
50
49
|
},
|
|
51
50
|
"devDependencies": {
|
package/src/config/config.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { readFile } from "fs/promises";
|
|
2
|
-
import yaml from "
|
|
2
|
+
import yaml from "yaml";
|
|
3
3
|
import { Diagnostic } from "../utils/diagnostic-reporter.js";
|
|
4
4
|
import { SpecConfigJsonSchema } from "./config-schema.js";
|
|
5
5
|
import { SchemaValidator } from "./schema-validator.js";
|
|
@@ -9,7 +9,7 @@ const validator = new SchemaValidator(SpecConfigJsonSchema);
|
|
|
9
9
|
|
|
10
10
|
export async function loadSpecConfig(path: string): Promise<[SpecConfig, Diagnostic[]]> {
|
|
11
11
|
const content = await readFile(path);
|
|
12
|
-
const config: any = yaml.
|
|
12
|
+
const config: any = yaml.parse(content.toString());
|
|
13
13
|
const diagnostics = validator.validate(config, path);
|
|
14
14
|
return [config, diagnostics];
|
|
15
15
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { loadScenarios } from "../scenarios-resolver.js";
|
|
2
2
|
import { Diagnostic } from "../utils/diagnostic-reporter.js";
|
|
3
|
-
import { getCommit, getPackageJson } from "../utils/misc-utils.js";
|
|
3
|
+
import { getCommit, getPackageJson, type SpectorPackageJson } from "../utils/misc-utils.js";
|
|
4
4
|
import { ScenarioLocation, ScenarioManifest } from "@typespec/spec-coverage-sdk";
|
|
5
5
|
import { getSourceLocation, normalizePath, PackageJson } from "@typespec/compiler";
|
|
6
6
|
import { relative } from "path";
|
|
@@ -30,7 +30,7 @@ function getRepo(pkg: PackageJson): string | undefined {
|
|
|
30
30
|
}
|
|
31
31
|
export function createScenarioManifest(
|
|
32
32
|
scenariosPath: string,
|
|
33
|
-
pkg:
|
|
33
|
+
pkg: SpectorPackageJson | undefined,
|
|
34
34
|
commit: string,
|
|
35
35
|
scenarios: Scenario[],
|
|
36
36
|
): ScenarioManifest {
|
|
@@ -38,6 +38,7 @@ export function createScenarioManifest(
|
|
|
38
38
|
return {
|
|
39
39
|
version: pkg?.version ?? "?",
|
|
40
40
|
repo: pkg && getRepo(pkg),
|
|
41
|
+
sourceUrl: pkg?.spector?.sourceUrl,
|
|
41
42
|
packageName: pkg?.name,
|
|
42
43
|
displayName: pkg && ("displayName" in pkg ? pkg.displayName as string : undefined),
|
|
43
44
|
commit,
|
package/src/utils/misc-utils.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { PackageJson } from "@typespec/compiler";
|
|
1
2
|
import { execSync } from "child_process";
|
|
2
3
|
import { readFile, stat } from "fs/promises";
|
|
3
4
|
import { dirname, join } from "path";
|
|
@@ -18,9 +19,10 @@ export function getCommit(path: string): string {
|
|
|
18
19
|
return execSync("git rev-parse HEAD", { cwd: path }).toString().trim();
|
|
19
20
|
}
|
|
20
21
|
|
|
21
|
-
export interface PackageJson {
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
export interface SpectorPackageJson extends PackageJson {
|
|
23
|
+
spector?: {
|
|
24
|
+
sourceUrl?: string;
|
|
25
|
+
};
|
|
24
26
|
}
|
|
25
27
|
|
|
26
28
|
export async function getPackageJson(path: string): Promise<PackageJson | undefined> {
|