@azure-tools/typespec-ts 0.17.0 → 0.17.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/modular/buildClassicalClient.d.ts.map +1 -1
- package/dist/src/modular/buildClassicalClient.js +14 -4
- package/dist/src/modular/buildClassicalClient.js.map +1 -1
- package/dist/src/modular/buildClientContext.d.ts.map +1 -1
- package/dist/src/modular/buildClientContext.js +8 -43
- package/dist/src/modular/buildClientContext.js.map +1 -1
- package/dist/src/modular/buildCodeModel.d.ts.map +1 -1
- package/dist/src/modular/buildCodeModel.js +49 -14
- package/dist/src/modular/buildCodeModel.js.map +1 -1
- package/dist/src/modular/buildOperations.d.ts.map +1 -1
- package/dist/src/modular/buildOperations.js +1 -3
- 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 +12 -7
- package/dist/src/modular/buildProjectFiles.js.map +1 -1
- package/dist/src/modular/emitModels.d.ts +1 -1
- package/dist/src/modular/emitModels.d.ts.map +1 -1
- package/dist/src/modular/emitModels.js +4 -2
- package/dist/src/modular/emitModels.js.map +1 -1
- package/dist/src/modular/helpers/clientHelpers.d.ts +2 -1
- package/dist/src/modular/helpers/clientHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/clientHelpers.js +6 -0
- package/dist/src/modular/helpers/clientHelpers.js.map +1 -1
- package/dist/src/modular/helpers/operationHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/operationHelpers.js +34 -37
- package/dist/src/modular/helpers/operationHelpers.js.map +1 -1
- package/dist/src/modular/helpers/typeHelpers.d.ts.map +1 -1
- package/dist/src/modular/helpers/typeHelpers.js +7 -10
- package/dist/src/modular/helpers/typeHelpers.js.map +1 -1
- package/dist/src/modular/modularCodeModel.d.ts +1 -1
- package/dist/src/modular/modularCodeModel.d.ts.map +1 -1
- package/dist/src/transform/transform.d.ts.map +1 -1
- package/dist/src/transform/transform.js +5 -1
- package/dist/src/transform/transform.js.map +1 -1
- package/dist/src/transform/transformParameters.js +2 -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 +13 -11
- package/dist/src/transform/transformSchemas.js.map +1 -1
- package/dist/src/utils/emitUtil.d.ts.map +1 -1
- package/dist/src/utils/emitUtil.js +9 -3
- package/dist/src/utils/emitUtil.js.map +1 -1
- package/dist/src/utils/modelUtils.d.ts.map +1 -1
- package/dist/src/utils/modelUtils.js +135 -129
- package/dist/src/utils/modelUtils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -9
- package/src/index.ts +8 -1
- package/src/modular/buildClassicalClient.ts +18 -5
- package/src/modular/buildClientContext.ts +15 -59
- package/src/modular/buildCodeModel.ts +47 -16
- package/src/modular/buildOperations.ts +1 -4
- package/src/modular/buildProjectFiles.ts +13 -7
- package/src/modular/emitModels.ts +7 -2
- package/src/modular/helpers/clientHelpers.ts +12 -1
- package/src/modular/helpers/operationHelpers.ts +63 -60
- package/src/modular/helpers/typeHelpers.ts +2 -5
- package/src/modular/modularCodeModel.ts +1 -0
- package/src/transform/transform.ts +8 -2
- package/src/transform/transformParameters.ts +2 -1
- package/src/transform/transformSchemas.ts +7 -3
- package/src/utils/emitUtil.ts +9 -3
- package/src/utils/modelUtils.ts +148 -143
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## 0.17.1 (2023-10-17)
|
|
2
|
+
|
|
3
|
+
- [Feature] Support mock sample generation from TypeSpec in RLC. Please refer to pr [#2002](https://github.com/Azure/autorest.typescript/pull/2002).
|
|
4
|
+
- [Feature] Support additional properties in RLC. Please refer to pr [#2054](https://github.com/Azure/autorest.typescript/pull/2054).
|
|
5
|
+
- [Feature] Support custom http auth in Modular. Please refer to pr [#2041](https://github.com/Azure/autorest.typescript/pull/2041).
|
|
6
|
+
- [Feature] Do not flatten payload in Modular. Please refer to pr [#2020](https://github.com/Azure/autorest.typescript/pull/2020).
|
|
7
|
+
- [Feature] Support parameterized host parameters in Modular. Please refer to pr [#2032](https://github.com/Azure/autorest.typescript/pull/2032).
|
|
8
|
+
- [Bugfix] Fix literal type in Modular. Please refer to pr [#2054](https://github.com/Azure/autorest.typescript/pull/2054).
|
|
9
|
+
- [Bugfix] Fix error response type missing, non-azure scope package name missing issue. Please refer to pr [#2041](https://github.com/Azure/autorest.typescript/pull/2041).
|
|
10
|
+
- [Others] Bump dependencies version, for @azure/identity and mocha. Please refer to pr [#2057](https://github.com/Azure/autorest.typescript/pull/2057) and [#2053](https://github.com/Azure/autorest.typescript/pull/2053).
|
|
11
|
+
- [Others] Use Node 16 in both codegen and generated code. Please refer to [#2039](https://github.com/Azure/autorest.typescript/pull/2039) and [#2052](https://github.com/Azure/autorest.typescript/pull/2052).
|
|
12
|
+
|
|
1
13
|
## 0.17.0 (2023-09-26)
|
|
2
14
|
|
|
3
15
|
- [Feature] Upgrade TypeSpec compiler version to v0.48.0. Please refer to pr [#2029](https://github.com/Azure/autorest.typescript/pull/2029).
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAkC1D,OAAO,EAAE,OAAO,EAAc,MAAM,UAAU,CAAC;AAmB/C,cAAc,UAAU,CAAC;AAEzB,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,iBA+NjD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,QA+EtD"}
|
package/dist/src/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Licensed under the MIT License.
|
|
3
3
|
import * as fsextra from "fs-extra";
|
|
4
4
|
import { existsSync } from "fs";
|
|
5
|
-
import { buildClientDefinitions, buildResponseTypes, buildParameterTypes, buildIsUnexpectedHelper, buildClient, buildIndexFile, buildTopLevelIndex, buildRollupConfig, buildTsConfig, buildApiExtractorConfig, buildPackageFile, buildPollingHelper, buildPaginateHelper, buildEsLintConfig, buildKarmaConfigFile, buildEnvFile, buildEnvBrowserFile, buildRecordedClientFile, buildSampleTest, buildReadmeFile, buildSerializeHelper, buildLogger, hasUnexpectedHelper } from "@azure-tools/rlc-common";
|
|
5
|
+
import { buildClientDefinitions, buildResponseTypes, buildParameterTypes, buildIsUnexpectedHelper, buildClient, buildIndexFile, buildTopLevelIndex, buildRollupConfig, buildTsConfig, buildApiExtractorConfig, buildPackageFile, buildPollingHelper, buildPaginateHelper, buildEsLintConfig, buildKarmaConfigFile, buildEnvFile, buildEnvBrowserFile, buildRecordedClientFile, buildSampleTest, buildReadmeFile, buildSerializeHelper, buildLogger, hasUnexpectedHelper, buildSamples } from "@azure-tools/rlc-common";
|
|
6
6
|
import { transformRLCModel } from "./transform/transform.js";
|
|
7
7
|
import { emitContentByBuilder, emitModels } from "./utils/emitUtil.js";
|
|
8
8
|
import { createSdkContext } from "@azure-tools/typespec-client-generator-core";
|
|
@@ -68,6 +68,7 @@ export async function $onEmit(context) {
|
|
|
68
68
|
await fsextra.emptyDir((_d = (_b = (_a = dpgContext.generationPathDetail) === null || _a === void 0 ? void 0 : _a.modularSourcesDir) !== null && _b !== void 0 ? _b : (_c = dpgContext.generationPathDetail) === null || _c === void 0 ? void 0 : _c.rlcSourcesDir) !== null && _d !== void 0 ? _d : "");
|
|
69
69
|
}
|
|
70
70
|
async function generateRLCSources() {
|
|
71
|
+
var _a;
|
|
71
72
|
const clients = getRLCClients(dpgContext);
|
|
72
73
|
for (const client of clients) {
|
|
73
74
|
const rlcModels = await transformRLCModel(client, dpgContext);
|
|
@@ -86,6 +87,7 @@ export async function $onEmit(context) {
|
|
|
86
87
|
await emitContentByBuilder(program, buildPaginateHelper, rlcModels);
|
|
87
88
|
await emitContentByBuilder(program, buildPollingHelper, rlcModels);
|
|
88
89
|
await emitContentByBuilder(program, buildSerializeHelper, rlcModels);
|
|
90
|
+
await emitContentByBuilder(program, buildSamples, rlcModels, (_a = dpgContext.generationPathDetail) === null || _a === void 0 ? void 0 : _a.metadataDir);
|
|
89
91
|
}
|
|
90
92
|
}
|
|
91
93
|
async function generateModularSources() {
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAGlC,OAAO,KAAK,OAAO,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,mBAAmB,EACnB,uBAAuB,EACvB,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EAEX,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAGlC,OAAO,KAAK,OAAO,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EACL,sBAAsB,EACtB,kBAAkB,EAClB,mBAAmB,EACnB,uBAAuB,EACvB,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EAEX,mBAAmB,EAEnB,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,cAAc,EACd,uBAAuB,EACxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,cAAc,UAAU,CAAC;AAEzB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAoB;IAChD,oBAAoB;IACpB,MAAM,OAAO,GAAY,OAAO,CAAC,OAAO,CAAC;IACzC,MAAM,cAAc,GAAe,OAAO,CAAC,OAAO,CAAC;IACnD,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAe,CAAC;IAC3D,MAAM,oBAAoB,GAAyB,IAAI,GAAG,EAAmB,CAAC;IAC9E,MAAM,yBAAyB,GAA0B,IAAI,GAAG,EAG7D,CAAC;IACJ,MAAM,aAAa,GAAe,EAAE,CAAC;IACrC,IAAI,gBAAkC,CAAC;IACvC,gEAAgE;IAChE,MAAM,gBAAgB,EAAE,CAAC;IACzB,0BAA0B;IAC1B,MAAM,cAAc,EAAE,CAAC;IACvB,0BAA0B;IAC1B,MAAM,kBAAkB,EAAE,CAAC;IAC3B,8BAA8B;IAC9B,MAAM,sBAAsB,EAAE,CAAC;IAC/B,sCAAsC;IACtC,MAAM,uBAAuB,EAAE,CAAC;IAEhC,KAAK,UAAU,gBAAgB;QAC7B,MAAM,oBAAoB,GACxB,MAAM,sBAAsB,EAAE,CAAC;QACjC,UAAU,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACvD,MAAM,OAAO,GAAe,mBAAmB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAC5E,UAAU,CAAC,UAAU,GAAG,OAAO,CAAC;IAClC,CAAC;IAED,KAAK,UAAU,sBAAsB;;QACnC,MAAM,WAAW,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,EAAE,CAAC;QACnD,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACzD,IAAI,MAAM,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;YACjD,WAAW,GAAG,IAAI,CAAC,mBAAmB,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;SAC7D;QACD,OAAO;YACL,OAAO,EAAE,WAAW;YACpB,WAAW,EAAE,WAAW;YACxB,aAAa,EAAE,IAAI,CACjB,WAAW,EACX,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,mEAAmE;aAClH;YACD,iBAAiB,EAAE,cAAc,CAAC,gBAAgB;gBAChD,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,SAAS;SACd,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,cAAc;;QAC3B,MAAM,OAAO,CAAC,QAAQ,CACpB,MAAA,MAAA,MAAA,UAAU,CAAC,oBAAoB,0CAAE,iBAAiB,mCAChD,MAAA,UAAU,CAAC,oBAAoB,0CAAE,aAAa,mCAC9C,EAAE,CACL,CAAC;IACJ,CAAC;IAED,KAAK,UAAU,kBAAkB;;QAC/B,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QAC1C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YAC9D,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC9D,oBAAoB,CAAC,GAAG,CACtB,aAAa,CAAC,SAAS,CAAC,EACxB,mBAAmB,CAAC,SAAS,CAAC,CAC/B,CAAC;YAEF,MAAM,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACrC,MAAM,oBAAoB,CAAC,OAAO,EAAE,sBAAsB,EAAE,SAAS,CAAC,CAAC;YACvE,MAAM,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC;YACnE,MAAM,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;YAC5D,MAAM,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;YACpE,MAAM,oBAAoB,CAAC,OAAO,EAAE,uBAAuB,EAAE,SAAS,CAAC,CAAC;YACxE,MAAM,oBAAoB,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;YAC/D,MAAM,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;YAC5D,MAAM,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC;YACnE,MAAM,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;YACpE,MAAM,oBAAoB,CAAC,OAAO,EAAE,kBAAkB,EAAE,SAAS,CAAC,CAAC;YACnE,MAAM,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC;YACrE,MAAM,oBAAoB,CACxB,OAAO,EACP,YAAY,EACZ,SAAS,EACT,MAAA,UAAU,CAAC,oBAAoB,0CAAE,WAAW,CAC7C,CAAC;SACH;IACH,CAAC;IAED,KAAK,UAAU,sBAAsB;;QACnC,IAAI,cAAc,CAAC,gBAAgB,EAAE;YACnC,0CAA0C;YAC1C,MAAM,kBAAkB,GACtB,MAAA,MAAA,UAAU,CAAC,oBAAoB,0CAAE,iBAAiB,mCAAI,KAAK,CAAC;YAC9D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAC9B,gBAAgB,GAAG,aAAa,CAC9B,UAAU,EACV,yBAAyB,EACzB,kBAAkB,EAClB,OAAO,EACP;gBACE,MAAM,EAAE,OAAO;aAChB,CACF,CAAC;YACF,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAC5C,GAAG,kBAAkB,WAAW,EAChC,EAAE,EACF;gBACE,SAAS,EAAE,IAAI;aAChB,CACF,CAAC;YACF,KAAK,MAAM,SAAS,IAAI,gBAAgB,CAAC,OAAO,EAAE;gBAChD,WAAW,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;gBACzC,kBAAkB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;gBAChD,MAAM,yBAAyB,GAC7B,MAAA,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,mCAAI,KAAK,CAAC;gBAC7D,mBAAmB,CACjB,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,yBAAyB,CAC1B,CAAC;gBACF,kBAAkB,CAAC,UAAU,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;gBAC5D,qBAAqB,CAAC,gBAAgB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC7D,qBAAqB,CAAC,gBAAgB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;gBAC1D,oBAAoB,CAAC,UAAU,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;gBAC9D,IAAI,gBAAgB,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACvC,uBAAuB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;iBACtD;gBACD,cAAc,CAAC,gBAAgB,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;aAC5D;YAED,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAEhC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE;gBAC3C,MAAM,oBAAoB,CACxB,OAAO,EACP,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,EACjE,gBAAuB,CACxB,CAAC;gBACF,6EAA6E;aAC9E;SACF;IACH,CAAC;IAED,KAAK,UAAU,uBAAuB;;QACpC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;YACnD,OAAO;SACR;QACD,MAAM,SAAS,GAAa,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,UAAU,CAAC,UAAW,CAAC;QACtC,oBAAoB;QACpB,MAAM,cAAc,GAAG,MAAM,UAAU,CACrC,IAAI,CAAC,MAAA,MAAA,UAAU,CAAC,oBAAoB,0CAAE,WAAW,mCAAI,EAAE,EAAE,cAAc,CAAC,CACzE,CAAC;QACF,MAAM,sBAAsB,GAC1B,MAAM,CAAC,gBAAgB,KAAK,IAAI;YAChC,CAAC,MAAM,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,cAAc,CAAC,CAAC;QAC7D,MAAM,cAAc,GAAG;YACrB,iBAAiB;YACjB,iBAAiB;YACjB,uBAAuB;YACvB,eAAe;SAChB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;YAC5B,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACtC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACpC;QACD,IAAI,sBAAsB,EAAE;YAC1B,gCAAgC;YAChC,MAAM,oBAAoB,CACxB,OAAO,EACP,cAAc,EACd,SAAS,EACT,MAAA,UAAU,CAAC,oBAAoB,0CAAE,WAAW,CAC7C,CAAC;YAEF,IAAI,MAAM,CAAC,gBAAgB,EAAE;gBAC3B,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC9B,WAAW,CACT,OAAO,EACP,MAAA,MAAA,UAAU,CAAC,oBAAoB,0CAAE,WAAW,mCAAI,EAAE,EAClD,gBAAgB,CACjB,CAAC;gBACF,YAAY,CACV,OAAO,EACP,MAAA,MAAA,UAAU,CAAC,oBAAoB,0CAAE,WAAW,mCAAI,EAAE,EAClD,gBAAgB,CACjB,CAAC;gBACF,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,cAAc,EAAE,EAAE;oBAC3C,MAAM,oBAAoB,CACxB,OAAO,EACP,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,EACjE,gBAAuB,CACxB,CAAC;iBACH;aACF;SACF;QAED,+BAA+B;QAC/B,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,UAAU,CAC5C,IAAI,CAAC,MAAA,MAAA,UAAU,CAAC,oBAAoB,0CAAE,WAAW,mCAAI,EAAE,EAAE,MAAM,CAAC,CACjE,CAAC;QACF,MAAM,kBAAkB,GACtB,MAAM,CAAC,YAAY,KAAK,IAAI;YAC5B,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS,IAAI,CAAC,aAAa,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,MAAM,oBAAoB,CACxB,OAAO,EACP;gBACE,oBAAoB;gBACpB,YAAY;gBACZ,mBAAmB;gBACnB,uBAAuB;gBACvB,eAAe;aAChB,EACD,SAAS,EACT,MAAA,UAAU,CAAC,oBAAoB,0CAAE,WAAW,CAC7C,CAAC;SACH;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAgB;IACrD,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9D,IAAI,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,oBAAoB,EAAE,EAAE;QAChD,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IAChE,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,oBAAoB,EAAE,EAAE;QACrE,MAAM,UAAU,GAAG,oBAAoB,CAAC,oBAAoB;aACzD,qBAAqB,EAAE;aACvB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;;YACf,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,SAAS,EAAE,0CAAE,OAAO,EAAE,CAAC;YACzC,OAAO,CACL,IAAI,KAAK,UAAU,CAAC,eAAe;gBACnC,IAAI,KAAK,UAAU,CAAC,oBAAoB,CACzC,CAAC;QACJ,CAAC,CAAC,CAAC;QACL,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,gBAAgB,CAAC,OAAO,CAAC,CAAC,oBAAoB,EAAE,EAAE;QAChD,MAAM,UAAU,GAAG,oBAAoB,CAAC,oBAAoB;aACzD,qBAAqB,EAAE;aACvB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;;YACf,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,SAAS,EAAE,0CAAE,OAAO,EAAE,CAAC;YACzC,OAAO,IAAI,KAAK,UAAU,CAAC,eAAe,CAAC;QAC7C,CAAC,CAAC,CAAC;QACL,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,WAAW,EAAE,CAAC;YACtD,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,wBAAwB;QACxB,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1D,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC,CAAC,wCAAwC;QAC5C,uDAAuD;QACvD,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACtD,OAAO,CACL,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM;gBACpC,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CACrC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,GAAa,EAAE,CAAC;QACrC,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE;YACxC,MAAM,QAAQ,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;YACzC,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACrB,8BAA8B;gBAC9B,MAAM,kBAAkB,GAAG,SAAS,CAAC,qBAAqB,EAAE,CAAC;gBAE7D,uCAAuC;gBACvC,kBAAkB,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE;oBAC/C,qDAAqD;oBACrD,MAAM,eAAe,GAAG,iBAAiB;yBACtC,eAAe,EAAE;yBACjB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;;wBACb,MAAM,SAAS,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC;wBACpC,IACE,SAAS;4BACT,SAAS,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;4BACzC,EAAE,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAClC;4BACA,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;yBAC3C;wBACD,OAAO,CACL,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;4BAC1C,EAAE,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;4BAClC,CAAA,MAAA,EAAE,CAAC,YAAY,EAAE,0CAAE,OAAO,EAAE,MAAK,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CACnD,CAAC;oBACJ,CAAC,CAAC,CAAC;oBACL,8BAA8B;oBAC9B,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC/C,CAAC,CAAC,CAAC;aACJ;SACF;QACD,oBAAoB,CAAC,oBAAoB,CAAC,MAAM,EAAE,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClassicalClient.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildClassicalClient.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,QAmEf"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Scope, StructureKind } from "ts-morph";
|
|
2
2
|
import { toCamelCase } from "../utils/casingUtils.js";
|
|
3
|
-
import { getClientParameters } from "./helpers/clientHelpers.js";
|
|
3
|
+
import { getClientParameters, importCredential } from "./helpers/clientHelpers.js";
|
|
4
4
|
import { getClientName } from "./helpers/namingHelpers.js";
|
|
5
5
|
import { getOperationFunction } from "./helpers/operationHelpers.js";
|
|
6
6
|
import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
|
|
@@ -37,6 +37,14 @@ export function buildClassicalClient(dpgContext, codeModel, client) {
|
|
|
37
37
|
scope: Scope.Private
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
|
+
// Add the pipeline member. This will be the pipeline from /api
|
|
41
|
+
clientClass.addProperty({
|
|
42
|
+
name: "pipeline",
|
|
43
|
+
type: "Pipeline",
|
|
44
|
+
scope: Scope.Public,
|
|
45
|
+
isReadonly: true,
|
|
46
|
+
docs: ["The pipeline used by this client to make requests"]
|
|
47
|
+
});
|
|
40
48
|
// TODO: We may need to generate constructor overloads at some point. Here we'd do that.
|
|
41
49
|
const constructor = clientClass.addConstructor({
|
|
42
50
|
docs: getDocsFromDescription(description),
|
|
@@ -47,7 +55,9 @@ export function buildClassicalClient(dpgContext, codeModel, client) {
|
|
|
47
55
|
.map((p) => p.name)
|
|
48
56
|
.join(",")})`
|
|
49
57
|
]);
|
|
58
|
+
constructor.addStatements(`this.pipeline = this._client.pipeline`);
|
|
50
59
|
importCredential(clientFile);
|
|
60
|
+
importPipeline(clientFile);
|
|
51
61
|
importAllModels(clientFile, srcPath, subfolder);
|
|
52
62
|
buildClientOperationGroups(client, clientClass, subfolder);
|
|
53
63
|
importAllApis(clientFile, srcPath, subfolder);
|
|
@@ -91,10 +101,10 @@ function importAllModels(clientFile, srcPath, subfolder) {
|
|
|
91
101
|
namedImports: exportedOptions
|
|
92
102
|
});
|
|
93
103
|
}
|
|
94
|
-
function
|
|
104
|
+
function importPipeline(clientSourceFile) {
|
|
95
105
|
clientSourceFile.addImportDeclaration({
|
|
96
|
-
moduleSpecifier: "@azure/core-
|
|
97
|
-
namedImports: ["
|
|
106
|
+
moduleSpecifier: "@azure/core-rest-pipeline",
|
|
107
|
+
namedImports: ["Pipeline"]
|
|
98
108
|
});
|
|
99
109
|
}
|
|
100
110
|
function buildClientOperationGroups(client, clientClass, subfolder) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,EAEL,aAAa,EACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAMtC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIjE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,GACb,UAAU,CAmGZ"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { getClientParameters } from "./helpers/clientHelpers.js";
|
|
2
|
-
import { importCredential } from "./helpers/credentialHelpers.js";
|
|
1
|
+
import { getClientParameters, importCredential } from "./helpers/clientHelpers.js";
|
|
3
2
|
import { getClientName } from "./helpers/namingHelpers.js";
|
|
4
3
|
import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
|
|
5
4
|
import { getDocsFromDescription } from "./helpers/docsHelpers.js";
|
|
@@ -8,11 +7,13 @@ import { importModels } from "./buildOperations.js";
|
|
|
8
7
|
* This function creates the file containing the modular client context
|
|
9
8
|
*/
|
|
10
9
|
export function buildClientContext(dpgContext, codeModel, client) {
|
|
11
|
-
const { description,
|
|
10
|
+
const { description, subfolder } = client;
|
|
12
11
|
const name = getClientName(client);
|
|
12
|
+
const params = getClientParameters(client);
|
|
13
13
|
const srcPath = codeModel.modularOptions.sourceRoot;
|
|
14
14
|
const clientContextFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}/api/${name}Context.ts`);
|
|
15
15
|
let factoryFunction;
|
|
16
|
+
importCredential(clientContextFile);
|
|
16
17
|
importModels(srcPath, clientContextFile, codeModel.project, subfolder);
|
|
17
18
|
clientContextFile.addImportDeclaration({
|
|
18
19
|
moduleSpecifier: "@azure-rest/core-client",
|
|
@@ -36,7 +37,7 @@ export function buildClientContext(dpgContext, codeModel, client) {
|
|
|
36
37
|
docs: getDocsFromDescription(description),
|
|
37
38
|
name: `create${name}`,
|
|
38
39
|
returnType: `Client.${client.name}`,
|
|
39
|
-
parameters:
|
|
40
|
+
parameters: params,
|
|
40
41
|
isExported: true
|
|
41
42
|
});
|
|
42
43
|
}
|
|
@@ -54,32 +55,12 @@ export function buildClientContext(dpgContext, codeModel, client) {
|
|
|
54
55
|
docs: getDocsFromDescription(description),
|
|
55
56
|
name: `create${name}`,
|
|
56
57
|
returnType: `${rlcClientName}`,
|
|
57
|
-
parameters:
|
|
58
|
+
parameters: params,
|
|
58
59
|
isExported: true
|
|
59
60
|
});
|
|
60
61
|
}
|
|
61
|
-
const
|
|
62
|
-
const
|
|
63
|
-
if (baseUrlParam) {
|
|
64
|
-
let baseUrl = "endpoint";
|
|
65
|
-
baseUrl =
|
|
66
|
-
baseUrlParam.type.type === "constant"
|
|
67
|
-
? baseUrlParam.type.value
|
|
68
|
-
: baseUrlParam.clientName;
|
|
69
|
-
factoryFunction.addStatements([`const baseUrl = ${baseUrl}`]);
|
|
70
|
-
}
|
|
71
|
-
let getClientStatement = `const clientContext = getClient(options)`;
|
|
72
|
-
if (baseUrlParam) {
|
|
73
|
-
getClientStatement = `const clientContext = getClient(baseUrl, options)`;
|
|
74
|
-
}
|
|
75
|
-
// If the client needs credentials we need to pass those to getClient
|
|
76
|
-
if (credentialsParam) {
|
|
77
|
-
importCredential(credentialsParam.type, clientContextFile);
|
|
78
|
-
addCredentialOptionsStatement(credentialsParam, factoryFunction);
|
|
79
|
-
getClientStatement = baseUrlParam
|
|
80
|
-
? `const clientContext = getClient(baseUrl, credential, options)`
|
|
81
|
-
: `const clientContext = getClient(credential, options)`;
|
|
82
|
-
}
|
|
62
|
+
const paramNames = params.map((p) => p.name);
|
|
63
|
+
const getClientStatement = `const clientContext = getClient(${paramNames.join(",")})`;
|
|
83
64
|
factoryFunction.addStatements([getClientStatement, "return clientContext;"]);
|
|
84
65
|
if (isRLCMultiEndpoint(dpgContext)) {
|
|
85
66
|
clientContextFile.addImportDeclarations([
|
|
@@ -101,20 +82,4 @@ export function buildClientContext(dpgContext, codeModel, client) {
|
|
|
101
82
|
clientContextFile.fixUnusedIdentifiers();
|
|
102
83
|
return clientContextFile;
|
|
103
84
|
}
|
|
104
|
-
/**
|
|
105
|
-
* This function adds the statements to pass the credential to getClient
|
|
106
|
-
*/
|
|
107
|
-
function addCredentialOptionsStatement(credential, factoryFunction) {
|
|
108
|
-
var _a;
|
|
109
|
-
switch (credential.type.type) {
|
|
110
|
-
case "Key":
|
|
111
|
-
if (!((_a = credential.type.policy) === null || _a === void 0 ? void 0 : _a.key)) {
|
|
112
|
-
throw new Error(`Key credential does not define a header name`);
|
|
113
|
-
}
|
|
114
|
-
factoryFunction.addStatements(`options.credentials = {...options.credentials, apiKeyHeaderName: "${credential.type.policy.key}"}`);
|
|
115
|
-
return;
|
|
116
|
-
default:
|
|
117
|
-
return;
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
85
|
//# sourceMappingURL=buildClientContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/buildCodeModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/buildCodeModel.ts"],"names":[],"mappings":"AAwEA,OAAO,EACL,gBAAgB,EAQjB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EACL,QAAQ,EAIT,MAAM,yBAAyB,CAAC;AAOjC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAsBnC,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAqgDD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EACnC,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAA;CAAwB,GAC3D,gBAAgB,CAqDlB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getPagedResult, isFixed } from "@azure-tools/typespec-azure-core";
|
|
2
2
|
import { getDoc, getFriendlyName, getMaxLength, getMaxValue, getMinLength, getMinValue, getPattern, getSummary, getVisibility, ignoreDiagnostics, isErrorModel, isNeverType, getEffectiveModelType, getDiscriminator, isKey, isStringType, getPropertyType, isNumericType, getMinItems, getMaxItems, listServices, getProjectedName, isNullType, getEncode, isTemplateDeclarationOrInstance, getFormat } from "@typespec/compiler";
|
|
3
|
-
import { getAuthentication, getHeaderFieldName, getPathParamName, getQueryParamName, getServers, isStatusCode,
|
|
3
|
+
import { getAuthentication, getHeaderFieldName, getPathParamName, getQueryParamName, getServers, isStatusCode, getHttpOperation } from "@typespec/http";
|
|
4
4
|
import { getAddedOnVersions } from "@typespec/versioning";
|
|
5
5
|
import { listClients, listOperationGroups, listOperationsInOperationGroup, isApiVersion, getDefaultApiVersion, getClientNamespaceString, getSdkUnion, getAllModels, getSdkBuiltInType, getClientType } from "@azure-tools/typespec-client-generator-core";
|
|
6
6
|
import { getResourceOperation } from "@typespec/rest";
|
|
@@ -74,6 +74,13 @@ function handleDiscriminator(context, type) {
|
|
|
74
74
|
}
|
|
75
75
|
return undefined;
|
|
76
76
|
}
|
|
77
|
+
function isSchemaProperty(program, property) {
|
|
78
|
+
const headerInfo = getHeaderFieldName(program, property);
|
|
79
|
+
const queryInfo = getQueryParamName(program, property);
|
|
80
|
+
const pathInfo = getPathParamName(program, property);
|
|
81
|
+
const statusCodeinfo = isStatusCode(program, property);
|
|
82
|
+
return !(headerInfo || queryInfo || pathInfo || statusCodeinfo);
|
|
83
|
+
}
|
|
77
84
|
function getEffectiveSchemaType(program, type) {
|
|
78
85
|
var _a;
|
|
79
86
|
function isSchemaProperty(property) {
|
|
@@ -112,9 +119,7 @@ function isEmptyModel(type) {
|
|
|
112
119
|
function processModelProperties(context, newValue, model) {
|
|
113
120
|
// need to do properties after insertion to avoid infinite recursion
|
|
114
121
|
for (const property of model.properties.values()) {
|
|
115
|
-
if (
|
|
116
|
-
isNeverType(property.type) ||
|
|
117
|
-
isHeader(context.program, property)) {
|
|
122
|
+
if (!isSchemaProperty(context.program, property)) {
|
|
118
123
|
continue;
|
|
119
124
|
}
|
|
120
125
|
if (newValue.properties === undefined || newValue.properties === null) {
|
|
@@ -154,7 +159,9 @@ function getType(context, type, options = {}) {
|
|
|
154
159
|
newValue = applyEncoding(context.program, type, newValue);
|
|
155
160
|
}
|
|
156
161
|
if (enableCache) {
|
|
157
|
-
|
|
162
|
+
if (!options.disableEffectiveModel) {
|
|
163
|
+
typesMap.set(effectiveModel, newValue);
|
|
164
|
+
}
|
|
158
165
|
if (type.kind === "Union") {
|
|
159
166
|
for (const t of type.variants.values()) {
|
|
160
167
|
if (t.type.kind === "Model") {
|
|
@@ -257,9 +264,6 @@ function emitBodyParameter(context, httpOperation) {
|
|
|
257
264
|
const type = getType(context, getBodyType(context.program, httpOperation), {
|
|
258
265
|
disableEffectiveModel: true
|
|
259
266
|
});
|
|
260
|
-
if (type.type === "model" && type.name === "") {
|
|
261
|
-
type.name = capitalize(httpOperation.operation.name) + "Request";
|
|
262
|
-
}
|
|
263
267
|
return {
|
|
264
268
|
contentTypes,
|
|
265
269
|
type,
|
|
@@ -440,7 +444,7 @@ function emitPagingOperation(context, operation, operationGroupName, rlcModels)
|
|
|
440
444
|
return emittedOperation;
|
|
441
445
|
}
|
|
442
446
|
function emitBasicOperation(context, operation, operationGroupName, rlcModels) {
|
|
443
|
-
var _a, _b;
|
|
447
|
+
var _a, _b, _c;
|
|
444
448
|
// Set up parameters for operation
|
|
445
449
|
const parameters = [];
|
|
446
450
|
if (endpointPathParameters) {
|
|
@@ -496,7 +500,18 @@ function emitBasicOperation(context, operation, operationGroupName, rlcModels) {
|
|
|
496
500
|
}
|
|
497
501
|
else {
|
|
498
502
|
bodyParameter = emitBodyParameter(context, httpOperation);
|
|
499
|
-
if (bodyParameter.type.type === "model" &&
|
|
503
|
+
if (bodyParameter.type.type === "model" && bodyParameter.type.name === "") {
|
|
504
|
+
if (bodyParameter.type.properties.length > 0) {
|
|
505
|
+
for (const param of bodyParameter.type.properties) {
|
|
506
|
+
// const emittedParam = emitParameter(context, param.type, "Method");
|
|
507
|
+
param.implementation = "Method";
|
|
508
|
+
param.location = (_b = param.location) !== null && _b !== void 0 ? _b : "body";
|
|
509
|
+
parameters.push(param);
|
|
510
|
+
}
|
|
511
|
+
}
|
|
512
|
+
bodyParameter = undefined;
|
|
513
|
+
}
|
|
514
|
+
else if (bodyParameter.type.type === "model" &&
|
|
500
515
|
bodyParameter.type.base === "json") {
|
|
501
516
|
bodyParameter["propertyToParameterName"] = {};
|
|
502
517
|
if (!isOverload) {
|
|
@@ -510,10 +525,24 @@ function emitBasicOperation(context, operation, operationGroupName, rlcModels) {
|
|
|
510
525
|
}
|
|
511
526
|
}
|
|
512
527
|
const name = applyCasing(operation.name, { casing: CASING });
|
|
528
|
+
/** handle name collision between operation name and parameter signature */
|
|
529
|
+
if (bodyParameter) {
|
|
530
|
+
bodyParameter.clientName =
|
|
531
|
+
bodyParameter.clientName === name
|
|
532
|
+
? bodyParameter.clientName + "Parameter"
|
|
533
|
+
: bodyParameter.clientName;
|
|
534
|
+
}
|
|
535
|
+
parameters
|
|
536
|
+
.filter((param) => {
|
|
537
|
+
return param.clientName === name && !param.isReadOnly && param.required;
|
|
538
|
+
})
|
|
539
|
+
.forEach((param) => {
|
|
540
|
+
param.clientName = param.clientName + "Parameter";
|
|
541
|
+
});
|
|
513
542
|
return {
|
|
514
543
|
name: name,
|
|
515
544
|
description: getDocStr(context.program, operation),
|
|
516
|
-
summary: (
|
|
545
|
+
summary: (_c = getSummary(context.program, operation)) !== null && _c !== void 0 ? _c : "",
|
|
517
546
|
url: httpOperation.path,
|
|
518
547
|
method: httpOperation.verb.toUpperCase(),
|
|
519
548
|
parameters: parameters,
|
|
@@ -700,6 +729,15 @@ function emitCredential(auth) {
|
|
|
700
729
|
}
|
|
701
730
|
};
|
|
702
731
|
}
|
|
732
|
+
else if (auth.type === "http") {
|
|
733
|
+
credential_type = {
|
|
734
|
+
type: "Key",
|
|
735
|
+
policy: {
|
|
736
|
+
type: "AzureKeyCredentialPolicy",
|
|
737
|
+
key: "Authorization"
|
|
738
|
+
}
|
|
739
|
+
};
|
|
740
|
+
}
|
|
703
741
|
return credential_type;
|
|
704
742
|
}
|
|
705
743
|
function emitCredentialUnion(cred_types) {
|
|
@@ -861,9 +899,6 @@ function mapTypeSpecType(context, type) {
|
|
|
861
899
|
return emitListOrDict(context, type);
|
|
862
900
|
}
|
|
863
901
|
}
|
|
864
|
-
function capitalize(name) {
|
|
865
|
-
return name[0].toUpperCase() + name.slice(1);
|
|
866
|
-
}
|
|
867
902
|
function emitUnion(context, type) {
|
|
868
903
|
var _a;
|
|
869
904
|
const sdkType = getSdkUnion(context, type);
|