@azure-tools/typespec-java 0.38.6 → 0.39.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/code-model-builder.d.ts.map +1 -1
- package/dist/src/code-model-builder.js +37 -14
- package/dist/src/code-model-builder.js.map +1 -1
- package/dist/src/external-schemas.d.ts.map +1 -1
- package/dist/src/external-schemas.js +22 -12
- package/dist/src/external-schemas.js.map +1 -1
- package/dist/src/operation-utils.d.ts +2 -2
- package/dist/src/operation-utils.d.ts.map +1 -1
- package/dist/src/operation-utils.js +7 -1
- package/dist/src/operation-utils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/generator/http-client-generator/target/emitter.jar +0 -0
- package/package.json +11 -11
|
@@ -118,7 +118,7 @@ const fileDetailsMap = new Map();
|
|
|
118
118
|
function getFileSchemaName(baseName, sdkModelType) {
|
|
119
119
|
// If the TypeSpec Model exists and is not TypeSpec.Http.File, directly use its name
|
|
120
120
|
if (sdkModelType && sdkModelType.crossLanguageDefinitionId !== "TypeSpec.Http.File") {
|
|
121
|
-
return
|
|
121
|
+
return sdkModelType.name;
|
|
122
122
|
}
|
|
123
123
|
// make sure suffix "FileDetails"
|
|
124
124
|
if (baseName.toLocaleLowerCase().endsWith("filedetails")) {
|
|
@@ -155,22 +155,33 @@ function addContentProperty(fileDetailsSchema, binarySchema) {
|
|
|
155
155
|
}));
|
|
156
156
|
}
|
|
157
157
|
function addFilenameProperty(fileDetailsSchema, stringSchema, filenameProperty, processSchemaFunc) {
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
158
|
+
const isRequired = filenameProperty ? !filenameProperty.optional : false;
|
|
159
|
+
const isConstant = filenameProperty?.type.kind === "constant" && isRequired;
|
|
160
|
+
// If the type is constant but not required, treat the type as non-constant String but its value as the default.
|
|
161
|
+
const clientDefaultValue = filenameProperty?.type.kind === "constant" ? String(filenameProperty.type.value) : undefined;
|
|
162
|
+
fileDetailsSchema.addProperty(new Property("filename", "The filename of the file.", isConstant && processSchemaFunc ? processSchemaFunc(filenameProperty.type) : stringSchema, {
|
|
163
|
+
required: isRequired,
|
|
162
164
|
nullable: false,
|
|
163
165
|
readOnly: false,
|
|
166
|
+
clientDefaultValue: clientDefaultValue,
|
|
164
167
|
}));
|
|
165
168
|
}
|
|
166
169
|
function addContentTypeProperty(fileDetailsSchema, stringSchema, contentTypeProperty, processSchemaFunc) {
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
170
|
+
const isRequired = contentTypeProperty ? !contentTypeProperty.optional : false;
|
|
171
|
+
const isConstant = contentTypeProperty?.type.kind === "constant" && isRequired;
|
|
172
|
+
// If the type is constant but not required, treat the type as non-constant String but its value as the default.
|
|
173
|
+
/*
|
|
174
|
+
* TypeSpec 'TypeSpec.Http.File<"image/png">' is such case.
|
|
175
|
+
* Feels that it is not user-friendly to create a single value enum for FileContentType that user probably had to set for the request.
|
|
176
|
+
*/
|
|
177
|
+
const clientDefaultValue = contentTypeProperty?.type.kind === "constant"
|
|
178
|
+
? String(contentTypeProperty.type.value)
|
|
179
|
+
: "application/octet-stream";
|
|
180
|
+
fileDetailsSchema.addProperty(new Property("contentType", "The content-type of the file.", isConstant && processSchemaFunc ? processSchemaFunc(contentTypeProperty.type) : stringSchema, {
|
|
181
|
+
required: isRequired,
|
|
171
182
|
nullable: false,
|
|
172
183
|
readOnly: false,
|
|
173
|
-
clientDefaultValue:
|
|
184
|
+
clientDefaultValue: clientDefaultValue,
|
|
174
185
|
}));
|
|
175
186
|
}
|
|
176
187
|
export function getFileDetailsSchema(property, namespace, javaNamespace, schemas, binarySchema, stringSchema, processSchemaFunc) {
|
|
@@ -193,8 +204,7 @@ export function getFileDetailsSchema(property, namespace, javaNamespace, schemas
|
|
|
193
204
|
- Allow required for "filename" and "contentType"
|
|
194
205
|
*/
|
|
195
206
|
const filePropertyName = property.name;
|
|
196
|
-
const
|
|
197
|
-
const schemaName = getFileSchemaName(fileSchemaName, fileSdkType);
|
|
207
|
+
const schemaName = getFileSchemaName(filePropertyName, fileSdkType);
|
|
198
208
|
let fileDetailsSchema = fileDetailsMap.get(schemaName);
|
|
199
209
|
if (!fileDetailsSchema) {
|
|
200
210
|
const typeNamespace = getNamespace(property.type.__raw) ?? namespace;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-schemas.js","sourceRoot":"","sources":["../../src/external-schemas.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"external-schemas.js","sourceRoot":"","sources":["../../src/external-schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Parameter, Property } from "@autorest/codemodel";
|
|
2
|
-
import { SdkHttpOperation, SdkLroServiceMetadata, SdkModelPropertyType, SdkServiceResponseHeader } from "@azure-tools/typespec-client-generator-core";
|
|
2
|
+
import { SdkCookieParameter, SdkHeaderParameter, SdkHttpOperation, SdkLroServiceMetadata, SdkModelPropertyType, SdkPathParameter, SdkQueryParameter, SdkServiceResponseHeader } from "@azure-tools/typespec-client-generator-core";
|
|
3
3
|
import { Program, Type, Union } from "@typespec/compiler";
|
|
4
4
|
import { HttpOperation } from "@typespec/http";
|
|
5
5
|
import { Client as CodeModelClient, ServiceVersion } from "./common/client.js";
|
|
@@ -7,7 +7,7 @@ import { CodeModel } from "./common/code-model.js";
|
|
|
7
7
|
import { Operation as CodeModelOperation } from "./common/operation.js";
|
|
8
8
|
export declare const SPECIAL_HEADER_NAMES: Set<string>;
|
|
9
9
|
export declare const ORIGIN_API_VERSION = "modelerfour:synthesized/api-version";
|
|
10
|
-
export declare
|
|
10
|
+
export declare function isContentTypeHeader(header: SdkPathParameter | SdkQueryParameter | SdkHeaderParameter | SdkCookieParameter | SdkServiceResponseHeader): boolean;
|
|
11
11
|
export declare function isKnownContentType(contentTypes: string[]): boolean;
|
|
12
12
|
export declare function operationIsJsonMergePatch(op: SdkHttpOperation): boolean;
|
|
13
13
|
export declare function operationIsMultipart(op: SdkHttpOperation): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation-utils.d.ts","sourceRoot":"","sources":["../../src/operation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,QAAQ,EAAkB,MAAM,qBAAqB,CAAC;AACxF,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAa,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIxE,eAAO,MAAM,oBAAoB,aAO/B,CAAC;AAEH,eAAO,MAAM,kBAAkB,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"operation-utils.d.ts","sourceRoot":"","sources":["../../src/operation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,SAAS,EAAE,QAAQ,EAAkB,MAAM,qBAAqB,CAAC;AACxF,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,gBAAgB,EAChB,qBAAqB,EACrB,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAa,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIxE,eAAO,MAAM,oBAAoB,aAO/B,CAAC;AAEH,eAAO,MAAM,kBAAkB,wCAAwC,CAAC;AAmBxE,wBAAgB,mBAAmB,CACjC,MAAM,EACF,gBAAgB,GAChB,iBAAiB,GACjB,kBAAkB,GAClB,kBAAkB,GAClB,wBAAwB,GAC3B,OAAO,CAMT;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,OAAO,CAMlE;AAED,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAEvE;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAElE;AAaD,wBAAgB,+BAA+B,CAAC,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAa7E;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,EAAE,EAAE,aAAa,EACjB,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC,GACzC,KAAK,GAAG,IAAI,CA+Bd;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,GAAG,cAAc,CAerF;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,gBAAgB,EAC3B,WAAW,EAAE,qBAAqB,GACjC,OAAO,CAyBT;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAmBvE;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC1C,EAAE,EAAE,kBAAkB,EACtB,gBAAgB,EAAE,CAAC,wBAAwB,GAAG,oBAAoB,CAAC,EAAE,GAAG,SAAS,GAChF,QAAQ,EAAE,GAAG,SAAS,CA+BxB"}
|
|
@@ -11,7 +11,8 @@ export const SPECIAL_HEADER_NAMES = new Set([
|
|
|
11
11
|
"x-ms-authorization-auxiliary",
|
|
12
12
|
]);
|
|
13
13
|
export const ORIGIN_API_VERSION = "modelerfour:synthesized/api-version";
|
|
14
|
-
|
|
14
|
+
const CONTENT_TYPE_KEY = "content-type";
|
|
15
|
+
const CONTENT_TYPE_NAME = "contentType";
|
|
15
16
|
// azure-core SerializerEncoding.SUPPORTED_MIME_TYPES
|
|
16
17
|
const SUPPORTED_MIME_TYPES = new Set([
|
|
17
18
|
"text/xml",
|
|
@@ -25,6 +26,11 @@ const SUPPORTED_MIME_TYPES = new Set([
|
|
|
25
26
|
// not in azure-core
|
|
26
27
|
"application/merge-patch+json",
|
|
27
28
|
]);
|
|
29
|
+
export function isContentTypeHeader(header) {
|
|
30
|
+
return ((header.serializedName && header.serializedName.toLowerCase() === CONTENT_TYPE_KEY) ||
|
|
31
|
+
// TODO: remove after TCGC bug fix
|
|
32
|
+
(!header.serializedName && header.name === CONTENT_TYPE_NAME));
|
|
33
|
+
}
|
|
28
34
|
export function isKnownContentType(contentTypes) {
|
|
29
35
|
return contentTypes
|
|
30
36
|
.map((it) => it.toLowerCase())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation-utils.js","sourceRoot":"","sources":["../../src/operation-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAY,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"operation-utils.js","sourceRoot":"","sources":["../../src/operation-utils.ts"],"names":[],"mappings":"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"}
|