@typespec/openapi3 1.4.0-dev.17 → 1.4.0-dev.18
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/args.d.ts +1 -0
- package/dist/src/cli/actions/convert/args.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/convert-file.js +1 -1
- package/dist/src/cli/actions/convert/convert-file.js.map +1 -1
- package/dist/src/cli/actions/convert/convert.d.ts +5 -1
- package/dist/src/cli/actions/convert/convert.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/convert.js +2 -2
- package/dist/src/cli/actions/convert/convert.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-main.js +1 -1
- package/dist/src/cli/actions/convert/generators/generate-main.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-service-info.d.ts +1 -1
- package/dist/src/cli/actions/convert/generators/generate-service-info.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-service-info.js +4 -2
- package/dist/src/cli/actions/convert/generators/generate-service-info.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/context.d.ts +1 -1
- package/dist/src/cli/actions/convert/utils/context.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/context.js +4 -2
- package/dist/src/cli/actions/convert/utils/context.js.map +1 -1
- package/dist/src/cli/cli.js +6 -1
- package/dist/src/cli/cli.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/args.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/args.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}
|
|
@@ -9,7 +9,7 @@ export async function convertAction(host, args) {
|
|
|
9
9
|
const fullPath = resolvePath(process.cwd(), args.path);
|
|
10
10
|
const parser = new OpenAPIParser();
|
|
11
11
|
const model = await parser.bundle(fullPath);
|
|
12
|
-
const context = createContext(parser, model, console);
|
|
12
|
+
const context = createContext(parser, model, console, args.namespace);
|
|
13
13
|
const program = transform(context);
|
|
14
14
|
let mainTsp;
|
|
15
15
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-file.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert-file.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAa,EAAE,IAAoB;IACrE,2BAA2B;IAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,KAAyB,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"convert-file.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert-file.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAa,EAAE,IAAoB;IACrE,2BAA2B;IAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,KAAyB,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,OAAe,CAAC;IACpB,IAAI,CAAC;QACH,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,2BAA2B,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,WAAW,CAAC;IAChB,2DAA2D;IAC3D,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE;YACtC,UAAU,EAAE,GAAG;YACf,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,WAAW,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QACtC,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,2BAA2B,CAAC,WAAW,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC"}
|
|
@@ -4,6 +4,10 @@ export interface ConvertOpenAPI3DocumentOptions {
|
|
|
4
4
|
* Whether external $ref pointers will be resolved and included in the output.
|
|
5
5
|
*/
|
|
6
6
|
disableExternalRefs?: boolean;
|
|
7
|
+
/**
|
|
8
|
+
* The namespace name to use instead of generating from the OpenAPI title.
|
|
9
|
+
*/
|
|
10
|
+
namespace?: string;
|
|
7
11
|
}
|
|
8
|
-
export declare function convertOpenAPI3Document(document: OpenAPI3Document, { disableExternalRefs }?: ConvertOpenAPI3DocumentOptions): Promise<string>;
|
|
12
|
+
export declare function convertOpenAPI3Document(document: OpenAPI3Document, { disableExternalRefs, namespace }?: ConvertOpenAPI3DocumentOptions): Promise<string>;
|
|
9
13
|
//# sourceMappingURL=convert.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAKrD,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAKrD,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,gBAAgB,EAC1B,EAAE,mBAAmB,EAAE,SAAS,EAAE,GAAE,8BAAmC,mBAoBxE"}
|
|
@@ -3,7 +3,7 @@ import { formatTypeSpec } from "@typespec/compiler";
|
|
|
3
3
|
import { generateMain } from "./generators/generate-main.js";
|
|
4
4
|
import { transform } from "./transforms/transforms.js";
|
|
5
5
|
import { createContext } from "./utils/context.js";
|
|
6
|
-
export async function convertOpenAPI3Document(document, { disableExternalRefs } = {}) {
|
|
6
|
+
export async function convertOpenAPI3Document(document, { disableExternalRefs, namespace } = {}) {
|
|
7
7
|
const parser = new OpenAPIParser();
|
|
8
8
|
const bundleOptions = disableExternalRefs
|
|
9
9
|
? {
|
|
@@ -11,7 +11,7 @@ export async function convertOpenAPI3Document(document, { disableExternalRefs }
|
|
|
11
11
|
}
|
|
12
12
|
: {};
|
|
13
13
|
await parser.bundle(document, bundleOptions);
|
|
14
|
-
const context = createContext(parser, document, console);
|
|
14
|
+
const context = createContext(parser, document, console, namespace);
|
|
15
15
|
const program = transform(context);
|
|
16
16
|
const content = generateMain(program, context);
|
|
17
17
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAanD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,QAA0B,EAC1B,EAAE,mBAAmB,EAAE,SAAS,KAAqC,EAAE;IAEvE,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;IACnC,MAAM,aAAa,GAAG,mBAAmB;QACvC,CAAC,CAAC;YACE,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;SACvD;QACH,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,MAAM,CAAC,MAAM,CAAC,QAAe,EAAE,aAAa,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,OAAO,MAAM,cAAc,CAAC,OAAO,EAAE;YACnC,UAAU,EAAE,GAAG;YACf,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC"}
|
|
@@ -12,7 +12,7 @@ export function generateMain(program, context) {
|
|
|
12
12
|
using Http;
|
|
13
13
|
using OpenAPI;
|
|
14
14
|
|
|
15
|
-
${generateServiceInformation(program.serviceInfo, program.servers, program.tags)}
|
|
15
|
+
${generateServiceInformation(program.serviceInfo, program.servers, program.tags, context.rootNamespace)}
|
|
16
16
|
|
|
17
17
|
${program.types.map((t) => generateDataType(t, context)).join("\n\n")}
|
|
18
18
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-main.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,UAAU,YAAY,CAAC,OAAwB,EAAE,OAAgB;IACrE,OAAO;;;;;;;;IAQL,0BAA0B,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC;;
|
|
1
|
+
{"version":3,"file":"generate-main.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-main.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAExE,MAAM,UAAU,YAAY,CAAC,OAAwB,EAAE,OAAgB;IACrE,OAAO;;;;;;;;IAQL,0BAA0B,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC;;IAErG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;IAEnE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;;IAEzE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SACjC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;SACvE,IAAI,CAAC,MAAM,CAAC;IACb,eAAe,CAAC,OAAO,CAAC;GACzB,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { TypeSpecServer, TypeSpecServiceInfo, TypeSpecTagMetadata } from "../interfaces.js";
|
|
2
|
-
export declare function generateServiceInformation(serviceInfo: TypeSpecServiceInfo, servers?: TypeSpecServer[], tags?: TypeSpecTagMetadata[]): string;
|
|
2
|
+
export declare function generateServiceInformation(serviceInfo: TypeSpecServiceInfo, servers?: TypeSpecServer[], tags?: TypeSpecTagMetadata[], namespaceName?: string): string;
|
|
3
3
|
//# sourceMappingURL=generate-service-info.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-service-info.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-service-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAO5F,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,mBAAmB,EAChC,OAAO,GAAE,cAAc,EAAO,EAC9B,IAAI,GAAE,mBAAmB,EAAO,
|
|
1
|
+
{"version":3,"file":"generate-service-info.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-service-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAO5F,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,mBAAmB,EAChC,OAAO,GAAE,cAAc,EAAO,EAC9B,IAAI,GAAE,mBAAmB,EAAO,EAChC,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CA6BR"}
|
|
@@ -3,7 +3,7 @@ import { generateNamespaceName } from "../utils/generate-namespace-name.js";
|
|
|
3
3
|
import { toTspValues } from "../utils/tsp-values.js";
|
|
4
4
|
import { generateServers } from "./generate-servers.js";
|
|
5
5
|
import { generateTags } from "./generate-tags.js";
|
|
6
|
-
export function generateServiceInformation(serviceInfo, servers = [], tags = []) {
|
|
6
|
+
export function generateServiceInformation(serviceInfo, servers = [], tags = [], namespaceName) {
|
|
7
7
|
const definitions = [];
|
|
8
8
|
const { name, doc, ...info } = serviceInfo;
|
|
9
9
|
definitions.push(`
|
|
@@ -21,7 +21,9 @@ export function generateServiceInformation(serviceInfo, servers = [], tags = [])
|
|
|
21
21
|
if (tags.length > 0) {
|
|
22
22
|
definitions.push(generateTags(tags));
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
// Use provided namespace name, or fall back to generating from service name
|
|
25
|
+
const namespace = (namespaceName && generateNamespaceName(namespaceName)) || generateNamespaceName(name);
|
|
26
|
+
definitions.push(`namespace ${namespace};`);
|
|
25
27
|
return definitions.join("\n");
|
|
26
28
|
}
|
|
27
29
|
//# sourceMappingURL=generate-service-info.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-service-info.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-service-info.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,UAAU,0BAA0B,CACxC,WAAgC,EAChC,UAA4B,EAAE,EAC9B,OAA8B,EAAE;
|
|
1
|
+
{"version":3,"file":"generate-service-info.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-service-info.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,UAAU,0BAA0B,CACxC,WAAgC,EAChC,UAA4B,EAAE,EAC9B,OAA8B,EAAE,EAChC,aAAsB;IAEtB,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,WAAW,CAAC;IAE3C,WAAW,CAAC,IAAI,CAAC;;gBAEH,IAAI;;YAER,WAAW,CAAC,IAAI,CAAC;KACxB,CAAC,CAAC;IAEL,IAAI,GAAG,EAAE,CAAC;QACR,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,4EAA4E;IAC5E,MAAM,SAAS,GACb,CAAC,aAAa,IAAI,qBAAqB,CAAC,aAAa,CAAC,CAAC,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACzF,WAAW,CAAC,IAAI,CAAC,aAAa,SAAS,GAAG,CAAC,CAAC;IAE5C,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC"}
|
|
@@ -31,5 +31,5 @@ export interface Context {
|
|
|
31
31
|
export type Parser = {
|
|
32
32
|
$refs: OpenAPIParser["$refs"];
|
|
33
33
|
};
|
|
34
|
-
export declare function createContext(parser: Parser, openApi3Doc: OpenAPI3Document, logger?: Logger): Context;
|
|
34
|
+
export declare function createContext(parser: Parser, openApi3Doc: OpenAPI3Document, logger?: Logger, namespace?: string): Context;
|
|
35
35
|
//# sourceMappingURL=context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI3C,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,6BAA6B,CAC3B,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,EAC/B,YAAY,EAAE,MAAM,EAAE,EACtB,UAAU,CAAC,EAAE,OAAO,EACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAC1C,MAAM,CAAC;IACV,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACxD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;IACxD,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IAExC;;;OAGG;IACH,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAExF;;OAEG;IACH,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;IACtF;;OAEG;IACH,2CAA2C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAClE;;;OAGG;IACH,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,OAAO,EACnB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,SAAS,EACtD,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,OAAO,GACnB,MAAM,CAAC;CACX;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AAEF,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,gBAAgB,EAC7B,MAAM,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAI3C,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,WAAW,EAAE,gBAAgB,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,6BAA6B,CAC3B,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,EAC/B,YAAY,EAAE,MAAM,EAAE,EACtB,UAAU,CAAC,EAAE,OAAO,EACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAC1C,MAAM,CAAC;IACV,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACxD,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAAC;IACxD,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IAExC;;;OAGG;IACH,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC;IAExF;;OAEG;IACH,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,SAAS,CAAC;IACtF;;OAEG;IACH,2CAA2C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAClE;;;OAGG;IACH,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,OAAO,EACnB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,SAAS,EACtD,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,OAAO,GACnB,MAAM,CAAC;CACX;AAED,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAC/B,CAAC;AAEF,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,gBAAgB,EAC7B,MAAM,CAAC,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAyET"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { SchemaToExpressionGenerator } from "../generators/generate-types.js";
|
|
2
2
|
import { generateNamespaceName } from "./generate-namespace-name.js";
|
|
3
|
-
export function createContext(parser, openApi3Doc, logger) {
|
|
4
|
-
const rootNamespace =
|
|
3
|
+
export function createContext(parser, openApi3Doc, logger, namespace) {
|
|
4
|
+
const rootNamespace = namespace
|
|
5
|
+
? generateNamespaceName(namespace)
|
|
6
|
+
: generateNamespaceName(openApi3Doc.info.title);
|
|
5
7
|
const schemaExpressionGenerator = new SchemaToExpressionGenerator(rootNamespace);
|
|
6
8
|
// Track schemas that are used in multipart forms with their encoding information
|
|
7
9
|
const multipartSchemas = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAiDrE,MAAM,UAAU,aAAa,CAC3B,MAAc,EACd,WAA6B,EAC7B,MAAe;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/utils/context.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAiDrE,MAAM,UAAU,aAAa,CAC3B,MAAc,EACd,WAA6B,EAC7B,MAAe,EACf,SAAkB;IAElB,MAAM,aAAa,GAAG,SAAS;QAC7B,CAAC,CAAC,qBAAqB,CAAC,SAAS,CAAC;QAClC,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,yBAAyB,GAAG,IAAI,2BAA2B,CAAC,aAAa,CAAC,CAAC;IAEjF,iFAAiF;IACjF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAmD,CAAC;IAEpF,iDAAiD;IACjD,MAAM,aAAa,GAAW;QAC5B,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;QACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;KAChB,CAAC;IAEF,MAAM,OAAO,GAAY;QACvB,WAAW;QACX,aAAa;QACb,MAAM,EAAE,MAAM,IAAI,aAAa;QAC/B,UAAU,CAAC,GAAW,EAAE,YAAsB;YAC5C,OAAO,yBAAyB,CAAC,UAAU,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACjE,CAAC;QACD,6BAA6B,CAC3B,MAA+B,EAC/B,YAAsB,EACtB,UAAU,GAAG,KAAK,EAClB,QAA2C;YAE3C,OAAO,yBAAyB,CAAC,6BAA6B,CAC5D,MAAM,EACN,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,IAAI,CACL,CAAC;QACJ,CAAC;QACD,cAAc,CAAC,GAAG;YAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;QACD,QAAQ,CAAC,GAAG;YACV,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAQ,CAAC;QACtC,CAAC;QACD,uBAAuB,CAAC,GAAW,EAAE,QAA2C;YAC9E,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,IAAI,IAAI,CAAC,CAAC;QAC9C,CAAC;QACD,0BAA0B,CAAC,GAAW;YACpC,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QAC9C,CAAC;QACD,2CAA2C,CAAC,GAAW;YACrD,OAAO,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC;QACD,WAAW,CACT,QAAgB,EAChB,IAAY,EACZ,UAAmB,EACnB,QAAsD,EACtD,UAAmB,EACnB,WAAoB;YAEpB,OAAO,yBAAyB,CAAC,WAAW,CAC1C,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;QACJ,CAAC;KACF,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
package/dist/src/cli/cli.js
CHANGED
|
@@ -6,7 +6,7 @@ export async function main() {
|
|
|
6
6
|
const host = createCliHost();
|
|
7
7
|
return convertAction(host, cliArgs);
|
|
8
8
|
}
|
|
9
|
-
const cliUsage = `tsp-openapi3 <path/to/openapi3/file> --output-dir <path/to/output/directory
|
|
9
|
+
const cliUsage = `tsp-openapi3 <path/to/openapi3/file> --output-dir <path/to/output/directory> [--namespace <namespace>]`;
|
|
10
10
|
function parseCliArgs() {
|
|
11
11
|
const options = parseArgs({
|
|
12
12
|
args: process.argv.slice(2),
|
|
@@ -17,6 +17,9 @@ function parseCliArgs() {
|
|
|
17
17
|
"output-dir": {
|
|
18
18
|
type: "string",
|
|
19
19
|
},
|
|
20
|
+
namespace: {
|
|
21
|
+
type: "string",
|
|
22
|
+
},
|
|
20
23
|
},
|
|
21
24
|
allowPositionals: true,
|
|
22
25
|
});
|
|
@@ -45,6 +48,7 @@ function parseCliArgs() {
|
|
|
45
48
|
return {
|
|
46
49
|
"output-dir": options.values["output-dir"],
|
|
47
50
|
path: options.positionals[0],
|
|
51
|
+
namespace: options.values.namespace,
|
|
48
52
|
};
|
|
49
53
|
}
|
|
50
54
|
function displayHelp() {
|
|
@@ -57,6 +61,7 @@ function displayHelp() {
|
|
|
57
61
|
log(`\nOptions:`);
|
|
58
62
|
log(padArgumentUsage("--help", "Show help.", "[boolean]"));
|
|
59
63
|
log(padArgumentUsage("--output-dir", "The output directory for generated TypeSpec files. Will be created if it does not exist.", "[string] [required]"));
|
|
64
|
+
log(padArgumentUsage("--namespace", "The namespace name to use instead of generating from the OpenAPI title.", "[string]"));
|
|
60
65
|
}
|
|
61
66
|
function padArgumentUsage(name, description, type) {
|
|
62
67
|
// Assume 80 col width
|
package/dist/src/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,IAAI;IACxB,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,OAAO,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/openapi3",
|
|
3
|
-
"version": "1.4.0-dev.
|
|
3
|
+
"version": "1.4.0-dev.18",
|
|
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",
|