@azure-tools/typespec-ts 0.27.0 → 0.28.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/CHANGELOG.md +11 -0
- package/README.md +0 -8
- package/dist/src/index.d.ts +0 -5
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +14 -88
- package/dist/src/index.js.map +1 -1
- package/dist/src/lib.d.ts +0 -1
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +0 -1
- package/dist/src/lib.js.map +1 -1
- package/dist/src/modular/buildClassicalClient.d.ts +1 -1
- package/dist/src/modular/buildClassicalClient.d.ts.map +1 -1
- package/dist/src/modular/buildClassicalClient.js +1 -1
- package/dist/src/modular/buildClassicalClient.js.map +1 -1
- package/dist/src/modular/buildClientContext.d.ts +1 -1
- package/dist/src/modular/buildClientContext.d.ts.map +1 -1
- package/dist/src/modular/buildClientContext.js +1 -1
- package/dist/src/modular/buildClientContext.js.map +1 -1
- package/dist/src/modular/buildCodeModel.d.ts.map +1 -1
- package/dist/src/modular/buildCodeModel.js +12 -7
- package/dist/src/modular/buildCodeModel.js.map +1 -1
- package/dist/src/modular/buildOperations.d.ts +1 -1
- package/dist/src/modular/buildOperations.d.ts.map +1 -1
- package/dist/src/modular/buildOperations.js +1 -1
- package/dist/src/modular/buildOperations.js.map +1 -1
- package/dist/src/modular/buildPagingFiles.d.ts +2 -2
- package/dist/src/modular/buildPagingFiles.d.ts.map +1 -1
- package/dist/src/modular/buildPagingFiles.js +2 -2
- package/dist/src/modular/buildPagingFiles.js.map +1 -1
- package/dist/src/modular/buildProjectFiles.d.ts.map +1 -1
- package/dist/src/modular/buildProjectFiles.js +4 -3
- package/dist/src/modular/buildProjectFiles.js.map +1 -1
- package/dist/src/modular/buildRootIndex.d.ts +2 -2
- package/dist/src/modular/buildRootIndex.d.ts.map +1 -1
- package/dist/src/modular/buildRootIndex.js +2 -2
- package/dist/src/modular/buildRootIndex.js.map +1 -1
- package/dist/src/modular/buildSubpathIndex.d.ts +1 -1
- package/dist/src/modular/buildSubpathIndex.d.ts.map +1 -1
- package/dist/src/modular/buildSubpathIndex.js +1 -1
- package/dist/src/modular/buildSubpathIndex.js.map +1 -1
- package/dist/src/modular/emitModels.d.ts +2 -2
- package/dist/src/modular/emitModels.d.ts.map +1 -1
- package/dist/src/modular/emitModels.js +2 -2
- package/dist/src/modular/emitModels.js.map +1 -1
- package/dist/src/modular/helpers/classicalOperationHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/classicalOperationHelpers.js.map +1 -1
- package/dist/src/modular/helpers/operationHelpers.js +2 -2
- package/dist/src/modular/helpers/operationHelpers.js.map +1 -1
- package/dist/src/modular/modularCodeModel.d.ts +1 -0
- package/dist/src/modular/modularCodeModel.d.ts.map +1 -1
- package/dist/src/transform/transform.js +5 -5
- package/dist/src/transform/transform.js.map +1 -1
- package/dist/src/transform/transformApiVersionInfo.d.ts.map +1 -1
- package/dist/src/transform/transformApiVersionInfo.js +1 -2
- package/dist/src/transform/transformApiVersionInfo.js.map +1 -1
- package/dist/src/transform/transformHelperFunctionDetails.d.ts.map +1 -1
- package/dist/src/transform/transformHelperFunctionDetails.js +8 -6
- package/dist/src/transform/transformHelperFunctionDetails.js.map +1 -1
- package/dist/src/transform/transformParameters.d.ts +1 -1
- package/dist/src/transform/transformParameters.d.ts.map +1 -1
- package/dist/src/transform/transformParameters.js +7 -21
- package/dist/src/transform/transformParameters.js.map +1 -1
- package/dist/src/transform/transformPaths.d.ts +2 -3
- package/dist/src/transform/transformPaths.d.ts.map +1 -1
- package/dist/src/transform/transformPaths.js +19 -9
- package/dist/src/transform/transformPaths.js.map +1 -1
- package/dist/src/transform/transformResponses.d.ts +1 -1
- package/dist/src/transform/transformResponses.d.ts.map +1 -1
- package/dist/src/transform/transformResponses.js +1 -1
- package/dist/src/transform/transformResponses.js.map +1 -1
- package/dist/src/transform/transformSchemas.d.ts +1 -2
- package/dist/src/transform/transformSchemas.d.ts.map +1 -1
- package/dist/src/transform/transformSchemas.js +11 -21
- package/dist/src/transform/transformSchemas.js.map +1 -1
- package/dist/src/transform/transformTelemetryInfo.d.ts +1 -1
- package/dist/src/transform/transformTelemetryInfo.d.ts.map +1 -1
- package/dist/src/transform/transformTelemetryInfo.js +1 -1
- package/dist/src/transform/transformTelemetryInfo.js.map +1 -1
- package/dist/src/utils/mediaTypes.d.ts +1 -1
- package/dist/src/utils/mediaTypes.d.ts.map +1 -1
- package/dist/src/utils/mediaTypes.js +5 -0
- package/dist/src/utils/mediaTypes.js.map +1 -1
- package/dist/src/utils/modelUtils.d.ts +2 -1
- package/dist/src/utils/modelUtils.d.ts.map +1 -1
- package/dist/src/utils/modelUtils.js +56 -16
- package/dist/src/utils/modelUtils.js.map +1 -1
- package/dist/src/utils/operationUtil.d.ts +2 -2
- package/dist/src/utils/operationUtil.d.ts.map +1 -1
- package/dist/src/utils/operationUtil.js +12 -8
- package/dist/src/utils/operationUtil.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +29 -25
- package/src/index.ts +14 -102
- package/src/lib.ts +0 -2
- package/src/modular/buildClassicalClient.ts +2 -2
- package/src/modular/buildClientContext.ts +2 -2
- package/src/modular/buildCodeModel.ts +15 -7
- package/src/modular/buildOperations.ts +1 -1
- package/src/modular/buildPagingFiles.ts +2 -2
- package/src/modular/buildProjectFiles.ts +4 -3
- package/src/modular/buildRootIndex.ts +3 -3
- package/src/modular/buildSubpathIndex.ts +1 -1
- package/src/modular/emitModels.ts +4 -4
- package/src/modular/helpers/classicalOperationHelpers.ts +8 -2
- package/src/modular/helpers/operationHelpers.ts +2 -2
- package/src/modular/modularCodeModel.ts +1 -0
- package/src/transform/transform.ts +6 -6
- package/src/transform/transformApiVersionInfo.ts +1 -2
- package/src/transform/transformHelperFunctionDetails.ts +7 -14
- package/src/transform/transformParameters.ts +9 -27
- package/src/transform/transformPaths.ts +28 -11
- package/src/transform/transformResponses.ts +2 -2
- package/src/transform/transformSchemas.ts +3 -22
- package/src/transform/transformTelemetryInfo.ts +2 -2
- package/src/utils/mediaTypes.ts +11 -1
- package/src/utils/modelUtils.ts +79 -15
- package/src/utils/operationUtil.ts +11 -12
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformPaths.d.ts","sourceRoot":"","sources":["../../../src/transform/transformPaths.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,
|
|
1
|
+
{"version":3,"file":"transformPaths.d.ts","sourceRoot":"","sources":["../../../src/transform/transformPaths.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,EAEL,OAAO,EACR,MAAM,yBAAyB,CAAC;AAOjC,OAAO,EACL,SAAS,EAIV,MAAM,6CAA6C,CAAC;AAgBrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,OAAO,GACrB,KAAK,CAkCP"}
|
|
@@ -4,10 +4,13 @@ import { getResponseTypeName, getParameterTypeName } from "@azure-tools/rlc-comm
|
|
|
4
4
|
import { getDoc, ignoreDiagnostics } from "@typespec/compiler";
|
|
5
5
|
import { getHttpOperation } from "@typespec/http";
|
|
6
6
|
import { listOperationGroups, listOperationsInOperationGroup, isApiVersion } from "@azure-tools/typespec-client-generator-core";
|
|
7
|
-
import { getSchemaForType } from "../utils/modelUtils.js";
|
|
7
|
+
import { getImportedModelName, getSchemaForType, getTypeName } from "../utils/modelUtils.js";
|
|
8
8
|
import { extractOperationLroDetail, getOperationSuccessStatus, getOperationGroupName, getOperationName, getOperationResponseTypes, getOperationStatuscode, isPagingOperation, sortedOperationResponses } from "../utils/operationUtil.js";
|
|
9
|
-
|
|
9
|
+
import { SchemaContext } from "@azure-tools/rlc-common";
|
|
10
|
+
export function transformPaths(client, dpgContext, importDetails) {
|
|
10
11
|
var _a, _b;
|
|
12
|
+
const program = dpgContext.program;
|
|
13
|
+
const pathParamsImportedSet = new Set();
|
|
11
14
|
const paths = {};
|
|
12
15
|
const clientOperations = listOperationsInOperationGroup(dpgContext, client);
|
|
13
16
|
for (const clientOp of clientOperations) {
|
|
@@ -16,7 +19,7 @@ export function transformPaths(program, client, dpgContext) {
|
|
|
16
19
|
if (route.overloads && ((_a = route.overloads) === null || _a === void 0 ? void 0 : _a.length) > 0) {
|
|
17
20
|
continue;
|
|
18
21
|
}
|
|
19
|
-
transformOperation(dpgContext, route, paths);
|
|
22
|
+
transformOperation(dpgContext, route, paths, pathParamsImportedSet);
|
|
20
23
|
}
|
|
21
24
|
const operationGroups = listOperationGroups(dpgContext, client, true);
|
|
22
25
|
for (const operationGroup of operationGroups) {
|
|
@@ -27,12 +30,15 @@ export function transformPaths(program, client, dpgContext) {
|
|
|
27
30
|
if (route.overloads && ((_b = route.overloads) === null || _b === void 0 ? void 0 : _b.length) > 0) {
|
|
28
31
|
continue;
|
|
29
32
|
}
|
|
30
|
-
transformOperation(dpgContext, route, paths);
|
|
33
|
+
transformOperation(dpgContext, route, paths, pathParamsImportedSet);
|
|
31
34
|
}
|
|
32
35
|
}
|
|
36
|
+
if (pathParamsImportedSet.size > 0) {
|
|
37
|
+
importDetails.rlcClientDefinition.importsSet = pathParamsImportedSet;
|
|
38
|
+
}
|
|
33
39
|
return paths;
|
|
34
40
|
}
|
|
35
|
-
function transformOperation(dpgContext, route, paths) {
|
|
41
|
+
function transformOperation(dpgContext, route, paths, importSet) {
|
|
36
42
|
var _a, _b, _c, _d, _e, _f;
|
|
37
43
|
const program = dpgContext.program;
|
|
38
44
|
const respNames = [];
|
|
@@ -69,12 +75,16 @@ function transformOperation(dpgContext, route, paths) {
|
|
|
69
75
|
pathParameters: route.parameters.parameters
|
|
70
76
|
.filter((p) => p.type === "path")
|
|
71
77
|
.map((p) => {
|
|
72
|
-
var _a;
|
|
78
|
+
var _a, _b;
|
|
79
|
+
const schemaUsage = [SchemaContext.Input, SchemaContext.Exception];
|
|
80
|
+
const schema = p.param.sourceProperty
|
|
81
|
+
? getSchemaForType(dpgContext, (_a = p.param.sourceProperty) === null || _a === void 0 ? void 0 : _a.type)
|
|
82
|
+
: getSchemaForType(dpgContext, p.param.type);
|
|
83
|
+
const importedNames = (_b = getImportedModelName(schema, schemaUsage)) !== null && _b !== void 0 ? _b : [];
|
|
84
|
+
importedNames.forEach(importSet.add, importSet);
|
|
73
85
|
return {
|
|
74
86
|
name: p.name,
|
|
75
|
-
type:
|
|
76
|
-
? getSchemaForType(dpgContext, (_a = p.param.sourceProperty) === null || _a === void 0 ? void 0 : _a.type).type
|
|
77
|
-
: getSchemaForType(dpgContext, p.param.type).type,
|
|
87
|
+
type: getTypeName(schema, schemaUsage),
|
|
78
88
|
description: getDoc(program, p.param)
|
|
79
89
|
};
|
|
80
90
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformPaths.js","sourceRoot":"","sources":["../../../src/transform/transformPaths.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EACL,mBAAmB,EACnB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"transformPaths.js","sourceRoot":"","sources":["../../../src/transform/transformPaths.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SdkClient } from "@azure-tools/typespec-client-generator-core";
|
|
2
2
|
import { OperationResponse, Imports } from "@azure-tools/rlc-common";
|
|
3
3
|
import { SdkContext } from "../utils/interfaces.js";
|
|
4
|
-
export declare function transformToResponseTypes(
|
|
4
|
+
export declare function transformToResponseTypes(client: SdkClient, dpgContext: SdkContext, importDetails: Imports): OperationResponse[];
|
|
5
5
|
//# sourceMappingURL=transformResponses.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformResponses.d.ts","sourceRoot":"","sources":["../../../src/transform/transformResponses.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAGV,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAEL,iBAAiB,EAKjB,OAAO,EACR,MAAM,yBAAyB,CAAC;AAqBjC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,wBAAgB,wBAAwB,CACtC,
|
|
1
|
+
{"version":3,"file":"transformResponses.d.ts","sourceRoot":"","sources":["../../../src/transform/transformResponses.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAGV,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAEL,iBAAiB,EAKjB,OAAO,EACR,MAAM,yBAAyB,CAAC;AAqBjC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,OAAO,GACrB,iBAAiB,EAAE,CAkErB"}
|
|
@@ -6,7 +6,7 @@ import { getDoc, ignoreDiagnostics } from "@typespec/compiler";
|
|
|
6
6
|
import { getHttpOperation } from "@typespec/http";
|
|
7
7
|
import { getImportedModelName, getTypeName, getSchemaForType, getBinaryType } from "../utils/modelUtils.js";
|
|
8
8
|
import { getOperationGroupName, getOperationStatuscode, isBinaryPayload, getOperationLroOverload, getOperationName, sortedOperationResponses } from "../utils/operationUtil.js";
|
|
9
|
-
export function transformToResponseTypes(
|
|
9
|
+
export function transformToResponseTypes(client, dpgContext, importDetails) {
|
|
10
10
|
var _a, _b;
|
|
11
11
|
const program = dpgContext.program;
|
|
12
12
|
const rlcResponses = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformResponses.js","sourceRoot":"","sources":["../../../src/transform/transformResponses.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAEL,mBAAmB,EACnB,8BAA8B,EAC/B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAKL,aAAa,EACb,yBAAyB,EAE1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EACL,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,gBAAgB,EAChB,aAAa,EACd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,uBAAuB,EACvB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,2BAA2B,CAAC;AAGnC,MAAM,UAAU,wBAAwB,CACtC,
|
|
1
|
+
{"version":3,"file":"transformResponses.js","sourceRoot":"","sources":["../../../src/transform/transformResponses.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { SdkClient } from "@azure-tools/typespec-client-generator-core";
|
|
2
|
-
import { Program } from "@typespec/compiler";
|
|
3
2
|
import { SdkContext } from "../utils/interfaces.js";
|
|
4
|
-
export declare function transformSchemas(
|
|
3
|
+
export declare function transformSchemas(client: SdkClient, dpgContext: SdkContext): any[];
|
|
5
4
|
//# sourceMappingURL=transformSchemas.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformSchemas.d.ts","sourceRoot":"","sources":["../../../src/transform/transformSchemas.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAGV,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"transformSchemas.d.ts","sourceRoot":"","sources":["../../../src/transform/transformSchemas.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAGV,MAAM,6CAA6C,CAAC;AAYrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,SA6NzE"}
|
|
@@ -6,8 +6,9 @@ import { ignoreDiagnostics } from "@typespec/compiler";
|
|
|
6
6
|
import { getHttpOperation, getServers } from "@typespec/http";
|
|
7
7
|
import { getSchemaForType, includeDerivedModel, getBodyType, trimUsage, isAzureCoreErrorType, getDefaultService } from "../utils/modelUtils.js";
|
|
8
8
|
import { extractMediaTypes } from "../utils/mediaTypes.js";
|
|
9
|
-
export function transformSchemas(
|
|
9
|
+
export function transformSchemas(client, dpgContext) {
|
|
10
10
|
var _a, _b;
|
|
11
|
+
const program = dpgContext.program;
|
|
11
12
|
const schemas = new Map();
|
|
12
13
|
const schemaMap = new Map();
|
|
13
14
|
const requestBodySet = new Set();
|
|
@@ -124,31 +125,20 @@ export function transformSchemas(program, client, dpgContext) {
|
|
|
124
125
|
}
|
|
125
126
|
}
|
|
126
127
|
function getGeneratedModels(model, context) {
|
|
127
|
-
var _a, _b, _c, _d, _e, _f
|
|
128
|
+
var _a, _b, _c, _d, _e, _f;
|
|
128
129
|
if (model.kind === "Model") {
|
|
129
|
-
if (model.templateMapper &&
|
|
130
|
-
model.templateMapper.args &&
|
|
131
|
-
model.templateMapper.args.length > 0) {
|
|
132
|
-
const temp = model.templateMapper.args[0];
|
|
133
|
-
if (temp &&
|
|
134
|
-
temp.kind === "Model" &&
|
|
135
|
-
(!program.stateMap(modelKey).get(temp) ||
|
|
136
|
-
!((_a = program.stateMap(modelKey).get(temp)) === null || _a === void 0 ? void 0 : _a.includes(context)))) {
|
|
137
|
-
getGeneratedModels(temp, context);
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
130
|
setModelMap(model, context);
|
|
141
131
|
const indexer = model.indexer;
|
|
142
132
|
if ((indexer === null || indexer === void 0 ? void 0 : indexer.value) &&
|
|
143
133
|
(!program.stateMap(modelKey).get(indexer === null || indexer === void 0 ? void 0 : indexer.value) ||
|
|
144
|
-
!((
|
|
134
|
+
!((_a = program
|
|
145
135
|
.stateMap(modelKey)
|
|
146
|
-
.get(indexer === null || indexer === void 0 ? void 0 : indexer.value)) === null ||
|
|
136
|
+
.get(indexer === null || indexer === void 0 ? void 0 : indexer.value)) === null || _a === void 0 ? void 0 : _a.includes(context)))) {
|
|
147
137
|
getGeneratedModels(indexer.value, context);
|
|
148
138
|
}
|
|
149
139
|
for (const prop of model.properties) {
|
|
150
140
|
const [, propType] = prop;
|
|
151
|
-
if ((
|
|
141
|
+
if ((_b = program.stateMap(modelKey).get(propType.type)) === null || _b === void 0 ? void 0 : _b.includes(context)) {
|
|
152
142
|
continue;
|
|
153
143
|
}
|
|
154
144
|
if (propType.type.kind === "Model") {
|
|
@@ -164,9 +154,9 @@ export function transformSchemas(program, client, dpgContext) {
|
|
|
164
154
|
variant.type.kind === "Union" ||
|
|
165
155
|
variant.type.kind === "Enum") &&
|
|
166
156
|
(!program.stateMap(modelKey).get(variant.type) ||
|
|
167
|
-
!((
|
|
157
|
+
!((_c = program
|
|
168
158
|
.stateMap(modelKey)
|
|
169
|
-
.get(variant.type)) === null ||
|
|
159
|
+
.get(variant.type)) === null || _c === void 0 ? void 0 : _c.includes(context)))) {
|
|
170
160
|
getGeneratedModels(variant.type, context);
|
|
171
161
|
}
|
|
172
162
|
}
|
|
@@ -183,7 +173,7 @@ export function transformSchemas(program, client, dpgContext) {
|
|
|
183
173
|
if (baseModel &&
|
|
184
174
|
baseModel.kind === "Model" &&
|
|
185
175
|
(!program.stateMap(modelKey).get(baseModel) ||
|
|
186
|
-
!((
|
|
176
|
+
!((_d = program.stateMap(modelKey).get(baseModel)) === null || _d === void 0 ? void 0 : _d.includes(context)))) {
|
|
187
177
|
getGeneratedModels(baseModel, context);
|
|
188
178
|
}
|
|
189
179
|
const derivedModels = model.derivedModels.filter((dm) => {
|
|
@@ -193,7 +183,7 @@ export function transformSchemas(program, client, dpgContext) {
|
|
|
193
183
|
for (const child of derivedModels) {
|
|
194
184
|
if (child.kind === "Model" &&
|
|
195
185
|
(!program.stateMap(modelKey).get(child) ||
|
|
196
|
-
!((
|
|
186
|
+
!((_e = program.stateMap(modelKey).get(child)) === null || _e === void 0 ? void 0 : _e.includes(context)))) {
|
|
197
187
|
getGeneratedModels(child, context);
|
|
198
188
|
}
|
|
199
189
|
}
|
|
@@ -203,7 +193,7 @@ export function transformSchemas(program, client, dpgContext) {
|
|
|
203
193
|
for (const variant of variants) {
|
|
204
194
|
if ((variant.type.kind === "Model" || variant.type.kind === "Union") &&
|
|
205
195
|
(!program.stateMap(modelKey).get(variant.type) ||
|
|
206
|
-
!((
|
|
196
|
+
!((_f = program.stateMap(modelKey).get(variant.type)) === null || _f === void 0 ? void 0 : _f.includes(context)))) {
|
|
207
197
|
getGeneratedModels(variant.type, context);
|
|
208
198
|
}
|
|
209
199
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformSchemas.js","sourceRoot":"","sources":["../../../src/transform/transformSchemas.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAElC,OAAO,EAEL,mBAAmB,EACnB,8BAA8B,EAC/B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"transformSchemas.js","sourceRoot":"","sources":["../../../src/transform/transformSchemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { TelemetryInfo } from "@azure-tools/rlc-common";
|
|
2
2
|
import { SdkClient, SdkContext } from "@azure-tools/typespec-client-generator-core";
|
|
3
|
-
export declare function transformTelemetryInfo(
|
|
3
|
+
export declare function transformTelemetryInfo(client: SdkClient, dpgContext: SdkContext): TelemetryInfo | undefined;
|
|
4
4
|
//# sourceMappingURL=transformTelemetryInfo.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformTelemetryInfo.d.ts","sourceRoot":"","sources":["../../../src/transform/transformTelemetryInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EACL,SAAS,EACT,UAAU,EAGX,MAAM,6CAA6C,CAAC;AAKrD,wBAAgB,sBAAsB,CACpC,
|
|
1
|
+
{"version":3,"file":"transformTelemetryInfo.d.ts","sourceRoot":"","sources":["../../../src/transform/transformTelemetryInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EACL,SAAS,EACT,UAAU,EAGX,MAAM,6CAA6C,CAAC;AAKrD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,GACrB,aAAa,GAAG,SAAS,CAW3B"}
|
|
@@ -2,7 +2,7 @@ import { listOperationGroups, listOperationsInOperationGroup } from "@azure-tool
|
|
|
2
2
|
import { ignoreDiagnostics } from "@typespec/compiler";
|
|
3
3
|
import { getCustomRequestHeaderNameForOperation } from "../utils/operationUtil.js";
|
|
4
4
|
import { getHttpOperation } from "@typespec/http";
|
|
5
|
-
export function transformTelemetryInfo(
|
|
5
|
+
export function transformTelemetryInfo(client, dpgContext) {
|
|
6
6
|
const customRequestIdHeaderName = getCustomRequestHeaderNameForClient(dpgContext, client);
|
|
7
7
|
if (customRequestIdHeaderName) {
|
|
8
8
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformTelemetryInfo.js","sourceRoot":"","sources":["../../../src/transform/transformTelemetryInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,mBAAmB,EACnB,8BAA8B,EAC/B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,sCAAsC,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,UAAU,sBAAsB,CACpC,
|
|
1
|
+
{"version":3,"file":"transformTelemetryInfo.js","sourceRoot":"","sources":["../../../src/transform/transformTelemetryInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,mBAAmB,EACnB,8BAA8B,EAC/B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,sCAAsC,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,UAAU,sBAAsB,CACpC,MAAiB,EACjB,UAAsB;IAEtB,MAAM,yBAAyB,GAAG,mCAAmC,CACnE,UAAU,EACV,MAAM,CACP,CAAC;IACF,IAAI,yBAAyB,EAAE,CAAC;QAC9B,OAAO;YACL,yBAAyB;SAC1B,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mCAAmC,CAC1C,UAAsB,EACtB,MAAiB;IAEjB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IACnC,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5E,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QACxC,MAAM,UAAU,GAAG,sCAAsC,CACvD,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CACvD,CAAC;QACF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IACD,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACtE,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,8BAA8B,CAC/C,UAAU,EACV,cAAc,CACf,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,sCAAsC,CACvD,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CACjD,CAAC;YACF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC7B,OAAO,UAAU,CAAC;YACpB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -18,7 +18,7 @@ export declare function normalizeMediaType(contentType: string): string | undefi
|
|
|
18
18
|
export declare function isMediaTypeJson(mediaType: string): boolean;
|
|
19
19
|
export declare function isMediaTypeJsonMergePatch(mediaType: string | string[]): boolean;
|
|
20
20
|
export declare function isMediaTypeXml(mediaType: string): boolean;
|
|
21
|
-
export declare function isMediaTypeMultipartFormData(mediaType: string): boolean;
|
|
21
|
+
export declare function isMediaTypeMultipartFormData(mediaType: string | string[]): boolean;
|
|
22
22
|
export declare function hasMediaType(target: KnownMediaType, sourceTypes?: KnownMediaType[]): boolean;
|
|
23
23
|
export declare function extractMediaTypes(mediaTypes: string[] | string): KnownMediaType[];
|
|
24
24
|
//# sourceMappingURL=mediaTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mediaTypes.d.ts","sourceRoot":"","sources":["../../../src/utils/mediaTypes.ts"],"names":[],"mappings":"AAaA,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,iBAAiB,wBAAwB;IACzC,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM;;;;;cAgB/C;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,kBAwC/C;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,sBAUrD;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAM1D;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAC3B,OAAO,CAcT;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAMzD;AAED,wBAAgB,4BAA4B,
|
|
1
|
+
{"version":3,"file":"mediaTypes.d.ts","sourceRoot":"","sources":["../../../src/utils/mediaTypes.ts"],"names":[],"mappings":"AAaA,oBAAY,cAAc;IACxB,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,iBAAiB,wBAAwB;IACzC,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM;;;;;cAgB/C;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,kBAwC/C;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,sBAUrD;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAM1D;AAED,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAC3B,OAAO,CAcT;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAMzD;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAC3B,OAAO,CAWT;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,WAAW,GAAE,cAAc,EAAO,WAGnC;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,GAC5B,cAAc,EAAE,CAKlB"}
|
|
@@ -106,6 +106,11 @@ export function isMediaTypeXml(mediaType) {
|
|
|
106
106
|
: false;
|
|
107
107
|
}
|
|
108
108
|
export function isMediaTypeMultipartFormData(mediaType) {
|
|
109
|
+
if (Array.isArray(mediaType)) {
|
|
110
|
+
return Boolean(mediaType.length === 1 &&
|
|
111
|
+
mediaType[0] &&
|
|
112
|
+
isMediaTypeMultipartFormData(mediaType[0]));
|
|
113
|
+
}
|
|
109
114
|
const mt = parseMediaType(mediaType);
|
|
110
115
|
return mt ? mt.type === multipart && mt.subtype === formData : false;
|
|
111
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mediaTypes.js","sourceRoot":"","sources":["../../../src/utils/mediaTypes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mediaTypes.js","sourceRoot":"","sources":["../../../src/utils/mediaTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export declare function getDefaultService(program: Program): Service | undefined
|
|
|
29
29
|
/**
|
|
30
30
|
* Return the default api version from the program; undefined if no default
|
|
31
31
|
*/
|
|
32
|
-
export declare function getDefaultApiVersionString(
|
|
32
|
+
export declare function getDefaultApiVersionString(dpgContext: SdkContext): string | undefined;
|
|
33
33
|
export declare function trimUsage(model: any): any;
|
|
34
34
|
export declare function isAzureCoreErrorType(t?: Type): boolean;
|
|
35
35
|
export declare function isAnonymousObjectSchema(schema: Schema): boolean;
|
|
@@ -43,5 +43,6 @@ export declare function isAnonymousModelType(type: Type): boolean;
|
|
|
43
43
|
export declare function getModelInlineSigniture(schema: ObjectSchema, options?: {
|
|
44
44
|
importedModels?: Set<string>;
|
|
45
45
|
usage?: SchemaContext[];
|
|
46
|
+
multipart?: boolean;
|
|
46
47
|
}): string;
|
|
47
48
|
//# sourceMappingURL=modelUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/modelUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAwBL,KAAK,EACL,aAAa,EACb,IAAI,EASJ,OAAO,EAEP,OAAO,EAKR,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAKL,YAAY,EACZ,MAAM,EACN,aAAa,
|
|
1
|
+
{"version":3,"file":"modelUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/modelUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAwBL,KAAK,EACL,aAAa,EACb,IAAI,EASJ,OAAO,EAEP,OAAO,EAKR,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAKL,YAAY,EACZ,MAAM,EACN,aAAa,EAEd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAKL,aAAa,EAGd,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQ/D,eAAO,MAAM,iBAAiB,6EAC8C,CAAC;AAE7E,eAAO,MAAM,0BAA0B,oFAAgC,CAAC;AAExE,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,EAAE,6FAInD;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,WAGnE;AA8BD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,GAAG,OAkBjD;AAED,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,EACf,OAAO,CAAC,EAAE,gBAAgB,OAyF3B;AACD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAmB5E;AACD,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,KAAK,EACZ,OAAO,GAAE,OAAe,GACvB,OAAO,CAST;AA8hCD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,aAAa,EAAE,GAAG,MAAM,CAG3E;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,aAAa,EAAE,GACtB,MAAM,CAyBR;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,aAAa,EAAE,GACtB,MAAM,EAAE,CAoDV;AA2CD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,aAAa,GAAG,IAAI,EAC1B,UAAU,EAAE,GAAG,EACf,QAAQ,GAAE,MAAe,sBAW1B;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,aAAa,GACnB,IAAI,GAAG,SAAS,CAWlB;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,KAAK,CAAC,EAAE,aAAa,yCAmBtB;AAoBD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAevE;AACD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,GAAG,OAanC;AAED,wBAAgB,oBAAoB,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,OAAO,CAetD;AAGD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,WAErD;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,WAK9C;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,YAAY,EACpB,OAAO,GAAE;IACP,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;CAChB,UAgCP"}
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
// Licensed under the MIT License.
|
|
3
3
|
import { getDiscriminator, getDoc, getEffectiveModelType, getFormat, getFriendlyName, getMaxLength, getMaxValue, getMinLength, getMinValue, getPattern, getProperty, getPropertyType, getSummary, getVisibility, isNeverType, isNumericType, isSecret, isStringType, isTemplateDeclaration, isUnknownType, isNullType, NoTarget, listServices, getEncode, isRecordModelType, isArrayModelType } from "@typespec/compiler";
|
|
4
4
|
import { reportDiagnostic } from "../lib.js";
|
|
5
|
-
import { NameType, normalizeName, SchemaContext } from "@azure-tools/rlc-common";
|
|
5
|
+
import { NameType, normalizeName, SchemaContext, isArraySchema } from "@azure-tools/rlc-common";
|
|
6
6
|
import { getHeaderFieldName, getPathParamName, getQueryParamName, isStatusCode, createMetadataInfo, Visibility } from "@typespec/http";
|
|
7
7
|
import { getPagedResult } from "@azure-tools/typespec-azure-core";
|
|
8
8
|
import { extractPagedMetadataNested } from "./operationUtil.js";
|
|
9
9
|
import { getDefaultApiVersion, getWireName, isApiVersion } from "@azure-tools/typespec-client-generator-core";
|
|
10
10
|
import { getModelNamespaceName } from "./namespaceUtils.js";
|
|
11
|
-
import { KnownMediaType, hasMediaType } from "./mediaTypes.js";
|
|
11
|
+
import { KnownMediaType, hasMediaType, isMediaTypeMultipartFormData } from "./mediaTypes.js";
|
|
12
12
|
export const BINARY_TYPE_UNION = "string | Uint8Array | ReadableStream<Uint8Array> | NodeJS.ReadableStream";
|
|
13
13
|
export const BINARY_AND_FILE_TYPE_UNION = `${BINARY_TYPE_UNION} | File`;
|
|
14
14
|
export function getBinaryType(usage) {
|
|
@@ -64,7 +64,7 @@ export function enrichBinaryTypeInBody(schema) {
|
|
|
64
64
|
return schema;
|
|
65
65
|
}
|
|
66
66
|
export function getSchemaForType(dpgContext, typeInput, options) {
|
|
67
|
-
var _a;
|
|
67
|
+
var _a, _b;
|
|
68
68
|
const program = dpgContext.program;
|
|
69
69
|
const { usage } = options !== null && options !== void 0 ? options : {};
|
|
70
70
|
const type = getEffectiveModelFromType(program, typeInput);
|
|
@@ -101,7 +101,9 @@ export function getSchemaForType(dpgContext, typeInput, options) {
|
|
|
101
101
|
});
|
|
102
102
|
}
|
|
103
103
|
schema.typeName = getModelInlineSigniture(schema, {
|
|
104
|
-
usage: [SchemaContext.Input]
|
|
104
|
+
usage: [SchemaContext.Input],
|
|
105
|
+
multipart: (options === null || options === void 0 ? void 0 : options.isRequestBody) &&
|
|
106
|
+
isMediaTypeMultipartFormData((_b = options === null || options === void 0 ? void 0 : options.mediaTypes) !== null && _b !== void 0 ? _b : [])
|
|
105
107
|
});
|
|
106
108
|
schema.type = "object";
|
|
107
109
|
}
|
|
@@ -271,10 +273,13 @@ function getSchemaForUnion(dpgContext, union, options) {
|
|
|
271
273
|
.map((item) => { var _a; return `${(_a = getTypeName(item, [SchemaContext.Output])) !== null && _a !== void 0 ? _a : item}`; })
|
|
272
274
|
.join(" | ");
|
|
273
275
|
if (!union.expression) {
|
|
274
|
-
|
|
276
|
+
const unionName = union.name
|
|
277
|
+
? normalizeName(union.name, NameType.Interface)
|
|
278
|
+
: undefined;
|
|
279
|
+
schema.name = unionName;
|
|
275
280
|
schema.type = "object";
|
|
276
|
-
schema.typeName =
|
|
277
|
-
schema.outputTypeName =
|
|
281
|
+
schema.typeName = unionName;
|
|
282
|
+
schema.outputTypeName = unionName + "Output";
|
|
278
283
|
schema.alias = unionAlias;
|
|
279
284
|
schema.outputAlias = outputUnionAlias;
|
|
280
285
|
}
|
|
@@ -459,6 +464,7 @@ function getSchemaForModel(dpgContext, model, options) {
|
|
|
459
464
|
})
|
|
460
465
|
.join("") + "List";
|
|
461
466
|
}
|
|
467
|
+
const isMultipartBody = isMediaTypeMultipartFormData(contentTypes !== null && contentTypes !== void 0 ? contentTypes : []);
|
|
462
468
|
const isCoreModel = isAzureCoreErrorType(model);
|
|
463
469
|
const modelSchema = {
|
|
464
470
|
name: isCoreModel
|
|
@@ -469,6 +475,7 @@ function getSchemaForModel(dpgContext, model, options) {
|
|
|
469
475
|
? fullNamespaceName
|
|
470
476
|
: name,
|
|
471
477
|
type: "object",
|
|
478
|
+
isMultipartBody,
|
|
472
479
|
description: (_c = getDoc(program, model)) !== null && _c !== void 0 ? _c : "",
|
|
473
480
|
fromCore: isCoreModel
|
|
474
481
|
};
|
|
@@ -738,8 +745,8 @@ function getSchemaForEnum(dpgContext, e) {
|
|
|
738
745
|
const schema = {
|
|
739
746
|
type: "object",
|
|
740
747
|
name: e.name,
|
|
741
|
-
typeName: e.name,
|
|
742
|
-
outputTypeName: e.name + "Output",
|
|
748
|
+
typeName: normalizeName(e.name, NameType.Interface),
|
|
749
|
+
outputTypeName: normalizeName(e.name, NameType.Interface) + "Output",
|
|
743
750
|
description: getDoc(dpgContext.program, e),
|
|
744
751
|
memberType: type
|
|
745
752
|
};
|
|
@@ -1177,12 +1184,8 @@ function getEnumStringDescription(type) {
|
|
|
1177
1184
|
return undefined;
|
|
1178
1185
|
}
|
|
1179
1186
|
function getBinaryDescripton(type) {
|
|
1180
|
-
var _a
|
|
1187
|
+
var _a;
|
|
1181
1188
|
if ((_a = type === null || type === void 0 ? void 0 : type.typeName) === null || _a === void 0 ? void 0 : _a.includes(BINARY_TYPE_UNION)) {
|
|
1182
|
-
if ((_b = type === null || type === void 0 ? void 0 : type.typeName) === null || _b === void 0 ? void 0 : _b.includes(BINARY_AND_FILE_TYPE_UNION)) {
|
|
1183
|
-
return `NOTE: The following type 'File' is part of WebAPI and available since Node 20. If your Node version is lower than Node 20.
|
|
1184
|
-
You could leverage our helpers 'createFile' or 'createFileFromStream' to create a File object. They could help you specify filename, type, and others.`;
|
|
1185
|
-
}
|
|
1186
1189
|
return `Value may contain any sequence of octets`;
|
|
1187
1190
|
}
|
|
1188
1191
|
return undefined;
|
|
@@ -1241,7 +1244,7 @@ export function predictDefaultValue(dpgContext, param) {
|
|
|
1241
1244
|
if (!serviceNamespace) {
|
|
1242
1245
|
return;
|
|
1243
1246
|
}
|
|
1244
|
-
const defaultApiVersion = getDefaultApiVersionString(
|
|
1247
|
+
const defaultApiVersion = getDefaultApiVersionString(dpgContext);
|
|
1245
1248
|
if (param && isApiVersion(dpgContext, param) && defaultApiVersion) {
|
|
1246
1249
|
return defaultApiVersion;
|
|
1247
1250
|
}
|
|
@@ -1277,8 +1280,9 @@ export function getDefaultService(program) {
|
|
|
1277
1280
|
/**
|
|
1278
1281
|
* Return the default api version from the program; undefined if no default
|
|
1279
1282
|
*/
|
|
1280
|
-
export function getDefaultApiVersionString(
|
|
1283
|
+
export function getDefaultApiVersionString(dpgContext) {
|
|
1281
1284
|
var _a;
|
|
1285
|
+
const program = dpgContext.program;
|
|
1282
1286
|
return getDefaultService(program)
|
|
1283
1287
|
? (_a = getDefaultApiVersion(dpgContext, getDefaultService(program).type)) === null || _a === void 0 ? void 0 : _a.value
|
|
1284
1288
|
: undefined;
|
|
@@ -1328,6 +1332,9 @@ export function isAnonymousModelType(type) {
|
|
|
1328
1332
|
* @returns
|
|
1329
1333
|
*/
|
|
1330
1334
|
export function getModelInlineSigniture(schema, options = {}) {
|
|
1335
|
+
if (options.multipart) {
|
|
1336
|
+
return getMultipartInlineSignature(schema, options.importedModels, options.usage);
|
|
1337
|
+
}
|
|
1331
1338
|
let schemaSignature = `{`;
|
|
1332
1339
|
for (const propName in schema.properties) {
|
|
1333
1340
|
const propType = schema.properties[propName];
|
|
@@ -1347,4 +1354,37 @@ export function getModelInlineSigniture(schema, options = {}) {
|
|
|
1347
1354
|
schemaSignature += `}`;
|
|
1348
1355
|
return schemaSignature;
|
|
1349
1356
|
}
|
|
1357
|
+
function getMultipartInlineSignature(schema, importedModels, usage) {
|
|
1358
|
+
var _a;
|
|
1359
|
+
const types = Object.entries((_a = schema.properties) !== null && _a !== void 0 ? _a : {})
|
|
1360
|
+
.map(([propertyName, property]) => {
|
|
1361
|
+
let schema;
|
|
1362
|
+
// Flatten arrays for file uploads
|
|
1363
|
+
if (isArraySchema(property) &&
|
|
1364
|
+
property.items &&
|
|
1365
|
+
getTypeName(property.items, usage).includes(BINARY_AND_FILE_TYPE_UNION)) {
|
|
1366
|
+
schema = property.items;
|
|
1367
|
+
}
|
|
1368
|
+
else {
|
|
1369
|
+
schema = property;
|
|
1370
|
+
}
|
|
1371
|
+
const typeName = getTypeName(schema, usage);
|
|
1372
|
+
if (!typeName) {
|
|
1373
|
+
return undefined;
|
|
1374
|
+
}
|
|
1375
|
+
const importNames = getImportedModelName(schema);
|
|
1376
|
+
if (importedModels && importNames) {
|
|
1377
|
+
importNames.forEach(importedModels.add.bind(importedModels));
|
|
1378
|
+
}
|
|
1379
|
+
if (typeName.includes("File")) {
|
|
1380
|
+
return `{ name: ${propertyName}, body: ${typeName}, filename?: string, contentType?: string }`;
|
|
1381
|
+
}
|
|
1382
|
+
else {
|
|
1383
|
+
return `{ name: ${propertyName}, body: ${typeName} }`;
|
|
1384
|
+
}
|
|
1385
|
+
})
|
|
1386
|
+
.filter(Boolean)
|
|
1387
|
+
.join(" | ");
|
|
1388
|
+
return `FormData | Array<${types}>`;
|
|
1389
|
+
}
|
|
1350
1390
|
//# sourceMappingURL=modelUtils.js.map
|