@azure-tools/typespec-ts 0.15.0 → 0.16.0-alpha.20230913.1
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 +10 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +14 -17
- package/dist/src/index.js.map +1 -1
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +3 -3
- package/dist/src/lib.js.map +1 -1
- package/dist/src/modular/buildClassicalClient.d.ts +2 -3
- package/dist/src/modular/buildClassicalClient.d.ts.map +1 -1
- package/dist/src/modular/buildClassicalClient.js +26 -12
- package/dist/src/modular/buildClassicalClient.js.map +1 -1
- package/dist/src/modular/buildClientContext.d.ts +3 -3
- package/dist/src/modular/buildClientContext.d.ts.map +1 -1
- package/dist/src/modular/buildClientContext.js +5 -4
- package/dist/src/modular/buildClientContext.js.map +1 -1
- package/dist/src/modular/buildCodeModel.d.ts +3 -2
- package/dist/src/modular/buildCodeModel.d.ts.map +1 -1
- package/dist/src/modular/buildCodeModel.js +141 -54
- package/dist/src/modular/buildCodeModel.js.map +1 -1
- package/dist/src/modular/buildOperations.d.ts +2 -2
- package/dist/src/modular/buildOperations.d.ts.map +1 -1
- package/dist/src/modular/buildOperations.js +15 -8
- package/dist/src/modular/buildOperations.js.map +1 -1
- package/dist/src/modular/buildProjectFiles.js +2 -2
- package/dist/src/modular/buildProjectFiles.js.map +1 -1
- package/dist/src/modular/buildRootIndex.d.ts +4 -4
- package/dist/src/modular/buildRootIndex.d.ts.map +1 -1
- package/dist/src/modular/buildRootIndex.js +12 -5
- package/dist/src/modular/buildRootIndex.js.map +1 -1
- package/dist/src/modular/buildSubpathIndex.d.ts +2 -2
- package/dist/src/modular/buildSubpathIndex.d.ts.map +1 -1
- package/dist/src/modular/buildSubpathIndex.js +7 -4
- package/dist/src/modular/buildSubpathIndex.js.map +1 -1
- package/dist/src/modular/emitModels.d.ts +3 -3
- package/dist/src/modular/emitModels.d.ts.map +1 -1
- package/dist/src/modular/emitModels.js +28 -18
- package/dist/src/modular/emitModels.js.map +1 -1
- package/dist/src/modular/helpers/clientHelpers.js +1 -1
- package/dist/src/modular/helpers/clientHelpers.js.map +1 -1
- package/dist/src/modular/helpers/operationHelpers.d.ts +1 -1
- package/dist/src/modular/helpers/operationHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/operationHelpers.js +140 -77
- package/dist/src/modular/helpers/operationHelpers.js.map +1 -1
- package/dist/src/modular/helpers/typeHelpers.d.ts +2 -2
- package/dist/src/modular/helpers/typeHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/typeHelpers.js +13 -7
- package/dist/src/modular/helpers/typeHelpers.js.map +1 -1
- package/dist/src/modular/modularCodeModel.d.ts +11 -0
- package/dist/src/modular/modularCodeModel.d.ts.map +1 -1
- package/dist/src/transform/transformHelperFunctionDetails.js +3 -4
- package/dist/src/transform/transformHelperFunctionDetails.js.map +1 -1
- package/dist/src/transform/transformParameters.d.ts +0 -10
- package/dist/src/transform/transformParameters.d.ts.map +1 -1
- package/dist/src/transform/transformParameters.js +7 -51
- package/dist/src/transform/transformParameters.js.map +1 -1
- package/dist/src/transform/transformResponses.js +3 -4
- package/dist/src/transform/transformResponses.js.map +1 -1
- package/dist/src/transform/transformSchemas.d.ts.map +1 -1
- package/dist/src/transform/transformSchemas.js +4 -8
- package/dist/src/transform/transformSchemas.js.map +1 -1
- package/dist/src/transform/transformTelemetryInfo.d.ts.map +1 -1
- package/dist/src/transform/transformTelemetryInfo.js +3 -10
- package/dist/src/transform/transformTelemetryInfo.js.map +1 -1
- package/dist/src/transform/transfromRLCOptions.d.ts.map +1 -1
- package/dist/src/transform/transfromRLCOptions.js +48 -9
- package/dist/src/transform/transfromRLCOptions.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 +83 -73
- package/dist/src/utils/modelUtils.js.map +1 -1
- package/dist/src/utils/operationUtil.d.ts +15 -1
- package/dist/src/utils/operationUtil.d.ts.map +1 -1
- package/dist/src/utils/operationUtil.js +82 -3
- package/dist/src/utils/operationUtil.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -11
- package/src/index.ts +24 -51
- package/src/lib.ts +3 -3
- package/src/modular/buildClassicalClient.ts +29 -16
- package/src/modular/buildClientContext.ts +8 -9
- package/src/modular/buildCodeModel.ts +183 -60
- package/src/modular/buildOperations.ts +16 -11
- package/src/modular/buildProjectFiles.ts +2 -2
- package/src/modular/buildRootIndex.ts +19 -12
- package/src/modular/buildSubpathIndex.ts +10 -8
- package/src/modular/emitModels.ts +35 -24
- package/src/modular/helpers/clientHelpers.ts +1 -1
- package/src/modular/helpers/operationHelpers.ts +231 -118
- package/src/modular/helpers/typeHelpers.ts +14 -7
- package/src/modular/modularCodeModel.ts +11 -0
- package/src/transform/transformHelperFunctionDetails.ts +10 -4
- package/src/transform/transformParameters.ts +15 -57
- package/src/transform/transformResponses.ts +2 -4
- package/src/transform/transformSchemas.ts +5 -9
- package/src/transform/transformTelemetryInfo.ts +4 -18
- package/src/transform/transfromRLCOptions.ts +67 -9
- package/src/utils/modelUtils.ts +81 -72
- package/src/utils/operationUtil.ts +121 -4
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import { OperationResponse, RLCOptions } from "@azure-tools/rlc-common";
|
|
2
|
+
import { Project } from "ts-morph";
|
|
3
|
+
export interface ModularOptions {
|
|
4
|
+
sourceRoot: string;
|
|
5
|
+
}
|
|
2
6
|
export interface ModularCodeModel {
|
|
3
7
|
options: RLCOptions;
|
|
8
|
+
modularOptions: ModularOptions;
|
|
4
9
|
namespace?: string;
|
|
5
10
|
subnamespaceToClients?: any;
|
|
6
11
|
clients: Client[];
|
|
7
12
|
types: Type[];
|
|
13
|
+
project: Project;
|
|
8
14
|
}
|
|
9
15
|
export interface Header {
|
|
10
16
|
type: Type;
|
|
@@ -18,6 +24,7 @@ export interface Property {
|
|
|
18
24
|
optional?: boolean;
|
|
19
25
|
description: string;
|
|
20
26
|
readonly?: boolean;
|
|
27
|
+
format?: string;
|
|
21
28
|
}
|
|
22
29
|
export interface BodyParameter {
|
|
23
30
|
contentTypes: string[];
|
|
@@ -59,6 +66,7 @@ export interface Type {
|
|
|
59
66
|
isFixed?: boolean;
|
|
60
67
|
valueType?: Type;
|
|
61
68
|
elementType?: Type;
|
|
69
|
+
parents?: Type[];
|
|
62
70
|
xmlMetadata?: XmlMetadata;
|
|
63
71
|
format?: string;
|
|
64
72
|
properties?: Property[];
|
|
@@ -73,6 +81,7 @@ export interface Client {
|
|
|
73
81
|
url: string;
|
|
74
82
|
apiVersions: any[];
|
|
75
83
|
rlcClientName: string;
|
|
84
|
+
subfolder?: string;
|
|
76
85
|
}
|
|
77
86
|
export type ParameterLocation = "endpointPath" | "header" | "query" | "path" | "other";
|
|
78
87
|
export interface Parameter {
|
|
@@ -94,6 +103,7 @@ export interface Parameter {
|
|
|
94
103
|
inDocstring?: boolean;
|
|
95
104
|
inOverriden?: boolean;
|
|
96
105
|
isApiVersion?: boolean;
|
|
106
|
+
format?: string;
|
|
97
107
|
}
|
|
98
108
|
export interface Response {
|
|
99
109
|
headers: Header[];
|
|
@@ -104,6 +114,7 @@ export interface Response {
|
|
|
104
114
|
}
|
|
105
115
|
export interface Operation {
|
|
106
116
|
name: string;
|
|
117
|
+
oriName?: string;
|
|
107
118
|
description: string;
|
|
108
119
|
summary: string;
|
|
109
120
|
url: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modularCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/modularCodeModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"modularCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/modularCodeModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { listOperationGroups, listOperationsInOperationGroup } from "@azure-tools/typespec-client-generator-core";
|
|
2
2
|
import { ignoreDiagnostics } from "@typespec/compiler";
|
|
3
3
|
import { getHttpOperation } from "@typespec/http";
|
|
4
|
-
import { hasPagingOperations, extractPagedMetadataNested, hasPollingOperations } from "../utils/operationUtil.js";
|
|
5
|
-
import { getSpecialSerializeInfo } from "./transformParameters.js";
|
|
4
|
+
import { hasPagingOperations, extractPagedMetadataNested, hasPollingOperations, getSpecialSerializeInfo } from "../utils/operationUtil.js";
|
|
6
5
|
export function transformHelperFunctionDetails(client, dpgContext) {
|
|
7
6
|
var _a, _b;
|
|
8
7
|
const program = dpgContext.program;
|
|
@@ -158,7 +157,7 @@ function extractSpecialSerializeInfo(program, client, dpgContext) {
|
|
|
158
157
|
for (const op of operations) {
|
|
159
158
|
const route = ignoreDiagnostics(getHttpOperation(program, op));
|
|
160
159
|
route.parameters.parameters.forEach((parameter) => {
|
|
161
|
-
const serializeInfo = getSpecialSerializeInfo(parameter);
|
|
160
|
+
const serializeInfo = getSpecialSerializeInfo(parameter.type, parameter.format);
|
|
162
161
|
hasMultiCollection = hasMultiCollection
|
|
163
162
|
? hasMultiCollection
|
|
164
163
|
: serializeInfo.hasMultiCollection;
|
|
@@ -181,7 +180,7 @@ function extractSpecialSerializeInfo(program, client, dpgContext) {
|
|
|
181
180
|
for (const clientOp of clientOperations) {
|
|
182
181
|
const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
|
|
183
182
|
route.parameters.parameters.forEach((parameter) => {
|
|
184
|
-
const serializeInfo = getSpecialSerializeInfo(parameter);
|
|
183
|
+
const serializeInfo = getSpecialSerializeInfo(parameter.type, parameter.format);
|
|
185
184
|
hasMultiCollection = hasMultiCollection
|
|
186
185
|
? hasMultiCollection
|
|
187
186
|
: serializeInfo.hasMultiCollection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformHelperFunctionDetails.js","sourceRoot":"","sources":["../../../src/transform/transformHelperFunctionDetails.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,mBAAmB,EACnB,8BAA8B,EAC/B,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAwB,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAiB,MAAM,gBAAgB,CAAC;AACjE,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,oBAAoB,
|
|
1
|
+
{"version":3,"file":"transformHelperFunctionDetails.js","sourceRoot":"","sources":["../../../src/transform/transformHelperFunctionDetails.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,5 @@
|
|
|
1
1
|
import { ImportKind, OperationParameter } from "@azure-tools/rlc-common";
|
|
2
|
-
import { HttpOperationParameter } from "@typespec/http";
|
|
3
2
|
import { SdkClient } from "@azure-tools/typespec-client-generator-core";
|
|
4
3
|
import { SdkContext } from "../utils/interfaces.js";
|
|
5
4
|
export declare function transformToParameterTypes(importDetails: Map<ImportKind, Set<string>>, client: SdkClient, dpgContext: SdkContext): OperationParameter[];
|
|
6
|
-
export declare function getSpecialSerializeInfo(parameter: HttpOperationParameter): {
|
|
7
|
-
hasMultiCollection: boolean;
|
|
8
|
-
hasPipeCollection: boolean;
|
|
9
|
-
hasSsvCollection: boolean;
|
|
10
|
-
hasTsvCollection: boolean;
|
|
11
|
-
hasCsvCollection: boolean;
|
|
12
|
-
descriptions: string[];
|
|
13
|
-
collectionInfo: string[];
|
|
14
|
-
};
|
|
15
5
|
//# sourceMappingURL=transformParameters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformParameters.d.ts","sourceRoot":"","sources":["../../../src/transform/transformParameters.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EAEV,kBAAkB,EAKnB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"transformParameters.d.ts","sourceRoot":"","sources":["../../../src/transform/transformParameters.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EAEV,kBAAkB,EAKnB,MAAM,yBAAyB,CAAC;AAyBjC,OAAO,EACL,SAAS,EAIV,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,EAC3C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,GACrB,kBAAkB,EAAE,CAkEtB"}
|
|
@@ -4,7 +4,7 @@ import { ImportKind, SchemaContext } from "@azure-tools/rlc-common";
|
|
|
4
4
|
import { ignoreDiagnostics } from "@typespec/compiler";
|
|
5
5
|
import { getHttpOperation } from "@typespec/http";
|
|
6
6
|
import { getImportedModelName, getTypeName, getSchemaForType, getFormattedPropertyDoc, getBodyType, predictDefaultValue, getBinaryType, enrichBinaryTypeInBody } from "../utils/modelUtils.js";
|
|
7
|
-
import { getOperationGroupName, getOperationName, isBinaryPayload } from "../utils/operationUtil.js";
|
|
7
|
+
import { getOperationGroupName, getOperationName, getSpecialSerializeInfo, isBinaryPayload } from "../utils/operationUtil.js";
|
|
8
8
|
import { listOperationGroups, listOperationsInOperationGroup, isApiVersion } from "@azure-tools/typespec-client-generator-core";
|
|
9
9
|
export function transformToParameterTypes(importDetails, client, dpgContext) {
|
|
10
10
|
var _a, _b;
|
|
@@ -76,7 +76,7 @@ function getParameterMetadata(dpgContext, paramType, parameter) {
|
|
|
76
76
|
type === "Array<string>" ||
|
|
77
77
|
type === "number[]" ||
|
|
78
78
|
type === "Array<number>") {
|
|
79
|
-
const serializeInfo = getSpecialSerializeInfo(parameter);
|
|
79
|
+
const serializeInfo = getSpecialSerializeInfo(parameter.type, parameter.format);
|
|
80
80
|
if (serializeInfo.hasMultiCollection ||
|
|
81
81
|
serializeInfo.hasPipeCollection ||
|
|
82
82
|
serializeInfo.hasSsvCollection ||
|
|
@@ -154,7 +154,7 @@ function transformNormalBody(dpgContext, bodyType, parameters, importedModels, h
|
|
|
154
154
|
if (hasBinaryContent) {
|
|
155
155
|
descriptions.push("Value may contain any sequence of octets");
|
|
156
156
|
}
|
|
157
|
-
const type =
|
|
157
|
+
const type = extractNameFromTypeSpecType(dpgContext, bodyType, importedModels, headers);
|
|
158
158
|
let schema = getSchemaForType(dpgContext, bodyType);
|
|
159
159
|
let overrideType = undefined;
|
|
160
160
|
if (hasBinaryContent) {
|
|
@@ -179,7 +179,7 @@ function transformMultiFormBody(dpgContext, bodyType, parameters, importedModels
|
|
|
179
179
|
var _a, _b;
|
|
180
180
|
const isModelBody = bodyType.kind === "Model";
|
|
181
181
|
if (!isModelBody) {
|
|
182
|
-
const type =
|
|
182
|
+
const type = extractNameFromTypeSpecType(dpgContext, bodyType, importedModels);
|
|
183
183
|
const description = extractDescriptionsFromBody(dpgContext, bodyType, parameters).join("\n\n");
|
|
184
184
|
return {
|
|
185
185
|
isPartialBody: true,
|
|
@@ -211,7 +211,7 @@ function transformMultiFormBody(dpgContext, bodyType, parameters, importedModels
|
|
|
211
211
|
])}>`;
|
|
212
212
|
}
|
|
213
213
|
else {
|
|
214
|
-
type =
|
|
214
|
+
type = extractNameFromTypeSpecType(dpgContext, paramType.type, importedModels);
|
|
215
215
|
}
|
|
216
216
|
bodyParameters.body.push({
|
|
217
217
|
name: paramName,
|
|
@@ -229,9 +229,9 @@ function getBodyDetail(dpgContext, bodyType, headers) {
|
|
|
229
229
|
const hasFormContent = contentTypes.includes(`"multipart/form-data"`);
|
|
230
230
|
return { hasBinaryContent, hasFormContent };
|
|
231
231
|
}
|
|
232
|
-
function
|
|
232
|
+
function extractNameFromTypeSpecType(dpgContext, type, importedModels, headers) {
|
|
233
233
|
var _a;
|
|
234
|
-
const bodySchema = getSchemaForType(dpgContext,
|
|
234
|
+
const bodySchema = getSchemaForType(dpgContext, type, [
|
|
235
235
|
SchemaContext.Input,
|
|
236
236
|
SchemaContext.Exception
|
|
237
237
|
]);
|
|
@@ -286,48 +286,4 @@ function extractDescriptionsFromBody(dpgContext, bodyType, parameters) {
|
|
|
286
286
|
]));
|
|
287
287
|
return description ? [description] : [];
|
|
288
288
|
}
|
|
289
|
-
export function getSpecialSerializeInfo(parameter) {
|
|
290
|
-
let hasMultiCollection = false;
|
|
291
|
-
let hasPipeCollection = false;
|
|
292
|
-
let hasSsvCollection = false;
|
|
293
|
-
let hasTsvCollection = false;
|
|
294
|
-
let hasCsvCollection = false;
|
|
295
|
-
const descriptions = [];
|
|
296
|
-
const collectionInfo = [];
|
|
297
|
-
if ((parameter.type === "query" || parameter.type === "header") &&
|
|
298
|
-
parameter.format === "multi") {
|
|
299
|
-
hasMultiCollection = true;
|
|
300
|
-
descriptions.push("buildMultiCollection");
|
|
301
|
-
collectionInfo.push("multi");
|
|
302
|
-
}
|
|
303
|
-
if (parameter.type === "query" && parameter.format === "ssv") {
|
|
304
|
-
hasSsvCollection = true;
|
|
305
|
-
descriptions.push("buildSsvCollection");
|
|
306
|
-
collectionInfo.push("ssv");
|
|
307
|
-
}
|
|
308
|
-
if (parameter.type === "query" && parameter.format === "tsv") {
|
|
309
|
-
hasTsvCollection = true;
|
|
310
|
-
descriptions.push("buildTsvCollection");
|
|
311
|
-
collectionInfo.push("tsv");
|
|
312
|
-
}
|
|
313
|
-
if (parameter.type === "query" && parameter.format === "pipes") {
|
|
314
|
-
hasPipeCollection = true;
|
|
315
|
-
descriptions.push("buildPipeCollection");
|
|
316
|
-
collectionInfo.push("pipe");
|
|
317
|
-
}
|
|
318
|
-
if (parameter.type === "header" && parameter.format === "csv") {
|
|
319
|
-
hasCsvCollection = true;
|
|
320
|
-
descriptions.push("buildCsvCollection");
|
|
321
|
-
collectionInfo.push("csv");
|
|
322
|
-
}
|
|
323
|
-
return {
|
|
324
|
-
hasMultiCollection,
|
|
325
|
-
hasPipeCollection,
|
|
326
|
-
hasSsvCollection,
|
|
327
|
-
hasTsvCollection,
|
|
328
|
-
hasCsvCollection,
|
|
329
|
-
descriptions,
|
|
330
|
-
collectionInfo
|
|
331
|
-
};
|
|
332
|
-
}
|
|
333
289
|
//# sourceMappingURL=transformParameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformParameters.js","sourceRoot":"","sources":["../../../src/transform/transformParameters.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transformParameters.js","sourceRoot":"","sources":["../../../src/transform/transformParameters.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,6 +105,7 @@ function transformHeaders(dpgContext, response) {
|
|
|
105
105
|
return rlcHeaders.length ? rlcHeaders : undefined;
|
|
106
106
|
}
|
|
107
107
|
function transformBody(dpgContext, response, importedModels) {
|
|
108
|
+
var _a;
|
|
108
109
|
if (!response.responses.length) {
|
|
109
110
|
return;
|
|
110
111
|
}
|
|
@@ -127,12 +128,10 @@ function transformBody(dpgContext, response, importedModels) {
|
|
|
127
128
|
const bodySchema = getSchemaForType(dpgContext, body.type, [
|
|
128
129
|
SchemaContext.Output
|
|
129
130
|
]);
|
|
130
|
-
|
|
131
|
-
fromCore = true;
|
|
132
|
-
}
|
|
131
|
+
fromCore = (_a = bodySchema.fromCore) !== null && _a !== void 0 ? _a : false;
|
|
133
132
|
const bodyType = getTypeName(bodySchema);
|
|
134
133
|
const importedNames = getImportedModelName(bodySchema);
|
|
135
|
-
if (importedNames) {
|
|
134
|
+
if (importedNames && !fromCore) {
|
|
136
135
|
importedNames
|
|
137
136
|
.filter((name) => {
|
|
138
137
|
return name !== "any";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformResponses.js","sourceRoot":"","sources":["../../../src/transform/transformResponses.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"transformResponses.js","sourceRoot":"","sources":["../../../src/transform/transformResponses.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAErD,OAAO,EAA4B,OAAO,EAAQ,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"transformSchemas.d.ts","sourceRoot":"","sources":["../../../src/transform/transformSchemas.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAGV,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAA4B,OAAO,EAAQ,MAAM,oBAAoB,CAAC;AAS7E,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,SAwLvB"}
|
|
@@ -4,7 +4,7 @@ import { listOperationGroups, listOperationsInOperationGroup } from "@azure-tool
|
|
|
4
4
|
import { SchemaContext } from "@azure-tools/rlc-common";
|
|
5
5
|
import { ignoreDiagnostics } from "@typespec/compiler";
|
|
6
6
|
import { getHttpOperation } from "@typespec/http";
|
|
7
|
-
import { getSchemaForType, includeDerivedModel, getBodyType, trimUsage } from "../utils/modelUtils.js";
|
|
7
|
+
import { getSchemaForType, includeDerivedModel, getBodyType, trimUsage, isAzureCoreErrorType } from "../utils/modelUtils.js";
|
|
8
8
|
export function transformSchemas(program, client, dpgContext) {
|
|
9
9
|
var _a, _b;
|
|
10
10
|
const schemas = new Map();
|
|
@@ -32,17 +32,13 @@ export function transformSchemas(program, client, dpgContext) {
|
|
|
32
32
|
transformSchemaForRoute(route);
|
|
33
33
|
}
|
|
34
34
|
function transformSchemaForRoute(route) {
|
|
35
|
-
var _a, _b;
|
|
36
35
|
const bodyModel = getBodyType(program, route);
|
|
37
36
|
if (bodyModel &&
|
|
38
37
|
(bodyModel.kind === "Model" || bodyModel.kind === "Union")) {
|
|
39
38
|
getGeneratedModels(bodyModel, SchemaContext.Input);
|
|
40
39
|
}
|
|
41
40
|
for (const resp of route.responses) {
|
|
42
|
-
if (resp.type
|
|
43
|
-
resp.type.name === "ErrorResponse" &&
|
|
44
|
-
((_a = resp.type.namespace) === null || _a === void 0 ? void 0 : _a.name) === "Foundations" &&
|
|
45
|
-
((_b = resp.type.namespace.namespace) === null || _b === void 0 ? void 0 : _b.name) === "Core") {
|
|
41
|
+
if (isAzureCoreErrorType(resp.type)) {
|
|
46
42
|
continue;
|
|
47
43
|
}
|
|
48
44
|
for (const resps of resp.responses) {
|
|
@@ -54,9 +50,9 @@ export function transformSchemas(program, client, dpgContext) {
|
|
|
54
50
|
}
|
|
55
51
|
}
|
|
56
52
|
}
|
|
57
|
-
program.stateMap(modelKey).forEach((context,
|
|
53
|
+
program.stateMap(modelKey).forEach((context, tspModel) => {
|
|
58
54
|
var _a;
|
|
59
|
-
const model = getSchemaForType(dpgContext,
|
|
55
|
+
const model = getSchemaForType(dpgContext, tspModel, context);
|
|
60
56
|
if (model) {
|
|
61
57
|
model.usage = context;
|
|
62
58
|
}
|
|
@@ -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,EAAwB,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAiB,MAAM,gBAAgB,CAAC;AACjE,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,WAAW,EACX,SAAS,
|
|
1
|
+
{"version":3,"file":"transformSchemas.js","sourceRoot":"","sources":["../../../src/transform/transformSchemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
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,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,SAAS,GAChB,aAAa,GAAG,SAAS,CAW3B"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { listOperationGroups, listOperationsInOperationGroup } from "@azure-tools/typespec-client-generator-core";
|
|
2
2
|
import { ignoreDiagnostics } from "@typespec/compiler";
|
|
3
|
+
import { getCustomRequestHeaderNameForOperation } from "../utils/operationUtil.js";
|
|
3
4
|
import { getHttpOperation } from "@typespec/http";
|
|
4
5
|
export function transformTelemetryInfo(dpgContext, client) {
|
|
5
6
|
const customRequestIdHeaderName = getCustomRequestHeaderNameForClient(dpgContext, client);
|
|
@@ -17,7 +18,7 @@ function getCustomRequestHeaderNameForClient(dpgContext, client) {
|
|
|
17
18
|
const operations = listOperationsInOperationGroup(dpgContext, operationGroup);
|
|
18
19
|
for (const op of operations) {
|
|
19
20
|
const headerName = getCustomRequestHeaderNameForOperation(ignoreDiagnostics(getHttpOperation(program, op)));
|
|
20
|
-
if (headerName
|
|
21
|
+
if (headerName !== undefined) {
|
|
21
22
|
return headerName;
|
|
22
23
|
}
|
|
23
24
|
}
|
|
@@ -25,18 +26,10 @@ function getCustomRequestHeaderNameForClient(dpgContext, client) {
|
|
|
25
26
|
const clientOperations = listOperationsInOperationGroup(dpgContext, client);
|
|
26
27
|
for (const clientOp of clientOperations) {
|
|
27
28
|
const headerName = getCustomRequestHeaderNameForOperation(ignoreDiagnostics(getHttpOperation(program, clientOp)));
|
|
28
|
-
if (headerName
|
|
29
|
+
if (headerName !== undefined) {
|
|
29
30
|
return headerName;
|
|
30
31
|
}
|
|
31
32
|
}
|
|
32
33
|
return undefined;
|
|
33
34
|
}
|
|
34
|
-
function getCustomRequestHeaderNameForOperation(route) {
|
|
35
|
-
const CUSTOM_REQUEST_HEADER_NAME = "client-request-id";
|
|
36
|
-
const params = route.parameters.parameters.filter((p) => p.type === "header" && p.name.toLowerCase() === CUSTOM_REQUEST_HEADER_NAME);
|
|
37
|
-
if (params.length > 0) {
|
|
38
|
-
return CUSTOM_REQUEST_HEADER_NAME;
|
|
39
|
-
}
|
|
40
|
-
return undefined;
|
|
41
|
-
}
|
|
42
35
|
//# sourceMappingURL=transformTelemetryInfo.js.map
|
|
@@ -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,gBAAgB,
|
|
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,UAAsB,EACtB,MAAiB;IAEjB,MAAM,yBAAyB,GAAG,mCAAmC,CACnE,UAAU,EACV,MAAM,CACP,CAAC;IACF,IAAI,yBAAyB,EAAE;QAC7B,OAAO;YACL,yBAAyB;SAC1B,CAAC;KACH;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mCAAmC,CAC1C,UAAsB,EACtB,MAAiB;IAEjB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IACnC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChE,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,MAAM,UAAU,GAAG,8BAA8B,CAC/C,UAAU,EACV,cAAc,CACf,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;YAC3B,MAAM,UAAU,GAAG,sCAAsC,CACvD,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CACjD,CAAC;YACF,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC5B,OAAO,UAAU,CAAC;aACnB;SACF;KACF;IACD,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5E,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;QACvC,MAAM,UAAU,GAAG,sCAAsC,CACvD,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CACvD,CAAC;QACF,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,OAAO,UAAU,CAAC;SACnB;KACF;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transfromRLCOptions.d.ts","sourceRoot":"","sources":["../../../src/transform/transfromRLCOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EAEX,MAAM,yBAAyB,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"transfromRLCOptions.d.ts","sourceRoot":"","sources":["../../../src/transform/transfromRLCOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EAEX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAIL,OAAO,EACR,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOpD,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,UAAU,EAC1B,UAAU,EAAE,UAAU,GACrB,UAAU,CAUZ;AA6MD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,UAAU;;;;;;EAgC3B"}
|
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
import { NameType, normalizeName } from "@azure-tools/rlc-common";
|
|
2
|
-
import { getDoc, NoTarget } from "@typespec/compiler";
|
|
3
|
-
import { getAuthentication } from "@typespec/http";
|
|
2
|
+
import { getDoc, ignoreDiagnostics, NoTarget } from "@typespec/compiler";
|
|
3
|
+
import { getAuthentication, getHttpOperation } from "@typespec/http";
|
|
4
4
|
import { reportDiagnostic } from "../lib.js";
|
|
5
5
|
import { getDefaultService } from "../utils/modelUtils.js";
|
|
6
6
|
import { getRLCClients } from "../utils/clientUtils.js";
|
|
7
|
+
import { listOperationGroups, listOperationsInOperationGroup } from "@azure-tools/typespec-client-generator-core";
|
|
8
|
+
import { getOperationName } from "../utils/operationUtil.js";
|
|
7
9
|
export function transformRLCOptions(emitterOptions, dpgContext) {
|
|
8
10
|
var _a, _b;
|
|
9
11
|
// Extract the options from emitter option
|
|
10
|
-
const options = extractRLCOptions(dpgContext
|
|
12
|
+
const options = extractRLCOptions(dpgContext, emitterOptions, (_b = (_a = dpgContext.generationPathDetail) === null || _a === void 0 ? void 0 : _a.rootDir) !== null && _b !== void 0 ? _b : "");
|
|
11
13
|
const batch = getRLCClients(dpgContext);
|
|
12
14
|
options.batch = batch;
|
|
13
15
|
return options;
|
|
14
16
|
}
|
|
15
|
-
function extractRLCOptions(
|
|
17
|
+
function extractRLCOptions(dpgContext, emitterOptions, generationRootDir) {
|
|
18
|
+
const program = dpgContext.program;
|
|
16
19
|
const includeShortcuts = getIncludeShortcuts(emitterOptions);
|
|
17
20
|
const packageDetails = getPackageDetails(program, emitterOptions);
|
|
18
21
|
const serviceInfo = getServiceInfo(program);
|
|
@@ -21,7 +24,7 @@ function extractRLCOptions(program, emitterOptions, generationRootDir) {
|
|
|
21
24
|
const generateTest = getGenerateTest(emitterOptions);
|
|
22
25
|
const credentialInfo = getCredentialInfo(program, emitterOptions);
|
|
23
26
|
const azureOutputDirectory = getAzureOutputDirectory(generationRootDir);
|
|
24
|
-
const enableOperationGroup = getEnableOperationGroup(emitterOptions);
|
|
27
|
+
const enableOperationGroup = getEnableOperationGroup(dpgContext, emitterOptions);
|
|
25
28
|
return {
|
|
26
29
|
...emitterOptions,
|
|
27
30
|
...credentialInfo,
|
|
@@ -32,7 +35,7 @@ function extractRLCOptions(program, emitterOptions, generationRootDir) {
|
|
|
32
35
|
azureSdkForJs,
|
|
33
36
|
serviceInfo,
|
|
34
37
|
azureOutputDirectory,
|
|
35
|
-
sourceFrom: "
|
|
38
|
+
sourceFrom: "TypeSpec",
|
|
36
39
|
enableOperationGroup
|
|
37
40
|
};
|
|
38
41
|
}
|
|
@@ -89,10 +92,46 @@ function processAuth(program) {
|
|
|
89
92
|
}
|
|
90
93
|
return securityInfo;
|
|
91
94
|
}
|
|
92
|
-
function getEnableOperationGroup(emitterOptions) {
|
|
93
|
-
if (emitterOptions.enableOperationGroup === true
|
|
94
|
-
|
|
95
|
+
function getEnableOperationGroup(dpgContext, emitterOptions) {
|
|
96
|
+
if (emitterOptions.enableOperationGroup === true ||
|
|
97
|
+
emitterOptions.enableOperationGroup === false) {
|
|
98
|
+
return emitterOptions.enableOperationGroup;
|
|
95
99
|
}
|
|
100
|
+
// Detect if existing name conflicts if customers didn't set the option explicitly
|
|
101
|
+
return detectIfNameConflicts(dpgContext);
|
|
102
|
+
}
|
|
103
|
+
function detectIfNameConflicts(dpgContext) {
|
|
104
|
+
const clients = getRLCClients(dpgContext);
|
|
105
|
+
const program = dpgContext.program;
|
|
106
|
+
const nameSet = new Set();
|
|
107
|
+
for (const client of clients) {
|
|
108
|
+
const operationGroups = listOperationGroups(dpgContext, client);
|
|
109
|
+
for (const operationGroup of operationGroups) {
|
|
110
|
+
const operations = listOperationsInOperationGroup(dpgContext, operationGroup);
|
|
111
|
+
for (const op of operations) {
|
|
112
|
+
const route = ignoreDiagnostics(getHttpOperation(program, op));
|
|
113
|
+
const name = getOperationName(program, route.operation);
|
|
114
|
+
if (nameSet.has(name)) {
|
|
115
|
+
return true;
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
nameSet.add(name);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
const clientOperations = listOperationsInOperationGroup(dpgContext, client);
|
|
123
|
+
for (const clientOp of clientOperations) {
|
|
124
|
+
const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
|
|
125
|
+
const name = getOperationName(program, route.operation);
|
|
126
|
+
if (nameSet.has(name)) {
|
|
127
|
+
return true;
|
|
128
|
+
}
|
|
129
|
+
else {
|
|
130
|
+
nameSet.add(name);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
// No conflicts if we didn't detect any
|
|
96
135
|
return false;
|
|
97
136
|
}
|
|
98
137
|
function getIncludeShortcuts(emitterOptions) {
|