@autorest/typescript 6.0.0-rc.9.20230306.1 → 6.0.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/dist/src/generators/static/packageFileGenerator.js +2 -2
- package/dist/src/generators/utils/docsUtils.d.ts +1 -1
- package/dist/src/generators/utils/docsUtils.d.ts.map +1 -1
- package/dist/src/models/modelDetails.d.ts +3 -3
- package/dist/src/models/modelDetails.d.ts.map +1 -1
- package/dist/src/models/operationDetails.d.ts +2 -2
- package/dist/src/models/operationDetails.d.ts.map +1 -1
- package/dist/src/restLevelClient/interfaces.d.ts +6 -6
- package/dist/src/restLevelClient/interfaces.d.ts.map +1 -1
- package/dist/src/restLevelClient/transforms/transform.d.ts.map +1 -1
- package/dist/src/restLevelClient/transforms/transform.js +38 -12
- package/dist/src/restLevelClient/transforms/transform.js.map +1 -1
- package/dist/src/restLevelClient/transforms/transformResponseTypes.d.ts.map +1 -1
- package/dist/src/restLevelClient/transforms/transformResponseTypes.js +5 -1
- package/dist/src/restLevelClient/transforms/transformResponseTypes.js.map +1 -1
- package/dist/src/transforms/mapperTransforms.d.ts +2 -2
- package/dist/src/transforms/mapperTransforms.d.ts.map +1 -1
- package/dist/src/utils/autorestOptions.d.ts.map +1 -1
- package/dist/src/utils/autorestOptions.js +4 -2
- package/dist/src/utils/autorestOptions.js.map +1 -1
- package/dist/src/utils/languageHelpers.d.ts +1 -1
- package/dist/src/utils/languageHelpers.d.ts.map +1 -1
- package/package.json +12 -10
- package/src/generators/static/packageFileGenerator.ts +2 -2
- package/src/restLevelClient/transforms/transform.ts +58 -16
- package/src/restLevelClient/transforms/transformResponseTypes.ts +5 -1
- package/src/utils/autorestOptions.ts +5 -2
|
@@ -70,7 +70,7 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
70
70
|
mkdirp: "^2.1.2",
|
|
71
71
|
rollup: "^2.66.1",
|
|
72
72
|
"rollup-plugin-sourcemaps": "^0.6.3",
|
|
73
|
-
typescript: "~
|
|
73
|
+
typescript: "~5.0.0",
|
|
74
74
|
"uglify-js": "^3.4.9",
|
|
75
75
|
rimraf: "^3.0.0",
|
|
76
76
|
dotenv: "^16.0.0"
|
|
@@ -143,7 +143,7 @@ function regularAutorestPackage(clientDetails, packageDetails) {
|
|
|
143
143
|
if (generateTest) {
|
|
144
144
|
packageInfo.module = `./dist-esm/src/index.js`;
|
|
145
145
|
packageInfo.devDependencies["@azure/identity"] = "^2.0.1";
|
|
146
|
-
packageInfo.devDependencies["@azure-tools/test-recorder"] = "^
|
|
146
|
+
packageInfo.devDependencies["@azure-tools/test-recorder"] = "^3.0.0";
|
|
147
147
|
packageInfo.devDependencies["@azure-tools/test-credential"] = "^1.0.0";
|
|
148
148
|
packageInfo.devDependencies["mocha"] = "^7.1.1";
|
|
149
149
|
packageInfo.devDependencies["@types/chai"] = "^4.2.8";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OptionalKind, ParameterDeclarationStructure } from "ts-morph";
|
|
2
|
-
export
|
|
2
|
+
export type ParameterWithDescription = OptionalKind<ParameterDeclarationStructure & {
|
|
3
3
|
description: string;
|
|
4
4
|
}>;
|
|
5
5
|
export declare function generateOperationJSDoc(params?: ParameterWithDescription[], description?: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docsUtils.d.ts","sourceRoot":"","sources":["../../../../src/generators/utils/docsUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAIvE,
|
|
1
|
+
{"version":3,"file":"docsUtils.d.ts","sourceRoot":"","sources":["../../../../src/generators/utils/docsUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAIvE,MAAM,MAAM,wBAAwB,GAAG,YAAY,CACjD,6BAA6B,GAAG;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,CACF,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,MAAM,GAAE,wBAAwB,EAAO,EACvC,WAAW,GAAE,MAAW,GACvB,MAAM,CAOR"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ObjectSchema } from "@autorest/codemodel";
|
|
2
|
-
export
|
|
2
|
+
export type ObjectDetails = BasicObjectDetails | ComposedObjectDetails | PolymorphicObjectDetails;
|
|
3
3
|
export declare enum ObjectKind {
|
|
4
4
|
Basic = 0,
|
|
5
5
|
Extended = 1,
|
|
@@ -22,7 +22,7 @@ export interface BasicObjectDetails {
|
|
|
22
22
|
/**
|
|
23
23
|
* Type that represents an object which inherits
|
|
24
24
|
*/
|
|
25
|
-
export
|
|
25
|
+
export type ComposedObjectDetails = BasicObjectDetails & {
|
|
26
26
|
/**
|
|
27
27
|
* Parents from which the object inherits properties
|
|
28
28
|
*/
|
|
@@ -31,7 +31,7 @@ export declare type ComposedObjectDetails = BasicObjectDetails & {
|
|
|
31
31
|
/**
|
|
32
32
|
* Type for representing polymorphism of an Object
|
|
33
33
|
*/
|
|
34
|
-
export
|
|
34
|
+
export type PolymorphicObjectDetails = BasicObjectDetails & {
|
|
35
35
|
/**
|
|
36
36
|
* Polymorphic discriminator
|
|
37
37
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modelDetails.d.ts","sourceRoot":"","sources":["../../../src/models/modelDetails.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,
|
|
1
|
+
{"version":3,"file":"modelDetails.d.ts","sourceRoot":"","sources":["../../../src/models/modelDetails.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,aAAa,GACrB,kBAAkB,GAClB,qBAAqB,GACrB,wBAAwB,CAAC;AAE7B,oBAAY,UAAU;IACpB,KAAK,IAAA;IACL,QAAQ,IAAA;IACR,WAAW,IAAA;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,MAAM,EAAE,YAAY,CAAC;IACrB,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,kBAAkB,GAAG;IACvD;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,wBAAwB,GAAG,kBAAkB,GAAG;IAC1D;;OAEG;IACH,mBAAmB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;IACjD;;;OAGG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACzC,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED;;GAEG;AACH,oBAAY,YAAY;IACtB,SAAS,IAAA;IACT,IAAI,IAAA;IACJ,SAAS,IAAA;IACT,UAAU,IAAA;CACX"}
|
|
@@ -13,7 +13,7 @@ export interface OperationRequestDetails {
|
|
|
13
13
|
mediaType?: KnownMediaType;
|
|
14
14
|
parameters?: (Parameter | VirtualParameter)[];
|
|
15
15
|
}
|
|
16
|
-
export
|
|
16
|
+
export type OperationResponseMapper = Mapper | string;
|
|
17
17
|
/**
|
|
18
18
|
* Contains all the mappers related to an operation response
|
|
19
19
|
*/
|
|
@@ -97,7 +97,7 @@ export interface OperationGroupDetails {
|
|
|
97
97
|
export interface OperationSpecResponse {
|
|
98
98
|
bodyMapper?: Mapper | string;
|
|
99
99
|
}
|
|
100
|
-
export
|
|
100
|
+
export type OperationSpecResponses = {
|
|
101
101
|
[responseCode: string]: OperationResponseMappers;
|
|
102
102
|
};
|
|
103
103
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operationDetails.d.ts","sourceRoot":"","sources":["../../../src/models/operationDetails.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EAEV,SAAS,EACT,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,UAAU,CAAC,EAAE,CAAC,SAAS,GAAG,gBAAgB,CAAC,EAAE,CAAC;CAC/C;AAED,
|
|
1
|
+
{"version":3,"file":"operationDetails.d.ts","sourceRoot":"","sources":["../../../src/models/operationDetails.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EAEV,SAAS,EACT,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,UAAU,CAAC,EAAE,CAAC,SAAS,GAAG,gBAAgB,CAAC,EAAE,CAAC;CAC/C;AAED,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,MAAM,CAAC;AAEtD;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,eAAe,CAAC,EAAE,WAAW,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,OAAO,EAAE,wBAAwB,CAAC;IAClC,KAAK,EAAE,sBAAsB,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB;;OAEG;IACH,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,QAAQ,EAAE,uBAAuB,EAAE,CAAC;IACpC,SAAS,EAAE,wBAAwB,EAAE,CAAC;IACtC,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,sBAAsB,CAAC;IAClC,WAAW,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACpD,kBAAkB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACxC,eAAe,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACrC,aAAa,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,UAAU,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9B;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,CAAC,YAAY,EAAE,MAAM,GAAG,wBAAwB,CAAC;CAClD,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,gBAAgB,EAAE,OAAO,CAAC;CAC3B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Schema } from "@autorest/codemodel";
|
|
2
2
|
import { ExampleParameter } from "@autorest/testmodeler/dist/src/core/model";
|
|
3
|
-
export
|
|
3
|
+
export type PathParameter = {
|
|
4
4
|
name: string;
|
|
5
5
|
schema: Schema;
|
|
6
6
|
description?: string;
|
|
@@ -17,7 +17,7 @@ export interface OperationMethod {
|
|
|
17
17
|
successStatus: string[];
|
|
18
18
|
responseTypes: ResponseTypes;
|
|
19
19
|
}
|
|
20
|
-
export
|
|
20
|
+
export type Methods = {
|
|
21
21
|
[key: string]: [OperationMethod];
|
|
22
22
|
};
|
|
23
23
|
export interface PathMetadata {
|
|
@@ -26,7 +26,7 @@ export interface PathMetadata {
|
|
|
26
26
|
methods: Methods;
|
|
27
27
|
annotations?: OperationAnnotations;
|
|
28
28
|
}
|
|
29
|
-
export
|
|
29
|
+
export type Paths = Record<string, PathMetadata>;
|
|
30
30
|
export interface OperationAnnotations {
|
|
31
31
|
isLongRunning?: boolean;
|
|
32
32
|
isPageable?: boolean;
|
|
@@ -64,9 +64,9 @@ export interface RLCSampleDetail {
|
|
|
64
64
|
isPaging: boolean;
|
|
65
65
|
useLegacyLro: boolean;
|
|
66
66
|
}
|
|
67
|
-
export
|
|
68
|
-
export
|
|
69
|
-
export
|
|
67
|
+
export type SampleParameterPosition = "client" | "path" | "method";
|
|
68
|
+
export type SampleParameters = Record<SampleParameterPosition, SampleParameter[]>;
|
|
69
|
+
export type TestSampleParameters = Record<SampleParameterPosition, ExampleParameter[]>;
|
|
70
70
|
export interface SampleParameter {
|
|
71
71
|
name: string;
|
|
72
72
|
assignment?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/restLevelClient/interfaces.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAG7E,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/restLevelClient/interfaces.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAG7E,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,eAAe,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,aAAa,EAAE,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,oBAAoB,CAAC;CACpC;AAED,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAEjD,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,SAAS,GAAG,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,uBAAuB,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEnE,MAAM,MAAM,gBAAgB,GAAG,MAAM,CACnC,uBAAuB,EACvB,eAAe,EAAE,CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,MAAM,CACvC,uBAAuB,EACvB,gBAAgB,EAAE,CACnB,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transform.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAIV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,QAAQ,EACR,iBAAiB,
|
|
1
|
+
{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transform.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAIV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,QAAQ,EACR,iBAAiB,EAKlB,MAAM,yBAAyB,CAAC;AAoBjC,wBAAgB,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,QAAQ,CAqBpD;AAyDD,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,SAAS,GACf,iBAAiB,CAoDnB"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.transformAnnotationDetails = exports.transform = void 0;
|
|
6
6
|
const codemodel_1 = require("@autorest/codemodel");
|
|
7
|
+
const rlc_common_1 = require("@azure-tools/rlc-common");
|
|
7
8
|
const autorestSession_1 = require("../../autorestSession");
|
|
8
9
|
const urlTransforms_1 = require("../../transforms/urlTransforms");
|
|
9
10
|
const extractPaginationDetails_1 = require("../../utils/extractPaginationDetails");
|
|
@@ -19,6 +20,7 @@ const transformSchemas_1 = require("./transformSchemas");
|
|
|
19
20
|
function transform(model) {
|
|
20
21
|
const { srcPath } = (0, autorestSession_1.getAutorestOptions)();
|
|
21
22
|
const importDetails = new Map();
|
|
23
|
+
const urlInfo = transformUrlInfo(model);
|
|
22
24
|
const rlcModel = {
|
|
23
25
|
libraryName: (0, nameUtils_1.normalizeName)((0, languageHelpers_1.getLanguageMetadata)(model.language).name, nameUtils_1.NameType.Interface),
|
|
24
26
|
srcPath,
|
|
@@ -27,17 +29,33 @@ function transform(model) {
|
|
|
27
29
|
schemas: (0, transformSchemas_1.transformSchemas)(model),
|
|
28
30
|
responses: (0, transformResponseTypes_1.transformResponseTypes)(model, importDetails),
|
|
29
31
|
importSet: importDetails,
|
|
30
|
-
apiVersionInQueryParam: transformApiVersionParam(model),
|
|
31
32
|
parameters: (0, transformParameterTypes_1.transformParameterTypes)(model, importDetails),
|
|
32
33
|
annotations: transformAnnotationDetails(model),
|
|
33
|
-
urlInfo: transformUrlInfo(model)
|
|
34
|
+
urlInfo: transformUrlInfo(model),
|
|
35
|
+
apiVersionInfo: transformApiVersion(model, urlInfo)
|
|
34
36
|
};
|
|
35
37
|
return rlcModel;
|
|
36
38
|
}
|
|
37
39
|
exports.transform = transform;
|
|
38
|
-
function
|
|
40
|
+
function transformApiVersion(model, urlInfo) {
|
|
41
|
+
var _a;
|
|
42
|
+
const queryVersionDetail = getOperationQueryApiVersion(model);
|
|
43
|
+
const pathVersionDetail = (0, rlc_common_1.extractPathApiVersion)(urlInfo);
|
|
44
|
+
const isCrossedVersion = (pathVersionDetail === null || pathVersionDetail === void 0 ? void 0 : pathVersionDetail.isCrossedVersion) || (queryVersionDetail === null || queryVersionDetail === void 0 ? void 0 : queryVersionDetail.isCrossedVersion);
|
|
45
|
+
let defaultValue = (_a = pathVersionDetail === null || pathVersionDetail === void 0 ? void 0 : pathVersionDetail.defaultValue) !== null && _a !== void 0 ? _a : queryVersionDetail === null || queryVersionDetail === void 0 ? void 0 : queryVersionDetail.defaultValue;
|
|
46
|
+
// Clear the default value if there exists cross version
|
|
47
|
+
if (isCrossedVersion) {
|
|
48
|
+
defaultValue = undefined;
|
|
49
|
+
}
|
|
50
|
+
return {
|
|
51
|
+
definedPosition: (0, rlc_common_1.extractDefinedPosition)(queryVersionDetail, pathVersionDetail),
|
|
52
|
+
isCrossedVersion,
|
|
53
|
+
defaultValue
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
function getOperationQueryApiVersion(model) {
|
|
39
57
|
if (!model.globalParameters || !model.globalParameters.length) {
|
|
40
|
-
return
|
|
58
|
+
return;
|
|
41
59
|
}
|
|
42
60
|
const apiVersionParam = model.globalParameters
|
|
43
61
|
.filter(gp => {
|
|
@@ -48,12 +66,12 @@ function transformApiVersionParam(model) {
|
|
|
48
66
|
.find(param => (0, languageHelpers_1.getLanguageMetadata)(param.language).serializedName === "api-version");
|
|
49
67
|
if (apiVersionParam && (0, schemaHelpers_1.isConstantSchema)(apiVersionParam.schema)) {
|
|
50
68
|
return {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
69
|
+
definedPosition: "path",
|
|
70
|
+
isCrossedVersion: false,
|
|
71
|
+
defaultValue: apiVersionParam.schema.value.value.toString()
|
|
54
72
|
};
|
|
55
73
|
}
|
|
56
|
-
return
|
|
74
|
+
return;
|
|
57
75
|
}
|
|
58
76
|
function transformAnnotationDetails(model) {
|
|
59
77
|
var _a;
|
|
@@ -76,10 +94,18 @@ function transformAnnotationDetails(model) {
|
|
|
76
94
|
}
|
|
77
95
|
(_a = operation.signatureParameters) === null || _a === void 0 ? void 0 : _a.forEach(parameter => {
|
|
78
96
|
const serializeInfo = (0, transformParameterTypes_1.getSpecialSerializeInfo)(parameter);
|
|
79
|
-
hasMultiCollection = hasMultiCollection
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
97
|
+
hasMultiCollection = hasMultiCollection
|
|
98
|
+
? hasMultiCollection
|
|
99
|
+
: serializeInfo.hasMultiCollection;
|
|
100
|
+
hasPipeCollection = hasPipeCollection
|
|
101
|
+
? hasPipeCollection
|
|
102
|
+
: serializeInfo.hasPipeCollection;
|
|
103
|
+
hasSsvCollection = hasSsvCollection
|
|
104
|
+
? hasSsvCollection
|
|
105
|
+
: serializeInfo.hasSsvCollection;
|
|
106
|
+
hasTsvCollection = hasTsvCollection
|
|
107
|
+
? hasTsvCollection
|
|
108
|
+
: serializeInfo.hasTsvCollection;
|
|
83
109
|
});
|
|
84
110
|
}
|
|
85
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transform.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,mDAK6B;
|
|
1
|
+
{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transform.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformResponseTypes.d.ts","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transformResponseTypes.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAGT,QAAQ,EAGT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,UAAU,EACV,iBAAiB,EAIlB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"transformResponseTypes.d.ts","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transformResponseTypes.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAGT,QAAQ,EAGT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,UAAU,EACV,iBAAiB,EAIlB,MAAM,yBAAyB,CAAC;AAUjC,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAC1C,iBAAiB,EAAE,CAwCrB;AA4ED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAYxD"}
|
|
@@ -8,6 +8,7 @@ const rlc_common_1 = require("@azure-tools/rlc-common");
|
|
|
8
8
|
const languageHelpers_1 = require("../../utils/languageHelpers");
|
|
9
9
|
const operationHelpers_1 = require("../operationHelpers");
|
|
10
10
|
const schemaHelpers_1 = require("../schemaHelpers");
|
|
11
|
+
const schemaHelpers_2 = require("../../utils/schemaHelpers");
|
|
11
12
|
function transformResponseTypes(model, importDetails) {
|
|
12
13
|
const operations = getAllOperationRequests(model);
|
|
13
14
|
const rlcResponses = [];
|
|
@@ -30,7 +31,10 @@ function transformResponseTypes(model, importDetails) {
|
|
|
30
31
|
// transform header
|
|
31
32
|
const headers = transformHeaders(response);
|
|
32
33
|
// transform body
|
|
33
|
-
|
|
34
|
+
let body = undefined;
|
|
35
|
+
if ((0, schemaHelpers_2.isSchemaResponse)(response) || response.binary) {
|
|
36
|
+
body = transformBody(response, importedModels);
|
|
37
|
+
}
|
|
34
38
|
const rlcResponseUnit = {
|
|
35
39
|
statusCode: getStatusCode(schemaResponse),
|
|
36
40
|
description: operationLanguageMetadata.description,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformResponseTypes.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transformResponseTypes.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,mDAO6B;AAC7B,wDAMiC;AACjC,iEAAkE;AAClE,0DAA+D;AAC/D,oDAI0B;
|
|
1
|
+
{"version":3,"file":"transformResponseTypes.js","sourceRoot":"","sources":["../../../../src/restLevelClient/transforms/transformResponseTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { Mapper } from "@azure/core-http";
|
|
|
3
3
|
import { ClientOptions } from "../models/clientDetails";
|
|
4
4
|
import { ObjectDetails } from "../models/modelDetails";
|
|
5
5
|
import { MapperTypes } from "../utils/valueHelpers";
|
|
6
|
-
export
|
|
6
|
+
export type ModelProperties = {
|
|
7
7
|
[propertyName: string]: Mapper | string[];
|
|
8
8
|
};
|
|
9
9
|
export interface EntityOptions {
|
|
@@ -32,5 +32,5 @@ export declare function transformMapper({ schema, options }: MapperInput): Mappe
|
|
|
32
32
|
export declare function getMapperClassName(schema: Schema): string;
|
|
33
33
|
export declare function getMapperOrRef(schema: Schema, serializedName?: string, options?: EntityOptions): Mapper;
|
|
34
34
|
export declare function isSchemaType(matchSchemas: SchemaType[], { type }: Schema): boolean;
|
|
35
|
-
export declare function getMapperTypeFromSchema(type: SchemaType, format?: string):
|
|
35
|
+
export declare function getMapperTypeFromSchema(type: SchemaType, format?: string): "Boolean" | "ByteArray" | "Date" | "DateTime" | "DateTimeRfc1123" | "Enum" | "Object" | "Stream" | "String" | "TimeSpan" | "UnixTime" | "Number" | "Sequence" | "Dictionary" | MapperTypes.Uuid | MapperTypes.any;
|
|
36
36
|
//# sourceMappingURL=mapperTransforms.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapperTransforms.d.ts","sourceRoot":"","sources":["../../../src/transforms/mapperTransforms.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,UAAU,EAUV,SAAS,EAGV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,MAAM,EAIP,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAyBpD,
|
|
1
|
+
{"version":3,"file":"mapperTransforms.d.ts","sourceRoot":"","sources":["../../../src/transforms/mapperTransforms.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,UAAU,EAUV,SAAS,EAGV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,MAAM,EAIP,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAKxD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAyBpD,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CAAC;AAE5E,MAAM,WAAW,aAAa;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,aAAa,EAAE,EAC5B,EAAE,UAAU,EAAE,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,EAAE,CAAC,CAuBnB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,WAAW,UAwB/D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMzD;AA+lBD,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,MAAM,EACvB,OAAO,GAAE,aAAkB,GAC1B,MAAM,CAmBR;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,WAExE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,qNA8CxE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autorestOptions.d.ts","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAuB,MAAM,oBAAoB,CAAC;AAK1E;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAsEvE;
|
|
1
|
+
{"version":3,"file":"autorestOptions.d.ts","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAuB,MAAM,oBAAoB,CAAC;AAK1E;;GAEG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAsEvE;AA+MD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAQ/B"}
|
|
@@ -254,13 +254,15 @@ function getTracingInfo(host) {
|
|
|
254
254
|
});
|
|
255
255
|
}
|
|
256
256
|
function getPackageDetails(host) {
|
|
257
|
-
var _a;
|
|
258
257
|
return __awaiter(this, void 0, void 0, function* () {
|
|
259
258
|
const { model } = (0, autorestSession_1.getSession)();
|
|
260
259
|
const name = (0, nameUtils_1.normalizeName)(model.language.default.name, nameUtils_1.NameType.File);
|
|
261
260
|
// TODO: Look for an existing package.json and
|
|
262
261
|
const packageName = (yield host.getValue("package-name")) || name;
|
|
263
|
-
const packageNameParts =
|
|
262
|
+
const packageNameParts = packageName.match(/(^@(.*)\/)?(.*)/);
|
|
263
|
+
if (!packageNameParts) {
|
|
264
|
+
throw new Error("Expecting valid package name");
|
|
265
|
+
}
|
|
264
266
|
const version = (yield host.getValue("package-version")) || "1.0.0-beta.1";
|
|
265
267
|
return {
|
|
266
268
|
name: packageName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"autorestOptions.js","sourceRoot":"","sources":["../../../src/utils/autorestOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ export interface PaginationExtension {
|
|
|
27
27
|
*/
|
|
28
28
|
isNextLinkMethod?: boolean;
|
|
29
29
|
}
|
|
30
|
-
export
|
|
30
|
+
export type Language = ModelerLanguage & {
|
|
31
31
|
paging?: PaginationExtension;
|
|
32
32
|
};
|
|
33
33
|
export declare function getLanguageMetadata(languages: Languages): Language;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"languageHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/languageHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,QAAQ,IAAI,eAAe,EAC3B,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IAE3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,
|
|
1
|
+
{"version":3,"file":"languageHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/languageHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,QAAQ,IAAI,eAAe,EAC3B,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC;IAE3B;;OAEG;IACH,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,MAAM,QAAQ,GAAG,eAAe,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAE1E,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAElE"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@autorest/typescript",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.1",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build": "tsc -p . && npm run copyFiles",
|
|
6
6
|
"build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"@autorest/codemodel": "~4.19.2",
|
|
56
56
|
"@autorest/extension-base": "^3.5.0",
|
|
57
57
|
"@autorest/testmodeler": "^2.4.0",
|
|
58
|
-
"@azure-rest/core-client": "^1.1.
|
|
58
|
+
"@azure-rest/core-client": "^1.1.2",
|
|
59
59
|
"@azure-tools/codegen": "^2.9.1",
|
|
60
60
|
"@azure/core-client": "^1.6.1",
|
|
61
61
|
"@azure/core-http": "^1.2.4",
|
|
@@ -74,10 +74,10 @@
|
|
|
74
74
|
"source-map-support": "^0.5.16",
|
|
75
75
|
"ts-morph": "^15.1.0",
|
|
76
76
|
"@azure/core-auth": "^1.3.2",
|
|
77
|
-
"@azure-tools/rlc-common": "
|
|
77
|
+
"@azure-tools/rlc-common": "^0.12.0"
|
|
78
78
|
},
|
|
79
79
|
"devDependencies": {
|
|
80
|
-
"@azure-tools/test-recorder": "^
|
|
80
|
+
"@azure-tools/test-recorder": "^3.0.0",
|
|
81
81
|
"@azure/abort-controller": "^1.0.1",
|
|
82
82
|
"@azure/core-util": "^1.0.0-beta.1",
|
|
83
83
|
"@azure/core-xml": "^1.0.0-beta.1",
|
|
@@ -92,8 +92,8 @@
|
|
|
92
92
|
"@types/sinon": "^10.0.0",
|
|
93
93
|
"@types/xmlbuilder": "0.0.34",
|
|
94
94
|
"@types/yargs": "^17.0.10",
|
|
95
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
96
|
-
"@typescript-eslint/parser": "^5.
|
|
95
|
+
"@typescript-eslint/eslint-plugin": "^5.58.0",
|
|
96
|
+
"@typescript-eslint/parser": "^5.58.0",
|
|
97
97
|
"autorest": "^3.4.2",
|
|
98
98
|
"chai": "^4.2.0",
|
|
99
99
|
"chai-as-promised": "^7.1.1",
|
|
@@ -104,8 +104,6 @@
|
|
|
104
104
|
"karma-chrome-launcher": "^3.1.0",
|
|
105
105
|
"karma-mocha": "^2.0.1",
|
|
106
106
|
"karma-source-map-support": "^1.4.0",
|
|
107
|
-
"karma-typescript": "^5.0.3",
|
|
108
|
-
"karma-typescript-es6-transform": "^5.0.3",
|
|
109
107
|
"mocha": "^9.2.2",
|
|
110
108
|
"moment": "^2.29.4",
|
|
111
109
|
"node-cmd": "^3.0.0",
|
|
@@ -116,7 +114,7 @@
|
|
|
116
114
|
"sinon": "^10.0.0",
|
|
117
115
|
"source-map-loader": "^1.0.0",
|
|
118
116
|
"ts-node": "^8.5.2",
|
|
119
|
-
"typescript": "~
|
|
117
|
+
"typescript": "~5.0.0",
|
|
120
118
|
"wait-port": "^0.2.6",
|
|
121
119
|
"webpack": "^5.72.0",
|
|
122
120
|
"webpack-cli": "^4.9.2",
|
|
@@ -124,5 +122,9 @@
|
|
|
124
122
|
"tslib": "^2.3.1",
|
|
125
123
|
"openapi-types": "^7.0.0",
|
|
126
124
|
"buffer": "^6.0.3"
|
|
127
|
-
}
|
|
125
|
+
},
|
|
126
|
+
"bugs": {
|
|
127
|
+
"url": "https://github.com/Azure/autorest.typescript/issues"
|
|
128
|
+
},
|
|
129
|
+
"homepage": "https://github.com/Azure/autorest.typescript/tree/main/packages/autorest.typescript/"
|
|
128
130
|
}
|
|
@@ -116,7 +116,7 @@ function regularAutorestPackage(
|
|
|
116
116
|
mkdirp: "^2.1.2",
|
|
117
117
|
rollup: "^2.66.1",
|
|
118
118
|
"rollup-plugin-sourcemaps": "^0.6.3",
|
|
119
|
-
typescript: "~
|
|
119
|
+
typescript: "~5.0.0",
|
|
120
120
|
"uglify-js": "^3.4.9",
|
|
121
121
|
rimraf: "^3.0.0",
|
|
122
122
|
dotenv: "^16.0.0"
|
|
@@ -192,7 +192,7 @@ function regularAutorestPackage(
|
|
|
192
192
|
if (generateTest) {
|
|
193
193
|
packageInfo.module = `./dist-esm/src/index.js`;
|
|
194
194
|
packageInfo.devDependencies["@azure/identity"] = "^2.0.1";
|
|
195
|
-
packageInfo.devDependencies["@azure-tools/test-recorder"] = "^
|
|
195
|
+
packageInfo.devDependencies["@azure-tools/test-recorder"] = "^3.0.0";
|
|
196
196
|
packageInfo.devDependencies["@azure-tools/test-credential"] = "^1.0.0";
|
|
197
197
|
packageInfo.devDependencies["mocha"] = "^7.1.1";
|
|
198
198
|
packageInfo.devDependencies["@types/chai"] = "^4.2.8";
|
|
@@ -11,7 +11,10 @@ import {
|
|
|
11
11
|
ImportKind,
|
|
12
12
|
RLCModel,
|
|
13
13
|
AnnotationDetails,
|
|
14
|
-
UrlInfo
|
|
14
|
+
UrlInfo,
|
|
15
|
+
ApiVersionInfo,
|
|
16
|
+
extractPathApiVersion,
|
|
17
|
+
extractDefinedPosition
|
|
15
18
|
} from "@azure-tools/rlc-common";
|
|
16
19
|
import { getAutorestOptions } from "../../autorestSession";
|
|
17
20
|
import { transformBaseUrl } from "../../transforms/urlTransforms";
|
|
@@ -24,7 +27,10 @@ import { NameType, normalizeName } from "../../utils/nameUtils";
|
|
|
24
27
|
import { hasPollingOperations } from "../helpers/hasPollingOperations";
|
|
25
28
|
import { isConstantSchema } from "../schemaHelpers";
|
|
26
29
|
import { transformOptions } from "./transformOptions";
|
|
27
|
-
import {
|
|
30
|
+
import {
|
|
31
|
+
transformParameterTypes,
|
|
32
|
+
getSpecialSerializeInfo
|
|
33
|
+
} from "./transformParameterTypes";
|
|
28
34
|
import { transformPaths } from "./transformPaths";
|
|
29
35
|
import { transformResponseTypes } from "./transformResponseTypes";
|
|
30
36
|
import { transformSchemas } from "./transformSchemas";
|
|
@@ -32,6 +38,7 @@ import { transformSchemas } from "./transformSchemas";
|
|
|
32
38
|
export function transform(model: CodeModel): RLCModel {
|
|
33
39
|
const { srcPath } = getAutorestOptions();
|
|
34
40
|
const importDetails = new Map<ImportKind, Set<string>>();
|
|
41
|
+
const urlInfo = transformUrlInfo(model);
|
|
35
42
|
const rlcModel: RLCModel = {
|
|
36
43
|
libraryName: normalizeName(
|
|
37
44
|
getLanguageMetadata(model.language).name,
|
|
@@ -43,17 +50,45 @@ export function transform(model: CodeModel): RLCModel {
|
|
|
43
50
|
schemas: transformSchemas(model),
|
|
44
51
|
responses: transformResponseTypes(model, importDetails),
|
|
45
52
|
importSet: importDetails,
|
|
46
|
-
apiVersionInQueryParam: transformApiVersionParam(model),
|
|
47
53
|
parameters: transformParameterTypes(model, importDetails),
|
|
48
54
|
annotations: transformAnnotationDetails(model),
|
|
49
|
-
urlInfo: transformUrlInfo(model)
|
|
55
|
+
urlInfo: transformUrlInfo(model),
|
|
56
|
+
apiVersionInfo: transformApiVersion(model, urlInfo)
|
|
50
57
|
};
|
|
51
58
|
return rlcModel;
|
|
52
59
|
}
|
|
53
60
|
|
|
54
|
-
function
|
|
61
|
+
function transformApiVersion(
|
|
62
|
+
model: CodeModel,
|
|
63
|
+
urlInfo: UrlInfo
|
|
64
|
+
): ApiVersionInfo | undefined {
|
|
65
|
+
const queryVersionDetail = getOperationQueryApiVersion(model);
|
|
66
|
+
const pathVersionDetail = extractPathApiVersion(urlInfo);
|
|
67
|
+
const isCrossedVersion =
|
|
68
|
+
pathVersionDetail?.isCrossedVersion || queryVersionDetail?.isCrossedVersion;
|
|
69
|
+
let defaultValue =
|
|
70
|
+
pathVersionDetail?.defaultValue ?? queryVersionDetail?.defaultValue;
|
|
71
|
+
|
|
72
|
+
// Clear the default value if there exists cross version
|
|
73
|
+
if (isCrossedVersion) {
|
|
74
|
+
defaultValue = undefined;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
return {
|
|
78
|
+
definedPosition: extractDefinedPosition(
|
|
79
|
+
queryVersionDetail,
|
|
80
|
+
pathVersionDetail
|
|
81
|
+
),
|
|
82
|
+
isCrossedVersion,
|
|
83
|
+
defaultValue
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function getOperationQueryApiVersion(
|
|
88
|
+
model: CodeModel
|
|
89
|
+
): ApiVersionInfo | undefined {
|
|
55
90
|
if (!model.globalParameters || !model.globalParameters.length) {
|
|
56
|
-
return
|
|
91
|
+
return;
|
|
57
92
|
}
|
|
58
93
|
|
|
59
94
|
const apiVersionParam = model.globalParameters
|
|
@@ -69,13 +104,13 @@ function transformApiVersionParam(model: CodeModel) {
|
|
|
69
104
|
|
|
70
105
|
if (apiVersionParam && isConstantSchema(apiVersionParam.schema)) {
|
|
71
106
|
return {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
107
|
+
definedPosition: "path",
|
|
108
|
+
isCrossedVersion: false,
|
|
109
|
+
defaultValue: apiVersionParam.schema.value.value.toString()
|
|
75
110
|
};
|
|
76
111
|
}
|
|
77
112
|
|
|
78
|
-
return
|
|
113
|
+
return;
|
|
79
114
|
}
|
|
80
115
|
|
|
81
116
|
export function transformAnnotationDetails(
|
|
@@ -100,11 +135,19 @@ export function transformAnnotationDetails(
|
|
|
100
135
|
}
|
|
101
136
|
operation.signatureParameters?.forEach(parameter => {
|
|
102
137
|
const serializeInfo = getSpecialSerializeInfo(parameter);
|
|
103
|
-
hasMultiCollection = hasMultiCollection
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
138
|
+
hasMultiCollection = hasMultiCollection
|
|
139
|
+
? hasMultiCollection
|
|
140
|
+
: serializeInfo.hasMultiCollection;
|
|
141
|
+
hasPipeCollection = hasPipeCollection
|
|
142
|
+
? hasPipeCollection
|
|
143
|
+
: serializeInfo.hasPipeCollection;
|
|
144
|
+
hasSsvCollection = hasSsvCollection
|
|
145
|
+
? hasSsvCollection
|
|
146
|
+
: serializeInfo.hasSsvCollection;
|
|
147
|
+
hasTsvCollection = hasTsvCollection
|
|
148
|
+
? hasTsvCollection
|
|
149
|
+
: serializeInfo.hasTsvCollection;
|
|
150
|
+
});
|
|
108
151
|
}
|
|
109
152
|
}
|
|
110
153
|
|
|
@@ -130,4 +173,3 @@ function transformUrlInfo(model: CodeModel): UrlInfo {
|
|
|
130
173
|
const { endpoint, urlParameters } = transformBaseUrl(model);
|
|
131
174
|
return { endpoint, urlParameters };
|
|
132
175
|
}
|
|
133
|
-
|
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
getFormatDocs,
|
|
24
24
|
primitiveSchemaToType
|
|
25
25
|
} from "../schemaHelpers";
|
|
26
|
+
import { isSchemaResponse } from "../../utils/schemaHelpers";
|
|
26
27
|
|
|
27
28
|
export function transformResponseTypes(
|
|
28
29
|
model: CodeModel,
|
|
@@ -49,7 +50,10 @@ export function transformResponseTypes(
|
|
|
49
50
|
// transform header
|
|
50
51
|
const headers = transformHeaders(response);
|
|
51
52
|
// transform body
|
|
52
|
-
|
|
53
|
+
let body = undefined;
|
|
54
|
+
if (isSchemaResponse(response) || (response as any).binary) {
|
|
55
|
+
body = transformBody(response, importedModels);
|
|
56
|
+
}
|
|
53
57
|
const rlcResponseUnit: ResponseMetadata = {
|
|
54
58
|
statusCode: getStatusCode(schemaResponse),
|
|
55
59
|
description: operationLanguageMetadata.description,
|
|
@@ -267,8 +267,11 @@ async function getPackageDetails(
|
|
|
267
267
|
const name = normalizeName(model.language.default.name, NameType.File);
|
|
268
268
|
// TODO: Look for an existing package.json and
|
|
269
269
|
const packageName: string = (await host.getValue("package-name")) || name;
|
|
270
|
-
const packageNameParts: RegExpMatchArray =
|
|
271
|
-
packageName.match(/(^@(.*)\/)?(.*)/)
|
|
270
|
+
const packageNameParts: RegExpMatchArray | null =
|
|
271
|
+
packageName.match(/(^@(.*)\/)?(.*)/);
|
|
272
|
+
if (!packageNameParts) {
|
|
273
|
+
throw new Error("Expecting valid package name");
|
|
274
|
+
}
|
|
272
275
|
const version: string =
|
|
273
276
|
(await host.getValue("package-version")) || "1.0.0-beta.1";
|
|
274
277
|
|