@azure-tools/typespec-ts 0.33.0 → 0.34.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +37 -0
- package/dist/src/framework/declaration.js.map +1 -1
- package/dist/src/framework/dependency.d.ts +25 -0
- package/dist/src/framework/dependency.d.ts.map +1 -1
- package/dist/src/framework/hooks/binder.d.ts +1 -1
- package/dist/src/framework/hooks/binder.d.ts.map +1 -1
- package/dist/src/framework/hooks/binder.js +16 -12
- package/dist/src/framework/hooks/binder.js.map +1 -1
- package/dist/src/framework/hooks/sdkTypes.d.ts +4 -2
- package/dist/src/framework/hooks/sdkTypes.d.ts.map +1 -1
- package/dist/src/framework/hooks/sdkTypes.js +43 -8
- package/dist/src/framework/hooks/sdkTypes.js.map +1 -1
- package/dist/src/framework/refkey.js +1 -1
- package/dist/src/framework/refkey.js.map +1 -1
- package/dist/src/framework/sample.js +1 -1
- package/dist/src/framework/sample.js.map +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +81 -24
- package/dist/src/index.js.map +1 -1
- package/dist/src/lib.d.ts +37 -3
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +26 -1
- package/dist/src/lib.js.map +1 -1
- package/dist/src/modular/buildClassicalClient.d.ts +2 -2
- package/dist/src/modular/buildClassicalClient.d.ts.map +1 -1
- package/dist/src/modular/buildClassicalClient.js +25 -61
- package/dist/src/modular/buildClassicalClient.js.map +1 -1
- package/dist/src/modular/buildClassicalOperationGroups.d.ts.map +1 -1
- package/dist/src/modular/buildClassicalOperationGroups.js +0 -7
- package/dist/src/modular/buildClassicalOperationGroups.js.map +1 -1
- package/dist/src/modular/buildClientContext.d.ts +7 -3
- package/dist/src/modular/buildClientContext.d.ts.map +1 -1
- package/dist/src/modular/buildClientContext.js +58 -38
- package/dist/src/modular/buildClientContext.js.map +1 -1
- package/dist/src/modular/buildCodeModel.d.ts +18 -0
- package/dist/src/modular/buildCodeModel.d.ts.map +1 -1
- package/dist/src/modular/buildCodeModel.js +95 -42
- package/dist/src/modular/buildCodeModel.js.map +1 -1
- package/dist/src/modular/buildOperations.d.ts +3 -4
- package/dist/src/modular/buildOperations.d.ts.map +1 -1
- package/dist/src/modular/buildOperations.js +24 -45
- package/dist/src/modular/buildOperations.js.map +1 -1
- package/dist/src/modular/buildProjectFiles.d.ts.map +1 -1
- package/dist/src/modular/buildProjectFiles.js +3 -1
- package/dist/src/modular/buildProjectFiles.js.map +1 -1
- package/dist/src/modular/buildRestorePoller.js +1 -1
- package/dist/src/modular/buildRestorePoller.js.map +1 -1
- package/dist/src/modular/buildRootIndex.d.ts +5 -0
- package/dist/src/modular/buildRootIndex.d.ts.map +1 -1
- package/dist/src/modular/buildRootIndex.js +62 -17
- package/dist/src/modular/buildRootIndex.js.map +1 -1
- package/dist/src/modular/buildSubpathIndex.d.ts +1 -1
- package/dist/src/modular/buildSubpathIndex.d.ts.map +1 -1
- package/dist/src/modular/buildSubpathIndex.js +11 -10
- package/dist/src/modular/buildSubpathIndex.js.map +1 -1
- package/dist/src/modular/emitModels.d.ts +13 -28
- package/dist/src/modular/emitModels.d.ts.map +1 -1
- package/dist/src/modular/emitModels.js +435 -240
- package/dist/src/modular/emitModels.js.map +1 -1
- package/dist/src/modular/emitModelsOptions.d.ts +26 -0
- package/dist/src/modular/emitModelsOptions.d.ts.map +1 -0
- package/dist/src/modular/emitModelsOptions.js +106 -0
- package/dist/src/modular/emitModelsOptions.js.map +1 -0
- package/dist/src/modular/emitSamples.d.ts +7 -0
- package/dist/src/modular/emitSamples.d.ts.map +1 -0
- package/dist/src/modular/emitSamples.js +354 -0
- package/dist/src/modular/emitSamples.js.map +1 -0
- package/dist/src/modular/external-dependencies.d.ts +7 -0
- package/dist/src/modular/external-dependencies.d.ts.map +1 -1
- package/dist/src/modular/external-dependencies.js +58 -1
- package/dist/src/modular/external-dependencies.js.map +1 -1
- package/dist/src/modular/helpers/classicalOperationHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/classicalOperationHelpers.js +2 -2
- package/dist/src/modular/helpers/classicalOperationHelpers.js.map +1 -1
- package/dist/src/modular/helpers/clientHelpers.d.ts +13 -6
- package/dist/src/modular/helpers/clientHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/clientHelpers.js +117 -48
- package/dist/src/modular/helpers/clientHelpers.js.map +1 -1
- package/dist/src/modular/helpers/namingHelpers.d.ts +3 -2
- package/dist/src/modular/helpers/namingHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/namingHelpers.js +3 -0
- package/dist/src/modular/helpers/namingHelpers.js.map +1 -1
- package/dist/src/modular/helpers/operationHelpers.d.ts +9 -11
- package/dist/src/modular/helpers/operationHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/operationHelpers.js +255 -408
- package/dist/src/modular/helpers/operationHelpers.js.map +1 -1
- package/dist/src/modular/helpers/typeHelpers.d.ts +12 -0
- package/dist/src/modular/helpers/typeHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/typeHelpers.js +30 -6
- package/dist/src/modular/helpers/typeHelpers.js.map +1 -1
- package/dist/src/modular/modularCodeModel.d.ts +2 -1
- package/dist/src/modular/modularCodeModel.d.ts.map +1 -1
- package/dist/src/modular/serialization/buildDeserializerFunction.d.ts +5 -0
- package/dist/src/modular/serialization/buildDeserializerFunction.d.ts.map +1 -0
- package/dist/src/modular/serialization/buildDeserializerFunction.js +327 -0
- package/dist/src/modular/serialization/buildDeserializerFunction.js.map +1 -0
- package/dist/src/modular/serialization/buildSerializerFunction.d.ts +4 -3
- package/dist/src/modular/serialization/buildSerializerFunction.d.ts.map +1 -1
- package/dist/src/modular/serialization/buildSerializerFunction.js +285 -102
- package/dist/src/modular/serialization/buildSerializerFunction.js.map +1 -1
- package/dist/src/modular/serialization/serializeUtils.d.ts +15 -0
- package/dist/src/modular/serialization/serializeUtils.d.ts.map +1 -0
- package/dist/src/modular/serialization/serializeUtils.js +102 -0
- package/dist/src/modular/serialization/serializeUtils.js.map +1 -0
- package/dist/src/modular/type-expressions/get-credential-expression.d.ts +3 -0
- package/dist/src/modular/type-expressions/get-credential-expression.d.ts.map +1 -0
- package/dist/src/modular/type-expressions/get-credential-expression.js +17 -0
- package/dist/src/modular/type-expressions/get-credential-expression.js.map +1 -0
- package/dist/src/modular/type-expressions/get-enum-expression.d.ts +6 -0
- package/dist/src/modular/type-expressions/get-enum-expression.d.ts.map +1 -0
- package/dist/src/modular/type-expressions/get-enum-expression.js +18 -0
- package/dist/src/modular/type-expressions/get-enum-expression.js.map +1 -0
- package/dist/src/modular/type-expressions/get-model-expression.d.ts +9 -0
- package/dist/src/modular/type-expressions/get-model-expression.d.ts.map +1 -0
- package/dist/src/modular/type-expressions/get-model-expression.js +42 -0
- package/dist/src/modular/type-expressions/get-model-expression.js.map +1 -0
- package/dist/src/modular/type-expressions/get-type-expression.d.ts +8 -0
- package/dist/src/modular/type-expressions/get-type-expression.d.ts.map +1 -0
- package/dist/src/modular/type-expressions/get-type-expression.js +94 -0
- package/dist/src/modular/type-expressions/get-type-expression.js.map +1 -0
- package/dist/src/modular/type-expressions/get-union-expression.d.ts +5 -0
- package/dist/src/modular/type-expressions/get-union-expression.d.ts.map +1 -0
- package/dist/src/modular/type-expressions/get-union-expression.js +13 -0
- package/dist/src/modular/type-expressions/get-union-expression.js.map +1 -0
- package/dist/src/modular/type-expressions/utils.d.ts +5 -0
- package/dist/src/modular/type-expressions/utils.d.ts.map +1 -0
- package/dist/src/modular/type-expressions/utils.js +9 -0
- package/dist/src/modular/type-expressions/utils.js.map +1 -0
- package/dist/src/transform/transform.js +1 -1
- package/dist/src/transform/transform.js.map +1 -1
- package/dist/src/transform/transformApiVersionInfo.js +1 -1
- package/dist/src/transform/transformApiVersionInfo.js.map +1 -1
- package/dist/src/transform/transformParameters.js +1 -1
- package/dist/src/transform/transformParameters.js.map +1 -1
- package/dist/src/transform/transformSchemas.d.ts.map +1 -1
- package/dist/src/transform/transformSchemas.js +3 -3
- package/dist/src/transform/transformSchemas.js.map +1 -1
- package/dist/src/utils/clientUtils.d.ts.map +1 -1
- package/dist/src/utils/clientUtils.js +1 -4
- package/dist/src/utils/clientUtils.js.map +1 -1
- package/dist/src/utils/credentialUtils.d.ts +5 -0
- package/dist/src/utils/credentialUtils.d.ts.map +1 -1
- package/dist/src/utils/credentialUtils.js +36 -4
- package/dist/src/utils/credentialUtils.js.map +1 -1
- package/dist/src/utils/modelUtils.d.ts.map +1 -1
- package/dist/src/utils/modelUtils.js +28 -43
- package/dist/src/utils/modelUtils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +26 -26
- package/src/framework/declaration.ts +0 -1
- package/src/framework/dependency.ts +25 -0
- package/src/framework/hooks/binder.ts +19 -14
- package/src/framework/hooks/sdkTypes.ts +53 -13
- package/src/framework/refkey.ts +1 -1
- package/src/framework/sample.ts +1 -1
- package/src/index.ts +96 -25
- package/src/lib.ts +26 -3
- package/src/modular/buildClassicalClient.ts +30 -97
- package/src/modular/buildClassicalOperationGroups.ts +0 -14
- package/src/modular/buildClientContext.ts +90 -50
- package/src/modular/buildCodeModel.ts +118 -47
- package/src/modular/buildOperations.ts +41 -76
- package/src/modular/buildProjectFiles.ts +4 -2
- package/src/modular/buildRestorePoller.ts +1 -1
- package/src/modular/buildRootIndex.ts +75 -35
- package/src/modular/buildSubpathIndex.ts +13 -11
- package/src/modular/emitModels.ts +588 -326
- package/src/modular/emitModelsOptions.ts +161 -0
- package/src/modular/emitSamples.ts +481 -0
- package/src/modular/external-dependencies.ts +59 -1
- package/src/modular/helpers/classicalOperationHelpers.ts +6 -2
- package/src/modular/helpers/clientHelpers.ts +182 -76
- package/src/modular/helpers/namingHelpers.ts +14 -2
- package/src/modular/helpers/operationHelpers.ts +356 -638
- package/src/modular/helpers/typeHelpers.ts +38 -6
- package/src/modular/modularCodeModel.ts +3 -0
- package/src/modular/serialization/buildDeserializerFunction.ts +492 -0
- package/src/modular/serialization/buildSerializerFunction.ts +434 -141
- package/src/modular/serialization/serializeUtils.ts +143 -0
- package/src/modular/type-expressions/get-credential-expression.ts +18 -0
- package/src/modular/type-expressions/get-enum-expression.ts +28 -0
- package/src/modular/type-expressions/get-model-expression.ts +63 -0
- package/src/modular/type-expressions/get-type-expression.ts +111 -0
- package/src/modular/type-expressions/get-union-expression.ts +20 -0
- package/src/modular/type-expressions/utils.ts +15 -0
- package/src/transform/transform.ts +2 -2
- package/src/transform/transformApiVersionInfo.ts +2 -2
- package/src/transform/transformParameters.ts +1 -1
- package/src/transform/transformSchemas.ts +9 -8
- package/src/utils/clientUtils.ts +2 -12
- package/src/utils/credentialUtils.ts +43 -3
- package/src/utils/modelUtils.ts +32 -41
- package/static/static-helpers/serialization/serializers.ts +60 -0
- package/dist/src/modular/buildSerializeUtils.d.ts +0 -14
- package/dist/src/modular/buildSerializeUtils.d.ts.map +0 -1
- package/dist/src/modular/buildSerializeUtils.js +0 -534
- package/dist/src/modular/buildSerializeUtils.js.map +0 -1
- package/src/modular/buildSerializeUtils.ts +0 -749
|
@@ -29,6 +29,11 @@ export const DefaultCoreDependencies = {
|
|
|
29
29
|
name: "OperationOptions",
|
|
30
30
|
module: "@typespec/ts-http-runtime"
|
|
31
31
|
},
|
|
32
|
+
StreamableMethod: {
|
|
33
|
+
kind: "externalDependency",
|
|
34
|
+
name: "StreamableMethod",
|
|
35
|
+
module: "@typespec/ts-http-runtime"
|
|
36
|
+
},
|
|
32
37
|
PathUncheckedResponse: {
|
|
33
38
|
kind: "externalDependency",
|
|
34
39
|
name: "PathUncheckedResponse",
|
|
@@ -58,6 +63,26 @@ export const DefaultCoreDependencies = {
|
|
|
58
63
|
kind: "externalDependency",
|
|
59
64
|
name: "stringToUint8Array",
|
|
60
65
|
module: "@typespec/ts-http-runtime"
|
|
66
|
+
},
|
|
67
|
+
KeyCredential: {
|
|
68
|
+
kind: "externalDependency",
|
|
69
|
+
name: "KeyCredential",
|
|
70
|
+
module: "@typespec/ts-http-runtime"
|
|
71
|
+
},
|
|
72
|
+
isKeyCredential: {
|
|
73
|
+
kind: "externalDependency",
|
|
74
|
+
name: "isKeyCredential",
|
|
75
|
+
module: "@typespec/ts-http-runtime"
|
|
76
|
+
},
|
|
77
|
+
TokenCredential: {
|
|
78
|
+
kind: "externalDependency",
|
|
79
|
+
name: "TokenCredential",
|
|
80
|
+
module: "@typespec/ts-http-runtime"
|
|
81
|
+
},
|
|
82
|
+
ErrorModel: {
|
|
83
|
+
kind: "externalDependency",
|
|
84
|
+
name: "ErrorModel",
|
|
85
|
+
module: "@typespec/ts-http-runtime"
|
|
61
86
|
}
|
|
62
87
|
};
|
|
63
88
|
export const AzurePollingDependencies = {
|
|
@@ -95,7 +120,7 @@ export const AzureCoreDependencies = {
|
|
|
95
120
|
},
|
|
96
121
|
Pipeline: {
|
|
97
122
|
kind: "externalDependency",
|
|
98
|
-
module: "@azure
|
|
123
|
+
module: "@azure/core-rest-pipeline",
|
|
99
124
|
name: "Pipeline"
|
|
100
125
|
},
|
|
101
126
|
getClient: {
|
|
@@ -113,6 +138,11 @@ export const AzureCoreDependencies = {
|
|
|
113
138
|
module: "@azure-rest/core-client",
|
|
114
139
|
name: "OperationOptions"
|
|
115
140
|
},
|
|
141
|
+
StreamableMethod: {
|
|
142
|
+
kind: "externalDependency",
|
|
143
|
+
module: "@azure-rest/core-client",
|
|
144
|
+
name: "StreamableMethod"
|
|
145
|
+
},
|
|
116
146
|
PathUncheckedResponse: {
|
|
117
147
|
kind: "externalDependency",
|
|
118
148
|
module: "@azure-rest/core-client",
|
|
@@ -142,6 +172,33 @@ export const AzureCoreDependencies = {
|
|
|
142
172
|
kind: "externalDependency",
|
|
143
173
|
module: "@azure/core-util",
|
|
144
174
|
name: "stringToUint8Array"
|
|
175
|
+
},
|
|
176
|
+
KeyCredential: {
|
|
177
|
+
kind: "externalDependency",
|
|
178
|
+
name: "KeyCredential",
|
|
179
|
+
module: "@azure/core-auth"
|
|
180
|
+
},
|
|
181
|
+
isKeyCredential: {
|
|
182
|
+
kind: "externalDependency",
|
|
183
|
+
name: "isKeyCredential",
|
|
184
|
+
module: "@azure/core-auth"
|
|
185
|
+
},
|
|
186
|
+
TokenCredential: {
|
|
187
|
+
kind: "externalDependency",
|
|
188
|
+
name: "TokenCredential",
|
|
189
|
+
module: "@azure/core-auth"
|
|
190
|
+
},
|
|
191
|
+
ErrorModel: {
|
|
192
|
+
kind: "externalDependency",
|
|
193
|
+
name: "ErrorModel",
|
|
194
|
+
module: "@azure-rest/core-client"
|
|
195
|
+
}
|
|
196
|
+
};
|
|
197
|
+
export const AzureIdentityDependencies = {
|
|
198
|
+
DefaultAzureCredential: {
|
|
199
|
+
kind: "externalDependency",
|
|
200
|
+
module: "@azure/identity",
|
|
201
|
+
name: "DefaultAzureCredential"
|
|
145
202
|
}
|
|
146
203
|
};
|
|
147
204
|
//# sourceMappingURL=external-dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-dependencies.js","sourceRoot":"","sources":["../../../src/modular/external-dependencies.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,uBAAuB,GAAqB;IACvD,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,2BAA2B;KACpC;IACD,aAAa,EAAE;QACb,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,eAAe;QACrB,MAAM,EAAE,2BAA2B;KACpC;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,2BAA2B;KACpC;IACD,SAAS,EAAE;QACT,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,2BAA2B;KACpC;IACD,SAAS,EAAE;QACT,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE,2BAA2B;KACpC;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,kBAAkB;QACxB,MAAM,EAAE,2BAA2B;KACpC;IACD,qBAAqB,EAAE;QACrB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,uBAAuB;QAC7B,MAAM,EAAE,2BAA2B;KACpC;IACD,eAAe,EAAE;QACf,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,2BAA2B;KACpC;IACD,eAAe,EAAE;QACf,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,iBAAiB;QACvB,MAAM,EAAE,2BAA2B;KACpC;IACD,mCAAmC,EAAE;QACnC,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,qCAAqC;QAC3C,MAAM,EAAE,2BAA2B;KACpC;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,2BAA2B;KACpC;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,2BAA2B;KACpC;CACO,CAAC;AAEX,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,UAAU,EAAE;QACV,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,iBAAiB;QACzB,IAAI,EAAE,YAAY;KACnB;IACD,cAAc,EAAE;QACd,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,iBAAiB;QACzB,IAAI,EAAE,gBAAgB;KACvB;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,iBAAiB;QACzB,IAAI,EAAE,kBAAkB;KACzB;IACD,sBAAsB,EAAE;QACtB,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,iBAAiB;QACzB,IAAI,EAAE,wBAAwB;KAC/B;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAqB;IACrD,MAAM,EAAE;QACN,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,yBAAyB;QACjC,IAAI,EAAE,QAAQ;KACf;IACD,aAAa,EAAE;QACb,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,yBAAyB;QACjC,IAAI,EAAE,eAAe;KACtB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,oBAAoB;QAC1B,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"external-dependencies.js","sourceRoot":"","sources":["../../../src/modular/external-dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classicalOperationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/classicalOperationHelpers.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,UAAU,EAEX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGhE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,uBAM/B;AACD,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,UAAU,EACvB,cAAc,EAAE,cAAc,EAC9B,KAAK,GAAE,MAAuD,
|
|
1
|
+
{"version":3,"file":"classicalOperationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/classicalOperationHelpers.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,UAAU,EAEX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGhE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,uBAM/B;AACD,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,UAAU,EACvB,cAAc,EAAE,cAAc,EAC9B,KAAK,GAAE,MAAuD,QA2P/D"}
|
|
@@ -12,7 +12,7 @@ export function getClassicalOperation(dpgContext, client, classicFile, operation
|
|
|
12
12
|
// TODO: remove this logic once client-level parameter design is finalized
|
|
13
13
|
// https://github.com/Azure/autorest.typescript/issues/2618
|
|
14
14
|
const hasSubscriptionIdPromoted = shouldPromoteSubscriptionId(dpgContext, operationGroup);
|
|
15
|
-
const modularClientName = `${getClientName(client)}Context`;
|
|
15
|
+
const modularClientName = `${getClientName(client.tcgcClient)}Context`;
|
|
16
16
|
const hasClientContextImport = classicFile
|
|
17
17
|
.getImportDeclarations()
|
|
18
18
|
.filter((i) => {
|
|
@@ -27,7 +27,7 @@ export function getClassicalOperation(dpgContext, client, classicFile, operation
|
|
|
27
27
|
}
|
|
28
28
|
const operationMap = new Map();
|
|
29
29
|
const operationDeclarations = operationGroup.operations.map((operation) => {
|
|
30
|
-
const declarations = getOperationFunction(operation, modularClientName);
|
|
30
|
+
const declarations = getOperationFunction(dpgContext, operation, modularClientName);
|
|
31
31
|
operationMap.set(declarations, operation.oriName);
|
|
32
32
|
return declarations;
|
|
33
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classicalOperationHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/classicalOperationHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAKL,aAAa,EACd,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAG7D,MAAM,UAAU,2BAA2B,CACzC,UAAsB,EACtB,cAA8B;;IAE9B,MAAM,0BAA0B,GAAG,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CACvE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,gBAAgB,CAAC,CAC7D,CAAC;IACF,OAAO,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,0CAAE,QAAQ,KAAI,0BAA0B,CAAC;AACxE,CAAC;AACD,MAAM,UAAU,qBAAqB,CACnC,UAAsB,EACtB,MAAc,EACd,WAAuB,EACvB,cAA8B,EAC9B,QAAgB,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;;IAE9D,0EAA0E;IAC1E,2DAA2D;IAC3D,MAAM,yBAAyB,GAAG,2BAA2B,CAC3D,UAAU,EACV,cAAc,CACf,CAAC;IACF,MAAM,iBAAiB,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"classicalOperationHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/classicalOperationHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,16 @@
|
|
|
1
|
-
import { Imports as RuntimeImports } from "@azure-tools/rlc-common";
|
|
2
|
-
import { OptionalKind, ParameterDeclarationStructure, SourceFile, StatementedNode } from "ts-morph";
|
|
3
1
|
import { Client, ModularCodeModel } from "../modularCodeModel.js";
|
|
2
|
+
import { OptionalKind, ParameterDeclarationStructure, StatementedNode } from "ts-morph";
|
|
3
|
+
import { SdkHttpParameter, SdkParameter } from "@azure-tools/typespec-client-generator-core";
|
|
4
4
|
import { SdkContext } from "../../utils/interfaces.js";
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
interface ClientParameterOptions {
|
|
6
|
+
onClientOnly?: boolean;
|
|
7
|
+
requiredOnly?: boolean;
|
|
8
|
+
optionalOnly?: boolean;
|
|
9
|
+
}
|
|
10
|
+
export declare function getClientParameters(_client: Client, dpgContext: SdkContext, options?: ClientParameterOptions): (SdkParameter | SdkHttpParameter)[];
|
|
11
|
+
export declare function getClientParametersDeclaration(_client: Client, dpgContext: SdkContext, options?: ClientParameterOptions): OptionalKind<ParameterDeclarationStructure>[];
|
|
12
|
+
export declare function getClientParameterName(parameter: SdkParameter | SdkHttpParameter): string;
|
|
13
|
+
export declare function buildGetClientEndpointParam(context: StatementedNode, dpgContext: SdkContext, client: Client): string;
|
|
7
14
|
/**
|
|
8
15
|
* Builds the options to be passed to getClient
|
|
9
16
|
*
|
|
@@ -13,6 +20,6 @@ export declare function buildGetClientEndpointParam(context: StatementedNode, cl
|
|
|
13
20
|
*/
|
|
14
21
|
export declare function buildGetClientOptionsParam(context: StatementedNode, codeModel: ModularCodeModel, endpointParam: string): string;
|
|
15
22
|
export declare function buildGetClientCredentialParam(client: Client, codeModel: ModularCodeModel): string;
|
|
16
|
-
export declare function buildUserAgentOptions(context: StatementedNode, sdkUserAgentPrefix: string): string;
|
|
17
|
-
export
|
|
23
|
+
export declare function buildUserAgentOptions(context: StatementedNode, codeModel: ModularCodeModel, sdkUserAgentPrefix: string): string;
|
|
24
|
+
export {};
|
|
18
25
|
//# sourceMappingURL=clientHelpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"clientHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EACL,YAAY,EACZ,6BAA6B,EAC7B,eAAe,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,gBAAgB,EAChB,YAAY,EACb,MAAM,6CAA6C,CAAC;AAOrD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAKvD,UAAU,sBAAsB;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,sBAIR,uCA6CF;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,sBAIR,GACA,YAAY,CAAC,6BAA6B,CAAC,EAAE,CAwB/C;AAqBD,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,YAAY,GAAG,gBAAgB,UAa3C;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,eAAe,EACxB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,MAAM,CAwCR;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,MAAM,GACpB,MAAM,CA2BR;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,gBAAgB,GAC1B,MAAM,CAaR;AAuCD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,gBAAgB,EAC3B,kBAAkB,EAAE,MAAM,GACzB,MAAM,CAqCR"}
|
|
@@ -1,9 +1,54 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { NameType, normalizeName } from "@azure-tools/rlc-common";
|
|
2
2
|
import { getClientName } from "./namingHelpers.js";
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
import { getTypeExpression } from "../type-expressions/get-type-expression.js";
|
|
4
|
+
import { isCredentialType } from "./typeHelpers.js";
|
|
5
|
+
export function getClientParameters(_client, dpgContext, options = {
|
|
6
|
+
requiredOnly: false,
|
|
7
|
+
onClientOnly: false,
|
|
8
|
+
optionalOnly: false
|
|
9
|
+
}) {
|
|
10
|
+
var _a, _b;
|
|
11
|
+
const client = _client.tcgcClient;
|
|
12
|
+
const clientParams = [];
|
|
13
|
+
for (const property of client.initialization.properties) {
|
|
14
|
+
if (property.type.kind === "union" &&
|
|
15
|
+
((_a = property.type.variantTypes[0]) === null || _a === void 0 ? void 0 : _a.kind) === "endpoint") {
|
|
16
|
+
clientParams.push(...property.type.variantTypes[0].templateArguments);
|
|
17
|
+
}
|
|
18
|
+
else if (property.type.kind === "endpoint") {
|
|
19
|
+
clientParams.push(...property.type.templateArguments);
|
|
20
|
+
}
|
|
21
|
+
else if (!clientParams.find((p) => p.name === property.name)) {
|
|
22
|
+
clientParams.push(property);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
const hasDefaultValue = (p) => { var _a; return p.clientDefaultValue || ((_a = p.__raw) === null || _a === void 0 ? void 0 : _a.defaultValue) || p.type.kind === "constant"; };
|
|
26
|
+
const isRequired = (p) => !p.optional && !hasDefaultValue(p);
|
|
27
|
+
const isOptional = (p) => p.optional || hasDefaultValue(p);
|
|
28
|
+
const skipCredentials = (p) => p.kind !== "credential";
|
|
29
|
+
const skipMethodParam = (p) => p.kind !== "method" ||
|
|
30
|
+
(p.kind === "method" &&
|
|
31
|
+
p.isApiVersionParam &&
|
|
32
|
+
_client.parameters.find((p) => p.isApiVersion));
|
|
33
|
+
const armSpecific = (p) => !(p.kind === "endpoint" && dpgContext.arm);
|
|
34
|
+
const filters = [
|
|
35
|
+
options.requiredOnly ? isRequired : undefined,
|
|
36
|
+
((_b = dpgContext.rlcOptions) === null || _b === void 0 ? void 0 : _b.addCredentials) === false
|
|
37
|
+
? skipCredentials
|
|
38
|
+
: undefined,
|
|
39
|
+
options.optionalOnly ? isOptional : undefined,
|
|
40
|
+
options.onClientOnly ? skipMethodParam : undefined,
|
|
41
|
+
armSpecific
|
|
42
|
+
];
|
|
43
|
+
const params = clientParams.filter((p) => filters.every((filter) => !filter || filter(p)));
|
|
44
|
+
return params;
|
|
45
|
+
}
|
|
46
|
+
export function getClientParametersDeclaration(_client, dpgContext, options = {
|
|
47
|
+
optionalOnly: false,
|
|
48
|
+
requiredOnly: false,
|
|
49
|
+
onClientOnly: false
|
|
50
|
+
}) {
|
|
51
|
+
const client = _client.tcgcClient;
|
|
7
52
|
const name = getClientName(client);
|
|
8
53
|
const optionsParam = {
|
|
9
54
|
name: "options",
|
|
@@ -11,56 +56,70 @@ export function getClientParameters(client, dpgContext, isClassicalClient = fals
|
|
|
11
56
|
initializer: "{}"
|
|
12
57
|
};
|
|
13
58
|
const params = [
|
|
14
|
-
...
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
(p.clientDefaultValue === null || p.clientDefaultValue === undefined))
|
|
18
|
-
.map((p) => {
|
|
19
|
-
const typeMetadata = getType(p.type, p.format);
|
|
20
|
-
let typeName = typeMetadata.name;
|
|
21
|
-
if (typeMetadata.nullable) {
|
|
22
|
-
typeName = `${typeName} | null`;
|
|
23
|
-
}
|
|
59
|
+
...getClientParameters(_client, dpgContext, options).map((p) => {
|
|
60
|
+
const typeExpression = getClientParameterTypeExpression(dpgContext, p);
|
|
61
|
+
const name = getClientParameterName(p);
|
|
24
62
|
return {
|
|
25
|
-
name
|
|
26
|
-
type:
|
|
63
|
+
name,
|
|
64
|
+
type: typeExpression
|
|
27
65
|
};
|
|
28
66
|
})
|
|
29
67
|
];
|
|
30
|
-
// Add promoted client-level parameters for classical clients
|
|
31
|
-
if (isClassicalClient && ((_a = dpgContext.rlcOptions) === null || _a === void 0 ? void 0 : _a.azureArm)) {
|
|
32
|
-
// added subscriptionId parameter for ARM clients
|
|
33
|
-
params.push({
|
|
34
|
-
name: "subscriptionId",
|
|
35
|
-
type: `string`
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
68
|
params.push(optionsParam);
|
|
39
69
|
return params;
|
|
40
70
|
}
|
|
41
|
-
|
|
71
|
+
function getClientParameterTypeExpression(context, parameter) {
|
|
72
|
+
// Special handle to work around the fact that TCGC creates a union type for endpoint. The reason they do this
|
|
73
|
+
// is to provide a way for users to either pass the value to fill in the template of the whole endpoint. Basically they are
|
|
74
|
+
// inserting a variant with {endpoint}.
|
|
75
|
+
// Our emitter allows this through the options.endpoint.
|
|
76
|
+
if (parameter.type.kind === "union") {
|
|
77
|
+
const endpointVariant = parameter.type.variantTypes.find((p) => p.kind === "endpoint");
|
|
78
|
+
if (endpointVariant) {
|
|
79
|
+
return getTypeExpression(context, endpointVariant);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return getTypeExpression(context, parameter.type);
|
|
83
|
+
}
|
|
84
|
+
export function getClientParameterName(parameter) {
|
|
85
|
+
// We have been calling this endpointParam, so special handling this here to make sure there are no unexpected side effects
|
|
86
|
+
if ((parameter.type.kind === "union" &&
|
|
87
|
+
parameter.type.variantTypes.some((v) => v.kind === "endpoint")) ||
|
|
88
|
+
((parameter.kind === "endpoint" || parameter.kind === "path") &&
|
|
89
|
+
parameter.name.toLowerCase() === "endpoint")) {
|
|
90
|
+
return "endpointParam";
|
|
91
|
+
}
|
|
92
|
+
return normalizeName(parameter.name, NameType.Parameter, true);
|
|
93
|
+
}
|
|
94
|
+
export function buildGetClientEndpointParam(context, dpgContext, client) {
|
|
42
95
|
// Special case: endpoint URL not defined
|
|
43
96
|
if (client.url === "") {
|
|
44
|
-
const endpointParam = client
|
|
45
|
-
|
|
97
|
+
const endpointParam = getClientParameters(client, dpgContext, {
|
|
98
|
+
onClientOnly: true
|
|
99
|
+
}).find((x) => x.kind === "endpoint" || x.kind === "path");
|
|
100
|
+
if (endpointParam) {
|
|
101
|
+
return `options.endpoint ?? options.baseUrl ?? String(${getClientParameterName(endpointParam)})`;
|
|
102
|
+
}
|
|
46
103
|
}
|
|
47
|
-
const urlParams = client.
|
|
104
|
+
const urlParams = getClientParameters(client, dpgContext).filter((x) => x.kind === "endpoint" || x.kind === "path");
|
|
48
105
|
for (const param of urlParams) {
|
|
106
|
+
const paramName = getClientParameterName(param);
|
|
49
107
|
if (param.clientDefaultValue) {
|
|
50
108
|
const defaultValue = typeof param.clientDefaultValue === "string"
|
|
51
109
|
? `"${param.clientDefaultValue}"`
|
|
52
110
|
: param.clientDefaultValue;
|
|
53
|
-
context.addStatements(`const ${
|
|
111
|
+
context.addStatements(`const ${paramName} = options.${paramName} ?? ${defaultValue};`);
|
|
54
112
|
}
|
|
55
113
|
else if (param.optional) {
|
|
56
|
-
context.addStatements(`const ${
|
|
114
|
+
context.addStatements(`const ${paramName} = options.${paramName};`);
|
|
57
115
|
}
|
|
58
116
|
}
|
|
59
117
|
let parameterizedEndpointUrl = client.url;
|
|
60
118
|
for (const param of urlParams) {
|
|
61
|
-
parameterizedEndpointUrl = parameterizedEndpointUrl.replace(`{${param.
|
|
119
|
+
parameterizedEndpointUrl = parameterizedEndpointUrl.replace(`{${param.serializedName}}`, `\${${getClientParameterName(param)}}`);
|
|
62
120
|
}
|
|
63
|
-
|
|
121
|
+
const endpointUrl = `const endpointUrl = options.endpoint ?? options.baseUrl ?? \`${parameterizedEndpointUrl}\``;
|
|
122
|
+
context.addStatements(endpointUrl);
|
|
64
123
|
return "endpointUrl";
|
|
65
124
|
}
|
|
66
125
|
/**
|
|
@@ -71,7 +130,7 @@ export function buildGetClientEndpointParam(context, client) {
|
|
|
71
130
|
* @returns - an expression representing the options to be passed in to getClient
|
|
72
131
|
*/
|
|
73
132
|
export function buildGetClientOptionsParam(context, codeModel, endpointParam) {
|
|
74
|
-
const userAgentOptions = buildUserAgentOptions(context, "azsdk-js-api");
|
|
133
|
+
const userAgentOptions = buildUserAgentOptions(context, codeModel, "azsdk-js-api");
|
|
75
134
|
const loggingOptions = buildLoggingOptions(codeModel.options.flavor);
|
|
76
135
|
const credentials = buildCredentials(codeModel, endpointParam);
|
|
77
136
|
let expr = "const { apiVersion: _, ...updatedOptions } = {";
|
|
@@ -126,21 +185,31 @@ function buildLoggingOptions(flavor) {
|
|
|
126
185
|
}
|
|
127
186
|
return `{ logger: options.loggingOptions?.logger ?? logger.info }`;
|
|
128
187
|
}
|
|
129
|
-
export function buildUserAgentOptions(context, sdkUserAgentPrefix) {
|
|
130
|
-
|
|
131
|
-
const
|
|
132
|
-
const
|
|
188
|
+
export function buildUserAgentOptions(context, codeModel, sdkUserAgentPrefix) {
|
|
189
|
+
var _a, _b, _c, _d, _e, _f;
|
|
190
|
+
const userAgentStatements = [];
|
|
191
|
+
const prefixFromOptions = "const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;";
|
|
192
|
+
userAgentStatements.push(prefixFromOptions);
|
|
193
|
+
const clientPackageName = (_d = (_b = (_a = codeModel.options.packageDetails) === null || _a === void 0 ? void 0 : _a.nameWithoutScope) !== null && _b !== void 0 ? _b : (_c = codeModel.options.packageDetails) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : "";
|
|
194
|
+
const packageVersion = (_f = (_e = codeModel.options.packageDetails) === null || _e === void 0 ? void 0 : _e.version) !== null && _f !== void 0 ? _f : "";
|
|
195
|
+
const userAgentInfoStatement = packageVersion && clientPackageName && sdkUserAgentPrefix.includes("api")
|
|
196
|
+
? "const userAgentInfo = `azsdk-js-" +
|
|
197
|
+
clientPackageName +
|
|
198
|
+
"/" +
|
|
199
|
+
packageVersion +
|
|
200
|
+
"`;"
|
|
201
|
+
: "";
|
|
202
|
+
if (userAgentInfoStatement) {
|
|
203
|
+
userAgentStatements.push(userAgentInfoStatement);
|
|
204
|
+
}
|
|
205
|
+
const userAgentPrefix = `const userAgentPrefix = ${"prefixFromOptions ? `${prefixFromOptions} " +
|
|
133
206
|
sdkUserAgentPrefix +
|
|
134
|
-
"
|
|
135
|
-
`"
|
|
136
|
-
|
|
137
|
-
|
|
207
|
+
`${userAgentInfoStatement ? " ${userAgentInfo}" : ""}` +
|
|
208
|
+
"` : `" +
|
|
209
|
+
`${sdkUserAgentPrefix}` +
|
|
210
|
+
`${userAgentInfoStatement ? " ${userAgentInfo}`" : "`"}`};`;
|
|
211
|
+
userAgentStatements.push(userAgentPrefix);
|
|
212
|
+
context.addStatements(userAgentStatements.join("\n"));
|
|
138
213
|
return `{ userAgentPrefix }`;
|
|
139
214
|
}
|
|
140
|
-
export function importCredential(runtimeImports, clientSourceFile) {
|
|
141
|
-
clientSourceFile.addImportDeclaration({
|
|
142
|
-
moduleSpecifier: getImportSpecifier("coreAuth", runtimeImports),
|
|
143
|
-
namedImports: ["TokenCredential", "KeyCredential"]
|
|
144
|
-
});
|
|
145
|
-
}
|
|
146
215
|
//# sourceMappingURL=clientHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"clientHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { NameType } from "@azure-tools/rlc-common";
|
|
2
|
-
import { SdkClient } from "@azure-tools/typespec-client-generator-core";
|
|
2
|
+
import { SdkClient, SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
|
|
3
3
|
import { SdkContext } from "../../utils/interfaces.js";
|
|
4
4
|
import { Client, ModularCodeModel, Operation, OperationGroup } from "../modularCodeModel.js";
|
|
5
|
-
export declare function getClientName(client:
|
|
5
|
+
export declare function getClientName(client: SdkClientType<SdkServiceOperation>): string;
|
|
6
|
+
export declare function getClassicalClientName(client: SdkClientType<SdkServiceOperation>): string;
|
|
6
7
|
export interface GuardedName {
|
|
7
8
|
name: string;
|
|
8
9
|
fixme?: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namingHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGT,MAAM,yBAAyB,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"namingHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,SAAS,EACT,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EACL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,cAAc,EACf,MAAM,wBAAwB,CAAC;AAEhC,wBAAgB,aAAa,CAC3B,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,GACzC,MAAM,CAER;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,GACzC,MAAM,CAER;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,EACpB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAA;CAAwB,GAC5D,WAAW,CAgBb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAMxE;AAED,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,QAAQ,EAAE,QAAQ,EAClB,SAAS,GAAE,MAAW,EACtB,KAAK,GAAE,MAAuD,GAC7D,MAAM,CAiBR;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,KAAK,IAAI,CAAC,CAEpE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,GAAG,GAAE,IAAI,GAAG,IAAW,GACtB,MAAM,CAQR;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,GAAG,GAAE,IAAI,GAAG,IAAW,GACtB,MAAM,CASR"}
|
|
@@ -4,6 +4,9 @@ import { toCamelCase, toPascalCase } from "../../utils/casingUtils.js";
|
|
|
4
4
|
export function getClientName(client) {
|
|
5
5
|
return client.name.replace(/Client$/, "");
|
|
6
6
|
}
|
|
7
|
+
export function getClassicalClientName(client) {
|
|
8
|
+
return client.name;
|
|
9
|
+
}
|
|
7
10
|
export function getOperationName(operation, options = { casing: "camel" }) {
|
|
8
11
|
const casingFn = options.casing === "camel" ? toCamelCase : toPascalCase;
|
|
9
12
|
if (isReservedName(operation.name, NameType.Operation)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namingHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,aAAa,EACb,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"namingHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,19 @@
|
|
|
1
1
|
import { Client, ModularCodeModel, Operation, Parameter, Property, Type } from "../modularCodeModel.js";
|
|
2
2
|
import { FunctionDeclarationStructure, OptionalKind } from "ts-morph";
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
export declare function
|
|
6
|
-
export declare function getDeserializePrivateFunction(operation: Operation, runtimeImports: RuntimeImports): OptionalKind<FunctionDeclarationStructure>;
|
|
3
|
+
import { SdkContext } from "../../utils/interfaces.js";
|
|
4
|
+
export declare function getSendPrivateFunction(dpgContext: SdkContext, operation: Operation, clientType: string): OptionalKind<FunctionDeclarationStructure>;
|
|
5
|
+
export declare function getDeserializePrivateFunction(context: SdkContext, operation: Operation): OptionalKind<FunctionDeclarationStructure>;
|
|
7
6
|
/**
|
|
8
7
|
* This operation builds and returns the function declaration for an operation.
|
|
9
8
|
*/
|
|
10
|
-
export declare function getOperationFunction(operation: Operation, clientType: string): OptionalKind<FunctionDeclarationStructure> & {
|
|
9
|
+
export declare function getOperationFunction(context: SdkContext, operation: Operation, clientType: string): OptionalKind<FunctionDeclarationStructure> & {
|
|
11
10
|
propertyName?: string;
|
|
12
11
|
};
|
|
13
12
|
export declare function getOperationOptionsName(operation: Operation, includeGroupName?: boolean): string;
|
|
14
13
|
/**
|
|
15
14
|
* This function helps with renames, translating client names to rest api names
|
|
16
15
|
*/
|
|
17
|
-
export declare function getParameterMap(param: Parameter | Property
|
|
16
|
+
export declare function getParameterMap(context: SdkContext, param: Parameter | Property): string;
|
|
18
17
|
/**
|
|
19
18
|
*
|
|
20
19
|
* This function helps translating an HLC request to RLC request,
|
|
@@ -24,24 +23,24 @@ interface RequestModelMappingResult {
|
|
|
24
23
|
propertiesStr: string[];
|
|
25
24
|
directAssignment?: boolean;
|
|
26
25
|
}
|
|
27
|
-
export declare function getRequestModelMapping(
|
|
26
|
+
export declare function getRequestModelMapping(context: SdkContext, modelPropertyType: Type, propertyPath?: string): RequestModelMappingResult;
|
|
28
27
|
/**
|
|
29
28
|
* This function helps translating an RLC response to an HLC response,
|
|
30
29
|
* extracting properties from body and headers and building the HLC response object
|
|
31
30
|
*/
|
|
32
|
-
export declare function getResponseMapping(
|
|
31
|
+
export declare function getResponseMapping(context: SdkContext, type: Type, propertyPath?: string): string[];
|
|
33
32
|
/**
|
|
34
33
|
* This function helps converting strings into JS complex types recursively.
|
|
35
34
|
* We need to drill down into Array elements to make sure that the element type is
|
|
36
35
|
* deserialized correctly
|
|
37
36
|
*/
|
|
38
|
-
export declare function
|
|
37
|
+
export declare function serializeRequestValue(context: SdkContext, type: Type, clientValue: string, required: boolean, format?: string): string;
|
|
39
38
|
/**
|
|
40
39
|
* This function helps converting strings into JS complex types recursively.
|
|
41
40
|
* We need to drill down into Array elements to make sure that the element type is
|
|
42
41
|
* deserialized correctly
|
|
43
42
|
*/
|
|
44
|
-
export declare function
|
|
43
|
+
export declare function deserializeResponseValue(context: SdkContext, type: Type, restValue: string, format?: string): string;
|
|
45
44
|
export declare function isLroAndPagingOperation(op: Operation): boolean;
|
|
46
45
|
export declare function isLroOnlyOperation(op: Operation): boolean;
|
|
47
46
|
export declare function hasPagingOnlyOperation(client: Client, needRLC?: boolean): boolean;
|
|
@@ -51,7 +50,6 @@ export declare function getAllProperties(type: Type, parents?: Type[]): Property
|
|
|
51
50
|
export declare function getAllAncestors(type: Type): Type[];
|
|
52
51
|
export declare function getPropertySerializationPrefix(modularType: Property | Parameter, propertyPath?: string): string;
|
|
53
52
|
export declare function getPropertyFullName(modularType: Property | Parameter, propertyPath?: string): string;
|
|
54
|
-
export declare function isDiscriminatedUnion(type?: SdkType): type is SdkModelType;
|
|
55
53
|
/**
|
|
56
54
|
* Get an expression representing an array of expected status codes for the operation
|
|
57
55
|
* @param operation The operation
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,4BAA4B,EAC5B,YAAY,EAEb,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"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"}
|