|
1 | 1 | import { filterAsync } from "@azure-tools/specs-shared/array"; |
2 | | -import { readFile } from "fs/promises"; |
| 2 | +import { defaultLogger } from "@azure-tools/specs-shared/logger"; |
| 3 | +import { Swagger } from "@azure-tools/specs-shared/swagger"; |
3 | 4 | import { globby } from "globby"; |
4 | 5 | import path, { basename, dirname, normalize } from "path"; |
5 | 6 | import pc from "picocolors"; |
@@ -103,12 +104,8 @@ export class CompileRule implements Rule { |
103 | 104 | const tspGeneratedSwaggers = await filterAsync( |
104 | 105 | allSwaggers, |
105 | 106 | async (swaggerPath: string) => { |
106 | | - const swaggerText = await readFile(swaggerPath, { encoding: "utf8" }); |
107 | | - const swaggerObj = JSON.parse(swaggerText); |
108 | | - return ( |
109 | | - swaggerObj["info"]?.["x-typespec-generated"] || |
110 | | - swaggerObj["info"]?.["x-cadl-generated"] |
111 | | - ); |
| 107 | + const swagger = new Swagger(swaggerPath, { logger: defaultLogger }); |
| 108 | + return (await swagger.getTypeSpecGenerated()) || (await swagger.getCadlGenerated()); |
112 | 109 | }, |
113 | 110 | ); |
114 | 111 |
|
@@ -178,7 +175,7 @@ export class CompileRule implements Rule { |
178 | 175 |
|
179 | 176 | const clientTsp = path.join(folder, "client.tsp"); |
180 | 177 | if (await fileExists(clientTsp)) { |
181 | | - let [err, stdout, stderr] = await runNpm([ |
| 178 | + const [err, stdout, stderr] = await runNpm([ |
182 | 179 | "exec", |
183 | 180 | "--no", |
184 | 181 | "--", |
|
0 commit comments