@typespec/openapi3 1.6.0-dev.0 → 1.6.0-dev.3
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/cli/actions/convert/generators/common.d.ts +3 -0
- package/dist/src/cli/actions/convert/generators/common.d.ts.map +1 -0
- package/dist/src/cli/actions/convert/generators/common.js +8 -0
- package/dist/src/cli/actions/convert/generators/common.js.map +1 -0
- package/dist/src/cli/actions/convert/generators/generate-servers.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-servers.js +9 -3
- package/dist/src/cli/actions/convert/generators/generate-servers.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/docs.d.ts +1 -1
- package/dist/src/cli/actions/convert/utils/docs.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/docs.js +7 -8
- package/dist/src/cli/actions/convert/utils/docs.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/common.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKnD"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/** Render a TypeSpec string literal. Automatically render a multiline one if needed */
|
|
2
|
+
export function stringLiteral(value) {
|
|
3
|
+
if (value.includes("\n")) {
|
|
4
|
+
return `"""\n${value}\n"""`;
|
|
5
|
+
}
|
|
6
|
+
return `"${value.replaceAll('"', '\\"')}"`;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=common.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/common.ts"],"names":[],"mappings":"AAAA,uFAAuF;AACvF,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACzB,OAAO,QAAQ,KAAK,OAAO,CAAC;IAC9B,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;AAC7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-servers.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-servers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA0B,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate-servers.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-servers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA0B,MAAM,kBAAkB,CAAC;AAkB1E,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CAmBjE"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { generateDocs } from "../utils/docs.js";
|
|
2
|
+
import { stringLiteral } from "./common.js";
|
|
1
3
|
function generateServerVariable(variableName, variable) {
|
|
2
4
|
const { default: defaultValue, description, enum: enumValues } = variable;
|
|
3
5
|
const enumString = enumValues ? `${enumValues.map((x) => `"${x}"`).join(" | ")}` : "";
|
|
4
6
|
return `
|
|
5
|
-
${description ?
|
|
7
|
+
${description ? generateDocs(description) + "\n" : ""}
|
|
6
8
|
${variableName}: ${enumString || "string"}${defaultValue ? ` = "${defaultValue}"` : ""},
|
|
7
9
|
`;
|
|
8
10
|
}
|
|
@@ -21,8 +23,12 @@ export function generateServers(servers) {
|
|
|
21
23
|
${generateServerVariables(server.variables)}
|
|
22
24
|
}`
|
|
23
25
|
: "";
|
|
24
|
-
const description = server.description
|
|
25
|
-
|
|
26
|
+
const description = server.description
|
|
27
|
+
? `, ${stringLiteral(server.description)}`
|
|
28
|
+
: variables
|
|
29
|
+
? `, ""`
|
|
30
|
+
: "";
|
|
31
|
+
return `@server(${stringLiteral(server.url)}${description}${variables})`;
|
|
26
32
|
});
|
|
27
33
|
return definitions.join("\n");
|
|
28
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-servers.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-servers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate-servers.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-servers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,SAAS,sBAAsB,CAAC,YAAoB,EAAE,QAAgC;IACpF,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;IAC1E,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACtF,OAAO;MACH,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE;MACnD,YAAY,KAAK,UAAU,IAAI,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,OAAO,YAAY,GAAG,CAAC,CAAC,CAAC,EAAE;GACvF,CAAC;AACJ,CAAC;AACD,SAAS,uBAAuB,CAAC,SAAiD;IAChF,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;SAC7B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SACjE,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAyB;IACvD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACzC,MAAM,SAAS,GACb,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC;YAC1D,CAAC,CAAC;UACA,uBAAuB,CAAC,MAAM,CAAC,SAAS,CAAC;QAC3C;YACA,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW;YACpC,CAAC,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC1C,CAAC,CAAC,SAAS;gBACT,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,EAAE,CAAC;QACT,OAAO,WAAW,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,GAAG,SAAS,GAAG,CAAC;IAC3E,CAAC,CAAC,CAAC;IACH,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function generateDocs(doc: string
|
|
1
|
+
export declare function generateDocs(doc: string): string;
|
|
2
2
|
//# sourceMappingURL=docs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docs.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/docs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"docs.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/docs.ts"],"names":[],"mappings":"AAEA,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAahD"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
|
+
import { stringLiteral } from "../generators/common.js";
|
|
1
2
|
export function generateDocs(doc) {
|
|
2
3
|
if (isEmptyDoc(doc)) {
|
|
3
4
|
return ``;
|
|
4
5
|
}
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
return `@doc("""\n${split.join("\n").replace(/\\/g, "\\\\").replace(/"/g, '\\"')}\n""")`;
|
|
12
|
-
}
|
|
6
|
+
if (doc.includes("*/")) {
|
|
7
|
+
return `@doc(${stringLiteral(doc)})`;
|
|
8
|
+
}
|
|
9
|
+
const split = splitNewlines(doc.replaceAll("@", "\\@"));
|
|
10
|
+
if (split.length === 1) {
|
|
11
|
+
return `/** ${split[0]} */`;
|
|
13
12
|
}
|
|
14
13
|
return `/**\n* ${split.join("\n* ")}\n*/`;
|
|
15
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docs.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/docs.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"docs.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/docs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACvB,OAAO,QAAQ,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC;IACvC,CAAC;IACD,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IACxD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9B,CAAC;IACD,OAAO,UAAU,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;AAC5C,CAAC;AAED,SAAS,aAAa,CAAC,GAAsB;IAC3C,IAAI,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC1D,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC7C,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAE3C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,SAAS,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,UAAU,CAAC,GAAuB;IACzC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/openapi3",
|
|
3
|
-
"version": "1.6.0-dev.
|
|
3
|
+
"version": "1.6.0-dev.3",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec library for emitting OpenAPI 3.0 and OpenAPI 3.1 from the TypeSpec REST protocol binding and converting OpenAPI3 to TypeSpec",
|
|
6
6
|
"homepage": "https://typespec.io",
|