@azure-tools/typespec-java 0.29.2 → 0.30.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 +2 -9
- package/dist/src/code-model-builder.d.ts.map +1 -1
- package/dist/src/code-model-builder.js +36 -46
- package/dist/src/code-model-builder.js.map +1 -1
- package/dist/src/emitter.js +2 -2
- package/dist/src/emitter.js.map +1 -1
- package/dist/src/utils.d.ts +0 -1
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +0 -3
- package/dist/src/utils.js.map +1 -1
- package/dist/src/versioning-utils.d.ts +22 -0
- package/dist/src/versioning-utils.d.ts.map +1 -0
- package/dist/src/versioning-utils.js +40 -0
- package/dist/src/versioning-utils.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/generator/http-client-generator/target/emitter.jar +0 -0
- package/package.json +36 -36
|
@@ -50,6 +50,8 @@ export declare class CodeModelBuilder {
|
|
|
50
50
|
private processHostParameters;
|
|
51
51
|
private processAuth;
|
|
52
52
|
private isBranded;
|
|
53
|
+
private isAzureV1;
|
|
54
|
+
private isAzureV2;
|
|
53
55
|
private processModels;
|
|
54
56
|
private processSchemaUsage;
|
|
55
57
|
private deduplicateSchemaName;
|
|
@@ -57,15 +59,6 @@ export declare class CodeModelBuilder {
|
|
|
57
59
|
private processClients;
|
|
58
60
|
private processClient;
|
|
59
61
|
private listSubClientsUnderClient;
|
|
60
|
-
/**
|
|
61
|
-
* Filter api-versions for "ServiceVersion".
|
|
62
|
-
* TODO(xiaofei) pending TCGC design: https://github.com/Azure/typespec-azure/issues/965
|
|
63
|
-
*
|
|
64
|
-
* @param pinnedApiVersion the api-version to use as filter base
|
|
65
|
-
* @param versions api-versions to filter
|
|
66
|
-
* @returns filtered api-versions
|
|
67
|
-
*/
|
|
68
|
-
private getFilteredApiVersions;
|
|
69
62
|
private needToSkipProcessingOperation;
|
|
70
63
|
/**
|
|
71
64
|
* Whether we support advanced versioning in non-breaking fashion.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-model-builder.d.ts","sourceRoot":"","sources":["../../src/code-model-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIT,YAAY,EACZ,aAAa,EAcb,OAAO,EAEP,YAAY,EAEZ,YAAY,EAOZ,MAAM,EAMN,YAAY,EAKb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAyBL,OAAO,EAOR,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,WAAW,EAKX,OAAO,EAWR,MAAM,oBAAoB,CAAC;AAiB5B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAuBnD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAY,MAAM,cAAc,CAAC;AACpE,OAAO,EAIL,eAAe,EAShB,MAAM,iBAAiB,CAAC;AAazB,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAGhB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAG9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAGlB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAG3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAG/B,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAG7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,OAAO,CAAC,EAAE,GAAG,CAAC;IAGd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAG5C,aAAa,CAAC,EAAE,UAAU,CAAC;IAG3B,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAMD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,iBAAiB,CAAU;IACnC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,gBAAgB,CAAY;IAEpC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6B;IAEhE,QAAQ,CAAC,WAAW,mCAElB;IAGF,OAAO,CAAC,UAAU,CAAqB;gBAEpB,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC;IAmD7D,KAAK,IAAI,OAAO,CAAC,SAAS,CAAC;IAwDxC,OAAO,CAAC,qBAAqB;IAmC7B,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"code-model-builder.d.ts","sourceRoot":"","sources":["../../src/code-model-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,8 @@ import { ClientContext } from "./models.js";
|
|
|
22
22
|
import { CONTENT_TYPE_KEY, ORIGIN_API_VERSION, SPECIAL_HEADER_NAMES, cloneOperationParameter, getServiceVersion, isKnownContentType, isLroNewPollingStrategy, operationIsJsonMergePatch, operationIsMultipart, operationIsMultipleContentTypes, } from "./operation-utils.js";
|
|
23
23
|
import { LIB_NAME } from "./options.js";
|
|
24
24
|
import { BYTES_KNOWN_ENCODING, DATETIME_KNOWN_ENCODING, DURATION_KNOWN_ENCODING, ProcessingCache, getAccess, getDurationFormat, getNonNullSdkType, getPropertySerializedName, getUnionDescription, getUsage, modelIs, pushDistinct, } from "./type-utils.js";
|
|
25
|
-
import { DiagnosticError, escapeJavaKeywords, getNamespace,
|
|
25
|
+
import { DiagnosticError, escapeJavaKeywords, getNamespace, pascalCase, removeClientSuffix, stringArrayContainsIgnoreCase, trace, } from "./utils.js";
|
|
26
|
+
import { getFilteredApiVersions, getServiceApiVersions } from "./versioning-utils.js";
|
|
26
27
|
const { isEqual } = pkg;
|
|
27
28
|
const AZURE_CORE_FOUNDATIONS_ERROR_ID = "Azure.Core.Foundations.Error";
|
|
28
29
|
export class CodeModelBuilder {
|
|
@@ -159,27 +160,12 @@ export class CodeModelBuilder {
|
|
|
159
160
|
switch (scheme.type) {
|
|
160
161
|
case "oauth2":
|
|
161
162
|
{
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
securitySchemes.push(oauth2Scheme);
|
|
169
|
-
}
|
|
170
|
-
else {
|
|
171
|
-
// there is no TokenCredential in clientcore, hence use Bearer Authentication directly
|
|
172
|
-
reportDiagnostic(this.program, {
|
|
173
|
-
code: "auth-scheme-not-supported",
|
|
174
|
-
messageId: "oauth2Unbranded",
|
|
175
|
-
target: serviceNamespace,
|
|
176
|
-
});
|
|
177
|
-
const keyScheme = new KeySecurityScheme({
|
|
178
|
-
name: "authorization",
|
|
179
|
-
});
|
|
180
|
-
keyScheme.prefix = "Bearer";
|
|
181
|
-
securitySchemes.push(keyScheme);
|
|
182
|
-
}
|
|
163
|
+
const oauth2Scheme = new OAuth2SecurityScheme({
|
|
164
|
+
scopes: [],
|
|
165
|
+
});
|
|
166
|
+
scheme.flows.forEach((it) => oauth2Scheme.scopes.push(...it.scopes.map((it) => it.value)));
|
|
167
|
+
oauth2Scheme.flows = scheme.flows;
|
|
168
|
+
securitySchemes.push(oauth2Scheme);
|
|
183
169
|
}
|
|
184
170
|
break;
|
|
185
171
|
case "apiKey":
|
|
@@ -233,9 +219,18 @@ export class CodeModelBuilder {
|
|
|
233
219
|
}
|
|
234
220
|
}
|
|
235
221
|
isBranded() {
|
|
222
|
+
var _a, _b;
|
|
223
|
+
return (((_a = this.options["flavor"]) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === "azure" ||
|
|
224
|
+
((_b = this.options["flavor"]) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()) === "azurev2");
|
|
225
|
+
}
|
|
226
|
+
isAzureV1() {
|
|
236
227
|
var _a;
|
|
237
228
|
return ((_a = this.options["flavor"]) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === "azure";
|
|
238
229
|
}
|
|
230
|
+
isAzureV2() {
|
|
231
|
+
var _a;
|
|
232
|
+
return ((_a = this.options["flavor"]) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === "azurev2";
|
|
233
|
+
}
|
|
239
234
|
processModels() {
|
|
240
235
|
const processedSdkModels = new Set();
|
|
241
236
|
// cache resolved value of access/usage for the namespace
|
|
@@ -287,13 +282,16 @@ export class CodeModelBuilder {
|
|
|
287
282
|
// deduplicate model name
|
|
288
283
|
const nameCount = new Map();
|
|
289
284
|
const deduplicateName = (schema) => {
|
|
290
|
-
var _a, _b, _c, _d;
|
|
285
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
291
286
|
const name = schema.language.default.name;
|
|
292
287
|
if (name &&
|
|
293
288
|
// skip models under "com.azure.core." in java, or "Azure." in typespec, if branded
|
|
294
|
-
!(this.isBranded() &&
|
|
289
|
+
!((this.isBranded() &&
|
|
295
290
|
(((_b = (_a = schema.language.java) === null || _a === void 0 ? void 0 : _a.namespace) === null || _b === void 0 ? void 0 : _b.startsWith("com.azure.core.")) ||
|
|
296
|
-
((_d = (_c = schema.language.default) === null || _c === void 0 ? void 0 : _c.namespace) === null || _d === void 0 ? void 0 : _d.startsWith("Azure."))
|
|
291
|
+
((_d = (_c = schema.language.default) === null || _c === void 0 ? void 0 : _c.namespace) === null || _d === void 0 ? void 0 : _d.startsWith("Azure.")) ||
|
|
292
|
+
((_f = (_e = schema.language.java) === null || _e === void 0 ? void 0 : _e.namespace) === null || _f === void 0 ? void 0 : _f.startsWith("com.azure.v2.core.")) ||
|
|
293
|
+
((_h = (_g = schema.language.java) === null || _g === void 0 ? void 0 : _g.namespace) === null || _h === void 0 ? void 0 : _h.startsWith("io.clientcore.core.")))) // because azure core v2 uses clientcore types
|
|
294
|
+
)) {
|
|
297
295
|
if (!nameCount.has(name)) {
|
|
298
296
|
nameCount.set(name, 1);
|
|
299
297
|
}
|
|
@@ -341,8 +339,8 @@ export class CodeModelBuilder {
|
|
|
341
339
|
}
|
|
342
340
|
}
|
|
343
341
|
processClients() {
|
|
344
|
-
var _a;
|
|
345
342
|
// preprocess group-etag-headers
|
|
343
|
+
var _a;
|
|
346
344
|
this.options["group-etag-headers"] = (_a = this.options["group-etag-headers"]) !== null && _a !== void 0 ? _a : true;
|
|
347
345
|
const sdkPackage = this.sdkContext.sdkPackage;
|
|
348
346
|
for (const client of sdkPackage.clients) {
|
|
@@ -375,7 +373,7 @@ export class CodeModelBuilder {
|
|
|
375
373
|
});
|
|
376
374
|
codeModelClient.language.default.crossLanguageDefinitionId = client.crossLanguageDefinitionId;
|
|
377
375
|
// versioning
|
|
378
|
-
const versions = client
|
|
376
|
+
const versions = getServiceApiVersions(this.program, client);
|
|
379
377
|
if (versions && versions.length > 0) {
|
|
380
378
|
if (!this.sdkContext.apiVersion || ["all", "latest"].includes(this.sdkContext.apiVersion)) {
|
|
381
379
|
this.apiVersion = versions[versions.length - 1];
|
|
@@ -391,7 +389,7 @@ export class CodeModelBuilder {
|
|
|
391
389
|
}
|
|
392
390
|
}
|
|
393
391
|
codeModelClient.apiVersions = [];
|
|
394
|
-
for (const version of
|
|
392
|
+
for (const version of getFilteredApiVersions(this.apiVersion, versions, this.options["service-version-exclude-preview"])) {
|
|
395
393
|
const apiVersion = new ApiVersion();
|
|
396
394
|
apiVersion.version = version;
|
|
397
395
|
codeModelClient.apiVersions.push(apiVersion);
|
|
@@ -450,7 +448,8 @@ export class CodeModelBuilder {
|
|
|
450
448
|
for (const subClient of subClients) {
|
|
451
449
|
const codeModelSubclient = this.processClient(subClient);
|
|
452
450
|
const buildMethodPublic = Boolean(subClient.clientInitialization.initializedBy & InitializedByFlags.Individually);
|
|
453
|
-
const parentAccessorPublic = Boolean(subClient.clientInitialization.initializedBy & InitializedByFlags.Parent
|
|
451
|
+
const parentAccessorPublic = Boolean(subClient.clientInitialization.initializedBy & InitializedByFlags.Parent ||
|
|
452
|
+
subClient.clientInitialization.initializedBy === InitializedByFlags.Default);
|
|
454
453
|
codeModelClient.addSubClient(codeModelSubclient, buildMethodPublic, parentAccessorPublic);
|
|
455
454
|
}
|
|
456
455
|
}
|
|
@@ -529,22 +528,6 @@ export class CodeModelBuilder {
|
|
|
529
528
|
}
|
|
530
529
|
return subClients;
|
|
531
530
|
}
|
|
532
|
-
/**
|
|
533
|
-
* Filter api-versions for "ServiceVersion".
|
|
534
|
-
* TODO(xiaofei) pending TCGC design: https://github.com/Azure/typespec-azure/issues/965
|
|
535
|
-
*
|
|
536
|
-
* @param pinnedApiVersion the api-version to use as filter base
|
|
537
|
-
* @param versions api-versions to filter
|
|
538
|
-
* @returns filtered api-versions
|
|
539
|
-
*/
|
|
540
|
-
getFilteredApiVersions(pinnedApiVersion, versions, excludePreview = false) {
|
|
541
|
-
if (!pinnedApiVersion) {
|
|
542
|
-
return versions;
|
|
543
|
-
}
|
|
544
|
-
return versions
|
|
545
|
-
.slice(0, versions.indexOf(pinnedApiVersion) + 1)
|
|
546
|
-
.filter((version) => !excludePreview || !isStableApiVersion(pinnedApiVersion) || isStableApiVersion(version));
|
|
547
|
-
}
|
|
548
531
|
needToSkipProcessingOperation(operation, clientContext) {
|
|
549
532
|
// don't generate protocol and convenience method for overloaded operations
|
|
550
533
|
// issue link: https://github.com/Azure/autorest.java/issues/1958#issuecomment-1562558219 we will support generate overload methods for non-union type in future (TODO issue: https://github.com/Azure/autorest.java/issues/2160)
|
|
@@ -1307,13 +1290,20 @@ export class CodeModelBuilder {
|
|
|
1307
1290
|
? "Specifies HTTP options for conditional requests based on modification time."
|
|
1308
1291
|
: "Specifies HTTP options for conditional requests.";
|
|
1309
1292
|
// group schema
|
|
1293
|
+
let coreNamespace = this.namespace;
|
|
1294
|
+
if (this.isAzureV1()) {
|
|
1295
|
+
coreNamespace = "com.azure.core.http";
|
|
1296
|
+
}
|
|
1297
|
+
else {
|
|
1298
|
+
coreNamespace = "io.clientcore.core.http.models";
|
|
1299
|
+
}
|
|
1310
1300
|
const requestConditionsSchema = this.codeModel.schemas.add(new GroupSchema(schemaName, schemaDescription, {
|
|
1311
1301
|
language: {
|
|
1312
1302
|
default: {
|
|
1313
1303
|
namespace: this.namespace,
|
|
1314
1304
|
},
|
|
1315
1305
|
java: {
|
|
1316
|
-
namespace:
|
|
1306
|
+
namespace: coreNamespace,
|
|
1317
1307
|
},
|
|
1318
1308
|
},
|
|
1319
1309
|
}));
|