@azure-tools/typespec-ts 0.26.1 → 0.27.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.
Files changed (83) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/src/index.d.ts.map +1 -1
  3. package/dist/src/index.js +21 -2
  4. package/dist/src/index.js.map +1 -1
  5. package/dist/src/modular/buildClassicalClient.d.ts.map +1 -1
  6. package/dist/src/modular/buildClassicalClient.js +6 -6
  7. package/dist/src/modular/buildClassicalClient.js.map +1 -1
  8. package/dist/src/modular/buildClassicalOperationGroups.js.map +1 -1
  9. package/dist/src/modular/buildClientContext.d.ts.map +1 -1
  10. package/dist/src/modular/buildClientContext.js +16 -3
  11. package/dist/src/modular/buildClientContext.js.map +1 -1
  12. package/dist/src/modular/buildCodeModel.d.ts.map +1 -1
  13. package/dist/src/modular/buildCodeModel.js +36 -78
  14. package/dist/src/modular/buildCodeModel.js.map +1 -1
  15. package/dist/src/modular/buildOperations.js.map +1 -1
  16. package/dist/src/modular/buildPagingFiles.js.map +1 -1
  17. package/dist/src/modular/buildProjectFiles.js +5 -5
  18. package/dist/src/modular/buildProjectFiles.js.map +1 -1
  19. package/dist/src/modular/buildRootIndex.d.ts.map +1 -1
  20. package/dist/src/modular/buildRootIndex.js +5 -4
  21. package/dist/src/modular/buildRootIndex.js.map +1 -1
  22. package/dist/src/modular/buildSerializeUtils.js.map +1 -1
  23. package/dist/src/modular/buildSubpathIndex.js.map +1 -1
  24. package/dist/src/modular/emitModels.d.ts.map +1 -1
  25. package/dist/src/modular/emitModels.js +15 -6
  26. package/dist/src/modular/emitModels.js.map +1 -1
  27. package/dist/src/modular/helpers/classicalOperationHelpers.d.ts.map +1 -1
  28. package/dist/src/modular/helpers/classicalOperationHelpers.js +24 -12
  29. package/dist/src/modular/helpers/classicalOperationHelpers.js.map +1 -1
  30. package/dist/src/modular/helpers/clientHelpers.d.ts.map +1 -1
  31. package/dist/src/modular/helpers/clientHelpers.js +2 -1
  32. package/dist/src/modular/helpers/clientHelpers.js.map +1 -1
  33. package/dist/src/modular/helpers/docsHelpers.js.map +1 -1
  34. package/dist/src/modular/helpers/namingHelpers.d.ts.map +1 -1
  35. package/dist/src/modular/helpers/namingHelpers.js +5 -4
  36. package/dist/src/modular/helpers/namingHelpers.js.map +1 -1
  37. package/dist/src/modular/helpers/operationHelpers.d.ts +3 -1
  38. package/dist/src/modular/helpers/operationHelpers.d.ts.map +1 -1
  39. package/dist/src/modular/helpers/operationHelpers.js +11 -10
  40. package/dist/src/modular/helpers/operationHelpers.js.map +1 -1
  41. package/dist/src/modular/helpers/typeHelpers.d.ts.map +1 -1
  42. package/dist/src/modular/helpers/typeHelpers.js.map +1 -1
  43. package/dist/src/transform/transform.d.ts +2 -2
  44. package/dist/src/transform/transform.d.ts.map +1 -1
  45. package/dist/src/transform/transform.js +16 -9
  46. package/dist/src/transform/transform.js.map +1 -1
  47. package/dist/src/transform/transformApiVersionInfo.d.ts.map +1 -1
  48. package/dist/src/transform/transformApiVersionInfo.js +3 -0
  49. package/dist/src/transform/transformApiVersionInfo.js.map +1 -1
  50. package/dist/src/transform/transformHelperFunctionDetails.js.map +1 -1
  51. package/dist/src/transform/transformParameters.js.map +1 -1
  52. package/dist/src/transform/transformPaths.js.map +1 -1
  53. package/dist/src/transform/transformResponses.js.map +1 -1
  54. package/dist/src/transform/transformSchemas.d.ts.map +1 -1
  55. package/dist/src/transform/transformSchemas.js +41 -16
  56. package/dist/src/transform/transformSchemas.js.map +1 -1
  57. package/dist/src/transform/transformTelemetryInfo.js.map +1 -1
  58. package/dist/src/transform/transfromRLCOptions.js.map +1 -1
  59. package/dist/src/utils/emitUtil.js.map +1 -1
  60. package/dist/src/utils/mediaTypes.js.map +1 -1
  61. package/dist/src/utils/modelUtils.d.ts.map +1 -1
  62. package/dist/src/utils/modelUtils.js +13 -8
  63. package/dist/src/utils/modelUtils.js.map +1 -1
  64. package/dist/src/utils/namespaceUtils.js.map +1 -1
  65. package/dist/src/utils/operationUtil.js.map +1 -1
  66. package/dist/tsconfig.tsbuildinfo +1 -1
  67. package/package.json +20 -20
  68. package/src/index.ts +26 -5
  69. package/src/modular/buildClassicalClient.ts +9 -5
  70. package/src/modular/buildClientContext.ts +22 -4
  71. package/src/modular/buildCodeModel.ts +45 -85
  72. package/src/modular/buildProjectFiles.ts +5 -5
  73. package/src/modular/buildRootIndex.ts +13 -4
  74. package/src/modular/emitModels.ts +15 -5
  75. package/src/modular/helpers/classicalOperationHelpers.ts +19 -6
  76. package/src/modular/helpers/clientHelpers.ts +1 -0
  77. package/src/modular/helpers/namingHelpers.ts +5 -4
  78. package/src/modular/helpers/operationHelpers.ts +14 -14
  79. package/src/modular/helpers/typeHelpers.ts +0 -1
  80. package/src/transform/transform.ts +19 -6
  81. package/src/transform/transformApiVersionInfo.ts +3 -0
  82. package/src/transform/transformSchemas.ts +33 -15
  83. package/src/utils/modelUtils.ts +14 -8
package/CHANGELOG.md CHANGED
@@ -1,3 +1,15 @@
1
+ ## 0.27.0 (2024-04-18)
2
+
3
+ - [Feature] Support server parameter in modular. Please refer to [#2424](https://github.com/Azure/autorest.typescript/pull/2424).
4
+ - [Feature] Support special words. Please refer to [#2387](https://github.com/Azure/autorest.typescript/pull/2387).
5
+ - [Feature] Support additional properties full cases in RLC. Please refer to [#2445](https://github.com/Azure/autorest.typescript/pull/2445).
6
+ - [Feature] Support the change for union and enums in modular and RLC. Please refer to [#2380](https://github.com/Azure/autorest.typescript/pull/2380).
7
+ - [Feature] Upgrade typespec compiler to 0.55.0. Please refer to [#2380](https://github.com/Azure/autorest.typescript/pull/2380).
8
+ - [Feature] Bump typescript version to typescript@~5.4.5. Please refer to [#2442](https://github.com/Azure/autorest.typescript/pull/2442).
9
+ - [Feature] Update @azure-rest/core-client to 1.4.0.. Please refer to [#2441](https://github.com/Azure/autorest.typescript/pull/2441).
10
+ - [Feature] Upgrade mkdirp to ^3.0.1. Please refer to [#2436](https://github.com/Azure/autorest.typescript/pull/2436).
11
+ - [Bugfix] Fix missing `pack` scripts in package.json. Please refer to [#2426](https://github.com/Azure/autorest.typescript/pull/2426).
12
+
1
13
  ## 0.26.1 (2024-04-04)
2
14
 
3
15
  - [Bugfix] Fix missing scripts in package.json file. Please refer to [#2402](https://github.com/Azure/autorest.typescript/pull/2402).
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAmC1D,OAAO,EAAE,OAAO,EAAc,MAAM,UAAU,CAAC;AA0B/C,cAAc,UAAU,CAAC;AAEzB,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,iBA2PjD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,QA+EtD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAoC1D,OAAO,EAAE,OAAO,EAAc,MAAM,UAAU,CAAC;AA0B/C,cAAc,UAAU,CAAC;AAEzB,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,iBA+QjD;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 as buildRLCPaginateHelper, buildEsLintConfig, buildKarmaConfigFile, buildEnvFile, buildEnvBrowserFile, buildRecordedClientFile, buildSampleTest, buildReadmeFile, buildSerializeHelper, buildLogger, hasUnexpectedHelper, buildSamples, buildVitestConfig } from "@azure-tools/rlc-common";
5
+ import { buildClientDefinitions, buildResponseTypes, buildParameterTypes, buildIsUnexpectedHelper, buildClient, buildIndexFile, buildTopLevelIndex, buildRollupConfig, buildTsConfig, buildApiExtractorConfig, buildPackageFile, buildPollingHelper, buildPaginateHelper as buildRLCPaginateHelper, buildEsLintConfig, buildKarmaConfigFile, buildEnvFile, buildEnvBrowserFile, buildRecordedClientFile, buildSampleTest, buildReadmeFile, buildSerializeHelper, buildLogger, hasUnexpectedHelper, buildSamples, buildVitestConfig, buildTsTestBrowserConfig } 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";
@@ -27,7 +27,7 @@ export async function $onEmit(context) {
27
27
  /** Shared status */
28
28
  const program = context.program;
29
29
  const emitterOptions = context.options;
30
- const dpgContext = createSdkContext(context, "@azure-tools/typespec-ts");
30
+ const dpgContext = createContextWithDefaultOptions(context);
31
31
  const needUnexpectedHelper = new Map();
32
32
  const serviceNameToRlcModelsMap = new Map();
33
33
  const rlcCodeModels = [];
@@ -73,6 +73,24 @@ export async function $onEmit(context) {
73
73
  : undefined
74
74
  };
75
75
  }
76
+ function createContextWithDefaultOptions(context) {
77
+ const tcgcSettings = {
78
+ "generate-protocol-methods": true,
79
+ "generate-convenience-methods": true,
80
+ "flatten-union-as-enum": false,
81
+ emitters: [
82
+ {
83
+ main: "@azure-tools/typespec-ts",
84
+ metadata: { name: "@azure-tools/typespec-ts" }
85
+ }
86
+ ]
87
+ };
88
+ context.options = {
89
+ ...context.options,
90
+ ...tcgcSettings
91
+ };
92
+ return createSdkContext(context);
93
+ }
76
94
  async function clearSrcFolder() {
77
95
  var _a, _b, _c, _d;
78
96
  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 : "");
@@ -172,6 +190,7 @@ export async function $onEmit(context) {
172
190
  if (option.moduleKind === "esm") {
173
191
  commonBuilders.push((model) => buildVitestConfig(model, "node"));
174
192
  commonBuilders.push((model) => buildVitestConfig(model, "browser"));
193
+ commonBuilders.push((model) => buildTsTestBrowserConfig(model));
175
194
  }
176
195
  if (isAzureFlavor) {
177
196
  commonBuilders.push(buildEsLintConfig);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"buildClassicalClient.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EAEX,MAAM,UAAU,CAAC;AASlB,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMpD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,cAoEf"}
1
+ {"version":3,"file":"buildClassicalClient.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EAEX,MAAM,UAAU,CAAC;AASlB,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMpD,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,cAwEf"}
@@ -14,10 +14,10 @@ export function buildClassicalClient(dpgContext, codeModel, client) {
14
14
  const params = getClientParameters(client);
15
15
  const srcPath = codeModel.modularOptions.sourceRoot;
16
16
  const subfolder = (_a = client.subfolder) !== null && _a !== void 0 ? _a : "";
17
- const clientFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}${classicalClientname}.ts`);
17
+ const clientFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}${normalizeName(classicalClientname, NameType.File)}.ts`);
18
18
  clientFile.addExportDeclaration({
19
19
  namedExports: [`${classicalClientname}Options`],
20
- moduleSpecifier: `./api/${modularClientName}Context.js`
20
+ moduleSpecifier: `./api/${normalizeName(modularClientName, NameType.File)}Context.js`
21
21
  });
22
22
  const clientClass = clientFile.addClass({
23
23
  isExported: true,
@@ -129,18 +129,18 @@ function buildClientOperationGroups(clientFile, client, clientClass) {
129
129
  const groupName = normalizeName((_b = operationGroup.namespaceHierarchies[0]) !== null && _b !== void 0 ? _b : operationGroup.propertyName, NameType.Property);
130
130
  if (groupName === "") {
131
131
  operationGroup.operations.forEach((op) => {
132
- var _a, _b, _c;
132
+ var _a, _b, _c, _d;
133
133
  const declarations = getOperationFunction(op, clientType);
134
134
  const method = {
135
135
  docs: declarations.docs,
136
- name: (_a = declarations.name) !== null && _a !== void 0 ? _a : "FIXME",
136
+ name: (_b = (_a = declarations.propertyName) !== null && _a !== void 0 ? _a : declarations.name) !== null && _b !== void 0 ? _b : "FIXME",
137
137
  kind: StructureKind.Method,
138
138
  returnType: declarations.returnType,
139
- parameters: (_b = declarations.parameters) === null || _b === void 0 ? void 0 : _b.filter((p) => p.name !== "context"),
139
+ parameters: (_c = declarations.parameters) === null || _c === void 0 ? void 0 : _c.filter((p) => p.name !== "context"),
140
140
  statements: `return ${declarations.name}(${[
141
141
  "this._client",
142
142
  ...[
143
- (_c = declarations.parameters) === null || _c === void 0 ? void 0 : _c.map((p) => p.name).filter((p) => p !== "context")
143
+ (_d = declarations.parameters) === null || _d === void 0 ? void 0 : _d.map((p) => p.name).filter((p) => p !== "context")
144
144
  ]
145
145
  ].join(",")})`
146
146
  };
@@ -1 +1 @@
1
- {"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,EAEL,aAAa,EACd,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,uBAAuB,EACvB,aAAa,EACd,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,UAAU,oBAAoB,CAClC,UAAsB,EACtB,SAA2B,EAC3B,MAAc;;IAEd,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAC/B,MAAM,iBAAiB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,mBAAmB,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC7D,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;IACpD,MAAM,SAAS,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;IAEzC,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CACnD,GAAG,OAAO,IACR,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACvC,GAAG,mBAAmB,KAAK,CAC5B,CAAC;IAEF,UAAU,CAAC,oBAAoB,CAAC;QAC9B,YAAY,EAAE,CAAC,GAAG,mBAAmB,SAAS,CAAC;QAC/C,eAAe,EAAE,SAAS,iBAAiB,YAAY;KACxD,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC;QACtC,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,GAAG,mBAAmB,EAAE;KAC/B,CAAC,CAAC;IAEH,2EAA2E;IAC3E,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE;QAClC,WAAW,CAAC,WAAW,CAAC;YACtB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,UAAU,MAAM,CAAC,aAAa,EAAE;YACtC,KAAK,EAAE,KAAK,CAAC,OAAO;SACrB,CAAC,CAAC;KACJ;SAAM;QACL,WAAW,CAAC,WAAW,CAAC;YACtB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,GAAG,MAAM,CAAC,aAAa,EAAE;YAC/B,KAAK,EAAE,KAAK,CAAC,OAAO;SACrB,CAAC,CAAC;KACJ;IAED,+DAA+D;IAC/D,WAAW,CAAC,WAAW,CAAC;QACtB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,KAAK,CAAC,MAAM;QACnB,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,CAAC,mDAAmD,CAAC;KAC5D,CAAC,CAAC;IAEH,wFAAwF;IACxF,MAAM,WAAW,GAAG,WAAW,CAAC,cAAc,CAAC;QAC7C,IAAI,EAAE,sBAAsB,CAAC,WAAW,CAAC;QACzC,UAAU,EAAE,MAAM;KACnB,CAAC,CAAC;IACH,WAAW,CAAC,aAAa,CAAC;QACxB,wBAAwB,iBAAiB,IAAI,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;aACxD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aAClB,IAAI,CAAC,GAAG,CAAC,GAAG;KAChB,CAAC,CAAC;IACH,WAAW,CAAC,aAAa,CAAC,uCAAuC,CAAC,CAAC;IACnE,gBAAgB,CAAC,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IACvD,cAAc,CAAC,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IACrD,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAChD,0BAA0B,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAC5D,aAAa,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC9C,UAAU,CAAC,iBAAiB,EAAE,CAAC;IAC/B,UAAU,CAAC,oBAAoB,EAAE,CAAC;IAClC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,aAAa,CACpB,UAAsB,EACtB,OAAe,EACf,SAAiB;IAEjB,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IACxC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CACrC,GAAG,OAAO,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,cAAc,CACpE,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjE,UAAU,CAAC,oBAAoB,CAAC;QAC9B,eAAe,EAAE,gBAAgB;QACjC,YAAY,EAAE,QAAQ;KACvB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CACtB,UAAsB,EACtB,OAAe,EACf,SAAiB;IAEjB,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IACxC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CACrC,GAAG,OAAO,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,kBAAkB,CACxE,CAAC;IAEF,IAAI,CAAC,SAAS,EAAE;QACd,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,UAAU,CAAC,oBAAoB,CAAC;YAC9B,eAAe,EAAE,oBAAoB;YACrC,YAAY,EAAE,QAAQ;SACvB,CAAC,CAAC;KACJ;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAC5C,GAAG,OAAO,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,mBAAmB,CACzE,CAAC;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,OAAO;KACR;IAED,MAAM,eAAe,GAAG;QACtB,GAAG,gBAAgB,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE;KACrD,CAAC;IAEF,UAAU,CAAC,oBAAoB,CAAC;QAC9B,eAAe,EAAE,qBAAqB;QACtC,YAAY,EAAE,eAAe;KAC9B,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CACvC,GAAG,OAAO,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,uBAAuB,CAC7E,CAAC;IAEF,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO;KACR;IAED,MAAM,kBAAkB,GAAG,CAAC,GAAG,WAAW,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAE7E,UAAU,CAAC,oBAAoB,CAAC;QAC9B,eAAe,EAAE,yBAAyB;QAC1C,YAAY,EAAE,kBAAkB;KACjC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CACrB,cAA8B,EAC9B,gBAA4B;IAE5B,gBAAgB,CAAC,oBAAoB,CAAC;QACpC,eAAe,EAAE,kBAAkB,CAAC,cAAc,EAAE,cAAc,CAAC;QACnE,YAAY,EAAE,CAAC,UAAU,CAAC;KAC3B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B,CACjC,UAAsB,EACtB,MAAc,EACd,WAA6B;;IAE7B,IAAI,UAAU,GAAG,QAAQ,CAAC;IAC1B,MAAM,SAAS,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;IACzC,IAAI,SAAS,IAAI,SAAS,KAAK,EAAE,EAAE;QACjC,UAAU,GAAG,UAAU,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;KAChD;IACD,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,eAAe,EAAE;QACnD,MAAM,SAAS,GAAG,aAAa,CAC7B,MAAA,cAAc,CAAC,oBAAoB,CAAC,CAAC,CAAC,mCAAI,cAAc,CAAC,YAAY,EACrE,QAAQ,CAAC,QAAQ,CAClB,CAAC;QACF,IAAI,SAAS,KAAK,EAAE,EAAE;YACpB,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;;gBACvC,MAAM,YAAY,GAAG,oBAAoB,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;gBAC1D,MAAM,MAAM,GAA+B;oBACzC,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,IAAI,EAAE,MAAA,YAAY,CAAC,IAAI,mCAAI,OAAO;oBAClC,IAAI,EAAE,aAAa,CAAC,MAAM;oBAC1B,UAAU,EAAE,YAAY,CAAC,UAAU;oBACnC,UAAU,EAAE,MAAA,YAAY,CAAC,UAAU,0CAAE,MAAM,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAC5B;oBACD,UAAU,EAAE,UAAU,YAAY,CAAC,IAAI,IAAI;wBACzC,cAAc;wBACd,GAAG;4BACD,MAAA,YAAY,CAAC,UAAU,0CACnB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAClB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;yBAClC;qBACF,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;iBACf,CAAC;gBACF,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,SAAS;SACV;QACD,MAAM,aAAa,GAAG,MAAM,uBAAuB,CACjD,cAAc,EACd,QAAQ,CAAC,SAAS,EAClB,EAAE,EACF,CAAC,CACF,YAAY,CAAC;QACd,MAAM,YAAY,GAAG,GAAG,uBAAuB,CAC7C,cAAc,EACd,QAAQ,CAAC,SAAS,EAClB,EAAE,EACF,CAAC,CACF,YAAY,CAAC;QACd,MAAM,aAAa,GAAG,WAAW,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7D,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,SAAS,CAAC;QACnC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,UAAU,CAAC,oBAAoB,CAAC;gBAC9B,YAAY,EAAE,CAAC,aAAa,EAAE,YAAY,CAAC;gBAC3C,eAAe,EAAE,aAAa,uBAAuB,CACnD,cAAc,EACd,QAAQ,CAAC,IAAI,EACb,GAAG,EACH,CAAC,CACF,WAAW;aACb,CAAC,CAAC;YACH,WAAW,CAAC,WAAW,CAAC;gBACtB,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,KAAK,CAAC,MAAM;gBACnB,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,CAAC,2BAA2B,GAAG,cAAc,CAAC,YAAY,CAAC;aAClE,CAAC,CAAC;YACH,MAAA,WAAW;iBACR,eAAe,EAAE,CAAC,CAAC,CAAC,0CACnB,aAAa,CACb,QAAQ,SAAS,SAAS,uBAAuB,CAC/C,cAAc,EACd,QAAQ,CAAC,SAAS,EAClB,EAAE,EACF,CAAC,CACF,0BAA0B,CAC5B,CAAC;SACL;KACF;AACH,CAAC"}
1
+ {"version":3,"file":"buildClassicalClient.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalClient.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.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,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAMtC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIjE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,GACb,UAAU,CAmGZ"}
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;AAQpD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,GACb,UAAU,CAgHZ"}
@@ -3,7 +3,8 @@ import { getClientName } from "./helpers/namingHelpers.js";
3
3
  import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
4
4
  import { getDocsFromDescription } from "./helpers/docsHelpers.js";
5
5
  import { importModels } from "./buildOperations.js";
6
- import { getImportSpecifier } from "@azure-tools/rlc-common";
6
+ import { getImportSpecifier, normalizeName, NameType } from "@azure-tools/rlc-common";
7
+ import { getType } from "./helpers/typeHelpers.js";
7
8
  /**
8
9
  * This function creates the file containing the modular client context
9
10
  */
@@ -12,7 +13,7 @@ export function buildClientContext(dpgContext, codeModel, client) {
12
13
  const name = getClientName(client);
13
14
  const params = getClientParameters(client);
14
15
  const srcPath = codeModel.modularOptions.sourceRoot;
15
- const clientContextFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}/api/${name}Context.ts`);
16
+ const clientContextFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}/api/${normalizeName(name, NameType.File)}Context.ts`);
16
17
  let factoryFunction;
17
18
  importCredential(codeModel.runtimeImports, clientContextFile);
18
19
  importModels(srcPath, clientContextFile, codeModel.project, subfolder);
@@ -23,7 +24,19 @@ export function buildClientContext(dpgContext, codeModel, client) {
23
24
  clientContextFile.addInterface({
24
25
  name: `${name}ClientOptions`,
25
26
  isExported: true,
26
- extends: ["ClientOptions"]
27
+ extends: ["ClientOptions"],
28
+ properties: client.parameters
29
+ .filter((p) => {
30
+ return (p.optional || (p.type.type !== "constant" && p.clientDefaultValue));
31
+ })
32
+ .map((p) => {
33
+ return {
34
+ name: p.clientName,
35
+ type: getType(p.type).name,
36
+ hasQuestionToken: true,
37
+ docs: getDocsFromDescription(p.description)
38
+ };
39
+ })
27
40
  });
28
41
  if (isRLCMultiEndpoint(dpgContext)) {
29
42
  clientContextFile.addImportDeclaration({
@@ -1 +1 @@
1
- {"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"buildClientContext.js","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,QAAQ,EACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAChC,UAAsB,EACtB,SAA2B,EAC3B,MAAc;IAEd,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAC1C,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;IACpD,MAAM,iBAAiB,GAAG,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAC1D,GAAG,OAAO,IACR,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACpD,QAAQ,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,YAAY,CACvD,CAAC;IAEF,IAAI,eAAe,CAAC;IACpB,gBAAgB,CAAC,SAAS,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAC9D,YAAY,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACvE,iBAAiB,CAAC,oBAAoB,CAAC;QACrC,eAAe,EAAE,kBAAkB,CAAC,YAAY,EAAE,SAAS,CAAC,cAAc,CAAC;QAC3E,YAAY,EAAE,CAAC,eAAe,CAAC;KAChC,CAAC,CAAC;IAEH,iBAAiB,CAAC,YAAY,CAAC;QAC7B,IAAI,EAAE,GAAG,IAAI,eAAe;QAC5B,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,CAAC,eAAe,CAAC;QAC1B,UAAU,EAAE,MAAM,CAAC,UAAU;aAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACZ,OAAO,CACL,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,kBAAkB,CAAC,CACnE,CAAC;QACJ,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,UAAU;gBAClB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI;gBAC1B,gBAAgB,EAAE,IAAI;gBACtB,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,WAAW,CAAC;aAC5C,CAAC;QACJ,CAAC,CAAC;KACL,CAAC,CAAC;IACH,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,iBAAiB,CAAC,oBAAoB,CAAC;YACrC,eAAe,EAAE,cAAc,SAAS,WAAW;YACnD,YAAY,EAAE,CAAC,QAAQ,CAAC;SACzB,CAAC,CAAC;QAEH,iBAAiB,CAAC,oBAAoB,CAAC;YACrC,eAAe,EAAE,cAAc,SAAS,WAAW;YACnD,YAAY,EAAE,CAAC,QAAQ,CAAC;SACzB,CAAC,CAAC;QACH,eAAe,GAAG,iBAAiB,CAAC,WAAW,CAAC;YAC9C,IAAI,EAAE,sBAAsB,CAAC,WAAW,CAAC;YACzC,IAAI,EAAE,SAAS,IAAI,EAAE;YACrB,UAAU,EAAE,UAAU,MAAM,CAAC,IAAI,EAAE;YACnC,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QAC3C,iBAAiB,CAAC,oBAAoB,CAAC;YACrC,eAAe,EAAE,GACf,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAC1C,kBAAkB;YAClB,YAAY,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC;SACnC,CAAC,CAAC;QAEH,iBAAiB,CAAC,oBAAoB,CAAC;YACrC,eAAe,EAAE,GACf,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAC1C,kBAAkB;YAClB,YAAY,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC;SACnC,CAAC,CAAC;QAEH,eAAe,GAAG,iBAAiB,CAAC,WAAW,CAAC;YAC9C,IAAI,EAAE,sBAAsB,CAAC,WAAW,CAAC;YACzC,IAAI,EAAE,SAAS,IAAI,EAAE;YACrB,UAAU,EAAE,GAAG,aAAa,EAAE;YAC9B,UAAU,EAAE,MAAM;YAClB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,kBAAkB,GAAG,mCAAmC,UAAU,CAAC,IAAI,CAC3E,GAAG,CACJ,GAAG,CAAC;IAEL,eAAe,CAAC,aAAa,CAAC,CAAC,kBAAkB,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAE7E,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,iBAAiB,CAAC,qBAAqB,CAAC;YACtC;gBACE,eAAe,EAAE,cAAc,SAAS,WAAW;gBACnD,YAAY,EAAE,CAAC,2BAA2B,CAAC;aAC5C;SACF,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,iBAAiB,CAAC,qBAAqB,CAAC;YACtC;gBACE,eAAe,EAAE,GACf,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAC1C,kBAAkB;gBAClB,aAAa,EAAE,WAAW;aAC3B;SACF,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,iBAAiB,CACjC,EAAE,EACF,EAAE,2BAA2B,EAAE,IAAI,EAAE,CACtC,CAAC;IAEF,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;IACzC,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"buildCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/buildCodeModel.ts"],"names":[],"mappings":"AAwEA,OAAO,EACL,gBAAgB,EASjB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EACL,QAAQ,EAIT,MAAM,yBAAyB,CAAC;AAUjC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AA0BnC,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;AAytDD,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,CAsDlB"}
1
+ {"version":3,"file":"buildCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/buildCodeModel.ts"],"names":[],"mappings":"AAuEA,OAAO,EACL,gBAAgB,EASjB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EACL,QAAQ,EAIT,MAAM,yBAAyB,CAAC;AAUjC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AA0BnC,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;AAkrDD,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,CAsDlB"}
@@ -1,8 +1,8 @@
1
- import { getPagedResult, isFixed } from "@azure-tools/typespec-azure-core";
1
+ import { getPagedResult } from "@azure-tools/typespec-azure-core";
2
2
  import { getDoc, getFriendlyName, getMaxLength, getMaxValue, getMinLength, getMinValue, getPattern, getSummary, getVisibility, ignoreDiagnostics, isErrorModel, isNeverType, getEffectiveModelType, getDiscriminator, isStringType, getPropertyType, isNumericType, getMinItems, getMaxItems, listServices, isNullType, getEncode, isTemplateDeclarationOrInstance, UsageFlags } from "@typespec/compiler";
3
3
  import { getAuthentication, getHeaderFieldName, getPathParamName, getQueryParamName, getServers, isStatusCode, getHttpOperation, isSharedRoute } from "@typespec/http";
4
4
  import { getAddedOnVersions } from "@typespec/versioning";
5
- import { listClients, listOperationGroups, listOperationsInOperationGroup, isApiVersion, getDefaultApiVersion, getClientNamespaceString, getSdkUnion, getAllModels, getSdkBuiltInType, getClientType, getLibraryName, getWireName } from "@azure-tools/typespec-client-generator-core";
5
+ import { listClients, listOperationGroups, listOperationsInOperationGroup, isApiVersion, getDefaultApiVersion, getClientNamespaceString, getSdkUnion, getAllModels, getSdkBuiltInType, getLibraryName, getWireName } from "@azure-tools/typespec-client-generator-core";
6
6
  import { getBodyType, getDefaultApiVersionString, isAzureCoreErrorType } from "../utils/modelUtils.js";
7
7
  import { camelToSnakeCase, toCamelCase } from "../utils/casingUtils.js";
8
8
  import { getClientName, NameType, normalizeName } from "@azure-tools/rlc-common";
@@ -21,7 +21,8 @@ function applyCasing(name, options = { casing: "snake" }) {
21
21
  const typesMap = new Map();
22
22
  const simpleTypesMap = new Map();
23
23
  const endpointPathParameters = [];
24
- let apiVersionParam = undefined;
24
+ let methodApiVersionParam = undefined;
25
+ let serverApiVersionParam = undefined;
25
26
  function isSimpleType(program, type) {
26
27
  // these decorators can only work for simple type(int/string/float, etc)
27
28
  if (type && (type.kind === "Scalar" || type.kind === "ModelProperty")) {
@@ -242,7 +243,7 @@ function emitParamBase(context, parameter) {
242
243
  const program = context.program;
243
244
  if (parameter.kind === "ModelProperty") {
244
245
  optional = parameter.optional;
245
- name = getLibraryName(context, parameter);
246
+ name = normalizeName(getLibraryName(context, parameter), NameType.Parameter, true);
246
247
  restApiName = getWireName(context, parameter);
247
248
  description = getDocStr(program, parameter);
248
249
  addedOn = getAddedOnVersion(program, parameter);
@@ -311,7 +312,7 @@ function emitParameter(context, parameter, implementation) {
311
312
  clientDefaultValue = paramMap.type.value;
312
313
  }
313
314
  if (isApiVersion(context, parameter) &&
314
- paramMap.location === "query") {
315
+ (paramMap.location === "query" || paramMap.location === "endpointPath")) {
315
316
  const defaultApiVersion = getDefaultApiVersion(context, getServiceNamespace(context.program));
316
317
  paramMap.implementation = implementation;
317
318
  paramMap.in_docstring = false;
@@ -491,8 +492,7 @@ function emitBasicOperation(context, operation, operationGroupName, rlcModels, h
491
492
  const namespaceHierarchies = ((_b = context.rlcOptions) === null || _b === void 0 ? void 0 : _b.hierarchyClient) === true ? hierarchies : [];
492
493
  if (namespaceHierarchies.length === 0 &&
493
494
  ((_c = context.rlcOptions) === null || _c === void 0 ? void 0 : _c.hierarchyClient) === false &&
494
- operationGroupName !== "" &&
495
- namespaceHierarchies[0] !== operationGroupName) {
495
+ operationGroupName !== "") {
496
496
  namespaceHierarchies.push(operationGroupName);
497
497
  }
498
498
  for (const param of httpOperation.parameters.parameters) {
@@ -502,7 +502,7 @@ function emitBasicOperation(context, operation, operationGroupName, rlcModels, h
502
502
  const emittedParam = emitParameter(context, param, "Method");
503
503
  if (isApiVersion(context, param)) {
504
504
  emittedParam.isApiVersion = true;
505
- apiVersionParam = emittedParam;
505
+ methodApiVersionParam = emittedParam;
506
506
  }
507
507
  parameters.push(emittedParam);
508
508
  }
@@ -572,7 +572,7 @@ function emitBasicOperation(context, operation, operationGroupName, rlcModels, h
572
572
  param.clientName = param.clientName + "Parameter";
573
573
  });
574
574
  return {
575
- name: normalizeName(name, NameType.Operation, true),
575
+ name,
576
576
  description: getDocStr(context.program, operation),
577
577
  summary: (_e = getSummary(context.program, operation)) !== null && _e !== void 0 ? _e : "",
578
578
  url: httpOperation.path,
@@ -663,7 +663,7 @@ function emitModel(context, type, usage) {
663
663
  baseModel = getType(context, type.baseModel, { usage });
664
664
  }
665
665
  const effectiveName = getEffectiveSchemaType(context.program, type).name;
666
- const overridedModelName = (_a = getLibraryName(context, type)) !== null && _a !== void 0 ? _a : getFriendlyName(context.program, type);
666
+ const overridedModelName = normalizeName((_a = getLibraryName(context, type)) !== null && _a !== void 0 ? _a : getFriendlyName(context.program, type), NameType.Interface, true);
667
667
  const fullNamespaceName = getModelNamespaceName(context, type.namespace)
668
668
  .map((nsName) => {
669
669
  return normalizeName(nsName, NameType.Interface);
@@ -740,7 +740,7 @@ function emitEnum(context, type) {
740
740
  description: getDocStr(program, type),
741
741
  valueType: { type: enumMemberType(type.members.values().next().value) },
742
742
  values: enumValues,
743
- isFixed: isFixed(program, type)
743
+ isFixed: true
744
744
  };
745
745
  }
746
746
  function enumMemberType(member) {
@@ -956,30 +956,8 @@ function mapTypeSpecType(context, type, usage) {
956
956
  return emitListOrDict(context, type, usage);
957
957
  }
958
958
  }
959
- function isExtensibleEnum(context, type) {
960
- var _a;
961
- if (isFixed(context.program, type)) {
962
- return false;
963
- }
964
- if (((_a = context.rlcOptions) === null || _a === void 0 ? void 0 : _a.flavor) === "azure") {
965
- return true;
966
- }
967
- return false;
968
- }
969
959
  function emitUnion(context, type, usage) {
970
- var _a, _b, _c;
971
- let isVariantExtensible = false;
972
- /**
973
- * This is a temporary workaround to handle TCGC reporting incorrect isFixed for Unions with Enum variants
974
- */
975
- for (const [_, variant] of type.variants) {
976
- if (variant.type.kind === "Enum") {
977
- if (isExtensibleEnum(context, variant.type)) {
978
- isVariantExtensible = true;
979
- break;
980
- }
981
- }
982
- }
960
+ var _a;
983
961
  const sdkType = getSdkUnion(context, type);
984
962
  const nonNullOptions = getNonNullOptions(type);
985
963
  if (sdkType === undefined) {
@@ -1014,34 +992,28 @@ function emitUnion(context, type, usage) {
1014
992
  };
1015
993
  }
1016
994
  else if (sdkType.kind === "enum") {
995
+ const typeName = getLibraryName(context, type)
996
+ ? getLibraryName(context, type)
997
+ : sdkType.isGeneratedName
998
+ ? type.name
999
+ : sdkType.name;
1017
1000
  return {
1018
- name: getLibraryName(context, type)
1019
- ? getLibraryName(context, type)
1020
- : (_b = type.name) !== null && _b !== void 0 ? _b : sdkType.name,
1001
+ name: typeName,
1021
1002
  nullable: sdkType.nullable,
1022
- description: sdkType.description || `Type of ${sdkType.name}`,
1003
+ description: sdkType.description || `Type of ${typeName}`,
1023
1004
  internal: true,
1024
1005
  type: sdkType.kind,
1025
1006
  valueType: emitSimpleType(context, sdkType.valueType),
1026
1007
  values: sdkType.values.map((x) => emitEnumMember(context, x)),
1027
- isFixed: isVariantExtensible ? false : sdkType.isFixed,
1008
+ isFixed: sdkType.isFixed,
1028
1009
  xmlMetadata: {},
1029
1010
  usage
1030
1011
  };
1031
1012
  }
1032
- else if (isStringOrNumberKind(context.program, sdkType.kind) &&
1033
- isStringOrNumberKind(context.program, (_c = nonNullOptions[0]) === null || _c === void 0 ? void 0 : _c.kind)) {
1013
+ else if (nonNullOptions.length === 1 && nonNullOptions[0]) {
1034
1014
  return {
1035
- name: undefined,
1036
- nullable: sdkType.nullable,
1037
- internal: true,
1038
- type: "enum",
1039
- valueType: emitSimpleType(context, sdkType),
1040
- values: nonNullOptions
1041
- .map((x) => getClientType(context, x))
1042
- .map((x) => emitEnumMember(context, x)),
1043
- isFixed: true,
1044
- xmlMetadata: {}
1015
+ ...emitType(context, nonNullOptions[0], usage),
1016
+ nullable: sdkType.nullable
1045
1017
  };
1046
1018
  }
1047
1019
  else {
@@ -1051,21 +1023,6 @@ function emitUnion(context, type, usage) {
1051
1023
  };
1052
1024
  }
1053
1025
  }
1054
- function isStringOrNumberKind(program, kind) {
1055
- var _a;
1056
- if (!kind) {
1057
- return false;
1058
- }
1059
- kind = kind.toLowerCase();
1060
- try {
1061
- const type = emitStdScalar(program, { name: kind });
1062
- kind = (_a = type["type"]) !== null && _a !== void 0 ? _a : kind;
1063
- }
1064
- catch (e) {
1065
- // ignore
1066
- }
1067
- return ["string", "number", "integer", "float"].includes(kind);
1068
- }
1069
1026
  function getNonNullOptions(type) {
1070
1027
  return [...type.variants.values()]
1071
1028
  .map((x) => x.type)
@@ -1095,7 +1052,7 @@ function emitSimpleType(context, type) {
1095
1052
  }
1096
1053
  return {
1097
1054
  nullable: sdkType.nullable,
1098
- type: "number",
1055
+ type: sdkType.kind === "string" ? "string" : "number", // TODO: handle other types
1099
1056
  doc: "",
1100
1057
  apiVersions: [],
1101
1058
  sdkDefaultValue: undefined,
@@ -1256,11 +1213,9 @@ function emitServerParams(context, namespace) {
1256
1213
  };
1257
1214
  const emittedParameter = emitParameter(context, serverParameter, "Client");
1258
1215
  endpointPathParameters.push(emittedParameter);
1259
- if (isApiVersion(context, serverParameter) &&
1260
- apiVersionParam === undefined) {
1216
+ if (isApiVersion(context, serverParameter)) {
1261
1217
  emittedParameter.isApiVersion = true;
1262
- apiVersionParam = emittedParameter;
1263
- continue;
1218
+ serverApiVersionParam = emittedParameter;
1264
1219
  }
1265
1220
  params.push(emittedParameter);
1266
1221
  }
@@ -1329,10 +1284,10 @@ function emitGlobalParameters(context, namespace) {
1329
1284
  }
1330
1285
  return clientParameters;
1331
1286
  }
1332
- function getApiVersionParameter() {
1333
- if (apiVersionParam) {
1287
+ function getMethodApiVersionParameter() {
1288
+ if (methodApiVersionParam) {
1334
1289
  return {
1335
- ...apiVersionParam,
1290
+ ...methodApiVersionParam,
1336
1291
  isApiVersion: true
1337
1292
  };
1338
1293
  }
@@ -1342,7 +1297,7 @@ function emitClients(context, namespace, rlcModelsMap) {
1342
1297
  const program = context.program;
1343
1298
  const clients = listClients(context);
1344
1299
  const retval = [];
1345
- apiVersionParam = undefined;
1300
+ methodApiVersionParam = undefined;
1346
1301
  for (const client of clients) {
1347
1302
  const clientName = getLibraryName(context, client.type).replace("Client", "");
1348
1303
  if (getNamespace(context, client.name) !== namespace) {
@@ -1364,9 +1319,12 @@ function emitClients(context, namespace, rlcModelsMap) {
1364
1319
  subfolder: "",
1365
1320
  rlcHelperDetails: rlcModels && rlcModels.helperDetails ? rlcModels.helperDetails : {}
1366
1321
  };
1367
- const emittedApiVersionParam = getApiVersionParameter();
1368
- if (emittedApiVersionParam && context.hasApiVersionInClient) {
1369
- emittedClient.parameters.push(emittedApiVersionParam);
1322
+ const methodApiVersionParam = getMethodApiVersionParameter();
1323
+ if (methodApiVersionParam &&
1324
+ !serverApiVersionParam &&
1325
+ context.hasApiVersionInClient) {
1326
+ // prompt method-level api version to client level only when there is no client one defined
1327
+ emittedClient.parameters.push(methodApiVersionParam);
1370
1328
  // if we have client level api version, we need to remove it from all operations
1371
1329
  emittedClient.operationGroups.map((opGroup) => {
1372
1330
  opGroup.operations.map((op) => {