@typespec/openapi3 1.6.0-dev.9 → 1.6.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/dist/src/cli/actions/convert/convert.d.ts +2 -2
- package/dist/src/cli/actions/convert/convert.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/convert.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-main.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-main.js +8 -2
- package/dist/src/cli/actions/convert/generators/generate-main.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-model.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-model.js +129 -4
- package/dist/src/cli/actions/convert/generators/generate-model.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.js +17 -3
- package/dist/src/cli/actions/convert/generators/generate-response-expressions.js.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-types.d.ts +6 -6
- package/dist/src/cli/actions/convert/generators/generate-types.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/generators/generate-types.js +4 -1
- package/dist/src/cli/actions/convert/generators/generate-types.js.map +1 -1
- package/dist/src/cli/actions/convert/interfaces.d.ts +9 -9
- package/dist/src/cli/actions/convert/interfaces.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-component-parameters.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-component-parameters.js +5 -2
- package/dist/src/cli/actions/convert/transforms/transform-component-parameters.js.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-component-schemas.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-component-schemas.js +29 -13
- package/dist/src/cli/actions/convert/transforms/transform-component-schemas.js.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-paths.d.ts +2 -2
- package/dist/src/cli/actions/convert/transforms/transform-paths.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transform-paths.js +3 -3
- package/dist/src/cli/actions/convert/transforms/transform-paths.js.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transforms.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/transforms/transforms.js +117 -8
- package/dist/src/cli/actions/convert/transforms/transforms.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/context.d.ts +22 -5
- package/dist/src/cli/actions/convert/utils/context.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/context.js +16 -0
- package/dist/src/cli/actions/convert/utils/context.js.map +1 -1
- package/dist/src/cli/actions/convert/utils/decorators.d.ts +3 -3
- package/dist/src/cli/actions/convert/utils/decorators.d.ts.map +1 -1
- package/dist/src/cli/actions/convert/utils/decorators.js +24 -6
- package/dist/src/cli/actions/convert/utils/decorators.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/lib.d.ts +18 -3
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +9 -1
- package/dist/src/lib.js.map +1 -1
- package/dist/src/openapi-spec-mappings.d.ts +2 -0
- package/dist/src/openapi-spec-mappings.d.ts.map +1 -1
- package/dist/src/openapi-spec-mappings.js +10 -0
- package/dist/src/openapi-spec-mappings.js.map +1 -1
- package/dist/src/openapi.d.ts.map +1 -1
- package/dist/src/openapi.js +45 -8
- package/dist/src/openapi.js.map +1 -1
- package/dist/src/range.d.ts +4 -0
- package/dist/src/range.d.ts.map +1 -0
- package/dist/src/range.js +22 -0
- package/dist/src/range.js.map +1 -0
- package/dist/src/schema-emitter.d.ts +5 -2
- package/dist/src/schema-emitter.d.ts.map +1 -1
- package/dist/src/schema-emitter.js +6 -3
- package/dist/src/schema-emitter.js.map +1 -1
- package/dist/src/sse-module.d.ts +10 -0
- package/dist/src/sse-module.d.ts.map +1 -0
- package/dist/src/sse-module.js +125 -0
- package/dist/src/sse-module.js.map +1 -0
- package/dist/src/types.d.ts +337 -23
- package/dist/src/types.d.ts.map +1 -1
- package/dist/version.js +1 -1
- package/package.json +35 -19
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SupportedOpenAPIDocuments } from "../../../types.js";
|
|
2
2
|
export interface ConvertOpenAPI3DocumentOptions {
|
|
3
3
|
/**
|
|
4
4
|
* Whether external $ref pointers will be resolved and included in the output.
|
|
@@ -9,5 +9,5 @@ export interface ConvertOpenAPI3DocumentOptions {
|
|
|
9
9
|
*/
|
|
10
10
|
namespace?: string;
|
|
11
11
|
}
|
|
12
|
-
export declare function convertOpenAPI3Document(document:
|
|
12
|
+
export declare function convertOpenAPI3Document(document: SupportedOpenAPIDocuments, { disableExternalRefs, namespace }?: ConvertOpenAPI3DocumentOptions): Promise<string>;
|
|
13
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,
|
|
1
|
+
{"version":3,"file":"convert.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAK9D,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,yBAAyB,EACnC,EAAE,mBAAmB,EAAE,SAAS,EAAE,GAAE,8BAAmC,mBA2BxE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,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,
|
|
1
|
+
{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/convert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAChE,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,QAAmC,EACnC,EAAE,mBAAmB,EAAE,SAAS,KAAqC,EAAE;IAEvE,MAAM,kBAAkB,GAAG,mBAAmB;QAC5C,CAAC,CAAC;YACE,aAAa,EAAE,CAAC,IAAwC,EAAQ,EAAE;gBAChE,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC7B,OAAO;gBACT,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,wDAAwD,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtF,CAAC;SACF;QACH,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAC1E,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5D,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-main.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"generate-main.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAO9C,wBAAgB,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CA4B/E"}
|
|
@@ -4,13 +4,19 @@ import { generateNamespace } from "./generate-namespace.js";
|
|
|
4
4
|
import { generateOperation } from "./generate-operation.js";
|
|
5
5
|
import { generateServiceInformation } from "./generate-service-info.js";
|
|
6
6
|
export function generateMain(program, context) {
|
|
7
|
+
const sseImports = context.isSSEUsed()
|
|
8
|
+
? ` import "@typespec/streams";
|
|
9
|
+
import "@typespec/sse";
|
|
10
|
+
import "@typespec/events";`
|
|
11
|
+
: "";
|
|
12
|
+
const sseUsings = context.isSSEUsed() ? "\n using SSE;" : "";
|
|
7
13
|
return `
|
|
8
14
|
import "@typespec/http";
|
|
9
15
|
import "@typespec/openapi";
|
|
10
|
-
import "@typespec/openapi3"
|
|
16
|
+
import "@typespec/openapi3";${sseImports}
|
|
11
17
|
|
|
12
18
|
using Http;
|
|
13
|
-
using OpenAPI
|
|
19
|
+
using OpenAPI;${sseUsings}
|
|
14
20
|
|
|
15
21
|
${generateServiceInformation(program.serviceInfo, program.servers, program.tags, context.rootNamespace)}
|
|
16
22
|
|
|
@@ -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
|
|
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,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,EAAE;QACpC,CAAC,CAAC;;6BAEuB;QACzB,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9D,OAAO;;;gCAGuB,UAAU;;;kBAGxB,SAAS;;IAEvB,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-model.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"generate-model.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAmC,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAEL,iBAAiB,EAGjB,qBAAqB,EAGtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAa9C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAalF;AAsUD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,qBAAqB,EAC3B,cAAc,EAAE,MAAM,EAAE,EACxB,OAAO,EAAE,OAAO,EAChB,uCAAuC,CAAC,EAAE,OAAO,EACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAC1C,MAAM,CAkBR;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,qBAAqB,EAAE,EAC9B,cAAc,EAAE,MAAM,EAAE,EACxB,OAAO,EAAE,OAAO,GACf,MAAM,CAER"}
|
|
@@ -3,6 +3,7 @@ import { getDecoratorsForSchema } from "../utils/decorators.js";
|
|
|
3
3
|
import { generateDocs } from "../utils/docs.js";
|
|
4
4
|
import { generateDecorators } from "./generate-decorators.js";
|
|
5
5
|
import { getTypeSpecPrimitiveFromSchema, isReferencedEnumType, isReferencedUnionType, SchemaToExpressionGenerator, } from "./generate-types.js";
|
|
6
|
+
const SSE_TERMINAL_EVENT_EXTENSION = "x-ms-sse-terminal-event";
|
|
6
7
|
export function generateDataType(type, context) {
|
|
7
8
|
switch (type.kind) {
|
|
8
9
|
case "alias":
|
|
@@ -53,6 +54,119 @@ function generateScalar(scalar, context) {
|
|
|
53
54
|
}
|
|
54
55
|
return definitions.join("\n");
|
|
55
56
|
}
|
|
57
|
+
function generateSSEEventVariants(members, union, context, getVariantName) {
|
|
58
|
+
// Generate SSE event variants: eventName: DataType,
|
|
59
|
+
// Sort so terminal events come last
|
|
60
|
+
const sortedMembers = [...members].sort((a, b) => {
|
|
61
|
+
const aSchema = "$ref" in a ? context.getSchemaByRef(a.$ref) : a;
|
|
62
|
+
const bSchema = "$ref" in b ? context.getSchemaByRef(b.$ref) : b;
|
|
63
|
+
const aIsTerminal = !!aSchema?.[SSE_TERMINAL_EVENT_EXTENSION];
|
|
64
|
+
const bIsTerminal = !!bSchema?.[SSE_TERMINAL_EVENT_EXTENSION];
|
|
65
|
+
if (aIsTerminal && !bIsTerminal)
|
|
66
|
+
return 1; // a comes after b
|
|
67
|
+
if (!aIsTerminal && bIsTerminal)
|
|
68
|
+
return -1; // a comes before b
|
|
69
|
+
return 0; // maintain original order for same type
|
|
70
|
+
});
|
|
71
|
+
return sortedMembers.map((member) => {
|
|
72
|
+
try {
|
|
73
|
+
const memberSchema = "$ref" in member ? context.getSchemaByRef(member.$ref) : member;
|
|
74
|
+
if (!memberSchema || typeof memberSchema !== "object" || !memberSchema.properties) {
|
|
75
|
+
// Fallback to regular generation if we can't parse the event structure
|
|
76
|
+
return (getVariantName(member) + context.generateTypeFromRefableSchema(member, union.scope) + ",");
|
|
77
|
+
}
|
|
78
|
+
// Use any to access properties since the types are complex
|
|
79
|
+
const props = memberSchema.properties;
|
|
80
|
+
// Extract event name from event.const
|
|
81
|
+
let eventName;
|
|
82
|
+
if (props.event) {
|
|
83
|
+
const eventProp = props.event;
|
|
84
|
+
if ("const" in eventProp && eventProp.const && typeof eventProp.const === "string") {
|
|
85
|
+
eventName = eventProp.const;
|
|
86
|
+
}
|
|
87
|
+
else if ("enum" in eventProp &&
|
|
88
|
+
eventProp.enum?.[0] &&
|
|
89
|
+
typeof eventProp.enum[0] === "string") {
|
|
90
|
+
eventName = eventProp.enum[0];
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
// Check for terminal events or special cases
|
|
94
|
+
if (!eventName) {
|
|
95
|
+
// Check if this is a terminal event (no event name, just data)
|
|
96
|
+
if ("const" in props.data && props.data.const) {
|
|
97
|
+
const terminalValue = props.data.const;
|
|
98
|
+
const isTerminal = memberSchema[SSE_TERMINAL_EVENT_EXTENSION];
|
|
99
|
+
const contentType = "contentMediaType" in props.data && props.data.contentMediaType;
|
|
100
|
+
let decorators = "";
|
|
101
|
+
if (contentType) {
|
|
102
|
+
decorators += `\n @TypeSpec.Events.contentType("${contentType}")`;
|
|
103
|
+
}
|
|
104
|
+
if (isTerminal) {
|
|
105
|
+
decorators += `\n @TypeSpec.SSE.terminalEvent`;
|
|
106
|
+
decorators += `\n @extension("${SSE_TERMINAL_EVENT_EXTENSION}", true)`;
|
|
107
|
+
}
|
|
108
|
+
return `${decorators}\n "${terminalValue}",`;
|
|
109
|
+
}
|
|
110
|
+
// Fallback to regular generation
|
|
111
|
+
return (getVariantName(member) + context.generateTypeFromRefableSchema(member, union.scope) + ",");
|
|
112
|
+
}
|
|
113
|
+
// Extract data type and content type from data.contentSchema
|
|
114
|
+
let dataType = "unknown";
|
|
115
|
+
let contentType;
|
|
116
|
+
if (props.data) {
|
|
117
|
+
const dataProp = props.data;
|
|
118
|
+
// Get content type if specified
|
|
119
|
+
if ("contentMediaType" in dataProp && dataProp.contentMediaType) {
|
|
120
|
+
contentType = dataProp.contentMediaType;
|
|
121
|
+
}
|
|
122
|
+
// Check for contentSchema (OpenAPI extension)
|
|
123
|
+
if ("contentSchema" in dataProp && dataProp.contentSchema) {
|
|
124
|
+
const contentSchema = dataProp.contentSchema;
|
|
125
|
+
// Special handling for byte data which should map to Base64/bytes
|
|
126
|
+
if (contentSchema &&
|
|
127
|
+
typeof contentSchema === "object" &&
|
|
128
|
+
"type" in contentSchema &&
|
|
129
|
+
contentSchema.type === "object" &&
|
|
130
|
+
contentSchema.properties?.data) {
|
|
131
|
+
const dataProperty = contentSchema.properties.data;
|
|
132
|
+
if ("type" in dataProperty &&
|
|
133
|
+
dataProperty.type === "string" &&
|
|
134
|
+
"format" in dataProperty &&
|
|
135
|
+
dataProperty.format === "byte") {
|
|
136
|
+
dataType = "Base64";
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
dataType = context.generateTypeFromRefableSchema(dataProp.contentSchema, union.scope);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
dataType = context.generateTypeFromRefableSchema(dataProp.contentSchema, union.scope);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
else if ("type" in dataProp && dataProp.type && typeof dataProp.type === "string") {
|
|
147
|
+
// Simple type like string
|
|
148
|
+
dataType = dataProp.type;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
// Build decorators for this event variant
|
|
152
|
+
let decorators = "";
|
|
153
|
+
if (contentType && contentType !== "application/json") {
|
|
154
|
+
decorators += `\n @TypeSpec.Events.contentType("${contentType}")`;
|
|
155
|
+
}
|
|
156
|
+
// Check if this is a terminal event
|
|
157
|
+
const isTerminal = memberSchema[SSE_TERMINAL_EVENT_EXTENSION];
|
|
158
|
+
if (isTerminal) {
|
|
159
|
+
decorators += `\n @TypeSpec.SSE.terminalEvent`;
|
|
160
|
+
decorators += `\n @extension("${SSE_TERMINAL_EVENT_EXTENSION}", true)`;
|
|
161
|
+
}
|
|
162
|
+
return `${decorators}\n ${eventName}: ${dataType},`;
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
// If any error occurs, fall back to regular generation
|
|
166
|
+
return (getVariantName(member) + context.generateTypeFromRefableSchema(member, union.scope) + ",");
|
|
167
|
+
}
|
|
168
|
+
});
|
|
169
|
+
}
|
|
56
170
|
function generateUnion(union, context) {
|
|
57
171
|
const definitions = [];
|
|
58
172
|
if (union.doc) {
|
|
@@ -66,19 +180,30 @@ function generateUnion(union, context) {
|
|
|
66
180
|
return "";
|
|
67
181
|
}
|
|
68
182
|
const memberSchema = "$ref" in member ? context.getSchemaByRef(member.$ref) : member;
|
|
183
|
+
const propertySchema = memberSchema.properties && memberSchema.properties[union.schema.discriminator.propertyName];
|
|
69
184
|
const value = (union.schema.discriminator?.mapping && "$ref" in member
|
|
70
185
|
? Object.entries(union.schema.discriminator.mapping).find((x) => x[1] === member.$ref)?.[0]
|
|
71
186
|
: undefined) ??
|
|
72
|
-
|
|
187
|
+
(propertySchema && "enum" in propertySchema && propertySchema.enum?.[0]);
|
|
73
188
|
// checking whether the value is using an invalid character as an identifier
|
|
74
|
-
const valueIdentifier = value ? printIdentifier(value
|
|
189
|
+
const valueIdentifier = value ? printIdentifier(`${value}`, "disallow-reserved") : "";
|
|
75
190
|
return value ? `${value === valueIdentifier ? value : valueIdentifier}: ` : "";
|
|
76
191
|
};
|
|
77
192
|
if (schema.enum) {
|
|
78
193
|
definitions.push(...schema.enum.map((e) => `${JSON.stringify(e)},`));
|
|
79
194
|
}
|
|
80
195
|
else if (schema.oneOf) {
|
|
81
|
-
|
|
196
|
+
// Check if this is an SSE event union
|
|
197
|
+
const isSSEEventUnion = union.decorators.some((d) => d.name === "TypeSpec.Events.events" || d.name === "events");
|
|
198
|
+
if (isSSEEventUnion) {
|
|
199
|
+
definitions.push(...generateSSEEventVariants(schema.oneOf, union, context, getVariantName));
|
|
200
|
+
}
|
|
201
|
+
else {
|
|
202
|
+
// Regular union generation
|
|
203
|
+
definitions.push(...schema.oneOf.map((member) => getVariantName(member) +
|
|
204
|
+
context.generateTypeFromRefableSchema(member, union.scope) +
|
|
205
|
+
","));
|
|
206
|
+
}
|
|
82
207
|
}
|
|
83
208
|
else if (schema.anyOf) {
|
|
84
209
|
definitions.push(...schema.anyOf.map((member) => getVariantName(member) + context.generateTypeFromRefableSchema(member, union.scope) + ","));
|
|
@@ -114,7 +239,7 @@ function generateUnion(union, context) {
|
|
|
114
239
|
definitions.push(`${arrayType},`);
|
|
115
240
|
}
|
|
116
241
|
}
|
|
117
|
-
if (schema.nullable) {
|
|
242
|
+
if ("nullable" in schema && schema.nullable) {
|
|
118
243
|
definitions.push("null,");
|
|
119
244
|
}
|
|
120
245
|
definitions.push("}");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-model.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generate-model.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -121,6 +121,20 @@ function generateResponseExpressions({ statusCode, contents, context, headers, o
|
|
|
121
121
|
return [generateModelExpression(modelProps, operationScope, context)];
|
|
122
122
|
}
|
|
123
123
|
return contents.map(([mediaType, content]) => {
|
|
124
|
+
// Special handling for Server-Sent Events
|
|
125
|
+
if (!context.openApi3Doc.openapi.startsWith("3.0") &&
|
|
126
|
+
!context.openApi3Doc.openapi.startsWith("3.1") &&
|
|
127
|
+
mediaType === "text/event-stream" &&
|
|
128
|
+
"itemSchema" in content &&
|
|
129
|
+
content.itemSchema &&
|
|
130
|
+
typeof content.itemSchema === "object" &&
|
|
131
|
+
"$ref" in content.itemSchema) {
|
|
132
|
+
// Check for itemSchema (OpenAPI 3.2 extension)
|
|
133
|
+
const eventUnionType = context.generateTypeFromRefableSchema(content.itemSchema, operationScope);
|
|
134
|
+
context.markSSEUsage();
|
|
135
|
+
return `SSEStream<${eventUnionType}>`;
|
|
136
|
+
// If no proper schema reference, fall through to regular handling
|
|
137
|
+
}
|
|
124
138
|
// Attempt to emit just the Body or an intersection of Body & MappedResponse
|
|
125
139
|
// if there aren't any custom headers.
|
|
126
140
|
const bodySchema = content.schema;
|
|
@@ -230,10 +244,10 @@ function convertHeaderToProperty(props) {
|
|
|
230
244
|
}
|
|
231
245
|
return {
|
|
232
246
|
name: normalizedName,
|
|
233
|
-
decorators: [headerDecorator, ...getDecoratorsForSchema(header.schema)],
|
|
234
|
-
doc: props.header.description ?? header.description ?? header.schema
|
|
247
|
+
decorators: [headerDecorator, ...(header.schema ? getDecoratorsForSchema(header.schema) : [])],
|
|
248
|
+
doc: props.header.description ?? header.description ?? header.schema?.description,
|
|
235
249
|
isOptional: !header.required,
|
|
236
|
-
schema: header.schema,
|
|
250
|
+
schema: header.schema ?? {},
|
|
237
251
|
};
|
|
238
252
|
}
|
|
239
253
|
// Map of statusCodes to their Response
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-response-expressions.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-response-expressions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generate-response-expressions.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-response-expressions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { OpenAPI3Encoding,
|
|
1
|
+
import { OpenAPI3Encoding, Refable, SupportedOpenAPISchema } from "../../../../types.js";
|
|
2
2
|
import { Context } from "../utils/context.js";
|
|
3
3
|
export declare class SchemaToExpressionGenerator {
|
|
4
4
|
rootNamespace: string;
|
|
5
5
|
constructor(rootNamespace: string);
|
|
6
|
-
generateTypeFromRefableSchema(schema: Refable<
|
|
7
|
-
generateArrayType(schema:
|
|
6
|
+
generateTypeFromRefableSchema(schema: Refable<SupportedOpenAPISchema>, callingScope: string[], isHttpPart?: boolean, encoding?: Record<string, OpenAPI3Encoding>, context?: Context): string;
|
|
7
|
+
generateArrayType(schema: SupportedOpenAPISchema, callingScope: string[]): string;
|
|
8
8
|
getRefName(ref: string, callingScope: string[]): string;
|
|
9
9
|
private getRefScopeAndName;
|
|
10
10
|
private getTypeFromSchema;
|
|
@@ -22,7 +22,7 @@ export declare class SchemaToExpressionGenerator {
|
|
|
22
22
|
static readonly decoratorNamesToExcludeForParts: string[];
|
|
23
23
|
private getObjectType;
|
|
24
24
|
}
|
|
25
|
-
export declare function isReferencedEnumType(propSchema:
|
|
26
|
-
export declare function isReferencedUnionType(propSchema:
|
|
27
|
-
export declare function getTypeSpecPrimitiveFromSchema(schema:
|
|
25
|
+
export declare function isReferencedEnumType(propSchema: Refable<SupportedOpenAPISchema>, context: Context): boolean;
|
|
26
|
+
export declare function isReferencedUnionType(propSchema: Refable<SupportedOpenAPISchema>, context: Context): boolean;
|
|
27
|
+
export declare function getTypeSpecPrimitiveFromSchema(schema: SupportedOpenAPISchema): string | undefined;
|
|
28
28
|
//# sourceMappingURL=generate-types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-types.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-types.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,
|
|
1
|
+
{"version":3,"file":"generate-types.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-types.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAEhB,OAAO,EACP,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAQ9C,qBAAa,2BAA2B;IACnB,aAAa,EAAE,MAAM;gBAArB,aAAa,EAAE,MAAM;IAEjC,6BAA6B,CAClC,MAAM,EAAE,OAAO,CAAC,sBAAsB,CAAC,EACvC,YAAY,EAAE,MAAM,EAAE,EACtB,UAAU,UAAQ,EAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAC3C,OAAO,CAAC,EAAE,OAAO,GAChB,MAAM;IAOF,iBAAiB,CAAC,MAAM,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM;IAcjF,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM;IAK9D,OAAO,CAAC,kBAAkB;IAoC1B,OAAO,CAAC,iBAAiB;IAqFzB,OAAO,CAAC,oBAAoB;IAuD5B,OAAO,CAAC,YAAY;IAqCpB,OAAO,CAAC,uBAAuB;IAsD/B,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,YAAY;IAYb,WAAW,CAChB,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;IAyBT,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,6BAA6B;IAGrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAkB3B;IAEF,gBAAuB,+BAA+B,EAAE,MAAM,EAAE,CAA4B;IAE5F,OAAO,CAAC,aAAa;CAwDtB;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,OAAO,CAAC,sBAAsB,CAAC,EAC3C,OAAO,EAAE,OAAO,GACf,OAAO,CAeT;AAED,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,OAAO,CAAC,sBAAsB,CAAC,EAC3C,OAAO,EAAE,OAAO,GACf,OAAO,CAmBT;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,GAAG,SAAS,CAajG"}
|
|
@@ -131,7 +131,7 @@ export class SchemaToExpressionGenerator {
|
|
|
131
131
|
// this is a fallback to maintain compatibility and it needs to be in the last cases
|
|
132
132
|
type = this.generateArrayType(schema, callingScope);
|
|
133
133
|
}
|
|
134
|
-
if (schema.nullable) {
|
|
134
|
+
if ("nullable" in schema && schema.nullable) {
|
|
135
135
|
type += ` | null`;
|
|
136
136
|
}
|
|
137
137
|
// Check for default value - either at top level or from union members
|
|
@@ -230,6 +230,7 @@ export class SchemaToExpressionGenerator {
|
|
|
230
230
|
if (strippedSchema.items) {
|
|
231
231
|
strippedSchema.items = this.stripDefaultsFromSchema(strippedSchema.items);
|
|
232
232
|
}
|
|
233
|
+
// in the next blocks the casts are ugly but safe because the stripped schema is going to be the same as the original one
|
|
233
234
|
if (strippedSchema.anyOf) {
|
|
234
235
|
strippedSchema.anyOf = strippedSchema.anyOf.map((item) => this.stripDefaultsFromSchema(item));
|
|
235
236
|
}
|
|
@@ -438,6 +439,8 @@ function getIntegerType(schema) {
|
|
|
438
439
|
return format;
|
|
439
440
|
case "double-int":
|
|
440
441
|
return "safeint";
|
|
442
|
+
case "unixtime":
|
|
443
|
+
return "utcDateTime";
|
|
441
444
|
default:
|
|
442
445
|
return "integer";
|
|
443
446
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-types.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generate-types.js","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/generators/generate-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Contact, License } from "@typespec/openapi";
|
|
2
|
-
import { OpenAPI3Encoding, OpenAPI3Responses,
|
|
2
|
+
import { OpenAPI3Encoding, OpenAPI3Responses, Refable, SupportedOpenAPISchema } from "../../../types.js";
|
|
3
3
|
export interface TypeSpecProgram {
|
|
4
4
|
serviceInfo: TypeSpecServiceInfo;
|
|
5
5
|
namespaces: Record<string, TypeSpecNamespace>;
|
|
@@ -68,7 +68,7 @@ export type TypeSpecDataTypes = TypeSpecAlias | TypeSpecEnum | TypeSpecModel | T
|
|
|
68
68
|
export interface TypeSpecModel extends TypeSpecDeclaration {
|
|
69
69
|
kind: "model";
|
|
70
70
|
properties: TypeSpecModelProperty[];
|
|
71
|
-
additionalProperties?: Refable<
|
|
71
|
+
additionalProperties?: Refable<SupportedOpenAPISchema>;
|
|
72
72
|
/**
|
|
73
73
|
* Note: Only one of `extends` or `is` should be specified.
|
|
74
74
|
*/
|
|
@@ -80,7 +80,7 @@ export interface TypeSpecModel extends TypeSpecDeclaration {
|
|
|
80
80
|
/**
|
|
81
81
|
* Defaults to 'object'
|
|
82
82
|
*/
|
|
83
|
-
type?:
|
|
83
|
+
type?: SupportedOpenAPISchema["type"];
|
|
84
84
|
spread?: string[];
|
|
85
85
|
/**
|
|
86
86
|
* Whether the model is referenced as a multipart request body and needs to be emitted as a set of http parts
|
|
@@ -97,15 +97,15 @@ export interface TypeSpecAlias extends Pick<TypeSpecDeclaration, "name" | "doc"
|
|
|
97
97
|
}
|
|
98
98
|
export interface TypeSpecEnum extends TypeSpecDeclaration {
|
|
99
99
|
kind: "enum";
|
|
100
|
-
schema:
|
|
100
|
+
schema: SupportedOpenAPISchema;
|
|
101
101
|
}
|
|
102
102
|
export interface TypeSpecUnion extends TypeSpecDeclaration {
|
|
103
103
|
kind: "union";
|
|
104
|
-
schema:
|
|
104
|
+
schema: SupportedOpenAPISchema;
|
|
105
105
|
}
|
|
106
106
|
export interface TypeSpecScalar extends TypeSpecDeclaration {
|
|
107
107
|
kind: "scalar";
|
|
108
|
-
schema:
|
|
108
|
+
schema: SupportedOpenAPISchema;
|
|
109
109
|
}
|
|
110
110
|
export interface TypeSpecModelProperty {
|
|
111
111
|
name: string;
|
|
@@ -117,7 +117,7 @@ export interface TypeSpecModelProperty {
|
|
|
117
117
|
* Example: location decorators for parameters
|
|
118
118
|
*/
|
|
119
119
|
decorators: TypeSpecDecorator[];
|
|
120
|
-
schema: Refable<
|
|
120
|
+
schema: Refable<SupportedOpenAPISchema>;
|
|
121
121
|
}
|
|
122
122
|
export interface TypeSpecOperation extends TypeSpecDeclaration {
|
|
123
123
|
operationId?: string;
|
|
@@ -132,13 +132,13 @@ export interface TypeSpecOperationParameter {
|
|
|
132
132
|
doc?: string;
|
|
133
133
|
decorators: TypeSpecDecorator[];
|
|
134
134
|
isOptional: boolean;
|
|
135
|
-
schema: Refable<
|
|
135
|
+
schema: Refable<SupportedOpenAPISchema>;
|
|
136
136
|
}
|
|
137
137
|
export interface TypeSpecRequestBody {
|
|
138
138
|
contentType: string;
|
|
139
139
|
doc?: string;
|
|
140
140
|
isOptional: boolean;
|
|
141
141
|
encoding?: Record<string, OpenAPI3Encoding>;
|
|
142
|
-
schema?: Refable<
|
|
142
|
+
schema?: Refable<SupportedOpenAPISchema>;
|
|
143
143
|
}
|
|
144
144
|
//# sourceMappingURL=interfaces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../../src/cli/actions/convert/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,OAAO,EACP,sBAAsB,EACvB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,mBAAmB,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC9C,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,IAAI,EAAE,mBAAmB,EAAE,CAAC;IAC5B,aAAa,EAAE,oBAAoB,EAAE,CAAC;IACtC,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC9C,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,UAAU,EAAE,iBAAiB,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC;CAC9C;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,iBAAiB,GACzB,aAAa,GACb,YAAY,GACZ,aAAa,GACb,cAAc,GACd,aAAa,CAAC;AAElB,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACxD,IAAI,EAAE,OAAO,CAAC;IAEd,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,oBAAoB,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACvD;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;OAEG;IACH,IAAI,CAAC,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,uCAAuC,CAAC,EAAE,OAAO,CAAC;IAClD;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,mBAAmB,EAAE,MAAM,GAAG,KAAK,GAAG,OAAO,CAAC;IACxF,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAa,SAAQ,mBAAmB;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,aAAc,SAAQ,mBAAmB;IACxD,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,cAAe,SAAQ,mBAAmB;IACzD,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,sBAAsB,CAAC;CAChC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,MAAM,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,iBAAkB,SAAQ,mBAAmB;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC,0BAA0B,CAAC,EAAE,CAAC;IAClD,aAAa,EAAE,mBAAmB,EAAE,CAAC;IACrC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC5C,MAAM,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;CAC1C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-component-parameters.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAyB,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,iBAAiB,EAAE,GAC7B,IAAI,
|
|
1
|
+
{"version":3,"file":"transform-component-parameters.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/actions/convert/transforms/transform-component-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAyB,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,iBAAiB,EAAE,GAC7B,IAAI,CASN"}
|