@typespec/http-client-python 0.18.0 → 0.19.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 (32) hide show
  1. package/dist/emitter/code-model.d.ts.map +1 -1
  2. package/dist/emitter/code-model.js +19 -4
  3. package/dist/emitter/code-model.js.map +1 -1
  4. package/dist/emitter/http.js +14 -6
  5. package/dist/emitter/http.js.map +1 -1
  6. package/emitter/src/code-model.ts +23 -6
  7. package/emitter/src/http.ts +14 -8
  8. package/emitter/temp/tsconfig.tsbuildinfo +1 -1
  9. package/eng/scripts/Build-Packages.ps1 +3 -0
  10. package/eng/scripts/ci/regenerate.ts +8 -1
  11. package/eng/scripts/setup/__pycache__/package_manager.cpython-39.pyc +0 -0
  12. package/eng/scripts/setup/__pycache__/venvtools.cpython-39.pyc +0 -0
  13. package/generator/build/lib/pygen/codegen/models/operation.py +5 -1
  14. package/generator/build/lib/pygen/codegen/serializers/builder_serializer.py +22 -6
  15. package/generator/build/lib/pygen/codegen/serializers/model_init_serializer.py +5 -2
  16. package/generator/build/lib/pygen/codegen/templates/model_init.py.jinja2 +6 -0
  17. package/generator/build/lib/pygen/codegen/templates/operation_tools.jinja2 +2 -1
  18. package/generator/dist/pygen-0.1.0-py3-none-any.whl +0 -0
  19. package/generator/pygen/codegen/models/operation.py +5 -1
  20. package/generator/pygen/codegen/serializers/builder_serializer.py +22 -6
  21. package/generator/pygen/codegen/serializers/model_init_serializer.py +5 -2
  22. package/generator/pygen/codegen/templates/model_init.py.jinja2 +6 -0
  23. package/generator/pygen/codegen/templates/operation_tools.jinja2 +2 -1
  24. package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_location_async.py +8 -1
  25. package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_override_async.py +63 -0
  26. package/generator/test/azure/mock_api_tests/asynctests/test_client_structure_clientoperationgroup_async.py +29 -0
  27. package/generator/test/azure/mock_api_tests/conftest.py +1 -1
  28. package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_client_location.py +5 -1
  29. package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_override.py +61 -0
  30. package/generator/test/azure/mock_api_tests/test_client_structure_clientoperationgroup.py +26 -0
  31. package/generator/test/azure/requirements.txt +1 -0
  32. package/package.json +6 -6
package/dist/emitter/code-model.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"code-model.d.ts","sourceRoot":"","sources":["../../emitter/src/code-model.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAkP5C,wBAAgB,aAAa,CAAC,UAAU,EAAE,gBAAgB,uBAyEzD"}
1
+ {"version":3,"file":"code-model.d.ts","sourceRoot":"","sources":["../../emitter/src/code-model.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAmQ5C,wBAAgB,aAAa,CAAC,UAAU,EAAE,gBAAgB,uBAyEzD"}
package/dist/emitter/code-model.js CHANGED
@@ -150,10 +150,25 @@ function emitClient(context, client) {
150
150
  if (client.clientInitialization) {
151
151
  context.__endpointPathParameters = [];
152
152
  }
153
- const parameters = client.clientInitialization?.parameters
154
- .map((x) => emitMethodParameter(context, x))
155
- .reduce((a, b) => [...a, ...b]) ?? [];
156
- const endpointParameter = client.clientInitialization?.parameters.find((x) => x.kind === "endpoint");
153
+ // get all init parameters including children clients
154
+ const initParameters = [];
155
+ const paramNames = new Set();
156
+ function collectParameters(client) {
157
+ if (client.clientInitialization?.parameters) {
158
+ for (const param of client.clientInitialization.parameters) {
159
+ if (!paramNames.has(param.name)) {
160
+ initParameters.push(param);
161
+ paramNames.add(param.name);
162
+ }
163
+ }
164
+ }
165
+ for (const child of client.children ?? []) {
166
+ collectParameters(child);
167
+ }
168
+ }
169
+ collectParameters(client);
170
+ const parameters = initParameters.map((x) => emitMethodParameter(context, x)).reduce((a, b) => [...a, ...b]) ?? [];
171
+ const endpointParameter = initParameters.find((x) => x.kind === "endpoint");
157
172
  const operationGroups = emitOperationGroups(context, client, client, "");
158
173
  let url;
159
174
  if (endpointParameter?.type.kind === "union") {
package/dist/emitter/code-model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"code-model.js","sourceRoot":"","sources":["../../emitter/src/code-model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"code-model.js","sourceRoot":"","sources":["../../emitter/src/code-model.ts"],"names":[],"mappings":"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"}
package/dist/emitter/http.js CHANGED
@@ -296,14 +296,22 @@ function emitHttpQueryParameter(context, parameter, method) {
296
296
  }
297
297
  function emitHttpParameters(context, rootClient, operation, method) {
298
298
  const parameters = [...context.__endpointPathParameters];
299
- // handle @override for parameters reorder
299
+ // handle @override
300
300
  const httpParameters = method.isOverride
301
301
  ? (() => {
302
- const parametersFromMethod = method.parameters
303
- .map((param) => getHttpOperationParameter(method, param))
304
- .filter((result) => result !== undefined);
305
- const parametersFromOperation = operation.parameters.filter((param) => !parametersFromMethod.includes(param));
306
- return [...parametersFromMethod, ...parametersFromOperation];
302
+ const parametersFromMethod = [];
303
+ for (const param of method.parameters) {
304
+ const httpParam = getHttpOperationParameter(method, param);
305
+ if (httpParam) {
306
+ // override properties of the http parameter
307
+ httpParam.optional = param.optional;
308
+ parametersFromMethod.push(httpParam);
309
+ }
310
+ }
311
+ if (parametersFromMethod.length > 0) {
312
+ return parametersFromMethod;
313
+ }
314
+ return operation.parameters;
307
315
  })()
308
316
  : operation.parameters;
309
317
  for (const parameter of httpParameters) {
package/dist/emitter/http.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"http.js","sourceRoot":"","sources":["../../emitter/src/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EACL,yBAAyB,EAkBzB,UAAU,GACX,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAoB,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,UAAU,EACV,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAN,IAAY,wBAIX;AAJD,WAAY,wBAAwB;IAClC,6EAAW,CAAA;IACX,mFAAc,CAAA;IACd,yFAAiB,CAAA;AACnB,CAAC,EAJW,wBAAwB,KAAxB,wBAAwB,QAInC;AAED,SAAS,sBAAsB,CAAC,SAA6B;IAC3D,OAAO,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC;AACnE,CAAC;AAED,SAAS,aAAa,CAAC,QAA+C;IACpE,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YAClD,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,oBAAoB,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;QACpF,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,OAAyB,EACzB,UAA2C,EAC3C,MAA+C,EAC/C,kBAA0B;IAE1B,OAAO;QACL;YACE,GAAG,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC;YACvF,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC;YAC5B,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC;YACnC,WAAW,EAAE,MAAM,CAAC,GAAG,IAAI,EAAE;YAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB;KACF,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAC/B,OAAyB,EACzB,UAA2C,EAC3C,MAA2F,EAC3F,kBAA0B;IAE1B,OAAO;QACL,GAAG,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC;QACvF,IAAI,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU;QACjD,qBAAqB,EAAE,IAAI;QAC3B,WAAW,EAAE,KAAK;QAClB,mBAAmB,EAAE,KAAK;QAC1B,WAAW,EAAE,MAAM,CAAC,GAAG,IAAI,EAAE;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,OAAyB,EACzB,UAA2C,EAC3C,MAA2F,EAC3F,kBAA0B;IAE1B,OAAO;QACL,GAAG,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC;QACvF,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC;QACnC,aAAa,EAAE,KAAK;QACpB,gBAAgB,EAAE,wBAAwB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC;QAC3F,mBAAmB,EAAE,KAAK;QAC1B,WAAW,EAAE,MAAM,CAAC,GAAG,IAAI,EAAE;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CACtC,QAAkF;IAElF,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACpC,OAAO,QAAQ;aACZ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;aACpC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;aACnD,IAAI,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,0BAA0B,CACjC,OAAyB,EACzB,QAAyE,EACzE,IAAyE,EACzE,MAA2C;IAE3C,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE;YAChC,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE;SACrC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAAyB,EACzB,MAA8F,EAC9F,QAAkF,EAClF,QAAiB,IAAI;IAErB,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACpC,MAAM,QAAQ,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACxC,CAAC;IACH,CAAC;SAAM,IAAI,KAAK,EAAE,CAAC;QACjB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;YACpD,IAAI,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC3C,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,cAAc,EAAE,QAAQ,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;YAC1E,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAClD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtC,IAAI,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;oBAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;gBACjE,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE;QAChC,IAAI,EAAE,4BAA4B;QAClC,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE;KAChF,CAAC,CAAC;IACH,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,yBAAyB,CAChC,OAAyB,EACzB,MAA8F;IAE9F,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,CAAC,kCAAkC,IAAI,EAAE,CAAC;IACzF,MAAM,gBAAgB,GAAG,MAAM,CAAC,cAAc,CAAC,iCAAiC,IAAI,EAAE,CAAC;IACvF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChE,OAAO;YACL,KAAK,EAAE,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,CAAC;YACjE,MAAM,EAAE,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,CAAC;SACzE,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAAyB,EACzB,UAA2C,EAC3C,MAA8F,EAC9F,kBAA0B;IAE1B,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;QAClD,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7C,IAAI,IAAI,CAAC,yBAAyB,CAAC,KAAK,SAAS,EAAE,CAAC;gBAClD,IAAI,CAAC,yBAAyB,CAAC,GAAG,wBAAwB,CAAC,OAAO,CAAC;YACrE,CAAC;YACD,IAAI,CAAC,yBAAyB,CAAC,IAAI,wBAAwB,CAAC,UAAU,CAAC;QACzE,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAK,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAClG,MAAM,QAAQ,GAAG,0BAA0B,CACzC,OAAO,EACP,MAAM,CAAC,QAAQ,CAAC,cAAc,EAC9B,sBAAsB,EACtB,MAAM,CACP,CAAC;IACF,MAAM,YAAY,GAAG,0BAA0B,CAC7C,OAAO,EACP,MAAM,CAAC,cAAc,CAAC,gBAAgB,EACtC,mBAAmB,EACnB,MAAM,CACP,CAAC;IACF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAyB,EAAE,EAAE;QACnD,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,MAAM,4BAA4B,GAA0B,EAAE,CAAC;IAC/D,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,cAAc,CAAC,oCAAoC,IAAI,EAAE,EAAE,CAAC;QACvF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;oBACpD,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,IAAI,SAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBACtF,4BAA4B,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;oBACxF,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO;QACL,GAAG,IAAI;QACP,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC;QACnC,aAAa,EAAE,QAAQ;QACvB,mBAAmB,EAAE,KAAK;QAC1B,QAAQ;QACR,YAAY;QACZ,gBAAgB,EACd,MAAM,CAAC,cAAc,CAAC,gBAAgB,IAAI,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC;QAC7F,4BAA4B;QAC5B,QAAQ;QACR,WAAW,EAAE,MAAM,CAAC,GAAG,IAAI,EAAE;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,iBAAiB,EAAE,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC;KAC9D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,OAAyB,EACzB,UAA2C,EAC3C,MAA6C,EAC7C,kBAA0B;IAE1B,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACrF,OAAO,CAAC,SAAS,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,OAAyB,EACzB,UAA2C,EAC3C,MAAgD,EAChD,kBAA0B;IAE1B,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC3F,OAAO,CAAC,YAAY,CAAC,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,OAAyB,EACzB,UAA2C,EAC3C,MAAmD,EACnD,kBAA0B;IAE1B,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC3F,MAAM,SAAS,GAAG,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACrF,OAAO,CAAC,SAAS,CAAC,gBAAgB,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,iBAAiB,CACxB,OAAyB,EACzB,UAA2C,EAC3C,kBAA0B,EAC1B,SAA2B,EAC3B,MAA0C;IAE1C,MAAM,SAAS,GAA0B,EAAE,CAAC;IAC5C,MAAM,UAAU,GAA0B,EAAE,CAAC;IAC7C,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAE,CAAC,CAAC;IACrF,CAAC;IACD,KAAK,MAAM,SAAS,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;QAC7C,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAE,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,MAAM,GAAG;QACb,GAAG,EAAE,SAAS,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE;QACpC,UAAU,EAAE,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,CAAC;QACtE,aAAa,EAAE,qBAAqB,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC;QAClE,SAAS;QACT,UAAU;QACV,SAAS,EAAE,kBAAkB;QAC7B,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;QAClD,aAAa,EAAE,OAAO;QACtB,UAAU,EAAE,KAAK;QACjB,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,WAAW,EAAE,IAAI;QACjB,mBAAmB,EAAE,IAAI;QACzB,yBAAyB,EAAE,MAAM,EAAE,yBAAyB;QAC5D,OAAO,EAAE,aAAa,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC;QAClD,QAAQ,EAAE,MAAM,CAAC,MAAM,KAAK,UAAU;KACvC,CAAC;IACF,IAAI,MAAM,CAAC,aAAa,IAAI,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9D,MAAM,CAAC,aAAa,CAAC,yBAAyB,CAAC,GAAG,EAAE,CAAC;QACrD,MAAM,CAAC,aAAa,CAAC,wBAAwB,CAAC,GAAG,IAAI,CAAC;QACtD,iJAAiJ;QACjJ,IACE,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC;YACxD,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EACzD,CAAC;YACD,MAAM,CAAC,aAAa,CAAC,IAAI,GAAG,EAAE,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;QAC9F,CAAC;QACD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC;QACxC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC5D,MAAM,CAAC,aAAa,CAAC,yBAAyB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACnE,QAAQ,CAAC,YAAY,CAAC,CAAC;YACzB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,YAAY,CAAC,SAAuC;IAC3D,OAAO,CACL,SAAS,EAAE,IAAI,CAAC,IAAI,KAAK,OAAO;QAChC,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,IAAI,CAChE,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,aAAkC,EAClC,QAA6B;IAE7B,OAAO;QACL,gBAAgB,EAAE,KAAK;QACvB,kBAAkB,EAAE,IAAI;QACxB,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,cAAc,EAAE,QAAQ;QACxB,WAAW,EAAE,IAAI;QACjB,eAAe,EAAE,IAAI;QACrB,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,KAAK;QACnB,YAAY,EAAE,aAAa,CAAC,cAAc,CAAC;QAC3C,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC;QAC9B,QAAQ,EAAE,IAAI;QACd,eAAe,EAAE,KAAK;QACtB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;QACtB,sBAAsB,EAAE,IAAI;KAC7B,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAyB,EACzB,SAA2B,EAC3B,SAA2B;IAE3B,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC/C,IAAI,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;QACpF,SAAS,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,CACrC,KAAK,SAAS,CAAC,cAAc,GAAG,EAChC,IAAI,SAAS,CAAC,cAAc,GAAG,CAChC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,SAAS,CAAC,cAAc;QAClC,QAAQ,EAAE,SAAS,CAAC,IAAI;QACxB,cAAc,EAAE,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC;QACrD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;QAChD,eAAe,EAAE,SAAS,CAAC,aAAa;KACzC,CAAC;AACJ,CAAC;AACD,SAAS,uBAAuB,CAC9B,OAAyB,EACzB,SAA6B,EAC7B,MAA0C;IAE1C,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACvD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC/D,IAAI,kBAAkB,GAAG,SAAS,CAAC,kBAAkB,CAAC;IACtD,IAAI,sBAAsB,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,mDAAmD;QACnD,IAAI,CAAC,kBAAkB,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9D,kBAAkB,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC;IAChC,CAAC;IACD,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,SAAS,CAAC,cAAc;QAClC,QAAQ,EAAE,SAAS,CAAC,IAAI;QACxB,cAAc,EAAE,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC;QACrD,SAAS;QACT,OAAO;QACP,kBAAkB;KACnB,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAAyB,EACzB,SAA4B,EAC5B,MAA0C;IAE1C,MAAM,IAAI,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACvD,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;IAC/D,OAAO;QACL,GAAG,IAAI;QACP,QAAQ,EAAE,SAAS,CAAC,cAAc;QAClC,QAAQ,EAAE,SAAS,CAAC,IAAI;QACxB,cAAc,EAAE,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC;QACrD,SAAS;QACT,OAAO;QACP,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;KACjD,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAyB,EACzB,UAA2C,EAC3C,SAA2B,EAC3B,MAA0C;IAE1C,MAAM,UAAU,GAA0B,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAEhF,0CAA0C;IAC1C,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU;QACtC,CAAC,CAAC,CAAC,GAAG,EAAE;YACJ,MAAM,oBAAoB,GAAG,MAAM,CAAC,UAAU;iBAC3C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,yBAAyB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;iBACxD,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;YAE5C,MAAM,uBAAuB,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,CACzD,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CACjD,CAAC;YAEF,OAAO,CAAC,GAAG,oBAAoB,EAAE,GAAG,uBAAuB,CAAC,CAAC;QAC/D,CAAC,CAAC,EAAE;QACN,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC;IAEzB,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;QACvC,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;YACvB,KAAK,QAAQ;gBACX,UAAU,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;gBACrE,MAAM;YACR,KAAK,OAAO;gBACV,UAAU,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;gBACpE,MAAM;YACR,KAAK,MAAM;gBACT,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;gBACtE,MAAM;QACV,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAyB,EACzB,SAA4B;IAE5B,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC9C,OAAO;QACL,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC;QACpC,YAAY,EAAE,SAAS,CAAC,YAAY;QACpC,QAAQ,EAAE,SAAS,CAAC,IAAI;QACxB,UAAU,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC;QACjF,QAAQ,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI;QAC7D,cAAc,EAAE,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC;QACrD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;QAChD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;KACjD,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAyB,EACzB,WAA+C,EAC/C,QAAgD,EAChD,MAA2C,EAC3C,WAAW,GAAG,KAAK;IAEnB,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,IAAI,IAAI,GAAG,SAAS,CAAC;IACrB,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9D,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;SAAM,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;SAAM,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACnB,MAAM,UAAU,GACd,MAAM,CAAC,IAAI,KAAK,QAAQ;YACtB,CAAC,CAAC,wBAAwB,CAAC,UAAU;YACrC,CAAC,CAAC,wBAAwB,CAAC,aAAa,CAAC;QAC7C,IAAI,IAAI,CAAC,yBAAyB,CAAC,KAAK,SAAS,EAAE,CAAC;YAClD,IAAI,CAAC,yBAAyB,CAAC,GAAG,wBAAwB,CAAC,OAAO,CAAC;QACrE,CAAC;QACD,IAAI,CAAC,yBAAyB,CAAC,IAAI,UAAU,CAAC;IAChD,CAAC;IAED,OAAO;QACL,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACxE,WAAW,EACT,OAAO,WAAW,KAAK,QAAQ;YAC7B,CAAC,CAAC,CAAC,CAAE,WAAmC,CAAC,KAAK,EAAG,WAAmC,CAAC,GAAG,CAAC,CAAC;YAC1F,CAAC,CAAC,WAAW,KAAK,GAAG;gBACnB,CAAC,CAAC,CAAC,SAAS,CAAC;gBACb,CAAC,CAAC,CAAC,WAAW,CAAC;QACrB,aAAa,EAAE,OAAO;QACtB,IAAI;QACJ,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB,IAAI,kBAAkB;QACrE,cAAc,EAAE,0BAA0B,CACxC,OAAO,EACP,MAAM,EAAE,QAAQ,CAAC,cAAc,EAC/B,oBAAoB,EACpB,MAAM,CACP;KACF,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,OAAyB,EACzB,MAAgC;IAEhC,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC;QACnC,QAAQ,EAAE,MAAM,CAAC,cAAc;KAChC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"http.js","sourceRoot":"","sources":["../../emitter/src/http.ts"],"names":[],"mappings":"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"}
package/emitter/src/code-model.ts CHANGED
@@ -229,14 +229,31 @@ function emitClient<TServiceOperation extends SdkServiceOperation>(
229
229
  if (client.clientInitialization) {
230
230
  context.__endpointPathParameters = [];
231
231
  }
232
+
233
+ // get all init parameters including children clients
234
+ const initParameters: (SdkEndpointParameter | SdkCredentialParameter | SdkMethodParameter)[] = [];
235
+ const paramNames = new Set<string>();
236
+ function collectParameters(client: SdkClientType<TServiceOperation>) {
237
+ if (client.clientInitialization?.parameters) {
238
+ for (const param of client.clientInitialization.parameters) {
239
+ if (!paramNames.has(param.name)) {
240
+ initParameters.push(param);
241
+ paramNames.add(param.name);
242
+ }
243
+ }
244
+ }
245
+ for (const child of client.children ?? []) {
246
+ collectParameters(child);
247
+ }
248
+ }
249
+ collectParameters(client);
250
+
232
251
  const parameters =
233
- client.clientInitialization?.parameters
234
- .map((x) => emitMethodParameter(context, x))
235
- .reduce((a, b) => [...a, ...b]) ?? [];
252
+ initParameters.map((x) => emitMethodParameter(context, x)).reduce((a, b) => [...a, ...b]) ?? [];
236
253
 
237
- const endpointParameter = client.clientInitialization?.parameters.find(
238
- (x) => x.kind === "endpoint",
239
- ) as SdkEndpointParameter | undefined;
254
+ const endpointParameter = initParameters.find((x) => x.kind === "endpoint") as
255
+ | SdkEndpointParameter
256
+ | undefined;
240
257
  const operationGroups = emitOperationGroups(context, client, client, "");
241
258
  let url: string | undefined;
242
259
  if (endpointParameter?.type.kind === "union") {
package/emitter/src/http.ts CHANGED
@@ -441,18 +441,24 @@ function emitHttpParameters(
441
441
  ): Record<string, any>[] {
442
442
  const parameters: Record<string, any>[] = [...context.__endpointPathParameters];
443
443
 
444
- // handle @override for parameters reorder
444
+ // handle @override
445
445
  const httpParameters = method.isOverride
446
446
  ? (() => {
447
- const parametersFromMethod = method.parameters
448
- .map((param) => getHttpOperationParameter(method, param))
449
- .filter((result) => result !== undefined);
447
+ const parametersFromMethod = [];
448
+ for (const param of method.parameters) {
449
+ const httpParam = getHttpOperationParameter(method, param);
450
+ if (httpParam) {
451
+ // override properties of the http parameter
452
+ httpParam.optional = param.optional;
453
+ parametersFromMethod.push(httpParam);
454
+ }
455
+ }
450
456
 
451
- const parametersFromOperation = operation.parameters.filter(
452
- (param) => !parametersFromMethod.includes(param),
453
- );
457
+ if (parametersFromMethod.length > 0) {
458
+ return parametersFromMethod;
459
+ }
454
460
 
455
- return [...parametersFromMethod, ...parametersFromOperation];
461
+ return operation.parameters;
456
462
  })()
457
463
  : operation.parameters;
458
464